podflow 20250301.1__py3-none-any.whl → 20250301.3__py3-none-any.whl

Podflow/bilibili/login.py

@@ -8,9 +8,6 @@ import re
 import time
 from datetime import datetime
 import requests
-from Cryptodome.Cipher import PKCS1_OAEP
-from Cryptodome.Hash import SHA256
-from Cryptodome.PublicKey import RSA
 from Podflow.basic.file_save import file_save
 from Podflow.basic.http_client import http_client
 from Podflow.basic.qr_code import qr_code
@@ -18,6 +15,15 @@ from Podflow.basic.time_stamp import time_stamp
 from Podflow.basic.write_log import write_log
 from Podflow.netscape.bulid_netscape import bulid_netscape
 
+try:
+    from Cryptodome.Cipher import PKCS1_OAEP
+    from Cryptodome.Hash import SHA256
+    from Cryptodome.PublicKey import RSA
+except Exception:
+    from Crypto.Cipher import PKCS1_OAEP
+    from Crypto.Hash import SHA256
+    from Crypto.PublicKey import RSA
+
 
 # 获取最新的img_key和sub_key模块
 def getWbiKeys(bilibili_cookie=None):

Podflow/download/youtube_and_bilibili_download.py

@@ -8,7 +8,7 @@ from Podflow.download.dl_aideo_video import dl_aideo_video
 
 # 下载YouTube和哔哩哔哩视频
 def youtube_and_bilibili_download():
-    for video_id, format_value in gVar.video_id_update_format.copy().items():
+    for video_id, format_value in gVar.video_id_update_format.items():
         if isinstance(format_value, dict) and format_value["main"] not in gVar.video_id_failed:
             output_dir_name = format_value["name"]
             display_color = "\033[35m" if format_value["backward_update"] else "\033[95m"
@@ -28,4 +28,4 @@ def youtube_and_bilibili_download():
                 write_log(
                     f"{display_color}{output_dir_name}\033[0m|{video_id} \033[31m无法下载\033[0m"
                 )
-        del gVar.video_id_update_format[video_id]
+            gVar.video_id_update_format[video_id]["finish"] = True

Podflow/message/create_main_rss.py

@@ -14,6 +14,7 @@ def update_output_dir():
         if (
             isinstance(format_value, dict)
             and format_value["main"] not in gVar.video_id_failed
+            and not format_value.get("finish",False)
         ):
             output_dirs.append(format_value["id"])
     return output_dirs

{podflow-20250301.1.dist-info → podflow-20250301.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250301.1
+Version: 20250301.3
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz
@@ -19,7 +19,7 @@ Requires-Dist: yt-dlp>=2025.2.19
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: cherrypy>=18.10.0
 Requires-Dist: requests>=2.32.3
-Requires-Dist: pycryptodomex>=3.21.0
+Requires-Dist: pycryptodome>=3.21.0
 Requires-Dist: ffmpeg-python>=0.2.0
 Requires-Dist: BeautifulSoup4>=4.13.3
 

{podflow-20250301.1.dist-info → podflow-20250301.3.dist-info}/RECORD

@@ -22,7 +22,7 @@ Podflow/basic/write_log.py,sha256=Sm6qzTSb1x6X2uQnnmVD4dU6BsY1PONxenwsWAdFxso,13
 Podflow/bilibili/__init__.py,sha256=ekvpCzR4bg6ar73Gq0YWQcPXND4TEqP46pb9iLyke9g,47
 Podflow/bilibili/build.py,sha256=Oeh6Cqb61F5zQWe8ohDP0QKwykAa4_I2fa-Yl6ZxkCw,7957
 Podflow/bilibili/get.py,sha256=PXPh_H8B_zP9dhqe6sA_QCeJcdnriBCpbF7mPq46xMw,20337
-Podflow/bilibili/login.py,sha256=aYKEj5re-JYXnA0aCOKUF9Cqwwd7FTOuAu_yvcaqdag,10944
+Podflow/bilibili/login.py,sha256=uWYnsMbEpxaJ5q0lRVZr2HDpXfpQVAnU-1_102dYg6Q,11093
 Podflow/config/__init__.py,sha256=BroaS1uvdLb00OQeJXc1i7QeuErD-U-2QjynQH5IDdE,45
 Podflow/config/build_original.py,sha256=tZtsGUi1rG6DH6cxaiaVQPRtIl6U0-FqOdeho7CXl0s,1809
 Podflow/config/channge_icon.py,sha256=z2tFFiP7aZFiMP1RqXkrovWAxBOI77rTHKhuzzhFfn0,5653
@@ -37,7 +37,7 @@ Podflow/download/delete_part.py,sha256=G9lK8G8tOOmnEBmAHJKPdqPeLhJ61S5m8o6iL5g9S
 Podflow/download/dl_aideo_video.py,sha256=8Y8agC4bBCpWLDE6zWfCAi0PrT_ik302XkufxgXK1z8,10001
 Podflow/download/show_progress.py,sha256=7oGzhj_frO2A1o5JeGuHn7bHtma5oPpD_IWcctIO2rs,1595
 Podflow/download/wait_animation.py,sha256=E2V3cm-10e5Iif40oU722OfzDe7YiLMbDqsjZ6dshBE,1056
-Podflow/download/youtube_and_bilibili_download.py,sha256=uHb-ZirbDXmnW_gDTmUtus6xqLy8flXwKmSkeslN_dc,1285
+Podflow/download/youtube_and_bilibili_download.py,sha256=0uuEO2ybyLlg9uOButjqFvmIkCfq6xiQ7QLV2_u4c_M,1294
 Podflow/httpfs/__init__.py,sha256=agnAtd2Xe0qfOrElKgoBattAVqUBdj79wU2e2UOpcJM,45
 Podflow/httpfs/app_bottle.py,sha256=B5rGSxSNFbrjZfmtH7GVYdHCNDZ0T_7Jxrh4_oM8-FU,9333
 Podflow/httpfs/port_judge.py,sha256=KozmaCGlMVh3E0ONekxSUstJWthhwdLK4WoJ84u1c5Q,349
@@ -48,7 +48,7 @@ Podflow/makeup/make_up_file_format_mod.py,sha256=NMG8gzp1ARSyZWZvMta3BMFPH75o1YY
 Podflow/makeup/make_up_file_mod.py,sha256=CDwgC8BKPf1o1x5U5DF8UR1gtoAEPmhknokkqGLdJWY,1075
 Podflow/message/__init__.py,sha256=SC42QCYhGwCvzvBnxiBz6L1MN-l57WHbH7PIh-UyPdI,46
 Podflow/message/backup_zip_save.py,sha256=cU1oLO68INKSlmckYNCWmdZKu51T-HNuVFSHYzA9a-8,1740
-Podflow/message/create_main_rss.py,sha256=R-8nfTp7cg1m9BfK-YGfb186iR_miMwDxszwOLFc-eQ,2946
+Podflow/message/create_main_rss.py,sha256=4nSZpw2vaQqkCtMNFHnHmbIPP2BoA9RqvLavt08CFRM,2999
 Podflow/message/display_qrcode_and_url.py,sha256=Ren6ly_W-c__FGlRxXrpNSyV16IOu-OwHDNOkzB6La0,1016
 Podflow/message/fail_message_initialize.py,sha256=J7yjPo7vaL5Ix3lHOK13DE2zZ_xmdFF9xokarajtv6E,6299
 Podflow/message/format_time.py,sha256=2Z7rPh3rrU68UoDO5fFF_ipV_SEmtotziBmBBl0mHdc,909
@@ -85,8 +85,8 @@ Podflow/youtube/__init__.py,sha256=-bdMyuw-wxoz2miVkp284amS4Qg0k7VN0JPuGF-cXlM,4
 Podflow/youtube/build.py,sha256=yy-rPBGs7H4aUjgLNyKz2HE-mjyGTs3b0FL5-KPHPM0,11650
 Podflow/youtube/get.py,sha256=dFLyiHttygqdJltwC29jD_v8wwoLynE5NUdow_0wERI,16970
 Podflow/youtube/login.py,sha256=DlS_ZG4g6CKWqS5ojE4UwFJSCSZDsXbeuDVgHtQAa4A,1380
-podflow-20250301.1.dist-info/METADATA,sha256=SIUS8ZjK2J7AvkP9BHAM5QyYSFU3YMWu3twN6VosXNo,13804
-podflow-20250301.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250301.1.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
-podflow-20250301.1.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
-podflow-20250301.1.dist-info/RECORD,,
+podflow-20250301.3.dist-info/METADATA,sha256=LPzujzOcwiO8ZJhZ_gtvTaGtOLoS-gEKp8AzBPqYiNY,13803
+podflow-20250301.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250301.3.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
+podflow-20250301.3.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
+podflow-20250301.3.dist-info/RECORD,,