diff --git a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
index 72765327..93f84324 100644
--- a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
+++ b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
@@ -45,7 +45,7 @@ extension MainController: UIWebViewDelegate, SFSafariViewControllerDelegate, LPT
guard let url = webView.request?.URL,
let article = Article.addOrUpdate(url: url, context: NSManagedObjectContext.mainQueueContext) else {return}
article.title = JSInjection.getTitle(from: webView)
- article.thumbImageURL = URLResponseCache.shared.firstImage()?.path
+ article.thumbImagePath = URLResponseCache.shared.firstImage()?.path
self.article = article
// UI Updates
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index fc9914f1..63ead068 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
CFBundleVersion
- 1.8.1479
+ 1.8.1487
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index 5800869a..487a713f 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 1.8.1483
+ 1.8.1491
NSExtension
NSExtensionMainStoryboard
diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
index 107934da..05d00337 100644
--- a/Kiwix.xcodeproj/project.pbxproj
+++ b/Kiwix.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
970E68B61D37E224001E8514 /* SettingSearchHistoryTBVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E68B51D37E224001E8514 /* SettingSearchHistoryTBVC.swift */; };
970E68BA1D3809A3001E8514 /* MainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E68B71D3809A3001E8514 /* MainController.swift */; };
970E68BB1D3809A3001E8514 /* MainControllerDelegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E68B81D3809A3001E8514 /* MainControllerDelegates.swift */; };
+ 970E7F741D9DB0FC00741290 /* 1.8.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 970E7F731D9DB0FC00741290 /* 1.8.xcmappingmodel */; };
9711871C1CEB448400B9909D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9711871B1CEB448400B9909D /* libz.tbd */; };
9711871E1CEB449A00B9909D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9711871D1CEB449A00B9909D /* libz.tbd */; };
971187A91CEB694400B9909D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 971187A81CEB694400B9909D /* WebKit.framework */; };
@@ -60,7 +61,6 @@
973DD4181D343F2F009D45DB /* libxapian.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 973DD40D1D343F2F009D45DB /* libxapian.a */; };
973DD4191D343F2F009D45DB /* libzim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 973DD40E1D343F2F009D45DB /* libzim.a */; };
973DD4281D36E3E4009D45DB /* SettingSingleSwitchTBVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973DD4271D36E3E4009D45DB /* SettingSingleSwitchTBVC.swift */; };
- 974F33C41D99BBEB00879D35 /* 1.8.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 974F33C31D99BBEB00879D35 /* 1.8.xcmappingmodel */; };
974F33C61D99CAD700879D35 /* BookmarkOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 974F33C51D99CAD700879D35 /* BookmarkOperation.swift */; };
974F42821D47E19A00F8074C /* SettingWidgetBookmarksTBVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 974F42811D47E19A00F8074C /* SettingWidgetBookmarksTBVC.swift */; };
975227821D020560001D1DDE /* Indexer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 975227811D020560001D1DDE /* Indexer.storyboard */; };
@@ -222,6 +222,7 @@
970E68B51D37E224001E8514 /* SettingSearchHistoryTBVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SettingSearchHistoryTBVC.swift; path = "Kiwix-iOS/Controller/Setting/SettingSearchHistoryTBVC.swift"; sourceTree = SOURCE_ROOT; };
970E68B71D3809A3001E8514 /* MainController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MainController.swift; path = "Kiwix-iOS/Controller/Main/MainController.swift"; sourceTree = SOURCE_ROOT; };
970E68B81D3809A3001E8514 /* MainControllerDelegates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MainControllerDelegates.swift; path = "Kiwix-iOS/Controller/Main/MainControllerDelegates.swift"; sourceTree = SOURCE_ROOT; };
+ 970E7F731D9DB0FC00741290 /* 1.8.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; name = 1.8.xcmappingmodel; path = Kiwix/CoreData/Migration/1.8.xcmappingmodel; sourceTree = SOURCE_ROOT; };
9711871B1CEB448400B9909D /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
9711871D1CEB449A00B9909D /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
971187A81CEB694400B9909D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -280,7 +281,6 @@
973DD40D1D343F2F009D45DB /* libxapian.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxapian.a; path = Kiwix/libkiwix/iOS/libxapian.a; sourceTree = ""; };
973DD40E1D343F2F009D45DB /* libzim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzim.a; path = Kiwix/libkiwix/iOS/libzim.a; sourceTree = ""; };
973DD4271D36E3E4009D45DB /* SettingSingleSwitchTBVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SettingSingleSwitchTBVC.swift; path = "Kiwix-iOS/Controller/Setting/SettingSingleSwitchTBVC.swift"; sourceTree = SOURCE_ROOT; };
- 974F33C31D99BBEB00879D35 /* 1.8.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; name = 1.8.xcmappingmodel; path = Kiwix/CoreData/Migration/1.8.xcmappingmodel; sourceTree = SOURCE_ROOT; };
974F33C51D99CAD700879D35 /* BookmarkOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkOperation.swift; sourceTree = ""; };
974F42811D47E19A00F8074C /* SettingWidgetBookmarksTBVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SettingWidgetBookmarksTBVC.swift; path = "Kiwix-iOS/Controller/Setting/SettingWidgetBookmarksTBVC.swift"; sourceTree = SOURCE_ROOT; };
975227811D020560001D1DDE /* Indexer.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Indexer.storyboard; path = "Kiwix-OSX/StoryBoards/Indexer.storyboard"; sourceTree = SOURCE_ROOT; };
@@ -543,7 +543,7 @@
isa = PBXGroup;
children = (
97D6812F1D6F70EC00E5FA99 /* 1.5.xcmappingmodel */,
- 974F33C31D99BBEB00879D35 /* 1.8.xcmappingmodel */,
+ 970E7F731D9DB0FC00741290 /* 1.8.xcmappingmodel */,
97D681301D6F70EC00E5FA99 /* MigrationPolicy.swift */,
);
name = Migration;
@@ -1531,8 +1531,8 @@
97D681371D6F711A00E5FA99 /* Article.swift in Sources */,
97D681231D6F70AC00E5FA99 /* GlobalQueue.swift in Sources */,
97A1FD3B1D6F724E00A80EE2 /* stringTools.cpp in Sources */,
+ 970E7F741D9DB0FC00741290 /* 1.8.xcmappingmodel in Sources */,
97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */,
- 974F33C41D99BBEB00879D35 /* 1.8.xcmappingmodel in Sources */,
971A10321D022AD5007FC62C /* SearchBar.swift in Sources */,
97E60A061D10504000EBCB9D /* LibraryBackupTBVC.swift in Sources */,
97A1FD451D6F728200A80EE2 /* StringTools.swift in Sources */,
diff --git a/Kiwix/CoreData/Classes/Article+CoreDataProperties.swift b/Kiwix/CoreData/Classes/Article+CoreDataProperties.swift
index 09f2d6a2..a0e87b7b 100644
--- a/Kiwix/CoreData/Classes/Article+CoreDataProperties.swift
+++ b/Kiwix/CoreData/Classes/Article+CoreDataProperties.swift
@@ -25,5 +25,5 @@ extension Article {
@NSManaged var book: Book?
@NSManaged var tags: NSSet?
- @NSManaged var thumbImageURL: String?
+ @NSManaged var thumbImagePath: String?
}
diff --git a/Kiwix/CoreData/Classes/Article.swift b/Kiwix/CoreData/Classes/Article.swift
index a5ea4d8a..66c0c988 100644
--- a/Kiwix/CoreData/Classes/Article.swift
+++ b/Kiwix/CoreData/Classes/Article.swift
@@ -51,7 +51,7 @@ class Article: NSManagedObject {
}
var thumbImageData: NSData? {
- if let bookID = book?.id, let path = thumbImageURL,
+ if let bookID = book?.id, let path = thumbImagePath,
let url = NSURL(bookID: bookID, contentPath: path),
let data = NSData(contentsOfURL: url) {
return data
diff --git a/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift b/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift
index a3b78b7d..dc4aae63 100644
--- a/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift
+++ b/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift
@@ -21,7 +21,6 @@ extension Book {
@NSManaged var favIcon: NSData?
@NSManaged var fileSize: Int64
@NSManaged var globalCount: Int64
- @NSManaged var hasIndex: Bool
@NSManaged var hasPic: Bool
@NSManaged var id: String
@NSManaged var includeInSearch: Bool
diff --git a/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents b/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents
index c9f99c74..25ce0df3 100644
--- a/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents
+++ b/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents
@@ -9,7 +9,7 @@
-
+
@@ -22,7 +22,6 @@
-
@@ -81,8 +80,8 @@
-
-
+
+
diff --git a/Kiwix/CoreData/Migration/1.8.xcmappingmodel/xcmapping.xml b/Kiwix/CoreData/Migration/1.8.xcmappingmodel/xcmapping.xml
deleted file mode 100644
index 91eee167..00000000
--- a/Kiwix/CoreData/Migration/1.8.xcmappingmodel/xcmapping.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
- 134481920
- CAC6BC21-47DB-478D-A01E-3C19ED6FDB4B
- 149
-
-
-
- NSPersistenceFrameworkVersion
- 752
- NSStoreModelVersionHashes
-
- XDDevAttributeMapping
-
- 0plcXXRN7XHKl5CcF+fwriFmUpON3ZtcI/AfK748aWc=
-
- XDDevEntityMapping
-
- qeN1Ym3TkWN1G6dU9RfX6Kd2ccEvcDVWHpd3LpLgboI=
-
- XDDevMappingModel
-
- EqtMzvRnVZWkXwBHu4VeVGy8UyoOe+bi67KC79kphlQ=
-
- XDDevPropertyMapping
-
- XN33V44TTGY4JETlMoOB5yyTKxB+u4slvDIinv0rtGA=
-
- XDDevRelationshipMapping
-
- akYY9LhehVA/mCb4ATLWuI9XGLcjpm14wWL1oEBtIcs=
-
-
- NSStoreModelVersionHashesVersion
- 3
- NSStoreModelVersionIdentifiers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Kiwix/CoreData/Migration/MigrationPolicy.swift b/Kiwix/CoreData/Migration/MigrationPolicy.swift
index 768df27e..b973a2de 100644
--- a/Kiwix/CoreData/Migration/MigrationPolicy.swift
+++ b/Kiwix/CoreData/Migration/MigrationPolicy.swift
@@ -24,7 +24,7 @@ class MigrationPolicy1_8: NSEntityMigrationPolicy {
}
}
- func articlePath(url: String) -> String {
- return NSURL(string: url)!.path!
+ func path(url: String) -> String {
+ return NSURL(string: url)?.path ?? ""
}
}
diff --git a/Kiwix/Operations/ScanLocalBookOperation.swift b/Kiwix/Operations/ScanLocalBookOperation.swift
index 706ec34e..4f64f4f9 100644
--- a/Kiwix/Operations/ScanLocalBookOperation.swift
+++ b/Kiwix/Operations/ScanLocalBookOperation.swift
@@ -95,17 +95,10 @@ class ScanLocalBookOperation: Operation {
return book ?? Book.add(reader.metaData, context: NSManagedObjectContext.mainQueueContext)
}() else {return}
book.state = .Local
- book.hasIndex = reader.hasIndex()
book.hasPic = !reader.fileURL.absoluteString!.containsString("nopic")
if let downloadTask = book.downloadTask {context.deleteObject(downloadTask)}
}
- for (id, book) in localBooks {
- guard !context.deletedObjects.contains(book) else {continue}
- guard let reader = ZimMultiReader.shared.readers[id] else {return}
- book.hasIndex = reader.hasIndex()
- }
-
if localBooks.count == 0 && addedZimFileIDs.count >= 1 {
firstBookAdded = true
}