podflow 20250803__py3-none-any.whl → 20250821__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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.dist-info → podflow-20250821.dist-info}/METADATA

@@ -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
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: astral>=3.2
 Requires-Dist: bottle>=0.13.2
-Requires-Dist: yt-dlp>=2025.7.21
+Requires-Dist: yt-dlp>=2025.8.20
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: cherrypy>=18.10.0
 Requires-Dist: pyqrcode>=1.2.1

{podflow-20250803.dist-info → podflow-20250821.dist-info}/RECORD

@@ -36,12 +36,12 @@ podflow/config/get_config.py,sha256=TpLbh5GoPO7csWUJ-di65XXnkN3LSnMXkFw85h5ndHs,
 podflow/download/__init__.py,sha256=1lATXiOAEx5oDUDR99mQRiTrQlQ9CQkJNAKpsLrnPCo,47
 podflow/download/convert_bytes.py,sha256=6Q3TcPGzCO2FlhOKWbp9RB_GPmfuyKY5suIyE9EJf6k,543
 podflow/download/delete_part.py,sha256=wjY6WulpUMjLx38on0kTLXj0gA04rIuKAdwFidZtWGU,679
-podflow/download/dl_aideo_video.py,sha256=HoiAYf1QpHG17U9y--ixKOT2aupeGA2vAleVvC1JoV8,10765
+podflow/download/dl_aideo_video.py,sha256=p9Awb0Zde3cH1xEtGUDIhTCyBJAUiryKs1HN6RrjS2M,10860
 podflow/download/show_progress.py,sha256=y46chchUC9eZCg4ZdNMFnx_bXJQV_IUq15jVzZtLlJM,2248
 podflow/download/wait_animation.py,sha256=AUTvszXF89QA7XYjocFIauPKV7Qj8cFqry44teClaLQ,1314
 podflow/download/youtube_and_bilibili_download.py,sha256=VCEhz6pGXFWXusdbGWqkCzi4f4VsKQVn6sZz1pfGsns,1335
 podflow/httpfs/__init__.py,sha256=BxEXkufjcx-a0F7sDVXo65hmyANqCCbZUd6EH9i8T2c,45
-podflow/httpfs/app_bottle.py,sha256=7xVaTmlSn4fyTr2CT3azqR5H6TVg-p0Lj-e5YBksjM4,35288
+podflow/httpfs/app_bottle.py,sha256=j7G9iWSxJ_F1y-FHwmrUP-Gg0A2Bg76ptO2yEATIIcU,36941
 podflow/httpfs/browser.py,sha256=BJ4Xkfiki_tDr0Sc9RqAcEfIVpkAZ3RFOwo0aMHlY3U,197
 podflow/httpfs/download_bar.py,sha256=0n3HATEO3pdsIpx-E_IZG9OlXa6u-9SeBCoZVgUutyc,965
 podflow/httpfs/get_channelid.py,sha256=gcwy4IVHBWNQz7qPCpjwiAklGFLRGzvM33-UZz7oFvo,2296
@@ -57,30 +57,30 @@ podflow/message/__init__.py,sha256=pZkcrrtkdtxgMriEHBZ0_rptKaQrQeMPJvPSaoI1Awo,4
 podflow/message/backup_zip_save.py,sha256=c81jnx8IxHjTcO7G0OUAppawpBIPxa9wgkj9AQhqeJc,1864
 podflow/message/create_main_rss.py,sha256=kW2QvJhxl2ZcqGV-M-OztlOaQ27ODuQxADeP8poymBQ,3118
 podflow/message/display_qrcode_and_url.py,sha256=VqmRkDYYG03VihfW4SAU49HJVmfqWbLTgMxqCaREeCo,1037
-podflow/message/fail_message_initialize.py,sha256=J8jhKa1PVHKJ6TUUNmakBjD2dd6nMHs8sVkiBf9oXmM,8040
+podflow/message/fail_message_initialize.py,sha256=mSRbyY1KZLXAINvC-FnbxHfy3W8L6staTTdu8bvtP2E,8358
 podflow/message/format_time.py,sha256=gveNh4FGeS3ytwDyYB-h12d1_Km6XoX7WSPcFmDfCBk,909
 podflow/message/get_media_name.py,sha256=5ULPQOQCZ2-lxdkILwlBP-ItzdFEgvEAKxeLtplACbQ,861
 podflow/message/get_original_rss.py,sha256=Bzy-Fs1vZEjwvQq6D6xp-2IUidliSyaL1P4WtkLJaRg,2450
 podflow/message/get_video_format.py,sha256=bPetnFwQlhIO9do_nq3B4AwHQRxFn6SDYvFItjwEx0o,5324
 podflow/message/get_video_format_multithread.py,sha256=tbgQDMpcntulrbmXBbKL4iVr4t_9evGsuMOIZLoLebI,1615
-podflow/message/get_youtube_and_bilibili_video_format.py,sha256=FACn7IYWTzMHvgNcv8DiUs9CrfoRvLz_9EBjrCxT_9A,4911
-podflow/message/media_format.py,sha256=Q4WoML4UqL0Ry-QN8DHFJqOQ2tXcFN6u5hmhdSLdP1g,7346
+podflow/message/get_youtube_and_bilibili_video_format.py,sha256=hLb7a6eUdaTVqTdP16n3MoBpgzPlbdd0OvN0bfnjMbE,4976
+podflow/message/media_format.py,sha256=Phf8cpkjLMWk6iGxqHPJPwqN0KlveQ9bWwGEahIwaRM,7445
 podflow/message/optimize_download.py,sha256=-6YritASap8Dp0HqDuvn-kyeamAfw8UjnR-_5S0DbYw,1034
 podflow/message/original_rss_fail_print.py,sha256=7HM5Gwi3GqBIg2dtTTDlN_FRgZZjYv6ejizS3tDiePE,502
 podflow/message/rss_create_hash.py,sha256=M5OS9KcQ4mIxLes9ij4oNji-4VKgi56bg0Shv5nCIQ4,638
 podflow/message/save_rss.py,sha256=x-yRwT7bAUt2k-R9DWa5uToqpcOdaXkPW_4VH5Gbeo4,3193
 podflow/message/title_correction.py,sha256=Zieulj2wQY_o4r3u5ZRsDQP5y8KuZHrL_l8tnM96k6g,915
-podflow/message/update_information_display.py,sha256=IfNdr8KQlgoRpN7NSouHx-NXa9OxdXO0Pbck8xoqgh8,4370
+podflow/message/update_information_display.py,sha256=w3sp-ZODL3gbJKFnMgUoRc4RYSMGIjWOyqsryhXfc-U,4462
 podflow/message/update_youtube_bilibili_rss.py,sha256=igt41NkGuikPzi0gqo-Hc29hMil65kHV19J4W-oGQfU,5962
 podflow/message/want_retry.py,sha256=3MtlAG4BZ2oznn0X5zYzAl2S0XzZkXhnN_LHVPcWZjA,699
-podflow/message/xml_item.py,sha256=jCB93aOoIDK6EaAFrZg5gd6mBMv7fP9uX-Z5eiTSyxg,3127
+podflow/message/xml_item.py,sha256=5kJHk3chnW04m2HLAXw74Twq1q_VqWh_4tEkmX1R2bA,4096
 podflow/message/xml_original_item.py,sha256=mlORI0p6aSLP6PWIAuvI4uVN0JbxUDZX5-U52ltn9E4,4048
 podflow/message/xml_rss.py,sha256=ogCteSUXyJJXLhOE7-ZBcRdWYzrRr2Qykjt3oppRpC4,1679
 podflow/netscape/__init__.py,sha256=SUw_BtbV3moA324UdxRECkPLv1xHkjio8r_5JTkVfxI,47
 podflow/netscape/bulid_netscape.py,sha256=wmUPlDGF8G456GGyajU_6Ak5WJzsqsq4bZgPjCSTGhI,2279
 podflow/remove/__init__.py,sha256=x1pMfpIyE6xUrmIOkdl43mbvKLwndGo5pIoOBXhJsP4,45
-podflow/remove/remove_dir.py,sha256=X-nxZq0cRkC3nHDfHLIGx0PDdzIGaM57GHy_LgA-8X0,3001
-podflow/remove/remove_file.py,sha256=VgbO76525qmPkU0A0OgSTTtgLW2sVr8_bAfF2jckD8U,2961
+podflow/remove/remove_dir.py,sha256=g68PW5xuBZWK3gV_33KVk10f1xCHiR9Wx6ZB0BeDbtw,3267
+podflow/remove/remove_file.py,sha256=hM959EZdQD6A4XsObSug-QpsmGoZq4o6t7osQO-gzho,3271
 podflow/remove/remove_flush.py,sha256=HWCe5SjNJ3VXaXbgFtqGdTXeJ1R2vv5qllNilB-G0_g,1851
 podflow/repair/__init__.py,sha256=Gpc1i6xiSLodKjjmzH66c_Y1z0HQ9E9CS3p95FRnVFM,45
 podflow/repair/reverse_log.py,sha256=Wc_vAH0WB-z1fNdWx7FYaVH4caRPtot7tDwDwFhmpz4,1106
@@ -103,13 +103,14 @@ podflow/upload/time_key.py,sha256=6jZ3cxUjzj_umYDwH27R0YNZlLXxfhNp-CqV_K22wlo,96
 podflow/upload/update_upload.py,sha256=tolV9WMRFg9KqdGSSC37REBy4N_f-d3GvCihciMlOlg,3456
 podflow/upload/upload_files.py,sha256=vI0sSjCxUILlu0K9doMLJpmR7KrqhMRsCJmcWrCKlA0,5564
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
+podflow/upload/uploaded_remove.py,sha256=qlQLEz29c4Ta5qtEj12gBW77eDvoUCS-G9zvNWN4Mz4,1844
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
 podflow/youtube/build.py,sha256=j6SVq3HFFGlNNqRrHfnBIThdzsH88PFmwLnejosif1U,12311
 podflow/youtube/check.py,sha256=UTk5GFkhc_3l_3GfrJDZuAyJnG9Esc_v01x7EHm-aKM,2175
 podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
 podflow/youtube/login.py,sha256=pDJNgCJdLOKV02yGot_5JJ-962JACbWZ-GlISmDfgIk,2742
-podflow-20250803.dist-info/METADATA,sha256=JL-W9JhBRZyX1hhCTr13uiP7yXxRjxBKZc3_hHGv_Eg,14195
-podflow-20250803.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250803.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250803.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250803.dist-info/RECORD,,
+podflow-20250821.dist-info/METADATA,sha256=1GlyCFfUcIsy07CFgLOLEIJOFOR9emJlkz1PSnf0EaQ,14195
+podflow-20250821.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250821.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250821.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250821.dist-info/RECORD,,