Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

enhance plugin

lauirf43760832c7be
diff --git a/lib/pages/plugin_editor/plugin_shop_page.dart b/lib/pages/plugin_editor/plugin_shop_page.dart
index d73f57b7..03edf651 100644
--- a/lib/pages/plugin_editor/plugin_shop_page.dart
+++ b/lib/pages/plugin_editor/plugin_shop_page.dart
@@ -108,44 +108,34 @@ class _PluginShopPageState extends State<PluginShopPage> {
if (pluginsController.pluginStatus(
pluginsController.pluginHTTPList[index]) ==
'install') {
- try {
- KazumiDialog.showToast(message: '导入中');
- var pluginHTTPItem =
- await pluginsController.queryPluginHTTP(
- pluginsController.pluginHTTPList[index].name);
- if (pluginHTTPItem != null) {
- if (int.parse(pluginHTTPItem.api) > Api.apiLevel) {
- KazumiDialog.showToast(message: 'kazumi版本过低, 此规则不兼容当前版本');
- return;
- }
- await pluginsController
- .tryInstallPlugin(pluginHTTPItem);
- KazumiDialog.showToast(message: '导入成功');
- setState(() {});
- }
- } catch (e) {
+ KazumiDialog.showToast(message: '导入中');
+ int res = await pluginsController.tryUpdatePluginByName(
+ pluginsController.pluginHTTPList[index].name);
+ if (res == 0) {
+ KazumiDialog.showToast(message: '导入成功');
+ setState(() {
+
+ });
+ } else if (res == 1) {
+ KazumiDialog.showToast(message: 'kazumi版本过低, 此规则不兼容当前版本');
+ } else if (res == 2) {
KazumiDialog.showToast(message: '导入规则失败');
}
}
if (pluginsController.pluginStatus(
pluginsController.pluginHTTPList[index]) ==
'update') {
- try {
- KazumiDialog.showToast(message: '更新中');
- var pluginHTTPItem =
- await pluginsController.queryPluginHTTP(
- pluginsController.pluginHTTPList[index].name);
- if (pluginHTTPItem != null) {
- if (int.parse(pluginHTTPItem.api) > Api.apiLevel) {
- KazumiDialog.showToast(message: 'kazumi版本过低, 此规则不兼容当前版本');
- return;
- }
- await pluginsController
- .tryInstallPlugin(pluginHTTPItem);
- KazumiDialog.showToast(message: '更新成功');
- setState(() {});
- }
- } catch (e) {
+ KazumiDialog.showToast(message: '更新中');
+ int res = await pluginsController.tryUpdatePluginByName(
+ pluginsController.pluginHTTPList[index].name);
+ if (res == 0) {
+ KazumiDialog.showToast(message: '更新成功');
+ setState(() {
+
+ });
+ } else if (res == 1) {
+ KazumiDialog.showToast(message: 'kazumi版本过低, 此规则不兼容当前版本');
+ } else if (res == 2) {
KazumiDialog.showToast(message: '更新规则失败');
}
}
diff --git a/lib/pages/plugin_editor/plugin_view_page.dart b/lib/pages/plugin_editor/plugin_view_page.dart
index 84574965..d6452fec 100644
--- a/lib/pages/plugin_editor/plugin_view_page.dart
+++ b/lib/pages/plugin_editor/plugin_view_page.dart
@@ -181,11 +181,13 @@ class _PluginViewPageState extends State<PluginViewPage> {
KazumiDialog.showToast(message: '规则已是最新');
} else if (state == "updatable") {
KazumiDialog.showLoading(msg: '更新中');
- bool succ = await pluginsController.tryUpdatePlugin(plugin);
+ int res = await pluginsController.tryUpdatePlugin(plugin);
KazumiDialog.dismiss();
- if (succ) {
+ if (res==0) {
KazumiDialog.showToast(message: '更新成功');
- } else {
+ } else if (res == 1) {
+ KazumiDialog.showToast(message: 'kazumi版本过低, 此规则不兼容当前版本');
+ } else if (res == 2) {
KazumiDialog.showToast(message: '更新规则失败');
}
}
diff --git a/lib/plugins/plugins_controller.dart b/lib/plugins/plugins_controller.dart
index 2a348706..ccb89759 100644
--- a/lib/plugins/plugins_controller.dart
+++ b/lib/plugins/plugins_controller.dart
@@ -160,24 +160,28 @@ Future<void> deletePluginJsonFile(Plugin plugin) async {
return p.version == plugin.version ? "latest" : "updatable";
}
- Future<bool> tryUpdatePlugin(Plugin plugin) async {
- var pluginHTTPItem = await queryPluginHTTP(plugin.name);
+ Future<int> tryUpdatePlugin(Plugin plugin) async {
+ return await tryUpdatePluginByName(plugin.name);
+ }
+
+ Future<int> tryUpdatePluginByName(String name) async {
+ var pluginHTTPItem = await queryPluginHTTP(name);
if (pluginHTTPItem != null) {
if (int.parse(pluginHTTPItem.api) > Api.apiLevel) {
- return false;
+ return 1;
}
await savePluginToJsonFile(pluginHTTPItem);
await loadPlugins();
- return true;
+ return 0;
}
- return false;
+ return 2;
}
Future<int> tryUpdateAllPlugin() async {
int count = 0;
for (Plugin plugin in pluginList) {
if (pluginUpdateStatus(plugin) == 'updatable') {
- if (await tryUpdatePlugin(plugin)) {
+ if (await tryUpdatePlugin(plugin) == 0) {
count++;
}
}