diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b5d0fe01..0e9a6a88 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -700,7 +700,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -826,7 +826,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -836,7 +836,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -854,7 +854,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -864,7 +864,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -885,7 +885,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -898,7 +898,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -924,7 +924,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -937,7 +937,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -960,7 +960,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -973,7 +973,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -996,7 +996,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1008,7 +1008,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -1037,7 +1037,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1049,7 +1049,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -1075,7 +1075,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1087,7 +1087,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/model/server/nvdia.dart b/lib/data/model/server/nvdia.dart index ee0f3b1a..5e0aabe8 100644 --- a/lib/data/model/server/nvdia.dart +++ b/lib/data/model/server/nvdia.dart @@ -71,11 +71,7 @@ class NvidiaSmi { .firstOrNull ?.innerText; final fanSpeed = gpu.findElements('fan_speed').firstOrNull?.innerText; - if (name != null && - temp != null && - powerDraw != null && - powerLimit != null && - memory != null) { + if (name != null && temp != null) { return NvidiaSmiItem( name: name, uuid: gpu.findElements('uuid').firstOrNull?.innerText ?? '', diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 5dd2b134..09dbd2b2 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 = 909; + static const int build = 910; static const String engine = "3.22.0"; - static const String buildAt = "2024-05-23 00:45:04"; - static const int modifications = 11; + static const String buildAt = "2024-05-23 19:27:43"; + static const int modifications = 2; static const int script = 48; } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 288806e5..8c2f6099 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -471,7 +471,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -481,7 +481,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -608,7 +608,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -618,7 +618,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -638,7 +638,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 909; + CURRENT_PROJECT_VERSION = 910; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; @@ -649,7 +649,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.909; + MARKETING_VERSION = 1.0.910; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/pubspec.lock b/pubspec.lock index 18d42a75..e7fbd99b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -270,9 +270,11 @@ packages: dartssh2: dependency: "direct main" description: - path: "../dartssh2" - relative: true - source: path + path: "." + ref: dev + resolved-ref: d62d7e64c99de62a52495f3dedbf6b8983e4ce77 + url: "https://github.com/lollipopkit/dartssh2" + source: git version: "2.9.1-pre" dbus: dependency: transitive @@ -397,9 +399,11 @@ packages: fl_lib: dependency: "direct main" description: - path: "../fl_lib" - relative: true - source: path + path: "." + ref: main + resolved-ref: "4ffe5cb3a42f93b59f011fdedde601b9681a144f" + url: "https://github.com/lollipopkit/fl_lib" + source: git version: "0.0.1" flutter: dependency: "direct main" @@ -1511,9 +1515,11 @@ packages: xterm: dependency: "direct main" description: - path: "../xterm.dart" - relative: true - source: path + path: "." + ref: a343bc2fdc11fbc7dbfc1f170692426a6fe01cb9 + resolved-ref: a343bc2fdc11fbc7dbfc1f170692426a6fe01cb9 + url: "https://github.com/lollipopkit/xterm.dart" + source: git version: "4.0.0" yaml: dependency: transitive @@ -1532,5 +1538,5 @@ packages: source: hosted version: "0.0.6" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.4.0 <4.0.0" flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index 9c7c36a9..80cf37c1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -59,13 +59,13 @@ dependencies: ref: main device_info_plus: ^10.1.0 -dependency_overrides: - dartssh2: - path: ../dartssh2 - fl_lib: - path: ../fl_lib - xterm: - path: ../xterm.dart +# dependency_overrides: +# dartssh2: +# path: ../dartssh2 +# fl_lib: +# path: ../fl_lib +# xterm: +# path: ../xterm.dart dev_dependencies: flutter_native_splash: ^2.1.6 diff --git a/test/nvidia.txt b/test/nvidia.xml similarity index 100% rename from test/nvidia.txt rename to test/nvidia.xml diff --git a/test/nvidia2.xml b/test/nvidia2.xml new file mode 100644 index 00000000..e876e00e --- /dev/null +++ b/test/nvidia2.xml @@ -0,0 +1,390 @@ + + + + Thu May 23 19:40:25 2024 + 470.239.06 + 11.4 + 1 + + NVIDIA GeForce GT 730 + GeForce + N/A + N/A + Disabled + + N/A + N/A + + + None + + N/A + N/A + + N/A + N/A + + N/A + GPU-3c0451a4-3ef8-e225-7fac-5159712b7d16 + 0 + 80.28.78.00.EA + N/A + N/A + N/A + 0 + + N/A + N/A + N/A + N/A + + + N/A + N/A + + N/A + + N/A + N/A + + + N/A + + + 0D + 00 + 0000 + 128710DE + 00000000:0D:00.0 + 000010DE + + + N/A + N/A + + + N/A + N/A + + + + N/A + N/A + + 0 + 0 + N/A + N/A + + 40 % + P0 + N/A + + 978 MiB + 0 MiB + 978 MiB + + + N/A + N/A + N/A + + Default + + N/A + N/A + N/A + N/A + + + N/A + N/A + N/A + + + N/A + N/A + N/A + + + N/A + N/A + + + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + + + + N/A + N/A + + + N/A + N/A + + N/A + N/A + + N/A + + 34 C + N/A + N/A + N/A + N/A + N/A + N/A + + + N/A + N/A + + + P0 + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + N/A + N/A + N/A + N/A + + + 901 MHz + 800 MHz + + + 901 MHz + 800 MHz + + + N/A + N/A + N/A + N/A + + + N/A + + + N/A + N/A + + + N/A + + + + 800 MHz + 901 MHz + 888 MHz + 875 MHz + 862 MHz + 849 MHz + 836 MHz + 823 MHz + 810 MHz + 797 MHz + 784 MHz + 771 MHz + 758 MHz + 745 MHz + 732 MHz + 719 MHz + 705 MHz + 692 MHz + 679 MHz + 666 MHz + 653 MHz + + + 405 MHz + 405 MHz + 402 MHz + 400 MHz + 398 MHz + 396 MHz + 394 MHz + 392 MHz + 390 MHz + 388 MHz + 386 MHz + 384 MHz + 382 MHz + 380 MHz + 378 MHz + 376 MHz + 374 MHz + 372 MHz + 370 MHz + 368 MHz + 366 MHz + 364 MHz + 361 MHz + 359 MHz + 357 MHz + 355 MHz + 353 MHz + 351 MHz + 349 MHz + 347 MHz + 345 MHz + 343 MHz + 341 MHz + 339 MHz + 337 MHz + 335 MHz + 333 MHz + 331 MHz + 329 MHz + 327 MHz + 325 MHz + 323 MHz + 321 MHz + 318 MHz + 316 MHz + 314 MHz + 312 MHz + 310 MHz + 308 MHz + 306 MHz + 304 MHz + 302 MHz + 300 MHz + 298 MHz + 296 MHz + 294 MHz + 292 MHz + 290 MHz + 288 MHz + 286 MHz + 284 MHz + 282 MHz + 280 MHz + 278 MHz + 275 MHz + 273 MHz + 271 MHz + 269 MHz + 267 MHz + 265 MHz + 263 MHz + 261 MHz + 259 MHz + 257 MHz + 255 MHz + 253 MHz + 251 MHz + 249 MHz + 247 MHz + 245 MHz + 243 MHz + 241 MHz + 239 MHz + 237 MHz + 235 MHz + 232 MHz + 230 MHz + 228 MHz + 226 MHz + 224 MHz + 222 MHz + 220 MHz + 218 MHz + 216 MHz + 214 MHz + 212 MHz + 210 MHz + 208 MHz + 206 MHz + 204 MHz + 202 MHz + 200 MHz + 198 MHz + 196 MHz + 194 MHz + 192 MHz + 189 MHz + 187 MHz + 185 MHz + 183 MHz + 181 MHz + 179 MHz + 177 MHz + 175 MHz + 173 MHz + 171 MHz + 169 MHz + 167 MHz + 165 MHz + 163 MHz + 161 MHz + 159 MHz + 157 MHz + 155 MHz + 153 MHz + 151 MHz + 149 MHz + 146 MHz + 144 MHz + 142 MHz + 140 MHz + 138 MHz + 136 MHz + + + + + N/A + + + diff --git a/test/nvidia_test.dart b/test/nvidia_test.dart index d3a48a48..649db674 100644 --- a/test/nvidia_test.dart +++ b/test/nvidia_test.dart @@ -864,8 +864,14 @@ void main() { }); test('nvidia-smi with N/A', () async { - final raw = await File('test/nvidia.txt').readAsString(); + final raw = await File('test/nvidia.xml').readAsString(); final items = NvidiaSmi.fromXml(raw); expect(items.length, 4); }); + + test('nvidia-smi 2', () async { + final raw = await File('test/nvidia2.xml').readAsString(); + final items = NvidiaSmi.fromXml(raw); + expect(items.length, 1); + }); }