refactor: git tool

chaldea-center · Jan 21, 2021 · 8167ee8 · 8167ee8
1 parent e802ff7
commit 8167ee8
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 45 deletions.
diff --git a/lib/components/git_tool.dart b/lib/components/git_tool.dart
@@ -8,7 +8,11 @@ import 'package:flutter/scheduler.dart';
 import 'package:github/github.dart' as github;
 import 'package:path/path.dart' as pathlib;
 
-enum GitReleaseType { app, dataset }
+const String _owner = 'narumishi';
+const String _appRepo = 'chaldea';
+const String _datasetRepo = 'chaldea-dataset';
+
+enum GitSource { gitee, github }
 
 class GitRelease {
   int id;
@@ -62,16 +66,16 @@ class GitAsset {
   GitAsset({required this.name, required this.browserDownloadUrl});
 }
 
-enum GitSource { github, gitee }
-
-const String _owner = 'narumishi';
-const String _appRepo = 'chaldea';
-const String _datasetRepo = 'chaldea-dataset';
-
 class GitTool {
   GitSource source;
 
-  GitTool([this.source = GitSource.github]);
+  GitTool([this.source = GitSource.gitee]);
+
+  GitTool.fromIndex(int? index)
+      : source =
+            (index == null || index < 0 || index >= GitSource.values.length)
+                ? GitSource.values.first
+                : GitSource.values[index];
 
   static String getReleasePageUrl(int? sourceIndex, bool appOrDataset) {
     if (sourceIndex == null ||

diff --git a/lib/modules/home/subpage/about_page.dart b/lib/modules/home/subpage/about_page.dart
@@ -145,13 +145,13 @@ class _AboutPageState extends State<AboutPage> {
                 onTap: () => jumpToLink(context, 'NGA-FGO',
                     'https://bbs.nga.cn/read.php?tid=24926789'),
               ),
-              if(Platform.isIOS||Platform.isMacOS)
-              ListTile(
-                title: Text('App Store评分'),
-                onTap: (){
-                  launch('itms-apps://itunes.apple.com/app/id1548713491');
-                },
-              )
+              if (Platform.isIOS || Platform.isMacOS)
+                ListTile(
+                  title: Text('App Store评分'),
+                  onTap: () {
+                    launch('itms-apps://itunes.apple.com/app/id1548713491');
+                  },
+                )
             ],
           ),
           if (kDebugMode_)
@@ -202,24 +202,28 @@ class _AboutPageState extends State<AboutPage> {
   Future<void> checkAppUpdate() async {
     // android, windows: download github releases
     if (Platform.isAndroid || Platform.isWindows) {
-      GitTool gitTool = GitTool(GitSource.gitee);
-      final release = await gitTool.latestAppRelease();
-      String curVersion =
-          AppInfo.fullVersion.isEmpty ? 'Unknown' : AppInfo.fullVersion;
-      SimpleCancelOkDialog(
-        title: Text('应用更新'),
-        content: Text('当前版本: $curVersion\n'
-            '最新版本: ${release.name ?? "查询失败"}\n'
-            '跳转到浏览器下载'),
-        onTapOk: () {
-          if (release.targetAsset?.browserDownloadUrl?.isNotEmpty == true) {
-            launch(release.targetAsset.browserDownloadUrl);
-          } else {
-            launch(GitTool.getReleasePageUrl(
-                db.userData.appDatasetUpdateSource, true));
-          }
-        },
-      ).show(context);
+      try {
+        GitTool gitTool = GitTool.fromIndex(db.userData.appDatasetUpdateSource);
+        final release = await gitTool.latestAppRelease();
+        String curVersion =
+            AppInfo.fullVersion.isEmpty ? 'Unknown' : AppInfo.fullVersion;
+        SimpleCancelOkDialog(
+          title: Text('应用更新'),
+          content: Text('当前版本: $curVersion\n'
+              '最新版本: ${release.name ?? "查询失败"}\n'
+              '跳转到浏览器下载'),
+          onTapOk: () {
+            if (release.targetAsset?.browserDownloadUrl?.isNotEmpty == true) {
+              launch(release.targetAsset.browserDownloadUrl);
+            } else {
+              launch(GitTool.getReleasePageUrl(
+                  db.userData.appDatasetUpdateSource, true));
+            }
+          },
+        ).show(context);
+      } catch (e) {
+        EasyLoading.showToast('Check update failed: $e');
+      }
     } else if (Platform.isIOS || Platform.isMacOS) {
       // to App Store
       SimpleCancelOkDialog(

diff --git a/lib/modules/home/subpage/dataset_manage_page.dart b/lib/modules/home/subpage/dataset_manage_page.dart
@@ -416,9 +416,7 @@ class _DatasetManagePageState extends State<DatasetManagePage> {
 
   void downloadGamedata() {
     void _downloadAsset([bool fullSize = true]) async {
-      int source = db.userData.appDatasetUpdateSource ?? 0;
-      source = (source < 0 || source >= GitSource.values.length) ? 0 : source;
-      final gitTool = GitTool(GitSource.values[source]);
+      final gitTool = GitTool.fromIndex(db.userData.appDatasetUpdateSource);
       final release = await gitTool.latestDatasetRelease(fullSize);
       Navigator.of(context).pop();
       String fp = pathlib.join(

diff --git a/lib/modules/statistics/game_statistics_page.dart b/lib/modules/statistics/game_statistics_page.dart
@@ -53,15 +53,11 @@ class _GameStatisticsPageState extends State<GameStatisticsPage>
     return ListView(
       padding: EdgeInsets.symmetric(vertical: 12),
       children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Checkbox(
-              value: includeCurItems,
-              onChanged: (v) => setState(() => includeCurItems = v),
-            ),
-            Text('计算现有素材')
-          ],
+        CheckboxListTile(
+          value: includeCurItems,
+          onChanged: (v) => setState(() => includeCurItems = v),
+          controlAffinity: ListTileControlAffinity.leading,
+          title: Text('包含现有素材'),
         ),
         ListTile(
           leading: Image(image: db.getIconImage(Item.qp)),