diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 14c94e53..875932bc 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.2196 + 1.8.2207 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 891a0881..d6d73214 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.2196 + 1.8.2207 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index c857a0b0..5af32f06 100644 --- a/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -33,21 +33,5 @@ endingLineNumber = "37"> - - - - diff --git a/Kiwix/CoreData/Classes/Book.swift b/Kiwix/CoreData/Classes/Book.swift index c5ef578f..e806d94a 100644 --- a/Kiwix/CoreData/Classes/Book.swift +++ b/Kiwix/CoreData/Classes/Book.swift @@ -86,7 +86,7 @@ class Book: NSManagedObject { // MARK: - Fetch class func fetchAll(in context: NSManagedObjectContext) -> [Book] { - let request: NSFetchRequest = Book.fetchRequest() as! NSFetchRequest + let request: NSFetchRequest = NSFetchRequest(entityName: "Book") return (try? context.fetch(request)) ?? [Book]() } diff --git a/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents b/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents index b53e10c0..74905643 100644 --- a/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents +++ b/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/Kiwix/Operations/RefreshLibrary.swift b/Kiwix/Operations/RefreshLibrary.swift index 2d323d1e..dad77c68 100644 --- a/Kiwix/Operations/RefreshLibrary.swift +++ b/Kiwix/Operations/RefreshLibrary.swift @@ -21,7 +21,6 @@ class RefreshLibraryOperation: GroupProcedure { } fileprivate class Retrieve: NetworkDataProcedure { - init() { let session = URLSession.shared let url = URL(string: "https://download.kiwix.org/library/library.xml")! @@ -59,6 +58,16 @@ fileprivate class Process: Procedure, ResultInjection, XMLParserDelegate { parser.delegate = self parser.parse() + let toBeDeleted = storeBookIDs.subtracting(memoryBookIDs) + hasUpdate = toBeDeleted.count > 0 + context.performAndWait { + toBeDeleted.forEach({ (id) in + + }) + } + print("\(memoryBookIDs.count)") + + if context.hasChanges { try? context.save() } finish() } @@ -71,13 +80,6 @@ fileprivate class Process: Procedure, ResultInjection, XMLParserDelegate { _ = Book.add(meta: attributeDict, in: self.context) }) } - } - - func parserDidEndDocument(_ parser: XMLParser) { - - } - - func parser(_ parser: XMLParser, parseErrorOccurred parseError: Error) { - + memoryBookIDs.insert(id) } }