podflow 20250705.1__py3-none-any.whl → 20250706__py3-none-any.whl

podflow/main_podcast.py

@@ -35,9 +35,9 @@ from podflow.message.original_rss_fail_print import original_rss_fail_print
 from podflow.message.update_information_display import update_information_display
 from podflow.message.update_youtube_bilibili_rss import update_youtube_bilibili_rss
 
-# 登录模块
+# 登录与校验模块
 from podflow.bilibili.login import get_bilibili_data
-from podflow.youtube.login import get_youtube_cookie
+from podflow.youtube.check import check_youtube_cookie
 
 # 配置和图标模块
 from podflow.config.channge_icon import channge_icon
@@ -120,8 +120,8 @@ def main_podcast():
         progress_update(0, refresh=1)
         # 暂停进程打印
         gVar.server_process_print_flag[0] = "pause"
-        # 获取YouTube cookie
-        gVar.youtube_cookie = get_youtube_cookie(gVar.channelid_youtube_ids_original)
+        # 校验YouTube cookie
+        gVar.youtube_cookie = check_youtube_cookie(gVar.channelid_youtube_ids_original)
         progress_update(0.01, num=0.0049)
         # 更新哔哩哔哩data
         gVar.channelid_bilibili_ids, gVar.bilibili_data = get_bilibili_data(

podflow/youtube/check.py

@@ -0,0 +1,71 @@
+# podflow/youtube/__init__.py
+# coding: utf-8
+
+import os
+import yt_dlp
+from podflow.basic.write_log import write_log
+from podflow.basic.time_print import time_print
+
+
+# yt-dlp校验cookie模块
+def yt_dlp_check(file, url):
+    parts = file.split("/")
+    if not os.path.exists(file):
+        time_print(f"{parts[-1]}文件不存在")
+        return False
+
+    class MyLogger:
+        def debug(self, msg):
+            pass
+        def warning(self, msg):
+            pass
+        def info(self, msg):
+            pass
+        def error(self, msg):
+            pass
+
+    ydl_opts = {
+        "cookiefile": file,
+        "quiet": True,
+        "no_warnings": True,
+        "flat_playlist": True,
+        "extract_flat": True,
+        "logger": MyLogger(),
+    }
+    try:
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info_dict = ydl.extract_info(url, download=False)
+        playlist_id = info_dict.get("id", "")
+        if playlist_id == "WL":
+            return True
+        else:
+            time_print("cookie校验返回异常")
+            return False
+    except yt_dlp.utils.DownloadError as e:
+        error_message = str(e).lower()
+        if any(
+            keyword in error_message
+            for keyword in ["login required", "sign in", "private", "forbidden"]
+        ):
+            time_print(f"cookie无效或已过期\n{e}")
+        else:
+            time_print(f"cookie无效或网络异常\n{e}")
+        return False
+    except Exception as e:
+        time_print(f"cookie发生未知错误\n{e}")
+        return False
+
+
+# 校验YouTube cookie模块
+def check_youtube_cookie(channelid_youtube_ids):
+    if not channelid_youtube_ids:
+        return False
+    youtube_cookie = yt_dlp_check(
+        "channel_data/yt_dlp_youtube.txt",
+        "https://www.youtube.com/playlist?list=WL",
+    )
+    if youtube_cookie:
+        time_print("YouTube \033[32m校验cookie成功\033[0m")
+    else:
+        write_log("YouTube \033[31m校验cookie失败\033[0m")
+    return youtube_cookie

podflow/youtube/login.py

@@ -1,11 +1,43 @@
 # podflow/youtube/login.py
 # coding: utf-8
 
+
+from http.cookiejar import LoadError, MozillaCookieJar
 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
+
+
+# 更新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
+
+
+# 将Netscape转Dict模块
+def get_cookie_dict(file):
+    parts = file.split("/")
+    try:
+        # 加载Netscape格式的cookie文件
+        cookie_jar = MozillaCookieJar(file)
+        cookie_jar.load(ignore_discard=True)
+        return {cookie.name: cookie.value for cookie in cookie_jar}
+    except FileNotFoundError:
+        time_print(f"{parts[-1]}文件不存在")
+        return None
+    except LoadError:
+        time_print(f"{parts[-1]}文件错误")
+        return None
 
 
 def get_youtube_cookie_fail(arg0):

{podflow-20250705.1.dist-info → podflow-20250706.dist-info}/METADATA

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

{podflow-20250705.1.dist-info → podflow-20250706.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=8lCQqZ5vP5su1pLKcPu65yJRnty1CqPKfDNJyvYU76M,12977
+podflow/main_podcast.py,sha256=gH2ERZjZpPqaUnTajwGxnjMyV7dlrXyM7WJFoFXH3i4,12990
 podflow/main_upload.py,sha256=VOihPtjr37lxRNEr2cJp70DB6W5q7lHvpanApFKA9qE,2595
 podflow/parse_arguments.py,sha256=h3a7EaRZS04kNMFYbxTW9Ch29KgZ7dyS-yqEEt_etQI,2592
 podflow/basic/__init__.py,sha256=CAfI6mVQtz7KKbAiTIZ9_IbvaTXeAqxR1U7ov9GDoDo,44
@@ -78,8 +78,6 @@ podflow/message/xml_original_item.py,sha256=mlORI0p6aSLP6PWIAuvI4uVN0JbxUDZX5-U5
 podflow/message/xml_rss.py,sha256=ogCteSUXyJJXLhOE7-ZBcRdWYzrRr2Qykjt3oppRpC4,1679
 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
@@ -107,10 +105,11 @@ podflow/upload/upload_files.py,sha256=vI0sSjCxUILlu0K9doMLJpmR7KrqhMRsCJmcWrCKlA
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
 podflow/youtube/build.py,sha256=j6SVq3HFFGlNNqRrHfnBIThdzsH88PFmwLnejosif1U,12311
+podflow/youtube/check.py,sha256=VUu2h7o4p2yZ7sFLtHRmxojURbgwqQUgYVNPeyhZ0wc,2009
 podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
-podflow/youtube/login.py,sha256=WGSa17wuTZPzkvra1Cx4rSrFcCFw1E_lw8fo8FYrl54,1830
-podflow-20250705.1.dist-info/METADATA,sha256=eZPo_pp2hOCaXUzCikQDZsmK4BbT2WYZTsuDNCkWQoI,14197
-podflow-20250705.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250705.1.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250705.1.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250705.1.dist-info/RECORD,,
+podflow/youtube/login.py,sha256=pDJNgCJdLOKV02yGot_5JJ-962JACbWZ-GlISmDfgIk,2742
+podflow-20250706.dist-info/METADATA,sha256=euTyT4mYua63OHU-BSgOkAn-XFTNASWnVrN2dIIOmNo,14195
+podflow-20250706.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250706.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250706.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250706.dist-info/RECORD,,

podflow/netscape/get_cookie_dict.py

@@ -1,21 +0,0 @@
-# podflow/Netscape/get_cookie_dict.py
-# coding: utf-8
-
-from http.cookiejar import LoadError, MozillaCookieJar
-from podflow.basic.time_print import time_print
-
-
-# 将Netscape转Dict模块
-def get_cookie_dict(file):
-    parts = file.split("/")
-    try:
-        # 加载Netscape格式的cookie文件
-        cookie_jar = MozillaCookieJar(file)
-        cookie_jar.load(ignore_discard=True)
-        return {cookie.name: cookie.value for cookie in cookie_jar}
-    except FileNotFoundError:
-        time_print(f"{parts[-1]}文件不存在")
-        return None
-    except LoadError:
-        time_print(f"{parts[-1]}文件错误")
-        return None

podflow/netscape/update_netscape.py

@@ -1,20 +0,0 @@
-# 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