Merge pull request #334 from fakeboboliu/master

tweaks to handle more galleries
jiangtian616 · Dec 15, 2023 · 5b1cf90 · 5b1cf90
2 parents e202972 + d0305bd
commit 5b1cf90
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lib/src/pages/download/download_base_page.dart b/lib/src/pages/download/download_base_page.dart
@@ -217,7 +217,7 @@ class _GroupListState<E, G> extends State<GroupList<E, G>> {
         controller: scrollController,
         padding: const EdgeInsets.only(bottom: 80),
         itemCount: widget.elements.length + widget.groups.length,
-        cacheExtent: 6000,
+        cacheExtent: 20,
         itemBuilder: (BuildContext context, int index) {
           int remainingCount = index;
           int groupIndex = 0;

diff --git a/lib/src/service/archive_download_service.dart b/lib/src/service/archive_download_service.dart
@@ -335,11 +335,11 @@ class ArchiveDownloadService extends GetxController with GridBasePageServiceMixi
         continue;
       }
 
-      _initArchiveInMemory(archive);
+      _initArchiveInMemory(archive, sort: false);
 
       restoredCount++;
     }
-
+    _sortArchives();
     return restoredCount;
   }
 
@@ -697,8 +697,9 @@ class ArchiveDownloadService extends GetxController with GridBasePageServiceMixi
     List<ArchiveDownloadedData> archives = await appDb.selectArchives().get();
 
     for (ArchiveDownloadedData archive in archives) {
-      _initArchiveInMemory(archive);
+      _initArchiveInMemory(archive, sort: false);
     }
+    _sortArchives();
   }
 
   Future<bool> _initArchiveInfo(ArchiveDownloadedData archive) async {
@@ -775,7 +776,7 @@ class ArchiveDownloadService extends GetxController with GridBasePageServiceMixi
 
   // MEMORY
 
-  void _initArchiveInMemory(ArchiveDownloadedData archive) {
+  void _initArchiveInMemory(ArchiveDownloadedData archive, {bool sort = true}) {
     if (!allGroups.contains(archive.groupName ?? 'default'.tr)) {
       allGroups.add(archive.groupName ?? 'default'.tr);
     }
@@ -794,7 +795,7 @@ class ArchiveDownloadService extends GetxController with GridBasePageServiceMixi
       group: archive.groupName ?? 'default'.tr,
     );
 
-    _sortArchives();
+    if (sort) _sortArchives();
     update([galleryCountChangedId, '$archiveStatusId::::${archive.gid}']);
   }
 

diff --git a/lib/src/service/gallery_download_service.dart b/lib/src/service/gallery_download_service.dart
@@ -431,11 +431,11 @@ class GalleryDownloadService extends GetxController with GridBasePageServiceMixi
         continue;
       }
 
-      _initGalleryInfoInMemory(gallery, images: images);
+      _initGalleryInfoInMemory(gallery, images: images, sort: false);
 
       restoredCount++;
     }
-
+    _sortGallerys();
     return restoredCount;
   }