opt.: Loggers

This commit is contained in:
lollipopkit
2023-09-13 13:41:09 +08:00
parent 269c2a0a10
commit 6c84d2f52b
22 changed files with 64 additions and 103 deletions

View File

@@ -4,10 +4,10 @@ import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:logging/logging.dart';
import 'package:toolbox/core/extension/context.dart';
import 'package:toolbox/core/utils/platform.dart';
import 'package:toolbox/data/model/app/backup.dart';
import 'package:toolbox/data/res/logger.dart';
import 'package:toolbox/data/res/path.dart';
import 'package:toolbox/view/widget/round_rect_card.dart';
@@ -18,8 +18,6 @@ import '../../locator.dart';
import '../widget/custom_appbar.dart';
import '../widget/store_switch.dart';
final _logger = Logger('Backup');
class BackupPage extends StatelessWidget {
BackupPage({Key? key}) : super(key: key);
@@ -166,7 +164,7 @@ class BackupPage extends StatelessWidget {
],
);
} catch (e, trace) {
_logger.warning('Import backup failed', e, trace);
Loggers.app.warning('Import backup failed', e, trace);
context.showSnackBar(e.toString());
} finally {
context.pop();

View File

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:get_it/get_it.dart';
import 'package:toolbox/core/extension/context.dart';
import 'package:toolbox/data/res/logger.dart';
import '../../core/analysis.dart';
import '../../core/route.dart';
@@ -360,6 +361,7 @@ class _HomePageState extends State<HomePage>
Future<void> _onLongPressSetting() async {
/// Encode [map] to String with indent `\t`
final map = _setting.toJson();
final keys = map.keys;
final text = jsonEncoder.convert(map);
final result = await AppRoute.editor(
text: text,
@@ -372,11 +374,17 @@ class _HomePageState extends State<HomePage>
try {
final newSettings = json.decode(result) as Map<String, dynamic>;
_setting.box.putAll(newSettings);
} catch (e) {
final newKeys = newSettings.keys;
final removedKeys = keys.where((e) => !newKeys.contains(e));
for (final key in removedKeys) {
_setting.box.delete(key);
}
} catch (e, trace) {
context.showRoundDialog(
title: Text(_s.error),
child: Text('${_s.save}:\n$e'),
);
Loggers.app.warning('Update json settings failed', e, trace);
}
}
}

View File

@@ -1068,7 +1068,7 @@ class _SettingPageState extends State<SettingPage> {
Widget _buildSftpRmrfDir() {
return ListTile(
title: Text(_s.sftpRmrfDir),
title: const Text('rm -rf'),
subtitle: Text(_s.sftpRmrfDirSummary, style: grey),
trailing: StoreSwitch(prop: _setting.sftpRmrfDir),
);

View File

@@ -4,9 +4,9 @@ import 'package:after_layout/after_layout.dart';
import 'package:dartssh2/dartssh2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:logging/logging.dart';
import 'package:toolbox/core/extension/context.dart';
import 'package:toolbox/core/extension/sftpfile.dart';
import 'package:toolbox/data/res/logger.dart';
import 'package:toolbox/data/res/misc.dart';
import 'package:toolbox/data/store/history.dart';
import 'package:toolbox/view/widget/round_rect_card.dart';
@@ -58,8 +58,6 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
SSHClient? _client;
final _logger = Logger('SFTP');
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -664,7 +662,7 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
return false;
} catch (e, trace) {
context.pop();
_logger.warning('List dir failed', e, trace);
Loggers.app.warning('List dir failed', e, trace);
await _backward();
Future.delayed(
const Duration(milliseconds: 177),