home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-23 11:45:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

more WeirdCharset

Browse Source
This commit is contained in:
nixzhu
2016-01-19 16:16:56 +08:00
parent e56c6cd715
commit 5fa029388c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/OpenGraphService.swift
+6 -4
View File
@@ -157,8 +157,10 @@ struct OpenGraph {
}
}
private enum ChinaCharset: String {
private enum WeirdCharset: String {
case GB2312 = "gb2312"
case GBK = "gbk"
case GB18030 = "gb18030"
}
private func getUTF8StringFromString(string: String, data: NSData) -> String {
@@ -175,13 +177,13 @@ private func getUTF8StringFromString(string: String, data: NSData) -> String {
let charsetStringRange = result.rangeAtIndex(1)
let charsetString = (string as NSString).substringWithRange(charsetStringRange).lowercaseString
guard let chinaCharset = ChinaCharset(rawValue: charsetString) else {
guard let weirdCharset = WeirdCharset(rawValue: charsetString) else {
return string
}
switch chinaCharset {
switch weirdCharset {
case .GB2312:
case .GB2312, .GBK, .GB18030:
let china = CFStringEncodings.GB_18030_2000
let encoding = CFStringConvertEncodingToNSStringEncoding(CFStringEncoding(china.rawValue))