From e41175f0fa1ef2f2d70d402bb2dfebc4da531ddd Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Fri, 8 Oct 2021 14:34:09 +0200
Subject: [PATCH] Extracted extractors.all.ytdl module

---
 .../extractors/all/ytdl.py                    | 44 +++++++++++++++++++
 .../extractors/media/ytdl.py                  | 42 +-----------------
 2 files changed, 46 insertions(+), 40 deletions(-)
 create mode 100644 server/entertainment_decider/extractors/all/ytdl.py

diff --git a/server/entertainment_decider/extractors/all/ytdl.py b/server/entertainment_decider/extractors/all/ytdl.py
new file mode 100644
index 0000000..75d307c
--- /dev/null
+++ b/server/entertainment_decider/extractors/all/ytdl.py
@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+import json
+import subprocess
+from typing import List
+
+from jsoncache import ApplicationCache
+
+from ...common import call
+
+
+cache = ApplicationCache(app_name="entertainment-decider-ytdl", create_cache_dir=True, default_max_age=7*86400)
+cache.clean_cache()
+
+YTDL_CALL = [
+    "yt-dlp",
+]
+
+
+class YtdlErrorException(subprocess.CalledProcessError):
+    pass
+
+def ytdl_call(args: List[str]) -> dict:
+    proc = call(YTDL_CALL + args, check=False)
+    if proc.returncode != 0:
+        raise YtdlErrorException(
+            returncode=proc.returncode,
+            cmd=args,
+            output=proc.stdout,
+            stderr=proc.stderr,
+        )
+    return json.loads(proc.stdout.strip())
+
+@cache.cache_json()
+def get_video_info(uri: str) -> dict:
+    return ytdl_call([
+        "--no-playlist",
+        "--dump-json",
+        uri,
+    ])
+
+@cache.cache_json()
+def get_playlist_info(uri: str) -> dict:
+    return ytdl_call(uri)
diff --git a/server/entertainment_decider/extractors/media/ytdl.py b/server/entertainment_decider/extractors/media/ytdl.py
index 11be766..9b851ab 100644
--- a/server/entertainment_decider/extractors/media/ytdl.py
+++ b/server/entertainment_decider/extractors/media/ytdl.py
@@ -1,54 +1,16 @@
 from __future__ import annotations
 
-import json
 from datetime import datetime
 import logging
-import subprocess
-from typing import Dict, List, Optional
+from typing import Dict, Optional
 
-from jsoncache import ApplicationCache
 
-from ...common import call
 from ...models import MediaElement
+from ..all.ytdl import get_video_info, YtdlErrorException
 from ..generic import AuthorExtractedData, ExtractedData, ExtractionError, SuitableLevel
 from .base import  MediaExtractor
 
 
-cache = ApplicationCache(app_name="entertainment-decider-ytdl", create_cache_dir=True, default_max_age=7*86400)
-cache.clean_cache()
-
-YTDL_CALL = [
-    "yt-dlp",
-]
-
-
-class YtdlErrorException(subprocess.CalledProcessError):
-    pass
-
-def ytdl_call(args: List[str]) -> dict:
-    proc = call(YTDL_CALL + args, check=False)
-    if proc.returncode != 0:
-        raise YtdlErrorException(
-            returncode=proc.returncode,
-            cmd=args,
-            output=proc.stdout,
-            stderr=proc.stderr,
-        )
-    return json.loads(proc.stdout.strip())
-
-@cache.cache_json()
-def get_video_info(uri: str) -> dict:
-    return ytdl_call([
-        "--no-playlist",
-        "--dump-json",
-        uri,
-    ])
-
-@cache.cache_json()
-def get_playlist_info(uri: str) -> dict:
-    return ytdl_call(uri)
-
-
 class YtdlMediaExtractor(MediaExtractor[Dict]):
 
     def __init__(self):