From bf652633f828764922af254e5cfecacb61c85205 Mon Sep 17 00:00:00 2001 From: fuwa Date: Tue, 18 Feb 2020 16:53:21 +0800 Subject: [PATCH] move controller to logic --- cyberwow/lib/{ => logic}/controller/daemon.dart | 4 ++-- cyberwow/lib/{ => logic}/controller/process/run.dart | 6 +++--- cyberwow/lib/{ => logic}/controller/refresh.dart | 6 +++--- cyberwow/lib/{ => logic}/controller/rpc/rpc.dart | 6 +++--- cyberwow/lib/{ => logic}/controller/rpc/rpc2.dart | 6 +++--- .../lib/{ => logic}/controller/rpc/rpc2View.dart | 4 ++-- cyberwow/lib/{ => logic}/controller/rpc/rpcView.dart | 4 ++-- cyberwow/lib/main.dart | 2 +- cyberwow/lib/state/resyncing.dart | 6 +++--- cyberwow/lib/state/synced.dart | 12 ++++++------ cyberwow/lib/state/syncing.dart | 6 +++--- 11 files changed, 31 insertions(+), 31 deletions(-) rename cyberwow/lib/{ => logic}/controller/daemon.dart (95%) rename cyberwow/lib/{ => logic}/controller/process/run.dart (95%) rename cyberwow/lib/{ => logic}/controller/refresh.dart (93%) rename cyberwow/lib/{ => logic}/controller/rpc/rpc.dart (96%) rename cyberwow/lib/{ => logic}/controller/rpc/rpc2.dart (96%) rename cyberwow/lib/{ => logic}/controller/rpc/rpc2View.dart (97%) rename cyberwow/lib/{ => logic}/controller/rpc/rpcView.dart (98%) diff --git a/cyberwow/lib/controller/daemon.dart b/cyberwow/lib/logic/controller/daemon.dart similarity index 95% rename from cyberwow/lib/controller/daemon.dart rename to cyberwow/lib/logic/controller/daemon.dart index 810b4e5..b98c587 100644 --- a/cyberwow/lib/controller/daemon.dart +++ b/cyberwow/lib/logic/controller/daemon.dart @@ -23,8 +23,8 @@ import 'dart:async'; import 'dart:convert'; import 'rpc/rpc.dart' as rpc; -import '../config.dart' as config; -import '../logging.dart'; +import '../../config.dart' as config; +import '../../logging.dart'; Future isConnected() async { final _outPeers = await rpc.outgoingConnectionsCount(); diff --git a/cyberwow/lib/controller/process/run.dart b/cyberwow/lib/logic/controller/process/run.dart similarity index 95% rename from cyberwow/lib/controller/process/run.dart rename to cyberwow/lib/logic/controller/process/run.dart index 5aa2850..659d61c 100644 --- a/cyberwow/lib/controller/process/run.dart +++ b/cyberwow/lib/logic/controller/process/run.dart @@ -26,9 +26,9 @@ import 'dart:io'; import 'dart:async'; import 'dart:convert'; -import '../../config.dart' as config; -import '../../logging.dart'; -import '../../logic/sensor/helper.dart' as helper; +import '../../../config.dart' as config; +import '../../../logging.dart'; +import '../../sensor/helper.dart' as helper; typedef ShouldExit = bool Function(); diff --git a/cyberwow/lib/controller/refresh.dart b/cyberwow/lib/logic/controller/refresh.dart similarity index 93% rename from cyberwow/lib/controller/refresh.dart rename to cyberwow/lib/logic/controller/refresh.dart index 855e70c..8b6699b 100644 --- a/cyberwow/lib/controller/refresh.dart +++ b/cyberwow/lib/logic/controller/refresh.dart @@ -25,9 +25,9 @@ import 'dart:ui'; import 'dart:async'; import 'rpc/rpc.dart' as rpc; -import '../config.dart'; -import '../logging.dart'; -import '../helper.dart'; +import '../../config.dart'; +import '../../logging.dart'; +import '../../helper.dart'; typedef GetNotificationFunc = AppLifecycleState Function(); diff --git a/cyberwow/lib/controller/rpc/rpc.dart b/cyberwow/lib/logic/controller/rpc/rpc.dart similarity index 96% rename from cyberwow/lib/controller/rpc/rpc.dart rename to cyberwow/lib/logic/controller/rpc/rpc.dart index f3be620..40f721a 100644 --- a/cyberwow/lib/controller/rpc/rpc.dart +++ b/cyberwow/lib/logic/controller/rpc/rpc.dart @@ -25,9 +25,9 @@ import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:flutter/foundation.dart'; -import '../../config.dart' as config; -import '../../helper.dart'; -import '../../logging.dart'; +import '../../../config.dart' as config; +import '../../../helper.dart'; +import '../../../logging.dart'; int rpcID = 0; diff --git a/cyberwow/lib/controller/rpc/rpc2.dart b/cyberwow/lib/logic/controller/rpc/rpc2.dart similarity index 96% rename from cyberwow/lib/controller/rpc/rpc2.dart rename to cyberwow/lib/logic/controller/rpc/rpc2.dart index de7e471..ee920d4 100644 --- a/cyberwow/lib/controller/rpc/rpc2.dart +++ b/cyberwow/lib/logic/controller/rpc/rpc2.dart @@ -27,9 +27,9 @@ import 'package:http/http.dart' as http; import 'package:flutter/foundation.dart'; import 'package:intl/intl.dart'; -import '../../config.dart' as config; -import '../../helper.dart'; -import '../../logging.dart'; +import '../../../config.dart' as config; +import '../../../helper.dart'; +import '../../../logging.dart'; Future rpc2(final String method) async { final url = 'http://${config.host}:${config.c.port}/${method}'; diff --git a/cyberwow/lib/controller/rpc/rpc2View.dart b/cyberwow/lib/logic/controller/rpc/rpc2View.dart similarity index 97% rename from cyberwow/lib/controller/rpc/rpc2View.dart rename to cyberwow/lib/logic/controller/rpc/rpc2View.dart index cd260e6..4d8d7af 100644 --- a/cyberwow/lib/controller/rpc/rpc2View.dart +++ b/cyberwow/lib/logic/controller/rpc/rpc2View.dart @@ -23,8 +23,8 @@ import 'dart:math'; import 'package:intl/intl.dart'; -import '../../config.dart' as config; -import '../../helper.dart'; +import '../../../config.dart' as config; +import '../../../helper.dart'; Map txView(Map x) { const _remove = diff --git a/cyberwow/lib/controller/rpc/rpcView.dart b/cyberwow/lib/logic/controller/rpc/rpcView.dart similarity index 98% rename from cyberwow/lib/controller/rpc/rpcView.dart rename to cyberwow/lib/logic/controller/rpc/rpcView.dart index a92d5e6..7fc0427 100644 --- a/cyberwow/lib/controller/rpc/rpcView.dart +++ b/cyberwow/lib/logic/controller/rpc/rpcView.dart @@ -21,8 +21,8 @@ along with CyberWOW. If not, see . import 'package:intl/intl.dart'; -import '../../config.dart' as config; -import '../../helper.dart'; +import '../../../config.dart' as config; +import '../../../helper.dart'; Map getConnectionView(Map x) { const _remove = diff --git a/cyberwow/lib/main.dart b/cyberwow/lib/main.dart index 02f5702..a440236 100644 --- a/cyberwow/lib/main.dart +++ b/cyberwow/lib/main.dart @@ -28,7 +28,7 @@ import 'dart:io'; import 'dart:async'; import 'config.dart' as config; -import 'controller/process/run.dart' as process; +import 'logic/controller/process/run.dart' as process; import 'logging.dart'; import 'state.dart' as state; import 'widget.dart' as widget; diff --git a/cyberwow/lib/state/resyncing.dart b/cyberwow/lib/state/resyncing.dart index 6196111..7354e31 100644 --- a/cyberwow/lib/state/resyncing.dart +++ b/cyberwow/lib/state/resyncing.dart @@ -22,9 +22,9 @@ along with CyberWOW. If not, see . import 'dart:async'; import 'dart:collection'; -import '../controller/rpc/rpc.dart' as rpc; -import '../controller/daemon.dart' as daemon; -import '../controller/refresh.dart' as refresh; +import '../logic/controller/rpc/rpc.dart' as rpc; +import '../logic/controller/daemon.dart' as daemon; +import '../logic/controller/refresh.dart' as refresh; import '../config.dart' as config; import '../logging.dart'; diff --git a/cyberwow/lib/state/synced.dart b/cyberwow/lib/state/synced.dart index ac3e9b7..3de2760 100644 --- a/cyberwow/lib/state/synced.dart +++ b/cyberwow/lib/state/synced.dart @@ -26,12 +26,12 @@ import 'dart:collection'; import 'package:flutter/material.dart'; import '../config.dart' as config; -import '../controller/daemon.dart' as daemon; -import '../controller/refresh.dart' as refresh; -import '../controller/rpc/rpc.dart' as rpc; -import '../controller/rpc/rpc2.dart' as rpc; -import '../controller/rpc/rpc2View.dart' as rpc2View; -import '../controller/rpc/rpcView.dart' as rpcView; +import '../logic/controller/daemon.dart' as daemon; +import '../logic/controller/refresh.dart' as refresh; +import '../logic/controller/rpc/rpc.dart' as rpc; +import '../logic/controller/rpc/rpc2.dart' as rpc; +import '../logic/controller/rpc/rpc2View.dart' as rpc2View; +import '../logic/controller/rpc/rpcView.dart' as rpcView; import '../helper.dart'; import '../logging.dart'; diff --git a/cyberwow/lib/state/syncing.dart b/cyberwow/lib/state/syncing.dart index 3cc10a8..4204f87 100644 --- a/cyberwow/lib/state/syncing.dart +++ b/cyberwow/lib/state/syncing.dart @@ -22,9 +22,9 @@ along with CyberWOW. If not, see . import 'dart:async'; import 'dart:collection'; -import '../controller/rpc/rpc.dart' as rpc; -import '../controller/daemon.dart' as daemon; -import '../controller/refresh.dart' as refresh; +import '../logic/controller/rpc/rpc.dart' as rpc; +import '../logic/controller/daemon.dart' as daemon; +import '../logic/controller/refresh.dart' as refresh; import '../config.dart' as config; import '../logging.dart';