podflow 20250701__py3-none-any.whl → 20250705__py3-none-any.whl

podflow/__init__.py

@@ -117,10 +117,11 @@ class Application_gVar:
         self.make_up_file_format = {}  # 补全缺失媒体字典
         self.make_up_file_format_fail = {}  # 补全缺失媒体失败字典
 
-        self.upload_original = []  # 原始上传信息字典
+        self.upload_original = []  # 原始上传信息列表
         self.upload_data = {}  # 上传用户账号密码字典
         self.upload_json = {}  # 上传登陆账号密码字典
         self.upload_stop = False  # 上传停止布尔值
+        self.upload_message = []  # 上传用户媒体信息列表
 
         self.shortcuts_url = {}  # 输出至shortcut的url字典
 

podflow/httpfs/app_bottle.py

@@ -21,6 +21,7 @@ from podflow.upload.time_key import check_time_key
 from podflow.basic.folder_build import folder_build
 from podflow.httpfs.get_channelid import get_channelid
 from podflow.basic.random_sequence import random_sequence
+from podflow.upload.store_users_info import store_users_info
 
 
 class bottle_app:
@@ -391,11 +392,23 @@ class bottle_app:
                     }
                 # 获取实际的文件句柄
                 uploadfile_obj = upload_file.file
+                # 去除临时文件模块
+                def close_file():
+                    if (
+                        upload_file
+                        and hasattr(upload_file, "file")
+                        and not upload_file.file.closed
+                    ):
+                        try:
+                            upload_file.file.close()
+                        except Exception:
+                            pass
                 # 判断文件是否完整
                 uploadfile_obj.seek(0)  # 确保从文件开头计算哈希
                 uploadfile_hash = build_hash(uploadfile_obj)
                 if upload_hash != uploadfile_hash:
                     self.print_out("upload", 401)
+                    close_file()
                     return {
                         "code": -5,
                         "message": "Incomplete File",  # 文件不完整
@@ -418,6 +431,8 @@ class bottle_app:
                                 original_file.seek(0)
                                 if upload_hash == build_hash(original_file):
                                     self.print_out("upload same", 200)
+                                    store_users_info(username,filename)
+                                    close_file()
                                     return {
                                         "code": 1,
                                         "message": "The Same File Exists",  # 相同文件已存在
@@ -437,6 +452,8 @@ class bottle_app:
                         )  # 传递文件对象
                         # 打印成功信息并返回成功码
                         self.print_out("upload", 200)
+                        store_users_info(username,filename)
+                        close_file()
                         return {
                             "code": 0,
                             "message": "Upload Success",  # 上传成功
@@ -458,7 +475,10 @@ class bottle_app:
                     and hasattr(upload_file, "file")
                     and not upload_file.file.closed
                 ):
-                    upload_file.file.close()
+                    try:
+                        upload_file.file.close()
+                    except Exception:
+                        pass
         else:
             num = 0
             while True:
@@ -475,6 +495,7 @@ class bottle_app:
                             original_file.seek(0)
                             if upload_hash == build_hash(original_file):
                                 self.print_out("upload same", 200)
+                                store_users_info(username,filename)
                                 return {
                                     "code": 1,
                                     "message": "The Same File Exists",  # 相同文件已存在

podflow/main_podcast.py

@@ -279,7 +279,7 @@ def main_podcast():
         gVar.overall_rss = ""  # 更新后的rss文本
         gVar.make_up_file_format.clear()  # 补全缺失媒体字典
         gVar.make_up_file_format_fail.clear()  # 补全缺失媒体失败字典
-        gVar.upload_original.clear()  # 原始上传信息字典
+        gVar.upload_original.clear()  # 原始上传信息列表
         # 将需要更新转为否
         gVar.update_generate_rss = False
         if parse.update_num != -1:

podflow/main_upload.py

@@ -21,7 +21,7 @@ def main_upload():
     os.makedirs(new_tmp_dir, exist_ok=True) # 确保目录存在
     os.environ['TMPDIR'] = new_tmp_dir
     time_print(f"临时文件目录已设置为: {os.environ['TMPDIR']}")
-    # 获取账号密码
+    # 获取账号密码及信息
     get_login()
     # 服务发现相关配置
     broadcast_port = 37001  # 服务发现用端口

podflow/netscape/update_netscape.py

@@ -0,0 +1,20 @@
+# podflow/netscape/update_netscape.py
+# coding: utf-8
+
+from http.cookiejar import MozillaCookieJar
+
+
+# 更新Netscape_HTTP_Cookie模块
+def update_netscape(response_cookies, file: str):
+    netscape_cookie_jar = MozillaCookieJar(file)
+    try:
+        netscape_cookie_jar.load(ignore_discard=True, ignore_expires=True)
+    except Exception:
+        return False
+    for cookie in response_cookies:
+        netscape_cookie_jar.set_cookie(cookie)
+    try:
+        netscape_cookie_jar.save(ignore_discard=True, ignore_expires=True)
+        return True
+    except Exception:
+        return False

podflow/templates/css/index.css

@@ -239,6 +239,20 @@ button:hover {
   color: var(--button-hover);
 }
 
+/* 版本号样式 */
+#version-info {
+  position: fixed; /* 固定定位，相对于视口 */
+  top: 10px;    /* 距离底部 10px */
+  right: 10px;     /* 距离右侧 10px */
+  font-size: 12px; /* 字体大小 */
+  color: var(--secondary-text); /* 使用定义的次要文本颜色 */
+  background-color: var(--bg-color); /* 背景颜色，确保在不同模式下可见 */
+  padding: 5px 8px; /* 内边距 */
+  border-radius: 5px; /* 圆角 */
+  z-index: 1001; /* 确保在其他内容之上 */
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); /* 轻微的阴影效果 */
+}
+
 /* 手机端优化 */
 @media (max-width: 600px) {
   #messageArea, textarea {
@@ -255,6 +269,12 @@ button:hover {
     width: 100%;
     overflow-x: hidden;
   }
+  #version-info {
+    top: 5px; /* 在手机上可以更靠近底部 */
+    right: 5px;  /* 在手机上可以更靠近右侧 */
+    font-size: 10px; /* 手机上字体可以更小 */
+    padding: 3px 6px;
+  }
 }
 .message {
   padding: 0px;

podflow/templates/index.html

@@ -65,6 +65,11 @@
     </section>
 
   </main>
+
+  <div id="version-info">
+    Version: 1.0.2
+  </div>
+
   <script src="/templates/js/index.js"></script>
   <script src="/templates/js/qrcode.min.js"></script>
   <script src="/templates/js/config.js"></script>

podflow/upload/find_media_index.py

@@ -0,0 +1,10 @@
+# podflow/upload/find_media_index.py
+# coding: utf-8
+
+
+# 查找位置模块
+def find_media_index(upload_original, target_media_id):
+    for index, item in enumerate(upload_original):
+        if item.get("media_id") == target_media_id:
+            return index  # 返回找到的索引
+    return -1

podflow/upload/login.py

@@ -20,6 +20,12 @@ def get_login():
         gVar.upload_data = json.loads(upload_data)
     except Exception:
         file_save(gVar.upload_data, "upload_login.json", "channel_data")
+    try:
+        with open("channel_data/upload_message.json", "r") as file:
+            upload_message = file.read()
+        gVar.upload_message = json.loads(upload_message)
+    except Exception:
+        file_save(gVar.upload_message, "upload_message.json", "channel_data")
 
 
 def create():

podflow/upload/store_users_info.py

@@ -0,0 +1,22 @@
+# podflow/upload/store_users_info.py
+# coding: utf-8
+
+from podflow import gVar
+from podflow.basic.file_save import file_save
+from podflow.upload.find_media_index import find_media_index
+
+
+def store_users_info(username,filename):
+    index = find_media_index(gVar.upload_message, filename)
+    if index == -1:
+        gVar.upload_message.append(
+            {
+                "media_id": filename,
+                "users": [username]
+            }
+        )
+    elif username not in gVar.upload_message[index]["users"]:
+        gVar.upload_message[index]["users"].append(username)
+    else:
+        return
+    file_save(gVar.upload_message, "upload_message.json", "channel_data")

podflow/upload/upload_files.py

@@ -5,6 +5,7 @@ from podflow import gVar
 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
+from podflow.upload.find_media_index import find_media_index
 
 
 # 上传文件模块
@@ -53,14 +54,6 @@ def upload_file(
     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:
-            return index  # 返回找到的索引
-    return -1
-
-
 # 过滤和排序上传媒体模块
 def filter_and_sort_media(media_list):
     filtered_sorted = sorted(

podflow/youtube/login.py

@@ -5,6 +5,7 @@ from podflow.basic.write_log import write_log
 from podflow.basic.time_print import time_print
 from podflow.basic.http_client import http_client
 from podflow.netscape.get_cookie_dict import get_cookie_dict
+from podflow.netscape.update_netscape import update_netscape
 
 
 def get_youtube_cookie_fail(arg0):
@@ -26,7 +27,17 @@ def get_youtube_cookie(channelid_youtube_ids):
     ):
         html_content = response.text
         if '"LOGGED_IN":true' in html_content:
-            time_print("YouTube \033[32m获取cookie成功\033[0m")
+            updata_data = update_netscape(
+                response.cookies,
+                "channel_data/yt_dlp_youtube.txt",
+            )
+            if updata_data:
+                time_print("YouTube \033[32m获取cookie成功\033[0m")
+            else:
+                return get_youtube_cookie_fail("更新YouTube cookie失败")
+            new_youtube_cookie = response.cookies.get_dict()
+            for my_cookie_name, my_cookie_value in new_youtube_cookie.items():
+                youtube_cookie[my_cookie_name] = my_cookie_value
             return youtube_cookie
         elif '"LOGGED_IN":false' in html_content:
             return get_youtube_cookie_fail("登陆YouTube失败")

{podflow-20250701.dist-info → podflow-20250705.dist-info}/METADATA

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

{podflow-20250701.dist-info → podflow-20250705.dist-info}/RECORD

@@ -1,9 +1,9 @@
-podflow/__init__.py,sha256=mquu8BdWK9V4dDObCCfnPodeXOPkz-kj8_RNB7kK3Ys,7628
+podflow/__init__.py,sha256=hpC5LyzhH6gYwn2DRHUBjQY4eHADFA5oIDztzhES-Ew,7695
 podflow/download_and_build.py,sha256=x7S7N26B1G9Yn2yr7YthDJgKUwEKBLtHBLlaqpofLas,746
 podflow/ffmpeg_judge.py,sha256=wM49pPXOFwFAA_8TKHal5fV6ka9sAA87yGQMDOssvXo,1340
 podflow/main.py,sha256=7zWdpw80jqPaYu1Un1nPqaZoiAb7Dqg8zaF-cUioU4c,755
-podflow/main_podcast.py,sha256=J2maKB-SRwHhOniVURKyp1zrqE6-ypkTmKQSZy4u6RE,12977
-podflow/main_upload.py,sha256=xuN15GAXokl2xzZrraLeusevl0j-TnHVziL0wobsBZc,2586
+podflow/main_podcast.py,sha256=8lCQqZ5vP5su1pLKcPu65yJRnty1CqPKfDNJyvYU76M,12977
+podflow/main_upload.py,sha256=VOihPtjr37lxRNEr2cJp70DB6W5q7lHvpanApFKA9qE,2595
 podflow/parse_arguments.py,sha256=h3a7EaRZS04kNMFYbxTW9Ch29KgZ7dyS-yqEEt_etQI,2592
 podflow/basic/__init__.py,sha256=CAfI6mVQtz7KKbAiTIZ9_IbvaTXeAqxR1U7ov9GDoDo,44
 podflow/basic/file_save.py,sha256=6vu4EkbsN4df5-ci6sJOgIOUEhh-WaRBOyMJ8rpouXo,1233
@@ -41,7 +41,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=f0bPGGVGSMabIaURmWeXwRT9k_rG3-akq6V6Ql9zrWU,27978
+podflow/httpfs/app_bottle.py,sha256=RunI3OVcYelgTk8lkYRJwwF8O2RxHOurih7Xn1RBPxo,28885
 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,35 +79,38 @@ podflow/message/xml_rss.py,sha256=ogCteSUXyJJXLhOE7-ZBcRdWYzrRr2Qykjt3oppRpC4,16
 podflow/netscape/__init__.py,sha256=SUw_BtbV3moA324UdxRECkPLv1xHkjio8r_5JTkVfxI,47
 podflow/netscape/bulid_netscape.py,sha256=wmUPlDGF8G456GGyajU_6Ak5WJzsqsq4bZgPjCSTGhI,2279
 podflow/netscape/get_cookie_dict.py,sha256=laqw-eriABiLyciRLzDmistVHHWqmUM-9eEbYZzsqBQ,643
+podflow/netscape/update_netscape.py,sha256=b7RL0Rm0pSOyRH9-sgflqtzB8EoyPhSFJgQTSfjFsy4,592
 podflow/remove/__init__.py,sha256=x1pMfpIyE6xUrmIOkdl43mbvKLwndGo5pIoOBXhJsP4,45
 podflow/remove/remove_dir.py,sha256=zqgf47UgxiGiLipb1FeoWKzrSHSxcHaEuu0261bqR1s,1105
 podflow/remove/remove_file.py,sha256=ZusvZsBQX_yRdLuboD7bZKiOX4z4Rxg66zZK9KDWHwE,1006
 podflow/remove/remove_flush.py,sha256=HWCe5SjNJ3VXaXbgFtqGdTXeJ1R2vv5qllNilB-G0_g,1851
 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
+podflow/templates/index.html,sha256=6GS2aq_mJBnI3STK_FsjNQY8xrMk3wxYBx3TtJ_qq28,2831
 podflow/templates/css/config.css,sha256=-xjFlrbP2BAeTYTLs2M2u-4--klwSSC7HE2av58QUF0,5224
-podflow/templates/css/index.css,sha256=dgrlonF2BYdAtIFYpDChvSBnXAndbdoyY6c2ysOgdL0,9641
+podflow/templates/css/index.css,sha256=wibmhsKu-jlnX6dbxMExlvO1Lbx2kw_TEbVGomyXd7M,10424
 podflow/templates/js/config.js,sha256=VZmpvtQWszofoccjJZNhbjvNkpl-CjGOdTrPkI83ND4,43634
 podflow/templates/js/index.js,sha256=GUfFhZM3vjiwfJ7USQZIIv5c7cyZwt64QZt0VInq5TI,34051
 podflow/templates/js/qrcode.min.js,sha256=xUHvBjJ4hahBW8qN9gceFBibSFUzbe9PNttUvehITzY,19927
 podflow/upload/__init__.py,sha256=AtOSXDrE5EjUe3z-iBd1NTDaH8n_X9qA5WXdBLkONjA,45
 podflow/upload/add_upload.py,sha256=LloIucGJSXARhxiWerAbJVW-FpTkTUxvYCAKPbl93Ew,1536
 podflow/upload/build_hash.py,sha256=9opa3xLd7nJbGGX5xa3uuKPS6dxlbkAb87ZdEiUxmxI,473
+podflow/upload/find_media_index.py,sha256=HAtKkp0e-mjqjyLv1jgxXcNlNYvz-RD_kWvGkFdLygY,299
 podflow/upload/get_upload_original.py,sha256=TEDnRutumm2FZNIesPJIlExHyKWpfB3ZAHb3sZt7V6A,4312
 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/login.py,sha256=WwQoPCr1oSGZh6wEsEuUH5E8-PEYS_k36b-Qfe00rjY,4282
+podflow/upload/store_users_info.py,sha256=nnAUgPUStYR48ma1B8mtY9SFOr3rOGvnlCuKSNdee3M,679
 podflow/upload/time_key.py,sha256=6jZ3cxUjzj_umYDwH27R0YNZlLXxfhNp-CqV_K22wlo,967
 podflow/upload/update_upload.py,sha256=tolV9WMRFg9KqdGSSC37REBy4N_f-d3GvCihciMlOlg,3456
-podflow/upload/upload_files.py,sha256=zKMv27cqj7u-c8dHKNZx67UNx0gkMkQAnu2oxnk6a5M,5749
+podflow/upload/upload_files.py,sha256=vI0sSjCxUILlu0K9doMLJpmR7KrqhMRsCJmcWrCKlA0,5564
 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-20250701.dist-info/METADATA,sha256=8Ea-bk1KpDHAD179t_i8ooFe7KBcMPA--JqBHdvv1Co,14195
-podflow-20250701.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250701.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250701.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250701.dist-info/RECORD,,
+podflow/youtube/login.py,sha256=WGSa17wuTZPzkvra1Cx4rSrFcCFw1E_lw8fo8FYrl54,1830
+podflow-20250705.dist-info/METADATA,sha256=xzWFm-eXaTeNz14CvbP05GcgKCcyMv8-OPaBqRMiN34,14195
+podflow-20250705.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250705.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250705.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250705.dist-info/RECORD,,