podflow 20250526__tar.gz → 20250604__tar.gz

{podflow-20250526 → podflow-20250604}/PKG-INFO

@@ -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 → podflow-20250604}/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-20250526 → podflow-20250604}/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-20250526 → podflow-20250604}/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-20250526 → podflow-20250604}/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-20250526 → podflow-20250604}/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 → podflow-20250604}/podflow.egg-info/PKG-INFO

@@ -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 → podflow-20250604}/podflow.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 MANIFEST.in
 README.md
+pyproject.toml
 setup.py
 podflow/__init__.py
 podflow/download_and_build.py

podflow-20250604/pyproject.toml

@@ -0,0 +1,6 @@
+# pyproject.toml
+# coding: utf-8
+
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"

{podflow-20250526 → podflow-20250604}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250526",
+    version="20250604",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",