podflow 20250803__tar.gz → 20250821__tar.gz

{podflow-20250803 → podflow-20250821}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250803
+Version: 20250821
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz

{podflow-20250803 → podflow-20250821}/podflow/download/dl_aideo_video.py

@@ -61,6 +61,7 @@ def download_video(
                 "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
                 "Referer": "https://www.youtube.com/",
             }
+            ydl_opts["extractor_args"] = {"youtube": {"player-client": "web_embedded,web,tv"}}
         ydl_opts["cookiefile"] = cookies  # cookies 是你的 cookies 文件名
     if playlist_num:  # 播放列表的第n个视频
         ydl_opts["playliststart"] = playlist_num

{podflow-20250803 → podflow-20250821}/podflow/httpfs/app_bottle.py

@@ -49,6 +49,7 @@ class bottle_app:
             self.app_bottle.route("/upload", method="POST", callback=self.upload)
             self.app_bottle.route("/flush", method="POST", callback=self.clear_cache)
             self.app_bottle.route("/remove", method="POST", callback=self.remove)
+            self.app_bottle.route("/download", callback=self.download)
         else:
             self.app_bottle.route("/index", callback=self.index)
             self.app_bottle.route("/getid", method="POST", callback=self.getid)
@@ -713,6 +714,51 @@ class bottle_app:
                     "message": "Folder Removed Successfully",  # 文件夹删除成功
                     "error": None,
                 }
+    # 路由处理下载请求
+    def download(self):
+        # 获取已上传数据
+        upload_message = gVar.upload_message
+        # 获取上传数据配置(存储用户名和密码)
+        upload_data = gVar.upload_data
+        # 从请求参数中获取用户名，默认为空字符串
+        username = request.query.get("username", "")
+        # 从请求参数中获取密码，默认为空字符串
+        password = request.query.get("password", "")
+        channelid = request.query.get("channel_id", "")
+        filename = request.query.get("filename", "")
+        if username not in upload_data:
+            self.print_out("login", 401)
+            return {
+                "code": -2,
+                "message": "Username Error",  # 用户名错误
+                "error": None,
+            }
+        # 验证密码是否正确
+        if upload_data[username] != password:
+            self.print_out("login", 401)
+            return {
+                "code": -3,
+                "message": "Password Error",  # 密码错误
+                "error": None,
+            }
+        if not channelid:
+            self.print_out("download", 404)
+            return {
+                "code": -6,
+                "message": "ChannelId Does Not Exist",  # 频道ID不存在
+            }
+        if not filename:
+            self.print_out("download", 404)
+            return {
+                "code": -14,
+                "message": "Filename Not Provided",  # 未提供文件名
+            }
+            
+            
+            
+            
+            
+    
 
     # 路由处理模板文件请求
     def serve_template_file(self, filepath):

{podflow-20250803 → podflow-20250821}/podflow/message/fail_message_initialize.py

@@ -184,6 +184,11 @@ error_reason = [
         "\033[31m播放列表不存在\033[0m",
         "text",
     ],
+    [
+        "An extractor error has occurred. (caused by KeyError('data')); please report this issue on  https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using  yt-dlp -U",
+        "\033[31m提取器错误\033[0m",
+        "text",
+    ],
 ]
 
 

{podflow-20250803 → podflow-20250821}/podflow/message/get_youtube_and_bilibili_video_format.py

@@ -69,7 +69,9 @@ def get_youtube_and_bilibili_video_format(
         else:
             power = get_bilibili_cid(id_num, gVar.video_id_update_format[id_num]["name"])[2]
         if power is True and (
-            "试看" in id_update_format or id_update_format == "无法获取音频ID"
+            "试看" in id_update_format
+            or "提取器错误" in id_update_format
+            or id_update_format == "无法获取音频ID"
         ):
             id_update_format = "\033[31m充电专属\033[0m"
     if isinstance(id_update_format, list):

{podflow-20250803 → podflow-20250821}/podflow/message/media_format.py

@@ -39,6 +39,7 @@ def duration_and_formats(video_website, video_url, cookies):
                     "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
                     "Referer": "https://www.youtube.com/",
                 }
+                ydl_opts["extractor_args"] = {"youtube": {"player-client": "web_embedded,web,tv"}}
             ydl_opts["cookiefile"] = cookies  # cookies 是你的 cookies 文件名
         with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             # 使用提供的 URL 提取视频信息

{podflow-20250803 → podflow-20250821}/podflow/message/update_information_display.py

@@ -55,20 +55,25 @@ def update_information_display(
                 channelid_key in content_id_update
                 and channelid_key in content_id_backward_update
             ):
-                if (
-                    skip_display(name, channelid_key, channelid_value, content_id_update)
-                    and skip_display(name, channelid_key, channelid_value, content_id_backward_update)
+                if skip_display(
+                    name, channelid_key, channelid_value, content_id_update
+                ) and skip_display(
+                    name, channelid_key, channelid_value, content_id_backward_update
                 ):
                     print_channelid_ids_update += f"\033[97m{channelid_value}\033[0m"
                 else:
                     print_channelid_ids_update += f"\033[34m{channelid_value}\033[0m"
             elif channelid_key in content_id_update:
-                if skip_display(name, channelid_key, channelid_value, content_id_update):
+                if skip_display(
+                    name, channelid_key, channelid_value, content_id_update
+                ):
                     print_channelid_ids_update += f"\033[97m{channelid_value}\033[0m"
                 else:
                     print_channelid_ids_update += f"\033[32m{channelid_value}\033[0m"
             elif channelid_key in content_id_backward_update:
-                if skip_display(name, channelid_key, channelid_value, content_id_backward_update):
+                if skip_display(
+                    name, channelid_key, channelid_value, content_id_backward_update
+                ):
                     print_channelid_ids_update += f"\033[97m{channelid_value}\033[0m"
                 else:
                     print_channelid_ids_update += f"\033[36m{channelid_value}\033[0m"

{podflow-20250803 → podflow-20250821}/podflow/message/xml_item.py

@@ -2,12 +2,28 @@
 # coding: utf-8
 
 import os
+import re
 import html
 import hashlib
-from podflow.message.title_correction import title_correction
+from podflow import gVar
 from podflow.basic.time_format import time_format
 from podflow.basic.get_duration import get_duration
-from podflow import gVar
+from podflow.upload.find_media_index import find_media_index
+from podflow.message.title_correction import title_correction
+
+
+def get_duration_by_guid(xml_text: str, target_guid: str):
+    # 匹配包含目标 GUID 的 <item> 区块，并提取 <itunes:duration> 的值
+    pattern = re.compile(
+        r"<item>.*?<guid>"
+        + re.escape(target_guid)
+        + r"</guid>.*?<itunes:duration>([^<]+)</itunes:duration>.*?</item>",
+        re.S,
+    )
+    m = pattern.search(xml_text)
+    if m:
+        return m.group(1)
+    return "Unknown"
 
 
 # 生成item模块
@@ -53,9 +69,19 @@ def xml_item(
         output_format = "m4a"
         video_type = "audio/x-m4a"
     # 获取文件时长
-    duration = time_format(
-        get_duration(f"channel_audiovisual/{output_dir}/{video_url}.{output_format}")
-    )
+    file_path = f"channel_audiovisual/{output_dir}/{video_url}.{output_format}"
+    duration = ""
+    if os.path.exists(file_path):
+        duration = time_format(get_duration(file_path))
+    elif gVar.config["upload"]:
+        index = find_media_index(gVar.upload_original, f"{video_url}.{output_format}")
+        if index != -1:
+            item = gVar.upload_original[index]
+            if "duration" in item:
+                duration = time_format(item["duration"])
+    else:
+        xml_text = gVar.xmls_original.get(output_dir, "")
+        duration = get_duration_by_guid(xml_text, video_url)
     # 生成url
     if gVar.config["token"]:
         input_string = f"{gVar.config['token']}/channel_audiovisual/{output_dir}/{video_url}.{output_format}"

{podflow-20250803 → podflow-20250821}/podflow/remove/remove_dir.py

@@ -11,6 +11,14 @@ from podflow.basic.http_client import http_client
 
 def judge_upload(upload_url, name):
     if upload_url:
+        sign = True
+        upload_original = gVar.upload_original
+        for item in upload_original:
+            if item["channel_id"] == name and item["upload"] is True:
+                sign = False
+                break
+        if sign:
+            return True
         result = {
             -2: "用户名错误",
             -3: "密码错误",

{podflow-20250803 → podflow-20250821}/podflow/remove/remove_file.py

@@ -5,10 +5,18 @@ import os
 from podflow import gVar
 from podflow.basic.write_log import write_log
 from podflow.basic.http_client import http_client
+from podflow.upload.find_media_index import find_media_index
 
 
 def judge_upload(upload_url, output_dir, file_name):
     if upload_url:
+        upload_original = gVar.upload_original
+        index = find_media_index(upload_original, file_name)
+        if index != -1:
+            return True
+        item = upload_original[index]
+        if not item["upload"]:
+            return True
         result = {
             -2: "用户名错误",
             -3: "密码错误",

podflow-20250821/podflow/upload/uploaded_remove.py

@@ -0,0 +1,54 @@
+# podflow/upload/uploaded_remove.py
+# coding: utf-8
+
+import os
+import time
+from datetime import datetime, timedelta
+from podflow import gVar
+from podflow.basic.write_log import write_log
+from podflow.basic.time_format import time_format
+from podflow.basic.get_duration import get_duration
+from podflow.upload.find_media_index import find_media_index
+
+
+# 过滤和排序上传媒体模块
+def filter_and_sort_media(media_list):
+    filtered_sorted = sorted(
+        (
+            item
+            for item in media_list
+            if item["upload"]
+            and not item["remove"]
+        ),
+        key=lambda x: x["media_time"],
+    )
+    return [
+        {"media_id": item["media_id"], "channel_id": item["channel_id"]}
+        for item in filtered_sorted
+    ]
+
+# 上传已删除媒体模块
+def uploaded_remove(upload_url):
+    if upload_url:
+        # 当前时间
+        now = datetime.now()
+        # 30天前的时间
+        one_month_ago = now - timedelta(days=30)
+        # 转换为时间戳（秒级）
+        timestamp = int(time.mktime(one_month_ago.timetuple()))
+        result = filter_and_sort_media(gVar.upload_original)
+        num = 0
+        for item in result:
+            if num < 10 and item["media_time"] < timestamp:
+                break
+            num += 1
+            output_dir = item["channel_id"]
+            file_name = item["media_id"]
+            index = find_media_index(gVar.upload_original, file_name)
+            if index != -1:
+                gVar.upload_original[index]["remove"] = True
+                file_path = f"channel_audiovisual/{output_dir}/{file_name}"
+                duration = time_format(get_duration(file_path))
+                gVar.upload_original[index]["duration"] = duration
+                os.remove(file_path)
+                write_log(f"{file_name}本地文件已删除")

{podflow-20250803 → podflow-20250821}/podflow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250803
+Version: 20250821
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz

{podflow-20250803 → podflow-20250821}/podflow.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ podflow/upload/time_key.py
 podflow/upload/update_upload.py
 podflow/upload/upload_files.py
 podflow/upload/upload_server.py
+podflow/upload/uploaded_remove.py
 podflow/youtube/__init__.py
 podflow/youtube/build.py
 podflow/youtube/check.py

{podflow-20250803 → podflow-20250821}/podflow.egg-info/requires.txt

@@ -1,6 +1,6 @@
 astral>=3.2
 bottle>=0.13.2
-yt-dlp>=2025.7.21
+yt-dlp>=2025.8.20
 chardet>=5.2.0
 cherrypy>=18.10.0
 pyqrcode>=1.2.1

{podflow-20250803 → podflow-20250821}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250803",
+    version="20250821",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",
@@ -31,7 +31,7 @@ setup(
     install_requires=[
         "astral>=3.2", 
         "bottle>=0.13.2",
-        "yt-dlp>=2025.7.21",
+        "yt-dlp>=2025.8.20",
         "chardet>=5.2.0",
         "cherrypy>=18.10.0",
         "pyqrcode>=1.2.1",