podflow 20250522__py3-none-any.whl → 20250601__py3-none-any.whl

podflow/__init__.py

@@ -20,6 +20,7 @@ default_config = {
     "delete_incompletement": False,  # 是否删除下载中断媒体(下载前处理流程)
     "remove_media": True,  # 是否删除无用的媒体文件
     "upload": False,  # 是否将长期媒体进行上传
+    "upload_ip": "10.0.3.231",  # 长期媒体进行上传服务器地址(可不写, 会自动搜索, 无法搜索请填写)
     "channelid_youtube": {  # Youtube频道列表
         "youtube": {
             "update_size": 15,  # 每次获取频道媒体数量

podflow/config/correct_config.py

@@ -106,3 +106,8 @@ def correct_config():
         config["upload"], bool
     ):
         config["upload"] = default_config["upload"]
+    # 对upload_ip进行纠正
+    if "upload_ip" not in config:
+        config["upload_ip"] = ""
+    else:
+        config["upload_ip"] = str(config["upload_ip"])

podflow/httpfs/app_bottle.py

@@ -328,14 +328,14 @@ class bottle_app:
             self.print_out("login", 401)
             return {
                 "code": -2,
-                "message": "Username Error",
+                "message": "Username Error",  # 用户名错误
             }
         # 验证密码是否正确
         if upload_data[username] != password:
             self.print_out("login", 401)
             return {
                 "code": -3,
-                "message": "Password Error",
+                "message": "Password Error",  # 密码错误
             }
         # 从请求中获取上传的文件对象
         upload_file = request.files.get("file")
@@ -345,7 +345,7 @@ class bottle_app:
             self.print_out("upload", 404)
             return {
                 "code": -4,
-                "message": "No File Provided",
+                "message": "No File Provided",  # 没有上传文件
             }
         # 判断文件是否完整
         uploadfile = upload_file.file
@@ -355,7 +355,7 @@ class bottle_app:
             self.print_out("upload", 401)
             return {
                 "code": -5,
-                "message": "Incomplete File",
+                "message": "Incomplete File",  # 文件不完整
                 "hash": uploadfile_hash,
             }
         if not channelid:
@@ -363,7 +363,7 @@ class bottle_app:
             self.print_out("upload", 404)
             return {
                 "code": -6,
-                "message": "ChannelId Does Not Exist",
+                "message": "ChannelId Does Not Exist",  # 频道ID不存在
             }
         # 获取上传文件的原始文件名
         filename = upload_file.filename
@@ -373,7 +373,7 @@ class bottle_app:
             self.print_out("upload", 404)
             return {
                 "code": -6,
-                "message": "File Format Error",
+                "message": "File Format Error",  # 文件格式错误
             }
         address = f"channel_audiovisual/{channelid}"
         if os.path.exists(address):
@@ -391,7 +391,7 @@ class bottle_app:
                         self.print_out("upload", 200)
                         return {
                             "code": 1,
-                            "message": "The Same File Exists",
+                            "message": "The Same File Exists",  # 相同文件已存在
                             "data": {
                                 "filename": filename,
                             },
@@ -405,7 +405,7 @@ class bottle_app:
                 self.print_out("upload", 200)
                 return {
                     "code": 0,
-                    "message": "Upload Success",
+                    "message": "Upload Success",  # 上传成功
                     "data": {
                         "filename": filename,
                     },

podflow/message/fail_message_initialize.py

@@ -148,7 +148,12 @@ error_reason = [
         r"Offline.",
         "\033[31m直播已停止\033[0m",
         "text",
-    ]
+    ],
+    [
+        r"Got error: \<urllib3\.connection\.HTTPSConnection object at .{18}\>: Failed to resolve \'rr5---sn-a5msenek\.googlevideo\.com\' \(\[Errno 11001\] getaddrinfo failed\)",
+        "\033[31m无法解析\033[0m",
+        "regexp",
+    ],
 ]
 
 

podflow/upload/linked_client.py

@@ -90,16 +90,20 @@ def discover_server(broadcast_ip, broadcast_port, time_out):
 def connect_upload_server():
     # 如果配置中启用了上传功能
     if gVar.config["upload"]:
-        local_ip = get_local_ip()
-        if not local_ip:
-            # 如果无法获取本地IP，广播发现也无法进行
-            time_print("\033[31m无法获取本地IP，跳过广播发现。\033[0m")
-            return
-        broadcast_ip = calculate_broadcast(local_ip)
-        if broadcast_ip in ["255.255.255.255", local_ip, "0.0.0.0"]:
-            # 避免向无效或自己的地址广播
-            time_print(f"\033[31m计算出的广播地址无效或为本机地址: {broadcast_ip}，跳过广播发现。\033[0m")
-            return
+        upload_ip = gVar.config["upload_ip"]
+        if upload_ip:
+            broadcast_ip = upload_ip
+        else:
+            local_ip = get_local_ip()
+            if not local_ip:
+                # 如果无法获取本地IP，广播发现也无法进行
+                time_print("\033[31m无法获取本地IP，跳过广播发现。\033[0m")
+                return
+            broadcast_ip = calculate_broadcast(local_ip)
+            if broadcast_ip in ["255.255.255.255", local_ip, "0.0.0.0"]:
+                # 避免向无效或自己的地址广播
+                time_print(f"\033[31m计算出的广播地址无效或为本机地址: {broadcast_ip}，跳过广播发现。\033[0m")
+                return
         # 打印正在搜索上传服务器
         time_print("正在搜索上传服务器...")
         # 服务器列表为空

podflow/upload/upload_files.py

@@ -2,10 +2,15 @@
 # coding: utf-8
 
 import time
+from datetime import datetime
+from podflow import gVar
+from podflow.httpfs.to_html import ansi_to_html
 from podflow.upload.build_hash import build_hash
 from podflow.basic.http_client import http_client
+from podflow.httpfs.app_bottle import bottle_app_instance
 
 
+# 上传文件模块
 def upload_file(username, password, channelid, filename):
     filename = f"channel_audiovisual/{channelid}/{filename}"
     with open(filename, "rb") as file:
@@ -25,12 +30,13 @@ def upload_file(username, password, channelid, filename):
             mode="post",
             file=file,
         ):
-            return response.json()
+            return response.json(), hashs
         else:
-            return None
-    return None
+            return None, hashs
+    return None, hashs
 
 
+# 查找位置模块
 def find_media_index(upload_original, target_media_id):
     for index, item in enumerate(upload_original):
         if item.get("media_id") == target_media_id:
@@ -38,6 +44,7 @@ def find_media_index(upload_original, target_media_id):
     return -1
 
 
+# 过滤和排序媒体模块
 def filter_and_sort_media(media_list, day):
     current_time = int(time.time())
     one_month_ago = current_time - day * 24 * 60 * 60  # 30天前的时间戳
@@ -56,3 +63,30 @@ def filter_and_sort_media(media_list, day):
         for item in filtered_sorted
     ]
     return result
+
+
+def record_upload(username, password, channelid, filename):
+    response, hashs = upload_file(username, password, channelid, filename)
+    channelname = (
+        gVar.channelid_youtube_ids_original | gVar.channelid_bilibili_ids_original
+    ).get(channelid, "")
+    now_time = datetime.now().strftime("%H:%M:%S")
+    if response:
+        code = response.get("code")
+        data = response.get("data", {})
+        message = response.get("message", "")
+        if code in [0, 1]:
+            index = find_media_index(gVar.upload_original, filename)
+            if index != -1:
+                filename = data.get("filename")
+                if filename:
+                    gVar.upload_original[index]["upload"] = True
+                    gVar.upload_original[index]["hash"] = hashs
+                    gVar.upload_original[index]["filename"] = hashs
+
+        bottle_text = f"{now_time}|{channelname}/{filename} Upload: {message}"
+    else:
+        bottle_text = f"{now_time}|{channelname}/{filename} Upload Failed"
+    bottle_app_instance.bottle_print.append(bottle_text)
+    gVar.index_message["http"].append(ansi_to_html(bottle_text))
+    bottle_app_instance.cherry_print(False)

podflow/youtube/build.py

@@ -47,8 +47,8 @@ def get_youtube_introduction():
             ).group()
         else:
             xml_tree = {"introduction": False}
-            with youtube_xml_get_lock:
-                gVar.youtube_xml_get_tree[output_dir] = xml_tree
+        with youtube_xml_get_lock:
+            gVar.youtube_xml_get_tree[output_dir] = xml_tree
     # 创建线程列表
     youtube_xml_get_threads = []
     for output_dir in gVar.channelid_youtube_ids_update:
@@ -187,7 +187,6 @@ def get_xml_item(guid, item, channelid_title, title_change, output_dir):
 # 生成YouTube对应channel的需更新的items模块
 def youtube_xml_items(output_dir, ratio_part):
     items_list = [f"<!-- {output_dir} -->"]
-    entry_num = 0
     original_judgment = True
     channelid_youtube_value = gVar.channelid_youtube[
         gVar.channelid_youtube_ids[output_dir]
@@ -227,6 +226,7 @@ def youtube_xml_items(output_dir, ratio_part):
         else:
             file_xml = output_dir_value["content"]
         entrys = re.findall(r"<entry>.+?</entry>", file_xml, re.DOTALL)
+        entry_num = 0
         for entry in entrys:
             if (
                 re.search(r"(?<=<yt:videoId>).+(?=</yt:videoId>)", entry).group()

{podflow-20250522.dist-info → podflow-20250601.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250522
+Version: 20250601
 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.4.30
+Requires-Dist: yt-dlp>=2025.5.22
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: cherrypy>=18.10.0
 Requires-Dist: pyqrcode>=1.2.1

{podflow-20250522.dist-info → podflow-20250601.dist-info}/RECORD

@@ -1,4 +1,4 @@
-podflow/__init__.py,sha256=aXqsJ8qN7VHvMdcgtRwR1p95my8mj9QsjOHklypRBiU,7381
+podflow/__init__.py,sha256=KdCh8mDeRDjjtdHQUzg025Qnpw8UGgrHdboFvkjOAm4,7506
 podflow/download_and_build.py,sha256=GKQ1uX8Nuwdhr4wgnGr3jP1Mu0llRUPFcboQ3S05WkU,671
 podflow/ffmpeg_judge.py,sha256=wM49pPXOFwFAA_8TKHal5fV6ka9sAA87yGQMDOssvXo,1340
 podflow/main.py,sha256=Cz2E33-Kcc_1_oxNs4Z1OoqJYhonmClsrtoCW1oQmZA,739
@@ -28,7 +28,7 @@ podflow/config/__init__.py,sha256=MzgAlkSdV-5MFC11r0QSf-GPxmsLbrMc5ROIrJafjag,45
 podflow/config/build_original.py,sha256=pG9gCkBBIWwU8QxZA06Br6JRfI4XUSIEiN8eqo1-v7k,1809
 podflow/config/channge_icon.py,sha256=W-EU_5_wg94_yioNofk8OTyRD2X7SY8HEjvjFmSEyh0,5653
 podflow/config/correct_channelid.py,sha256=4Z6B3cR5wQq5Vce4LPGVDqqUGc-fW54B46w7f_XEKYc,9252
-podflow/config/correct_config.py,sha256=UgfDyZP4v0lTLtUdUMV0AEZwAaJ30QOhjqzeDRFsu0k,3958
+podflow/config/correct_config.py,sha256=slC3DYiapyZ8JO6xjDvNWQ5DBOZRvO7FvAQm-2J5H08,4121
 podflow/config/get_channelid.py,sha256=WUtvUZ1Q_L9n94ZGGaOqu-9QC2HlYMx5oU4gOCZ4_Ew,626
 podflow/config/get_channelid_id.py,sha256=VjExb_AXPHtQ5v8SaZiehaiLNkNmfMoPcv5HyUar6GU,571
 podflow/config/get_config.py,sha256=TpLbh5GoPO7csWUJ-di65XXnkN3LSnMXkFw85h5ndHs,1279
@@ -40,7 +40,7 @@ podflow/download/show_progress.py,sha256=y46chchUC9eZCg4ZdNMFnx_bXJQV_IUq15jVzZt
 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=A-EZuuY1Xlpuu0_kQSeRgswhLbGw9J_3BbxuO8L2nZg,21305
+podflow/httpfs/app_bottle.py,sha256=UhUIpkI4afz6fXrvXH8a-hYBmjXH8WJuNIcvnCtSIrQ,21465
 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
@@ -56,7 +56,7 @@ 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=UPHYNErD2hnzm2WFlNqghBRDCw_sf_3EagAF5LiO9wk,6462
+podflow/message/fail_message_initialize.py,sha256=OlkPQUU2qgTJ-wcFhyGiTAeoY0qy_eOOQGkA0PtyxHQ,6711
 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
@@ -93,19 +93,19 @@ podflow/upload/__init__.py,sha256=AtOSXDrE5EjUe3z-iBd1NTDaH8n_X9qA5WXdBLkONjA,45
 podflow/upload/add_upload.py,sha256=_2-V0z75Lwu-PUCfMD9HOSxZTB102yZlZW5hSdlHcsc,1432
 podflow/upload/build_hash.py,sha256=9opa3xLd7nJbGGX5xa3uuKPS6dxlbkAb87ZdEiUxmxI,473
 podflow/upload/get_upload_original.py,sha256=TEDnRutumm2FZNIesPJIlExHyKWpfB3ZAHb3sZt7V6A,4312
-podflow/upload/linked_client.py,sha256=gXcqwvyJtRZ-bAygQu6EyPoOa1y8GuJILTTVvGhu6DY,5130
+podflow/upload/linked_client.py,sha256=NdSi5uh0TbZUhOHbA_mkHo4aIz1XNKoSXHhT4rMRUpc,5288
 podflow/upload/linked_server.py,sha256=h-qSx13fP8_Ny2IKW3wCNPwqRqW6-Iz1pqxD9ga9-dM,2308
 podflow/upload/login.py,sha256=85sqr12T-3NH-TD3kAMzy4yb1KOheV3Tr0eGee7NCJo,4007
 podflow/upload/time_key.py,sha256=6jZ3cxUjzj_umYDwH27R0YNZlLXxfhNp-CqV_K22wlo,967
 podflow/upload/update_upload.py,sha256=_5tp1zPNsC9DdDnLzm-P8bLcOBuDov4eMRHp_861j80,3183
-podflow/upload/upload_files.py,sha256=5QZUjnfH3kVTfKCo0673j19bh00JLTyA92TLAN9oVfU,1634
+podflow/upload/upload_files.py,sha256=f6ME5t4shs1XB_aqO5tFYbJNqEOTzGkceZ2dF1m7cl4,3072
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
-podflow/youtube/build.py,sha256=67m74rQOrvqU6ZZybP85ORpg3pOCkpoikttBbtO_PxY,12315
+podflow/youtube/build.py,sha256=j6SVq3HFFGlNNqRrHfnBIThdzsH88PFmwLnejosif1U,12311
 podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
 podflow/youtube/login.py,sha256=KYl--ya6Z1u0uIcOp9l8i3DIIj9hsYUDH4dtJjI0MLM,1295
-podflow-20250522.dist-info/METADATA,sha256=xM46jtPG8HRrJ_IY4WYaOTqePoRHvZtct2Z6lIdkrv8,14195
-podflow-20250522.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250522.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250522.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250522.dist-info/RECORD,,
+podflow-20250601.dist-info/METADATA,sha256=8-mKVPtVbJ6lsTX8F69gX0VfHcCFjOYjOPcJuaSV1hM,14195
+podflow-20250601.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250601.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250601.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250601.dist-info/RECORD,,