fix: fetching other pages when first page is cached (merge pull request

#105 from davidovski/fix_pages_caching) Fix fetching other pages when first page is cached
Ahwxorg · Jan 3, 2024 · c77e0c1 · c77e0c1
2 parents 4aa25f7 + 70fd43f
commit c77e0c1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/config.php.example b/config.php.example
@@ -11,8 +11,8 @@
         // You can use any Invidious instance here
         "invidious_instance_for_video_results" => "https://invidious.snopyta.org",
 
-        "disable_bittorent_search" => false,
-        "bittorent_trackers" => "&tr=http://nyaa.tracker.wf:7777/announce&tr=udp://open.stealth.si:80/announce&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://exodus.desync.com:6969/announce&tr=udp://tracker.torrent.eu.org:451/announce",
+        "disable_bittorrent_search" => false,
+        "bittorrent_trackers" => "&tr=http://nyaa.tracker.wf:7777/announce&tr=udp://open.stealth.si:80/announce&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://exodus.desync.com:6969/announce&tr=udp://tracker.torrent.eu.org:451/announce",
 
         "disable_hidden_service_search" => false,
 

diff --git a/docker/config.php b/docker/config.php
@@ -5,8 +5,8 @@
         "language" => "${CONFIG_LANGUAGE}",
         "number_of_results" => ${CONFIG_NUMBER_OF_RESULTS},
         "invidious_instance_for_video_results" => "${CONFIG_INVIDIOUS_INSTANCE}",
-        "disable_bittorent_search" => ${CONFIG_DISABLE_BITTORRENT_SEARCH},
-        "bittorent_trackers" => "${CONFIG_BITTORRENT_TRACKERS}",
+        "disable_bittorrent_search" => ${CONFIG_DISABLE_BITTORRENT_SEARCH},
+        "bittorrent_trackers" => "${CONFIG_BITTORRENT_TRACKERS}",
         "disable_hidden_service_search" => ${CONFIG_HIDDEN_SERVICE_SEARCH},
         "instance_fallback" => ${CONFIG_INSTANCE_FALLBACK},
         "request_cooldown" => ${CONFIG_RATE_LIMIT_COOLDOWN},

diff --git a/engines/bittorrent/thepiratebay.php b/engines/bittorrent/thepiratebay.php
@@ -26,7 +26,7 @@ public function parse_results($response) {
                 if ($name == "No results returned")
                     break;
 
-                array_push($results, 
+                array_push($results,
                     array (
                         "size" => htmlspecialchars($size),
                         "name" => htmlspecialchars($name),
@@ -39,7 +39,7 @@ public function parse_results($response) {
             }
 
             return $results;
-           
+
         }
     }
 ?>
diff --git a/engines/qwant/image.php b/engines/qwant/image.php
@@ -1,7 +1,7 @@
 <?php
     class QwantImageSearch extends EngineRequest {
         public function get_request_url() {
-            $offset = $page * 5; // load 50 images per page
+            $offset = $this->page * 5; // load 50 images per page
             $query = urlencode($this->query);
             return "https://api.qwant.com/v3/search/images?q=$query&t=images&count=50&locale=en_us&offset=$offset&device=desktop&tgp=3&safesearch=1";
         }

diff --git a/engines/text/text.php b/engines/text/text.php
@@ -10,7 +10,7 @@ public function __construct($opts, $mh) {
             shuffle($this->engines);
 
             $this->query = $opts->query;
-            $this->cache_key = "text:" . $this->query;
+            $this->cache_key = "text:" . $this->query . "p" . $opts->page . "l" . $opts->language;
 
             $this->page = $opts->page;
             $this->opts = $opts;

diff --git a/misc/search_engine.php b/misc/search_engine.php
@@ -62,6 +62,13 @@ public static function print_results($results, $opts) {}
     function load_opts() {
         $opts = require "config.php";
 
+        # account for the old, misspelled options
+        if (isset($opts->disable_bittorent_search))
+            $opts->disable_bittorrent_search = $opts->disable_bittorent_search;
+
+        if (isset($opts->bittorent_trackers))
+            $opts->bittorrent_trackers = $opts->bittorent_trackers;
+
         $opts->request_cooldown ??= 25;
         $opts->cache_time ??= 25;
 
@@ -124,7 +131,7 @@ function init_search($opts, $mh) {
                 return new VideoSearch($opts, $mh);
 
             case 3:
-                if ($opts->disable_bittorent_search) {
+                if ($opts->disable_bittorrent_search) {
                     echo "<p class=\"text-result-container\">" . TEXTS["feature_disabled"] . "</p>";
                     break;
                 }