home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-12 06:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

fill skill to feed if can

Browse Source
This commit is contained in:
nixzhu
2015-10-22 17:41:15 +08:00
committed by nixzhu
parent 0a06346c52
commit df856191d3
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/YepService.swift
+34 -20
View File
@@ -178,6 +178,31 @@ struct Skill: Hashable {
var hashValue: Int {
return id.hashValue
}
static func fromJSONDictionary(skillInfo: JSONDictionary) -> Skill? {
if
let skillID = skillInfo["id"] as? String,
let skillName = skillInfo["name"] as? String,
let skillLocalName = skillInfo["name_string"] as? String {
var skillCategory: SkillCategory?
if
let skillCategoryData = skillInfo["category"] as? JSONDictionary,
let categoryID = skillCategoryData["id"] as? String,
let categoryName = skillCategoryData["name"] as? String,
let categoryLocalName = skillCategoryData["name_string"] as? String {
skillCategory = SkillCategory(id: categoryID, name: categoryName, localName: categoryLocalName, skills: [])
}
let coverURLString = skillInfo["cover_url"] as? String
let skill = Skill(category: skillCategory, id: skillID, name: skillName, localName: skillLocalName, coverURLString: coverURLString)
return skill
}
return nil
}
}
func ==(lhs: Skill, rhs: Skill) -> Bool {
@@ -222,25 +247,9 @@ func skillsFromSkillsData(skillsData: [JSONDictionary]) -> [Skill] {
var skills = [Skill]()
for skillInfo in skillsData {
if
let skillID = skillInfo["id"] as? String,
let skillName = skillInfo["name"] as? String,
let skillLocalName = skillInfo["name_string"] as? String {
var skillCategory: SkillCategory?
if
let skillCategoryData = skillInfo["category"] as? JSONDictionary,
let categoryID = skillCategoryData["id"] as? String,
let categoryName = skillCategoryData["name"] as? String,
let categoryLocalName = skillCategoryData["name_string"] as? String {
skillCategory = SkillCategory(id: categoryID, name: categoryName, localName: categoryLocalName, skills: [])
}
let coverURLString = skillInfo["cover_url"] as? String
let skill = Skill(category: skillCategory, id: skillID, name: skillName, localName: skillLocalName, coverURLString: coverURLString)
skills.append(skill)
if let skill = Skill.fromJSONDictionary(skillInfo) {
skills.append(skill)
}
}
@@ -2300,13 +2309,18 @@ struct DiscoveredFeed: Hashable {
let attachments = attachmentsData.map({ DiscoveredAttachment.fromJSONDictionary($0) }).flatMap({ $0 })
return DiscoveredFeed(id: id, allowComment: allowComment, createdUnixTime: createdUnixTime, updatedUnixTime: updatedUnixTime, creator: creator, body: body, attachments: attachments, distance: distance, skill: nil, groupID: groupID, messageCount: messageCount)
var skill: Skill?
if let skillInfo = json["skill"] as? JSONDictionary {
skill = Skill.fromJSONDictionary(skillInfo)
}
return DiscoveredFeed(id: id, allowComment: allowComment, createdUnixTime: createdUnixTime, updatedUnixTime: updatedUnixTime, creator: creator, body: body, attachments: attachments, distance: distance, skill: skill, groupID: groupID, messageCount: messageCount)
}
}
let parseFeeds: JSONDictionary -> [DiscoveredFeed]? = { data in
//println("feedsData: \(data)")
println("feedsData: \(data)")
if let feedsData = data["topics"] as? [JSONDictionary] {
return feedsData.map({ DiscoveredFeed.fromJSONDictionary($0) }).flatMap({ $0 })