From f24a3dd1f5725168187db48ef8c4fc2bbdb38777 Mon Sep 17 00:00:00 2001
From: simon <simobilleter@gmail.com>
Date: Fri, 29 Oct 2021 14:42:12 +0700
Subject: [PATCH] userspace sort_order and sort_by

---
 tubearchivist/home/config.json |  3 ++-
 tubearchivist/home/views.py    | 39 ++++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/tubearchivist/home/config.json b/tubearchivist/home/config.json
index 50e69d9..e5ecc38 100644
--- a/tubearchivist/home/config.json
+++ b/tubearchivist/home/config.json
@@ -1,6 +1,7 @@
 {
     "archive": {
-        "sort": "published",
+        "sort_by": "published",
+        "sort_order": "desc",
         "page_size": 12
     },
     "default_view": {
diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py
index c82ddb2..119803c 100644
--- a/tubearchivist/home/views.py
+++ b/tubearchivist/home/views.py
@@ -128,12 +128,14 @@ class HomeView(View):
         if not view_style:
             view_style = config_handler["default_view"]["home"]
 
-        sort_by = RedisArchivist().get_message("sort_by")
-        if sort_by == {"status": False}:
-            sort_by = "published"
-        sort_order = RedisArchivist().get_message("sort_order")
-        if sort_order == {"status": False}:
-            sort_order = "desc"
+        sort_by = RedisArchivist().get_message(f"{user_id}:sort_by")["status"]
+        if not sort_by:
+            sort_by = config_handler["archive"]["sort_by"]
+
+        sort_order_key = f"{user_id}:sort_order"
+        sort_order = RedisArchivist().get_message(sort_order_key)["status"]
+        if not sort_order:
+            sort_order = config_handler["archive"]["sort_order"]
 
         hide_watched_key = f"{user_id}:hide_watched"
         hide_watched = RedisArchivist().get_message(hide_watched_key)["status"]
@@ -342,12 +344,15 @@ class ChannelIdView(View):
         """read config file"""
         config = AppConfig().config
 
-        sort_by = RedisArchivist().get_message("sort_by")
-        if sort_by == {"status": False}:
-            sort_by = "published"
-        sort_order = RedisArchivist().get_message("sort_order")
-        if sort_order == {"status": False}:
-            sort_order = "desc"
+        sort_by = RedisArchivist().get_message(f"{user_id}:sort_by")["status"]
+        if not sort_by:
+            sort_by = config["archive"]["sort_by"]
+
+        sort_order_key = f"{user_id}:sort_order"
+        sort_order = RedisArchivist().get_message(sort_order_key)["status"]
+        if not sort_order:
+            sort_order = config["archive"]["sort_order"]
+
         hide_watched_key = f"{user_id}:hide_watched"
         hide_watched = RedisArchivist().get_message(hide_watched_key)["status"]
 
@@ -761,13 +766,15 @@ class PostData:
 
     def sort_order(self):
         """change the sort between published to downloaded"""
-        sort_order = self.exec_val
-        if sort_order in ["asc", "desc"]:
+        sort_order = {"status": self.exec_val}
+        if self.exec_val in ["asc", "desc"]:
             RedisArchivist().set_message(
-                "sort_order", sort_order, expire=False
+                f"{self.current_user}:sort_order", sort_order, expire=False
             )
         else:
-            RedisArchivist().set_message("sort_by", sort_order, expire=False)
+            RedisArchivist().set_message(
+                f"{self.current_user}:sort_by", sort_order, expire=False
+            )
         return {"success": True}
 
     def hide_watched(self):