Skip to content

Use Paper's List of Supported Libraries #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
q231950 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use Paper's List of Supported Libraries #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e848b8
Refactor library configuration to use Paper's LibraryList
q231950 Jan 17, 2026
b92f6c0
Use enabledForSearch and enabledForLogin from Paper framework
q231950 Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ class EDSyncAppDelegate: NSObject, UIApplicationDelegate {
if let container = self?.appViewModel.dataStackProvider.persistentContainer {
let librariesController = LibraryManager(persistentContainer: container)

librariesController.loadOrUpdateLibraries(in: container.viewContext)
librariesController
.loadOrUpdateLibraries(
in: container.viewContext,
libraryProvider: LibraryList()
)
}
}

Expand Down Expand Up @@ -260,8 +264,13 @@ extension EDSyncAppDelegate: UNUserNotificationCenterDelegate {
try await dependency(RenewUseCase())
}

UtilitiesDependencies.accountValidatingUseCase = { (depenency: (AccountValidatingUseCase) async throws -> ValidationStatus) in
try await depenency(ValidateAccountUseCase())
UtilitiesDependencies.accountValidatingUseCase = { (dependency: (AccountValidatingUseCase) async throws -> ValidationStatus) in
try await dependency(ValidateAccountUseCase())
}

LibrariesDependencies.libraryModelProvider = { (
dependency: (LibraryModelProvider) async throws -> Void) in
try await dependency(LibraryList())
}
}

Expand Down
8 changes: 4 additions & 4 deletions BTLB.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
392252C111A27E9E00B29A01 /* Libraries.plist in Resources */ = {isa = PBXBuildFile; fileRef = 397E5B1B0F8F550F00500714 /* Libraries.plist */; };
392252C511A27EAC00B29A01 /* BTLBApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* BTLBApp.swift */; };
39F8D8C611ED28070009DE37 /* Credits.md in Resources */ = {isa = PBXBuildFile; fileRef = 39F8D8C511ED28070009DE37 /* Credits.md */; };
3B020A042D047AB100B8486C /* Recommend.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 3B020A032D047AB100B8486C /* Recommend.xcstrings */; };
Expand Down Expand Up @@ -86,6 +85,7 @@
3B58742D2143C70000EB3B27 /* AuthenticationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B58742C2143C70000EB3B27 /* AuthenticationManagerTests.swift */; };
3B60C9082B7424F200605B4C /* SmallBTLBWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B60C9072B7424F200605B4C /* SmallBTLBWidget.swift */; };
3B60C90A2B7425F300605B4C /* SmallEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B60C9092B7425F300605B4C /* SmallEntryView.swift */; };
3B628DD02F1BAD8E0038A1E3 /* 28to29.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3B628DCF2F1BAD8E0038A1E3 /* 28to29.xcmappingmodel */; };
3B64879E2D200D1200D92A34 /* Paper in Frameworks */ = {isa = PBXBuildFile; productRef = 3B0D30612BE25C87008C67E7 /* Paper */; };
3B64879F2D200D1200D92A34 /* Paper in Frameworks */ = {isa = PBXBuildFile; productRef = 3BDC0CC32CB0117E001E9828 /* Paper */; };
3B6487A12D200DC400D92A34 /* RenewUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B6487A02D200DC400D92A34 /* RenewUseCase.swift */; };
Expand Down Expand Up @@ -204,7 +204,6 @@
39446FDC11A29E0800B64170 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
3944700811A29FB400B64170 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
397A9B3811D69F5D0031C9D2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
397E5B1B0F8F550F00500714 /* Libraries.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Libraries.plist; path = Classes/Libraries.plist; sourceTree = "<group>"; };
39815E9D12D20307006CDCC8 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
3981E54511E149A000C7FBB8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
3998C0E412F2EDC400C68CC6 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -302,6 +301,7 @@
3B58742C2143C70000EB3B27 /* AuthenticationManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationManagerTests.swift; sourceTree = "<group>"; };
3B60C9072B7424F200605B4C /* SmallBTLBWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallBTLBWidget.swift; sourceTree = "<group>"; };
3B60C9092B7425F300605B4C /* SmallEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallEntryView.swift; sourceTree = "<group>"; };
3B628DCF2F1BAD8E0038A1E3 /* 28to29.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = 28to29.xcmappingmodel; sourceTree = "<group>"; };
3B6487A02D200DC400D92A34 /* RenewUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RenewUseCase.swift; sourceTree = "<group>"; };
3B6487A22D200DD600D92A34 /* ValidateAccountUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidateAccountUseCase.swift; sourceTree = "<group>"; };
3B7284B729257E01003E2544 /* Utilities */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Utilities; path = Packages/Utilities; sourceTree = "<group>"; };
Expand Down Expand Up @@ -626,6 +626,7 @@
3BEB14782C76652E0023E1F8 /* 25to26.xcmappingmodel */,
3B179FC12D6D0441007D9DD3 /* 26to27.xcmappingmodel */,
3BE5BFB92D8B6CFD00EE48BD /* 27to28.xcmappingmodel */,
3B628DCF2F1BAD8E0038A1E3 /* 28to29.xcmappingmodel */,
);
path = MappingModels;
sourceTree = "<group>";
Expand Down Expand Up @@ -683,7 +684,6 @@
3BA11B5E21EB51FC00F8D16F /* Entitlements */,
FDC3D3622145932C001678AD /* README.md */,
39F8D8C511ED28070009DE37 /* Credits.md */,
397E5B1B0F8F550F00500714 /* Libraries.plist */,
8D1107310486CEB800E47090 /* BTLB-Info.plist */,
);
name = "Supporting Files";
Expand Down Expand Up @@ -991,7 +991,6 @@
buildActionMask = 2147483647;
files = (
3B020A142D047AB200B8486C /* Applicationwide.xcstrings in Resources */,
392252C111A27E9E00B29A01 /* Libraries.plist in Resources */,
3B020A042D047AB100B8486C /* Recommend.xcstrings in Resources */,
3B2FB1531E22883200DC52A5 /* Assets.xcassets in Resources */,
3B020A062D047AB100B8486C /* AppIntents.xcstrings in Resources */,
Expand Down Expand Up @@ -1123,6 +1122,7 @@
3B257D0E29A66F8B00B1CC0B /* 15to16.xcmappingmodel in Sources */,
3B6487A12D200DC400D92A34 /* RenewUseCase.swift in Sources */,
3B257CF829A66F8B00B1CC0B /* 7to8.xcmappingmodel in Sources */,
3B628DD02F1BAD8E0038A1E3 /* 28to29.xcmappingmodel in Sources */,
3BE9A5BB21D25BE200D16D11 /* AccountPasswordMigratingPolicy.swift in Sources */,
3B257CF929A66F8B00B1CC0B /* 4to5.xcmappingmodel in Sources */,
3BF799BA2E18201B00F63075 /* BuildConfig.swift in Sources */,
Expand Down
8 changes: 2 additions & 6 deletions BTLBAppViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,7 @@ class AppViewModel: ObservableObject {
library: LibraryModel(
name: name,
subtitle: subtitle,
identifier: libraryManagedObject?.identifier ?? "unknown",
baseUrl: libraryManagedObject?.baseURL,
catalogUrl: libraryManagedObject?.catalogUrl
identifier: libraryManagedObject?.identifier ?? "unknown"
),
dependencies: searchDependencies
)
Expand Down Expand Up @@ -210,9 +208,7 @@ class AppViewModel: ObservableObject {
library: LibraryModel(
name: name,
subtitle: subtitle,
identifier: libraryManagedObject?.identifier ?? "unknown",
baseUrl: libraryManagedObject?.baseURL,
catalogUrl: libraryManagedObject?.catalogUrl
identifier: libraryManagedObject?.identifier ?? "unknown"
),
dependencies: searchDependencies
)
Expand Down
Loading