Fix the problem with reading or download original image

补充适配原图保存&下载逻辑

changelog/v7.4.5+144.md

@@ -0,0 +1,5 @@
+1. 补充适配原图保存&下载逻辑
+
+------------------------------------------------------------------------------------------
+
+1. Fix the problem with reading or download original image

lib/src/utils/eh_spider_parser.dart

@@ -428,30 +428,33 @@ class EHSpiderParser {
     if (img == null && document.querySelector('#pane_images') != null) {
       throw EHException(type: EHExceptionType.unsupportedImagePageStyle, message: 'unsupportedImagePageStyle'.tr);
     }
-    Element a = document.querySelector('#i6 a')!;
 
     /// height: 1600px; width: 1124px;
     String style = img!.attributes['style']!;
     String url = img.attributes['src']!;
-
     if (url.contains('509.gif')) {
       throw EHException(type: EHExceptionType.exceedLimit, message: 'exceedImageLimits'.tr);
     }
+    double height = double.parse(RegExp(r'height:(\d+)px').firstMatch(style)!.group(1)!);
+    double width = double.parse(RegExp(r'width:(\d+)px').firstMatch(style)!.group(1)!);
+
+    Element hashElement = document.querySelector('#i6 div a')!;
+    String imageHash = RegExp(r'f_shash=(\w+)').firstMatch(hashElement.attributes['href']!)!.group(1)!;
 
-    Element? originalImg = document.querySelector('#i7 > a');
+    Element? originalImg = document.querySelector('#i6:nth-child(3) a');
     String? originalImgHref = originalImg?.attributes['href'];
     RegExpMatch? originalImgWidthAndHeight = RegExp(r'(\d+) x (\d+)').firstMatch(originalImg?.text ?? '');
     double? originalImgWidth = double.tryParse(originalImgWidthAndHeight?.group(1) ?? '');
     double? originalImgHeight = double.tryParse(originalImgWidthAndHeight?.group(2) ?? '');
 
     return GalleryImage(
       url: url,
-      height: double.parse(RegExp(r'height:(\d+)px').firstMatch(style)!.group(1)!),
-      width: double.parse(RegExp(r'width:(\d+)px').firstMatch(style)!.group(1)!),
+      height: height,
+      width: width,
       originalImageUrl: originalImgHref,
       originalImageWidth: originalImgWidth,
       originalImageHeight: originalImgHeight,
-      imageHash: RegExp(r'f_shash=(\w+)').firstMatch(a.attributes['href']!)!.group(1)!,
+      imageHash: imageHash,
     );
   }
 
@@ -461,27 +464,30 @@ class EHSpiderParser {
     if (img == null && document.querySelector('#pane_images') != null) {
       throw EHException(type: EHExceptionType.unsupportedImagePageStyle, message: 'unsupportedImagePageStyle'.tr);
     }
-    Element a = document.querySelector('#i6 > a')!;
 
     /// height: 1600px; width: 1124px;
     String style = img!.attributes['style']!;
     String url = img.attributes['src']!;
-
     if (url.contains('509.gif')) {
       throw EHException(type: EHExceptionType.exceedLimit, message: 'exceedImageLimits'.tr);
     }
+    double height = double.parse(RegExp(r'height:(\d+)px').firstMatch(style)!.group(1)!);
+    double width = double.parse(RegExp(r'width:(\d+)px').firstMatch(style)!.group(1)!);
+
+    Element hashElement = document.querySelector('#i6 div a')!;
+    String imageHash = RegExp(r'f_shash=(\w+)').firstMatch(hashElement.attributes['href']!)!.group(1)!;
 
-    Element? originalImg = document.querySelector('#i7 > a');
+    Element? originalImg = document.querySelector('#i6:nth-child(3) a');
     String? originalImgHref = originalImg?.attributes['href'];
     RegExpMatch? originalImgWidthAndHeight = RegExp(r'(\d+) x (\d+)').firstMatch(originalImg?.text ?? '');
     double? originalImgWidth = double.tryParse(originalImgWidthAndHeight?.group(1) ?? '');
     double? originalImgHeight = double.tryParse(originalImgWidthAndHeight?.group(2) ?? '');
 
     return GalleryImage(
       url: originalImgHref ?? url,
-      height: originalImgHeight ?? double.parse(RegExp(r'height:(\d+)px').firstMatch(style)!.group(1)!),
-      width: originalImgWidth ?? double.parse(RegExp(r'width:(\d+)px').firstMatch(style)!.group(1)!),
-      imageHash: RegExp(r'f_shash=(\w+)').firstMatch(a.attributes['href']!)!.group(1)!,
+      height: originalImgHeight ?? height,
+      width: originalImgWidth ?? width,
+      imageHash: imageHash,
     );
   }
 

pubspec.yaml

@@ -2,7 +2,7 @@ name: jhentai
 description: A flutter app for E-Hentai/EXHentai
 
 publish_to: 'none'
-version: 7.4.4+143
+version: 7.4.5+144
 
 environment:
   sdk: '>=3.0.0 <4.0.0'