From f7724576abae839ebe1d640a8c25761337b0a7a6 Mon Sep 17 00:00:00 2001 From: toki Date: Tue, 21 Mar 2023 09:46:58 +0900 Subject: [PATCH] refactoring --- bin/main.dart | 2 +- lib/core/app_data_manager.dart | 2 +- lib/core/application.dart | 2 +- lib/io/file_base.dart | 10 ---------- lib/io/file_io.dart | 13 ------------- lib/io/file_web.dart | 17 ----------------- lib/{core => log}/log.dart | 2 +- lib/{io => log}/log_writer_io.dart | 2 +- lib/{io => log}/log_writer_web.dart | 0 lib/{core => platform}/isolate_manager.dart | 0 .../platform_base.dart} | 5 +++-- lib/platform/platform_stub.dart | 8 ++++++++ lib/{core => platform}/process.dart | 0 lib/utils/os_startup.dart | 2 +- lib/utils/slack/slack_data.dart | 1 - 15 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 lib/io/file_base.dart delete mode 100644 lib/io/file_io.dart delete mode 100644 lib/io/file_web.dart rename lib/{core => log}/log.dart (98%) rename lib/{io => log}/log_writer_io.dart (95%) rename lib/{io => log}/log_writer_web.dart (100%) rename lib/{core => platform}/isolate_manager.dart (100%) rename lib/{io/log_writer_base.dart => platform/platform_base.dart} (53%) create mode 100644 lib/platform/platform_stub.dart rename lib/{core => platform}/process.dart (100%) diff --git a/bin/main.dart b/bin/main.dart index b95e12f..0ca79fb 100644 --- a/bin/main.dart +++ b/bin/main.dart @@ -1,5 +1,5 @@ import 'package:dart_framework/core/application.dart'; -import 'package:dart_framework/core/log.dart'; +import 'package:dart_framework/log/log.dart'; void main() async { Application(() { diff --git a/lib/core/app_data_manager.dart b/lib/core/app_data_manager.dart index a29bf29..ae5b6e5 100644 --- a/lib/core/app_data_manager.dart +++ b/lib/core/app_data_manager.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; //import 'package:flutter/services.dart' show rootBundle; -import 'package:dart_framework/core/process.dart'; +import 'package:dart_framework/platform/process.dart'; import 'package:dart_framework/model/app_data.dart'; enum SCMType { Svn, Git } diff --git a/lib/core/application.dart b/lib/core/application.dart index 5a9ce89..2536ad5 100644 --- a/lib/core/application.dart +++ b/lib/core/application.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'log.dart'; +import 'package:dart_framework/log/log.dart'; import 'package:dart_framework/utils/system_util.dart' as system; class Application { diff --git a/lib/io/file_base.dart b/lib/io/file_base.dart deleted file mode 100644 index 56abb91..0000000 --- a/lib/io/file_base.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:dart_framework/io/file_io.dart' - if (dart.library.html) 'package:dart_framework/io/file_web.dart'; - -abstract class FileExtendBase { - static FileExtendBase get instance { - return getInstance(); - } - - void test(); -} diff --git a/lib/io/file_io.dart b/lib/io/file_io.dart deleted file mode 100644 index 821437a..0000000 --- a/lib/io/file_io.dart +++ /dev/null @@ -1,13 +0,0 @@ -import 'dart:io'; -import 'package:dart_framework/io/file_base.dart'; - -class FileExtend extends FileExtendBase { - @override - void test() { - print('This is ${Platform.operatingSystem}'); - } -} - -FileExtendBase getInstance() { - return FileExtend(); -} diff --git a/lib/io/file_web.dart b/lib/io/file_web.dart deleted file mode 100644 index 104c053..0000000 --- a/lib/io/file_web.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'dart:html'; -import 'package:dart_framework/io/file_base.dart'; - -class FileExtend extends FileExtendBase { - @override - void test() { - var list = querySelectorAll('div'); - for (var item in list) { - print(item); - } - print('This is web!!'); - } -} - -FileExtendBase getInstance() { - return FileExtend(); -} diff --git a/lib/core/log.dart b/lib/log/log.dart similarity index 98% rename from lib/core/log.dart rename to lib/log/log.dart index bedab3d..db6d84a 100644 --- a/lib/core/log.dart +++ b/lib/log/log.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:dart_framework/data/isolate_data.dart'; -import 'package:dart_framework/io/log_writer_base.dart'; +import 'package:dart_framework/platform/platform_base.dart'; import 'package:dart_framework/utils/string_util.dart'; import 'package:dart_framework/utils/system_util.dart'; diff --git a/lib/io/log_writer_io.dart b/lib/log/log_writer_io.dart similarity index 95% rename from lib/io/log_writer_io.dart rename to lib/log/log_writer_io.dart index 38d1080..eea88d9 100644 --- a/lib/io/log_writer_io.dart +++ b/lib/log/log_writer_io.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:path/path.dart' as path; -import 'package:dart_framework/core/isolate_manager.dart'; +import 'package:dart_framework/platform/isolate_manager.dart'; import 'package:dart_framework/utils/string_util.dart'; import 'package:dart_framework/data/isolate_data.dart'; diff --git a/lib/io/log_writer_web.dart b/lib/log/log_writer_web.dart similarity index 100% rename from lib/io/log_writer_web.dart rename to lib/log/log_writer_web.dart diff --git a/lib/core/isolate_manager.dart b/lib/platform/isolate_manager.dart similarity index 100% rename from lib/core/isolate_manager.dart rename to lib/platform/isolate_manager.dart diff --git a/lib/io/log_writer_base.dart b/lib/platform/platform_base.dart similarity index 53% rename from lib/io/log_writer_base.dart rename to lib/platform/platform_base.dart index 80089a4..acb6982 100644 --- a/lib/io/log_writer_base.dart +++ b/lib/platform/platform_base.dart @@ -1,6 +1,7 @@ import 'package:dart_framework/data/isolate_data.dart'; -import 'package:dart_framework/io/log_writer_io.dart' - if (dart.library.html) 'package:dart_framework/io/log_writer_web.dart'; +import 'package:dart_framework/platform/platform_stub.dart' + if (dart.library.io) 'package:dart_framework/log/log_writer_io.dart' + if (dart.library.html) 'package:dart_framework/log/log_writer_web.dart'; void startLogWriter(String path, Function(IsoMessege) listener) { startLog(path, listener); diff --git a/lib/platform/platform_stub.dart b/lib/platform/platform_stub.dart new file mode 100644 index 0000000..850ffe7 --- /dev/null +++ b/lib/platform/platform_stub.dart @@ -0,0 +1,8 @@ +import 'package:dart_framework/platform/platform_base.dart'; +import 'package:dart_framework/data/isolate_data.dart'; + +void startLog(String path, Function(IsoMessege) listener) {} + +void writeLog(String log) {} + +void endLog() {} diff --git a/lib/core/process.dart b/lib/platform/process.dart similarity index 100% rename from lib/core/process.dart rename to lib/platform/process.dart diff --git a/lib/utils/os_startup.dart b/lib/utils/os_startup.dart index b3fbe81..d5209a7 100644 --- a/lib/utils/os_startup.dart +++ b/lib/utils/os_startup.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'dart:async'; import 'package:path/path.dart' as path; -import 'package:dart_framework/core/process.dart'; +import 'package:dart_framework/platform/process.dart'; class OSStartup { static _Startup? _instance; diff --git a/lib/utils/slack/slack_data.dart b/lib/utils/slack/slack_data.dart index db1c1de..40a6cd2 100644 --- a/lib/utils/slack/slack_data.dart +++ b/lib/utils/slack/slack_data.dart @@ -181,7 +181,6 @@ class SlackConfirm { String? dismiss_text; } -// To-do: File upload test class SlackFile { String? title; // ignore: non_constant_identifier_names