From 7431de094fcafe88c4a5629f3e89e1a39dcf4865 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sat, 5 Aug 2023 21:15:29 +0800 Subject: [PATCH] #97 fix --- ios/Runner.xcodeproj/project.pbxproj | 24 ++++++++++++------------ lib/data/res/build_data.dart | 6 +++--- lib/view/page/docker.dart | 1 - lib/view/page/storage/sftp.dart | 12 +++++++++--- macos/Runner.xcodeproj/project.pbxproj | 12 ++++++------ make.dart | 12 ++++++++++-- 6 files changed, 40 insertions(+), 27 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c76fbda2..2792aad4 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -478,7 +478,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -610,7 +610,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -628,7 +628,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -636,7 +636,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -657,7 +657,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -670,7 +670,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -696,7 +696,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -709,7 +709,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -732,7 +732,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -745,7 +745,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 440a855f..e7383ea0 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 422; + static const int build = 423; static const String engine = "3.10.6"; - static const String buildAt = "2023-08-05 17:05:26.027438"; - static const int modifications = 10; + static const String buildAt = "2023-08-05 21:13:42.622817"; + static const int modifications = 7; } diff --git a/lib/view/page/docker.dart b/lib/view/page/docker.dart index e4d63d23..d2d245e1 100644 --- a/lib/view/page/docker.dart +++ b/lib/view/page/docker.dart @@ -266,7 +266,6 @@ class _DockerManagePageState extends State { _buildImageHeader(), _buildImageItems(), _buildEditHost(), - const SizedBox(height: 37), ].map((e) => RoundRectCard(e)); return ListView( padding: const EdgeInsets.all(7), diff --git a/lib/view/page/storage/sftp.dart b/lib/view/page/storage/sftp.dart index 7070b5ce..1c0cb79b 100644 --- a/lib/view/page/storage/sftp.dart +++ b/lib/view/page/storage/sftp.dart @@ -619,10 +619,16 @@ class _SftpPageState extends State { _status.client = sftpc; } try { - final fs = - await _status.client!.listdir(path ?? _status.path?.path ?? '/'); + final listPath = path ?? _status.path?.path ?? '/'; + final fs = await _status.client!.listdir(listPath); fs.sort((a, b) => a.filename.compareTo(b.filename)); - fs.removeAt(0); + + /// Issue #97 + /// In order to compatible with the Synology NAS + /// which not has '.' and '..' in listdir + if (fs.isNotEmpty && fs.first.filename == '.') { + fs.removeAt(0); + } if (mounted) { setState(() { _status.files = fs; diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 04a3df03..ce8b4a63 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 422; + CURRENT_PROJECT_VERSION = 423; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.422; + MARKETING_VERSION = 1.0.423; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/make.dart b/make.dart index 2c5e8886..5f935431 100755 --- a/make.dart +++ b/make.dart @@ -146,9 +146,17 @@ Future flutterBuildAndroid() async { } Future scp2CDN() async { - print('scp2CDN...'); + print('scp2CDN? (Y/n)'); + final str = stdin.readLineSync() ?? ''; + if (str.isNotEmpty) { + print('skip scp2CDN'); + return; + } final result = await Process.run( - 'scp', [apkPath, 'hk:/var/www/res/serverbox/apks/$build.apk']); + 'scp', + [apkPath, 'hk:/var/www/res/serverbox/apks/$build.apk'], + runInShell: true, + ); print(result.stdout); if (result.exitCode != 0) { print(result.stderr);