Replace SQLite.swift with GRDB and use Combine for asynchronous code (#…

…398)
readium · Aug 20, 2021 · 43367fc · 43367fc
1 parent c13d161
commit 43367fc
Show file tree

Hide file tree

Showing 52 changed files with 1,024 additions and 1,213 deletions.
diff --git a/Integrations/Carthage/Cartfile b/Integrations/Carthage/Cartfile
@@ -1,9 +1,3 @@
-# Third-party dependencies used in the Test App itself.
-github "onevcat/Kingfisher" ~> 5.15.8
-github "jdg/MBProgressHUD" ~> 1.2.0
-github "stephencelis/SQLite.swift" ~> 0.12.2
-github "scinfu/SwiftSoup" ~> 2.3.2
-
 # Readium 2 dependencies
 github "readium/r2-shared-swift" "develop"
 github "readium/r2-streamer-swift" "develop"

diff --git a/Integrations/Carthage/Cartfile+lcp b/Integrations/Carthage/Cartfile+lcp
@@ -1,9 +1,3 @@
-# Third-party dependencies used in the Test App itself.
-github "onevcat/Kingfisher" ~> 5.15.8
-github "jdg/MBProgressHUD" ~> 1.2.0
-github "stephencelis/SQLite.swift" ~> 0.12.2
-github "scinfu/SwiftSoup" ~> 2.3.2
-
 # Readium 2 dependencies
 github "readium/r2-shared-swift" "develop"
 github "readium/r2-streamer-swift" "develop"

diff --git a/Integrations/Carthage/project+lcp.yml b/Integrations/Carthage/project+lcp.yml
@@ -1,11 +1,21 @@
 name: R2TestApp
 options:
   bundleIdPrefix: org.readium
+packages:
+  GRDB:
+    url: https://github.com/groue/GRDB.swift.git
+    from: 5.8.0
+  Kingfisher:
+    url: https://github.com/onevcat/Kingfisher.git
+    from: 5.15.8
+  MBProgressHUD:
+    url: https://github.com/jdg/MBProgressHUD.git
+    from: 1.2.0
 targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:
@@ -17,8 +27,6 @@ targets:
       - framework: Carthage/Build/CryptoSwift.xcframework
       - framework: Carthage/Build/Fuzi.xcframework
       - framework: Carthage/Build/GCDWebServer.xcframework
-      - framework: Carthage/Build/Kingfisher.xcframework
-      - framework: Carthage/Build/MBProgressHUD.xcframework
       - framework: Carthage/Build/Minizip.xcframework
       - framework: Carthage/Build/R2Navigator.xcframework
       - framework: Carthage/Build/R2Shared.xcframework
@@ -28,6 +36,9 @@ targets:
       - framework: Carthage/Build/SQLite.xcframework
       - framework: Carthage/Build/SwiftSoup.xcframework
       - framework: Carthage/Build/ZIPFoundation.xcframework
+      - package: GRDB
+      - package: Kingfisher
+      - package: MBProgressHUD
     settings:
       LIBRARY_SEARCH_PATHS: $(PROJECT_DIR)/Carthage
       OTHER_SWIFT_FLAGS: -DLCP
diff --git a/Integrations/Carthage/project.yml b/Integrations/Carthage/project.yml
@@ -1,11 +1,21 @@
 name: R2TestApp
 options:
   bundleIdPrefix: org.readium
+packages:
+  GRDB:
+    url: https://github.com/groue/GRDB.swift.git
+    from: 5.8.0
+  Kingfisher:
+    url: https://github.com/onevcat/Kingfisher.git
+    from: 5.15.8
+  MBProgressHUD:
+    url: https://github.com/jdg/MBProgressHUD.git
+    from: 1.2.0
 targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:
@@ -16,14 +26,14 @@ targets:
       - framework: Carthage/Build/CryptoSwift.xcframework
       - framework: Carthage/Build/Fuzi.xcframework
       - framework: Carthage/Build/GCDWebServer.xcframework
-      - framework: Carthage/Build/Kingfisher.xcframework
-      - framework: Carthage/Build/MBProgressHUD.xcframework
       - framework: Carthage/Build/Minizip.xcframework
       - framework: Carthage/Build/R2Navigator.xcframework
       - framework: Carthage/Build/R2Shared.xcframework
       - framework: Carthage/Build/R2Streamer.xcframework
       - framework: Carthage/Build/ReadiumOPDS.xcframework
-      - framework: Carthage/Build/SQLite.xcframework
       - framework: Carthage/Build/SwiftSoup.xcframework
+      - package: GRDB
+      - package: Kingfisher
+      - package: MBProgressHUD
     settings:
       LIBRARY_SEARCH_PATHS: $(PROJECT_DIR)/Carthage
diff --git a/Integrations/CocoaPods/Podfile b/Integrations/CocoaPods/Podfile
@@ -11,9 +11,9 @@ target 'R2TestApp' do
   pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/r2-lcp-swift/develop/ReadiumLCP.podspec'
 
   pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
+  pod 'GRDB.swift'
   pod 'Kingfisher'
   pod 'MBProgressHUD'
-  pod 'SQLite.swift'
   pod 'SwiftSoup'
 end
 

diff --git a/Integrations/CocoaPods/Podfile+lcp b/Integrations/CocoaPods/Podfile+lcp
@@ -12,9 +12,9 @@ target 'R2TestApp' do
   pod 'R2LCPClient', podspec: 'LCP_URL'
 
   pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
+  pod 'GRDB.swift'
   pod 'Kingfisher'
   pod 'MBProgressHUD'
-  pod 'SQLite.swift'
   pod 'SwiftSoup'
 end
 

diff --git a/Integrations/CocoaPods/project+lcp.yml b/Integrations/CocoaPods/project+lcp.yml
@@ -5,7 +5,7 @@ targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:

diff --git a/Integrations/CocoaPods/project.yml b/Integrations/CocoaPods/project.yml
@@ -5,7 +5,7 @@ targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:

diff --git a/Integrations/SPM/project+lcp.yml b/Integrations/SPM/project+lcp.yml
@@ -17,6 +17,9 @@ packages:
   ReadiumLCP:
     url: https://github.com/readium/r2-lcp-swift.git
     branch: develop
+  GRDB:
+    url: https://github.com/groue/GRDB.swift.git
+    from: 5.8.0
   Kingfisher:
     url: https://github.com/onevcat/Kingfisher.git
     from: 5.15.8
@@ -26,14 +29,11 @@ packages:
   SwiftSoup:
     url: https://github.com/scinfu/SwiftSoup.git
     from: 2.3.2
-  SQLite:
-    url: https://github.com/stephencelis/SQLite.swift.git
-    from: 0.12.2
 targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:
@@ -47,10 +47,10 @@ targets:
       - package: R2Navigator
       - package: ReadiumOPDS
       - package: ReadiumLCP
+      - package: GRDB
       - package: Kingfisher
       - package: MBProgressHUD
       - package: SwiftSoup
-      - package: SQLite
     settings:
       OTHER_SWIFT_FLAGS: -DLCP
 
diff --git a/Integrations/SPM/project.yml b/Integrations/SPM/project.yml
@@ -14,6 +14,9 @@ packages:
   ReadiumOPDS:
     url: https://github.com/readium/r2-opds-swift.git
     branch: develop
+  GRDB:
+    url: https://github.com/groue/GRDB.swift.git
+    from: 5.8.0
   Kingfisher:
     url: https://github.com/onevcat/Kingfisher.git
     from: 5.15.8
@@ -23,14 +26,11 @@ packages:
   SwiftSoup:
     url: https://github.com/scinfu/SwiftSoup.git
     from: 2.3.2
-  SQLite:
-    url: https://github.com/stephencelis/SQLite.swift.git
-    from: 0.12.2
 targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:
@@ -42,8 +42,7 @@ targets:
       - package: R2Streamer
       - package: R2Navigator
       - package: ReadiumOPDS
+      - package: GRDB
       - package: Kingfisher
       - package: MBProgressHUD
-      - package: SwiftSoup
-      - package: SQLite
 
diff --git a/Integrations/Submodules/project+lcp.yml b/Integrations/Submodules/project+lcp.yml
@@ -12,6 +12,9 @@ packages:
     path: Integrations/Submodules/r2-opds-swift
   ReadiumLCP:
     path: Integrations/Submodules/r2-lcp-swift
+  GRDB:
+    url: https://github.com/groue/GRDB.swift.git
+    from: 5.8.0
   Kingfisher:
     url: https://github.com/onevcat/Kingfisher.git
     from: 5.15.8
@@ -21,14 +24,11 @@ packages:
   SwiftSoup:
     url: https://github.com/scinfu/SwiftSoup.git
     from: 2.3.2
-  SQLite:
-    url: https://github.com/stephencelis/SQLite.swift.git
-    from: 0.12.2
 targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:
@@ -42,9 +42,9 @@ targets:
       - package: R2Navigator
       - package: ReadiumOPDS
       - package: ReadiumLCP
+      - package: GRDB
       - package: Kingfisher
       - package: MBProgressHUD
       - package: SwiftSoup
-      - package: SQLite
     settings:
       OTHER_SWIFT_FLAGS: -DLCP
diff --git a/Integrations/Submodules/project.yml b/Integrations/Submodules/project.yml
@@ -10,6 +10,9 @@ packages:
     path: Integrations/Submodules/r2-navigator-swift
   ReadiumOPDS:
     path: Integrations/Submodules/r2-opds-swift
+  GRDB:
+    url: https://github.com/groue/GRDB.swift.git
+    from: 5.8.0
   Kingfisher:
     url: https://github.com/onevcat/Kingfisher.git
     from: 5.15.8
@@ -19,14 +22,11 @@ packages:
   SwiftSoup:
     url: https://github.com/scinfu/SwiftSoup.git
     from: 2.3.2
-  SQLite:
-    url: https://github.com/stephencelis/SQLite.swift.git
-    from: 0.12.2
 targets:
   R2TestApp:
     type: application
     platform: iOS
-    deploymentTarget: "10.0"
+    deploymentTarget: "13.6"
     sources: 
       - path: Sources
         excludes:
@@ -38,7 +38,7 @@ targets:
       - package: R2Streamer
       - package: R2Navigator
       - package: ReadiumOPDS
+      - package: GRDB
       - package: Kingfisher
       - package: MBProgressHUD
       - package: SwiftSoup
-      - package: SQLite
diff --git a/Integrations/Submodules/r2-shared-swift b/Integrations/Submodules/r2-shared-swift
diff --git a/Sources/App/AppModule.swift b/Sources/App/AppModule.swift
@@ -10,6 +10,7 @@
 //  LICENSE file present in the project repository where this source code is maintained.
 //
 
+import Combine
 import Foundation
 import UIKit
 import R2Shared
@@ -40,14 +41,19 @@ final class AppModule {
             fatalError("Can't start publication server")
         }
 
-        library = LibraryModule(delegate: self, server: server)
-        reader = ReaderModule(delegate: self, resourcesServer: server)
+        let httpClient = DefaultHTTPClient()
+        let db = try Database(file: Paths.library.appendingPathComponent("database.db"))
+        let books = BookRepository(db: db)
+        let bookmarks = BookmarkRepository(db: db)
+
+        library = LibraryModule(delegate: self, books: books, server: server, httpClient: httpClient)
+        reader = ReaderModule(delegate: self, books: books, bookmarks: bookmarks, resourcesServer: server)
         opds = OPDSModule(delegate: self)
 
         // Set Readium 2's logging minimum level.
         R2EnableLog(withMinimumSeverityLevel: .debug)
 
-        try library.preloadSamples()
+        library.preloadSamples()
     }
 
     private(set) lazy var aboutViewController: UIViewController = {
@@ -70,6 +76,7 @@ extension AppModule: ModuleDelegate {
 
     func presentError(_ error: Error?, from viewController: UIViewController) {
         guard let error = error else { return }
+        if case LibraryError.cancelled = error { return }
         presentAlert(
             NSLocalizedString("error_title", comment: "Alert title for errors"),
             message: error.localizedDescription,
@@ -95,15 +102,12 @@ extension AppModule: ReaderModuleDelegate {
 
 extension AppModule: OPDSModuleDelegate {
 
-    func opdsDownloadPublication(_ publication: Publication?, at link: Link, sender: UIViewController, completion: @escaping (CancellableResult<Book, Error>) -> ()) {
+    func opdsDownloadPublication(_ publication: Publication?, at link: Link, sender: UIViewController) -> AnyPublisher<Book, LibraryError> {
         guard let url = link.url(relativeTo: publication?.baseURL) else {
-            completion(.cancelled)
-            return
+            return .fail(.cancelled)
         }
 
-        library.importPublication(from: url, title: publication?.metadata.title, sender: sender) {
-            completion($0.eraseToAnyError())
-        }
+        return library.importPublication(from: url, sender: sender)
     }
 
 }
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
@@ -10,6 +10,7 @@
 //  LICENSE file present in the project repository where this source code is maintained.
 //
 
+import Combine
 import UIKit
 
 @UIApplicationMain
@@ -18,6 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     private var app: AppModule!
+    private var subscriptions = Set<AnyCancellable>()
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         app = try! AppModule()
@@ -60,6 +62,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
         app.library.importPublication(from: url, sender: window!.rootViewController!)
+            .assertNoFailure()
+            .sink { _ in }
+            .store(in: &subscriptions)
         return true
     }
+4 −1		r2-shared-swift/Toolkit/Media Type/MediaTypeSniffer.swift
+10 −0		r2-shared-swiftTests/Fixtures/Format/html-doctype-case.unknown
+1 −0		r2-shared-swiftTests/Toolkit/Media Type/MediaTypeSnifferTests.swift