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

podflow/__init__.py

@@ -119,6 +119,8 @@ class Application_gVar:
 
         self.upload_original = []  # 原始上传信息字典
         self.upload_data = {}  # 上传用户账号密码字典
+        self.upload_json = {}  # 上传登陆账号密码字典
+        self.upload_stop = False  # 上传停止布尔值
 
         self.shortcuts_url = {}  # 输出至shortcut的url字典
 

podflow/download_and_build.py

@@ -2,6 +2,8 @@
 # coding: utf-8
 
 import threading
+from podflow import gVar
+from podflow.upload.upload_files import all_upload
 from podflow.youtube.build import get_youtube_introduction
 from podflow.message.create_main_rss import create_main_rss
 from podflow.download.youtube_and_bilibili_download import youtube_and_bilibili_download
@@ -10,15 +12,19 @@ from podflow.download.youtube_and_bilibili_download import youtube_and_bilibili_
 def get_and_duild():
     get_youtube_introduction()
     create_main_rss()
+    gVar.upload_stop = True  # 停止上传线程
 
 
 # 下载并构建YouTube和哔哩哔哩视频模块
 def download_and_build():
     thread_download = threading.Thread(target=youtube_and_bilibili_download)
     thread_build = threading.Thread(target=get_and_duild)
+    thread_upload = threading.Thread(target=all_upload)
 
     thread_download.start()
     thread_build.start()
+    thread_upload.start()
 
     thread_download.join()
     thread_build.join()
+    thread_upload.join()

podflow/httpfs/app_bottle.py

@@ -343,6 +343,7 @@ class bottle_app:
         if not upload_file:
             # 打印错误信息并返回错误码
             self.print_out("upload", 404)
+            upload_file.file.close()
             return {
                 "code": -4,
                 "message": "No File Provided",  # 没有上传文件
@@ -353,6 +354,7 @@ class bottle_app:
         uploadfile_hash = build_hash(uploadfile)
         if upload_hash != uploadfile_hash:
             self.print_out("upload", 401)
+            upload_file.file.close()
             return {
                 "code": -5,
                 "message": "Incomplete File",  # 文件不完整
@@ -361,6 +363,7 @@ class bottle_app:
         if not channelid:
             # 打印错误信息并返回错误码
             self.print_out("upload", 404)
+            upload_file.file.close()
             return {
                 "code": -6,
                 "message": "ChannelId Does Not Exist",  # 频道ID不存在
@@ -371,8 +374,9 @@ class bottle_app:
         suffix = filename.split(".")[1]
         if suffix not in ["mp4", "m4a"]:
             self.print_out("upload", 404)
+            upload_file.file.close()
             return {
-                "code": -6,
+                "code": -7,
                 "message": "File Format Error",  # 文件格式错误
             }
         address = f"channel_audiovisual/{channelid}"
@@ -389,6 +393,7 @@ class bottle_app:
                     original_file.seek(0)
                     if upload_hash == build_hash(original_file):
                         self.print_out("upload", 200)
+                        upload_file.file.close()
                         return {
                             "code": 1,
                             "message": "The Same File Exists",  # 相同文件已存在
@@ -403,6 +408,7 @@ class bottle_app:
                 file_save(uploadfile, filename, address, True)
                 # 打印成功信息并返回成功码
                 self.print_out("upload", 200)
+                upload_file.file.close()
                 return {
                     "code": 0,
                     "message": "Upload Success",  # 上传成功

podflow/main_podcast.py

@@ -141,6 +141,8 @@ def main_podcast():
         if upload_url:
             upload_json = login_upload(upload_url)
             if upload_json:
+                gVar.upload_json = upload_json
+            else:
                 gVar.config["upload"] = False
         else:
             gVar.config["upload"] = False

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

@@ -1,7 +1,6 @@
 # podflow/upload/upload_files.py
 # coding: utf-8
 
-import time
 from datetime import datetime
 from podflow import gVar
 from podflow.httpfs.to_html import ansi_to_html
@@ -25,7 +24,7 @@ def upload_file(username, password, channelid, filename):
         }
         if response := http_client(
             url="http://10.0.3.231:5000/upload",
-            name="1",
+            name="",
             data=data,
             mode="post",
             file=file,
@@ -44,17 +43,14 @@ 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天前的时间戳
+# 过滤和排序上传媒体模块
+def filter_and_sort_media(media_list):
     filtered_sorted = sorted(
         (
             item
             for item in media_list
             if not item["upload"]
             and not item["remove"]
-            and item["media_time"] < one_month_ago
         ),
         key=lambda x: x["media_time"],
     )
@@ -65,12 +61,24 @@ def filter_and_sort_media(media_list, day):
     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")
+    result = {
+        0: "",
+        1: "存在相同文件",
+        -2: "用户名错误",
+        -3: "密码错误",
+        -4: "上传文件为空",
+        -5: "文件不完整",
+        -6: "频道ID不存在",
+        -7: "文件格式有误",
+    }
+    name = filename.split(".")[0]
     if response:
         code = response.get("code")
         data = response.get("data", {})
@@ -82,11 +90,28 @@ def record_upload(username, password, channelid, 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}"
+                    gVar.upload_original[index]["filename"] = filename
+        if code == 0:
+            bottle_text = "\033[32m上传成功\033[0m"
+        elif code == 1:
+            bottle_text = f"\033[33m上传成功\033[0m: {result.get(code, message)}"
+        else:
+            bottle_text = f"\033[31m上传失败\033[0m: {result.get(code, message)}"
     else:
-        bottle_text = f"{now_time}|{channelname}/{filename} Upload Failed"
+        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():
+    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"])
+            if gVar.upload_stop:
+                break

{podflow-20250604.dist-info → podflow-20250606.1.dist-info}/METADATA

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

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

@@ -1,8 +1,8 @@
-podflow/__init__.py,sha256=KdCh8mDeRDjjtdHQUzg025Qnpw8UGgrHdboFvkjOAm4,7506
-podflow/download_and_build.py,sha256=GKQ1uX8Nuwdhr4wgnGr3jP1Mu0llRUPFcboQ3S05WkU,671
+podflow/__init__.py,sha256=mquu8BdWK9V4dDObCCfnPodeXOPkz-kj8_RNB7kK3Ys,7628
+podflow/download_and_build.py,sha256=UPFTc8XjBEkg3GnCt3zkNjCzSbHugS3O8AreaWIgHJ0,904
 podflow/ffmpeg_judge.py,sha256=wM49pPXOFwFAA_8TKHal5fV6ka9sAA87yGQMDOssvXo,1340
 podflow/main.py,sha256=Cz2E33-Kcc_1_oxNs4Z1OoqJYhonmClsrtoCW1oQmZA,739
-podflow/main_podcast.py,sha256=D1eBxeGNks0q8_zhVG2uUuE1pBcPEXGDAfd1CwAtuOs,12321
+podflow/main_podcast.py,sha256=SSFIg73JLu3wS5E3WAo8OAgXG4r_CHsPT-XSga0Vzrg,12386
 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
@@ -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=UhUIpkI4afz6fXrvXH8a-hYBmjXH8WJuNIcvnCtSIrQ,21465
+podflow/httpfs/app_bottle.py,sha256=po0yxEvXp6kYupJdaVTR7b-4t-Dv7C-E8D6IOwu9sNU,21703
 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=f6ME5t4shs1XB_aqO5tFYbJNqEOTzGkceZ2dF1m7cl4,3072
+podflow/upload/upload_files.py,sha256=0IHVWtf-S2m3UekIFJyIT89lk7mHvTHzAP_CavCDonE,3887
 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-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,,
+podflow-20250606.1.dist-info/METADATA,sha256=GHtoxpy5Mpw8WYSwEom-YA2WxWbzgKXVk2Hxf6dtPPE,14197
+podflow-20250606.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250606.1.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250606.1.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250606.1.dist-info/RECORD,,