Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit 9b65a8c

Browse files
authored
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
1 parent 62495e6 commit 9b65a8c

File tree

73 files changed

+434
-2150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+434
-2150
lines changed

DuckDuckGo.xcodeproj/project.pbxproj

+7-71
Large diffs are not rendered by default.

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"kind" : "remoteSourceControl",
3333
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
3434
"state" : {
35-
"revision" : "4232acb81dc42311832cdaab042cbcafd530f9bc",
36-
"version" : "229.0.0"
35+
"revision" : "123efda94c60487ecd71e6f9870902cee3c89710",
36+
"version" : "229.1.0"
3737
}
3838
},
3939
{

DuckDuckGo/Bookmarks/Model/BookmarkManager.swift

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import Cocoa
2121
import Combine
2222
import Common
2323
import os.log
24+
import BrowserServicesKit
2425

2526
protocol BookmarkManager: AnyObject {
2627

DuckDuckGo/Bookmarks/Services/BookmarkStore.swift

+1-12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import Bookmarks
2020
import Foundation
21+
import BrowserServicesKit
2122

2223
enum BookmarkStoreFetchPredicateType {
2324
case bookmarks
@@ -30,18 +31,6 @@ enum ParentFolderType: Equatable {
3031
case parent(uuid: String)
3132
}
3233

33-
struct BookmarksImportSummary: Equatable {
34-
var successful: Int
35-
var duplicates: Int
36-
var failed: Int
37-
38-
static func += (left: inout BookmarksImportSummary, right: BookmarksImportSummary) {
39-
left.successful += right.successful
40-
left.duplicates += right.duplicates
41-
left.failed += right.failed
42-
}
43-
}
44-
4534
protocol BookmarkStore {
4635

4736
func applyFavoritesDisplayMode(_ configuration: FavoritesDisplayMode)

DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import Bookmarks
2222
import Foundation
23+
import BrowserServicesKit
2324

2425
final class BookmarkStoreMock: BookmarkStore, CustomDebugStringConvertible {
2526

DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import Cocoa
2626
import Persistence
2727
import PixelKit
2828
import os.log
29+
import BrowserServicesKit
2930

3031
protocol BookmarkEntityProtocol {
3132
var uuid: String? { get }

DuckDuckGo/Common/Localizables/UserText.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import Foundation
2020
import Navigation
21+
import BrowserServicesKit
2122

2223
struct UserText {
2324

@@ -1108,7 +1109,7 @@ struct UserText {
11081109

11091110
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")
11101111

1111-
static let passwordManagerPinnedPromptPopoverText = NSLocalizedString("autofill.popover.passwords.pin-prompt.text",
1112+
static let passwordManagerPinnedPromptPopoverText = NSLocalizedString("autofill.popover.passwords.pin-prompt.text",
11121113
value: "Add passwords shortcut?",
11131114
comment: "Text prompting user to pin the password manager shortcut to the toolbar")
11141115
static let passwordManagerPinnedPromptPopoverButtonText = NSLocalizedString("autofill.popover.passwords.pin-prompt.button.text",
@@ -1317,7 +1318,7 @@ struct UserText {
13171318
}
13181319
}
13191320
}
1320-
1321+
13211322
// MARK: - Onboarding
13221323
enum ContextualOnboarding {
13231324
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 {
13561357
}
13571358

13581359
// MARK: - Privacy Pro
1359-
1360+
13601361
// Key: "subscription.menu.item"
13611362
// Comment: "Title for Subscription item in the options menu"
13621363
static let subscriptionOptionsMenuItem = "Privacy Pro"

DuckDuckGo/DataImport/Bookmarks/BookmarkImport.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import BrowserServicesKit
2021

2122
enum BookmarkImportSource: Equatable {
2223
case duckduckgoWebKit

DuckDuckGo/DataImport/Bookmarks/Chromium/ChromiumBookmarksReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import BrowserServicesKit
2021

2122
final class ChromiumBookmarksReader {
2223

DuckDuckGo/DataImport/Bookmarks/Chromium/ChromiumFaviconsReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import AppKit
2020
import Foundation
2121
import GRDB
22+
import BrowserServicesKit
2223

2324
final class ChromiumFaviconsReader {
2425

DuckDuckGo/DataImport/Bookmarks/CoreDataBookmarkImporter.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import BrowserServicesKit
2021

2122
final class CoreDataBookmarkImporter: BookmarkImporter {
2223

DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import Foundation
2020
import GRDB
21+
import BrowserServicesKit
2122

2223
final class FirefoxBookmarksReader {
2324

DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxFaviconsReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import AppKit
2020
import Foundation
2121
import GRDB
22+
import BrowserServicesKit
2223

2324
final class FirefoxFaviconsReader {
2425

DuckDuckGo/DataImport/Bookmarks/HTML/BookmarkHTMLImporter.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import BrowserServicesKit
2021

2122
final class BookmarkHTMLImporter: DataImporter {
2223

DuckDuckGo/DataImport/Bookmarks/HTML/BookmarkHTMLReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import BrowserServicesKit
2021

2122
struct HTMLImportedBookmarks {
2223
let source: BookmarkImportSource?

DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import Common
2020
import Foundation
2121
import os.log
22+
import BrowserServicesKit
2223

2324
final class SafariBookmarksReader {
2425

DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import AppKit
2020
import PixelKit
21+
import BrowserServicesKit
2122

2223
final class SafariDataImporter: DataImporter {
2324

DuckDuckGo/DataImport/Bookmarks/Safari/SafariFaviconsReader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import Common
2222
import CryptoKit
2323
import GRDB
2424
import os.log
25+
import BrowserServicesKit
2526

2627
final class SafariFaviconsReader {
2728

0 commit comments

Comments
 (0)