podflow 20250526__py3-none-any.whl → 20250604__py3-none-any.whl

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/message/get_youtube_and_bilibili_video_format.py

@@ -3,6 +3,7 @@
 
 from podflow import gVar
 from podflow.basic.write_log import write_log
+from podflow.bilibili.get import get_bilibili_cid
 from podflow.httpfs.progress_bar import progress_bar
 from podflow.message.media_format import media_format
 
@@ -63,7 +64,11 @@ def get_youtube_and_bilibili_video_format(
                     id_update_format = f"\033[31m{fail_info}\033[0m(需要Cookies)"
                 break
     else:
-        if gVar.video_id_update_format[id_num]["power"] is True and (
+        if gVar.channelid_bilibili[gVar.video_id_update_format[id_num]["name"]]["AllPartGet"]:
+            power = gVar.video_id_update_format[id_num]["power"]
+        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"
         ):
             id_update_format = "\033[31m充电专属\033[0m"

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

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

{podflow-20250526.dist-info → podflow-20250604.dist-info}/RECORD

@@ -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,13 +56,13 @@ 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
 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=LKer75ZhVDvFLd7aMOrr-9UPKIVpCEPkeIhdlmP_xu4,4633
+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/optimize_download.py,sha256=-6YritASap8Dp0HqDuvn-kyeamAfw8UjnR-_5S0DbYw,1034
 podflow/message/original_rss_fail_print.py,sha256=7HM5Gwi3GqBIg2dtTTDlN_FRgZZjYv6ejizS3tDiePE,502
@@ -98,14 +98,14 @@ podflow/upload/linked_server.py,sha256=h-qSx13fP8_Ny2IKW3wCNPwqRqW6-Iz1pqxD9ga9-
 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-20250526.dist-info/METADATA,sha256=8mS19fSwTP9cjSRos5EVs8Hcu2bTK_oevMX4wlGUAUw,14195
-podflow-20250526.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250526.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250526.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250526.dist-info/RECORD,,
+podflow-20250604.dist-info/METADATA,sha256=aCN1CEvbSbYV1C3uqV9GJ_D6_Smk29sWzdwyG5R4yeo,14195
+podflow-20250604.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250604.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250604.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250604.dist-info/RECORD,,