move get_channel_overwrites to helper

tubearchivist/home/src/download/queue.py

@@ -7,10 +7,7 @@ Functionality:
 import json
 from datetime import datetime
 
-from home.src.download.subscriptions import (
-    ChannelSubscription,
-    PlaylistSubscription,
-)
+from home.src.download.subscriptions import ChannelSubscription
 from home.src.download.thumbnails import ThumbManager
 from home.src.download.yt_dlp_base import YtWrap
 from home.src.es.connect import ElasticWrap, IndexPaginate
@@ -196,7 +193,6 @@ class PendingList(PendingIndex):
             self._parse_channel(entry["url"], vid_type)
         elif entry["type"] == "playlist":
             self._parse_playlist(entry["url"])
-            PlaylistSubscription().process_url_str([entry], subscribed=False)
         else:
             raise ValueError(f"invalid url_type: {entry}")
 

tubearchivist/home/src/download/subscriptions.py

@@ -4,12 +4,12 @@ Functionality:
 - handle playlist subscriptions
 """
 
-from home.src.download import queue  # partial import
 from home.src.download.thumbnails import ThumbManager
 from home.src.download.yt_dlp_base import YtWrap
 from home.src.es.connect import IndexPaginate
 from home.src.index.channel import YoutubeChannel
 from home.src.index.playlist import YoutubePlaylist
+from home.src.index.video import YoutubeVideo
 from home.src.index.video_constants import VideoTypeEnum
 from home.src.ta.config import AppConfig
 from home.src.ta.helper import is_missing
@@ -341,8 +341,10 @@ class SubscriptionHandler:
 
         if item["type"] == "video":
             # extract channel id from video
-            vid = queue.PendingList().get_youtube_details(item["url"])
-            channel_id = vid["channel_id"]
+            video = YoutubeVideo(item["url"])
+            video.get_from_youtube()
+            video.process_youtube_meta()
+            channel_id = video.channel_id
         elif item["type"] == "channel":
             channel_id = item["url"]
         else:

tubearchivist/home/src/download/yt_dlp_handler.py

@@ -20,7 +20,7 @@ from home.src.index.playlist import YoutubePlaylist
 from home.src.index.video import YoutubeVideo, index_new_video
 from home.src.index.video_constants import VideoTypeEnum
 from home.src.ta.config import AppConfig
-from home.src.ta.helper import ignore_filelist
+from home.src.ta.helper import get_channel_overwrites, ignore_filelist
 from home.src.ta.settings import EnvironmentSettings
 
 
@@ -317,26 +317,13 @@ class DownloadPostProcess:
 
     def run(self):
         """run all functions"""
-        self.channel_overwrites = self.get_channel_overwrites()
+        self.channel_overwrites = get_channel_overwrites()
         self.auto_delete_all()
         self.auto_delete_overwrites()
         to_refresh = self.refresh_playlist()
         self.match_videos(to_refresh)
         self.get_comments()
 
-    def get_channel_overwrites(self):
-        """get overwrites"""
-        data = {
-            "query": {
-                "bool": {"must": [{"exists": {"field": "channel_overwrites"}}]}
-            },
-            "_source": ["channel_id", "channel_overwrites"],
-        }
-        result = IndexPaginate("ta_channel", data).get_results()
-        overwrites = {i["channel_id"]: i["channel_overwrites"] for i in result}
-
-        return overwrites
-
     def auto_delete_all(self):
         """handle auto delete"""
         autodelete_days = self.download.config["downloads"]["autodelete_days"]

tubearchivist/home/src/index/video.py

@@ -147,7 +147,7 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle):
             self.youtube_meta = youtube_meta_overwrite
             self.offline_import = True
 
-        self._process_youtube_meta()
+        self.process_youtube_meta()
         self._add_channel()
         self._add_stats()
         self.add_file_path()
@@ -175,7 +175,7 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle):
 
         return integrate
 
-    def _process_youtube_meta(self):
+    def process_youtube_meta(self):
         """extract relevant fields from youtube"""
         self._validate_id()
         # extract

tubearchivist/home/src/ta/helper.py

@@ -9,6 +9,7 @@ import random
 import string
 import subprocess
 from datetime import datetime
+from typing import Any
 from urllib.parse import urlparse
 
 import requests
@@ -241,3 +242,17 @@ def is_missing(
     dl = [i for i in to_check if i not in existing_ids]
 
     return dl
+
+
+def get_channel_overwrites() -> dict[str, dict[str, Any]]:
+    """get overwrites indexed my channel_id"""
+    data = {
+        "query": {
+            "bool": {"must": [{"exists": {"field": "channel_overwrites"}}]}
+        },
+        "_source": ["channel_id", "channel_overwrites"],
+    }
+    result = IndexPaginate("ta_channel", data).get_results()
+    overwrites = {i["channel_id"]: i["channel_overwrites"] for i in result}
+
+    return overwrites