Skip to content

Commit

Permalink
Improve plugin installation UX with loading state and error handling #…
Browse files Browse the repository at this point in the history
  • Loading branch information
qianlifeng committed Feb 19, 2025
1 parent 14e9fc7 commit 5152dc6
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 49 deletions.
10 changes: 7 additions & 3 deletions wox.core/ui/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func handlePluginInstall(w http.ResponseWriter, r *http.Request) {
body, _ := io.ReadAll(r.Body)
idResult := gjson.GetBytes(body, "id")
if !idResult.Exists() {
writeErrorResponse(w, "id is empty")
writeErrorResponse(w, "Plugin ID is required for installation")
return
}

Expand All @@ -209,16 +209,20 @@ func handlePluginInstall(w http.ResponseWriter, r *http.Request) {
return false
})
if !exist {
writeErrorResponse(w, "can't find plugin in the store")
writeErrorResponse(w, fmt.Sprintf("Plugin '%s' not found in the store", pluginId))
return
}

logger.Info(ctx, fmt.Sprintf("Installing plugin '%s' (%s)", findPlugin.Name, pluginId))
installErr := plugin.GetStoreManager().Install(ctx, findPlugin)
if installErr != nil {
writeErrorResponse(w, "can't install plugin: "+installErr.Error())
errMsg := fmt.Sprintf("Failed to install plugin '%s': %s", findPlugin.Name, installErr.Error())
logger.Error(ctx, errMsg)
writeErrorResponse(w, errMsg)
return
}

logger.Info(ctx, fmt.Sprintf("Successfully installed plugin '%s' (%s)", findPlugin.Name, pluginId))
writeSuccessResponse(w, "")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,26 @@ class WoxSettingPluginView extends GetView<WoxSettingController> {
if (!plugin.isInstalled)
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: Button(
onPressed: () {
controller.installPlugin(plugin);
},
child: const Text('Install'),
),
child: Obx(() => Button(
onPressed: controller.isInstallingPlugin.value
? null
: () {
controller.installPlugin(plugin);
},
child: controller.isInstallingPlugin.value
? const Row(
children: [
SizedBox(
width: 16,
height: 16,
child: ProgressRing(),
),
SizedBox(width: 8),
Text('Installing...'),
],
)
: const Text('Install'),
)),
),
if (plugin.isInstalled && !plugin.isDisable)
Padding(
Expand Down
22 changes: 19 additions & 3 deletions wox.ui.flutter/wox/lib/modules/setting/wox_setting_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class WoxSettingController extends GetxController {
//lang
var langMap = <String, String>{}.obs;

final isInstallingPlugin = false.obs;

void hideWindow() {
Get.find<WoxLauncherController>().isInSettingView.value = false;
}
Expand Down Expand Up @@ -101,9 +103,23 @@ class WoxSettingController extends GetxController {
}

Future<void> installPlugin(PluginDetail plugin) async {
Logger.instance.info(const UuidV4().generate(), 'installing plugin: ${plugin.name}');
await WoxApi.instance.installPlugin(plugin.id);
await refreshPluginList();
try {
isInstallingPlugin.value = true;
Logger.instance.info(const UuidV4().generate(), 'installing plugin: ${plugin.name}');
await WoxApi.instance.installPlugin(plugin.id);
await refreshPluginList();
} catch (e) {
Get.snackbar(
'Installation Failed',
e.toString(),
snackPosition: SnackPosition.TOP,
backgroundColor: Colors.red,
colorText: Colors.white,
duration: const Duration(seconds: 5),
);
} finally {
isInstallingPlugin.value = false;
}
}

Future<void> disablePlugin(PluginDetail plugin) async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
74 changes: 37 additions & 37 deletions wox.ui.flutter/wox/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ packages:
dependency: transitive
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.11.0"
version: "2.12.0"
autotrie:
dependency: transitive
description:
Expand All @@ -37,18 +37,18 @@ packages:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
characters:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
charcode:
dependency: transitive
description:
Expand All @@ -69,18 +69,18 @@ packages:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
collection:
dependency: transitive
description:
name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.19.0"
version: "1.19.1"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -165,10 +165,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.2"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -417,18 +417,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.7"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.8"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -497,10 +497,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
Expand All @@ -521,10 +521,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.16.0"
mocktail:
dependency: transitive
description:
Expand All @@ -537,10 +537,10 @@ packages:
dependency: "direct main"
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
path_parsing:
dependency: transitive
description:
Expand Down Expand Up @@ -710,10 +710,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.10.1"
sprintf:
dependency: transitive
description:
Expand All @@ -726,26 +726,26 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.12.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
string_scanner:
dependency: transitive
description:
name: string_scanner
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.1"
syncfusion_flutter_core:
dependency: transitive
description:
Expand Down Expand Up @@ -814,18 +814,18 @@ packages:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test_api:
dependency: transitive
description:
name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.3"
version: "0.7.4"
tuple:
dependency: transitive
description:
Expand Down Expand Up @@ -958,10 +958,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "14.3.0"
version: "14.3.1"
web:
dependency: transitive
description:
Expand Down Expand Up @@ -1028,5 +1028,5 @@ packages:
source: hosted
version: "6.5.0"
sdks:
dart: ">=3.5.0 <4.0.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.24.0"

0 comments on commit 5152dc6

Please sign in to comment.