podflow 20250301.1__tar.gz → 20250301.3__tar.gz

{podflow-20250301.1 → podflow-20250301.3}/PKG-INFO

@@ -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

{podflow-20250301.1 → podflow-20250301.3}/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-20250301.1 → podflow-20250301.3}/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-20250301.1 → podflow-20250301.3}/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 → podflow-20250301.3}/podflow.egg-info/PKG-INFO

@@ -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

{podflow-20250301.1 → podflow-20250301.3}/podflow.egg-info/requires.txt

@@ -5,6 +5,6 @@ yt-dlp>=2025.2.19
 chardet>=5.2.0
 cherrypy>=18.10.0
 requests>=2.32.3
-pycryptodomex>=3.21.0
+pycryptodome>=3.21.0
 ffmpeg-python>=0.2.0
 BeautifulSoup4>=4.13.3

{podflow-20250301.1 → podflow-20250301.3}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250301.1",
+    version="20250301.3",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",
@@ -35,7 +35,7 @@ setup(
         "chardet>=5.2.0",
         "cherrypy>=18.10.0",
         "requests>=2.32.3",
-        "pycryptodomex>=3.21.0",
+        "pycryptodome>=3.21.0",
         "ffmpeg-python>=0.2.0",
         "BeautifulSoup4>=4.13.3",
     ],