Merge pull request #309 from TaYaKi71751/dev-add-ignore-timeout

Add `ignoreTimeout` for slow environment

assets/locale/en.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/eo.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/it.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/ja.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/ko.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "실시간 유저 레코드",
   "manualupdate": "수동 업데이트",
   "cannotuseios": "iOS에선 사용할 수 없어요 :(",
-  "exitTheApp": "앱 종료하기"
+  "exitTheApp": "앱 종료하기",
+  "ignoretimeout": "타임아웃 끄기"
 }

assets/locale/pt.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/zh.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/zh_Hans.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

assets/locale/zh_Hant.json

@@ -306,5 +306,6 @@
   "realtimeuserrecord": "Real Time User Record",
   "manualupdate": "Manual Update",
   "cannotuseios": "You cannot use update on iOS :(",
-  "exitTheApp": "Exit the app"
+  "exitTheApp": "Exit the app",
+  "ignoretimeout": "Ignore Timeout"
 }

lib/network/wrapper.dart

@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
 import 'package:violet/log/log.dart';
+import 'package:violet/settings/settings.dart';
 import 'package:violet/thread/semaphore.dart';
 
 class HttpWrapper {
@@ -95,13 +96,17 @@ Future<http.Response> _ehentaiGet(String url,
     StreamedResponse response;
 
     try {
-      response = await client.send(request).timeout(
-        const Duration(seconds: 3),
-        onTimeout: () {
-          timeout = true;
-          throw TimeoutException('Timeout error');
-        },
-      );
+      final sent = client.send(request);
+      if (!Settings.ignoreTimeout) {
+        sent.timeout(
+          const Duration(seconds: 3),
+          onTimeout: () {
+            timeout = true;
+            throw TimeoutException('Timeout error');
+          },
+        );
+      }
+      response = await sent;
     } catch (e, st) {
       Logger.error('[Http Request] GET: $url\n'
           'E:$e\n'
@@ -155,14 +160,18 @@ Future<http.Response> _scriptGet(String url,
     var retry = 0;
     do {
       isTimeout = false;
-      res = await http.get(Uri.parse(url), headers: headers).timeout(
-        timeout,
-        onTimeout: () {
-          isTimeout = true;
-          retry++;
-          return http.Response('', 200);
-        },
-      );
+      final sent = http.get(Uri.parse(url), headers: headers);
+      if (!Settings.ignoreTimeout) {
+        sent.timeout(
+          timeout,
+          onTimeout: () {
+            isTimeout = true;
+            retry++;
+            return http.Response('', 200);
+          },
+        );
+      }
+      res = await sent;
     } while (isTimeout && retry < 10);
   }
 

lib/pages/search/search_page.dart

@@ -82,8 +82,11 @@ class _SearchPageState extends ThemeSwitchableState<SearchPage>
 
   doInitialSearch() async {
     try {
-      final result = await HentaiManager.search(widget.searchKeyWord ?? '')
-          .timeout(const Duration(seconds: 5));
+      final search = HentaiManager.search(widget.searchKeyWord ?? '');
+      if (!Settings.ignoreTimeout) {
+        search.timeout(const Duration(seconds: 5));
+      }
+      final result = await search;
 
       c.latestQuery = Tuple2(result, widget.searchKeyWord ?? '');
       c.queryResult = c.latestQuery!.item1!.results;

lib/pages/search/search_page_controller.dart

@@ -163,28 +163,35 @@ class SearchPageController extends GetxController {
   }
 
   loadNextQuery() async {
-    await _querySem.acquire().timeout(
-      const Duration(seconds: 5),
-      onTimeout: () {
-        showErrorToast('Semaphore acquisition failed');
-
-        throw TimeoutException('Failed to acquire the query semaphore');
-      },
-    );
+    final aquire = _querySem.acquire();
+    if (!Settings.ignoreTimeout) {
+      aquire.timeout(
+        const Duration(seconds: 5),
+        onTimeout: () {
+          showErrorToast('Semaphore acquisition failed');
+
+          throw TimeoutException('Failed to acquire the query semaphore');
+        },
+      );
+    }
+    await aquire;
 
     try {
       if (_queryEnd ||
           (latestQuery!.item1 != null && latestQuery!.item1!.offset == -1)) {
         return;
       }
 
-      var next = await HentaiManager.search(latestQuery!.item2,
-              latestQuery!.item1 == null ? 0 : latestQuery!.item1!.offset)
-          .timeout(const Duration(seconds: 10), onTimeout: () {
-        Logger.error('[Search_loadNextQuery] Search Timeout');
+      final search = HentaiManager.search(latestQuery!.item2,
+          latestQuery!.item1 == null ? 0 : latestQuery!.item1!.offset);
+      if (!Settings.ignoreTimeout) {
+        search.timeout(const Duration(seconds: 10), onTimeout: () {
+          Logger.error('[Search_loadNextQuery] Search Timeout');
 
-        throw TimeoutException('Failed to search the query');
-      });
+          throw TimeoutException('Failed to search the query');
+        });
+      }
+      var next = await search;
 
       latestQuery = Tuple2(next, latestQuery!.item2);
 

lib/pages/settings/settings_page.dart

@@ -1441,6 +1441,38 @@ class _SettingsPageState extends State<SettingsPage>
               });
             },
           ),
+          _buildDivider(),
+          InkWell(
+            customBorder: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.only(
+                    bottomLeft: Radius.circular(8.0),
+                    bottomRight: Radius.circular(8.0))),
+            child: ListTile(
+              leading: Image.asset(
+                'assets/images/logo.png',
+                width: 25,
+                height: 25,
+              ),
+              title: Text(Translations.of(context).trans('ignoretimeout')),
+              trailing: Switch(
+                value: Settings.ignoreTimeout,
+                onChanged: (newValue) async {
+                  await Settings.setIgnoreTimeout(newValue);
+                  setState(() {
+                    _shouldReload = true;
+                  });
+                },
+                activeTrackColor: Settings.majorColor,
+                activeColor: Settings.majorAccentColor,
+              ),
+            ),
+            onTap: () async {
+              await Settings.setIgnoreTimeout(!Settings.ignoreTimeout);
+              setState(() {
+                _shouldReload = true;
+              });
+            },
+          ),
         ],
       ),
     ];

lib/settings/settings.dart

@@ -20,6 +20,9 @@ import 'package:violet/settings/device_type.dart';
 class Settings {
   static late final SharedPreferences prefs;
 
+  // Timeout Settings
+  static late bool ignoreTimeout; // default false
+
   // Color Settings
   static late Color themeColor; // default light
   static late bool themeWhat; // default false == light
@@ -300,6 +303,7 @@ class Settings {
     searchMessageAPI = await _getString(
         'searchmessageapi', 'https://koromo.xyz/api/search/msg');
 
+    ignoreTimeout = await _getBool('ignoretimeout');
     useVioletServer = await _getBool('usevioletserver');
     useDrawer = await _getBool('usedrawer');
     showArticleProgress = await _getBool('showarticleprogress');
@@ -623,6 +627,12 @@ class Settings {
     await prefs.setBool('searchPure', nn);
   }
 
+  static Future<void> setIgnoreTimeout(bool nn) async {
+    ignoreTimeout = nn;
+
+    await prefs.setBool('ignoretimeout', nn);
+  }
+
   static Future<void> setUseVioletServer(bool nn) async {
     useVioletServer = nn;