Merge pull request #410 from venera-app/v1.4.5-dev

V1.4.5

assets/translation.json

@@ -389,9 +389,12 @@
     "Do not report any issues related to sources to App repo.": "请不要向App仓库报告任何与源相关的问题",
     "Show single image on first page": "在首页显示单张图片",
     "Click to select an image": "点击选择一张图片",
-    "Source URL": "源地址",
+    "Repo URL": "仓库地址",
     "The URL should point to a 'index.json' file": "该URL应指向一个'index.json'文件",
-    "Double tap to zoom": "双击缩放"
+    "Double tap to zoom": "双击缩放",
+    "Clear Unfavorited": "清除未收藏",
+    "Reverse": "反转",
+    "Delete Chapters": "删除章节"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -783,8 +786,11 @@
     "Do not report any issues related to sources to App repo.": "請不要向App倉庫報告任何與源相關的問題",
     "Show single image on first page": "在首頁顯示單張圖片",
     "Click to select an image": "點擊選擇一張圖片",
-    "Source URL": "源地址",
+    "Repo URL": "倉庫地址",
     "The URL should point to a 'index.json' file": "該URL應指向一個'index.json'文件",
-    "Double tap to zoom": "雙擊縮放"
+    "Double tap to zoom": "雙擊縮放",
+    "Clear Unfavorited": "清除未收藏",
+    "Reverse": "反轉",
+    "Delete Chapters": "刪除章節"
   }
 }

doc/comic_source.md

@@ -9,13 +9,45 @@ Venera uses [flutter_qjs](https://github.com/wgh136/flutter_qjs) as js engine wh
 
 This document will describe how to write a comic source for Venera.
 
-## Preparation
+## Comic Source List
+
+Venera can display a list of comic sources in the app.
+
+You should provide a repository url to let the app load the comic source list.
+The url should point to a JSON file that contains the list of comic sources.
+
+The JSON file should have the following format:
+
+```json
+[
+  {
+    "name": "Source Name",
+    "url": "https://example.com/source.js",
+    "filename": "Relative path to the source file",
+    "version": "1.0.0",
+    "description": "A brief description of the source"
+  }
+]
+```
+
+Only one of `url` and `filename` should be provided.
+The description field is optional.
+
+Currently, you can use the following repo url:
+```
+https://cdn.jsdelivr.net/gh/venera-app/venera-configs@main/index.json
+```
+The repo is maintained by the Venera team, and you can submit a pull request to add your comic source.
+
+## Create a Comic Source
+
+### Preparation
 
 - Install Venera. Using flutter to run the project is recommended since it's easier to debug.
 - An editor that supports javascript.
 - Download template and venera javascript api from [here](https://github.com/venera-app/venera-configs).
 
-## Start Writing
+### Start Writing
 
 The template contains detailed comments and examples. You can refer to it when writing your own comic source.
 
@@ -23,7 +55,7 @@ Here is a brief introduction to the template:
 
 > Note: Javascript api document is [here](js_api.md).
 
-### Write basic information
+#### Write basic information
 
 ```javascript
 class NewComicSource extends ComicSource {
@@ -49,7 +81,7 @@ In this part, you need to do the following:
 - Change the class name to your source name.
 - Fill in the name, key, version, minAppVersion, and url fields.
 
-### init function
+#### init function
 
 ```javascript
     /**
@@ -64,7 +96,7 @@ The function will be called when the source is initialized. You can do some init
 
 Remove this function if not used.
 
-### Account
+#### Account
 
 ```javascript
 // [Optional] account related
@@ -140,7 +172,7 @@ In this part, you can implement login, logout, and register functions.
 
 Remove this part if not used.
 
-### Explore page
+#### Explore page
 
 ```javascript
     // explore page list
@@ -185,7 +217,7 @@ There are three types of explore pages:
 - multiPageComicList: An explore page contains multiple comics, the comics are loaded page by page.
 - mixed: An explore page contains multiple parts, each part can be a list of comics or a block of comics which have a title and a view more button.
 
-### Category Page
+#### Category Page
 
 ```javascript
     // categories
@@ -227,7 +259,7 @@ Category page is a static page that contains multiple parts, each part contains
 
 A comic source can only have one category page.
 
-### Category Comics Page
+#### Category Comics Page
 
 ```javascript
     /// category comic loading related
@@ -280,7 +312,7 @@ When user clicks on a category, the category comics page will be displayed.
 
 This part is used to load comics of a category.
 
-### Search
+#### Search
 
 ```javascript
     /// search related
@@ -339,7 +371,7 @@ This part is used to load search results.
 `load` and `loadNext` functions are used to load search results. 
 If `load` function is implemented, `loadNext` function will be ignored.
 
-### Favorites
+#### Favorites
 
 ```javascript
     // favorite related
@@ -411,7 +443,7 @@ This part is used to manage network favorites of the source.
 `load` and `loadNext` functions are used to load search results.
 If `load` function is implemented, `loadNext` function will be ignored.
 
-### Comic Details
+#### Comic Details
 
 ```javascript
     /// single comic related
@@ -576,7 +608,7 @@ If `load` function is implemented, `loadNext` function will be ignored.
 
 This part is used to load comic details.
 
-### Settings
+#### Settings
 
 ```javascript
     /*
@@ -635,7 +667,7 @@ This part is used to load comic details.
 This part is used to provide settings for the source.
 
 
-### Translations
+#### Translations
 
 ```javascript
     // [Optional] translations for the strings in this config

lib/components/message.dart

@@ -290,7 +290,8 @@ class ContentDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var content = Column(
+    var content = SingleChildScrollView(
+      child: Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -312,6 +313,7 @@ class ContentDialog extends StatelessWidget {
           ).paddingRight(12),
           const SizedBox(height: 16),
         ],
+      ),
     );
     return Dialog(
       shape: RoundedRectangleBorder(

lib/foundation/app.dart

@@ -13,7 +13,7 @@ export "widget_utils.dart";
 export "context.dart";
 
 class _App {
-  final version = "1.4.3";
+  final version = "1.4.5";
 
   bool get isAndroid => Platform.isAndroid;
 

lib/foundation/appdata.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:venera/foundation/app.dart';
+import 'package:venera/foundation/log.dart';
 import 'package:venera/utils/data_sync.dart';
 import 'package:venera/utils/init.dart';
 import 'package:venera/utils/io.dart';
@@ -110,6 +111,7 @@ class Appdata with Init {
     if (!await file.exists()) {
       return;
     }
+    try {
       var json = jsonDecode(await file.readAsString());
       for (var key in (json['settings'] as Map<String, dynamic>).keys) {
         if (json['settings'][key] != null) {
@@ -117,14 +119,23 @@ class Appdata with Init {
         }
       }
       searchHistory = List.from(json['searchHistory']);
+    }
+    catch(e) {
+      Log.error("Appdata", "Failed to load appdata", e);
+      Log.info("Appdata", "Resetting appdata");
+      file.deleteIgnoreError();
+    }
+    try {
       var implicitDataFile = File(FilePath.join(dataPath, 'implicitData.json'));
       if (await implicitDataFile.exists()) {
-      try {
         implicitData = jsonDecode(await implicitDataFile.readAsString());
       }
-      catch(_) {
-        // ignore
     }
+    catch (e) {
+      Log.error("Appdata", "Failed to load implicit data", e);
+      Log.info("Appdata", "Resetting implicit data");
+      var implicitDataFile = File(FilePath.join(dataPath, 'implicitData.json'));
+      implicitDataFile.deleteIgnoreError();
     }
   }
 }
@@ -178,7 +189,7 @@ class Settings with ChangeNotifier {
     'customImageProcessing': defaultCustomImageProcessing,
     'sni': true,
     'autoAddLanguageFilter': 'none', // none, chinese, english, japanese
-    'comicSourceListUrl': defaultComicSourceUrl,
+    'comicSourceListUrl': '',
     'preloadImageCount': 4,
     'followUpdatesFolder': null,
     'initialPage': '0',
@@ -194,8 +205,10 @@ class Settings with ChangeNotifier {
 
   operator []=(String key, dynamic value) {
     _data[key] = value;
+    if (key != "dataVersion") {
       notifyListeners();
     }
+  }
 
   @override
   String toString() {
@@ -220,5 +233,3 @@ function processImage(image, cid, eid, page, sourceKey) {
     return futureImage;
 }
 ''';
-
-const defaultComicSourceUrl = "https://cdn.jsdelivr.net/gh/venera-app/venera-configs@latest/index.json";

lib/foundation/comic_source/models.dart

@@ -116,6 +116,26 @@ class Comic {
   toString() => "$sourceKey@$id";
 }
 
+class ComicID {
+  final ComicType type;
+
+  final String id;
+
+  const ComicID(this.type, this.id);
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! ComicID) return false;
+    return other.type == type && other.id == id;
+  }
+
+  @override
+  int get hashCode => type.hashCode ^ id.hashCode;
+
+  @override
+  String toString() => "$type@$id";
+}
+
 class ComicDetails with HistoryMixin {
   @override
   final String title;

lib/foundation/favorites.dart

@@ -653,6 +653,102 @@ class LocalFavoritesManager with ChangeNotifier {
     notifyListeners();
   }
 
+  void batchMoveFavorites(
+      String sourceFolder, String targetFolder, List<FavoriteItem> items) {
+    _modifiedAfterLastCache = true;
+
+    if (!existsFolder(sourceFolder)) {
+      throw Exception("Source folder does not exist");
+    }
+    if (!existsFolder(targetFolder)) {
+      throw Exception("Target folder does not exist");
+    }
+
+    _db.execute("BEGIN TRANSACTION");
+    var displayOrder = maxValue(targetFolder) + 1;
+    try {
+      for (var item in items) {
+        _db.execute("""
+          insert or ignore into "$targetFolder" (id, name, author, type, tags, cover_path, time, display_order)
+          select id, name, author, type, tags, cover_path, time, ?
+          from "$sourceFolder"
+          where id == ? and type == ?;
+        """, [displayOrder, item.id, item.type.value]);
+
+        _db.execute("""
+          delete from "$sourceFolder"
+          where id == ? and type == ?;
+        """, [item.id, item.type.value]);
+
+        displayOrder++;
+      }
+      notifyListeners();
+    } catch (e) {
+      Log.error("Batch Move Favorites", e.toString());
+      _db.execute("ROLLBACK");
+      return;
+    }
+    _db.execute("COMMIT");
+
+    // Update counts
+    if (counts[targetFolder] == null) {
+      counts[targetFolder] = count(targetFolder);
+    } else {
+      counts[targetFolder] = counts[targetFolder]! + items.length;
+    }
+
+    if (counts[sourceFolder] != null) {
+      counts[sourceFolder] = counts[sourceFolder]! - items.length;
+    } else {
+      counts[sourceFolder] = count(sourceFolder);
+    }
+
+    notifyListeners();
+  }
+
+  void batchCopyFavorites(
+      String sourceFolder, String targetFolder, List<FavoriteItem> items) {
+    _modifiedAfterLastCache = true;
+
+    if (!existsFolder(sourceFolder)) {
+      throw Exception("Source folder does not exist");
+    }
+    if (!existsFolder(targetFolder)) {
+      throw Exception("Target folder does not exist");
+    }
+
+    _db.execute("BEGIN TRANSACTION");
+    var displayOrder = maxValue(targetFolder) + 1;
+    try {
+      for (var item in items) {
+        _db.execute("""
+          insert or ignore into "$targetFolder" (id, name, author, type, tags, cover_path, time, display_order)
+          select id, name, author, type, tags, cover_path, time, ?
+          from "$sourceFolder"
+          where id == ? and type == ?;
+        """, [displayOrder, item.id, item.type.value]);
+
+        displayOrder++;
+      }
+      notifyListeners();
+    } catch (e) {
+      Log.error("Batch Copy Favorites", e.toString());
+      _db.execute("ROLLBACK");
+      return;
+    }
+
+    _db.execute("COMMIT");
+
+    // Update counts
+    if (counts[targetFolder] == null) {
+      counts[targetFolder] = count(targetFolder);
+    } else {
+      counts[targetFolder] = counts[targetFolder]! + items.length;
+    }
+
+    notifyListeners();
+  }
+
   /// delete a folder
   void deleteFolder(String name) {
     _modifiedAfterLastCache = true;
@@ -667,11 +763,6 @@ class LocalFavoritesManager with ChangeNotifier {
     notifyListeners();
   }
 
-  void deleteComic(String folder, FavoriteItem comic) {
-    _modifiedAfterLastCache = true;
-    deleteComicWithId(folder, comic.id, comic.type);
-  }
-
   void deleteComicWithId(String folder, String id, ComicType type) {
     _modifiedAfterLastCache = true;
     LocalFavoriteImageProvider.delete(id, type.value);
@@ -687,6 +778,55 @@ class LocalFavoritesManager with ChangeNotifier {
     notifyListeners();
   }
 
+  void batchDeleteComics(String folder, List<FavoriteItem> comics) {
+    _modifiedAfterLastCache = true;
+    _db.execute("BEGIN TRANSACTION");
+    try {
+      for (var comic in comics) {
+        LocalFavoriteImageProvider.delete(comic.id, comic.type.value);
+        _db.execute("""
+          delete from "$folder"
+          where id == ? and type == ?;
+        """, [comic.id, comic.type.value]);
+      }
+      if (counts[folder] != null) {
+        counts[folder] = counts[folder]! - comics.length;
+      } else {
+        counts[folder] = count(folder);
+      }
+    } catch (e) {
+      Log.error("Batch Delete Comics", e.toString());
+      _db.execute("ROLLBACK");
+      return;
+    }
+    _db.execute("COMMIT");
+    notifyListeners();
+  }
+
+  void batchDeleteComicsInAllFolders(List<ComicID> comics) {
+    _modifiedAfterLastCache = true;
+    _db.execute("BEGIN TRANSACTION");
+    var folderNames = _getFolderNamesWithDB();
+    try {
+      for (var comic in comics) {
+        LocalFavoriteImageProvider.delete(comic.id, comic.type.value);
+        for (var folder in folderNames) {
+          _db.execute("""
+            delete from "$folder"
+            where id == ? and type == ?;
+          """, [comic.id, comic.type.value]);
+        }
+      }
+    } catch (e) {
+      Log.error("Batch Delete Comics in All Folders", e.toString());
+      _db.execute("ROLLBACK");
+      return;
+    }
+    initCounts();
+    _db.execute("COMMIT");
+    notifyListeners();
+  }
+
   Future<int> removeInvalid() async {
     int count = 0;
     await Future.microtask(() {
@@ -714,11 +854,26 @@ class LocalFavoritesManager with ChangeNotifier {
     if (!existsFolder(folder)) {
       throw Exception("Failed to reorder: folder not found");
     }
-    deleteFolder(folder);
-    createFolder(folder);
+    _db.execute("BEGIN TRANSACTION");
+    try {
       for (int i = 0; i < newFolder.length; i++) {
-      addComic(folder, newFolder[i], i);
+        _db.execute("""
+          update "$folder"
+          set display_order = ?
+          where id == ? and type == ?;
+        """, [
+          i,
+          newFolder[i].id,
+          newFolder[i].type.value
+        ]);
       }
+    }
+    catch (e) {
+      Log.error("Reorder", e.toString());
+      _db.execute("ROLLBACK");
+      return;
+    }
+    _db.execute("COMMIT");
     notifyListeners();
   }
 
@@ -743,6 +898,8 @@ class LocalFavoritesManager with ChangeNotifier {
       set folder_name = ?
       where folder_name == ?;
     """, [after, before]);
+    counts[after] = counts[before] ?? 0;
+    counts.remove(before);
     notifyListeners();
   }
 

lib/foundation/history.dart

@@ -10,6 +10,7 @@ import 'package:flutter/widgets.dart' show ChangeNotifier;
 import 'package:sqlite3/sqlite3.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/comic_type.dart';
+import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/image_provider/image_favorites_provider.dart';
 import 'package:venera/foundation/log.dart';
 import 'package:venera/utils/ext.dart';
@@ -305,6 +306,31 @@ class HistoryManager with ChangeNotifier {
     notifyListeners();
   }
 
+void clearUnfavoritedHistory() {
+  _db.execute('BEGIN TRANSACTION;');
+  try {
+    final idAndTypes = _db.select("""
+      select id, type from history;
+    """);
+    for (var element in idAndTypes) {
+      final id = element["id"] as String;
+      final type = ComicType(element["type"] as int);
+      if (!LocalFavoritesManager().isExist(id, type)) {
+        _db.execute("""
+          delete from history
+          where id == ? and type == ?;
+        """, [id, type.value]);
+      }
+    }
+    _db.execute('COMMIT;');
+  } catch (e) {
+    _db.execute('ROLLBACK;');
+    rethrow;
+  }
+  updateCache();
+  notifyListeners();
+}
+
   void remove(String id, ComicType type) async {
     _db.execute("""
       delete from history
@@ -380,4 +406,23 @@ class HistoryManager with ChangeNotifier {
     isInitialized = false;
     _db.dispose();
   }
+
+  void batchDeleteHistories(List<ComicID> histories) {
+    if (histories.isEmpty) return;
+    _db.execute('BEGIN TRANSACTION;');
+    try {
+      for (var history in histories) {
+        _db.execute("""
+          delete from history
+          where id == ? and type == ?;
+        """, [history.id, history.type.value]);
+      }
+      _db.execute('COMMIT;');
+    } catch (e) {
+      _db.execute('ROLLBACK;');
+      rethrow;
+    }
+    updateCache();
+    notifyListeners();
+  }
 }

lib/foundation/local.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
+import 'dart:isolate';
 
 import 'package:flutter/widgets.dart' show ChangeNotifier;
+import 'package:flutter_saf/flutter_saf.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
@@ -107,15 +109,42 @@ class LocalComic with HistoryMixin implements Comic {
 
   void read() {
     var history = HistoryManager().find(id, comicType);
+    int? firstDownloadedChapter;
+    int? firstDownloadedChapterGroup;
+    if (downloadedChapters.isNotEmpty && chapters != null) {
+      final chapters = this.chapters!;
+      if (chapters.isGrouped) {
+        for (int i=0; i<chapters.groupCount; i++) {
+          var group = chapters.getGroupByIndex(i);
+          var keys = group.keys.toList();
+          for (int j=0; j<keys.length; j++) {
+            var chapterId = keys[j];
+            if (downloadedChapters.contains(chapterId)) {
+              firstDownloadedChapter = j + 1;
+              firstDownloadedChapterGroup = i + 1;
+              break;
+            }
+          }
+        }
+      } else {
+        var keys = chapters.allChapters.keys;
+        for (int i = 0; i < keys.length; i++) {
+          if (downloadedChapters.contains(keys.elementAt(i))) {
+            firstDownloadedChapter = i + 1;
+            break;
+          }
+        }
+      }
+    }
     App.rootContext.to(
       () => Reader(
         type: comicType,
         cid: id,
         name: title,
         chapters: chapters,
-        initialChapter: history?.ep,
+        initialChapter: history?.ep ?? firstDownloadedChapter,
         initialPage: history?.page,
-        initialChapterGroup: history?.group,
+        initialChapterGroup: history?.group ?? firstDownloadedChapterGroup,
         history: history ??
             History.fromModel(
               model: this,
@@ -461,7 +490,7 @@ class LocalManager with ChangeNotifier {
     if (comic != null) {
       return Directory(FilePath.join(path, comic.directory));
     }
-    const comicDirectoryMaxLength = 128;
+    const comicDirectoryMaxLength = 80;
     if (name.length > comicDirectoryMaxLength) {
       name = name.substring(0, comicDirectoryMaxLength);
     }
@@ -546,6 +575,96 @@ class LocalManager with ChangeNotifier {
     remove(c.id, c.comicType);
     notifyListeners();
   }
+
+  void deleteComicChapters(LocalComic c, List<String> chapters) {
+    if (chapters.isEmpty) {
+      return;
+    }
+    var newDownloadedChapters = c.downloadedChapters
+        .where((e) => !chapters.contains(e))
+        .toList();
+    if (newDownloadedChapters.isNotEmpty) {
+      _db.execute(
+        'UPDATE comics SET downloadedChapters = ? WHERE id = ? AND comic_type = ?;',
+        [
+          jsonEncode(newDownloadedChapters),
+          c.id,
+          c.comicType.value,
+        ],
+      );
+    } else {
+      _db.execute(
+        'DELETE FROM comics WHERE id = ? AND comic_type = ?;',
+        [c.id, c.comicType.value],
+      );
+    }
+    var shouldRemovedDirs = <Directory>[];
+    for (var chapter in chapters) {
+      var dir = Directory(FilePath.join(c.baseDir, chapter));
+      if (dir.existsSync()) {
+        shouldRemovedDirs.add(dir);
+      }
+    }
+    if (shouldRemovedDirs.isNotEmpty) {
+      _deleteDirectories(shouldRemovedDirs);
+    }
+    notifyListeners();
+  }
+
+  void batchDeleteComics(List<LocalComic> comics, [bool removeFileOnDisk = true]) {
+    if (comics.isEmpty) {
+      return;
+    }
+
+    var shouldRemovedDirs = <Directory>[];
+    _db.execute('BEGIN TRANSACTION;');
+    try {
+      for (var c in comics) {
+        if (removeFileOnDisk) {
+          var dir = Directory(FilePath.join(path, c.directory));
+          if (dir.existsSync()) {
+            shouldRemovedDirs.add(dir);
+          }
+        }
+        _db.execute(
+          'DELETE FROM comics WHERE id = ? AND comic_type = ?;',
+          [c.id, c.comicType.value],
+        );
+      }
+    }
+    catch(e, s) {
+      Log.error("LocalManager", "Failed to batch delete comics: $e", s);
+      _db.execute('ROLLBACK;');
+      return;
+    }
+    _db.execute('COMMIT;');
+
+    var comicIDs = comics.map((e) => ComicID(e.comicType, e.id)).toList();
+    LocalFavoritesManager().batchDeleteComicsInAllFolders(comicIDs);
+    HistoryManager().batchDeleteHistories(comicIDs);
+
+    notifyListeners();
+
+    if (removeFileOnDisk) {
+      _deleteDirectories(shouldRemovedDirs);
+    }
+  }
+
+  /// Deletes the directories in a separate isolate to avoid blocking the UI thread.
+  static void _deleteDirectories(List<Directory> directories) {
+    Isolate.run(() async {
+      await SAFTaskWorker().init();
+      for (var dir in directories) {
+        try {
+          if (dir.existsSync()) {
+            await dir.delete(recursive: true);
+          }
+        } catch (e) {
+          continue;
+        }
+      }
+    });
+  }
 }
 
 enum LocalSortType {

lib/init.dart

@@ -95,8 +95,7 @@ Future<void> _checkAppUpdates() async {
   appdata.writeImplicitData();
   ComicSourcePage.checkComicSourceUpdate();
   if (appdata.settings['checkUpdateOnStart']) {
-    await Future.delayed(const Duration(milliseconds: 300));
-    await checkUpdateUi(false);
+    await checkUpdateUi(false, true);
   }
 }
 

lib/network/download.dart

@@ -552,7 +552,7 @@ class _ImageDownloadWrapper {
   void start() async {
     int lastBytes = 0;
     try {
-      await for (var p in ImageDownloader.loadComicImage(
+      await for (var p in ImageDownloader.loadComicImageUnwrapped(
           image, task.source.key, task.comicId, chapter)) {
         if (isCancelled) {
           return;

lib/network/images.dart

@@ -111,6 +111,11 @@ abstract class ImageDownloader {
     return stream.stream;
   }
 
+  static Stream<ImageDownloadProgress> loadComicImageUnwrapped(
+      String imageKey, String? sourceKey, String cid, String eid) {
+    return _loadComicImage(imageKey, sourceKey, cid, eid);
+  }
+
   static Stream<ImageDownloadProgress> _loadComicImage(
       String imageKey, String? sourceKey, String cid, String eid) async* {
     final cacheKey = "$imageKey@$sourceKey@$cid@$eid";

lib/pages/comic_source_page.dart

@@ -51,9 +51,7 @@ class ComicSourcePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: const _Body(),
-    );
+    return Scaffold(body: const _Body());
   }
 }
 
@@ -87,10 +85,7 @@ class _BodyState extends State<_Body> {
   Widget build(BuildContext context) {
     return SmoothCustomScrollView(
       slivers: [
-        SliverAppbar(
-          title: Text('Comic Source'.tl),
-          style: AppbarStyle.shadow,
-        ),
+        SliverAppbar(title: Text('Comic Source'.tl), style: AppbarStyle.shadow),
         buildCard(context),
         for (var source in ComicSource.all())
           _SliverComicSource(
@@ -109,9 +104,7 @@ class _BodyState extends State<_Body> {
     showConfirmDialog(
       context: App.rootContext,
       title: "Delete".tl,
-      content: "Delete comic source '@n' ?".tlParams({
-        "n": source.name,
-      }),
+      content: "Delete comic source '@n' ?".tlParams({"n": source.name}),
       btnColor: context.colorScheme.error,
       onConfirm: () {
         var file = File(source.filePath);
@@ -134,13 +127,15 @@ class _BodyState extends State<_Body> {
             actions: [
               TextButton(
                 onPressed: () => Navigator.pop(context),
-                  child: const Text("cancel")),
+                child: const Text("cancel"),
+              ),
               TextButton(
                 onPressed: () async {
                   await ComicSourceManager().reload();
                   App.forceRebuild();
                 },
-                  child: const Text("continue")),
+                child: const Text("continue"),
+              ),
             ],
           ),
         );
@@ -157,8 +152,10 @@ class _BodyState extends State<_Body> {
     );
   }
 
-  static Future<void> update(ComicSource source,
-      [bool showLoading = true]) async {
+  static Future<void> update(
+    ComicSource source, [
+    bool showLoading = true,
+  ]) async {
     if (!source.url.isURL) {
       App.rootContext.showMessage(message: "Invalid url config");
       return;
@@ -174,8 +171,10 @@ class _BodyState extends State<_Body> {
       );
     }
     try {
-      var res = await AppDio().get<String>(source.url,
-          options: Options(responseType: ResponseType.plain));
+      var res = await AppDio().get<String>(
+        source.url,
+        options: Options(responseType: ResponseType.plain),
+      );
       if (cancel) return;
       controller?.close();
       await ComicSourceParser().parse(res.data!, source.filePath);
@@ -192,12 +191,11 @@ class _BodyState extends State<_Body> {
   }
 
   Widget buildCard(BuildContext context) {
-    Widget buildButton(
-        {required Widget child, required VoidCallback onPressed}) {
-      return Button.normal(
-        onPressed: onPressed,
-        child: child,
-      ).fixHeight(32);
+    Widget buildButton({
+      required Widget child,
+      required VoidCallback onPressed,
+    }) {
+      return Button.normal(onPressed: onPressed, child: child).fixHeight(32);
     }
 
     return SliverToBoxAdapter(
@@ -218,7 +216,9 @@ class _BodyState extends State<_Body> {
                 contentPadding: const EdgeInsets.symmetric(horizontal: 12),
                 suffix: IconButton(
                   onPressed: () => handleAddSource(url),
-                      icon: const Icon(Icons.check))),
+                  icon: const Icon(Icons.check),
+                ),
+              ),
               onChanged: (value) {
                 url = value;
               },
@@ -245,10 +245,7 @@ class _BodyState extends State<_Body> {
             ),
             ListTile(
               title: Text("Help".tl),
-              trailing: buildButton(
-                onPressed: help,
-                child: Text("Open".tl),
-              ),
+              trailing: buildButton(onPressed: help, child: Text("Open".tl)),
             ),
             ListTile(
               title: Text("Check updates".tl),
@@ -277,7 +274,8 @@ class _BodyState extends State<_Body> {
 
   void help() {
     launchUrlString(
-        "https://github.com/venera-app/venera/blob/master/doc/comic_source.md");
+      "https://github.com/venera-app/venera/blob/master/doc/comic_source.md",
+    );
   }
 
   Future<void> handleAddSource(String url) async {
@@ -288,11 +286,16 @@ class _BodyState extends State<_Body> {
     splits.removeWhere((element) => element == "");
     var fileName = splits.last;
     bool cancel = false;
-    var controller = showLoadingDialog(App.rootContext,
-        onCancel: () => cancel = true, barrierDismissible: false);
+    var controller = showLoadingDialog(
+      App.rootContext,
+      onCancel: () => cancel = true,
+      barrierDismissible: false,
+    );
     try {
-      var res = await AppDio()
-          .get<String>(url, options: Options(responseType: ResponseType.plain));
+      var res = await AppDio().get<String>(
+        url,
+        options: Options(responseType: ResponseType.plain),
+      );
       if (cancel) return;
       controller.close();
       await addSource(res.data!, fileName);
@@ -332,6 +335,12 @@ class _ComicSourceListState extends State<_ComicSourceList> {
         json = null;
       });
     }
+    if (controller.text.isEmpty) {
+      setState(() {
+        json = [];
+      });
+      return;
+    }
     var dio = AppDio();
     try {
       var res = await dio.get<String>(controller.text);
@@ -343,8 +352,7 @@ class _ComicSourceListState extends State<_ComicSourceList> {
           json = jsonDecode(res.data!);
         });
       }
-    }
-    catch(e) {
+    } catch (e) {
       context.showMessage(message: "Network error".tl);
       if (mounted) {
         setState(() {
@@ -372,10 +380,7 @@ class _ComicSourceListState extends State<_ComicSourceList> {
 
   @override
   Widget build(BuildContext context) {
-    return PopUpWidgetScaffold(
-      title: "Comic Source".tl,
-      body: buildBody(),
-    );
+    return PopUpWidgetScaffold(title: "Comic Source".tl, body: buildBody());
   }
 
   Widget buildBody() {
@@ -399,32 +404,36 @@ class _ComicSourceListState extends State<_ComicSourceList> {
               children: [
                 ListTile(
                   leading: Icon(Icons.source_outlined),
-                  title: Text("Source URL".tl),
+                  title: Text("Repo URL".tl),
                 ),
                 TextField(
                   controller: controller,
                   decoration: InputDecoration(
                     hintText: "URL",
                     border: const UnderlineInputBorder(),
-                    contentPadding:
-                    const EdgeInsets.symmetric(horizontal: 12),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 12),
                   ),
                   onChanged: (value) {
                     changed = true;
                   },
                 ).paddingHorizontal(16).paddingBottom(8),
-                Text("The URL should point to a 'index.json' file".tl).paddingLeft(16),
-                Text("Do not report any issues related to sources to App repo.".tl).paddingLeft(16),
+                Text(
+                  "The URL should point to a 'index.json' file".tl,
+                ).paddingLeft(16),
+                Text(
+                  "Do not report any issues related to sources to App repo.".tl,
+                ).paddingLeft(16),
                 const SizedBox(height: 8),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
                     TextButton(
                       onPressed: () {
-                        controller.text = defaultComicSourceUrl;
-                        changed = true;
+                        launchUrlString(
+                          "https://github.com/venera-app/venera/blob/master/doc/comic_source.md",
+                        );
                       },
-                      child: Text("Reset".tl),
+                      child: Text("Help".tl),
                     ),
                     FilledButton.tonal(
                       onPressed: load,
@@ -440,7 +449,11 @@ class _ComicSourceListState extends State<_ComicSourceList> {
         }
 
         if (index == 1 && json == null) {
-          return Center(child: CircularProgressIndicator());
+          return Center(
+            child: CircularProgressIndicator(
+              strokeWidth: 2,
+            ).fixWidth(24).fixHeight(24),
+          );
         }
 
         index--;
@@ -551,8 +564,7 @@ void _addAllPagesWithComicSource(ComicSource source) {
       !networkFavorites.contains(source.favoriteData!.key)) {
     networkFavorites.add(source.favoriteData!.key);
   }
-  if (source.searchPageData != null &&
-      !searchPages.contains(source.key)) {
+  if (source.searchPageData != null && !searchPages.contains(source.key)) {
     searchPages.add(source.key);
   }
 
@@ -594,15 +606,10 @@ class __EditFilePageState extends State<_EditFilePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: Appbar(
-        title: Text("Edit".tl),
-      ),
+      appBar: Appbar(title: Text("Edit".tl)),
       body: Column(
         children: [
-          Container(
-            height: 0.6,
-            color: context.colorScheme.outlineVariant,
-          ),
+          Container(height: 0.6, color: context.colorScheme.outlineVariant),
           Expanded(
             child: CodeEditor(
               initialValue: current,
@@ -643,9 +650,11 @@ class _CheckUpdatesButtonState extends State<_CheckUpdatesButton> {
   }
 
   void showUpdateDialog() async {
-    var text = ComicSourceManager().availableUpdates.entries.map((e) {
+    var text = ComicSourceManager().availableUpdates.entries
+        .map((e) {
           return "${ComicSource.find(e.key)!.name}: ${e.value}";
-    }).join("\n");
+        })
+        .join("\n");
     bool doUpdate = false;
     await showDialog(
       context: App.rootContext,
@@ -783,10 +792,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
           child: ListTile(
             title: Row(
               children: [
-                Text(
-                  source.name,
-                  style: ts.s18,
-                ),
+                Text(source.name, style: ts.s18),
                 const SizedBox(width: 6),
                 Container(
                   padding: const EdgeInsets.symmetric(
@@ -819,7 +825,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
                         style: const TextStyle(fontSize: 13),
                       ),
                     ),
-                  ).paddingLeft(4)
+                  ).paddingLeft(4),
               ],
             ),
             trailing: Row(
@@ -864,15 +870,9 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
           ),
         ),
         SliverToBoxAdapter(
-          child: Column(
-            children: buildSourceSettings().toList(),
-          ),
-        ),
-        SliverToBoxAdapter(
-          child: Column(
-            children: _buildAccount().toList(),
-          ),
+          child: Column(children: buildSourceSettings().toList()),
         ),
+        SliverToBoxAdapter(child: Column(children: _buildAccount().toList())),
       ],
     );
   }
@@ -898,8 +898,10 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
               }
             }
           } else {
-            current = item.value['options']
-                    .firstWhere((e) => e['value'] == current)['text'] ??
+            current =
+                item.value['options'].firstWhere(
+                  (e) => e['value'] == current,
+                )['text'] ??
                 current;
           }
           yield ListTile(
@@ -907,8 +909,9 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
             trailing: Select(
               current: (current as String).ts(source.key),
               values: (item.value['options'] as List)
-                  .map<String>((e) =>
-                      ((e['text'] ?? e['value']) as String).ts(source.key))
+                  .map<String>(
+                    (e) => ((e['text'] ?? e['value']) as String).ts(source.key),
+                  )
                   .toList(),
               onTap: (i) {
                 source.data['settings'][key] =
@@ -936,8 +939,11 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
               source.data['settings'][key] ?? item.value['default'] ?? '';
           yield ListTile(
             title: Text((item.value['title'] as String).ts(source.key)),
-            subtitle:
-                Text(current, maxLines: 1, overflow: TextOverflow.ellipsis),
+            subtitle: Text(
+              current,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
             trailing: IconButton(
               icon: const Icon(Icons.edit),
               onPressed: () {
@@ -978,10 +984,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
         trailing: const Icon(Icons.arrow_right),
         onTap: () async {
           await context.to(
-            () => _LoginPage(
-              config: source.account!,
-              source: source,
-            ),
+            () => _LoginPage(config: source.account!, source: source),
           );
           source.saveData();
           setState(() {});
@@ -1027,9 +1030,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
           trailing: loading
               ? const SizedBox.square(
                   dimension: 24,
-                  child: CircularProgressIndicator(
-                    strokeWidth: 2,
-                  ),
+                  child: CircularProgressIndicator(strokeWidth: 2),
                 )
               : const Icon(Icons.refresh),
         );
@@ -1070,9 +1071,7 @@ class _LoginPageState extends State<_LoginPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: const Appbar(
-        title: Text(''),
-      ),
+      appBar: const Appbar(title: Text('')),
       body: Center(
         child: Container(
           padding: const EdgeInsets.all(16),
@@ -1200,8 +1199,9 @@ class _LoginPageState extends State<_LoginPage> {
       setState(() {
         loading = true;
       });
-      var cookies =
-          widget.config.cookieFields!.map((e) => _cookies[e] ?? '').toList();
+      var cookies = widget.config.cookieFields!
+          .map((e) => _cookies[e] ?? '')
+          .toList();
       widget.config.validateCookies!(cookies).then((value) {
         if (value) {
           widget.source.data['account'] = 'ok';

lib/pages/favorites/favorites_page.dart

@@ -66,6 +66,11 @@ class _FavoritesPageState extends State<FavoritesPage> {
       folder = data['name'];
       isNetwork = data['isNetwork'] ?? false;
     }
+    if (folder != null
+        && !isNetwork
+        && !LocalFavoritesManager().existsFolder(folder!)) {
+      folder = null;
+    }
     super.initState();
   }
 

lib/pages/favorites/local_favorites_page.dart

@@ -155,16 +155,33 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
 
   void selectAll() {
     setState(() {
+      if (searchMode) {
+        selectedComics = searchResults.asMap().map((k, v) => MapEntry(v, true));
+      } else {
         selectedComics = comics.asMap().map((k, v) => MapEntry(v, true));
+      }
     });
   }
 
   void invertSelection() {
     setState(() {
-      comics.asMap().forEach((k, v) {
-        selectedComics[v] = !selectedComics.putIfAbsent(v, () => false);
-      });
-      selectedComics.removeWhere((k, v) => !v);
+      if (searchMode) {
+        for (var c in searchResults) {
+          if (selectedComics.containsKey(c)) {
+            selectedComics.remove(c);
+          } else {
+            selectedComics[c] = true;
+          }
+        }
+      } else {
+        for (var c in comics) {
+          if (selectedComics.containsKey(c)) {
+            selectedComics.remove(c);
+          } else {
+            selectedComics[c] = true;
+          }
+        }
+      }
     });
   }
 
@@ -416,10 +433,12 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                 "Selected @c comics".tlParams({"c": selectedComics.length})),
             actions: [
               MenuButton(entries: [
+                if (!isAllFolder)
                 MenuEntry(
                     icon: Icons.drive_file_move,
                     text: "Move to folder".tl,
                     onClick: () => favoriteOption('move')),
+                if (!isAllFolder)
                 MenuEntry(
                     icon: Icons.copy,
                     text: "Copy to folder".tl,
@@ -756,32 +775,26 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                             return;
                           }
                           if (option == 'move') {
-                            for (var c in selectedComics.keys) {
-                              for (var s in selectedLocalFolders) {
-                                LocalFavoritesManager().moveFavorite(
+                            var comics = selectedComics.keys
+                                .map((e) => e as FavoriteItem)
+                                .toList();
+                            for (var f in selectedLocalFolders) {
+                              LocalFavoritesManager().batchMoveFavorites(
                                 favPage.folder as String,
-                                    s,
-                                    c.id,
-                                    (c as FavoriteItem).type);
-                              }
-                            }
-                          } else {
-                            for (var c in selectedComics.keys) {
-                              for (var s in selectedLocalFolders) {
-                                LocalFavoritesManager().addComic(
-                                  s,
-                                  FavoriteItem(
-                                    id: c.id,
-                                    name: c.title,
-                                    coverPath: c.cover,
-                                    author: c.subtitle ?? '',
-                                    type: ComicType((c.sourceKey == 'local'
-                                        ? 0
-                                        : c.sourceKey.hashCode)),
-                                    tags: c.tags ?? [],
-                                  ),
+                                f,
+                                comics,
                               );
                             }
+                          } else {
+                            var comics = selectedComics.keys
+                                .map((e) => e as FavoriteItem)
+                                .toList();
+                            for (var f in selectedLocalFolders) {
+                              LocalFavoritesManager().batchCopyFavorites(
+                                favPage.folder as String,
+                                f,
+                                comics,
+                              );
                             }
                           }
                           App.rootContext.pop();
@@ -817,13 +830,8 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
   }
 
   void _deleteComicWithId() {
-    for (var c in selectedComics.keys) {
-      LocalFavoritesManager().deleteComicWithId(
-        widget.folder,
-        c.id,
-        (c as FavoriteItem).type,
-      );
-    }
+    var toBeDeleted = selectedComics.keys.map((e) => e as FavoriteItem).toList();
+    LocalFavoritesManager().batchDeleteComics(widget.folder, toBeDeleted);
     _cancel();
   }
 }
@@ -864,7 +872,10 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
   @override
   void dispose() {
     if (changed) {
+      // Delay to ensure navigation is completed
+      Future.delayed(const Duration(milliseconds: 200), () {
         LocalFavoritesManager().reorder(comics, widget.name);
+      });
     }
     super.dispose();
   }
@@ -899,7 +910,9 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
       appBar: Appbar(
         title: Text("Reorder".tl),
         actions: [
-          IconButton(
+          Tooltip(
+            message: "Information".tl,
+            child: IconButton(
               icon: const Icon(Icons.info_outline),
               onPressed: () {
                 showInfoDialog(
@@ -909,17 +922,19 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
                 );
               },
             ),
-          IconButton(
+          ),
+          Tooltip(
+            message: "Reverse".tl,
+            child: IconButton(
               icon: const Icon(Icons.swap_vert),
               onPressed: () {
                 setState(() {
                   comics = comics.reversed.toList();
                   changed = true;
-                showToast(
-                    message: "Reversed successfully".tl, context: context);
                 });
               },
             ),
+          )
         ],
       ),
       body: ReorderableBuilder<FavoriteItem>(

lib/pages/favorites/side_bar.dart

@@ -42,6 +42,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
     folders = LocalFavoritesManager().folderNames;
     findNetworkFolders();
     appdata.settings.addListener(updateFolders);
+    LocalFavoritesManager().addListener(updateFolders);
     super.initState();
   }
 
@@ -49,6 +50,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
   void dispose() {
     super.dispose();
     appdata.settings.removeListener(updateFolders);
+    LocalFavoritesManager().removeListener(updateFolders);
   }
 
   @override

lib/pages/history_page.dart

@@ -140,6 +140,14 @@ class _HistoryPageState extends State<HistoryPage> {
               title: 'Clear History'.tl,
               content: Text('Are you sure you want to clear your history?'.tl),
               actions: [
+                Button.outlined(
+                  onPressed: () {
+                    HistoryManager().clearUnfavoritedHistory();
+                    context.pop();
+                  },
+                  child: Text('Clear Unfavorited'.tl),
+                ),
+                const SizedBox(width: 4),
                 Button.filled(
                   color: context.colorScheme.error,
                   onPressed: () {

lib/pages/local_comics_page.dart

@@ -374,15 +374,21 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
               },
             ),
             actions: [
+              if (comics.length == 1 && comics.first.hasChapters)
+                TextButton(
+                  child: Text("Delete Chapters".tl),
+                  onPressed: () {
+                    context.pop();
+                    showDeleteChaptersPopWindow(context, comics.first);
+                  },
+                ),
               FilledButton(
                 onPressed: () {
                   context.pop();
-                  for (var comic in comics) {
-                    LocalManager().deleteComic(
-                      comic,
+                  LocalManager().batchDeleteComics(
+                    comics,
                     removeComicFile,
                   );
-                  }
                   isDeleted = true;
                 },
                 child: Text("Confirm".tl),
@@ -497,3 +503,59 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
 
 typedef ExportComicFunc = Future<File> Function(
     LocalComic comic, String outFilePath);
+
+void showDeleteChaptersPopWindow(BuildContext context, LocalComic comic) {
+  var chapters = <String>[];
+
+  showPopUpWidget(
+    context,
+    PopUpWidgetScaffold(
+      title: "Delete Chapters".tl,
+      body: StatefulBuilder(builder: (context, setState) {
+        return Column(
+          children: [
+            Expanded(
+              child: ListView.builder(
+                itemCount: comic.downloadedChapters.length,
+                itemBuilder: (context, index) {
+                  var id = comic.downloadedChapters[index];
+                  var chapter = comic.chapters![id] ?? "Unknown Chapter";
+                  return CheckboxListTile(
+                    title: Text(chapter),
+                    value: chapters.contains(id),
+                    onChanged: (v) {
+                      setState(() {
+                        if (v == true) {
+                          chapters.add(id);
+                        } else {
+                          chapters.remove(id);
+                        }
+                      });
+                    },
+                  );
+                },
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  FilledButton(
+                    onPressed: () {
+                      Future.delayed(const Duration(milliseconds: 200), () {
+                        LocalManager().deleteComicChapters(comic, chapters);
+                      });
+                      App.rootContext.pop();
+                    },
+                    child: Text("Submit".tl),
+                  )
+                ],
+              ),
+            )
+          ],
+        );
+      }),
+    ),
+  );
+}

lib/pages/reader/images.dart

@@ -40,6 +40,9 @@ class _ReaderImagesState extends State<_ReaderImages> {
           reader.images = images;
           reader.isLoading = false;
           inProgress = false;
+          Future.microtask(() {
+            reader.updateHistory();
+          });
         });
       } catch (e) {
         setState(() {
@@ -65,6 +68,9 @@ class _ReaderImagesState extends State<_ReaderImages> {
           reader.images = res.data;
           reader.isLoading = false;
           inProgress = false;
+          Future.microtask(() {
+            reader.updateHistory();
+          });
         });
       }
     }
@@ -233,7 +239,7 @@ class _GalleryModeState extends State<_GalleryMode>
 
             photoViewControllers[index] ??= PhotoViewController();
 
-            if (reader.imagesPerPage == 1) {
+            if (reader.imagesPerPage == 1 || pageImages.length == 1) {
               return PhotoViewGalleryPageOptions(
                 filterQuality: FilterQuality.medium,
                 controller: photoViewControllers[index],

lib/pages/reader/reader.dart

@@ -164,9 +164,6 @@ class _ReaderState extends State<Reader>
     }
     mode = ReaderMode.fromKey(appdata.settings['readerMode']);
     history = widget.history;
-    Future.microtask(() {
-      updateHistory();
-    });
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
     if (appdata.settings['enableTurnPageByVolumeKey']) {
       handleVolumeEvent();
@@ -267,7 +264,15 @@ class _ReaderState extends State<Reader>
         history!.page = images?.length ?? 1;
       } else {
         /// Record the first image of the page
+        if (!showSingleImageOnFirstPage || imagesPerPage == 1) {
           history!.page = (page - 1) * imagesPerPage + 1;
+        } else {
+          if (page == 1) {
+            history!.page = 1;
+          } else {
+            history!.page = (page - 2) * imagesPerPage + 2;
+          }
+        }
       }
       history!.maxPage = images?.length ?? 1;
       if (widget.chapters?.isGrouped ?? false) {
@@ -349,9 +354,13 @@ abstract mixin class _ImagePerPageHandler {
   void initImagesPerPage(int initialPage) {
     _lastImagesPerPage = imagesPerPage;
     if (imagesPerPage != 1) {
+      if (showSingleImageOnFirstPage) {
+        page = ((initialPage - 1) / imagesPerPage).ceil() + 1;
+      } else {
         page = (initialPage / imagesPerPage).ceil();
       }
     }
+  }
 
   bool get showSingleImageOnFirstPage =>
       appdata.settings["showSingleImageOnFirstPage"];

lib/pages/settings/about.dart

@@ -96,10 +96,13 @@ Future<bool> checkUpdate() async {
   return false;
 }
 
-Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
+Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true, bool delay = false]) async {
   try {
     var value = await checkUpdate();
     if (value) {
+      if (delay) {
+        await Future.delayed(const Duration(seconds: 2));
+      }
       showDialog(
           context: App.rootContext,
           builder: (context) {

lib/utils/data_sync.dart

@@ -22,11 +22,13 @@ class DataSync with ChangeNotifier {
     }
     LocalFavoritesManager().addListener(onDataChanged);
     ComicSourceManager().addListener(onDataChanged);
+    if (App.isDesktop) {
       Future.delayed(const Duration(seconds: 1), () {
         var controller = WindowFrame.of(App.rootContext);
         controller.addCloseListener(_handleWindowClose);
       });
     }
+  }
 
   void onDataChanged() {
     if (isEnabled) {

lib/utils/pdf.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:isolate';
+import 'package:flutter_saf/flutter_saf.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/utils/image.dart';
@@ -74,6 +75,9 @@ Future<Isolate> _runIsolate(
   return Isolate.spawn<SendPort>(
     (sendPort) => overrideIO(
       () async {
+        if (App.isAndroid) {
+          await SAFTaskWorker().init();
+        }
         var receivePort = ReceivePort();
         sendPort.send(receivePort.sendPort);
 

lib/utils/tags_translation.dart

@@ -36,7 +36,9 @@ extension TagsTranslation on String{
   static String _translateTags(String tag){
     if (tag.contains('|')) {
       var splits = tag.split('|');
-      return enTagsTranslations[splits[0]]??enTagsTranslations[splits[1]]??tag;
+      return enTagsTranslations[splits[0].trim()]
+          ?? enTagsTranslations[splits[1].trim()]
+          ?? tag;
     } else if(tag.contains(':')) {
       var splits = tag.split(':');
       if(_haveNamespace(splits[0])) {

pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   battery_plus:
     dependency: "direct main"
     description:
@@ -190,10 +190,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -433,10 +433,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_rust_bridge
-      sha256: "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611"
+      sha256: b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.10.0"
   flutter_saf:
     dependency: "direct main"
     description:
@@ -524,10 +524,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   io:
     dependency: transitive
     description:
@@ -548,10 +548,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -766,11 +766,11 @@ packages:
     dependency: "direct main"
     description:
       path: rhttp
-      ref: e7dca15ca543b5df49f3ada06016e874b79bce36
-      resolved-ref: e7dca15ca543b5df49f3ada06016e874b79bce36
+      ref: "1f0ff50336062c5f809c256726dc55cd30b9ce59"
+      resolved-ref: "1f0ff50336062c5f809c256726dc55cd30b9ce59"
       url: "https://github.com/wgh136/rhttp"
     source: git
-    version: "0.11.0"
+    version: "0.12.0"
   screen_retriever:
     dependency: transitive
     description:
@@ -1037,10 +1037,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
   web:
     dependency: transitive
     description:
@@ -1107,5 +1107,5 @@ packages:
     source: hosted
     version: "0.0.12"
 sdks:
-  dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.29.3"
+  dart: ">=3.8.0 <4.0.0"
+  flutter: ">=3.32.4"

pubspec.yaml

@@ -2,11 +2,11 @@ name: venera
 description: "A comic app."
 publish_to: 'none'
 
-version: 1.4.3+143
+version: 1.4.5+145
 
 environment:
-  sdk: '>=3.6.0 <4.0.0'
-  flutter: 3.29.3
+  sdk: '>=3.8.0 <4.0.0'
+  flutter: 3.32.4
 
 dependencies:
   flutter:
@@ -61,7 +61,7 @@ dependencies:
   rhttp:
     git:
       url: https://github.com/wgh136/rhttp
-      ref: e7dca15ca543b5df49f3ada06016e874b79bce36
+      ref: 1f0ff50336062c5f809c256726dc55cd30b9ce59
       path: rhttp
   webdav_client:
     git: