rewrite: Changed aniyomibridge to new simplified api.

Author: K3vinb5

lib/application/cubits/extensions_cubit.dart

@@ -73,72 +73,45 @@ class ExtensionsCubit extends Cubit<ExtensionsState> with EffectMixin<Extensions
       return;
     }
     try {
-      if (extension.type == ExtensionType.ANIYOMI) {
-        emit(state.copyWith(
-            availableAnimeExtensions: List.from(state.availableAnimeExtensions)..remove(extension)
-        ));
-      } else {
-        emit(state.copyWith(
-            availableMangaExtensions: List.from(state.availableMangaExtensions)..remove(extension)
-        ));
-      }
       await _extensionRepositoryAniyomi.addExtension(extension);
       if (extension.type == ExtensionType.ANIYOMI) {
-        emit(state.copyWith(
-            installedAnimeExtensions: [extension, ...state.installedAnimeExtensions]
-        ));
-
+        _fetchInstaledAnimeExtensions(state.loggedUser);
+        _fetchAvailableAnimeExtensions(state.loggedUser);
       } else {
-        emit(state.copyWith(
-            installedMangaExtensions: [extension, ...state.installedMangaExtensions]
-        ));
+        _fetchInstaledMangaExtensions(state.loggedUser);
+        _fetchAvailableMangaExtensions(state.loggedUser);
       }
       showSnackBarEffect("${extension.name} Installed!", message: "${extension.name} was installed successfully", contentType: ContentType.success);
     } catch (e, stackTrace) {
       if (extension.type == ExtensionType.ANIYOMI) {
-        emit(state.copyWith(
-            availableAnimeExtensions: [extension, ...state.availableAnimeExtensions]
-        ));
+        _fetchAvailableAnimeExtensions(state.loggedUser);
       } else {
-        emit(state.copyWith(
-            availableMangaExtensions: [extension, ...state.availableMangaExtensions]
-        ));
+        _fetchAvailableMangaExtensions(state.loggedUser);
       }
       handleError("Failed to download extension ${extension.pkg}: $e", stackTrace: stackTrace);
     }
   }
 
   Future<void> removeExtension(Extension extension) async {
+    if (!state.installedAnimeExtensions.contains(extension) && !state.installedMangaExtensions.contains(extension)) {
+      handleError("This version of ${extension.name} is already uninstalled.");
+      return;
+    }
     try {
-      if (extension.type == ExtensionType.ANIYOMI) {
-        emit(state.copyWith(
-            installedAnimeExtensions: List.from(state.installedAnimeExtensions)..remove(extension)
-        ));
-      } else {
-        emit(state.copyWith(
-            installedMangaExtensions: List.from(state.installedMangaExtensions)..remove(extension)
-        ));
-      }
       await _extensionRepositoryAniyomi.removeExtension(extension);
       if (extension.type == ExtensionType.ANIYOMI) {
-        emit(state.copyWith(
-            availableAnimeExtensions: [extension, ...state.availableAnimeExtensions]
-        ));
+        _fetchInstaledAnimeExtensions(state.loggedUser);
+        _fetchAvailableAnimeExtensions(state.loggedUser);
       } else {
-        emit(state.copyWith(
-            availableMangaExtensions: [extension, ...state.availableMangaExtensions]
-        ));
+        _fetchInstaledMangaExtensions(state.loggedUser);
+        _fetchAvailableMangaExtensions(state.loggedUser);
       }
       showSnackBarEffect("${extension.name} Removed!", message: "${extension.name} was removed successfully", contentType: ContentType.success);
     } catch (e, stackTrace) {
       if (extension.type == ExtensionType.ANIYOMI) {
-        emit(state.copyWith(
-            installedAnimeExtensions: [extension, ...state.installedAnimeExtensions]
-        ));
+        _fetchInstaledAnimeExtensions(state.loggedUser);
       } else {
-        emit(state.copyWith(
-            installedMangaExtensions: [extension, ...state.installedMangaExtensions]
-        ));
+        _fetchInstaledMangaExtensions(state.loggedUser);
       }
       handleError("Failed to remove extension ${extension.pkg}: $e", stackTrace: stackTrace);
     }

lib/data/repositories/extension_repository_aniyomi.dart

@@ -146,9 +146,9 @@ class ExtensionRepositoryAniyomi implements ExtensionRepository {
     _aniyomiExtensionsBox = await Hive.openBox<Extension>('aniyomiExtensions');
     await _aniyomiExtensionsBox.put('${extension.name}-${extension.version}', extension);
     if (extension.type == ExtensionType.ANIYOMI) {
-      _aniyomiBridge.loadAnimeExtension(extension.apk);
+      _aniyomiBridge.loadAnimeExtension(extension.apk, extension.pkg);
     } else if (extension.type == ExtensionType.TACHIYOMI) {
-      _aniyomiBridge.loadMangaExtension(extension.apk);
+      _aniyomiBridge.loadMangaExtension(extension.apk, extension.pkg);
     } else {
       _logger.w("Unknown extension type: ${extension.type}");
       throw Exception("Unknown extension type: ${extension.type}");
@@ -160,37 +160,37 @@ class ExtensionRepositoryAniyomi implements ExtensionRepository {
     _aniyomiExtensionsBox = await Hive.openBox<Extension>('aniyomiExtensions');
     await _aniyomiExtensionsBox.delete('${extension.name}-${extension.version}');
     if (extension.type == ExtensionType.ANIYOMI) {
-      _aniyomiBridge.unloadAnimeExtension(extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1), "v${extension.version}");
+      _aniyomiBridge.unloadAnimeExtension(extension.pkg);
     } else if (extension.type == ExtensionType.TACHIYOMI) {
-      _aniyomiBridge.unloadMangaExtension(extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1), "v${extension.version}");
+      _aniyomiBridge.unloadMangaExtension(extension.pkg);
     } else {
       _logger.w("Unknown extension type: ${extension.type}");
       throw Exception("Unknown extension type: ${extension.type}");
     }
   }
 
   Future<List<JSAnime>> getAnimeSearchResults(String query, Extension extension) async {
-    return _aniyomiBridge.getAnimeSearchResults(query, 1, extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1));
+    return _aniyomiBridge.getAnimeSearchResults(query, 1, extension.pkg);
   }
 
   Future<List<JSEpisode>> getAnimeEpisodeList(JSAnime anime, Extension extension) async {
-    return _aniyomiBridge.getEpisodeList(anime, extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1));
+    return _aniyomiBridge.getEpisodeList(anime, extension.pkg);
   }
 
   Future<List<JVideo>> getAnimeVideoList(JSEpisode episode, Extension extension) async {
-    return _aniyomiBridge.getVideoList(episode, extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1));
+    return _aniyomiBridge.getVideoList(episode, extension.pkg);
   }
 
   Future<List<JSManga>> getMangaSearchResults(String query, Extension extension) async {
-    return _aniyomiBridge.getMangaSearchResults(query, 1, extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1));
+    return _aniyomiBridge.getMangaSearchResults(query, 1, extension.pkg);
   }
 
   Future<List<JSChapter>> getMangaChapterList(JSManga manga, Extension extension) async {
-    return _aniyomiBridge.getChapterList(manga, extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1));
+    return _aniyomiBridge.getChapterList(manga, extension.pkg);
   }
 
   Future<List<JPage>> getMangaPageList(JSChapter chapter, Extension extension) async {
-    return _aniyomiBridge.getPageList(chapter, extension.pkg.substring(extension.pkg.lastIndexOf(".") + 1));
+    return _aniyomiBridge.getPageList(chapter, extension.pkg);
   }
 
   List<AniyomiRepoJsonEntity> _parseAniyomiRepoJsonList(Map<String, dynamic> json) {
@@ -214,7 +214,7 @@ class ExtensionRepositoryAniyomi implements ExtensionRepository {
       return;
     }
     for (Extension extension in installedExtensions) {
-      _aniyomiBridge.loadAnimeExtension(extension.apk);
+      _aniyomiBridge.loadAnimeExtension(extension.apk, extension.pkg);
     }
   }
 
@@ -227,7 +227,7 @@ class ExtensionRepositoryAniyomi implements ExtensionRepository {
       return;
     }
     for (Extension extension in installedExtensions) {
-      _aniyomiBridge.loadMangaExtension(extension.apk);
+      _aniyomiBridge.loadMangaExtension(extension.apk, extension.pkg);
     }
   }