windows版本初步完成

2026-07-13 19:39:01 +08:00
parent 121cbf8b0b
commit 6c30026e32
37 changed files with 5583 additions and 624 deletions
--- a/lib/services/epub/epub_service.dart
+++ b/lib/services/epub/epub_service.dart
@@ -6,6 +6,7 @@ import 'package:uuid/uuid.dart';
 import 'epub_parser.dart';
 import '../../data/epub/reader_dao.dart';
 import '../../data/epub/reader_models.dart';
+import '../../utils/image_path_helper.dart';

 /// EPUB 服务层 - 管理导入、解压、删除
 class EpubService {
@@ -21,8 +22,8 @@ class EpubService {
    final fileName = p.basename(sourcePath);

    // 复制 EPUB 到永久存储（FilePicker 临时文件会被清理）
-    final appDir = await getApplicationDocumentsDirectory();
-    final bookDir = Directory(p.join(appDir.path, 'epub_books', bookId));
+    final appDirPath = await ImagePathHelper.getAppDir();
+    final bookDir = Directory(p.join(appDirPath, 'epub_books', bookId));
    if (!await bookDir.exists()) await bookDir.create(recursive: true);
    final permanentPath = p.join(bookDir.path, 'book.epub');
    await File(sourcePath).copy(permanentPath);
@@ -98,8 +99,8 @@ class EpubService {
      if (!await coverFile.exists()) return null;

      // 保存到 epub_books/{bookId}/ 目录下
-      final appDir = await getApplicationDocumentsDirectory();
-      final coverDir = p.join(appDir.path, 'epub_books', bookId);
+      final appDirPath = await ImagePathHelper.getAppDir();
+      final coverDir = p.join(appDirPath, 'epub_books', bookId);
      await Directory(coverDir).create(recursive: true);
      final ext = p.extension(coverFile.path).toLowerCase();
      final destPath = p.join(coverDir, 'cover$ext');
@@ -144,8 +145,8 @@ class EpubService {

    // 清理 epub_books/{bookId}/ 目录（epub + 封面）
    try {
-      final appDir = await getApplicationDocumentsDirectory();
-      final bookDir = Directory(p.join(appDir.path, 'epub_books', bookId));
+      final appDirPath = await ImagePathHelper.getAppDir();
+      final bookDir = Directory(p.join(appDirPath, 'epub_books', bookId));
      if (await bookDir.exists()) await bookDir.delete(recursive: true);
    } catch (_) {}

--- a/lib/services/epub/epub_webview_handler.dart
+++ b/lib/services/epub/epub_webview_handler.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 import 'dart:typed_data';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:path_provider/path_provider.dart';
 import 'epub_stream_service.dart';
+import '../../utils/image_path_helper.dart';

 /// Simple file reference with path and optional anchor.
 class Href {
@@ -34,8 +34,8 @@ class EpubWebViewHandler {

  static Future<String> getDocumentsPath() async {
    if (_documentsPath != null) return _documentsPath!;
-    final dir = await getApplicationDocumentsDirectory();
-    _documentsPath = '${dir.path}/';
+    final appDirPath = await ImagePathHelper.getAppDir();
+    _documentsPath = '$appDirPath/';
    return _documentsPath!;
  }

--- a/lib/services/font_download_manager.dart
+++ b/lib/services/font_download_manager.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:path/path.dart' as path;
-import 'package:path_provider/path_provider.dart';
+import '../utils/image_path_helper.dart';

 /// 本地字体扫描与加载管理器
 ///
@@ -131,8 +131,8 @@ class FontDownloadManager {
      return fontDir;
    }
    // iOS / 桌面端 fallback
-    final appDir = await getApplicationDocumentsDirectory();
-    final fontDir = Directory(path.join(appDir.path, 'fonts'));
+    final appDirPath = await ImagePathHelper.getAppDir();
+    final fontDir = Directory(path.join(appDirPath, 'fonts'));
    if (!await fontDir.exists()) {
      await fontDir.create(recursive: true);
    }
--- a/lib/services/sync/backup_service.dart
+++ b/lib/services/sync/backup_service.dart
@@ -10,6 +10,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sqflite/sqflite.dart';
 import '../../data/database_helper.dart';
 import '../../utils/user_prefs.dart';
+import '../../utils/image_path_helper.dart';

 /// 数据备份服务 - 支持导出和导入数据（包含图片）
 class BackupService {
@@ -17,6 +18,11 @@ class BackupService {

  BackupService._init();

+  /// 获取应用数据根目录（统一路径）
+  Future<String> _getAppDir() async {
+    return await ImagePathHelper.getAppDir();
+  }
+
  // ─── 共享导出逻辑 ─────────────────────────────────────

  /// 收集所有表数据和图片，构建 ZIP 文件
@@ -112,13 +118,25 @@ class BackupService {

    // 阶段2：后台 isolate 执行 JSON 编码 + ZIP 压缩（避免阻塞主线程动画）
    final tempDir = await getTemporaryDirectory();
-    final appDir = await getApplicationDocumentsDirectory();
+    final appDirPath = await _getAppDir();
+
+    // DEBUG: 诊断 Windows 导出图片缺失问题
+    final imagesRootPath = path.join(appDirPath, 'images');
+    debugPrint('[BackupService] DEBUG appDirPath=$appDirPath');
+    debugPrint('[BackupService] DEBUG imagesRoot=$imagesRootPath');
+    debugPrint('[BackupService] DEBUG imagePaths count=${imagePaths.length}');
+    for (final ip in imagePaths) {
+      final f = File(ip);
+      final exists = f.existsSync();
+      final match = ip.startsWith(imagesRootPath);
+      debugPrint('[BackupService] DEBUG path=$ip exists=$exists startsWithImagesRoot=$match');
+    }

    final result = await compute(_buildZipInIsolate, _ZipComputeParams(
      backupData: backupData,
      imagePaths: imagePaths.toList(),
      tempDirPath: tempDir.path,
-      appDirPath: appDir.path,
+      appDirPath: appDirPath,
    ));

    return _ExportData(
@@ -144,19 +162,17 @@ class BackupService {

      String? finalPath;
      try {
-        // FilePicker.saveFile 需要 bytes，这里必须读入内存
-        final zipBytes = await zipFile.readAsBytes();
        final outputPath = await FilePicker.platform.saveFile(
          dialogTitle: '保存备份文件',
          fileName: fileName,
          type: FileType.custom,
          allowedExtensions: ['zip'],
-          bytes: zipBytes,
        );
        if (outputPath == null) {
          await zipFile.delete();
          return ExportResult.cancelled();
        }
+        await zipFile.copy(outputPath);
        finalPath = outputPath;
      } catch (e) {
        // FilePicker 不可用时，复制到临时目录
@@ -239,8 +255,8 @@ class BackupService {

        backupData = jsonDecode(utf8.decode(dataFile.content as List<int>)) as Map<String, dynamic>;

-        final appDir = await getApplicationDocumentsDirectory();
-        final imagesDir = Directory(path.join(appDir.path, 'images'));
+        final appDirPath = await _getAppDir();
+        final imagesDir = Directory(path.join(appDirPath, 'images'));
        if (!await imagesDir.exists()) await imagesDir.create(recursive: true);

        for (final archiveFile in archive) {
@@ -254,7 +270,7 @@ class BackupService {
            imageCount++;
          } else if (archiveFile.name.startsWith('epub_books/')) {
            final relativePath = archiveFile.name.substring(12);
-            final epubDir = Directory(path.join(appDir.path, 'epub_books'));
+            final epubDir = Directory(path.join(appDirPath, 'epub_books'));
            if (!await epubDir.exists()) await epubDir.create(recursive: true);
            final outputFile = File(path.join(epubDir.path, relativePath));
            if (!await outputFile.parent.exists()) await outputFile.parent.create(recursive: true);
@@ -401,8 +417,8 @@ class BackupService {
      final epubFileMap = <String, String>{};
      int imageCount = 0;

-      final appDir = await getApplicationDocumentsDirectory();
-      final imagesDir = Directory(path.join(appDir.path, 'images'));
+      final appDirPath = await _getAppDir();
+      final imagesDir = Directory(path.join(appDirPath, 'images'));
      if (!await imagesDir.exists()) await imagesDir.create(recursive: true);

      for (final archiveFile in archive) {
@@ -415,7 +431,7 @@ class BackupService {
          imageCount++;
        } else if (archiveFile.name.startsWith('epub_books/')) {
          final relativePath = archiveFile.name.substring(12);
-          final epubDir = Directory(path.join(appDir.path, 'epub_books'));
+          final epubDir = Directory(path.join(appDirPath, 'epub_books'));
          if (!await epubDir.exists()) await epubDir.create(recursive: true);
          final outputFile = File(path.join(epubDir.path, relativePath));
          if (!await outputFile.parent.exists()) await outputFile.parent.create(recursive: true);
@@ -627,12 +643,11 @@ class BackupService {

  /// 将绝对路径转为 images/ 下的相对路径（用于 imagePathMap key）
  String _toRelativePath(String absolutePath) {
+    // 统一为正斜杠，避免 Windows 反斜杠与 zip 内正斜杠不匹配
+    final normalized = absolutePath.replaceAll('\\', '/');
    // 尝试提取 images/ 后面的部分
-    final idx = absolutePath.indexOf('/images/');
-    if (idx >= 0) return absolutePath.substring(idx + 8); // skip '/images/'
-    // Windows 路径
-    final winIdx = absolutePath.indexOf('\\images\\');
-    if (winIdx >= 0) return absolutePath.substring(winIdx + 8);
+    final idx = normalized.indexOf('/images/');
+    if (idx >= 0) return normalized.substring(idx + 8); // skip '/images/'
    return path.basename(absolutePath);
  }

@@ -683,10 +698,9 @@ class BackupService {

  /// 从绝对路径中提取 epub_books/ 下的相对路径
  String? _toEpubRelativePath(String absolutePath) {
-    final idx = absolutePath.indexOf('/epub_books/');
-    if (idx >= 0) return absolutePath.substring(idx + 13); // skip '/epub_books/'
-    final winIdx = absolutePath.indexOf('\\epub_books\\');
-    if (winIdx >= 0) return absolutePath.substring(winIdx + 13);
+    final normalized = absolutePath.replaceAll('\\', '/');
+    final idx = normalized.indexOf('/epub_books/');
+    if (idx >= 0) return normalized.substring(idx + 13); // skip '/epub_books/'
    return null;
  }

@@ -910,14 +924,16 @@ _ZipComputeResult _buildZipInIsolate(_ZipComputeParams params) {
    dataFile.deleteSync();

    int imageCount = 0;
-    final imagesRoot = path.join(params.appDirPath, 'images');

    for (final imagePath in params.imagePaths) {
      final file = File(imagePath);
      if (file.existsSync()) {
+        // 统一用 /images/ 子串匹配提取相对路径，兼容旧路径（路径前缀可能不含 mooknote 子目录）
+        final normalized = imagePath.replaceAll('\\', '/');
+        final idx = normalized.indexOf('/images/');
        String relativePath;
-        if (imagePath.startsWith(imagesRoot)) {
-          relativePath = imagePath.substring(imagesRoot.length + 1);
+        if (idx >= 0) {
+          relativePath = normalized.substring(idx + 8); // skip '/images/'
        } else {
          relativePath = path.basename(imagePath);
        }
--- a/lib/services/sync/cache_cleaner.dart
+++ b/lib/services/sync/cache_cleaner.dart
@@ -1,9 +1,11 @@
+import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as path;
-import '../../providers/app_provider.dart';
 import '../../data/database_helper.dart';
+import '../../utils/image_path_helper.dart';
+import '../../utils/user_prefs.dart';

 /// 缓存清理服务
 class CacheCleaner {
@@ -11,10 +13,10 @@ class CacheCleaner {
  static final CacheCleaner instance = CacheCleaner._();

  /// 执行完整缓存清理，返回各分类删除数量
-  Future<CacheCleanResult> clean(AppProvider provider) async {
-    final dbImagePaths = await _getAllDbImagePaths(provider);
+  Future<CacheCleanResult> clean() async {
+    final dbImagePaths = await _getAllDbImagePaths();
    final deletedImages = await _cleanImageDirectory(dbImagePaths);
-    final deletedEpubs = await _cleanOrphanedEpubBooks(provider);
+    final deletedEpubs = await _cleanOrphanedEpubBooks();
    final deletedTemp = await _cleanTempDirectory();
    final deletedEmptyDirs = await _cleanEmptyDirectories();
    return CacheCleanResult(
@@ -25,44 +27,87 @@ class CacheCleaner {
    );
  }

-  Future<Set<String>> _getAllDbImagePaths(AppProvider provider) async {
+  /// 直接查 DB 收集所有图片路径（含软删除记录，与 BackupService 保持一致）
+  Future<Set<String>> _getAllDbImagePaths() async {
+    final db = await DatabaseHelper.instance.database;
    final paths = <String>{};
-    for (final movie in provider.movies) {
-      if (movie.posterPath?.isNotEmpty == true) paths.add(movie.posterPath!);
+
+    // 影视海报
+    final movies = await db.query('movies', columns: ['poster_path']);
+    for (final m in movies) {
+      final p = m['poster_path'] as String?;
+      if (p != null && p.isNotEmpty) paths.add(p);
    }
-    for (final book in provider.books) {
-      if (book.coverPath?.isNotEmpty == true) paths.add(book.coverPath!);
+
+    // 书籍封面
+    final books = await db.query('books', columns: ['cover_path']);
+    for (final b in books) {
+      final p = b['cover_path'] as String?;
+      if (p != null && p.isNotEmpty) paths.add(p);
    }
-    for (final note in provider.notes) {
-      for (final p in note.images) {
-        if (p.isNotEmpty) paths.add(p);
+
+    // 笔记图片
+    final notes = await db.query('notes', columns: ['images']);
+    for (final n in notes) {
+      final imagesJson = n['images'] as String?;
+      if (imagesJson != null && imagesJson.isNotEmpty) {
+        try {
+          for (final ip in jsonDecode(imagesJson) as List<dynamic>) {
+            if (ip is String && ip.isNotEmpty) paths.add(ip);
+          }
+        } catch (_) {}
      }
    }
-    for (final movieId in provider.movies.map((m) => m.id)) {
-      for (final poster in await provider.getMoviePosters(movieId)) {
-        if (poster.posterPath.isNotEmpty) paths.add(poster.posterPath);
-      }
+
+    // 影视海报墙图片
+    final moviePosters = await db.query('movie_posters', columns: ['poster_path']);
+    for (final p in moviePosters) {
+      final pp = p['poster_path'] as String?;
+      if (pp != null && pp.isNotEmpty) paths.add(pp);
    }
-    for (final game in provider.games) {
-      if (game.coverPath?.isNotEmpty == true) paths.add(game.coverPath!);
+
+    // 游戏封面
+    final games = await db.query('games', columns: ['cover_path']);
+    for (final g in games) {
+      final p = g['cover_path'] as String?;
+      if (p != null && p.isNotEmpty) paths.add(p);
    }
-    for (final gameId in provider.games.map((g) => g.id)) {
-      for (final screenshot in await provider.getGameScreenshots(gameId)) {
-        if (screenshot.screenshotPath.isNotEmpty) paths.add(screenshot.screenshotPath);
-      }
+
+    // 游戏截图
+    final gameScreenshots = await db.query('game_screenshots', columns: ['screenshot_path']);
+    for (final s in gameScreenshots) {
+      final p = s['screenshot_path'] as String?;
+      if (p != null && p.isNotEmpty) paths.add(p);
    }
+
+    // 用户头像
+    final userPrefs = UserPrefs();
+    final avatarPath = userPrefs.avatarPath;
+    if (avatarPath != null && avatarPath.isNotEmpty) paths.add(avatarPath);
+
    return paths;
  }

+  /// 规范化路径用于跨平台比较（统一分隔符、去掉末尾分隔符）
+  /// Windows 上 DB 存的路径和文件系统遍历得到的路径分隔符可能不一致，
+  /// 直接字符串比较会漏匹配导致图片被误删。
+  String _normalize(String p) {
+    // 统一为正斜杠后再用 path.normalize 处理 .. 和 . 等
+    final unified = p.replaceAll('\\', '/');
+    return path.normalize(unified);
+  }
+
  Future<int> _cleanImageDirectory(Set<String> dbImagePaths) async {
    int deletedCount = 0;
    try {
-      final appDir = await getApplicationDocumentsDirectory();
-      final imagesDir = Directory('${appDir.path}/images');
+      final appDirPath = await ImagePathHelper.getAppDir();
+      final imagesDir = Directory(path.join(appDirPath, 'images'));
      if (!await imagesDir.exists()) return 0;
+      // 预先规范化 DB 路径，避免每个文件都做转换
+      final normalizedDbPaths = dbImagePaths.map(_normalize).toSet();
      await for (final entity in imagesDir.list(recursive: true, followLinks: false)) {
        if (entity is File &&
-            !dbImagePaths.contains(entity.path) &&
+            !normalizedDbPaths.contains(_normalize(entity.path)) &&
            !path.basename(entity.path).startsWith('avatar')) {
          try {
            await entity.delete();
@@ -76,7 +121,7 @@ class CacheCleaner {
    return deletedCount;
  }

-  Future<int> _cleanOrphanedEpubBooks(AppProvider provider) async {
+  Future<int> _cleanOrphanedEpubBooks() async {
    int deletedCount = 0;
    try {
      final db = await DatabaseHelper.instance.database;
@@ -91,9 +136,10 @@ class CacheCleaner {
        _collectEpubDirName(r['cover_path'] as String?, usedDirs);
      }

-      final appDir = await getApplicationDocumentsDirectory();
+      final appDirPath = await ImagePathHelper.getAppDir();
      final possiblePaths = [
-        '${appDir.path}/epub_books',
+        path.join(appDirPath, 'epub_books'),
+        // Android 旧版绝对路径（path.join 在 Windows 上不会破坏它）
        '/data/user/0/top.iletter.mooknote/app_flutter/epub_books',
      ];

@@ -118,16 +164,36 @@ class CacheCleaner {
    return deletedCount;
  }

+  /// 从路径中提取 epub_books/{bookId} 的 bookId 部分
+  /// 兼容 Windows(\) 和 Unix(/) 分隔符
  void _collectEpubDirName(String? pathStr, Set<String> dirs) {
    if (pathStr == null || pathStr.isEmpty) return;
+    // 统一为正斜杠便于查找 marker
+    final unified = pathStr.replaceAll('\\', '/');
    final marker = '/epub_books/';
-    final idx = pathStr.indexOf(marker);
+    final idx = unified.indexOf(marker);
    if (idx < 0) return;
-    final rest = pathStr.substring(idx + marker.length);
+    final rest = unified.substring(idx + marker.length);
    final slashIdx = rest.indexOf('/');
    dirs.add(slashIdx >= 0 ? rest.substring(0, slashIdx) : rest);
  }

+  /// mooknote 自己产生的临时文件名前缀
+  static const _tempPrefixes = [
+    'book_poster_',
+    'movie_poster_',
+    'note_share_',
+    'mooknote_download',
+    'mooknote_bidir',
+  ];
+
+  bool _isMooknoteTempFile(String name) {
+    for (final prefix in _tempPrefixes) {
+      if (name.startsWith(prefix)) return true;
+    }
+    return false;
+  }
+
  Future<int> _cleanTempDirectory() async {
    int deletedCount = 0;
    final now = DateTime.now();
@@ -138,11 +204,7 @@ class CacheCleaner {
        await for (final entity in tempDir.list(followLinks: false)) {
          if (entity is File) {
            final name = path.basename(entity.path);
-            if (name.startsWith('book_poster_') ||
-                name.startsWith('movie_poster_') ||
-                name.startsWith('note_share_') ||
-                name.startsWith('mooknote_download') ||
-                name.startsWith('mooknote_bidir')) {
+            if (_isMooknoteTempFile(name)) {
              try {
                final stat = await entity.stat();
                if (now.difference(stat.modified).inHours >= 1) {
@@ -158,15 +220,20 @@ class CacheCleaner {
      debugPrint('清理临时目录失败: $e');
    }

+    // cacheDir 只删 mooknote 自己产生的临时文件，不再无差别全清
+    // （Windows/Flutter 引擎也在该目录放缓存文件，全清可能误伤）
    try {
      final cacheDir = await getApplicationCacheDirectory();
      if (await cacheDir.exists()) {
        await for (final entity in cacheDir.list(recursive: true, followLinks: false)) {
          if (entity is File) {
-            try {
-              await entity.delete();
-              deletedCount++;
-            } catch (_) {}
+            final name = path.basename(entity.path);
+            if (_isMooknoteTempFile(name)) {
+              try {
+                await entity.delete();
+                deletedCount++;
+              } catch (_) {}
+            }
          }
        }
      }
@@ -180,11 +247,11 @@ class CacheCleaner {
  Future<int> _cleanEmptyDirectories() async {
    int deletedCount = 0;
    try {
-      final appDir = await getApplicationDocumentsDirectory();
+      final appDirPath = await ImagePathHelper.getAppDir();
      final cacheDir = await getApplicationCacheDirectory();
      final dirs = [
-        Directory('${appDir.path}/images'),
-        Directory('${appDir.path}/epub_books'),
+        Directory(path.join(appDirPath, 'images')),
+        Directory(path.join(appDirPath, 'epub_books')),
        cacheDir,
      ];
      for (final dir in dirs) {