Fix continue watching progress matching, #build

tubearchivist/config/management/commands/ta_startup.py

@@ -241,56 +241,56 @@ class Command(BaseCommand):
 
                 colors_key = f"{user}:colors"
                 colors = redis.get_message(colors_key).get("status")
-                if colors is not None:
+                if colors:
                     new_conf.set_value("colors", colors)
                     redis.del_message(colors_key)
 
                 sort_by_key = f"{user}:sort_by"
                 sort_by = redis.get_message(sort_by_key).get("status")
-                if sort_by is not None:
+                if sort_by:
                     new_conf.set_value("sort_by", sort_by)
                     redis.del_message(sort_by_key)
 
                 page_size_key = f"{user}:page_size"
                 page_size = redis.get_message(page_size_key).get("status")
-                if page_size is not None:
+                if page_size:
                     new_conf.set_value("page_size", page_size)
                     redis.del_message(page_size_key)
 
                 sort_order_key = f"{user}:sort_order"
                 sort_order = redis.get_message(sort_order_key).get("status")
-                if sort_order is not None:
+                if sort_order:
                     new_conf.set_value("sort_order", sort_order)
                     redis.del_message(sort_order_key)
 
                 grid_items_key = f"{user}:grid_items"
                 grid_items = redis.get_message(grid_items_key).get("status")
-                if grid_items is not None:
+                if grid_items:
                     new_conf.set_value("grid_items", grid_items)
                     redis.del_message(grid_items_key)
 
                 hide_watch_key = f"{user}:hide_watched"
                 hide_watch = redis.get_message(hide_watch_key).get("status")
-                if hide_watch is not None:
+                if hide_watch:
                     new_conf.set_value("hide_watched", hide_watch)
                     redis.del_message(hide_watch_key)
 
                 ignore_only_key = f"{user}:show_ignored_only"
                 ignore_only = redis.get_message(ignore_only_key).get("status")
-                if ignore_only is not None:
+                if ignore_only:
                     new_conf.set_value("show_ignored_only", ignore_only)
                     redis.del_message(ignore_only_key)
 
                 subed_only_key = f"{user}:show_subed_only"
                 subed_only = redis.get_message(subed_only_key).get("status")
-                if subed_only is not None:
+                if subed_only:
                     new_conf.set_value("show_subed_only", subed_only)
                     redis.del_message(subed_only_key)
 
                 for view in ["channel", "playlist", "home", "downloads"]:
                     view_key = f"{user}:view:{view}"
                     view_style = redis.get_message(view_key).get("status")
-                    if view_style is not None:
+                    if view_style:
                         new_conf.set_value(f"view_style_{view}", view_style)
                         redis.del_message(view_key)
 

tubearchivist/home/src/es/index_setup.py

@@ -152,6 +152,7 @@ class ElasitIndexWrap:
             index_name, expected_map, expected_set = self._config_split(index)
             handler = ElasticIndex(index_name, expected_map, expected_set)
             if not handler.exists:
+                self._check_backup()
                 handler.create_blank()
                 continue
 

tubearchivist/home/views.py

@@ -144,8 +144,7 @@ class ArchivistResultsView(ArchivistViewConfig):
         self.context["continue_vids"] = self.get_in_progress(results)
 
         in_progress = {i["youtube_id"]: i["position"] for i in results}
-        for hit in self.context["results"]:
+        for video in self.context["results"]:
-            video = hit["source"]
             if video["youtube_id"] in in_progress:
                 played_sec = in_progress.get(video["youtube_id"])
                 total = video["player"]["duration"]