Merge pull request #1203 from TortugaPower/develop

Release v5.4.1
TortugaPower · Oct 10, 2024 · c4be829 · c4be829
2 parents 0688184 + cfcd138
commit c4be829
Show file tree

Hide file tree

Showing 35 changed files with 226 additions and 118 deletions.
diff --git a/BookPlayer.xcodeproj/project.pbxproj b/BookPlayer.xcodeproj/project.pbxproj
@@ -4154,7 +4154,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerIntents";
@@ -4188,7 +4188,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerIntents";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4220,7 +4220,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerIntents";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4256,7 +4256,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp";
@@ -4297,7 +4297,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4335,7 +4335,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4504,7 +4504,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerWidgetUI";
@@ -4542,7 +4542,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerWidgetUI";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4578,7 +4578,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerWidgetUI";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4731,7 +4731,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = BookPlayer;
 				PROVISIONING_PROFILE_SPECIFIER = "$(BP_PROVISIONING_MAIN)";
@@ -4769,7 +4769,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = BookPlayer;
 				PROVISIONING_PROFILE_SPECIFIER = "$(BP_PROVISIONING_MAIN)";
@@ -4991,7 +4991,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp.widgets";
@@ -5029,7 +5029,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp.widgets";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5065,7 +5065,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp.widgets";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5104,7 +5104,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerShareExtension";
@@ -5144,7 +5144,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5182,7 +5182,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5274,7 +5274,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.0;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = BookPlayer;
 				PROVISIONING_PROFILE_SPECIFIER = "$(BP_PROVISIONING_MAIN)";

diff --git a/BookPlayer/Base.lproj/Localizable.strings b/BookPlayer/Base.lproj/Localizable.strings
@@ -318,3 +318,4 @@ We're working hard on providing a seamless experience, if possible, please conta
 "intent_custom_skiprewind_title" = "Rewind with interval";
 "Rewind ${interval}" = "Rewind ${interval}";
 "settings_lock_orientation_title" = "Orientation Locked";
+"more_title" = "More";
diff --git a/BookPlayer/Coordinators/DataInitializerCoordinator.swift b/BookPlayer/Coordinators/DataInitializerCoordinator.swift
@@ -11,6 +11,7 @@ import Combine
 import CoreData
 import Foundation
 
+@MainActor
 class DataInitializerCoordinator: BPLogger {
   let databaseInitializer: DatabaseInitializer = DatabaseInitializer()
   let alertPresenter: AlertPresenter
@@ -28,10 +29,10 @@ class DataInitializerCoordinator: BPLogger {
   }
 
   func initializeLibrary(isRecoveryAttempt: Bool) async {
-    let appDelegate = await AppDelegate.shared!
+    let appDelegate = AppDelegate.shared!
     _ = await appDelegate.setupCoreServicesTask?.result
 
-    if let errorCoreServicesSetup = await appDelegate.errorCoreServicesSetup {
+    if let errorCoreServicesSetup = appDelegate.errorCoreServicesSetup {
       await handleError(errorCoreServicesSetup as NSError)
       return
     }
@@ -68,19 +69,35 @@ class DataInitializerCoordinator: BPLogger {
         }
       }
     } else {
-      fatalError("Unresolved error \(error), \(error.userInfo)")
+      await MainActor.run {
+        let errorDescription = """
+          \(error.localizedDescription)
+
+          Error Domain
+          \(error.domain)
+
+          Additional Info
+          \(error.userInfo)
+          """
+        alertPresenter.showAlert(
+          "error_title".localized,
+          message: errorDescription
+        ) {
+          fatalError("Unresolved error \(error.localizedDescription)")
+        }
+      }
     }
   }
 
   func recoverLibraryFromFailedMigration() {
     Task {
-      await AppDelegate.shared?.resetCoreServices()
+      AppDelegate.shared?.resetCoreServices()
       await initializeLibrary(isRecoveryAttempt: true)
     }
   }
 
   func finishLibrarySetup(fromRecovery: Bool) async {
-    let coreServices = await AppDelegate.shared!.coreServices!
+    let coreServices = AppDelegate.shared!.coreServices!
 
     setupDefaultState(
       libraryService: coreServices.libraryService,

diff --git a/BookPlayer/Coordinators/ItemListCoordinator.swift b/BookPlayer/Coordinators/ItemListCoordinator.swift
@@ -104,14 +104,14 @@ class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
   }
 
   func loadPlayer(_ relativePath: String) {
-    Task {
+    Task { @MainActor in
       let alertPresenter: AlertPresenter = self
       do {
         try await AppDelegate.shared?.coreServices?.playerLoaderService.loadPlayer(
           relativePath,
           autoplay: true
         )
-        await self.showPlayer()
+        self.showPlayer()
       } catch BPPlayerError.fileMissing {
         alertPresenter.showAlert(
           "file_missing_title".localized,

diff --git a/BookPlayer/Coordinators/LibraryListCoordinator.swift b/BookPlayer/Coordinators/LibraryListCoordinator.swift
@@ -232,7 +232,7 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
       let libraryItem = libraryService.getLibraryLastItem()
     else { return }
 
-    Task {
+    Task { @MainActor in
       let alertPresenter: AlertPresenter = self
       do {
         try await AppDelegate.shared?.coreServices?.playerLoaderService.loadPlayer(

diff --git a/BookPlayer/Coordinators/MainCoordinator.swift b/BookPlayer/Coordinators/MainCoordinator.swift
@@ -148,7 +148,7 @@ class MainCoordinator: NSObject {
   }
 
   func loadPlayer(_ relativePath: String, autoplay: Bool, showPlayer: Bool) {
-    Task {
+    Task { @MainActor in
       let alertPresenter: AlertPresenter = getLibraryCoordinator() ?? self
       do {
         try await AppDelegate.shared?.coreServices?.playerLoaderService.loadPlayer(

diff --git a/BookPlayer/Loading/LoadingViewModel.swift b/BookPlayer/Loading/LoadingViewModel.swift
@@ -14,12 +14,14 @@ class LoadingViewModel: ViewModelProtocol {
   weak var coordinator: LoadingCoordinator!
 
   func initializeDataIfNeeded() {
-    let dataInitializerCoordinator = DataInitializerCoordinator(alertPresenter: self.coordinator)
+    Task { @MainActor in
+      let dataInitializerCoordinator = DataInitializerCoordinator(alertPresenter: self.coordinator)
 
-    dataInitializerCoordinator.onFinish = {
-      self.coordinator.didFinishLoadingSequence()
-    }
+      dataInitializerCoordinator.onFinish = {
+        self.coordinator.didFinishLoadingSequence()
+      }
 
-    dataInitializerCoordinator.start()
+      dataInitializerCoordinator.start()
+    }
   }
 }