From c3ca5725a417af69e4151e81263553f9a8116c32 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Fri, 27 Oct 2023 22:13:45 +0800 Subject: [PATCH] fix: constantly write script by sftp --- ios/Runner.xcodeproj/project.pbxproj | 36 +++++++++++++------------- lib/core/utils/misc.dart | 1 - lib/data/model/server/server.dart | 2 +- lib/data/model/sftp/req.dart | 6 ++--- lib/data/provider/server.dart | 3 ++- lib/data/res/build_data.dart | 8 +++--- lib/data/res/rebuild.dart | 2 +- lib/view/page/storage/sftp.dart | 8 +++--- macos/Runner.xcodeproj/project.pbxproj | 12 ++++----- 9 files changed, 37 insertions(+), 41 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b9d526c4..179a8d9d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/core/utils/misc.dart b/lib/core/utils/misc.dart index f8246e44..0ea8aa5b 100644 --- a/lib/core/utils/misc.dart +++ b/lib/core/utils/misc.dart @@ -3,7 +3,6 @@ import 'package:plain_notification_token/plain_notification_token.dart'; import 'package:toolbox/core/utils/platform/base.dart'; import 'package:toolbox/data/res/provider.dart'; - Future pickOneFile() async { Pros.app.moveBg = false; final result = await FilePicker.platform.pickFiles(type: FileType.any); diff --git a/lib/data/model/server/server.dart b/lib/data/model/server/server.dart index ef7b2de4..6b9d6b85 100644 --- a/lib/data/model/server/server.dart +++ b/lib/data/model/server/server.dart @@ -10,7 +10,7 @@ class Server implements TagPickable { SSHClient? client; ServerState state; - /// Whether is generating client. + /// Whether is generating client. /// Use this to avoid reconnecting if last connect try not finished. bool isGenerating = false; diff --git a/lib/data/model/sftp/req.dart b/lib/data/model/sftp/req.dart index 9dc6c665..07264948 100644 --- a/lib/data/model/sftp/req.dart +++ b/lib/data/model/sftp/req.dart @@ -78,14 +78,12 @@ class SftpReqStatus { case int: size = event; break; - case Exception: - error = event; - break; case Duration: spentTime = event; break; default: - error = Exception('unknown event: $event'); + error = Exception('sftp worker event: $event'); + dispose(); } notifyListeners(); } diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index ab2dca8a..70d80d0f 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -267,7 +267,7 @@ class ServerProvider extends ChangeNotifier { final time1 = DateTime.now(); - try { + try { if (s.isGenerating) return; s.isGenerating = true; s.client = await genClient( @@ -323,6 +323,7 @@ class ServerProvider extends ChangeNotifier { s.status.failedInfo = e.toString(); _setServerState(s, ServerState.failed); Loggers.app.warning('Write script to ${spi.name} failed', e); + return; } finally { await file.delete(); } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 0d9280aa..3f15cb2e 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 607; - static const String engine = "3.13.7"; - static const String buildAt = "2023-10-22 14:20:27"; - static const int modifications = 4; + static const int build = 611; + static const String engine = "3.13.8"; + static const String buildAt = "2023-10-27 20:42:26"; + static const int modifications = 7; static const int script = 22; } diff --git a/lib/data/res/rebuild.dart b/lib/data/res/rebuild.dart index 8baf24b5..0cb9dece 100644 --- a/lib/data/res/rebuild.dart +++ b/lib/data/res/rebuild.dart @@ -4,4 +4,4 @@ class RebuildNodes { const RebuildNodes._(); static final app = RebuildNode(); -} \ No newline at end of file +} diff --git a/lib/view/page/storage/sftp.dart b/lib/view/page/storage/sftp.dart index fcb924a6..fae944ca 100644 --- a/lib/view/page/storage/sftp.dart +++ b/lib/view/page/storage/sftp.dart @@ -208,11 +208,9 @@ class _SftpPageState extends State with AfterLayoutMixin { if (!Stores.setting.recordHistory.fetch()) { return []; } - return List.from( - Stores.history.sftpGoPath.all.where( - (element) => element.contains(val.text), - ), - ); + return Stores.history.sftpGoPath.all.cast().where( + (element) => element.contains(val.text), + ); }, fieldViewBuilder: (_, controller, node, __) { return Input( diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index efd570da..6199e910 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -432,7 +432,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -442,7 +442,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = ServerBox; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -567,7 +567,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -577,7 +577,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = ServerBox; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -596,7 +596,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 607; + CURRENT_PROJECT_VERSION = 611; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -606,7 +606,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.607; + MARKETING_VERSION = 1.0.611; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = ServerBox; PROVISIONING_PROFILE_SPECIFIER = "";