fix: torrent stats panic (#737)

GopeedLab · Sep 20, 2024 · d375046 · d375046
1 parent 5c9bcd3
commit d375046
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/internal/protocol/bt/fetcher.go b/internal/protocol/bt/fetcher.go
@@ -295,7 +295,7 @@ func (f *Fetcher) doUpload(fromUpload bool) {
 				continue
 			}
 
-			stats := f.torrent.Stats()
+			stats := f.torrentStats()
 			f.data.SeedBytes = lastData.SeedBytes + stats.BytesWrittenData.Int64()
 
 			// Check is download complete, if not don't check and stop seeding
@@ -332,6 +332,17 @@ func (f *Fetcher) doUpload(fromUpload bool) {
 	}
 }
 
+// Get torrent stats maybe panic, see https://github.com/anacrolix/torrent/issues/972
+func (f *Fetcher) torrentStats() torrent.TorrentStats {
+	defer func() {
+		if r := recover(); r != nil {
+			// ignore panic
+		}
+	}()
+
+	return f.torrent.Stats()
+}
+
 func (f *Fetcher) UploadedBytes() int64 {
 	return f.data.SeedBytes
 }

diff --git a/ui/flutter/lib/app/modules/create/views/create_view.dart b/ui/flutter/lib/app/modules/create/views/create_view.dart
@@ -689,8 +689,8 @@ class CreateView extends GetView<CreateController> {
                     style:
                         ElevatedButton.styleFrom(shape: const StadiumBorder())
                             .copyWith(
-                                backgroundColor: WidgetStateProperty.all(
-                                    Get.theme.colorScheme.surface)),
+                                backgroundColor: MaterialStateProperty.all(
+                                    Get.theme.colorScheme.background)),
                     onPressed: () {
                       Get.back();
                     },

diff --git a/ui/flutter/lib/app/modules/extension/views/extension_view.dart b/ui/flutter/lib/app/modules/extension/views/extension_view.dart
@@ -335,8 +335,8 @@ class ExtensionView extends GetView<ExtensionController> {
                     style:
                         ElevatedButton.styleFrom(shape: const StadiumBorder())
                             .copyWith(
-                                backgroundColor: WidgetStateProperty.all(
-                                    Get.theme.colorScheme.surface)),
+                                backgroundColor: MaterialStateProperty.all(
+                                    Get.theme.colorScheme.background)),
                     onPressed: () {
                       Get.back();
                     },

diff --git a/ui/flutter/lib/app/views/open_in_new.dart b/ui/flutter/lib/app/views/open_in_new.dart
@@ -17,7 +17,7 @@ class OpenInNew extends StatelessWidget {
             launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);
           },
           style: ElevatedButton.styleFrom(
-            backgroundColor: Get.theme.colorScheme.surface,
+            backgroundColor: Get.theme.colorScheme.background,
           ),
           child: Row(
             mainAxisSize: MainAxisSize