podflow 20250325__tar.gz → 20250326__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (106) hide show
  1. {podflow-20250325 → podflow-20250326}/PKG-INFO +1 -1
  2. {podflow-20250325 → podflow-20250326}/Podflow/message/get_youtube_and_bilibili_video_format.py +46 -30
  3. {podflow-20250325 → podflow-20250326}/podflow.egg-info/PKG-INFO +1 -1
  4. {podflow-20250325 → podflow-20250326}/podflow.egg-info/requires.txt +1 -1
  5. {podflow-20250325 → podflow-20250326}/setup.py +2 -2
  6. {podflow-20250325 → podflow-20250326}/Podflow/__init__.py +0 -0
  7. {podflow-20250325 → podflow-20250326}/Podflow/basic/__init__.py +0 -0
  8. {podflow-20250325 → podflow-20250326}/Podflow/basic/file_save.py +0 -0
  9. {podflow-20250325 → podflow-20250326}/Podflow/basic/folder_build.py +0 -0
  10. {podflow-20250325 → podflow-20250326}/Podflow/basic/get_duration.py +0 -0
  11. {podflow-20250325 → podflow-20250326}/Podflow/basic/get_file_list.py +0 -0
  12. {podflow-20250325 → podflow-20250326}/Podflow/basic/get_html_dict.py +0 -0
  13. {podflow-20250325 → podflow-20250326}/Podflow/basic/http_client.py +0 -0
  14. {podflow-20250325 → podflow-20250326}/Podflow/basic/list_merge_tidy.py +0 -0
  15. {podflow-20250325 → podflow-20250326}/Podflow/basic/qr_code.py +0 -0
  16. {podflow-20250325 → podflow-20250326}/Podflow/basic/split_dict.py +0 -0
  17. {podflow-20250325 → podflow-20250326}/Podflow/basic/time_format.py +0 -0
  18. {podflow-20250325 → podflow-20250326}/Podflow/basic/time_print.py +0 -0
  19. {podflow-20250325 → podflow-20250326}/Podflow/basic/time_stamp.py +0 -0
  20. {podflow-20250325 → podflow-20250326}/Podflow/basic/vary_replace.py +0 -0
  21. {podflow-20250325 → podflow-20250326}/Podflow/basic/write_log.py +0 -0
  22. {podflow-20250325 → podflow-20250326}/Podflow/bilibili/__init__.py +0 -0
  23. {podflow-20250325 → podflow-20250326}/Podflow/bilibili/build.py +0 -0
  24. {podflow-20250325 → podflow-20250326}/Podflow/bilibili/get.py +0 -0
  25. {podflow-20250325 → podflow-20250326}/Podflow/bilibili/login.py +0 -0
  26. {podflow-20250325 → podflow-20250326}/Podflow/config/__init__.py +0 -0
  27. {podflow-20250325 → podflow-20250326}/Podflow/config/build_original.py +0 -0
  28. {podflow-20250325 → podflow-20250326}/Podflow/config/channge_icon.py +0 -0
  29. {podflow-20250325 → podflow-20250326}/Podflow/config/correct_channelid.py +0 -0
  30. {podflow-20250325 → podflow-20250326}/Podflow/config/correct_config.py +0 -0
  31. {podflow-20250325 → podflow-20250326}/Podflow/config/get_channelid.py +0 -0
  32. {podflow-20250325 → podflow-20250326}/Podflow/config/get_channelid_id.py +0 -0
  33. {podflow-20250325 → podflow-20250326}/Podflow/config/get_config.py +0 -0
  34. {podflow-20250325 → podflow-20250326}/Podflow/download/__init__.py +0 -0
  35. {podflow-20250325 → podflow-20250326}/Podflow/download/convert_bytes.py +0 -0
  36. {podflow-20250325 → podflow-20250326}/Podflow/download/delete_part.py +0 -0
  37. {podflow-20250325 → podflow-20250326}/Podflow/download/dl_aideo_video.py +0 -0
  38. {podflow-20250325 → podflow-20250326}/Podflow/download/show_progress.py +0 -0
  39. {podflow-20250325 → podflow-20250326}/Podflow/download/wait_animation.py +0 -0
  40. {podflow-20250325 → podflow-20250326}/Podflow/download/youtube_and_bilibili_download.py +0 -0
  41. {podflow-20250325 → podflow-20250326}/Podflow/download_and_build.py +0 -0
  42. {podflow-20250325 → podflow-20250326}/Podflow/ffmpeg_judge.py +0 -0
  43. {podflow-20250325 → podflow-20250326}/Podflow/httpfs/__init__.py +0 -0
  44. {podflow-20250325 → podflow-20250326}/Podflow/httpfs/app_bottle.py +0 -0
  45. {podflow-20250325 → podflow-20250326}/Podflow/httpfs/browser.py +0 -0
  46. {podflow-20250325 → podflow-20250326}/Podflow/httpfs/get_channelid.py +0 -0
  47. {podflow-20250325 → podflow-20250326}/Podflow/httpfs/html.py +0 -0
  48. {podflow-20250325 → podflow-20250326}/Podflow/httpfs/port_judge.py +0 -0
  49. {podflow-20250325 → podflow-20250326}/Podflow/main.py +0 -0
  50. {podflow-20250325 → podflow-20250326}/Podflow/main_podcast.py +0 -0
  51. {podflow-20250325 → podflow-20250326}/Podflow/main_upload.py +0 -0
  52. {podflow-20250325 → podflow-20250326}/Podflow/makeup/__init__.py +0 -0
  53. {podflow-20250325 → podflow-20250326}/Podflow/makeup/del_makeup_format_fail.py +0 -0
  54. {podflow-20250325 → podflow-20250326}/Podflow/makeup/make_up_file.py +0 -0
  55. {podflow-20250325 → podflow-20250326}/Podflow/makeup/make_up_file_format_mod.py +0 -0
  56. {podflow-20250325 → podflow-20250326}/Podflow/makeup/make_up_file_mod.py +0 -0
  57. {podflow-20250325 → podflow-20250326}/Podflow/message/__init__.py +0 -0
  58. {podflow-20250325 → podflow-20250326}/Podflow/message/backup_zip_save.py +0 -0
  59. {podflow-20250325 → podflow-20250326}/Podflow/message/create_main_rss.py +0 -0
  60. {podflow-20250325 → podflow-20250326}/Podflow/message/display_qrcode_and_url.py +0 -0
  61. {podflow-20250325 → podflow-20250326}/Podflow/message/fail_message_initialize.py +0 -0
  62. {podflow-20250325 → podflow-20250326}/Podflow/message/format_time.py +0 -0
  63. {podflow-20250325 → podflow-20250326}/Podflow/message/get_media_name.py +0 -0
  64. {podflow-20250325 → podflow-20250326}/Podflow/message/get_original_rss.py +0 -0
  65. {podflow-20250325 → podflow-20250326}/Podflow/message/get_video_format.py +0 -0
  66. {podflow-20250325 → podflow-20250326}/Podflow/message/get_video_format_multithread.py +0 -0
  67. {podflow-20250325 → podflow-20250326}/Podflow/message/media_format.py +0 -0
  68. {podflow-20250325 → podflow-20250326}/Podflow/message/original_rss_fail_print.py +0 -0
  69. {podflow-20250325 → podflow-20250326}/Podflow/message/rss_create_hash.py +0 -0
  70. {podflow-20250325 → podflow-20250326}/Podflow/message/save_rss.py +0 -0
  71. {podflow-20250325 → podflow-20250326}/Podflow/message/title_correction.py +0 -0
  72. {podflow-20250325 → podflow-20250326}/Podflow/message/update_information_display.py +0 -0
  73. {podflow-20250325 → podflow-20250326}/Podflow/message/update_youtube_bilibili_rss.py +0 -0
  74. {podflow-20250325 → podflow-20250326}/Podflow/message/want_retry.py +0 -0
  75. {podflow-20250325 → podflow-20250326}/Podflow/message/xml_item.py +0 -0
  76. {podflow-20250325 → podflow-20250326}/Podflow/message/xml_original_item.py +0 -0
  77. {podflow-20250325 → podflow-20250326}/Podflow/message/xml_rss.py +0 -0
  78. {podflow-20250325 → podflow-20250326}/Podflow/netscape/__init__.py +0 -0
  79. {podflow-20250325 → podflow-20250326}/Podflow/netscape/bulid_netscape.py +0 -0
  80. {podflow-20250325 → podflow-20250326}/Podflow/netscape/get_cookie_dict.py +0 -0
  81. {podflow-20250325 → podflow-20250326}/Podflow/parse_arguments.py +0 -0
  82. {podflow-20250325 → podflow-20250326}/Podflow/remove/__init__.py +0 -0
  83. {podflow-20250325 → podflow-20250326}/Podflow/remove/remove_dir.py +0 -0
  84. {podflow-20250325 → podflow-20250326}/Podflow/remove/remove_file.py +0 -0
  85. {podflow-20250325 → podflow-20250326}/Podflow/repair/__init__.py +0 -0
  86. {podflow-20250325 → podflow-20250326}/Podflow/repair/reverse_log.py +0 -0
  87. {podflow-20250325 → podflow-20250326}/Podflow/upload/__init__.py +0 -0
  88. {podflow-20250325 → podflow-20250326}/Podflow/upload/add_upload.py +0 -0
  89. {podflow-20250325 → podflow-20250326}/Podflow/upload/build_hash.py +0 -0
  90. {podflow-20250325 → podflow-20250326}/Podflow/upload/get_upload_original.py +0 -0
  91. {podflow-20250325 → podflow-20250326}/Podflow/upload/linked_client.py +0 -0
  92. {podflow-20250325 → podflow-20250326}/Podflow/upload/linked_server.py +0 -0
  93. {podflow-20250325 → podflow-20250326}/Podflow/upload/login.py +0 -0
  94. {podflow-20250325 → podflow-20250326}/Podflow/upload/time_key.py +0 -0
  95. {podflow-20250325 → podflow-20250326}/Podflow/upload/update_upload.py +0 -0
  96. {podflow-20250325 → podflow-20250326}/Podflow/upload/upload_server.py +0 -0
  97. {podflow-20250325 → podflow-20250326}/Podflow/youtube/__init__.py +0 -0
  98. {podflow-20250325 → podflow-20250326}/Podflow/youtube/build.py +0 -0
  99. {podflow-20250325 → podflow-20250326}/Podflow/youtube/get.py +0 -0
  100. {podflow-20250325 → podflow-20250326}/Podflow/youtube/login.py +0 -0
  101. {podflow-20250325 → podflow-20250326}/README.md +0 -0
  102. {podflow-20250325 → podflow-20250326}/podflow.egg-info/SOURCES.txt +0 -0
  103. {podflow-20250325 → podflow-20250326}/podflow.egg-info/dependency_links.txt +0 -0
  104. {podflow-20250325 → podflow-20250326}/podflow.egg-info/entry_points.txt +0 -0
  105. {podflow-20250325 → podflow-20250326}/podflow.egg-info/top_level.txt +0 -0
  106. {podflow-20250325 → podflow-20250326}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: podflow
3
- Version: 20250325
3
+ Version: 20250326
4
4
  Summary: A podcast server that includes YouTube and BiliBili
5
5
  Home-page: https://github.com/gruel-zxz/podflow
6
6
  Author: gruel_zxz
@@ -9,45 +9,59 @@ from Podflow.message.media_format import media_format
9
9
  def one_format(id_update_format, id_num):
10
10
  entry_id_update_format = id_update_format[0]
11
11
  gVar.video_id_update_format[id_num]["url"] = entry_id_update_format["url"]
12
- gVar.video_id_update_format[id_num]["format"] = entry_id_update_format["duration_and_id"]
12
+ gVar.video_id_update_format[id_num]["format"] = entry_id_update_format[
13
+ "duration_and_id"
14
+ ]
13
15
  gVar.video_id_update_format[id_num]["title"] = entry_id_update_format["title"]
14
- gVar.video_id_update_format[id_num]["timestamp"] = entry_id_update_format["timestamp"]
15
- gVar.video_id_update_format[id_num]["description"] = entry_id_update_format["description"]
16
+ gVar.video_id_update_format[id_num]["timestamp"] = entry_id_update_format[
17
+ "timestamp"
18
+ ]
19
+ gVar.video_id_update_format[id_num]["description"] = entry_id_update_format[
20
+ "description"
21
+ ]
16
22
  gVar.video_id_update_format[id_num]["main"] = id_num
17
23
  gVar.video_id_update_format[id_num]["image"] = entry_id_update_format["image"]
18
24
  gVar.video_id_update_format[id_num]["download"] = entry_id_update_format["download"]
19
25
 
20
26
 
21
27
  # YouTube&哔哩哔哩视频信息模块
22
- def get_youtube_and_bilibili_video_format(id_num, stop_flag, video_format_lock, prepare_animation):
28
+ def get_youtube_and_bilibili_video_format(
29
+ id_num, stop_flag, video_format_lock, prepare_animation
30
+ ):
31
+ url = gVar.video_id_update_format[id_num]["url"]
32
+ media = gVar.video_id_update_format[id_num]["media"]
33
+ quality = gVar.video_id_update_format[id_num]["quality"]
23
34
  id_update_format = media_format(
24
- gVar.video_id_update_format[id_num]["url"],
35
+ url,
25
36
  id_num,
26
- gVar.video_id_update_format[id_num]["media"],
27
- gVar.video_id_update_format[id_num]["quality"],
37
+ media,
38
+ quality,
28
39
  gVar.video_id_update_format[id_num]["cookie"],
29
40
  )
30
- for fail_info in ["年龄限制", "需登录", "请求拒绝", "无法获取音频ID"]:
31
- if fail_info in id_update_format:
32
- if gVar.youtube_cookie:
33
- gVar.video_id_update_format[id_num]["cookie"] = "channel_data/yt_dlp_youtube.txt"
34
- id_update_format = media_format(
35
- gVar.video_id_update_format[id_num]["url"],
36
- id_num,
37
- gVar.video_id_update_format[id_num]["media"],
38
- gVar.video_id_update_format[id_num]["quality"],
39
- gVar.video_id_update_format[id_num]["cookie"],
40
- )
41
- if fail_info in id_update_format:
42
- id_update_format = f"\x1b[31m{fail_info}\x1b[0m(Cookies错误)"
43
- else:
44
- id_update_format = f"\x1b[31m{fail_info}\x1b[0m(需要Cookies)"
45
- break
46
- if gVar.video_id_update_format[id_num]["power"] is True and (
47
- "试看" in id_update_format
48
- or id_update_format == "无法获取音频ID"
41
+ if "youtube" in url:
42
+ for fail_info in ["年龄限制", "需登录", "请求拒绝", "无法获取音频ID"]:
43
+ if fail_info in id_update_format:
44
+ if gVar.youtube_cookie:
45
+ gVar.video_id_update_format[id_num][
46
+ "cookie"
47
+ ] = "channel_data/yt_dlp_youtube.txt"
48
+ id_update_format = media_format(
49
+ url,
50
+ id_num,
51
+ media,
52
+ quality,
53
+ gVar.video_id_update_format[id_num]["cookie"],
54
+ )
55
+ if fail_info in id_update_format:
56
+ id_update_format = f"\x1b[31m{fail_info}\x1b[0m(Cookies错误)"
57
+ else:
58
+ id_update_format = f"\x1b[31m{fail_info}\x1b[0m(需要Cookies)"
59
+ break
60
+ else:
61
+ if gVar.video_id_update_format[id_num]["power"] is True and (
62
+ "试看" in id_update_format or id_update_format == "无法获取音频ID"
49
63
  ):
50
- id_update_format = "\x1b[31m充电专属\x1b[0m"
64
+ id_update_format = "\x1b[31m充电专属\x1b[0m"
51
65
  if isinstance(id_update_format, list):
52
66
  if len(id_update_format) == 1:
53
67
  one_format(id_update_format, id_num)
@@ -58,8 +72,8 @@ def get_youtube_and_bilibili_video_format(id_num, stop_flag, video_format_lock,
58
72
  entrys_id.append(entry_id)
59
73
  gVar.video_id_update_format[entry_id] = {
60
74
  "id": gVar.video_id_update_format[id_num]["id"],
61
- "media": gVar.video_id_update_format[id_num]["media"],
62
- "quality": gVar.video_id_update_format[id_num]["quality"],
75
+ "media": media,
76
+ "quality": quality,
63
77
  "url": entry_id_update_format["url"],
64
78
  "name": gVar.video_id_update_format[id_num]["name"],
65
79
  "cookie": gVar.video_id_update_format[id_num]["cookie"],
@@ -70,7 +84,9 @@ def get_youtube_and_bilibili_video_format(id_num, stop_flag, video_format_lock,
70
84
  "main": id_num,
71
85
  "image": entry_id_update_format["image"],
72
86
  "download": entry_id_update_format["download"],
73
- "backward_update": gVar.video_id_update_format[id_num]["backward_update"],
87
+ "backward_update": gVar.video_id_update_format[id_num][
88
+ "backward_update"
89
+ ],
74
90
  }
75
91
  gVar.video_id_update_format[id_num] = entrys_id
76
92
  else:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: podflow
3
- Version: 20250325
3
+ Version: 20250326
4
4
  Summary: A podcast server that includes YouTube and BiliBili
5
5
  Home-page: https://github.com/gruel-zxz/podflow
6
6
  Author: gruel_zxz
@@ -1,6 +1,6 @@
1
1
  astral>=3.2
2
2
  bottle>=0.13.2
3
- yt-dlp>=2025.3.25
3
+ yt-dlp>=2025.3.26
4
4
  chardet>=5.2.0
5
5
  cherrypy>=18.10.0
6
6
  pyqrcode>=1.2.1
@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
5
5
 
6
6
  setup(
7
7
  name="podflow",
8
- version="20250325",
8
+ version="20250326",
9
9
  author="gruel_zxz",
10
10
  author_email="zhuxizhouzxz@gmail.com",
11
11
  description="A podcast server that includes YouTube and BiliBili",
@@ -30,7 +30,7 @@ setup(
30
30
  install_requires=[
31
31
  "astral>=3.2",
32
32
  "bottle>=0.13.2",
33
- "yt-dlp>=2025.3.25",
33
+ "yt-dlp>=2025.3.26",
34
34
  "chardet>=5.2.0",
35
35
  "cherrypy>=18.10.0",
36
36
  "pyqrcode>=1.2.1",
File without changes
File without changes
File without changes