From 1185087398a6dce434e569c82be7f3305518e40e Mon Sep 17 00:00:00 2001
From: Gianni Carlo <gcarlo89@hotmail.com>
Date: Sun, 4 Jan 2026 09:02:58 -0500
Subject: [PATCH 1/4] refactor extracting audio metadata into standalone
 service

---
 BookPlayer.xcodeproj/project.pbxproj          |  12 +-
 BookPlayer/AppDelegate.swift                  |  11 +-
 .../DataInitializerCoordinator.swift          |   2 +-
 .../Hardcover/Network/HardcoverService.swift  |   4 +-
 .../Library/ItemList/LibraryRootView.swift    |   2 +-
 .../Library/ItemList/Views/BookView.swift     |   3 +-
 .../Profile/ProfileListenedSectionView.swift  |   3 +-
 .../Profile/ProfileSyncTasksSectionView.swift |   3 +-
 .../Settings/Storage/StorageViewModel.swift   |  24 +-
 BookPlayerTests/DataManagerTests.swift        |   3 +-
 BookPlayerTests/ImportOperationTests.swift    |   3 +-
 .../PlaybackPerformanceTests.swift            |   7 +-
 .../Services/LibraryServiceTests.swift        |  37 +-
 BookPlayerTests/Support/StubFactory.swift     |   3 +-
 BookPlayerWatch/ExtensionDelegate.swift       |   3 +-
 .../AVAudioAssetImageDataProvider.swift       |  39 +-
 .../Backed-Models/Book+CoreDataClass.swift    | 137 +------
 Shared/CoreData/DatabaseInitializer.swift     |   3 +-
 Shared/Services/AudioMetadataService.swift    | 110 -----
 Shared/Services/BookMetadataService.swift     | 387 ++++++++++++++++++
 Shared/Services/LibraryService.swift          | 122 ++++--
 21 files changed, 582 insertions(+), 336 deletions(-)
 delete mode 100644 Shared/Services/AudioMetadataService.swift
 create mode 100644 Shared/Services/BookMetadataService.swift

diff --git a/BookPlayer.xcodeproj/project.pbxproj b/BookPlayer.xcodeproj/project.pbxproj
index fe6356a66..c048b4a5e 100644
--- a/BookPlayer.xcodeproj/project.pbxproj
+++ b/BookPlayer.xcodeproj/project.pbxproj
@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3F66408A2E162ABF00356522 /* AudioMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* AudioMetadataService.swift */; };
-		3F66408B2E162ABF00356522 /* AudioMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* AudioMetadataService.swift */; };
+		3F66408A2E162ABF00356522 /* BookMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* BookMetadataService.swift */; };
+		3F66408B2E162ABF00356522 /* BookMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* BookMetadataService.swift */; };
 		3F66408D2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */; };
 		3F66408E2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */; };
 		3F66408F2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */; };
@@ -955,7 +955,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3F6640892E162ABF00356522 /* AudioMetadataService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioMetadataService.swift; sourceTree = "<group>"; };
+		3F6640892E162ABF00356522 /* BookMetadataService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookMetadataService.swift; sourceTree = "<group>"; };
 		3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = MappingModel_v9_to_v10.xcmappingmodel; sourceTree = "<group>"; };
 		3F6640932E17386400356522 /* DeleteUserBookData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteUserBookData.swift; sourceTree = "<group>"; };
 		3F7B64352E0F71E900299D97 /* HardcoverSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HardcoverSettingsView.swift; sourceTree = "<group>"; };
@@ -2448,7 +2448,7 @@
 		62AAE22F274AA6E9001EB9FF /* Services */ = {
 			isa = PBXGroup;
 			children = (
-				3F6640892E162ABF00356522 /* AudioMetadataService.swift */,
+				3F6640892E162ABF00356522 /* BookMetadataService.swift */,
 				9F49072B2903663800054AD6 /* SortType.swift */,
 				9FC1E4742815C6A300522FA8 /* KeychainService.swift */,
 				62AAE22B274AA3EB001EB9FF /* LibraryService.swift */,
@@ -4027,7 +4027,7 @@
 				4140EA71227289A20009F794 /* UIColor+BookPlayer.swift in Sources */,
 				9F0872DC2A19867C00B7FD4A /* ArtworkResponse.swift in Sources */,
 				9FF383D42A40F97000BBAC11 /* MappingModel_v8_to_v9.xcmappingmodel in Sources */,
-				3F66408B2E162ABF00356522 /* AudioMetadataService.swift in Sources */,
+				3F66408B2E162ABF00356522 /* BookMetadataService.swift in Sources */,
 				4138CE1726E584B60014F11E /* BookmarkType.swift in Sources */,
 				9F9C7B5429F9672700E257B0 /* SyncableBookmark.swift in Sources */,
 				5126F123258E9F18009965DC /* URL+BookPlayer.swift in Sources */,
@@ -4630,7 +4630,7 @@
 				41A1B12A226F88C500EA0400 /* Folder+CoreDataProperties.swift in Sources */,
 				638E64CE2B8E1CFD00DCFA3B /* SyncTasksCountService.swift in Sources */,
 				63C6C30D2B538D8500FFE0D8 /* SyncTasksStorage.swift in Sources */,
-				3F66408A2E162ABF00356522 /* AudioMetadataService.swift in Sources */,
+				3F66408A2E162ABF00356522 /* BookMetadataService.swift in Sources */,
 				41EB07152752F17B00EFEE13 /* PlayableItem.swift in Sources */,
 				41A1B11E226F88C500EA0400 /* Theme+CoreDataProperties.swift in Sources */,
 				9F1345B62938DF070089B1DE /* Fonts.swift in Sources */,
diff --git a/BookPlayer/AppDelegate.swift b/BookPlayer/AppDelegate.swift
index cb1ccb859..362cdbffe 100644
--- a/BookPlayer/AppDelegate.swift
+++ b/BookPlayer/AppDelegate.swift
@@ -523,7 +523,8 @@ extension AppDelegate {
     } else {
       let dataManager = DataManager(coreDataStack: stack)
       let accountService = makeAccountService(dataManager: dataManager)
-      let libraryService = makeLibraryService(dataManager: dataManager)
+      let bookMetadataService = makeBookMetadataService()
+      let libraryService = makeLibraryService(dataManager: dataManager, bookMetadataService: bookMetadataService)
       let syncService = makeSyncService(accountService: accountService, libraryService: libraryService)
       let playbackService = makePlaybackService(libraryService: libraryService)
       let playerManager = PlayerManager(
@@ -571,9 +572,13 @@ extension AppDelegate {
     return service
   }
 
-  private func makeLibraryService(dataManager: DataManager) -> LibraryService {
+  private func makeBookMetadataService() -> BookMetadataService {
+    return BookMetadataService()
+  }
+
+  private func makeLibraryService(dataManager: DataManager, bookMetadataService: BookMetadataServiceProtocol) -> LibraryService {
     let service = LibraryService()
-    service.setup(dataManager: dataManager)
+    service.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     return service
   }
 
diff --git a/BookPlayer/Coordinators/DataInitializerCoordinator.swift b/BookPlayer/Coordinators/DataInitializerCoordinator.swift
index 9d9f1055b..09711e969 100644
--- a/BookPlayer/Coordinators/DataInitializerCoordinator.swift
+++ b/BookPlayer/Coordinators/DataInitializerCoordinator.swift
@@ -179,7 +179,7 @@ class DataInitializerCoordinator: BPLogger {
 
     if shouldRebuildFromFiles {
       let files = getLibraryFiles()
-      coreServices.libraryService.insertItems(from: files)
+      await coreServices.libraryService.insertItems(from: files)
     }
 
     await MainActor.run {
diff --git a/BookPlayer/Hardcover/Network/HardcoverService.swift b/BookPlayer/Hardcover/Network/HardcoverService.swift
index 9757f6531..deb9c3181 100644
--- a/BookPlayer/Hardcover/Network/HardcoverService.swift
+++ b/BookPlayer/Hardcover/Network/HardcoverService.swift
@@ -48,7 +48,7 @@ protocol HardcoverServiceProtocol {
 final class HardcoverService: BPLogger, HardcoverServiceProtocol {
   private var keychain: KeychainServiceProtocol!
   private let graphQL = GraphQLClient(baseURL: "https://api.hardcover.app/v1/graphql")
-  private var audioMetadataService: AudioMetadataServiceProtocol!
+  private var audioMetadataService: BookMetadataServiceProtocol!
   private var libraryService: LibraryServiceProtocol!
 
   private var metadataSubscription: AnyCancellable?
@@ -72,7 +72,7 @@ final class HardcoverService: BPLogger, HardcoverServiceProtocol {
   func setup(
     libraryService: LibraryServiceProtocol,
     keychain: KeychainServiceProtocol = KeychainService(),
-    audioMetadataService: AudioMetadataServiceProtocol = AudioMetadataService()
+    audioMetadataService: BookMetadataServiceProtocol = BookMetadataService()
   ) {
     self.libraryService = libraryService
     self.keychain = keychain
diff --git a/BookPlayer/Library/ItemList/LibraryRootView.swift b/BookPlayer/Library/ItemList/LibraryRootView.swift
index 97f92d189..a3b4720f8 100644
--- a/BookPlayer/Library/ItemList/LibraryRootView.swift
+++ b/BookPlayer/Library/ItemList/LibraryRootView.swift
@@ -181,7 +181,7 @@ struct LibraryRootView: View {
     guard !files.isEmpty else { return }
 
     Task { @MainActor in
-      let processedItems = libraryService.insertItems(from: files)
+      let processedItems = await libraryService.insertItems(from: files)
       var itemIdentifiers = processedItems.map({ $0.relativePath })
       do {
         await syncService.scheduleUpload(items: processedItems)
diff --git a/BookPlayer/Library/ItemList/Views/BookView.swift b/BookPlayer/Library/ItemList/Views/BookView.swift
index 949b81a11..f7d7e7dbf 100644
--- a/BookPlayer/Library/ItemList/Views/BookView.swift
+++ b/BookPlayer/Library/ItemList/Views/BookView.swift
@@ -70,8 +70,9 @@ struct BookView: View {
   @Previewable var syncService: SyncService = {
     let syncService = SyncService()
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: ""))
+    let bookMetadataService = BookMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager)
+    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     syncService.setup(
       isActive: true,
       libraryService: libraryService
diff --git a/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift b/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift
index 7cdcfb766..143dc2f91 100644
--- a/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift
+++ b/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift
@@ -68,7 +68,8 @@ struct ProfileListenedSectionView: View {
   @Previewable var libraryService: LibraryService = {
     let libraryService = LibraryService()
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: ""))
-    libraryService.setup(dataManager: dataManager)
+    let bookMetadataService = BookMetadataService()
+    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
 
     return libraryService
   }()
diff --git a/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift b/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift
index cf33b57a3..ed98edabc 100644
--- a/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift
+++ b/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift
@@ -91,8 +91,9 @@ struct ProfileSyncTasksSectionView: View {
 #Preview {
   @Previewable var syncService: SyncService = {
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: ""))
+    let bookMetadataService = BookMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager)
+    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     let syncService = SyncService()
     syncService.setup(isActive: true, libraryService: libraryService)
 
diff --git a/BookPlayer/Settings/Storage/StorageViewModel.swift b/BookPlayer/Settings/Storage/StorageViewModel.swift
index bbad01b11..bd08c66ea 100644
--- a/BookPlayer/Settings/Storage/StorageViewModel.swift
+++ b/BookPlayer/Settings/Storage/StorageViewModel.swift
@@ -166,10 +166,10 @@ final class StorageViewModel: StorageViewModelProtocol {
     publishedFiles.filter({ $0.showWarning })
   }
 
-  func handleFix(for item: StorageItem, shouldReloadItems: Bool = true) throws {
+  func handleFix(for item: StorageItem, shouldReloadItems: Bool = true) async throws {
     guard let fetchedBook = self.libraryService.findBooks(containing: item.fileURL)?.first else {
       // create a new book
-      try self.createBook(from: item)
+      try await self.createBook(from: item)
       if shouldReloadItems {
         self.loadItems()
       }
@@ -224,11 +224,15 @@ final class StorageViewModel: StorageViewModelProtocol {
   }
 
   func fixSelectedItem(_ item: StorageItem) {
-    do {
-      try handleFix(for: item)
-    } catch {
-      storageAlert = .error(errorMessage: error.localizedDescription)
-      showAlert = true
+    Task {
+      do {
+        try await handleFix(for: item)
+      } catch {
+        await MainActor.run {
+          storageAlert = .error(errorMessage: error.localizedDescription)
+          showAlert = true
+        }
+      }
     }
   }
 
@@ -361,8 +365,8 @@ final class StorageViewModel: StorageViewModelProtocol {
     listState.reloadAll()
   }
 
-  private func createBook(from item: StorageItem) throws {
-    let book = self.libraryService.createBook(from: item.fileURL)
+  private func createBook(from item: StorageItem) async throws {
+    let book = await self.libraryService.createBook(from: item.fileURL)
     try moveBookFile(from: item, with: book)
     try libraryService.moveItems([book.relativePath], inside: nil)
     reloadLibraryItems()
@@ -450,7 +454,7 @@ final class StorageViewModel: StorageViewModelProtocol {
   private func fixItemSafely(_ item: StorageItem) async -> FixResult {
     do {
       try await Task.detached(priority: .userInitiated) {
-        try self.handleFix(for: item, shouldReloadItems: false)
+        try await self.handleFix(for: item, shouldReloadItems: false)
       }.value
       
       return FixResult(item: item, success: true, error: nil)
diff --git a/BookPlayerTests/DataManagerTests.swift b/BookPlayerTests/DataManagerTests.swift
index c5861498b..a893324fa 100644
--- a/BookPlayerTests/DataManagerTests.swift
+++ b/BookPlayerTests/DataManagerTests.swift
@@ -46,8 +46,9 @@ class ProcessFilesTests: DataManagerTests {
 
     let expectation = XCTestExpectation(description: "File import notification")
 
+    let bookMetadataService = BookMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: self.dataManager)
+    libraryService.setup(dataManager: self.dataManager, bookMetadataService: bookMetadataService)
     self.importManager = ImportManager(libraryService: libraryService)
 
     self.subscription = self.importManager.observeFiles().sink { files in
diff --git a/BookPlayerTests/ImportOperationTests.swift b/BookPlayerTests/ImportOperationTests.swift
index 72fbc3d3c..31d4b55ab 100644
--- a/BookPlayerTests/ImportOperationTests.swift
+++ b/BookPlayerTests/ImportOperationTests.swift
@@ -31,8 +31,9 @@ class ImportOperationTests: XCTestCase {
     let promise = XCTestExpectation(description: "Process file")
     let promiseFile = expectation(forNotification: .processingFile, object: nil)
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: "/dev/null"))
+    let bookMetadataService = BookMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager)
+    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     let operation = ImportOperation(files: [fileUrl],
                                     libraryService: libraryService)
 
diff --git a/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift b/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift
index fbaaad775..330338904 100644
--- a/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift
+++ b/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift
@@ -17,8 +17,9 @@ final class PlaybackPerformanceTests: XCTestCase {
   override func setUpWithError() throws {
     DataTestUtils.clearFolderContents(url: DataManager.getProcessedFolderURL())
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: "/dev/null"))
+    let bookMetadataService = BookMetadataService()
     self.sut = LibraryService()
-    self.sut.setup(dataManager: dataManager)
+    self.sut.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     _ = self.sut.getLibrary()
   }
 
@@ -26,11 +27,11 @@ final class PlaybackPerformanceTests: XCTestCase {
     self.sut = nil
   }
 
-  func testFolderProgressUpdatePerformance() throws {
+  func testFolderProgressUpdatePerformance() async throws {
     /// Setup a test folder with 3000 ibooks inside it
     let folder = try self.sut.createFolder(with: "test-folder", inside: nil)
     let urls = Array(stride(from: 0, to: 3000, by: 1)).map({ URL(string: "test-book-\($0).mp3")! })
-    _ = self.sut.insertItems(from: urls, parentPath: folder.relativePath)
+    _ = await self.sut.insertItems(from: urls, parentPath: folder.relativePath)
 
     self.measure(metrics: [XCTCPUMetric()]) {
       /// This is called by the `PlayerManager` when the currently playing book changes its progress percentage
diff --git a/BookPlayerTests/Services/LibraryServiceTests.swift b/BookPlayerTests/Services/LibraryServiceTests.swift
index e24ab8cbd..b6c662671 100644
--- a/BookPlayerTests/Services/LibraryServiceTests.swift
+++ b/BookPlayerTests/Services/LibraryServiceTests.swift
@@ -20,8 +20,9 @@ class LibraryServiceTests: XCTestCase {
   override func setUp() {
     DataTestUtils.clearFolderContents(url: DataManager.getProcessedFolderURL())
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: "/dev/null"))
+    let bookMetadataService = BookMetadataService()
     self.sut = LibraryService()
-    self.sut.setup(dataManager: dataManager)
+    self.sut.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     _ = self.sut.getLibrary()
   }
 
@@ -71,14 +72,14 @@ class LibraryServiceTests: XCTestCase {
     XCTAssert(currentTheme?.title == "Default / Dark")
   }
 
-  func testCreateBook() {
+  func testCreateBook() async {
     let filename = "test-book.txt"
     let bookContents = "bookcontents".data(using: .utf8)!
     let processedFolder = DataManager.getProcessedFolderURL()
 
     // Add test file to Processed folder
     let fileUrl = DataTestUtils.generateTestFile(name: filename, contents: bookContents, destinationFolder: processedFolder)
-    let newBook = self.sut.createBook(from: fileUrl)
+    let newBook = await self.sut.createBook(from: fileUrl)
     XCTAssert(newBook.title == "test-book.txt")
     XCTAssert(newBook.relativePath == "test-book.txt")
   }
@@ -657,7 +658,7 @@ class InsertBooksTests: LibraryServiceTests {
     XCTAssert(library.items?.count == 0)
   }
 
-  func testInsertOneBookInLibrary() throws {
+  func testInsertOneBookInLibrary() async throws {
     let library = self.sut.getLibrary()
 
     let filename = "file.txt"
@@ -667,13 +668,13 @@ class InsertBooksTests: LibraryServiceTests {
     // Add test file to Processed folder
     let fileUrl = DataTestUtils.generateTestFile(name: filename, contents: bookContents, destinationFolder: processedFolder)
 
-    let processedItems = self.sut.insertItems(from: [fileUrl])
+    let processedItems = await self.sut.insertItems(from: [fileUrl])
 
     XCTAssert(library.items?.count == 1)
     XCTAssert(processedItems.count == 1)
   }
 
-  func testInsertMultipleBooksInLibrary() throws {
+  func testInsertMultipleBooksInLibrary() async throws {
     let library = self.sut.getLibrary()
 
     let filename1 = "file1.txt"
@@ -686,13 +687,13 @@ class InsertBooksTests: LibraryServiceTests {
     let file1Url = DataTestUtils.generateTestFile(name: filename1, contents: book1Contents, destinationFolder: processedFolder)
     let file2Url = DataTestUtils.generateTestFile(name: filename2, contents: book2Contents, destinationFolder: processedFolder)
 
-    let processedItems = self.sut.insertItems(from: [file1Url, file2Url])
+    let processedItems = await self.sut.insertItems(from: [file1Url, file2Url])
 
     XCTAssert(library.items?.count == 2)
     XCTAssert(processedItems.count == 2)
   }
 
-  func testInsertEmptyBooksIntoPlaylist() throws {
+  func testInsertEmptyBooksIntoPlaylist() async throws {
     let library = self.sut.getLibrary()
 
     _ = try self.sut.createFolder(with: "test-folder", inside: nil)
@@ -703,7 +704,7 @@ class InsertBooksTests: LibraryServiceTests {
     XCTAssert(folder.items?.count == 0)
   }
 
-  func testInsertOneBookIntoPlaylist() throws {
+  func testInsertOneBookIntoPlaylist() async throws {
     let library = self.sut.getLibrary()
 
     _ = try self.sut.createFolder(with: "test-folder", inside: nil)
@@ -718,7 +719,7 @@ class InsertBooksTests: LibraryServiceTests {
     // Add test file to Documents folder
     let fileUrl = DataTestUtils.generateTestFile(name: filename, contents: bookContents, destinationFolder: processedFolder)
 
-    let processedItems = sut.insertItems(from: [fileUrl])
+    let processedItems = await sut.insertItems(from: [fileUrl])
       .map({ $0.relativePath })
     try sut.moveItems(processedItems, inside: folder.relativePath)
     XCTAssert(library.items?.count == 1)
@@ -726,7 +727,7 @@ class InsertBooksTests: LibraryServiceTests {
     XCTAssert(processedItems.count == 1)
   }
 
-  func testInsertMultipleBooksIntoPlaylist() throws {
+  func testInsertMultipleBooksIntoPlaylist() async throws {
     let library = self.sut.getLibrary()
 
     _ = try self.sut.createFolder(with: "test-folder", inside: nil)
@@ -744,7 +745,7 @@ class InsertBooksTests: LibraryServiceTests {
     let file1Url = DataTestUtils.generateTestFile(name: filename1, contents: book1Contents, destinationFolder: processedFolder)
     let file2Url = DataTestUtils.generateTestFile(name: filename2, contents: book2Contents, destinationFolder: processedFolder)
 
-    let processedItems = sut.insertItems(from: [file1Url, file2Url])
+    let processedItems = await sut.insertItems(from: [file1Url, file2Url])
       .map({ $0.relativePath })
     try sut.moveItems(processedItems, inside: folder.relativePath)
 
@@ -753,7 +754,7 @@ class InsertBooksTests: LibraryServiceTests {
     XCTAssert(processedItems.count == 2)
   }
 
-  func testInsertExistingBookFromLibraryIntoPlaylist() throws {
+  func testInsertExistingBookFromLibraryIntoPlaylist() async throws {
     let library = self.sut.getLibrary()
 
     _ = try self.sut.createFolder(with: "test-folder", inside: nil)
@@ -768,7 +769,7 @@ class InsertBooksTests: LibraryServiceTests {
     // Add test file to Documents folder
     let fileUrl = DataTestUtils.generateTestFile(name: filename, contents: bookContents, destinationFolder: processedFolder)
 
-    let processedItems = self.sut.insertItems(from: [fileUrl])
+    let processedItems = await self.sut.insertItems(from: [fileUrl])
       .map({ $0.relativePath })
 
     XCTAssert(library.items?.count == 2)
@@ -780,7 +781,7 @@ class InsertBooksTests: LibraryServiceTests {
     XCTAssert(folder.items?.count == 1)
   }
 
-  func testInsertExistingBookFromPlaylistIntoLibrary() throws {
+  func testInsertExistingBookFromPlaylistIntoLibrary() async throws {
     let library = self.sut.getLibrary()
 
     _ = try self.sut.createFolder(with: "test-folder", inside: nil)
@@ -795,7 +796,7 @@ class InsertBooksTests: LibraryServiceTests {
     // Add test file to Documents folder
     let fileUrl = DataTestUtils.generateTestFile(name: filename, contents: bookContents, destinationFolder: processedFolder)
 
-    let processedItems = self.sut.insertItems(from: [fileUrl])
+    let processedItems = await self.sut.insertItems(from: [fileUrl])
       .map({ $0.relativePath })
 
     try self.sut.moveItems(processedItems, inside: folder.relativePath)
@@ -810,7 +811,7 @@ class InsertBooksTests: LibraryServiceTests {
     XCTAssert(folder.items?.count == 0)
   }
 
-  func testInsertExistingBookFromPlaylistIntoPlaylist() throws {
+  func testInsertExistingBookFromPlaylistIntoPlaylist() async throws {
     let library = self.sut.getLibrary()
 
     _ = try self.sut.createFolder(with: "test-folder1", inside: nil)
@@ -827,7 +828,7 @@ class InsertBooksTests: LibraryServiceTests {
     // Add test file to Processed folder
     let fileUrl = DataTestUtils.generateTestFile(name: filename, contents: bookContents, destinationFolder: processedFolder)
 
-    let processedItems = self.sut.insertItems(from: [fileUrl])
+    let processedItems = await self.sut.insertItems(from: [fileUrl])
       .map({ $0.relativePath })
 
     try self.sut.moveItems(processedItems, inside: folder1.relativePath)
diff --git a/BookPlayerTests/Support/StubFactory.swift b/BookPlayerTests/Support/StubFactory.swift
index b9502febf..c41bcd641 100644
--- a/BookPlayerTests/Support/StubFactory.swift
+++ b/BookPlayerTests/Support/StubFactory.swift
@@ -59,8 +59,9 @@ class StubFactory {
   }
 
   public class func library(dataManager: DataManager) -> Library {
+    let bookMetadataService = BookMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager)
+    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
     return libraryService.getLibrary()
   }
 }
diff --git a/BookPlayerWatch/ExtensionDelegate.swift b/BookPlayerWatch/ExtensionDelegate.swift
index 7536cffe4..34f3b6b5a 100644
--- a/BookPlayerWatch/ExtensionDelegate.swift
+++ b/BookPlayerWatch/ExtensionDelegate.swift
@@ -67,8 +67,9 @@ class ExtensionDelegate: NSObject, WKApplicationDelegate, ObservableObject {
       let dataManager = DataManager(coreDataStack: stack)
       let accountService = AccountService()
       accountService.setup(dataManager: dataManager)
+      let bookMetadataService = BookMetadataService()
       let libraryService = LibraryService()
-      libraryService.setup(dataManager: dataManager)
+      libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
       let syncService = SyncService()
       syncService.setup(
         isActive: accountService.hasSyncEnabled(),
diff --git a/Shared/Artwork/AVAudioAssetImageDataProvider.swift b/Shared/Artwork/AVAudioAssetImageDataProvider.swift
index 59fbf55f2..709d319f4 100644
--- a/Shared/Artwork/AVAudioAssetImageDataProvider.swift
+++ b/Shared/Artwork/AVAudioAssetImageDataProvider.swift
@@ -66,21 +66,23 @@ public struct AVAudioAssetImageDataProvider: ImageDataProvider {
   }
 
   private func extractDataFrom(url: URL) async throws -> Data {
-    let asset = AVAsset(url: url)
+    let asset = AVURLAsset(url: url)
 
-    await asset.loadValues(forKeys: ["metadata"])
+    do {
+      let metadata = try await asset.load(.metadata)
 
-    switch asset.statusOfValue(forKey: "metadata", error: nil) {
-    case .loaded:
       var imageData: Data?
 
       if url.pathExtension == "mp3" {
-        imageData = self.getDataFromMP3(asset: asset)
-      } else if let data = AVMetadataItem.metadataItems(
-        from: asset.commonMetadata,
-        filteredByIdentifier: .commonIdentifierArtwork
-      ).first?.dataValue {
-        imageData = data
+        imageData = await self.getDataFromMP3(metadata: metadata)
+      } else {
+        let commonMetadata = try await asset.load(.commonMetadata)
+        if let artworkItem = AVMetadataItem.metadataItems(
+          from: commonMetadata,
+          filteredByIdentifier: .commonIdentifierArtwork
+        ).first {
+          imageData = try? await artworkItem.load(.dataValue)
+        }
       }
 
       if let imageData {
@@ -88,18 +90,23 @@ public struct AVAudioAssetImageDataProvider: ImageDataProvider {
       }
 
       throw ProviderError.missingImage
-    default:
+    } catch is CancellationError {
+      throw ProviderError.metadataFailed
+    } catch let error as ProviderError {
+      throw error
+    } catch {
       throw ProviderError.metadataFailed
     }
   }
 
-  private func getDataFromMP3(asset: AVAsset) -> Data? {
-    for item in asset.metadata {
+  private func getDataFromMP3(metadata: [AVMetadataItem]) async -> Data? {
+    for item in metadata {
       guard let key = item.commonKey?.rawValue,
-            key == "artwork",
-            let value = item.value as? Data else { continue }
+            key == "artwork" else { continue }
 
-      return value
+      if let value = try? await item.load(.dataValue) {
+        return value
+      }
     }
 
     return nil
diff --git a/Shared/CoreData/Backed-Models/Book+CoreDataClass.swift b/Shared/CoreData/Backed-Models/Book+CoreDataClass.swift
index abfce8a84..842f7df76 100644
--- a/Shared/CoreData/Backed-Models/Book+CoreDataClass.swift
+++ b/Shared/CoreData/Backed-Models/Book+CoreDataClass.swift
@@ -56,140 +56,19 @@ extension CodingUserInfoKey {
 }
 
 extension Book {
-  public func loadChaptersIfNeeded(from asset: AVAsset, context: NSManagedObjectContext) -> Bool {
-    guard chapters?.count == 0 else { return false }
-
-    setChapters(from: asset, context: context)
-    return true
-  }
-
-  public func setChapters(from asset: AVAsset, context: NSManagedObjectContext) {
-    if !asset.availableChapterLocales.isEmpty {
-      setStandardChapters(from: asset, context: context)
-    } else {
-      setOverdriveChapters(from: asset, context: context)
-    }
-  }
-
-  /// Store chapters that are automatically parsed by the native SDK
-  private func setStandardChapters(from asset: AVAsset, context: NSManagedObjectContext) {
-    for locale in asset.availableChapterLocales {
-      let chaptersMetadata = asset.chapterMetadataGroups(
-        withTitleLocale: locale, containingItemsWithCommonKeys: [AVMetadataKey.commonKeyArtwork]
-      )
-
-      for (index, chapterMetadata) in chaptersMetadata.enumerated() {
-        let chapterIndex = index + 1
-        let chapter = Chapter(context: context)
-
-        chapter.title = AVMetadataItem.metadataItems(
-          from: chapterMetadata.items,
-          withKey: AVMetadataKey.commonKeyTitle,
-          keySpace: AVMetadataKeySpace.common).first?.value?.copy(with: nil) as? String ?? ""
-        chapter.start = CMTimeGetSeconds(chapterMetadata.timeRange.start)
-        chapter.duration = CMTimeGetSeconds(chapterMetadata.timeRange.duration)
-        chapter.index = Int16(chapterIndex)
-
-        self.addToChapters(chapter)
-      }
-    }
-  }
-
-  /// Try to store chapters info from the TXXX tag for mp3s (used by Overdrive)
-  /// Note: `XMLParser` does not have an async/await API, so I would rather use regex with
-  /// what was introduced in iOS 16 to parse the info
-  private func setOverdriveChapters(from asset: AVAsset, context: NSManagedObjectContext) {
-    guard
-      let fileURL,
-      fileURL.pathExtension == "mp3",
-      let overdriveMetadata = asset.metadata.first(where: { $0.identifier?.rawValue == "id3/TXXX" })?.value as? String
-    else { return }
-
-    let matches = overdriveMetadata.matches(of: /<Marker>(.+?)<\/Marker>/)
-    var chapters = [Chapter]()
-
-    for (index, match) in matches.enumerated() {
-      let (_, marker) = match.output
-
-      guard let (_, timeMatch) = marker.matches(of: /<Time>(.+?)<\/Time>/).first?.output else {
-        continue
-      }
-
-      let chapter = Chapter(context: context)
-      chapter.index = Int16(index + 1)
-      chapter.start = TimeParser.getDuration(from: String(timeMatch))
-
-      if let (_, nameMatch) = marker.matches(of: /<Name>(.+?)<\/Name>/).first?.output {
-        chapter.title = String(nameMatch)
-      } else {
-        chapter.title = ""
-      }
-
-      chapters.append(chapter)
-    }
-
-    /// Overdrive markers do not include the duration, we have to parse it from the next chapter over
-    for (index, chapter) in chapters.enumerated() {
-      if index == chapters.endIndex - 1 {
-        chapter.duration = self.duration - chapter.start
-      } else {
-        chapter.duration = chapters[index + 1].start - chapter.start
-      }
-
-      self.addToChapters(chapter)
-    }
-  }
+  public class func getBookTitle(from fileURL: URL) -> String {
+    let asset = AVAsset(url: fileURL)
 
-  private func loadMp3Data(from asset: AVAsset) {
+    // Check all metadata items for title, regardless of format
     for item in asset.metadata {
-      guard let key = item.commonKey?.rawValue,
-            let value = item.value else { continue }
-
-      switch key {
-      case "title":
-        self.title = value as? String
-      case "artist":
-        if self.details == "voiceover_unknown_author".localized {
-          self.details = value as? String
-        }
-      default:
-        continue
+      if let commonKey = item.commonKey?.rawValue,
+         commonKey == "title",
+         let title = item.value as? String {
+        return title
       }
     }
-  }
-
-  public convenience init(from bookUrl: URL, context: NSManagedObjectContext) {
-    let entity = NSEntityDescription.entity(forEntityName: "Book", in: context)!
-    self.init(entity: entity, insertInto: context)
-    let fileURL = bookUrl
-    self.relativePath = fileURL.relativePath(to: DataManager.getProcessedFolderURL())
-    self.remoteURL = nil
-    self.artworkURL = nil
-    let asset = AVAsset(url: fileURL)
-
-    let titleFromMeta = AVMetadataItem.metadataItems(from: asset.metadata, withKey: AVMetadataKey.commonKeyTitle, keySpace: AVMetadataKeySpace.common).first?.value?.copy(with: nil) as? String
-    let authorFromMeta = AVMetadataItem.metadataItems(from: asset.metadata, withKey: AVMetadataKey.commonKeyArtist, keySpace: AVMetadataKeySpace.common).first?.value?.copy(with: nil) as? String
-
-    self.title = titleFromMeta ?? bookUrl.lastPathComponent.replacingOccurrences(of: "_", with: " ")
-    self.details = authorFromMeta ?? "voiceover_unknown_author".localized
-    self.duration = CMTimeGetSeconds(asset.duration)
-    self.originalFileName = bookUrl.lastPathComponent
-    self.isFinished = false
-    self.type = .book
-
-    if fileURL.pathExtension == "mp3" {
-      self.loadMp3Data(from: asset)
-    }
-
-    self.setChapters(from: asset, context: context)
-  }
-
-  public class func getBookTitle(from fileURL: URL) -> String {
-    let asset = AVAsset(url: fileURL)
-
-    let titleFromMeta = AVMetadataItem.metadataItems(from: asset.metadata, withKey: AVMetadataKey.commonKeyTitle, keySpace: AVMetadataKeySpace.common).first?.value?.copy(with: nil) as? String
 
-    return titleFromMeta ?? fileURL.lastPathComponent
+    return fileURL.lastPathComponent
   }
 }
 
diff --git a/Shared/CoreData/DatabaseInitializer.swift b/Shared/CoreData/DatabaseInitializer.swift
index 549a3fd00..48a0cef45 100644
--- a/Shared/CoreData/DatabaseInitializer.swift
+++ b/Shared/CoreData/DatabaseInitializer.swift
@@ -80,8 +80,9 @@ public class DatabaseInitializer: BPLogger {
           continuation.resume(throwing: error)
         } else {
           let dataManager = DataManager(coreDataStack: stack)
+          let bookMetadataService = BookMetadataService()
           let libraryService = LibraryService()
-          libraryService.setup(dataManager: dataManager)
+          libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
           _ = libraryService.getLibrary()
 
           continuation.resume(returning: stack)
diff --git a/Shared/Services/AudioMetadataService.swift b/Shared/Services/AudioMetadataService.swift
deleted file mode 100644
index 6f1c491a0..000000000
--- a/Shared/Services/AudioMetadataService.swift
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-//  AudioMetadataService.swift
-//  BookPlayer
-//
-//  Created by Jeremy Grenier on 7/3/25.
-//  Copyright © 2025 BookPlayer LLC. All rights reserved.
-//
-
-import AVFoundation
-
-public struct AudioMetadata {
-  public let title: String
-  public let artist: String
-  public let artwork: Data?
-  
-  public init(
-    title: String,
-    artist: String = "",
-    artwork: Data? = nil
-  ) {
-    self.title = title
-    self.artist = artist
-    self.artwork = artwork
-  }
-}
-
-public protocol AudioMetadataServiceProtocol {
-  /// Extract metadata from an audio file
-  /// - Parameter fileURL: URL to the audio file
-  /// - Returns: AudioMetadata if extraction succeeds, nil otherwise
-  func extractMetadata(from fileURL: URL) async -> AudioMetadata?
-}
-
-public class AudioMetadataService: BPLogger, AudioMetadataServiceProtocol {
-  
-  public init() {}
-  
-  public func extractMetadata(from fileURL: URL) async -> AudioMetadata? {
-    do {
-      let asset = AVAsset(url: fileURL)
-      let metadata = try await asset.load(.metadata)
-
-      let title = await extractTitle(from: metadata) ?? fileURL.deletingPathExtension().lastPathComponent
-      let artist = await extractArtist(from: metadata)
-      let artwork = await extractArtwork(from: metadata)
-
-      return AudioMetadata(
-        title: title,
-        artist: artist,
-        artwork: artwork
-      )
-
-    } catch {
-      Self.logger.error("Failed to extract metadata from audio file \(fileURL.lastPathComponent): \(error)")
-      return nil
-    }
-  }
-  
-  private func extractTitle(from metadata: [AVMetadataItem]) async -> String? {
-    let titleKeys: [AVMetadataKey] = [
-      .commonKeyAlbumName,
-      .id3MetadataKeyAlbumTitle,
-      .iTunesMetadataKeyAlbum,
-      .commonKeyTitle,
-      .id3MetadataKeyOriginalAlbumTitle,
-    ]
-    
-    var title: String?
-
-    for key in titleKeys {
-      if let metadataItem = metadata.first(where: { $0.commonKey == key }),
-         let titleValue = try? await metadataItem.load(.stringValue),
-         !titleValue.isEmpty {
-        title = titleValue
-        break
-      }
-    }
-    
-    return title
-  }
-  
-  private func extractArtist(from metadata: [AVMetadataItem]) async -> String {
-    let artistKeys: [AVMetadataKey] = [
-      .commonKeyAuthor,
-      .commonKeyArtist,
-      .metadata3GPUserDataKeyAuthor,
-      .iTunesMetadataKeyArtist,
-      .iTunesMetadataKeyAlbumArtist,
-      .id3MetadataKeyOriginalArtist
-    ]
-    
-    for key in artistKeys {
-      if let metadataItem = metadata.first(where: { $0.commonKey == key }),
-         let artistValue = try? await metadataItem.load(.stringValue),
-         !artistValue.isEmpty {
-        return artistValue
-      }
-    }
-    
-    return ""
-  }
-  
-  private func extractArtwork(from metadata: [AVMetadataItem]) async -> Data? {
-    guard let artworkItem = metadata.first(where: { $0.commonKey == .commonKeyArtwork }) else {
-      return nil
-    }
-    
-    return try? await artworkItem.load(.dataValue)
-  }
-}
diff --git a/Shared/Services/BookMetadataService.swift b/Shared/Services/BookMetadataService.swift
new file mode 100644
index 000000000..5533f2e97
--- /dev/null
+++ b/Shared/Services/BookMetadataService.swift
@@ -0,0 +1,387 @@
+//
+//  BookMetadataService.swift
+//  BookPlayer
+//
+//  Created by Jeremy Grenier on 7/3/25.
+//  Copyright © 2025 BookPlayer LLC. All rights reserved.
+//
+
+import AVFoundation
+import CoreMedia
+
+public struct ChapterMetadata {
+  public let title: String
+  public let start: TimeInterval
+  public let duration: TimeInterval
+  public let index: Int
+  
+  public init(
+    title: String,
+    start: TimeInterval,
+    duration: TimeInterval,
+    index: Int
+  ) {
+    self.title = title
+    self.start = start
+    self.duration = duration
+    self.index = index
+  }
+}
+
+public struct AudioMetadata {
+  public let title: String
+  public let artist: String
+  public let duration: TimeInterval
+  public let artwork: Data?
+  public let chapters: [ChapterMetadata]?
+  
+  public init(
+    title: String,
+    artist: String = "",
+    duration: TimeInterval = 0,
+    artwork: Data? = nil,
+    chapters: [ChapterMetadata]? = nil
+  ) {
+    self.title = title
+    self.artist = artist
+    self.duration = duration
+    self.artwork = artwork
+    self.chapters = chapters
+  }
+}
+
+public protocol BookMetadataServiceProtocol {
+  /// Extract metadata from an audio file
+  /// - Parameter fileURL: URL to the audio file
+  /// - Returns: AudioMetadata if extraction succeeds, nil otherwise
+  func extractMetadata(from fileURL: URL) async -> AudioMetadata?
+  
+  /// Extract metadata from an AVAsset
+  /// - Parameter asset: The AVAsset to extract metadata from
+  /// - Returns: AudioMetadata if extraction succeeds, nil otherwise
+  func extractMetadata(from asset: AVAsset) async -> AudioMetadata?
+}
+
+public class BookMetadataService: BPLogger, BookMetadataServiceProtocol {
+  
+  public init() {}
+  
+  public func extractMetadata(from fileURL: URL) async -> AudioMetadata? {
+    let asset = AVURLAsset(url: fileURL)
+    return await extractMetadata(from: asset)
+  }
+  
+  public func extractMetadata(from asset: AVAsset) async -> AudioMetadata? {
+    do {
+      let metadata = try await asset.load(.metadata)
+      let duration = try await asset.load(.duration)
+      let durationSeconds = CMTimeGetSeconds(duration)
+
+      let title = await extractTitle(from: metadata)
+      let artist = await extractArtist(from: metadata)
+      let artwork = await extractArtwork(from: metadata)
+      let chapters = await extractChapters(from: asset, duration: durationSeconds)
+
+      return AudioMetadata(
+        title: title,
+        artist: artist,
+        duration: durationSeconds,
+        artwork: artwork,
+        chapters: chapters
+      )
+
+    } catch {
+      Self.logger.error("Failed to extract metadata from audio asset: \(error)")
+      return nil
+    }
+  }
+  
+  private func extractTitle(from metadata: [AVMetadataItem]) async -> String {
+    let titleKeys: [AVMetadataKey] = [
+      .commonKeyTitle,              // Actual title - should be first
+      .commonKeyAlbumName,          // Album name (fallback for audiobooks)
+      .id3MetadataKeyAlbumTitle,
+      .iTunesMetadataKeyAlbum,
+      .id3MetadataKeyOriginalAlbumTitle,
+    ]
+    
+    for key in titleKeys {
+      if let metadataItem = metadata.first(where: { $0.commonKey == key }),
+         let titleValue = try? await metadataItem.load(.stringValue),
+         !titleValue.isEmpty {
+        return titleValue
+      }
+    }
+    
+    return ""
+  }
+  
+  private func extractArtist(from metadata: [AVMetadataItem]) async -> String {
+    let artistKeys: [AVMetadataKey] = [
+      .commonKeyAuthor,
+      .commonKeyArtist,
+      .metadata3GPUserDataKeyAuthor,
+      .iTunesMetadataKeyArtist,
+      .iTunesMetadataKeyAlbumArtist,
+      .id3MetadataKeyOriginalArtist
+    ]
+    
+    for key in artistKeys {
+      if let metadataItem = metadata.first(where: { $0.commonKey == key }),
+         let artistValue = try? await metadataItem.load(.stringValue),
+         !artistValue.isEmpty {
+        return artistValue
+      }
+    }
+    
+    return ""
+  }
+  
+  private func extractArtwork(from metadata: [AVMetadataItem]) async -> Data? {
+    guard let artworkItem = metadata.first(where: { $0.commonKey == .commonKeyArtwork }) else {
+      return nil
+    }
+    
+    return try? await artworkItem.load(.dataValue)
+  }
+  
+  // MARK: - Chapter Extraction
+  
+  private func extractChapters(from asset: AVAsset, duration: TimeInterval) async -> [ChapterMetadata]? {
+    do {
+      let metadata = try await asset.load(.metadata)
+      let availableChapterLocales = try await asset.load(.availableChapterLocales)
+      
+      // First try: Native chapter support (works for M4B, some M4A, properly tagged files)
+      if !availableChapterLocales.isEmpty {
+        return await extractStandardChapters(from: asset, locales: availableChapterLocales)
+      }
+      
+      // Second try: Check what metadata identifiers exist
+      let identifiers = metadata.compactMap { $0.identifier?.rawValue }
+      
+      // FLAC/Vorbis chapters (CHAPTER tags)
+      if identifiers.contains(where: { $0.contains("CHAPTER") && !$0.contains("NAME") }) {
+        return await extractVorbisChapters(from: metadata, duration: duration)
+      }
+
+      // MP3 Overdrive chapters (ID3 TXXX tag)
+      if identifiers.contains("id3/TXXX") {
+        return await extractOverdriveChapters(from: metadata, duration: duration)
+      }
+
+      // MP3 standard chapters (ID3v2.3+ CHAP frames)
+      // Note: Currently AVFoundation doesn't fully expose CHAP frame data,
+      // but this may be supported in future iOS releases.
+      if identifiers.contains(where: { $0.hasPrefix("id3/CHAP") }) {
+        return await extractID3Chapters(from: metadata, duration: duration)
+      }
+
+      return nil
+    } catch {
+      Self.logger.error("Failed to extract chapters: \(error)")
+      return nil
+    }
+  }
+  
+  private func extractStandardChapters(from asset: AVAsset, locales: [Locale]) async -> [ChapterMetadata]? {
+    var allChapters: [ChapterMetadata] = []
+
+    for locale in locales {
+      do {
+        let chaptersMetadata = try await asset.loadChapterMetadataGroups(
+          withTitleLocale: locale,
+          containingItemsWithCommonKeys: [AVMetadataKey.commonKeyArtwork]
+        )
+
+        for (index, chapterMetadata) in chaptersMetadata.enumerated() {
+          let chapterIndex = index + 1
+
+          // Get title using async load API
+          let titleItem = AVMetadataItem.metadataItems(
+            from: chapterMetadata.items,
+            withKey: AVMetadataKey.commonKeyTitle,
+            keySpace: AVMetadataKeySpace.common
+          ).first
+          let title = (try? await titleItem?.load(.stringValue)) ?? ""
+
+          let start = CMTimeGetSeconds(chapterMetadata.timeRange.start)
+          let duration = CMTimeGetSeconds(chapterMetadata.timeRange.duration)
+
+          let chapter = ChapterMetadata(
+            title: title,
+            start: start,
+            duration: duration,
+            index: chapterIndex
+          )
+
+          allChapters.append(chapter)
+        }
+      } catch {
+        Self.logger.error("Failed to load chapter metadata for locale \(locale): \(error)")
+      }
+    }
+
+    return allChapters.isEmpty ? nil : allChapters
+  }
+  
+  private func extractVorbisChapters(from metadata: [AVMetadataItem], duration: TimeInterval) async -> [ChapterMetadata]? {
+    var chapterMap: [Int: (time: String?, name: String?)] = [:]
+
+    for item in metadata {
+      guard let identifier = item.identifier?.rawValue else { continue }
+
+      // Match CHAPTER001, CHAPTER002, etc. (without NAME suffix)
+      if let range = identifier.range(of: #"CHAPTER(\d+)$"#, options: .regularExpression) {
+        let matched = identifier[range]
+        let numberStr = matched.dropFirst(7) // Remove "CHAPTER" prefix
+        if let number = Int(numberStr) {
+          let time = try? await item.load(.stringValue)
+          chapterMap[number, default: (nil, nil)].time = time
+        }
+      }
+
+      // Match CHAPTER001NAME, CHAPTER002NAME, etc.
+      if let range = identifier.range(of: #"CHAPTER(\d+)NAME$"#, options: .regularExpression) {
+        let matched = identifier[range]
+        let numberStr = String(matched.dropFirst(7).dropLast(4)) // Remove "CHAPTER" and "NAME"
+        if let number = Int(numberStr) {
+          let name = try? await item.load(.stringValue)
+          chapterMap[number, default: (nil, nil)].name = name
+        }
+      }
+    }
+
+    // Sort by chapter number and create ChapterMetadata objects
+    let sortedChapters = chapterMap.sorted { $0.key < $1.key }
+    var chapters: [ChapterMetadata] = []
+
+    for (index, (_, data)) in sortedChapters.enumerated() {
+      guard let timeString = data.time else { continue }
+
+      let start = TimeParser.getDuration(from: timeString)
+      let chapterDuration: TimeInterval
+
+      // Calculate duration from next chapter or file duration
+      if index < sortedChapters.count - 1,
+         let nextTimeString = sortedChapters[index + 1].value.time {
+        chapterDuration = TimeParser.getDuration(from: nextTimeString) - start
+      } else {
+        chapterDuration = duration - start
+      }
+
+      let chapter = ChapterMetadata(
+        title: data.name ?? "",
+        start: start,
+        duration: chapterDuration,
+        index: index + 1
+      )
+
+      chapters.append(chapter)
+    }
+
+    return chapters.isEmpty ? nil : chapters
+  }
+
+  private func extractID3Chapters(from metadata: [AVMetadataItem], duration: TimeInterval) async -> [ChapterMetadata]? {
+    var chapterData: [(start: Double, title: String)] = []
+
+    for item in metadata {
+      guard let identifier = item.identifier?.rawValue,
+            identifier.hasPrefix("id3/CHAP") else { continue }
+
+      // Extract chapter start time and title from CHAP frame
+      // Note: AVFoundation may not fully expose CHAP frame timing data currently,
+      // but we attempt to load what's available for future compatibility.
+      if let dateValue = try? await item.load(.dateValue) {
+        let startTime = dateValue.timeIntervalSince1970
+        let title = (try? await item.load(.stringValue)) ?? ""
+        chapterData.append((start: startTime, title: title))
+      }
+    }
+
+    // Sort chapters by start time
+    chapterData.sort { $0.start < $1.start }
+
+    var chapters: [ChapterMetadata] = []
+    for (index, data) in chapterData.enumerated() {
+      let chapterDuration: TimeInterval
+
+      // Calculate duration
+      if index < chapterData.count - 1 {
+        chapterDuration = chapterData[index + 1].start - data.start
+      } else {
+        chapterDuration = duration - data.start
+      }
+
+      let chapter = ChapterMetadata(
+        title: data.title,
+        start: data.start,
+        duration: chapterDuration,
+        index: index + 1
+      )
+
+      chapters.append(chapter)
+    }
+
+    return chapters.isEmpty ? nil : chapters
+  }
+
+  private func extractOverdriveChapters(from metadata: [AVMetadataItem], duration: TimeInterval) async -> [ChapterMetadata]? {
+    guard let txxxItem = metadata.first(where: { $0.identifier?.rawValue == "id3/TXXX" }),
+          let overdriveMetadata = try? await txxxItem.load(.stringValue)
+    else { return nil }
+
+    let matches = overdriveMetadata.matches(of: /<Marker>(.+?)<\/Marker>/)
+    var chapters: [ChapterMetadata] = []
+
+    for (index, match) in matches.enumerated() {
+      let (_, marker) = match.output
+
+      guard let (_, timeMatch) = marker.matches(of: /<Time>(.+?)<\/Time>/).first?.output else {
+        continue
+      }
+
+      let start = TimeParser.getDuration(from: String(timeMatch))
+      let title: String
+      
+      if let (_, nameMatch) = marker.matches(of: /<Name>(.+?)<\/Name>/).first?.output {
+        title = String(nameMatch)
+      } else {
+        title = ""
+      }
+      
+      let chapter = ChapterMetadata(
+        title: title,
+        start: start,
+        duration: 0, // Will be calculated below
+        index: index + 1
+      )
+
+      chapters.append(chapter)
+    }
+
+    // Overdrive markers do not include the duration, we have to parse it from the next chapter over
+    var finalChapters: [ChapterMetadata] = []
+    for (index, chapter) in chapters.enumerated() {
+      let chapterDuration: TimeInterval
+      
+      if index == chapters.endIndex - 1 {
+        chapterDuration = duration - chapter.start
+      } else {
+        chapterDuration = chapters[index + 1].start - chapter.start
+      }
+      
+      let updatedChapter = ChapterMetadata(
+        title: chapter.title,
+        start: chapter.start,
+        duration: chapterDuration,
+        index: chapter.index
+      )
+
+      finalChapters.append(updatedChapter)
+    }
+
+    return finalChapters.isEmpty ? nil : finalChapters
+  }
+}
diff --git a/Shared/Services/LibraryService.swift b/Shared/Services/LibraryService.swift
index 0c20ba05f..4cb0961b1 100644
--- a/Shared/Services/LibraryService.swift
+++ b/Shared/Services/LibraryService.swift
@@ -33,7 +33,7 @@ public protocol LibraryServiceProtocol: AnyObject {
   /// Set the last played book
   func setLibraryLastBook(with relativePath: String?)
   /// Import and insert items
-  func insertItems(from files: [URL]) -> [SimpleLibraryItem]
+  func insertItems(from files: [URL]) async -> [SimpleLibraryItem]
   /// Move items between folders
   func moveItems(_ items: [String], inside relativePath: String?) throws
   /// Delete items
@@ -82,7 +82,7 @@ public protocol LibraryServiceProtocol: AnyObject {
 
   /// Update metadata
   /// Create book core data object
-  func createBook(from url: URL) -> Book
+  func createBook(from url: URL) async -> Book
   /// Load metadata chapters if needed
   func loadChaptersIfNeeded(relativePath: String, asset: AVAsset) async
   /// Create folder
@@ -153,6 +153,7 @@ public protocol LibraryServiceProtocol: AnyObject {
 @Observable
 public final class LibraryService: LibraryServiceProtocol, @unchecked Sendable {
   var dataManager: DataManager!
+  var bookMetadataService: BookMetadataServiceProtocol!
 
   /// Internal passthrough publisher for emitting metadata update events
   private var metadataPassthroughPublisher = PassthroughSubject<[String: Any], Never>()
@@ -170,8 +171,9 @@ public final class LibraryService: LibraryServiceProtocol, @unchecked Sendable {
 
   public init() {}
 
-  public func setup(dataManager: DataManager) {
+  public func setup(dataManager: DataManager, bookMetadataService: BookMetadataServiceProtocol) {
     self.dataManager = dataManager
+    self.bookMetadataService = bookMetadataService
 
     metadataUpdatePublisher =
       metadataPassthroughPublisher
@@ -570,14 +572,14 @@ extension LibraryService {
   }
 
   @discardableResult
-  public func insertItems(from files: [URL]) -> [SimpleLibraryItem] {
-    return insertItems(from: files, parentPath: nil)
+  public func insertItems(from files: [URL]) async -> [SimpleLibraryItem] {
+    return await insertItems(from: files, parentPath: nil)
   }
 
   /// This handles the Core Data objects creation from the Import operation. This method doesn't handle moving files on disk,
   /// as we don't want this method to throw, and the files are already in the processed folder
   @discardableResult
-  func insertItems(from files: [URL], parentPath: String? = nil) -> [SimpleLibraryItem] {
+  func insertItems(from files: [URL], parentPath: String? = nil) async -> [SimpleLibraryItem] {
     let context = dataManager.getContext()
     let library = getLibraryReference()
 
@@ -590,10 +592,20 @@ extension LibraryService {
         type == .typeDirectory
       {
         libraryItem = Folder(from: file, context: context)
-        /// Kick-off separate function to handle instatiating the folder contents
-        self.handleDirectory(file)
+        /// Handle folder contents and wait for completion to ensure proper metadata extraction
+        await self.handleDirectory(file)
       } else {
-        libraryItem = Book(from: file, context: context)
+        // Extract metadata FIRST (includes chapters)
+        let metadata = await bookMetadataService.extractMetadata(from: file)
+        
+        // Create Book with metadata
+        let book = createBook(from: file, metadata: metadata, context: context)
+        libraryItem = book
+        
+        // Create chapters immediately if available
+        if let chapters = metadata?.chapters {
+          storeChapters(chapters, for: book, context: context)
+        }
       }
 
       libraryItem.orderRank = getNextOrderRank(in: parentPath)
@@ -614,7 +626,43 @@ extension LibraryService {
     return processedFiles
   }
 
-  private func handleDirectory(_ folderURL: URL) {
+  private func createBook(from url: URL, metadata: AudioMetadata?, context: NSManagedObjectContext) -> Book {
+    let entity = NSEntityDescription.entity(forEntityName: "Book", in: context)!
+    let book = Book(entity: entity, insertInto: context)
+    
+    book.relativePath = url.relativePath(to: DataManager.getProcessedFolderURL())
+    book.remoteURL = nil
+    book.artworkURL = nil
+    book.title = metadata?.title ?? url.lastPathComponent.replacingOccurrences(of: "_", with: " ")
+    book.details = metadata?.artist ?? "voiceover_unknown_author".localized
+    book.duration = metadata?.duration ?? 0
+    book.originalFileName = url.lastPathComponent
+    book.isFinished = false
+    book.type = .book
+    
+    return book
+  }
+  
+  private func storeChapters(_ chapters: [ChapterMetadata], for book: Book, context: NSManagedObjectContext) {
+    for chapterMeta in chapters {
+      let chapter = Chapter(context: context)
+      chapter.title = chapterMeta.title
+      chapter.start = chapterMeta.start
+      chapter.duration = chapterMeta.duration
+      chapter.index = Int16(chapterMeta.index)
+      book.addToChapters(chapter)
+    }
+  }
+  
+  /// Overload for backwards compatibility when we need to query by relativePath
+  private func storeChapters(_ chapters: [ChapterMetadata], for relativePath: String, context: NSManagedObjectContext) {
+    guard let book = getItem(with: relativePath, context: context) as? Book else {
+      return
+    }
+    storeChapters(chapters, for: book, context: context)
+  }
+
+  private func handleDirectory(_ folderURL: URL) async {
     let enumerator = FileManager.default.enumerator(
       at: folderURL,
       includingPropertiesForKeys: [.isDirectoryKey],
@@ -640,7 +688,7 @@ extension LibraryService {
     let sortedFiles = orderedSet.sortedArray(using: [sortDescriptor]) as! [URL]
 
     let parentPath = folderURL.relativePath(to: DataManager.getProcessedFolderURL())
-    insertItems(from: sortedFiles, parentPath: parentPath)
+    _ = await insertItems(from: sortedFiles, parentPath: parentPath)
     rebuildFolderDetails(parentPath)
   }
 
@@ -1320,31 +1368,47 @@ extension LibraryService {
 
 // MARK: - Metadata update
 extension LibraryService {
-  public func createBook(from url: URL) -> Book {
+  public func createBook(from url: URL) async -> Book {
     let context = dataManager.getContext()
-    let newBook = Book(from: url, context: context)
+    
+    // Extract metadata using the new service
+    let metadata = await bookMetadataService.extractMetadata(from: url)
+    
+    // Create book with extracted metadata
+    let newBook = createBook(from: url, metadata: metadata, context: context)
+    
+    // Store chapters if available
+    if let chapters = metadata?.chapters {
+      storeChapters(chapters, for: newBook, context: context)
+    }
+    
     self.dataManager.saveSyncContext(context)
     return newBook
   }
 
   public func loadChaptersIfNeeded(relativePath: String, asset: AVAsset) async {
-    return await withCheckedContinuation { continuation in
-      let context = dataManager.getBackgroundContext()
-      context.perform { [unowned self, context] in
-        guard
-          let book = getItem(with: relativePath, context: context) as? Book
-        else {
-          continuation.resume()
-          return
-        }
-
-        let hadEmptyChapters = book.loadChaptersIfNeeded(from: asset, context: context)
-
-        if hadEmptyChapters {
-          dataManager.saveSyncContext(context)
-        }
-        continuation.resume()
+    let context = dataManager.getBackgroundContext()
+    
+    // First, check if we need to load chapters
+    let needsChapters = await context.perform { [unowned self] in
+      guard let book = self.getItem(with: relativePath, context: context) as? Book else {
+        return false
       }
+      return book.chapters?.count == 0
+    }
+    
+    guard needsChapters else { return }
+    
+    // Extract metadata outside of context.perform
+    guard let metadata = await bookMetadataService.extractMetadata(from: asset),
+          let chapters = metadata.chapters else {
+      return
+    }
+    
+    // Store chapters in the context
+    await context.perform { [unowned self] in
+      self.storeChapters(chapters, for: relativePath, context: context)
+      self.dataManager.saveSyncContext(context)
     }
   }
 

From 1b28ae410e44987b5304e6b1db0f62e40f330258 Mon Sep 17 00:00:00 2001
From: Gianni Carlo <gcarlo89@hotmail.com>
Date: Sun, 4 Jan 2026 19:31:58 -0500
Subject: [PATCH 2/4] address feedback

---
 BookPlayer.xcodeproj/project.pbxproj          | 12 ++++++------
 BookPlayer/AppDelegate.swift                  | 12 ++++++------
 .../Hardcover/Network/HardcoverService.swift  |  4 ++--
 .../Library/ItemList/Views/BookView.swift     |  4 ++--
 .../Profile/ProfileListenedSectionView.swift  |  4 ++--
 .../Profile/ProfileSyncTasksSectionView.swift |  4 ++--
 BookPlayerTests/DataManagerTests.swift        |  4 ++--
 BookPlayerTests/ImportOperationTests.swift    |  4 ++--
 .../PlaybackPerformanceTests.swift            |  4 ++--
 .../Services/LibraryServiceTests.swift        |  4 ++--
 BookPlayerTests/Support/StubFactory.swift     |  4 ++--
 BookPlayerWatch/ExtensionDelegate.swift       |  4 ++--
 Shared/CoreData/DatabaseInitializer.swift     |  4 ++--
 ...rvice.swift => AudioMetadataService.swift} | 19 +++++++++----------
 Shared/Services/LibraryService.swift          | 18 ++++++++++--------
 15 files changed, 53 insertions(+), 52 deletions(-)
 rename Shared/Services/{BookMetadataService.swift => AudioMetadataService.swift} (96%)

diff --git a/BookPlayer.xcodeproj/project.pbxproj b/BookPlayer.xcodeproj/project.pbxproj
index c048b4a5e..fe6356a66 100644
--- a/BookPlayer.xcodeproj/project.pbxproj
+++ b/BookPlayer.xcodeproj/project.pbxproj
@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3F66408A2E162ABF00356522 /* BookMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* BookMetadataService.swift */; };
-		3F66408B2E162ABF00356522 /* BookMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* BookMetadataService.swift */; };
+		3F66408A2E162ABF00356522 /* AudioMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* AudioMetadataService.swift */; };
+		3F66408B2E162ABF00356522 /* AudioMetadataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6640892E162ABF00356522 /* AudioMetadataService.swift */; };
 		3F66408D2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */; };
 		3F66408E2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */; };
 		3F66408F2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */; };
@@ -955,7 +955,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3F6640892E162ABF00356522 /* BookMetadataService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookMetadataService.swift; sourceTree = "<group>"; };
+		3F6640892E162ABF00356522 /* AudioMetadataService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioMetadataService.swift; sourceTree = "<group>"; };
 		3F66408C2E172DF500356522 /* MappingModel_v9_to_v10.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = MappingModel_v9_to_v10.xcmappingmodel; sourceTree = "<group>"; };
 		3F6640932E17386400356522 /* DeleteUserBookData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteUserBookData.swift; sourceTree = "<group>"; };
 		3F7B64352E0F71E900299D97 /* HardcoverSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HardcoverSettingsView.swift; sourceTree = "<group>"; };
@@ -2448,7 +2448,7 @@
 		62AAE22F274AA6E9001EB9FF /* Services */ = {
 			isa = PBXGroup;
 			children = (
-				3F6640892E162ABF00356522 /* BookMetadataService.swift */,
+				3F6640892E162ABF00356522 /* AudioMetadataService.swift */,
 				9F49072B2903663800054AD6 /* SortType.swift */,
 				9FC1E4742815C6A300522FA8 /* KeychainService.swift */,
 				62AAE22B274AA3EB001EB9FF /* LibraryService.swift */,
@@ -4027,7 +4027,7 @@
 				4140EA71227289A20009F794 /* UIColor+BookPlayer.swift in Sources */,
 				9F0872DC2A19867C00B7FD4A /* ArtworkResponse.swift in Sources */,
 				9FF383D42A40F97000BBAC11 /* MappingModel_v8_to_v9.xcmappingmodel in Sources */,
-				3F66408B2E162ABF00356522 /* BookMetadataService.swift in Sources */,
+				3F66408B2E162ABF00356522 /* AudioMetadataService.swift in Sources */,
 				4138CE1726E584B60014F11E /* BookmarkType.swift in Sources */,
 				9F9C7B5429F9672700E257B0 /* SyncableBookmark.swift in Sources */,
 				5126F123258E9F18009965DC /* URL+BookPlayer.swift in Sources */,
@@ -4630,7 +4630,7 @@
 				41A1B12A226F88C500EA0400 /* Folder+CoreDataProperties.swift in Sources */,
 				638E64CE2B8E1CFD00DCFA3B /* SyncTasksCountService.swift in Sources */,
 				63C6C30D2B538D8500FFE0D8 /* SyncTasksStorage.swift in Sources */,
-				3F66408A2E162ABF00356522 /* BookMetadataService.swift in Sources */,
+				3F66408A2E162ABF00356522 /* AudioMetadataService.swift in Sources */,
 				41EB07152752F17B00EFEE13 /* PlayableItem.swift in Sources */,
 				41A1B11E226F88C500EA0400 /* Theme+CoreDataProperties.swift in Sources */,
 				9F1345B62938DF070089B1DE /* Fonts.swift in Sources */,
diff --git a/BookPlayer/AppDelegate.swift b/BookPlayer/AppDelegate.swift
index 362cdbffe..c85700f33 100644
--- a/BookPlayer/AppDelegate.swift
+++ b/BookPlayer/AppDelegate.swift
@@ -523,8 +523,8 @@ extension AppDelegate {
     } else {
       let dataManager = DataManager(coreDataStack: stack)
       let accountService = makeAccountService(dataManager: dataManager)
-      let bookMetadataService = makeBookMetadataService()
-      let libraryService = makeLibraryService(dataManager: dataManager, bookMetadataService: bookMetadataService)
+      let audioMetadataService = makeAudioMetadataService()
+      let libraryService = makeLibraryService(dataManager: dataManager, audioMetadataService: audioMetadataService)
       let syncService = makeSyncService(accountService: accountService, libraryService: libraryService)
       let playbackService = makePlaybackService(libraryService: libraryService)
       let playerManager = PlayerManager(
@@ -572,13 +572,13 @@ extension AppDelegate {
     return service
   }
 
-  private func makeBookMetadataService() -> BookMetadataService {
-    return BookMetadataService()
+  private func makeAudioMetadataService() -> AudioMetadataService {
+    return AudioMetadataService()
   }
 
-  private func makeLibraryService(dataManager: DataManager, bookMetadataService: BookMetadataServiceProtocol) -> LibraryService {
+  private func makeLibraryService(dataManager: DataManager, audioMetadataService: AudioMetadataServiceProtocol) -> LibraryService {
     let service = LibraryService()
-    service.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    service.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     return service
   }
 
diff --git a/BookPlayer/Hardcover/Network/HardcoverService.swift b/BookPlayer/Hardcover/Network/HardcoverService.swift
index deb9c3181..9757f6531 100644
--- a/BookPlayer/Hardcover/Network/HardcoverService.swift
+++ b/BookPlayer/Hardcover/Network/HardcoverService.swift
@@ -48,7 +48,7 @@ protocol HardcoverServiceProtocol {
 final class HardcoverService: BPLogger, HardcoverServiceProtocol {
   private var keychain: KeychainServiceProtocol!
   private let graphQL = GraphQLClient(baseURL: "https://api.hardcover.app/v1/graphql")
-  private var audioMetadataService: BookMetadataServiceProtocol!
+  private var audioMetadataService: AudioMetadataServiceProtocol!
   private var libraryService: LibraryServiceProtocol!
 
   private var metadataSubscription: AnyCancellable?
@@ -72,7 +72,7 @@ final class HardcoverService: BPLogger, HardcoverServiceProtocol {
   func setup(
     libraryService: LibraryServiceProtocol,
     keychain: KeychainServiceProtocol = KeychainService(),
-    audioMetadataService: BookMetadataServiceProtocol = BookMetadataService()
+    audioMetadataService: AudioMetadataServiceProtocol = AudioMetadataService()
   ) {
     self.libraryService = libraryService
     self.keychain = keychain
diff --git a/BookPlayer/Library/ItemList/Views/BookView.swift b/BookPlayer/Library/ItemList/Views/BookView.swift
index f7d7e7dbf..397b02a3d 100644
--- a/BookPlayer/Library/ItemList/Views/BookView.swift
+++ b/BookPlayer/Library/ItemList/Views/BookView.swift
@@ -70,9 +70,9 @@ struct BookView: View {
   @Previewable var syncService: SyncService = {
     let syncService = SyncService()
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: ""))
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     syncService.setup(
       isActive: true,
       libraryService: libraryService
diff --git a/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift b/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift
index 143dc2f91..198a698e5 100644
--- a/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift
+++ b/BookPlayer/Profile/Profile/ProfileListenedSectionView.swift
@@ -68,8 +68,8 @@ struct ProfileListenedSectionView: View {
   @Previewable var libraryService: LibraryService = {
     let libraryService = LibraryService()
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: ""))
-    let bookMetadataService = BookMetadataService()
-    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    let audioMetadataService = AudioMetadataService()
+    libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
 
     return libraryService
   }()
diff --git a/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift b/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift
index ed98edabc..9bcd8336f 100644
--- a/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift
+++ b/BookPlayer/Profile/Profile/ProfileSyncTasksSectionView.swift
@@ -91,9 +91,9 @@ struct ProfileSyncTasksSectionView: View {
 #Preview {
   @Previewable var syncService: SyncService = {
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: ""))
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     let syncService = SyncService()
     syncService.setup(isActive: true, libraryService: libraryService)
 
diff --git a/BookPlayerTests/DataManagerTests.swift b/BookPlayerTests/DataManagerTests.swift
index a893324fa..102a32af9 100644
--- a/BookPlayerTests/DataManagerTests.swift
+++ b/BookPlayerTests/DataManagerTests.swift
@@ -46,9 +46,9 @@ class ProcessFilesTests: DataManagerTests {
 
     let expectation = XCTestExpectation(description: "File import notification")
 
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: self.dataManager, bookMetadataService: bookMetadataService)
+    libraryService.setup(dataManager: self.dataManager, audioMetadataService: audioMetadataService)
     self.importManager = ImportManager(libraryService: libraryService)
 
     self.subscription = self.importManager.observeFiles().sink { files in
diff --git a/BookPlayerTests/ImportOperationTests.swift b/BookPlayerTests/ImportOperationTests.swift
index 31d4b55ab..c537d628c 100644
--- a/BookPlayerTests/ImportOperationTests.swift
+++ b/BookPlayerTests/ImportOperationTests.swift
@@ -31,9 +31,9 @@ class ImportOperationTests: XCTestCase {
     let promise = XCTestExpectation(description: "Process file")
     let promiseFile = expectation(forNotification: .processingFile, object: nil)
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: "/dev/null"))
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     let operation = ImportOperation(files: [fileUrl],
                                     libraryService: libraryService)
 
diff --git a/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift b/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift
index 330338904..f7a28996b 100644
--- a/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift
+++ b/BookPlayerTests/PerformanceTests/PlaybackPerformanceTests.swift
@@ -17,9 +17,9 @@ final class PlaybackPerformanceTests: XCTestCase {
   override func setUpWithError() throws {
     DataTestUtils.clearFolderContents(url: DataManager.getProcessedFolderURL())
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: "/dev/null"))
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     self.sut = LibraryService()
-    self.sut.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    self.sut.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     _ = self.sut.getLibrary()
   }
 
diff --git a/BookPlayerTests/Services/LibraryServiceTests.swift b/BookPlayerTests/Services/LibraryServiceTests.swift
index b6c662671..09d8775cf 100644
--- a/BookPlayerTests/Services/LibraryServiceTests.swift
+++ b/BookPlayerTests/Services/LibraryServiceTests.swift
@@ -20,9 +20,9 @@ class LibraryServiceTests: XCTestCase {
   override func setUp() {
     DataTestUtils.clearFolderContents(url: DataManager.getProcessedFolderURL())
     let dataManager = DataManager(coreDataStack: CoreDataStack(testPath: "/dev/null"))
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     self.sut = LibraryService()
-    self.sut.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    self.sut.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     _ = self.sut.getLibrary()
   }
 
diff --git a/BookPlayerTests/Support/StubFactory.swift b/BookPlayerTests/Support/StubFactory.swift
index c41bcd641..07a60323f 100644
--- a/BookPlayerTests/Support/StubFactory.swift
+++ b/BookPlayerTests/Support/StubFactory.swift
@@ -59,9 +59,9 @@ class StubFactory {
   }
 
   public class func library(dataManager: DataManager) -> Library {
-    let bookMetadataService = BookMetadataService()
+    let audioMetadataService = AudioMetadataService()
     let libraryService = LibraryService()
-    libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+    libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
     return libraryService.getLibrary()
   }
 }
diff --git a/BookPlayerWatch/ExtensionDelegate.swift b/BookPlayerWatch/ExtensionDelegate.swift
index 34f3b6b5a..e691ff895 100644
--- a/BookPlayerWatch/ExtensionDelegate.swift
+++ b/BookPlayerWatch/ExtensionDelegate.swift
@@ -67,9 +67,9 @@ class ExtensionDelegate: NSObject, WKApplicationDelegate, ObservableObject {
       let dataManager = DataManager(coreDataStack: stack)
       let accountService = AccountService()
       accountService.setup(dataManager: dataManager)
-      let bookMetadataService = BookMetadataService()
+      let audioMetadataService = AudioMetadataService()
       let libraryService = LibraryService()
-      libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+      libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
       let syncService = SyncService()
       syncService.setup(
         isActive: accountService.hasSyncEnabled(),
diff --git a/Shared/CoreData/DatabaseInitializer.swift b/Shared/CoreData/DatabaseInitializer.swift
index 48a0cef45..5b471f985 100644
--- a/Shared/CoreData/DatabaseInitializer.swift
+++ b/Shared/CoreData/DatabaseInitializer.swift
@@ -80,9 +80,9 @@ public class DatabaseInitializer: BPLogger {
           continuation.resume(throwing: error)
         } else {
           let dataManager = DataManager(coreDataStack: stack)
-          let bookMetadataService = BookMetadataService()
+          let audioMetadataService = AudioMetadataService()
           let libraryService = LibraryService()
-          libraryService.setup(dataManager: dataManager, bookMetadataService: bookMetadataService)
+          libraryService.setup(dataManager: dataManager, audioMetadataService: audioMetadataService)
           _ = libraryService.getLibrary()
 
           continuation.resume(returning: stack)
diff --git a/Shared/Services/BookMetadataService.swift b/Shared/Services/AudioMetadataService.swift
similarity index 96%
rename from Shared/Services/BookMetadataService.swift
rename to Shared/Services/AudioMetadataService.swift
index 5533f2e97..9e2c89fd9 100644
--- a/Shared/Services/BookMetadataService.swift
+++ b/Shared/Services/AudioMetadataService.swift
@@ -1,5 +1,5 @@
 //
-//  BookMetadataService.swift
+//  AudioMetadataService.swift
 //  BookPlayer
 //
 //  Created by Jeremy Grenier on 7/3/25.
@@ -50,19 +50,19 @@ public struct AudioMetadata {
   }
 }
 
-public protocol BookMetadataServiceProtocol {
+public protocol AudioMetadataServiceProtocol {
   /// Extract metadata from an audio file
   /// - Parameter fileURL: URL to the audio file
   /// - Returns: AudioMetadata if extraction succeeds, nil otherwise
   func extractMetadata(from fileURL: URL) async -> AudioMetadata?
-  
+
   /// Extract metadata from an AVAsset
   /// - Parameter asset: The AVAsset to extract metadata from
   /// - Returns: AudioMetadata if extraction succeeds, nil otherwise
   func extractMetadata(from asset: AVAsset) async -> AudioMetadata?
 }
 
-public class BookMetadataService: BPLogger, BookMetadataServiceProtocol {
+public class AudioMetadataService: BPLogger, AudioMetadataServiceProtocol {
   
   public init() {}
   
@@ -80,7 +80,7 @@ public class BookMetadataService: BPLogger, BookMetadataServiceProtocol {
       let title = await extractTitle(from: metadata)
       let artist = await extractArtist(from: metadata)
       let artwork = await extractArtwork(from: metadata)
-      let chapters = await extractChapters(from: asset, duration: durationSeconds)
+      let chapters = await extractChapters(from: asset, metadata: metadata, duration: durationSeconds)
 
       return AudioMetadata(
         title: title,
@@ -147,19 +147,18 @@ public class BookMetadataService: BPLogger, BookMetadataServiceProtocol {
   
   // MARK: - Chapter Extraction
   
-  private func extractChapters(from asset: AVAsset, duration: TimeInterval) async -> [ChapterMetadata]? {
+  private func extractChapters(from asset: AVAsset, metadata: [AVMetadataItem], duration: TimeInterval) async -> [ChapterMetadata]? {
     do {
-      let metadata = try await asset.load(.metadata)
       let availableChapterLocales = try await asset.load(.availableChapterLocales)
-      
+
       // First try: Native chapter support (works for M4B, some M4A, properly tagged files)
       if !availableChapterLocales.isEmpty {
         return await extractStandardChapters(from: asset, locales: availableChapterLocales)
       }
-      
+
       // Second try: Check what metadata identifiers exist
       let identifiers = metadata.compactMap { $0.identifier?.rawValue }
-      
+
       // FLAC/Vorbis chapters (CHAPTER tags)
       if identifiers.contains(where: { $0.contains("CHAPTER") && !$0.contains("NAME") }) {
         return await extractVorbisChapters(from: metadata, duration: duration)
diff --git a/Shared/Services/LibraryService.swift b/Shared/Services/LibraryService.swift
index 4cb0961b1..b4c9bd4e5 100644
--- a/Shared/Services/LibraryService.swift
+++ b/Shared/Services/LibraryService.swift
@@ -153,7 +153,7 @@ public protocol LibraryServiceProtocol: AnyObject {
 @Observable
 public final class LibraryService: LibraryServiceProtocol, @unchecked Sendable {
   var dataManager: DataManager!
-  var bookMetadataService: BookMetadataServiceProtocol!
+  var audioMetadataService: AudioMetadataServiceProtocol!
 
   /// Internal passthrough publisher for emitting metadata update events
   private var metadataPassthroughPublisher = PassthroughSubject<[String: Any], Never>()
@@ -171,9 +171,9 @@ public final class LibraryService: LibraryServiceProtocol, @unchecked Sendable {
 
   public init() {}
 
-  public func setup(dataManager: DataManager, bookMetadataService: BookMetadataServiceProtocol) {
+  public func setup(dataManager: DataManager, audioMetadataService: AudioMetadataServiceProtocol) {
     self.dataManager = dataManager
-    self.bookMetadataService = bookMetadataService
+    self.audioMetadataService = audioMetadataService
 
     metadataUpdatePublisher =
       metadataPassthroughPublisher
@@ -596,7 +596,7 @@ extension LibraryService {
         await self.handleDirectory(file)
       } else {
         // Extract metadata FIRST (includes chapters)
-        let metadata = await bookMetadataService.extractMetadata(from: file)
+        let metadata = await audioMetadataService.extractMetadata(from: file)
         
         // Create Book with metadata
         let book = createBook(from: file, metadata: metadata, context: context)
@@ -633,8 +633,10 @@ extension LibraryService {
     book.relativePath = url.relativePath(to: DataManager.getProcessedFolderURL())
     book.remoteURL = nil
     book.artworkURL = nil
-    book.title = metadata?.title ?? url.lastPathComponent.replacingOccurrences(of: "_", with: " ")
-    book.details = metadata?.artist ?? "voiceover_unknown_author".localized
+    let title = metadata?.title ?? ""
+    book.title = title.isEmpty ? url.lastPathComponent.replacingOccurrences(of: "_", with: " ") : title
+    let artist = metadata?.artist ?? ""
+    book.details = artist.isEmpty ? "voiceover_unknown_author".localized : artist
     book.duration = metadata?.duration ?? 0
     book.originalFileName = url.lastPathComponent
     book.isFinished = false
@@ -1372,7 +1374,7 @@ extension LibraryService {
     let context = dataManager.getContext()
     
     // Extract metadata using the new service
-    let metadata = await bookMetadataService.extractMetadata(from: url)
+    let metadata = await audioMetadataService.extractMetadata(from: url)
     
     // Create book with extracted metadata
     let newBook = createBook(from: url, metadata: metadata, context: context)
@@ -1400,7 +1402,7 @@ extension LibraryService {
     guard needsChapters else { return }
     
     // Extract metadata outside of context.perform
-    guard let metadata = await bookMetadataService.extractMetadata(from: asset),
+    guard let metadata = await audioMetadataService.extractMetadata(from: asset),
           let chapters = metadata.chapters else {
       return
     }

From 9597b3b232647fc974dd4f76f84881c9aaafe115 Mon Sep 17 00:00:00 2001
From: Gianni Carlo <gcarlo89@hotmail.com>
Date: Mon, 5 Jan 2026 09:42:13 -0500
Subject: [PATCH 3/4] address second feedback

---
 Shared/Services/AudioMetadataService.swift | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Shared/Services/AudioMetadataService.swift b/Shared/Services/AudioMetadataService.swift
index 9e2c89fd9..4a386e6fa 100644
--- a/Shared/Services/AudioMetadataService.swift
+++ b/Shared/Services/AudioMetadataService.swift
@@ -289,11 +289,13 @@ public class AudioMetadataService: BPLogger, AudioMetadataServiceProtocol {
       guard let identifier = item.identifier?.rawValue,
             identifier.hasPrefix("id3/CHAP") else { continue }
 
-      // Extract chapter start time and title from CHAP frame
+      // Extract chapter start time and title from CHAP frame.
+      // CHAP timestamps are relative offsets from the start of the audio (not absolute dates).
       // Note: AVFoundation may not fully expose CHAP frame timing data currently,
       // but we attempt to load what's available for future compatibility.
-      if let dateValue = try? await item.load(.dateValue) {
-        let startTime = dateValue.timeIntervalSince1970
+      if let numberValue = try? await item.load(.numberValue),
+         numberValue.doubleValue >= 0 {
+        let startTime = numberValue.doubleValue
         let title = (try? await item.load(.stringValue)) ?? ""
         chapterData.append((start: startTime, title: title))
       }

From f2c1b6acde473416b45879e86cddd2ae5b62d3d7 Mon Sep 17 00:00:00 2001
From: Gianni Carlo <gcarlo89@hotmail.com>
Date: Tue, 6 Jan 2026 22:17:32 -0500
Subject: [PATCH 4/4] fix race condition

---
 .../Library/ItemList/ItemListView+Alerts.swift   |  1 +
 .../Library/ItemList/ItemListViewModel.swift     | 13 ++++++++++++-
 Shared/Services/LibraryService.swift             | 16 ++++++++++------
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/BookPlayer/Library/ItemList/ItemListView+Alerts.swift b/BookPlayer/Library/ItemList/ItemListView+Alerts.swift
index ca0e59bde..989453d04 100644
--- a/BookPlayer/Library/ItemList/ItemListView+Alerts.swift
+++ b/BookPlayer/Library/ItemList/ItemListView+Alerts.swift
@@ -68,6 +68,7 @@ extension ItemListView {
     }
     
     Button("existing_playlist_button") {
+      model.pendingMoveItemIdentifiers = alertParameters.itemIdentifiers
       model.selectedSetItems = Set(alertParameters.itemIdentifiers)
       activeSheet = .foldersSelection
     }
diff --git a/BookPlayer/Library/ItemList/ItemListViewModel.swift b/BookPlayer/Library/ItemList/ItemListViewModel.swift
index 9e5bfe500..cd9d81e43 100644
--- a/BookPlayer/Library/ItemList/ItemListViewModel.swift
+++ b/BookPlayer/Library/ItemList/ItemListViewModel.swift
@@ -77,6 +77,9 @@ final class ItemListViewModel: ObservableObject {
     }
   }
   @Published var selectedItems = [SimpleLibraryItem]()
+  /// Stores item identifiers from import operations to avoid race condition
+  /// where items may not be loaded in the UI yet when moving to a folder
+  var pendingMoveItemIdentifiers: [String]?
 
   /// Search
   @Published var scope: ItemListSearchScope = .all
@@ -410,7 +413,15 @@ extension ItemListViewModel {
   }
 
   func handleMoveIntoFolder(_ folder: SimpleLibraryItem) {
-    let fetchedItems = selectedItems.compactMap({ $0.relativePath })
+    // Use pendingMoveItemIdentifiers if available (from import operations),
+    // otherwise fall back to selectedItems (from manual selection)
+    let fetchedItems: [String]
+    if let pendingItems = pendingMoveItemIdentifiers {
+      fetchedItems = pendingItems
+      pendingMoveItemIdentifiers = nil
+    } else {
+      fetchedItems = selectedItems.compactMap({ $0.relativePath })
+    }
 
     do {
       try libraryService.moveItems(fetchedItems, inside: folder.relativePath)
diff --git a/Shared/Services/LibraryService.swift b/Shared/Services/LibraryService.swift
index b4c9bd4e5..e4b0081d7 100644
--- a/Shared/Services/LibraryService.swift
+++ b/Shared/Services/LibraryService.swift
@@ -1390,7 +1390,7 @@ extension LibraryService {
 
   public func loadChaptersIfNeeded(relativePath: String, asset: AVAsset) async {
     let context = dataManager.getBackgroundContext()
-    
+
     // First, check if we need to load chapters
     let needsChapters = await context.perform { [unowned self] in
       guard let book = self.getItem(with: relativePath, context: context) as? Book else {
@@ -1398,18 +1398,22 @@ extension LibraryService {
       }
       return book.chapters?.count == 0
     }
-    
+
     guard needsChapters else { return }
-    
+
     // Extract metadata outside of context.perform
     guard let metadata = await audioMetadataService.extractMetadata(from: asset),
           let chapters = metadata.chapters else {
       return
     }
-    
-    // Store chapters in the context
+
+    // Store chapters in the context, re-checking if still needed to avoid race conditions
     await context.perform { [unowned self] in
-      self.storeChapters(chapters, for: relativePath, context: context)
+      guard let book = self.getItem(with: relativePath, context: context) as? Book,
+            book.chapters?.count == 0 else {
+        return
+      }
+      self.storeChapters(chapters, for: book, context: context)
       self.dataManager.saveSyncContext(context)
     }
   }