Migration of data import code to BSK for re-use on iOS (#3768)

Task/Issue URL: https://app.asana.com/0/0/1209117022539264/f Tech Design URL: CC: **Description**: Migration of data import code from macOS to BSK as needed for iOS 18.2 Safari data importing
duckduckgo · Jan 23, 2025 · 9b65a8c · 9b65a8c
1 parent 62495e6
commit 9b65a8c
Show file tree

Hide file tree

Showing 73 changed files with 434 additions and 2,150 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "4232acb81dc42311832cdaab042cbcafd530f9bc",
-        "version" : "229.0.0"
+        "revision" : "123efda94c60487ecd71e6f9870902cee3c89710",
+        "version" : "229.1.0"
       }
     },
     {

diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift b/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
@@ -21,6 +21,7 @@ import Cocoa
 import Combine
 import Common
 import os.log
+import BrowserServicesKit
 
 protocol BookmarkManager: AnyObject {
 

diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
@@ -18,6 +18,7 @@
 
 import Bookmarks
 import Foundation
+import BrowserServicesKit
 
 enum BookmarkStoreFetchPredicateType {
     case bookmarks
@@ -30,18 +31,6 @@ enum ParentFolderType: Equatable {
     case parent(uuid: String)
 }
 
-struct BookmarksImportSummary: Equatable {
-    var successful: Int
-    var duplicates: Int
-    var failed: Int
-
-    static func += (left: inout BookmarksImportSummary, right: BookmarksImportSummary) {
-        left.successful += right.successful
-        left.duplicates += right.duplicates
-        left.failed += right.failed
-    }
-}
-
 protocol BookmarkStore {
 
     func applyFavoritesDisplayMode(_ configuration: FavoritesDisplayMode)

diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
@@ -20,6 +20,7 @@
 
 import Bookmarks
 import Foundation
+import BrowserServicesKit
 
 final class BookmarkStoreMock: BookmarkStore, CustomDebugStringConvertible {
 

diff --git a/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
@@ -26,6 +26,7 @@ import Cocoa
 import Persistence
 import PixelKit
 import os.log
+import BrowserServicesKit
 
 protocol BookmarkEntityProtocol {
     var uuid: String? { get }

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import Navigation
+import BrowserServicesKit
 
 struct UserText {
 
@@ -1108,7 +1109,7 @@ struct UserText {
 
     static let passwordManagerAutoPinnedPopoverText = NSLocalizedString("autofill.popover.passwords.auto-pinned.text", value: "Shortcut Added!", comment: "Text confirming the password manager has been pinned to the toolbar")
 
-    static let passwordManagerPinnedPromptPopoverText = NSLocalizedString("autofill.popover.passwords.pin-prompt.text", 
+    static let passwordManagerPinnedPromptPopoverText = NSLocalizedString("autofill.popover.passwords.pin-prompt.text",
                                                                           value: "Add passwords shortcut?",
                                                                           comment: "Text prompting user to pin the password manager shortcut to the toolbar")
     static let passwordManagerPinnedPromptPopoverButtonText = NSLocalizedString("autofill.popover.passwords.pin-prompt.button.text",
@@ -1317,7 +1318,7 @@ struct UserText {
             }
         }
     }
-    
+
     // MARK: - Onboarding
     enum ContextualOnboarding {
         static let onboardingTryASearchTitle = NSLocalizedString("contextual.onboarding.try-a-search.title", value: "Try a search!", comment: "Title of a popover on the browser that invites the user to try a search")
@@ -1356,7 +1357,7 @@ struct UserText {
     }
 
     // MARK: - Privacy Pro
-    
+
     // Key: "subscription.menu.item"
     // Comment: "Title for Subscription item in the options menu"
     static let subscriptionOptionsMenuItem = "Privacy Pro"

diff --git a/DuckDuckGo/DataImport/Bookmarks/BookmarkImport.swift b/DuckDuckGo/DataImport/Bookmarks/BookmarkImport.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import BrowserServicesKit
 
 enum BookmarkImportSource: Equatable {
     case duckduckgoWebKit

diff --git a/DuckDuckGo/DataImport/Bookmarks/Chromium/ChromiumBookmarksReader.swift b/DuckDuckGo/DataImport/Bookmarks/Chromium/ChromiumBookmarksReader.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import BrowserServicesKit
 
 final class ChromiumBookmarksReader {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/Chromium/ChromiumFaviconsReader.swift b/DuckDuckGo/DataImport/Bookmarks/Chromium/ChromiumFaviconsReader.swift
@@ -19,6 +19,7 @@
 import AppKit
 import Foundation
 import GRDB
+import BrowserServicesKit
 
 final class ChromiumFaviconsReader {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/CoreDataBookmarkImporter.swift b/DuckDuckGo/DataImport/Bookmarks/CoreDataBookmarkImporter.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import BrowserServicesKit
 
 final class CoreDataBookmarkImporter: BookmarkImporter {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift b/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import GRDB
+import BrowserServicesKit
 
 final class FirefoxBookmarksReader {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxFaviconsReader.swift b/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxFaviconsReader.swift
@@ -19,6 +19,7 @@
 import AppKit
 import Foundation
 import GRDB
+import BrowserServicesKit
 
 final class FirefoxFaviconsReader {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/HTML/BookmarkHTMLImporter.swift b/DuckDuckGo/DataImport/Bookmarks/HTML/BookmarkHTMLImporter.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import BrowserServicesKit
 
 final class BookmarkHTMLImporter: DataImporter {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/HTML/BookmarkHTMLReader.swift b/DuckDuckGo/DataImport/Bookmarks/HTML/BookmarkHTMLReader.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import BrowserServicesKit
 
 struct HTMLImportedBookmarks {
     let source: BookmarkImportSource?

diff --git a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift
@@ -19,6 +19,7 @@
 import Common
 import Foundation
 import os.log
+import BrowserServicesKit
 
 final class SafariBookmarksReader {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift
@@ -18,6 +18,7 @@
 
 import AppKit
 import PixelKit
+import BrowserServicesKit
 
 final class SafariDataImporter: DataImporter {
 

diff --git a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariFaviconsReader.swift b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariFaviconsReader.swift
@@ -22,6 +22,7 @@ import Common
 import CryptoKit
 import GRDB
 import os.log
+import BrowserServicesKit
 
 final class SafariFaviconsReader {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ @@
     //
     import Foundation
+    import BrowserServicesKit
     final class ChromiumBookmarksReader {
@@ Expand Down @@