This commit is contained in:
kodjomoustapha 2024-11-27 15:15:16 +01:00
parent a0dda26878
commit 65414a98ca
4 changed files with 46 additions and 82 deletions

View file

@ -33,6 +33,7 @@ class CustomExtendedNetworkImageProvider
this.cacheRawData = false,
this.cancelToken,
this.imageCacheName,
this.imageCacheFolderName,
this.cacheMaxAge = const Duration(days: 30),
this.showCloudFlareError = false,
});
@ -95,6 +96,8 @@ class CustomExtendedNetworkImageProvider
final bool showCloudFlareError;
final String? imageCacheFolderName;
@override
ImageStreamCompleter loadImage(
image_provider.ExtendedNetworkImageProvider key,
@ -187,8 +190,9 @@ class CustomExtendedNetworkImageProvider
StreamController<ImageChunkEvent>? chunkEvents,
String md5Key,
) async {
final Directory cacheImagesDirectory = Directory(
join((await getTemporaryDirectory()).path, cacheImageFolderName));
final Directory cacheImagesDirectory = Directory(join(
(await getTemporaryDirectory()).path,
'Mangayomi/${imageCacheFolderName ?? "cacheimagecover"}'));
Uint8List? data;
// exist, try to find cache image file
if (cacheImagesDirectory.existsSync()) {
@ -284,15 +288,12 @@ class CustomExtendedNetworkImageProvider
StreamedResponse response =
await MClient.init(showCloudFlareError: showCloudFlareError)
.send(request);
if (response.request != null) {
if (response.statusCode != 200) {
final res = await MClient.init(
reqcopyWith: {'useDartHttpClient': true},
showCloudFlareError: showCloudFlareError)
.send(response.request!);
if (![403, 503].contains(res.statusCode) &&
["cloudflare-nginx", "cloudflare"].contains(res.headers["server"])) {
return res;
}
return res;
}
return response;

View file

@ -77,6 +77,7 @@ extension UChapDataPreloadExtensions on UChapDataPreload {
cache: true,
cacheMaxAge: const Duration(days: 7),
showCloudFlareError: showCloudFlareError,
imageCacheFolderName: "cacheimagemanga",
headers: {
...data.pageUrl!.headers ?? {},
...ref.watch(headersProvider(

View file

@ -487,74 +487,66 @@ packages:
flutter_inappwebview:
dependency: "direct main"
description:
path: flutter_inappwebview
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview
sha256: a8f5c9dd300a8cc7fde7bb902ae57febe95e9269424e4d08d5a1a56214e1e6ff
url: "https://pub.dev"
source: hosted
version: "6.2.0-beta.2"
flutter_inappwebview_android:
dependency: "direct overridden"
dependency: transitive
description:
path: flutter_inappwebview_android
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_android
sha256: "2427e89d9c7b00cc756f800932d7ab8f3272d3fbc71544e1aedb3dbc17dae074"
url: "https://pub.dev"
source: hosted
version: "1.2.0-beta.2"
flutter_inappwebview_internal_annotations:
dependency: transitive
description:
path: "dev_packages/flutter_inappwebview_internal_annotations"
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_internal_annotations
sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
flutter_inappwebview_ios:
dependency: "direct overridden"
dependency: transitive
description:
path: flutter_inappwebview_ios
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_ios
sha256: "7ff65d7408e453f9a4ff38f74673aeec8cae824cba8276b4b77350262bfe356a"
url: "https://pub.dev"
source: hosted
version: "1.2.0-beta.2"
flutter_inappwebview_macos:
dependency: "direct overridden"
dependency: transitive
description:
path: flutter_inappwebview_macos
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_macos
sha256: be8b8ab0100c94ec9fc079a4d48b2bc8dd1a8b4c2647da34f1d3dae93cd5f88a
url: "https://pub.dev"
source: hosted
version: "1.2.0-beta.2"
flutter_inappwebview_platform_interface:
dependency: "direct overridden"
dependency: transitive
description:
path: flutter_inappwebview_platform_interface
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_platform_interface
sha256: "2c99bf767900ba029d825bc6f494d30169ee83cdaa038d86e85fe70571d0a655"
url: "https://pub.dev"
source: hosted
version: "1.4.0-beta.2"
flutter_inappwebview_web:
dependency: transitive
description:
path: flutter_inappwebview_web
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_web
sha256: "6c4bb61ea9d52e51d79ea23da27c928d0430873c04ad380df39c1ef442b11f4e"
url: "https://pub.dev"
source: hosted
version: "1.2.0-beta.2"
flutter_inappwebview_windows:
dependency: "direct overridden"
dependency: transitive
description:
path: flutter_inappwebview_windows
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
resolved-ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
url: "https://github.com/pichillilorenzo/flutter_inappwebview.git"
source: git
name: flutter_inappwebview_windows
sha256: "0ff241f814b7caff63b9632cf858b6d3d9c35758040620a9745e5f6e9dd94d74"
url: "https://pub.dev"
source: hosted
version: "0.7.0-beta.2"
flutter_launcher_icons:
dependency: "direct dev"

View file

@ -98,36 +98,6 @@ dependency_overrides:
meta: ^1.15.0
collection: ^1.19.0
flutter_inappwebview_windows:
git:
url: https://github.com/pichillilorenzo/flutter_inappwebview.git
path: flutter_inappwebview_windows
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
flutter_inappwebview_android:
git:
url: https://github.com/pichillilorenzo/flutter_inappwebview.git
path: flutter_inappwebview_android
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
flutter_inappwebview_ios:
git:
url: https://github.com/pichillilorenzo/flutter_inappwebview.git
path: flutter_inappwebview_ios
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
flutter_inappwebview_macos:
git:
url: https://github.com/pichillilorenzo/flutter_inappwebview.git
path: flutter_inappwebview_macos
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
flutter_inappwebview_platform_interface:
git:
url: https://github.com/pichillilorenzo/flutter_inappwebview.git
path: flutter_inappwebview_platform_interface
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
flutter_inappwebview:
git:
url: https://github.com/pichillilorenzo/flutter_inappwebview.git
path: flutter_inappwebview
ref: fe5949f7fa8478943e98e748b19152a9fdc36be4
dev_dependencies:
flutter_test: