Fix state tracking of app-update download

Fix: #119
nullxception · Jun 3, 2023 · 1ac3ea9 · 1ac3ea9
1 parent 48b329d
commit 1ac3ea9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/lib/data/repository/booru/entity/post.dart b/lib/data/repository/booru/entity/post.dart
@@ -34,4 +34,5 @@ class Post with _$Post {
   factory Post.fromJson(Map<String, dynamic> json) => _$PostFromJson(json);
 
   static const empty = Post();
+  static const appReserved = Post(id: -100);
 }
diff --git a/lib/presentation/provider/app_updater.dart b/lib/presentation/provider/app_updater.dart
@@ -1,6 +1,8 @@
 import 'dart:io';
 
 import 'package:boorusphere/constant/app.dart';
+import 'package:boorusphere/data/repository/booru/entity/post.dart';
+import 'package:boorusphere/data/repository/download/entity/download_entry.dart';
 import 'package:boorusphere/data/repository/download/entity/download_progress.dart';
 import 'package:boorusphere/data/repository/version/datasource/version_network_source.dart';
 import 'package:boorusphere/data/repository/version/entity/app_version.dart';
@@ -47,6 +49,7 @@ class AppUpdater {
         query: 'SELECT * FROM task WHERE file_name LIKE \'%.apk\'');
     if (tasks == null) return;
     for (var task in tasks) {
+      await ref.read(downloadStateProvider.notifier).remove(task.taskId);
       await FlutterDownloader.remove(
         taskId: task.taskId,
         shouldDeleteContent: removeFile,
@@ -78,6 +81,12 @@ class AppUpdater {
     if (newId != null) {
       _version = version;
       id = newId;
+      final entry = DownloadEntry(
+        id: newId,
+        post: Post.appReserved,
+        destination: appDir.absolute.path,
+      );
+      await ref.read(downloadStateProvider.notifier).add(entry);
     }
   }
 

diff --git a/lib/presentation/provider/download/download_state.dart b/lib/presentation/provider/download/download_state.dart
@@ -80,4 +80,8 @@ extension DownloadItemsExt on Iterable<DownloadItem> {
     final item = firstWhereOrNull((it) => it.entry.post == post);
     return item?.progress ?? DownloadProgress.none;
   }
+
+  Iterable<DownloadItem> whereNotReserved() {
+    return whereNot((it) => it.entry.post == Post.appReserved);
+  }
 }
diff --git a/lib/presentation/screens/downloads/downloads_page.dart b/lib/presentation/screens/downloads/downloads_page.dart
@@ -26,7 +26,7 @@ class DownloadsPage extends HookConsumerWidget {
         ref.read(serverSettingStateProvider.select((it) => it.lastActiveId));
     final session = this.session ?? SearchSession(serverId: savedServerId);
     final serverData = ref.watch(serverDataStateProvider);
-    final downloadState = ref.watch(downloadStateProvider);
+    final downloadState = ref.watch(downloadStateProvider).whereNotReserved();
     final groupByServer = ref
         .watch(downloadSettingStateProvider.select((it) => it.groupByServer));
     final filter = useState(DownloadFilter.none);

diff --git a/lib/presentation/screens/post/post_toolbox.dart b/lib/presentation/screens/post/post_toolbox.dart
@@ -132,7 +132,11 @@ class PostDownloadButton extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final progress = ref.watch(downloadStateProvider).getProgressByPost(post);
+    final progress = ref
+        .watch(downloadStateProvider)
+        .whereNotReserved()
+        .getProgressByPost(post);
+
     final pending = useState(false);
 
     return Stack(