fix: 修复书源导入、阅读外观和书签状态

- 修复书源文件选择、访问权限与导入预览流程，支持查看分组内的书源 - 修复背景图片、字体选择与主题切换，限制背景图片解码尺寸 - 根据已保存书签恢复当前位置状态，避免重复添加 - 补充模型、阅读器和文件选择回归测试及测试样本 - 更新应用版本为 0.1.10（build 16） Fixes #1
2026-10-24 04:41:23 +08:00 · 2026-10-20 23:30:42 +08:00
parent 0bf332441d
commit 0915a144a7
17 changed files with 903 additions and 101 deletions
@@ -1,8 +1,161 @@
+import ImageIO
 import SwiftUI
 import UIKit
 import XCTest
@testable import Legado

+private final class BackgroundPhotoProvider: NSItemProvider, @unchecked Sendable {
+    let photoData: Data?
+    let photoError: (any Error)?
+
+    init(data: Data?, error: (any Error)? = nil) {
+        photoData = data
+        photoError = error
+        super.init()
+    }
+
+    required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
+
+    override var registeredTypeIdentifiers: [String] { ["public.png"] }
+
+    override func loadDataRepresentation(
+        forTypeIdentifier typeIdentifier: String,
+        completionHandler: @escaping @Sendable (Data?, (any Error)?) -> Void
+    ) -> Progress {
+        DispatchQueue.global(qos: .userInitiated).async { [photoData, photoError] in
+            dispatchPrecondition(condition: .notOnQueue(.main))
+            completionHandler(photoData, photoError)
+        }
+        return Progress(totalUnitCount: 1)
+    }
+}
+
+@MainActor
+final class ReadingPhotoPickerTests: XCTestCase {
+    func testPhotoDataReturnedOnBackgroundQueueReachesMainActor() async throws {
+        let expected = Data("photo-provider-data".utf8)
+        let provider = BackgroundPhotoProvider(data: expected)
+        let received = expectation(description: "Photo data delivered on main actor")
+        let coordinator = ReadingPhotoPickerController.Coordinator { result in
+            XCTAssertTrue(Thread.isMainThread)
+            XCTAssertEqual(try? result?.get(), expected)
+            received.fulfill()
+        }
+
+        coordinator.loadImage(from: provider)
+        await fulfillment(of: [received], timeout: 5)
+        withExtendedLifetime(coordinator) {}
+    }
+
+    func testPhotoProviderFailureOnBackgroundQueueReachesMainActor() async throws {
+        let errors: [(any Error)?] = [CocoaError(.fileReadNoPermission), nil]
+        for error in errors {
+            let provider = BackgroundPhotoProvider(data: nil, error: error)
+            let received = expectation(description: "Photo error delivered on main actor")
+            let coordinator = ReadingPhotoPickerController.Coordinator { result in
+                XCTAssertTrue(Thread.isMainThread)
+                guard case .failure(let failure)? = result else {
+                    XCTFail("Expected an import error")
+                    received.fulfill()
+                    return
+                }
+                XCTAssertEqual((failure as NSError).domain, NSCocoaErrorDomain)
+                XCTAssertEqual((failure as NSError).code, (error as NSError?)?.code ?? NSFileReadCorruptFileError)
+                received.fulfill()
+            }
+
+            coordinator.loadImage(from: provider)
+            await fulfillment(of: [received], timeout: 5)
+            withExtendedLifetime(coordinator) {}
+        }
+    }
+}
+
+@MainActor
+final class ReaderBackgroundStoreTests: XCTestCase {
+    func testLargeBackgroundIsDownsampledOnImportAndLegacyReload() throws {
+        let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        defer { try? FileManager.default.removeItem(at: directory) }
+        let target = directory.appendingPathComponent("background.jpg")
+        let format = UIGraphicsImageRendererFormat()
+        format.scale = 1
+        let data = UIGraphicsImageRenderer(size: CGSize(width: 4096, height: 3072), format: format).jpegData(withCompressionQuality: 0.9) { context in
+            UIColor.red.setFill()
+            context.fill(CGRect(x: 0, y: 0, width: 4096, height: 3072))
+        }
+
+        for _ in 0..<3 {
+            let imported = try ReaderBackgroundStore.save(data, to: target)
+            XCTAssertEqual(imported.size.width, CGFloat(ReaderBackgroundStore.maximumPixelSize))
+            XCTAssertEqual(imported.size.height / imported.size.width, 0.75, accuracy: 0.001)
+            let restored = try XCTUnwrap(ReaderBackgroundStore.load(from: target))
+            XCTAssertEqual(restored.size, imported.size)
+        }
+        try data.write(to: target)
+        let legacy = try XCTUnwrap(ReaderBackgroundStore.load(from: target))
+        XCTAssertEqual(legacy.size.width, CGFloat(ReaderBackgroundStore.maximumPixelSize))
+    }
+
+    func testCorruptReplacementPreservesExistingBackground() throws {
+        let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        defer { try? FileManager.default.removeItem(at: directory) }
+        let target = directory.appendingPathComponent("background.jpg")
+        let image = UIGraphicsImageRenderer(size: CGSize(width: 40, height: 60)).image { context in
+            UIColor.blue.setFill()
+            context.fill(CGRect(x: 0, y: 0, width: 40, height: 60))
+        }
+        _ = try ReaderBackgroundStore.save(try XCTUnwrap(image.pngData()), to: target)
+        let saved = try Data(contentsOf: target)
+
+        XCTAssertThrowsError(try ReaderBackgroundStore.save(Data("not an image".utf8), to: target))
+        XCTAssertEqual(try Data(contentsOf: target), saved)
+        XCTAssertNotNil(ReaderBackgroundStore.load(from: target))
+    }
+
+    func testBackgroundPreservesPhotoOrientation() throws {
+        let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        defer { try? FileManager.default.removeItem(at: directory) }
+        let image = UIGraphicsImageRenderer(size: CGSize(width: 120, height: 60)).image { context in
+            UIColor.green.setFill()
+            context.fill(CGRect(x: 0, y: 0, width: 120, height: 60))
+        }
+        let data = NSMutableData()
+        let destination = try XCTUnwrap(CGImageDestinationCreateWithData(data, "public.jpeg" as CFString, 1, nil))
+        CGImageDestinationAddImage(destination, try XCTUnwrap(image.cgImage), [kCGImagePropertyOrientation: 6] as CFDictionary)
+        XCTAssertTrue(CGImageDestinationFinalize(destination))
+
+        let saved = try ReaderBackgroundStore.save(data as Data, to: directory.appendingPathComponent("background.jpg"))
+        XCTAssertEqual(saved.imageOrientation, .up)
+        XCTAssertEqual(saved.size.height / saved.size.width, 2, accuracy: 0.001)
+    }
+}
+
+@MainActor
+final class ReaderBookmarkPersistenceTests: XCTestCase {
+    func testBookmarkSurvivesNewActivityAndReaderInstances() async throws {
+        let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        defer { try? FileManager.default.removeItem(at: directory) }
+        let repository = FileReadingActivityRepository(
+            bookmarksURL: directory.appendingPathComponent("bookmarks.json"),
+            recordsURL: directory.appendingPathComponent("records.json")
+        )
+        let book = Book(bookUrl: "demo://saved-bookmark", name: "书", author: "作者")
+        let chapters = [BookChapter(url: "demo://chapter", title: "第一章", bookUrl: book.bookUrl, index: 0)]
+        let original = ReadingActivityModel(repository: repository, deviceID: "test")
+        await original.load()
+        await original.addBookmark(book: book, chapter: chapters[0], position: 40, content: String(repeating: "正文", count: 100))
+        XCTAssertNil(original.errorMessage)
+
+        let restored = ReadingActivityModel(repository: repository, deviceID: "test")
+        await restored.load()
+        let reader = ReaderViewModel(demoBook: book, chapters: chapters, initialIndex: 0, content: "正文")
+        XCTAssertEqual(reader.bookmarks(at: 40, in: restored.bookmarks).count, 1)
+        XCTAssertTrue(reader.bookmarks(at: 80, in: restored.bookmarks).isEmpty)
+        await restored.removeBookmark(try XCTUnwrap(restored.bookmarks.first))
+        XCTAssertTrue(reader.bookmarks(at: 40, in: restored.bookmarks).isEmpty)
+    }
+}
+
@MainActor
 final class ReaderScrollGeometryTests: XCTestCase {
    func testPrependingAndRecyclingStayWithinOnePhysicalPixel() async throws {
@@ -116,7 +269,7 @@ final class ReaderScrollGeometryTests: XCTestCase {
        .init(configuration: configuration(fontSize: fontSize), chapters: chapters,
              resetID: 0, activeIndex: active, loadingAhead: false, loadingBehind: false,
              onNeedChapters: { _ in }, onPositionChanged: { _, _ in },
-              onRetainChapters: { _ in }, onRetry: { _ in })
+              onRetainChapters: { _ in })
    }

    private func configuration(fontSize: Double = 20) -> ReaderTextView {