From b0a7a5569a5e260891abb5b541e66df015668a76 Mon Sep 17 00:00:00 2001 From: levi Date: Fri, 28 Oct 2022 10:57:39 +0800 Subject: [PATCH] feat: add logger --- ui/flutter/lib/api/model/resource.dart | 3 ++- ui/flutter/lib/api/model/task.dart | 3 ++- ui/flutter/lib/main.dart | 11 ++++++++--- ui/flutter/lib/pages/create/create_view.dart | 2 -- ui/flutter/lib/pages/setting/setting_controller.dart | 2 -- ui/flutter/lib/pages/task/task_view.dart | 1 + ui/flutter/lib/util/log_util.dart | 11 +++++++++++ ui/flutter/pubspec.lock | 7 +++++++ ui/flutter/pubspec.yaml | 1 + 9 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 ui/flutter/lib/util/log_util.dart diff --git a/ui/flutter/lib/api/model/resource.dart b/ui/flutter/lib/api/model/resource.dart index 8aff1ee5..7d2d3ad2 100644 --- a/ui/flutter/lib/api/model/resource.dart +++ b/ui/flutter/lib/api/model/resource.dart @@ -1,6 +1,7 @@ -import 'request.dart'; import 'package:json_annotation/json_annotation.dart'; +import 'request.dart'; + part 'resource.g.dart'; @JsonSerializable(explicitToJson: true) diff --git a/ui/flutter/lib/api/model/task.dart b/ui/flutter/lib/api/model/task.dart index 8126e6db..cbb8038f 100644 --- a/ui/flutter/lib/api/model/task.dart +++ b/ui/flutter/lib/api/model/task.dart @@ -1,6 +1,7 @@ +import 'package:json_annotation/json_annotation.dart'; + import 'options.dart'; import 'resource.dart'; -import 'package:json_annotation/json_annotation.dart'; part 'task.g.dart'; diff --git a/ui/flutter/lib/main.dart b/ui/flutter/lib/main.dart index ca20cf8b..0cc2d331 100644 --- a/ui/flutter/lib/main.dart +++ b/ui/flutter/lib/main.dart @@ -5,13 +5,18 @@ import 'core/libgopeed_boot.dart'; import 'routes/router.dart'; import 'setting/setting.dart'; import 'theme/theme.dart'; +import 'util/log_util.dart'; import 'util/mac_secure_util.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await LibgopeedBoot.instance.start(); - await Setting.instance.load(); + try { + await LibgopeedBoot.instance.start(); + await Setting.instance.load(); + } catch (e) { + logger.e("init fail", e); + } MacSecureUtil.loadBookmark(); runApp(GetMaterialApp.router( @@ -21,4 +26,4 @@ void main() async { themeMode: Setting.instance.themeMode, getPages: Routes.routes, )); -} \ No newline at end of file +} diff --git a/ui/flutter/lib/pages/create/create_view.dart b/ui/flutter/lib/pages/create/create_view.dart index b613f4c2..fab299ac 100644 --- a/ui/flutter/lib/pages/create/create_view.dart +++ b/ui/flutter/lib/pages/create/create_view.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:gopeed/api/api.dart'; diff --git a/ui/flutter/lib/pages/setting/setting_controller.dart b/ui/flutter/lib/pages/setting/setting_controller.dart index 7ffeda27..9ee7a286 100644 --- a/ui/flutter/lib/pages/setting/setting_controller.dart +++ b/ui/flutter/lib/pages/setting/setting_controller.dart @@ -1,6 +1,4 @@ import 'package:get/get.dart'; -import 'package:gopeed/api/api.dart'; -import 'package:gopeed/api/model/server_config.dart'; import '../../setting/setting.dart'; diff --git a/ui/flutter/lib/pages/task/task_view.dart b/ui/flutter/lib/pages/task/task_view.dart index ee10ad0c..fcdc2218 100644 --- a/ui/flutter/lib/pages/task/task_view.dart +++ b/ui/flutter/lib/pages/task/task_view.dart @@ -6,6 +6,7 @@ import 'package:gopeed/api/api.dart'; import 'package:gopeed/api/model/task.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:url_launcher/url_launcher.dart'; + import '../../util/util.dart'; import 'task_controller.dart'; diff --git a/ui/flutter/lib/util/log_util.dart b/ui/flutter/lib/util/log_util.dart new file mode 100644 index 00000000..0106c012 --- /dev/null +++ b/ui/flutter/lib/util/log_util.dart @@ -0,0 +1,11 @@ +import 'dart:io'; + +import 'package:logger/logger.dart'; +import 'package:logger/src/outputs/file_output.dart'; + +import 'util.dart'; + +final logger = Logger( + printer: PrettyPrinter(), + output: Util.isDesktop() ? FileOutput(file: File('log.txt')) : null, +); diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock index ebd1d05c..d8652c2a 100644 --- a/ui/flutter/pubspec.lock +++ b/ui/flutter/pubspec.lock @@ -401,6 +401,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" + logger: + dependency: "direct main" + description: + name: logger + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.0" logging: dependency: transitive description: diff --git a/ui/flutter/pubspec.yaml b/ui/flutter/pubspec.yaml index 2b937858..abd9cb77 100644 --- a/ui/flutter/pubspec.yaml +++ b/ui/flutter/pubspec.yaml @@ -48,6 +48,7 @@ dependencies: shared_preferences: ^2.0.15 permission_handler: ^10.1.0 external_path: ^1.0.3 + logger: ^1.1.0 dev_dependencies: flutter_test: