🔀 Added true_random sort that don't keep server-side cache

Lugrim · Nov 6, 2023 · 794ee6a · 794ee6a
1 parent 91a695f
commit 794ee6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/server/szurubooru/search/configs/post_search_config.py b/server/szurubooru/search/configs/post_search_config.py
@@ -412,7 +412,7 @@ def sort_columns(self) -> Dict[str, Tuple[SaColumn, str]]:
         return util.unalias_dict(
             [
                 (
-                    ["random"],
+                    ["random", "true_random"],
                     (sa.sql.expression.func.random(), self.SORT_NONE),
                 ),
                 (["id"], (model.Post.post_id, self.SORT_DESC)),

diff --git a/server/szurubooru/search/executor.py b/server/szurubooru/search/executor.py
@@ -89,12 +89,15 @@ def execute(
             offset = 0
 
         disable_eager_loads = False
+        disable_cache = False
         for token in search_query.sort_tokens:
-            if token.name == "random":
+            if "random" in token.name:
                 disable_eager_loads = True
+                if token.name == "true_random":
+                    disable_cache = True
 
         key = (id(self.config), hash(search_query), offset, limit)
-        if cache.has(key):
+        if not disable_cache and cache.has(key):
             return cache.get(key)
 
         filter_query = self.config.create_filter_query(disable_eager_loads)