diff --git a/lib/providers/fetchBooks.dart b/lib/providers/fetchBooks.dart index 48bce764..33efbdc0 100644 --- a/lib/providers/fetchBooks.dart +++ b/lib/providers/fetchBooks.dart @@ -2,7 +2,7 @@ import 'package:dio/dio.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:built_collection/built_collection.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -46,7 +46,7 @@ Future getComics(String comicsId) async { ]); // turn into built list - final api = Openapi(basePathOverride: url).getItemsApi(); + final api = Tentacle(basePathOverride: url).getItemsApi(); Response? response; bool useSentry = prefs.getBool('useSentry') ?? false; try { diff --git a/lib/providers/fetchCategories.dart b/lib/providers/fetchCategories.dart index 28bfd9fb..01cce4ab 100644 --- a/lib/providers/fetchCategories.dart +++ b/lib/providers/fetchCategories.dart @@ -1,7 +1,7 @@ // The purpose of this file is to fetch the categories from the database import 'package:shared_preferences/shared_preferences.dart'; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:jellybook/providers/fetchBooks.dart'; import 'package:jellybook/providers/folderProvider.dart'; import 'package:jellybook/models/entry.dart'; @@ -50,7 +50,7 @@ Future<(List, List)> getServerCategories({ logger.d("got prefs"); Map headers = getHeaders(url, client, device, deviceId, version, token); - final api = Openapi(basePathOverride: url).getUserViewsApi(); + final api = Tentacle(basePathOverride: url).getUserViewsApi(); var response; try { response = await api.getUserViews( diff --git a/lib/providers/login.dart b/lib/providers/login.dart index 2dfd5559..e9afa844 100644 --- a/lib/providers/login.dart +++ b/lib/providers/login.dart @@ -11,7 +11,7 @@ import 'package:package_info_plus/package_info_plus.dart' as package_info; import 'package:isar/isar.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:jellybook/models/login.dart'; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:jellybook/variables.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -95,12 +95,12 @@ class LoginProvider { "URL is not valid. Please check the URL and try again."; } - final api = Openapi(basePathOverride: _url); + final api = Tentacle(basePathOverride: _url); final apiInstance = api.getUserApi(); Response response; try { - // use the authenticateUserByNameRequest from openapi/lib/src/model/authenticate_user_by_name_request.g.dart + // use the authenticateUserByNameRequest from tentacle/lib/src/model/authenticate_user_by_name_request.g.dart var authenticateUserByNameRequest = AuthenticateUserByNameRequest((b) => b ..username = username ..pw = password); diff --git a/lib/providers/updateLike.dart b/lib/providers/updateLike.dart index 36893031..ee391029 100644 --- a/lib/providers/updateLike.dart +++ b/lib/providers/updateLike.dart @@ -2,7 +2,7 @@ import 'package:isar/isar.dart'; import 'package:jellybook/models/entry.dart'; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:package_info_plus/package_info_plus.dart' as p_info; import 'package:jellybook/variables.dart'; @@ -38,7 +38,7 @@ Future updateLike(String id) async { 'Host': server.substring(server.indexOf("//") + 2, server.length), 'Content-Length': '0', }; - final api = Openapi(basePathOverride: server).getUserLibraryApi(); + final api = Tentacle(basePathOverride: server).getUserLibraryApi(); logger.d(url); bool useSentry = prefs.getBool('useSentry') ?? false; if (entries?.isFavorited == false) { diff --git a/lib/providers/updatePagenum.dart b/lib/providers/updatePagenum.dart index ace20c1d..89fa52a5 100644 --- a/lib/providers/updatePagenum.dart +++ b/lib/providers/updatePagenum.dart @@ -1,5 +1,5 @@ // the purpose of this file is to update the page number of the current page on jellyfin -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:package_info_plus/package_info_plus.dart' as p_info; import 'package:jellybook/variables.dart'; @@ -31,7 +31,7 @@ Future updatePagenum(String id, int pagenum) async { 'Host': server.substring(server.indexOf("//") + 2, server.length), 'Content-Length': '0', }; - final api = Openapi(basePathOverride: server).getPlaystateApi(); + final api = Tentacle(basePathOverride: server).getPlaystateApi(); try { final response = await api.onPlaybackProgress( userId: userId, diff --git a/lib/screens/EditScreen.dart b/lib/screens/EditScreen.dart index b9611939..4cbea24b 100644 --- a/lib/screens/EditScreen.dart +++ b/lib/screens/EditScreen.dart @@ -18,7 +18,7 @@ import 'package:jellybook/models/entry.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:jellybook/variables.dart'; import 'package:package_info_plus/package_info_plus.dart' as p_info; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:image_picker/image_picker.dart'; import 'package:built_collection/built_collection.dart'; @@ -185,7 +185,7 @@ class _EditScreenState extends State { 'Origin': server, 'Host': server.substring(server.indexOf("//") + 2, server.length), }; - final api = Openapi(basePathOverride: server).getItemUpdateApi(); + final api = Tentacle(basePathOverride: server).getItemUpdateApi(); DateTime? dateTime; bool useSentry = prefs.getBool('useSentry') ?? false; try { @@ -245,7 +245,7 @@ class _EditScreenState extends State { ); } if (imageChanged) { - final api2 = Openapi(basePathOverride: server).getImageApi(); + final api2 = Tentacle(basePathOverride: server).getImageApi(); // get the image encoded in base64 File imagefile = File(entry.imagePath); MultipartFile file = await MultipartFile.fromFile( diff --git a/lib/screens/MainScreens/settingsScreen.dart b/lib/screens/MainScreens/settingsScreen.dart index abfc90b8..fe4be7b8 100644 --- a/lib/screens/MainScreens/settingsScreen.dart +++ b/lib/screens/MainScreens/settingsScreen.dart @@ -16,7 +16,7 @@ import 'package:jellybook/variables.dart'; import 'package:palette_generator/palette_generator.dart'; import 'package:sentry/sentry.dart'; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; class SettingsScreen extends StatefulWidget { @override @@ -309,7 +309,7 @@ class _SettingsScreenState extends State { 'Host': server.substring(server.indexOf("//") + 2, server.length), 'Content-Length': '0', }; - final api = Openapi(basePathOverride: server).getImageApi(); + final api = Tentacle(basePathOverride: server).getImageApi(); Uint8List image = Uint8List(0); ImageProvider imageProvider = Image.asset('assets/images/Logo.png').image; try { diff --git a/lib/screens/downloaderScreen.dart b/lib/screens/downloaderScreen.dart index 68e76b19..4dac038b 100644 --- a/lib/screens/downloaderScreen.dart +++ b/lib/screens/downloaderScreen.dart @@ -15,7 +15,7 @@ import 'package:unrar_file/unrar_file.dart'; import 'package:jellybook/providers/fileNameFromTitle.dart'; import 'package:jellybook/providers/parseEpub.dart'; import 'package:jellybook/providers/ComicInfoXML.dart'; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; // import the database import 'package:jellybook/models/entry.dart'; @@ -153,7 +153,7 @@ class _DownloadScreenState extends State { entry.filePath = dir; logger.d('Directory created'); logger.d('Attempting to download file'); - final api = Openapi(basePathOverride: entry.url).getLibraryApi(); + final api = Tentacle(basePathOverride: entry.url).getLibraryApi(); Response download; downloading = true; download = await api diff --git a/lib/screens/infoScreen.dart b/lib/screens/infoScreen.dart index c19d8214..72760512 100644 --- a/lib/screens/infoScreen.dart +++ b/lib/screens/infoScreen.dart @@ -19,7 +19,7 @@ import 'package:jellybook/models/entry.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:jellybook/variables.dart'; import 'package:package_info_plus/package_info_plus.dart' as p_info; -import 'package:openapi/openapi.dart'; +import 'package:tentacle/tentacle.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:jellybook/providers/Author.dart'; @@ -274,7 +274,7 @@ class _InfoScreenState extends State { 'Content-Length': '0', }; - final api = Openapi(basePathOverride: server).getPersonsApi(); + final api = Tentacle(basePathOverride: server).getPersonsApi(); final person = await api.getPerson(name: author, headers: headers); if (person.data!.imageTags == null || person.data!.imageTags!.isEmpty) { return "asset"; diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 726c8b0d..56f3d0e8 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -7,20 +7,28 @@ #include "generated_plugin_registrant.h" #include +#include #include #include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) audioplayers_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "AudioplayersLinuxPlugin"); audioplayers_linux_plugin_register_with_registrar(audioplayers_linux_registrar); + g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); + file_selector_plugin_register_with_registrar(file_selector_linux_registrar); g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); g_autoptr(FlPluginRegistrar) isar_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "IsarFlutterLibsPlugin"); isar_flutter_libs_plugin_register_with_registrar(isar_flutter_libs_registrar); + g_autoptr(FlPluginRegistrar) sentry_flutter_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin"); + sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 557d1b24..548341a3 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,8 +4,10 @@ list(APPEND FLUTTER_PLUGIN_LIST audioplayers_linux + file_selector_linux flutter_secure_storage_linux isar_flutter_libs + sentry_flutter url_launcher_linux ) diff --git a/submodules/tentacle b/submodules/tentacle index 43128bb7..a91be3cc 160000 --- a/submodules/tentacle +++ b/submodules/tentacle @@ -1 +1 @@ -Subproject commit 43128bb77ff5528f7c29fc050d94d09523a83865 +Subproject commit a91be3cc52cee88a38775f8fb7e6d470dab5b986