podflow 20250606__py3-none-any.whl → 20250608__py3-none-any.whl

podflow/basic/file_save.py

@@ -15,8 +15,13 @@ def file_save(content, file_name, folder=None, binary=False):
         file_path = os.path.join(os.getcwd(), file_name)
     # 保存文件
     if binary:
-        with open(file_path, "wb") as file:
-            file.write(content.read())
+        # 使用分块读取和写入的方式处理二进制文件
+        with open(file_path, "wb") as dest_file:
+            while True:
+                chunk = content.read(8192)  # 每次读取 8KB 的数据
+                if not chunk:
+                    break  # 读取完毕
+                dest_file.write(chunk)
     else:
         with open(file_path, "w", encoding="utf-8") as file:
             # 如果文件名中包含"."且文件类型为json，则将内容以json格式保存

podflow/download_and_build.py

@@ -16,15 +16,21 @@ def get_and_duild():
 
 
 # 下载并构建YouTube和哔哩哔哩视频模块
-def download_and_build():
+def download_and_build(upload_url):
     thread_download = threading.Thread(target=youtube_and_bilibili_download)
     thread_build = threading.Thread(target=get_and_duild)
-    thread_upload = threading.Thread(target=all_upload)
+    if upload_url:
+        thread_upload = threading.Thread(
+            target=all_upload,
+            args=(upload_url,)
+        )
 
     thread_download.start()
     thread_build.start()
-    thread_upload.start()
+    if upload_url:
+        thread_upload.start()
 
     thread_download.join()
     thread_build.join()
-    thread_upload.join()
+    if upload_url:
+        thread_upload.join()

podflow/httpfs/app_bottle.py

@@ -314,102 +314,126 @@ class bottle_app:
 
     # 文件上传处理请求
     def upload(self):
-        # 获取上传数据配置(存储用户名和密码)
-        upload_data = gVar.upload_data
-        # 从请求参数中获取用户名，默认为空字符串
-        username = request.query.get("username", "")
-        # 从请求参数中获取密码，默认为空字符串
-        password = request.query.get("password", "")
-        upload_hash = request.query.get("hash", "")
-        channelid = request.query.get("channel_id", "")
-
-        # 验证用户是否存在
-        if username not in upload_data:
-            self.print_out("login", 401)
-            return {
-                "code": -2,
-                "message": "Username Error",  # 用户名错误
-            }
-        # 验证密码是否正确
-        if upload_data[username] != password:
-            self.print_out("login", 401)
-            return {
-                "code": -3,
-                "message": "Password Error",  # 密码错误
-            }
-        # 从请求中获取上传的文件对象
-        upload_file = request.files.get("file")
-        # 检查是否有文件被上传
-        if not upload_file:
-            # 打印错误信息并返回错误码
-            self.print_out("upload", 404)
-            return {
-                "code": -4,
-                "message": "No File Provided",  # 没有上传文件
-            }
-        # 判断文件是否完整
-        uploadfile = upload_file.file
-        uploadfile.seek(0)
-        uploadfile_hash = build_hash(uploadfile)
-        if upload_hash != uploadfile_hash:
-            self.print_out("upload", 401)
-            return {
-                "code": -5,
-                "message": "Incomplete File",  # 文件不完整
-                "hash": uploadfile_hash,
-            }
-        if not channelid:
-            # 打印错误信息并返回错误码
-            self.print_out("upload", 404)
-            return {
-                "code": -6,
-                "message": "ChannelId Does Not Exist",  # 频道ID不存在
-            }
-        # 获取上传文件的原始文件名
-        filename = upload_file.filename
-        name = filename.split(".")[0]
-        suffix = filename.split(".")[1]
-        if suffix not in ["mp4", "m4a"]:
-            self.print_out("upload", 404)
-            return {
-                "code": -7,
-                "message": "File Format Error",  # 文件格式错误
-            }
-        address = f"channel_audiovisual/{channelid}"
-        if os.path.exists(address):
-            file_list = os.listdir(address)
-        else:
-            file_list = []
-        num = 0
-        while True:
-            if num != 0:
-                filename = f"{name}.{num}.{suffix}"
-            if filename in file_list:
-                with open(f"{address}/{filename}", "rb") as original_file:
-                    original_file.seek(0)
-                    if upload_hash == build_hash(original_file):
-                        self.print_out("upload", 200)
-                        return {
-                            "code": 1,
-                            "message": "The Same File Exists",  # 相同文件已存在
-                            "data": {
-                                "filename": filename,
-                            },
-                        }
-                    num += 1
-            else:
-                folder_build(channelid, "channel_audiovisual")
-                uploadfile.seek(0)
-                file_save(uploadfile, filename, address, True)
-                # 打印成功信息并返回成功码
-                self.print_out("upload", 200)
+        # 初始化 upload_file 为 None，以便在 finally 块中安全检查
+        upload_file = None
+        try:
+            # 获取上传数据配置(存储用户名和密码)
+            upload_data = gVar.upload_data
+            # 从请求参数中获取用户名，默认为空字符串
+            username = request.query.get("username", "")
+            # 从请求参数中获取密码，默认为空字符串
+            password = request.query.get("password", "")
+            upload_hash = request.query.get("hash", "")
+            channelid = request.query.get("channel_id", "")
+
+            # 验证用户是否存在
+            if username not in upload_data:
+                self.print_out("login", 401)
                 return {
-                    "code": 0,
-                    "message": "Upload Success",  # 上传成功
-                    "data": {
-                        "filename": filename,
-                    },
+                    "code": -2,
+                    "message": "Username Error",  # 用户名错误
+                }
+            # 验证密码是否正确
+            if upload_data[username] != password:
+                self.print_out("login", 401)
+                return {
+                    "code": -3,
+                    "message": "Password Error",  # 密码错误
+                }
+            # 从请求中获取上传的文件对象
+            upload_file = request.files.get("file")
+            # 检查是否有文件被上传
+            if not upload_file:
+                # 打印错误信息并返回错误码
+                self.print_out("upload", 404)
+                return {
+                    "code": -4,
+                    "message": "No File Provided",  # 没有上传文件
+                }
+
+            # 获取实际的文件句柄
+            uploadfile_obj = upload_file.file
+
+            # 判断文件是否完整
+            uploadfile_obj.seek(0) # 确保从文件开头计算哈希
+            uploadfile_hash = build_hash(uploadfile_obj)
+            if upload_hash != uploadfile_hash:
+                self.print_out("upload", 401)
+                return {
+                    "code": -5,
+                    "message": "Incomplete File",  # 文件不完整
+                    "hash": uploadfile_hash,
                 }
+            if not channelid:
+                # 打印错误信息并返回错误码
+                self.print_out("upload", 404)
+                return {
+                    "code": -6,
+                    "message": "ChannelId Does Not Exist",  # 频道ID不存在
+                }
+            # 获取上传文件的原始文件名
+            filename = upload_file.filename
+            # 安全地分割文件名和后缀
+            parts = filename.rsplit(".", 1)
+            name = parts[0]
+            suffix = parts[1].lower() if len(parts) > 1 else "" # 转换为小写以便比较
+
+            if suffix not in ["mp4", "m4a"]:
+                self.print_out("upload", 404)
+                return {
+                    "code": -7,
+                    "message": "File Format Error",  # 文件格式错误
+                }
+            address = f"channel_audiovisual/{channelid}"
+            file_list = os.listdir(address) if os.path.exists(address) else []
+            num = 0
+            while True:
+                # 构建当前尝试的文件名
+                current_filename = f"{name}.{suffix}" if num == 0 else f"{name}.{num}.{suffix}"
+                full_target_path = os.path.join(os.getcwd(), address, current_filename) # 完整的保存路径
+
+                if current_filename in file_list:
+                    # 如果文件名已存在，检查是否是相同文件
+                    # 再次检查文件是否存在于磁盘，以防在列表检查后文件被删除
+                    if os.path.exists(full_target_path):
+                        with open(full_target_path, "rb") as original_file:
+                            original_file.seek(0)
+                            if upload_hash == build_hash(original_file):
+                                self.print_out("upload", 200)
+                                return {
+                                    "code": 1,
+                                    "message": "The Same File Exists",  # 相同文件已存在
+                                    "data": {
+                                        "filename": current_filename,
+                                    },
+                                }
+                    num += 1 # 如果哈希不同，尝试下一个文件名
+                else:
+                    # 文件名不存在，可以保存
+                    folder_build(channelid, "channel_audiovisual") # 确保目标文件夹存在
+                    uploadfile_obj.seek(0) # 再次重置文件指针到开头，准备写入
+                    file_save(uploadfile_obj, current_filename, address, True) # 传递文件对象
+                    # 打印成功信息并返回成功码
+                    self.print_out("upload", 200)
+                    return {
+                        "code": 0,
+                        "message": "Upload Success",  # 上传成功
+                        "data": {
+                            "filename": current_filename,
+                        },
+                    }
+        except Exception as e:
+            # 捕获所有其他可能的异常
+            self.print_out("upload", 500)
+            return {
+                "code": -99,
+                "message": f"Server Error: {str(e)}", # 将异常信息返回给客户端
+            }
+        finally:
+            # 无论函数如何退出（正常返回或抛出异常），都会执行此块
+            if upload_file and hasattr(upload_file, 'file') and not upload_file.file.closed:
+                upload_file.file.close()
+
 
     def serve_template_file(self, filepath):
         template_dir = pkg_resources.resource_filename("podflow", "templates")

podflow/main.py

@@ -14,7 +14,7 @@ def main():
     parse_arguments()
     # 开始运行
     if parse.upload:
-        time_print("Podflow|接收服务开始运行...")
+        time_print("Podflow|{version('Podflow')} 接收开始运行...")
         reverse_log("upload")
         main_upload()
     else:

podflow/main_podcast.py

@@ -190,7 +190,7 @@ def main_podcast():
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 下载并构建YouTube和哔哩哔哩视频
-            download_and_build()
+            download_and_build(upload_url)
             progress_update(0.8)
             # 添加新媒体至上传列表
             add_upload()

podflow/remove/remove_dir.py

@@ -16,7 +16,7 @@ def remove_dir():
         if os.path.exists(directory_path):
             # 删除该目录及其内容
             shutil.rmtree(directory_path)
-        write_log(f"{name}文件夹已删除")
+        write_log(f"{name}抛弃文件夹已删除")
 
     folder_names = [
         folder

podflow/remove/remove_file.py

@@ -14,11 +14,11 @@ def remove_file():
         for file_name in os.listdir(f"channel_audiovisual/{output_dir}"):
             if file_name not in gVar.all_youtube_content_ytid[output_dir]:
                 os.remove(f"channel_audiovisual/{output_dir}/{file_name}")
-                write_log(f"{name}|{file_name}已删除")
+                write_log(f"{name}|{file_name}抛弃文件已删除")
 
     channelid_bilibili_ids = gVar.channelid_bilibili_ids
     for output_dir, name in channelid_bilibili_ids.items():
         for file_name in os.listdir(f"channel_audiovisual/{output_dir}"):
             if file_name not in gVar.all_bilibili_content_bvid[output_dir]:
                 os.remove(f"channel_audiovisual/{output_dir}/{file_name}")
-                write_log(f"{name}|{file_name}已删除")
+                write_log(f"{name}|{file_name}抛弃文件已删除")

podflow/upload/upload_files.py

@@ -10,7 +10,7 @@ from podflow.httpfs.app_bottle import bottle_app_instance
 
 
 # 上传文件模块
-def upload_file(username, password, channelid, filename):
+def upload_file(upload_url, username, password, channelid, filename):
     filename = f"channel_audiovisual/{channelid}/{filename}"
     with open(filename, "rb") as file:
         file.seek(0)
@@ -23,7 +23,7 @@ def upload_file(username, password, channelid, filename):
             "hash": hashs,
         }
         if response := http_client(
-            url="http://10.0.3.231:5000/upload",
+            url=f"{upload_url}/upload",
             name="",
             data=data,
             mode="post",
@@ -54,16 +54,15 @@ def filter_and_sort_media(media_list):
         ),
         key=lambda x: x["media_time"],
     )
-    result = [
+    return [
         {"media_id": item["media_id"], "channel_id": item["channel_id"]}
         for item in filtered_sorted
     ]
-    return result
 
 
 # 媒体文件上传模块
-def record_upload(username, password, channelid, filename):
-    response, hashs = upload_file(username, password, channelid, filename)
+def record_upload(upload_url, username, password, channelid, filename):
+    response, hashs = upload_file(upload_url, username, password, channelid, filename)
     channelname = (
         gVar.channelid_youtube_ids_original | gVar.channelid_bilibili_ids_original
     ).get(channelid, "")
@@ -86,29 +85,31 @@ def record_upload(username, password, channelid, filename):
         if code in [0, 1]:
             index = find_media_index(gVar.upload_original, filename)
             if index != -1:
-                filename = data.get("filename")
-                if filename:
+                if filename := data.get("filename"):
                     gVar.upload_original[index]["upload"] = True
                     gVar.upload_original[index]["hash"] = hashs
                     gVar.upload_original[index]["filename"] = filename
         if code == 0:
-            bottle_text = f"{now_time}|{channelname}/{name}|\033[32m上传成功\033[0m"
+            bottle_text = "\033[32m上传成功\033[0m"
+        elif code == 1:
+            bottle_text = f"\033[33m上传成功\033[0m: {result.get(code, message)}"
         else:
-            bottle_text = f"{now_time}|{channelname}/{name}|\033[33m上传成功\033[0m: {result.get(code, message)}"
+            bottle_text = f"\033[31m上传失败\033[0m: {result.get(code, message)}"
     else:
-        bottle_text = f"{now_time}|{channelname}/{name}|\033[31m上传失败\033[0m: {result.get(code, message)}"
+        bottle_text = "\033[31m上传失败\033[0m: 网络连接失败"
+    bottle_text = f"{now_time}|{channelname}/{name}|{bottle_text}"
     bottle_app_instance.bottle_print.append(bottle_text)
     gVar.index_message["http"].append(ansi_to_html(bottle_text))
     bottle_app_instance.cherry_print(False)
 
 
 # 总体上传模块
-def all_upload():
+def all_upload(upload_url):
     if gVar.config["upload"]:
         result = filter_and_sort_media(gVar.upload_original)
         username = gVar.upload_json["username"]
         password = gVar.upload_json["password"]
         for item in result:
-            record_upload(username, password, item["channel_id"], item["media_id"])
+            record_upload(upload_url, username, password, item["channel_id"], item["media_id"])
             if gVar.upload_stop:
                 break

{podflow-20250606.dist-info → podflow-20250608.dist-info}/METADATA

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

{podflow-20250606.dist-info → podflow-20250608.dist-info}/RECORD

@@ -1,12 +1,12 @@
 podflow/__init__.py,sha256=mquu8BdWK9V4dDObCCfnPodeXOPkz-kj8_RNB7kK3Ys,7628
-podflow/download_and_build.py,sha256=UPFTc8XjBEkg3GnCt3zkNjCzSbHugS3O8AreaWIgHJ0,904
+podflow/download_and_build.py,sha256=vwyVs6MMLgbWZjGCFnPcj08dGxplgmU7u9CAP_ujJ8g,1037
 podflow/ffmpeg_judge.py,sha256=wM49pPXOFwFAA_8TKHal5fV6ka9sAA87yGQMDOssvXo,1340
-podflow/main.py,sha256=Cz2E33-Kcc_1_oxNs4Z1OoqJYhonmClsrtoCW1oQmZA,739
-podflow/main_podcast.py,sha256=SSFIg73JLu3wS5E3WAo8OAgXG4r_CHsPT-XSga0Vzrg,12386
+podflow/main.py,sha256=6cUgu8niM6LryBXCppQv0Nj4I2ye2bwoVrTF5vYmVFw,754
+podflow/main_podcast.py,sha256=J63BSzj044Q8YaErSoV-zE2kYrqhPqS6-TqZCEG-VOA,12396
 podflow/main_upload.py,sha256=H_T5KQMYzToqzQbjGQ6DWDGziy8iMnpmf7A1qOStJuo,2296
 podflow/parse_arguments.py,sha256=h3a7EaRZS04kNMFYbxTW9Ch29KgZ7dyS-yqEEt_etQI,2592
 podflow/basic/__init__.py,sha256=CAfI6mVQtz7KKbAiTIZ9_IbvaTXeAqxR1U7ov9GDoDo,44
-podflow/basic/file_save.py,sha256=JPrX0cWJmVSgI8XTb326AlneNJauEYj8oHKakkqYGfk,991
+podflow/basic/file_save.py,sha256=6vu4EkbsN4df5-ci6sJOgIOUEhh-WaRBOyMJ8rpouXo,1233
 podflow/basic/folder_build.py,sha256=5oHyfiDcSp2YITXQWIPwriBF9XuU3qs7wZQOWJHYJ1s,546
 podflow/basic/get_duration.py,sha256=eqdE85b7sgLyp6brhnGcOIQEWX6JqtNCGAsGyJOuXFI,532
 podflow/basic/get_file_list.py,sha256=XmnC4faObislyTsL9WUeyztyTQrvdi76lMzPudKEfXw,2389
@@ -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=cRPJe9JvS6FZVumDgQYOzPdpKrLd3gitKetCNVa3TPw,21465
+podflow/httpfs/app_bottle.py,sha256=8KHi_MxHK1HMCiWb8CqnkEWxMGAu3FVS5KRA2sPGbC8,23338
 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
@@ -79,8 +79,8 @@ podflow/netscape/__init__.py,sha256=SUw_BtbV3moA324UdxRECkPLv1xHkjio8r_5JTkVfxI,
 podflow/netscape/bulid_netscape.py,sha256=wmUPlDGF8G456GGyajU_6Ak5WJzsqsq4bZgPjCSTGhI,2279
 podflow/netscape/get_cookie_dict.py,sha256=laqw-eriABiLyciRLzDmistVHHWqmUM-9eEbYZzsqBQ,643
 podflow/remove/__init__.py,sha256=x1pMfpIyE6xUrmIOkdl43mbvKLwndGo5pIoOBXhJsP4,45
-podflow/remove/remove_dir.py,sha256=xQIhrnqnYjMzXjoSWaTvm7JwPYOFTN1muuTPdaLDXpQ,1099
-podflow/remove/remove_file.py,sha256=8wAJQehs-XBqvu0vPlEme2_tt0FZxc5ELwGMxXA_558,982
+podflow/remove/remove_dir.py,sha256=zqgf47UgxiGiLipb1FeoWKzrSHSxcHaEuu0261bqR1s,1105
+podflow/remove/remove_file.py,sha256=ZusvZsBQX_yRdLuboD7bZKiOX4z4Rxg66zZK9KDWHwE,1006
 podflow/repair/__init__.py,sha256=Gpc1i6xiSLodKjjmzH66c_Y1z0HQ9E9CS3p95FRnVFM,45
 podflow/repair/reverse_log.py,sha256=Wc_vAH0WB-z1fNdWx7FYaVH4caRPtot7tDwDwFhmpz4,1106
 podflow/templates/index.html,sha256=kGsp1TAcf_qkV6hYRE8Ueq7CaTflR73rsTWtjnWuwwY,2775
@@ -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=HgnqWA6W1Llonb2wPXxCeIWuZfTte7As1C8qzLSSe5c,3816
+podflow/upload/upload_files.py,sha256=sy4GOIWpHPPiqoZzrMXQVzRCNT2QwEWwsraUj3CCRwY,3891
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
 podflow/youtube/build.py,sha256=j6SVq3HFFGlNNqRrHfnBIThdzsH88PFmwLnejosif1U,12311
 podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
 podflow/youtube/login.py,sha256=KYl--ya6Z1u0uIcOp9l8i3DIIj9hsYUDH4dtJjI0MLM,1295
-podflow-20250606.dist-info/METADATA,sha256=zKC-lSx5y_drdcigYN7YXdHvD3QJSNvVCkyIIOiZDfM,14195
-podflow-20250606.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250606.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250606.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250606.dist-info/RECORD,,
+podflow-20250608.dist-info/METADATA,sha256=p_3SBZZLCDjvgy6iy3n8rRdD_glGFTLxzodyVGdIX-A,14195
+podflow-20250608.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250608.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250608.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250608.dist-info/RECORD,,