修復：修復4個bug

RPMTW · Sep 13, 2021 · 7a8b3d4 · 7a8b3d4
1 parent 2a0f247
commit 7a8b3d4
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 60 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "type": "dart",
             "args": [
                 "--dart-define",
-                "build_id=none",
+                "build_id=10000000",
                 "--dart-define",
                 "version_type=alpha",
                 "--dart-define",
@@ -24,7 +24,7 @@
             "flutterMode": "profile",
             "args": [
                 "--dart-define",
-                "build_id=none",
+                "build_id=10000000",
                 "--dart-define",
                 "version_type=alpha",
                 "--dart-define",
@@ -38,7 +38,7 @@
             "flutterMode": "release",
             "args": [
                 "--dart-define",
-                "build_id=none",
+                "build_id=10000000",
                 "--dart-define",
                 "version_type=alpha",
                 "--dart-define",

diff --git a/lib/Account/MSAccountHandler.dart b/lib/Account/MSAccountHandler.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:http/http.dart' as http;
 import 'package:rpmlauncher/Launcher/APIs.dart';
 import 'package:rpmlauncher/Utility/Loggger.dart';
+import 'package:rpmlauncher/main.dart';
 
 class MSAccountHandler {
   /*
@@ -26,7 +27,7 @@ class MSAccountHandler {
       String body = await response.stream.bytesToString();
       return json.decode(body);
     } else {
-      Logger.send(response.reasonPhrase);
+      logger.send(response.reasonPhrase);
       return [];
     }
   }
@@ -42,7 +43,6 @@ class MSAccountHandler {
 
     http.StreamedResponse response = await request.send();
 
-    Map data = json.decode(await response.stream.bytesToString());
-    return data.containsKey("id");
+    return response.statusCode == 200;
   }
 }
diff --git a/lib/Account/MojangAccountHandler.dart b/lib/Account/MojangAccountHandler.dart
@@ -8,6 +8,7 @@ import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
 import 'package:http_parser/http_parser.dart';
+import 'package:rpmlauncher/main.dart';
 
 class MojangHandler {
 /*
@@ -91,7 +92,7 @@ API Docs: https://wiki.vg/Authentication
 
     bool Success = response.stream.bytesToString().toString().isNotEmpty;
     if (!Success) {
-      Logger.send(response.reasonPhrase);
+      logger.send(response.reasonPhrase);
     }
 
     return Success;

diff --git a/lib/Launcher/Forge/Processors.dart b/lib/Launcher/Forge/Processors.dart
@@ -7,10 +7,10 @@ import 'package:rpmlauncher/Launcher/GameRepository.dart';
 import 'package:rpmlauncher/Launcher/InstanceRepository.dart';
 import 'package:rpmlauncher/Launcher/Libraries.dart';
 import 'package:rpmlauncher/Utility/Config.dart';
-import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
 import 'package:archive/archive.dart';
 import 'package:path/path.dart';
+import 'package:rpmlauncher/main.dart';
 
 import '../../path.dart';
 
@@ -87,7 +87,7 @@ class Processor {
     String? MainClass = utility.getJarMainClass(ProcessorJarFile);
 
     if (MainClass == null) {
-      Logger.send("No MainClass found in " + jar); //如果找不到程式進入點
+      logger.send("No MainClass found in " + jar); //如果找不到程式進入點
       return;
     } else {
       MainClass = MainClass.replaceAll(" ", "")
@@ -133,7 +133,7 @@ class Processor {
             String DataPath =
                 clientData.split("[").join("").split("]").join(""); //去除方括號
             List split_ = utility.split(DataPath, ":", max: 4);
-            if (split_.length != 3 && split_.length != 4) Logger.send("err");
+            if (split_.length != 3 && split_.length != 4) logger.send("err");
 
             String? extension_ = null;
             int last = split_.length - 1;
@@ -142,7 +142,7 @@ class Processor {
               split_[last] = splitted[0];
               extension_ = splitted[1];
             } else if (splitted.length > 2) {
-              Logger.send("err");
+              logger.send("err");
             }
             var group = split_[0].toString().replaceAll("\\", "/");
             var name = split_[1];
@@ -202,13 +202,13 @@ class Processor {
       });
       await process.stderr.transform(utf8.decoder).listen((data) {
         errorLog += data;
-        Logger.send("$jar - error: $data");
+        logger.send("$jar - error: $data");
       });
     } catch (err) {}
     await process.exitCode.then((code) {
-      Logger.send("$jar - Forge process is exited, exit code: $code");
+      logger.send("$jar - Forge process is exited, exit code: $code");
       if (code != 0) {
-        Logger.send(
+        logger.send(
             "$jar - An unknown error occurred while running the Forge process:\n$errorLog\n$runLog");
       }
       process = null;

diff --git a/lib/Launcher/MinecraftClient.dart b/lib/Launcher/MinecraftClient.dart
@@ -8,10 +8,9 @@ import 'package:archive/archive.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
 import 'package:path/path.dart';
-import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/ModLoader.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
-import 'package:rpmlauncher/Utility/utility.dart';
+import 'package:rpmlauncher/main.dart';
 
 import '../path.dart';
 import 'Arguments.dart';
@@ -53,7 +52,7 @@ class MinecraftClientHandler {
         await file.writeAsBytes(response.bodyBytes);
       });
     } catch (err) {
-      Logger.send(err);
+      logger.send(err);
     }
     DoneTaskLength++; //Download Done
     ChangeProgress(SetState_);

diff --git a/lib/Screen/CurseForgeMod.dart b/lib/Screen/CurseForgeMod.dart
@@ -6,6 +6,7 @@ import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/CurseForgeModVersion.dart';
 import 'package:flutter/material.dart';
+import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class CurseForgeMod_ extends State<CurseForgeMod> {
@@ -194,7 +195,7 @@ class CurseForgeMod_ extends State<CurseForgeMod> {
                               if (await canLaunch(PageUrl)) {
                                 launch(PageUrl);
                               } else {
-                                Logger.send("Can't open the url $PageUrl");
+                                logger.send("Can't open the url $PageUrl");
                               }
                             },
                             icon: Icon(Icons.open_in_browser),

diff --git a/lib/Screen/CurseForgeModPack.dart b/lib/Screen/CurseForgeModPack.dart
@@ -8,6 +8,7 @@ import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
+import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class CurseForgeModPack_ extends State<CurseForgeModPack> {
@@ -225,7 +226,7 @@ class CurseForgeModPack_ extends State<CurseForgeModPack> {
                               if (await canLaunch(PageUrl)) {
                                 launch(PageUrl);
                               } else {
-                                Logger.send("Can't open the url $PageUrl");
+                                logger.send("Can't open the url $PageUrl");
                               }
                             },
                             icon: Icon(Icons.open_in_browser),
@@ -442,7 +443,7 @@ class Task_ extends State<Task> {
         port.send(1.0);
       },
       onError: (e) {
-        Logger.send(e);
+        logger.send(e);
       },
       cancelOnError: true,
     );

diff --git a/lib/Screen/Edit.dart b/lib/Screen/Edit.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:archive/archive.dart';
 import 'package:auto_size_text/auto_size_text.dart';
@@ -1018,7 +1017,7 @@ class EditInstance_ extends State<EditInstance> {
               WorldDirEvent.cancel();
               Navigator.push(
                 context,
-                new MaterialPageRoute(builder: (context) => LauncherHome()),
+                new MaterialPageRoute(builder: (context) => HomePage()),
               );
             },
           ),

diff --git a/lib/Screen/MSOauth2Login.dart b/lib/Screen/MSOauth2Login.dart
@@ -14,6 +14,7 @@ import 'package:rpmlauncher/Account/MSAccountHandler.dart';
 import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/OkClose.dart';
+import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 final _authorizationEndpoint =
@@ -171,7 +172,7 @@ class _MSLoginState extends State<MSLoginWidget> {
     if (await canLaunch(url)) {
       await launch(url);
     } else {
-      Logger.send("Can't open the url $url");
+      logger.send("Can't open the url $url");
     }
   }
 

diff --git a/lib/Screen/ModrinthMod.dart b/lib/Screen/ModrinthMod.dart
@@ -6,6 +6,7 @@ import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/ModrinthModVersion.dart';
 import 'package:flutter/material.dart';
+import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ModrinthMod_ extends State<ModrinthMod> {
@@ -195,7 +196,7 @@ class ModrinthMod_ extends State<ModrinthMod> {
                               if (await canLaunch(PageUrl)) {
                                 launch(PageUrl);
                               } else {
-                                Logger.send("Can't open the url $PageUrl");
+                                logger.send("Can't open the url $PageUrl");
                               }
                             },
                             icon: Icon(Icons.open_in_browser),

diff --git a/lib/Screen/RefreshMSToken.dart b/lib/Screen/RefreshMSToken.dart
@@ -4,6 +4,7 @@ import 'package:oauth2/oauth2.dart';
 import 'package:rpmlauncher/Account/Account.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/OkClose.dart';
+import 'package:rpmlauncher/main.dart';
 
 import 'MSOauth2Login.dart';
 
@@ -40,6 +41,7 @@ class _RefreshMsTokenScreenState extends State<RefreshMsTokenScreen> {
               actions: [OkClose()],
             );
           } else if (snapshot.hasError) {
+            logger.send(snapshot.error);
             return AlertDialog(
               title: Text(i18n.Format('gui.error.info')),
               content: Text("自動更新登入憑證失敗，請手動重新登入"),

diff --git a/lib/Utility/Loggger.dart b/lib/Utility/Loggger.dart
@@ -3,19 +3,18 @@ import 'dart:io';
 import 'package:path/path.dart';
 import 'package:rpmlauncher/path.dart';
 
-late final File LogFile;
-
 class Logger {
-  static void init() {
+  late final File _LogFile;
+  Logger() {
     DateTime now = DateTime.now();
-    LogFile = File(join(dataHome.absolute.path, 'logs',
+    _LogFile = File(join(dataHome.absolute.path, 'logs',
         '${now.year}-${now.month}-${now.day}-${now.hour}-${now.minute}-${now.second}-log.txt'));
-    LogFile.createSync(recursive: true);
+    _LogFile.createSync(recursive: true);
   }
 
-  static void send(Object? object) {
+  void send(Object? object) {
     print(object);
-    LogFile.writeAsStringSync("[${DateTime.now().toIso8601String()}] $object\n",
+    _LogFile.writeAsStringSync("[${DateTime.now().toIso8601String()}] $object\n",
         mode: FileMode.append);
   }
 }
diff --git a/lib/Utility/Updater.dart b/lib/Utility/Updater.dart
@@ -134,9 +134,9 @@ class Updater {
           throw Exception("Unsupported OS");
         }
         break;
-      case "macos":
-        downloadUrl = info.downloadUrl!.macos;
-        break;
+      // case "macos":
+      //   downloadUrl = info.downloadUrl!.macos;
+      //   break;
       default:
         throw Exception("Unknown operating system");
     }
@@ -179,7 +179,7 @@ class Updater {
       return true;
     }
 
-   Future RunUpdater() async {
+    Future RunUpdater() async {
       String nowPath = Directory.current.absolute.path;
       switch (operatingSystem) {
         case "linux":
@@ -342,18 +342,18 @@ class DownloadUrl {
   final String windows_10_11;
   final String windows_7;
   final String linux;
-  final String macos;
+  // final String macos;
 
   const DownloadUrl({
     required this.windows_10_11,
     required this.windows_7,
     required this.linux,
-    required this.macos,
+    // required this.macos,
   });
   factory DownloadUrl.fromJson(Map json) => DownloadUrl(
         windows_10_11: json['windows_10_11'],
         windows_7: json['windows_7'],
         linux: json['linux'],
-        macos: json['macos'],
+        // macos: json['macos'],
       );
 }
diff --git a/lib/Utility/utility.dart b/lib/Utility/utility.dart
@@ -15,6 +15,7 @@ import 'package:rpmlauncher/Account/MojangAccountHandler.dart';
 import 'package:rpmlauncher/Launcher/APIs.dart';
 import 'package:rpmlauncher/Widget/CheckAssets.dart';
 import 'package:rpmlauncher/Widget/DownloadJava.dart';
+import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'Config.dart';
@@ -287,7 +288,7 @@ class utility {
     if (await canLaunch(url)) {
       launch(url);
     } else {
-      Logger.send("Can't open the url $url");
+      logger.send("Can't open the url $url");
     }
   }
 

diff --git a/lib/Widget/CheckAssets.dart b/lib/Widget/CheckAssets.dart
@@ -3,9 +3,6 @@ import 'dart:io';
 import 'dart:isolate';
 
 import 'package:flutter/foundation.dart';
-import 'package:rpmlauncher/Account/Account.dart';
-import 'package:rpmlauncher/Launcher/InstanceRepository.dart';
-import 'package:rpmlauncher/Screen/Account.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart';
@@ -37,7 +34,10 @@ class CheckAssetsScreen_ extends State<CheckAssetsScreen> {
 
   Thread() async {
     ReceivePort port = ReceivePort();
-    compute(InstanceAssets, [port.sendPort, InstanceDir, dataHome]);
+    compute(InstanceAssets, [port.sendPort, InstanceDir, dataHome])
+        .then((value) => setState(() {
+              CheckAssetsProgress = 1.0;
+            }));
     port.listen((message) {
       setState(() {
         CheckAssetsProgress = double.parse(message.toString());
@@ -61,8 +61,7 @@ class CheckAssetsScreen_ extends State<CheckAssetsScreen> {
         join(dataHome.absolute.path, "assets", "indexes", "${VersionID}.json"));
     Directory AssetsObjectDir =
         Directory(join(dataHome.absolute.path, "assets", "objects"));
-    Map<String, dynamic> IndexObject =
-        jsonDecode(IndexFile.readAsStringSync());
+    Map<String, dynamic> IndexObject = jsonDecode(IndexFile.readAsStringSync());
 
     TotalAssetsFiles = IndexObject["objects"].keys.length;
 

diff --git a/lib/Widget/CurseForgeModVersion.dart b/lib/Widget/CurseForgeModVersion.dart
@@ -3,13 +3,13 @@ import 'dart:isolate';
 
 import 'package:rpmlauncher/Mod/CurseForge/Handler.dart';
 import 'package:rpmlauncher/Utility/Config.dart';
-import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
+import 'package:rpmlauncher/main.dart';
 
 class CurseForgeModVersion extends StatefulWidget {
   late List Files;
@@ -252,7 +252,7 @@ class Task_ extends State<Task> {
         await ModFile.writeAsBytes(bytes);
       },
       onError: (e) {
-        Logger.send(e);
+        logger.send(e);
       },
       cancelOnError: true,
     );