Add back the setting of automatically redirecting to the EH site to deal with the problem that some IPs cannot

  access the EH site

重新添加自动重定向至表站的设置，以应对部分ip无法访问表站的问题

Author: jiangtian616

changelog/v7.4.11+150.md

@@ -1,5 +1,6 @@
 - 偏好设置中支持搜索时将中文标签搜索结果按热度排序。感谢[e-hentai-db](https://github.com/ccloli/e-hentai-db)
   和[e-hentai-tag-count](https://github.com/poly000/e-hentai-tag-count)
+- 重新添加自动重定向至表站的设置，以应对部分ip无法访问表站的问题
 - 支持自动创建.nomedia文件
 - 支持处理下载原图时GP不足的情况
 - 平板布局和桌面布局下，使用系统返回键返回时，会优先弹出右侧页面
@@ -29,6 +30,8 @@
 - In the preference settings, support to sort the Chinese tag search results by popularity when searching.
   Thanks to [e-hentai-db](https://github.com/ccloli/e-hentai-db)
   和[e-hentai-tag-count](https://github.com/poly000/e-hentai-tag-count)
+- Add back the setting of automatically redirecting to the EH site to deal with the problem that some IPs cannot
+  access the EH site
 - Support to create .nomedia file automatically
 - Support to process the situation of insufficient GP when downloading the original image
 - Under the tablet layout and desktop layout, when using the system return key to return, the right page will be

lib/src/l18n/en_US.dart

@@ -227,6 +227,7 @@ class en_US {
       /// eh setting page
       'site': 'Site',
       'redirect2Eh': 'Redirect to EH if available',
+      'redirect2EhHint': 'Try to load gallery detail page from EH site first to get better network performance',
       'redirectAllGallery': 'Redirect all gallery to EH',
       'imDonorHint': 'If you are a donor, you can turn this on to help you access gallerys in EX site',
       'profileSetting': 'Profile Setting',

lib/src/l18n/ko_KR.dart

@@ -227,6 +227,7 @@ class ko_KR {
       /// eh setting page
       'site': '사이트',
       'redirect2Eh': '사용 가능하면 EH로 재요청',
+      'redirect2EhHint': 'Try to load gallery detail page from EH site first to get better network performance',
       'redirectAllGallery': 'Redirect all gallery to EH',
       'imDonorHint': 'If you are a donor, you can turn this on to help you access gallerys in EX site',
       'profileSetting': 'Profile Setting',

lib/src/l18n/pt_BR.dart

@@ -228,6 +228,7 @@ class pt_BR {
       /// eh setting page
       'site': 'Site',
       'redirect2Eh': 'Redirecionar para EH, se disponível',
+      'redirect2EhHint': 'Try to load gallery detail page from EH site first to get better network performance',
       'redirectAllGallery': 'Redirect all gallery to EH',
       'imDonorHint': 'If you are a donor, you can turn this on to help you access gallerys in EX site',
       'profileSetting': 'Profile Setting',

lib/src/l18n/zh_CN.dart

@@ -226,6 +226,7 @@ class zh_CN {
       /// eh setting page
       'site': '站点',
       'redirect2Eh': '优先重定向至表站',
+      'redirect2EhHint': '优先尝试从表站加载画廊详情页，以获得更好的网络体验',
       'redirectAllGallery': '重定向所有画廊至表站',
       'imDonorHint': '如果你是捐赠者，你可以打开此项来更容易地访问里站中的画廊',
       'profileSetting': 'Profile设置',

lib/src/l18n/zh_TW.dart

@@ -226,6 +226,7 @@ class zh_TW {
       /// eh setting page
       'site': '站點',
       'redirect2Eh': '優先重定向至表站',
+      'redirect2EhHint': '優先嘗試從表站加載畫廊詳情頁，以獲得更好的網絡體驗',
       'redirectAllGallery': '重定向所有畫廊至表站',
       'imDonorHint': '如果你是捐赠者，你可以打開此項來更容易地訪問裏站中的畫廊',
       'profileSetting': 'Profile設定',

lib/src/pages/details/details_page_logic.dart

@@ -49,6 +49,7 @@ import '../../model/tag_set.dart';
 import '../../service/history_service.dart';
 import '../../service/gallery_download_service.dart';
 import '../../service/storage_service.dart';
+import '../../setting/eh_setting.dart';
 import '../../setting/read_setting.dart';
 import '../../utils/process_util.dart';
 import '../../utils/route_util.dart';
@@ -720,24 +721,35 @@ class DetailsPageLogic extends GetxController with LoginRequiredMixin, Scroll2To
   }
 
   Future<Map<String, dynamic>> _getDetailsWithRedirectAndFallback({bool useCache = true}) async {
-    final String firstLink;
+    final String? firstLink;
     final String secondLink;
 
-    /// 1. Try EH site first for EX link
+    /// 1. if redirect is enabled, try EH site first for EX link
     /// 2. if a gallery can't be found in EH site, it may be moved into EX site
-    if (state.galleryUrl.contains(EHConsts.EXIndex) && !_galleryOnlyInExSite()) {
-      firstLink = state.galleryUrl.replaceFirst(EHConsts.EXIndex, EHConsts.EHIndex);
-      secondLink = state.galleryUrl;
+    if (state.galleryUrl.contains(EHConsts.EXIndex)) {
+      if (EHSetting.redirect2Eh.isTrue) {
+        firstLink = state.galleryUrl.replaceFirst(EHConsts.EXIndex, EHConsts.EHIndex);
+        secondLink = state.galleryUrl;
+      } else {
+        firstLink = null;
+        secondLink = state.galleryUrl;
+      }
     } else {
-      firstLink = state.galleryUrl;
-      secondLink = state.galleryUrl.replaceFirst(EHConsts.EHIndex, EHConsts.EXIndex);
+      if (_galleryOnlyInExSite()) {
+        firstLink = null;
+        secondLink = state.galleryUrl.replaceFirst(EHConsts.EHIndex, EHConsts.EXIndex);
+      } else {
+        firstLink = state.galleryUrl;
+        secondLink = state.galleryUrl.replaceFirst(EHConsts.EHIndex, EHConsts.EXIndex);
+      }
     }
 
     /// if we can't find gallery via firstLink, try second link
     if (!isEmptyOrNull(firstLink)) {
+      Log.verbose('Try to find gallery via firstLink: $firstLink');
       try {
         Map<String, dynamic> galleryAndDetailAndApikey = await EHRequest.requestDetailPage<Map<String, dynamic>>(
-          galleryUrl: firstLink,
+          galleryUrl: firstLink!,
           parser: EHSpiderParser.detailPage2GalleryAndDetailAndApikey,
           useCacheIfAvailable: useCache,
         );
@@ -749,6 +761,7 @@ class DetailsPageLogic extends GetxController with LoginRequiredMixin, Scroll2To
     }
 
     try {
+      Log.verbose('Try to find gallery via secondLink: $secondLink');
       Map<String, dynamic> galleryAndDetailAndApikey = await EHRequest.requestDetailPage<Map<String, dynamic>>(
         galleryUrl: secondLink,
         parser: EHSpiderParser.detailPage2GalleryAndDetailAndApikey,

lib/src/pages/setting/eh/setting_eh_page.dart

@@ -53,6 +53,7 @@ class _SettingEHPageState extends State<SettingEHPage> {
           padding: const EdgeInsets.only(top: 16),
           children: [
             _buildSiteSegmentControl(),
+            _buildRedirect2EH(),
             _buildProfile(),
             _buildSiteSetting(),
             _buildImageLimit(),
@@ -78,6 +79,18 @@ class _SettingEHPageState extends State<SettingEHPage> {
     );
   }
 
+  Widget _buildRedirect2EH() {
+    if (EHSetting.site.value == 'EH') {
+      return const SizedBox();
+    }
+
+    return ListTile(
+      title: Text('redirect2Eh'.tr),
+      subtitle: Text('redirect2EhHint'.tr),
+      trailing: Switch(value: EHSetting.redirect2Eh.value, onChanged: EHSetting.saveRedirect2Eh).fadeIn(),
+    );
+  }
+
   Widget _buildProfile() {
     return ListTile(
       title: Text('profileSetting'.tr),

lib/src/setting/eh_setting.dart

@@ -15,7 +15,7 @@ import '../utils/eh_spider_parser.dart';
 
 class EHSetting {
   static RxString site = 'EH'.obs;
-
+  static RxBool redirect2Eh = true.obs;
   static Rx<LoadingState> refreshState = LoadingState.idle.obs;
   static RxInt currentConsumption = (-1).obs;
   static RxInt totalLimit = 5000.obs;
@@ -75,6 +75,12 @@ class EHSetting {
     Log.info('refresh EHSetting success');
   }
 
+  static saveRedirect2Eh(bool redirect2Eh) {
+    Log.debug('saveRedirect2Eh:$redirect2Eh');
+    EHSetting.redirect2Eh.value = redirect2Eh;
+    _save();
+  }
+
   static saveSite(String site) {
     Log.debug('saveSite:$site');
     EHSetting.site.value = site;
@@ -99,12 +105,14 @@ class EHSetting {
   static Map<String, dynamic> _toMap() {
     return {
       'site': site.value,
+      'redirect2Eh': redirect2Eh.value,
       'totalLimit': totalLimit.value,
     };
   }
 
   static _initFromMap(Map<String, dynamic> map) {
     site.value = map['site'];
+    redirect2Eh.value = map['redirect2Eh'] ?? redirect2Eh.value;
     totalLimit.value = map['totalLimit'];
   }
 }