podflow 20250404.9__tar.gz → 20250406__tar.gz

{podflow-20250404.9 → podflow-20250406}/PKG-INFO

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

{podflow-20250404.9 → podflow-20250406}/podflow/basic/time_print.py

@@ -35,5 +35,5 @@ def time_print(text, Top=False, NoEnter=False, Time=True, Url=""):
         gVar.index_message["enter"] = True
     if Url:
         gVar.index_message["podflow"].append(
-            f'<a href="{Url}"><span class="ansi-url">{Url}</span></a>'
+            f'<a href="{Url}" target="_blank"><span class="ansi-url">{Url}</span></a>'
         )

{podflow-20250404.9 → podflow-20250406}/podflow/download/dl_aideo_video.py

@@ -2,6 +2,7 @@
 # coding: utf-8
 
 import os
+import re
 import ffmpeg
 import yt_dlp
 from podflow import gVar
@@ -68,22 +69,22 @@ def download_video(
             ydl.download([f"{video_website}"])  # 下载指定视频链接的视频
         return None, None
     except Exception as download_video_error:
-        fail_info = fail_message_initialize(download_video_error, video_url).replace("\n","")
+        fail_info = fail_message_initialize(download_video_error, video_url).replace(
+            "\n", ""
+        )
         remove_info = ""
-        if fail_info in [
-            "",
-            "\033[31m请求拒绝\033[0m",
-            "\033[31m数据不完整\033[0m",
-            "\033[31m传输中断\033[0m",
-            "\033[31m请求超时\033[0m",
-            "\033[31m响应超时\033[0m",
-        ] and "www.youtube.com" in video_website:
+        if (
+            fail_info == ""
+            or re.search(r"请求拒绝|数据不完整|传输中断|请求超时|响应超时", fail_info)
+        ) and "www.youtube.com" in video_website:
+            if fail_info != "":
+                remove_info = "|"
             if os.path.isfile(outtmpl):
                 os.remove(outtmpl)
-                remove_info = "|已删除失败文件"
+                remove_info += "已删除失败文件"
             elif os.path.isfile(outtmpl + ".part"):
                 os.remove(outtmpl + ".part")
-                remove_info = "|已删除部分失败文件"
+                remove_info += "已删除部分失败文件"
         write_log(
             f"{video_write_log} \033[31m下载失败\033[0m",
             None,
@@ -124,15 +125,12 @@ def dl_full_video(
         f"channel_audiovisual/{output_dir}/{video_url}{sesuffix}.{output_format}"
     )  # 获取已下载视频的实际时长
     if (
-        duration_video is not None 
-        and abs(id_duration - duration_video) <= 1
+        duration_video is not None and abs(id_duration - duration_video) <= 1
     ):  # 检查实际时长与预计时长是否一致
         return None, None
     if duration_video:
         fail_info = f"不完整({id_duration}|{duration_video}"
-        write_log(
-            f"{video_write_log} \033[31m下载失败\033[0m\n错误信息: {fail_info})"
-        )
+        write_log(f"{video_write_log} \033[31m下载失败\033[0m\n错误信息: {fail_info})")
         os.remove(
             f"channel_audiovisual/{output_dir}/{video_url}{sesuffix}.{output_format}"
         )  # 删除不完整的视频
@@ -176,7 +174,9 @@ def dl_retry_video(
             cookies = "channel_data/yt_dlp_youtube.txt"
         video_id_count += 1
         if cookies:
-            write_log(f"{video_write_log} 第\033[34m{video_id_count}\033[0m次重新下载 🍪")
+            write_log(
+                f"{video_write_log} 第\033[34m{video_id_count}\033[0m次重新下载 🍪"
+            )
         else:
             write_log(f"{video_write_log} 第\033[34m{video_id_count}\033[0m次重新下载")
         video_id_failed, _ = dl_full_video(
@@ -298,10 +298,7 @@ def dl_aideo_video(
                     audio, video, output_file, vcodec="copy", acodec="copy"
                 )
                 ffmpeg.run(stream, quiet=True)
-                time_print(
-                    " \033[32m合成成功\033[0m",
-                    Time=False
-                )
+                time_print(" \033[32m合成成功\033[0m", Time=False)
                 # 删除临时文件
                 os.remove(f"channel_audiovisual/{output_dir}/{video_url}.part.mp4")
                 os.remove(f"channel_audiovisual/{output_dir}/{video_url}.part.m4a")

{podflow-20250404.9 → podflow-20250406}/podflow/httpfs/app_bottle.py

@@ -3,6 +3,7 @@
 
 import os
 import hashlib
+import mimetypes
 import pkg_resources
 from datetime import datetime
 import cherrypy
@@ -203,7 +204,21 @@ class bottle_app:
                 # 如果文件存在, 返回文件
                 if os.path.exists(filename):  # 如果文件存在, 返回文件
                     self.print_out(filename, 200)
-                    return static_file(filename, root=".")
+                    # 设置正确的 Content-Type 头部
+                    content_type, _ = mimetypes.guess_type(filename)
+                    # 如果无法自动猜测出正确的 Content-Type，手动指定
+                    if not content_type:
+                        if filename.endswith(".xml"):
+                            content_type = "application/xml"
+                        elif filename.endswith(".m4a"):
+                            content_type = "audio/mp4"
+                        elif filename.endswith(".mp4"):
+                            content_type = "video/mp4"
+                        else:
+                            content_type = "application/octet-stream"  # 默认文件类型
+
+                    # 返回静态文件并附加正确的 Content-Type
+                    return static_file(filename, root=".", mimetype=content_type)
                 else:  # 如果文件不存在, 返回 404 错误
                     self.print_out(filename, 404)
                     abort(404, "File not found")

{podflow-20250404.9 → podflow-20250406}/podflow/main_podcast.py

@@ -210,7 +210,27 @@ def main_podcast():
             update_upload()
         else:
             time_print("频道无更新内容")
-
+        # 清空变量内数据
+        gVar.channelid_youtube_ids_update.clear()  # 需更新的YouTube频道字典
+        gVar.youtube_content_ytid_update.clear()  # 需下载YouTube视频字典
+        gVar.youtube_content_ytid_backward_update.clear()  # 向后更新需下载YouTube视频字典
+        gVar.channelid_youtube_rss.clear()  # YouTube频道最新Rss Response字典
+        gVar.channelid_bilibili_ids_update.clear()  # 需更新的哔哩哔哩频道字典
+        gVar.bilibili_content_bvid_update.clear()  # 需下载哔哩哔哩视频字典
+        gVar.channelid_bilibili_rss.clear()  # 哔哩哔哩频道最新Rss Response字典
+        gVar.bilibili_content_bvid_backward_update.clear()  # 向后更新需下载哔哩哔哩视频字典
+        gVar.video_id_failed.clear()  # YouTube&哔哩哔哩视频下载失败列表
+        gVar.video_id_update_format.clear()  # YouTube&哔哩哔哩视频下载的详细信息字典
+        gVar.hash_rss_original = ""  # 原始rss哈希值文本
+        gVar.xmls_original.clear()  # 原始xml信息字典
+        gVar.xmls_original_fail.clear()  # 未获取原始xml频道列表
+        gVar.youtube_xml_get_tree.clear()  # YouTube频道简介和图标字典
+        gVar.all_youtube_content_ytid.clear()  # 所有YouTube视频id字典
+        gVar.all_bilibili_content_bvid.clear()  # 所有哔哩哔哩视频id字典
+        gVar.all_items.clear()  # 更新后所有item明细列表
+        gVar.overall_rss = ""  # 更新后的rss文本
+        gVar.make_up_file_format.clear()  # 补全缺失媒体字典
+        gVar.make_up_file_format_fail.clear()  # 补全缺失媒体失败字典
         # 将需要更新转为否
         gVar.update_generate_rss = False
         if parse.update_num != -1:
@@ -232,5 +252,5 @@ def main_podcast():
             # 延时
             time.sleep(parse.time_delay)
     # 关闭CherryPy服务器
-    cherrypy.engine.exit()
     time_print("Podflow运行结束")
+    cherrypy.engine.exit()

{podflow-20250404.9 → podflow-20250406}/podflow/message/fail_message_initialize.py

@@ -169,4 +169,6 @@ def fail_message_initialize(message_error, video_url):
         elif mode == "regexp" and re.search(fail_info, fail_message):
             fail_message = re.sub(rf"{fail_info}", field, fail_message)
             break
+    if fail_message[0] == "\n":
+        fail_message = fail_message[1:]
     return fail_message

{podflow-20250404.9 → podflow-20250406}/podflow/templates/index.html

@@ -151,6 +151,9 @@
       overflow-x: auto; /* 当内容超出宽度时显示水平滚动条（可选） */
       overflow-y: auto;
       font-family: 'Courier New', Courier, monospace; /* 添加字体 */
+      word-break: break-word;
+      overflow-wrap: break-word;
+      white-space: pre-wrap; /* 保留换行并允许自动换行 */
     }
     textarea {
       height: 350px;
@@ -222,6 +225,11 @@
       nav {
         position: fixed;
       }
+      /* 确保页面宽度不会超出视口 */
+      body, html {
+        width: 100%;
+        overflow-x: hidden;
+      }
     }
     .message {
       padding: 0px;
@@ -276,7 +284,7 @@
     </section>
   </main>
   <script>
-    (function() {
+    (function() {    
       // 生成单个二维码的函数
       function generateQRCodeForNode(container) {
         const rootStyles = getComputedStyle(document.documentElement);
@@ -297,36 +305,10 @@
           container.textContent = 'URL 未提供';
         }
       }
-
-      // 为所有存在的二维码容器生成二维码
-      function generateQRCodes() {
-        const containers = document.querySelectorAll('.qrcode-container');
-        containers.forEach(generateQRCodeForNode);
-      }
-
-      // 利用 MutationObserver 动态监听 container 内新增的二维码容器
-      function observeQRCodes(container) {
-        const observer = new MutationObserver((mutationsList) => {
-          mutationsList.forEach(mutation => {
-            mutation.addedNodes.forEach(node => {
-              if (node.nodeType === Node.ELEMENT_NODE) {
-                if (node.classList.contains('qrcode-container')) {
-                  generateQRCodeForNode(node);
-                } else {
-                  const childContainers = node.querySelectorAll('.qrcode-container');
-                  childContainers.forEach(generateQRCodeForNode);
-                }
-              }
-            });
-          });
-        });
-        observer.observe(container, { childList: true, subtree: true });
-      }
-
+    
       // 缓存常用节点
       const menu = document.getElementById('menu');
       const toggleMenuBtn = document.getElementById('toggleMenu');
-      const mainArea = document.getElementById('main');
       const pages = {
         pageChannel: document.getElementById('pageChannel'),
         pageMessage: document.getElementById('pageMessage')
@@ -338,12 +320,9 @@
       const pasteBtn = document.getElementById('pasteBtn');
       const copyBtn = document.getElementById('copyBtn');
       const clearBtn = document.getElementById('clearBtn');
-
+    
       let pollingTimer = null;
-
-      // 监听 messageArea 内动态新增的二维码容器
-      observeQRCodes(messageArea);
-
+    
       // 菜单切换函数
       function toggleMenu() {
         menu.classList.toggle('hidden');
@@ -355,7 +334,7 @@
           toggleMenuBtn.textContent = '❮';
         }
       }
-
+    
       // 根据页面标识显示对应面板
       function showPage(pageId) {
         Object.values(pages).forEach(page => page.style.display = 'none');
@@ -366,29 +345,26 @@
             toggleMenu();
           }
           pageId === 'pageMessage' ? startMessagePolling() : stopMessagePolling();
-          if (pageId === 'pageMessage') {
-            generateQRCodes(); // 页面切换时生成已有二维码
-          }
         }
       }
-
+    
       // 初始化默认页面
       showPage('pageMessage');
-
+    
       let lastMessage = { podflow: [], http: [] };
       let userScrolled = false;
-
+    
       // 监听滚动事件，检测用户是否手动滚动
       function onUserScroll(event) {
         const element = event.target;
-        // 判断是否接近底部
+        // 判断是否接近底部，增加一定的容差值
         const nearBottom = element.scrollHeight - element.scrollTop <= element.clientHeight + 10;
         userScrolled = !nearBottom;
       }
-
+    
       messageArea.addEventListener('scroll', onUserScroll);
       messageHttp.addEventListener('scroll', onUserScroll);
-
+    
       // 轮询消息更新，更新 messageArea 与 messageHttp
       function getMessages() {
         fetch('message')
@@ -403,7 +379,7 @@
           })
           .catch(error => console.error('获取消息失败:', error));
       }
-
+    
       function createMessageElement(message) {
         const p = document.createElement('p');
         p.innerHTML = message;
@@ -411,16 +387,34 @@
         return p;
       }
 
+      function processQRCodeContainers(p) {
+        const qrContainers = p.querySelectorAll('.qrcode-container');
+        qrContainers.forEach(container => {
+          // 判断当前容器是否有 data-url 属性，并且值不为空
+          if (container.dataset.url) {
+            generateQRCodeForNode(container);
+          } else {
+            // 如果没有 data-url 或值为空，可以执行其他操作，例如输出提示信息
+            console.log('容器中未提供 URL，跳过二维码生成:', container);
+            container.textContent = '未提供二维码 URL'; // 可选：在容器中显示提示
+          }
+        });
+      }
+    
+      // 修改后的 appendMessages 函数：先生成消息节点内的二维码，再将节点追加或替换到消息容器中
       function appendMessages(container, newMessages, oldMessages) {
         // 判断当前是否在底部
-        const isAtBottom = container.scrollHeight - container.scrollTop <= container.clientHeight + 10;
-        
-        // 当两数组长度相等且有内容时，只比较最后一项
+        const wasAtBottom = container.scrollHeight - container.scrollTop <= container.clientHeight + 10;
+        // 较为简单的情况：两数组长度相同且有内容，只比较最后一项
         if (newMessages.length === oldMessages.length && newMessages.length > 0) {
           const lastNewMessage = newMessages[newMessages.length - 1];
           const lastOldMessage = oldMessages[oldMessages.length - 1];
           if (lastNewMessage !== lastOldMessage) {
+            // 先创建消息节点
             const p = createMessageElement(lastNewMessage);
+            // 在插入前先处理二维码生成
+            processQRCodeContainers(p);
+            // 替换或追加到容器中
             const lastChild = container.lastElementChild;
             if (lastChild) {
               container.replaceChild(p, lastChild);
@@ -429,11 +423,13 @@
             }
           }
         } else {
-          // 如果 newMessages 与 oldMessages 数量不一致
-          // 先替换容器中最后一项为 newMessages 中对应位置的消息（若 oldMessages 存在数据）
+          // 当 newMessages 与 oldMessages 数量不一致时
+          // 如果 oldMessages 存在数据，先替换容器中最后一项对应的消息
           if (oldMessages.length > 0) {
             const replaceIndex = oldMessages.length - 1;
             const p = createMessageElement(newMessages[replaceIndex]);
+            // 先生成二维码
+            processQRCodeContainers(p);
             const lastChild = container.lastElementChild;
             if (lastChild) {
               container.replaceChild(p, lastChild);
@@ -443,30 +439,33 @@
           }
           // 再追加从 oldMessages.length 开始的后续消息
           newMessages.slice(oldMessages.length).forEach(msg => {
-            container.appendChild(createMessageElement(msg));
+            const p = createMessageElement(msg);
+            // 先生成二维码
+            processQRCodeContainers(p);
+            // 插入容器中
+            container.appendChild(p);
           });
         }
-        
-        // 如果用户没有主动滚动，则自动滚动到底部
-        if (!userScrolled) {
+        // 如果之前在底部且用户没有主动滚动，则自动滚动到底部
+        if (wasAtBottom && !userScrolled) {
           container.scrollTop = container.scrollHeight;
         }
       }
-
+    
       function startMessagePolling() {
         getMessages();
-        pollingTimer = setInterval(getMessages, 250);
+        pollingTimer = setInterval(getMessages, 500);
       }
-
+    
       function stopMessagePolling() {
         if (pollingTimer !== null) {
           clearInterval(pollingTimer);
           pollingTimer = null;
         }
       }
-
+    
       startMessagePolling();
-
+    
       // 表单异步提交（获取 Channel-ID）
       inputForm && inputForm.addEventListener('submit', function(event) {
         event.preventDefault();
@@ -476,19 +475,19 @@
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({ content })
         })
-        .then(response => {
-          if (!response.ok) {
-            throw new Error('网络响应异常');
-          }
-          return response.json();
-        })
-        .then(data => inputOutput.value = data.response)
-        .catch(error => {
-          console.error('请求失败:', error);
-          alert('请求失败，请稍后重试！');
-        });
+          .then(response => {
+            if (!response.ok) {
+              throw new Error('网络响应异常');
+            }
+            return response.json();
+          })
+          .then(data => inputOutput.value = data.response)
+          .catch(error => {
+            console.error('请求失败:', error);
+            alert('请求失败，请稍后重试！');
+          });
       });
-
+    
       // 粘贴功能
       pasteBtn.addEventListener('click', function() {
         if (navigator.clipboard && navigator.clipboard.readText) {
@@ -509,7 +508,7 @@
           }
         }
       });
-
+    
       // 复制功能
       copyBtn.addEventListener('click', function() {
         if (navigator.clipboard && navigator.clipboard.writeText) {
@@ -527,12 +526,12 @@
           }
         }
       });
-
+    
       // 清空输入框
       clearBtn.addEventListener('click', function() {
         inputOutput.value = '';
       });
-
+    
       // 菜单项点击事件委托
       menu.addEventListener('click', function(event) {
         const target = event.target;
@@ -540,24 +539,17 @@
           showPage(target.dataset.page);
         }
       });
-
+    
       // 菜单切换按钮事件绑定
       toggleMenuBtn.addEventListener('click', toggleMenu);
-
+    
       // 针对手机端，初始化时隐藏菜单
       if (window.innerWidth <= 600) {
         menu.classList.add('hidden');
         toggleMenuBtn.style.left = '0px';
         toggleMenuBtn.textContent = '❯';
       }
-
-      // 在页面加载完成后首次生成二维码（如果当前显示的是 Channel 页面）
-      window.addEventListener('load', () => {
-        if (pages.pageChannel.style.display === 'block') {
-          generateQRCodes();
-        }
-      });
     })();
-  </script>
+    </script>    
 </body>
 </html>

{podflow-20250404.9 → podflow-20250406}/podflow.egg-info/PKG-INFO

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

{podflow-20250404.9 → podflow-20250406}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250404.9",
+    version="20250406",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",