mod

app.py

@@ -13,75 +13,79 @@ db = TinyDB('data.json')
 
 
 def get_key(url: str) -> str:
-    return f"v1:{url}"
+    return f"v2:{url}"
+
+
+def convert_dto(info):
+    thumbnails = []
+    for item in info.get("thumbnails", []):
+        if item.get("width"):
+            thumbnails.append({
+                "url": item.get("url", ""),
+                "width": item.get("width", 0),
+                "height": item.get("height", 0),
+            })
+    formats = []
+    for item in info.get("formats", []):
+        if item.get("resolution") != "audio only" and item.get("url") and item.get("acodec") and item.get(
+                "acodec") != "none" and item.get("vcodec"):
+            formats.append({
+                "width": f"{item.get('width', 0)}",
+                "height": f"{item.get('height', 0)}",
+                "type": item.get("format", ""),
+                "quality": f'{item.get("format_note", "")}',
+                "itag": 0,
+                "fps": "0",
+                "bitrate": "0",
+                "url": item.get("url", ""),
+                "ext": item.get("ext"),
+                "vcodec": item.get("vcodec", ""),
+                "acodec": item.get("acodec", ""),
+                "vbr": "0",
+                "abr": "0",
+                "container": item.get("container")
+            })
+    result = {
+        "code": 200,
+        "msg": "",
+        "data": {
+            "videoDetails": {
+                "isLiveContent": info.get("is_live", False),
+                "title": info.get("title", ""),
+                "thumbnails": thumbnails,
+                "description": info.get("description", ""),
+                "lengthSeconds": f"{int(info.get('duration', 0) / 100)}",
+                "viewCount": f"{info.get('view_count', 0)}",
+                "keywords": [],
+                "author": info.get("uploader", info.get("channel", "")),
+                "channelID": info.get("channel_id", ""),
+                "recommendInfo": [],
+                "channelURL": info.get("channel_url", ""),
+                "videoId": info.get("display_id", "")
+            },
+            "streamingData": {
+                "formats": formats
+            }
+        },
+        "id": "MusicDetailViewModel_detail_url"
+    }
+    return result
 
 
 @app.route("/extract", methods=["GET", "POST"])
 def extract():
     url = request.json.get("url")
-    logging.info(f"url: ${url}")
+    logging.info(f"url: {url}")
     key = get_key(url=url)
     result = db.search(lambda x: x.get("key") == key)
     if result:
         logging.info("find from data.json, so return")
         if result[0].get("result"):
-            return result[0].get("result")
+            return convert_dto(info=result[0].get("info"))
     with yt_dlp.YoutubeDL({"flat-playlist": True, "extract_flat": "flat-playlist"}) as ydl:
         info = ydl.extract_info(url, download=False)
-        thumbnails = []
-        for item in info.get("thumbnails", []):
-            if item.get("width"):
-                thumbnails.append({
-                    "url": item.get("url", ""),
-                    "width": item.get("width", 0),
-                    "height": item.get("height", 0),
-                })
-        formats = []
-        for item in info.get("formats", []):
-            if item.get("resolution") != "audio only" and item.get("url") and item.get("acodec") and item.get(
-                    "acodec") != "none" and item.get("vcodec"):
-                formats.append({
-                    "width": item.get("width", 0),
-                    "height": item.get("height", 0),
-                    "type": item.get("format", ""),
-                    "quality": f'{item.get("format_note", "")}',
-                    "itag": 0,
-                    "fps": 0,
-                    "bitrate": 0,
-                    "url": item.get("url", ""),
-                    "ext": item.get("ext"),
-                    "vcodec": item.get("vcodec", ""),
-                    "acodec": item.get("acodec", ""),
-                    "vbr": 0,
-                    "abr": 0,
-                    "container": item.get("container")
-                })
-        result = {
-            "code": 200,
-            "msg": "",
-            "data": {
-                "videoDetails": {
-                    "isLiveContent": info.get("is_live", False),
-                    "title": info.get("title", ""),
-                    "thumbnails": thumbnails,
-                    "description": info.get("description", ""),
-                    "lengthSeconds": int(info.get("duration", 0) / 100),
-                    "viewCount": f"{info.get('view_count', 0)}",
-                    "keywords": [],
-                    "author": info.get("uploader", info.get("channel", "")),
-                    "channelID": info.get("channel_id", ""),
-                    "recommendInfo": [],
-                    "channelURL": info.get("channel_url", ""),
-                    "videoId": info.get("display_id", "")
-                },
-                "streamingData": {
-                    "formats": formats
-                }
-            },
-            "id": "MusicDetailViewModel_detail_url"
-        }
-        db.insert({"result": result, "key": key})
-        return result
+        db.insert({"info": info, "key": key})
+        return convert_dto(info=info)
 
 
 if __name__ == '__main__':