podflow 20250331.3__tar.gz → 20250401.1__tar.gz

{podflow-20250331.3 → podflow-20250401.1}/PKG-INFO

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

{podflow-20250331.3 → podflow-20250401.1}/podflow/basic/time_print.py

@@ -3,7 +3,7 @@
 
 from datetime import datetime
 from podflow import gVar
-from podflow.httpfs.ansi_to_html import ansi_to_html
+from podflow.httpfs.to_html import ansi_to_html
 
 
 def time_print(text, Top=False, NoEnter=False, Time=True):
@@ -17,10 +17,10 @@ def time_print(text, Top=False, NoEnter=False, Time=True):
         print(text)
     text = ansi_to_html(text)
     if not gVar.index_message["enter"] and gVar.index_message["podflow"]:
-        if Top:
-            gVar.index_message["podflow"][0] = text
+        if Top and gVar.index_message["podflow"]:
+            gVar.index_message["podflow"][-1] = text
         else:
-            gVar.index_message["podflow"][0] += (text)
+            gVar.index_message["podflow"][-1] += (text)
     else:
         gVar.index_message["podflow"].append(text)
     if NoEnter:

{podflow-20250331.3 → podflow-20250401.1}/podflow/basic/write_log.py

@@ -4,7 +4,7 @@
 import re
 from datetime import datetime
 from podflow import gVar
-from podflow.httpfs.ansi_to_html import ansi_to_html
+from podflow.httpfs.to_html import ansi_to_html
 
 
 # 日志模块

{podflow-20250331.3 → podflow-20250401.1}/podflow/httpfs/app_bottle.py

@@ -13,7 +13,7 @@ from podflow.basic.file_save import file_save
 from podflow.basic.write_log import write_log
 from podflow.upload.build_hash import build_hash
 from podflow.upload.time_key import check_time_key
-from podflow.httpfs.ansi_to_html import ansi_to_html
+from podflow.httpfs.to_html import ansi_to_html
 from podflow.httpfs.get_channelid import get_channelid
 
 

podflow-20250331.3/podflow/httpfs/ansi_to_html.py → podflow-20250401.1/podflow/httpfs/to_html.py

@@ -1,8 +1,9 @@
-# podflow/httpfs/ansi_to_htmlpy
+# podflow/httpfs/to_html.py
 # coding: utf-8
 
 import re
 import html
+from podflow import gVar
 
 
 def ansi_to_html(ansi_text):
@@ -48,3 +49,8 @@ def ansi_to_html(ansi_text):
         html_output += "</span>"
 
     return html_output
+
+
+def qrcode_to_html(url):
+    text = f'<span class="qrcode-container" data-url="{url}"></span>'
+    gVar.index_message["podflow"].append(text)

{podflow-20250331.3 → podflow-20250401.1}/podflow/message/save_rss.py

@@ -6,6 +6,7 @@ from podflow.basic.qr_code import qr_code
 from podflow.message.xml_rss import xml_rss
 from podflow.basic.file_save import file_save
 from podflow.basic.write_log import write_log
+from podflow.httpfs.to_html import qrcode_to_html
 from podflow.message.backup_zip_save import backup_zip_save
 from podflow.message.display_qrcode_and_url import display_qrcode_and_url
 
@@ -79,6 +80,7 @@ def save_rss():
     # 如果gVar.displayed_QRcode中不包含"main"，则调用qr_code函数，显示总播客的二维码，并将"main"添加到gVar.displayed_QRcode中
     if "main" not in gVar.displayed_QRcode:
         qr_code(overall_url)
+        qrcode_to_html(overall_url)
         gVar.displayed_QRcode.append("main")
 
     # 备份主rss

{podflow-20250331.3 → podflow-20250401.1}/podflow/templates/index.html

@@ -21,7 +21,7 @@
       --menu-width: 170px;
       --menu-selected-bg: #cccccc;
     }
-    
+
     /* 深色模式变量 */
     @media (prefers-color-scheme: dark) {
       :root {
@@ -55,7 +55,7 @@
     .ansi-94m { color: #7c9ecb; }
     .ansi-95m { color: #de30c5; }
     .ansi-96m { color: #51b2bb; }
-    .ansi-97m { color: #eeeeec; }.
+    .ansi-97m { color: #eeeeec; }
 
     @media (prefers-color-scheme: dark) {
       .ansi-30m { color: #ffffff; }
@@ -130,7 +130,7 @@
     main.full {
       margin-left: 0;
     }
-    
+
     /* 表单与消息区域共用样式 */
     .common-area {
       width: 100%;
@@ -147,14 +147,16 @@
       overflow-y: auto;
     }
     textarea {
-      height: 250px;
+      height: 350px;
       font-size: 16px;
     }
     #messageArea {
-      height: 250px;
+      height: 350px;
+      font-size: 12px;
     }
     #messageHttp {
       height: 150px;
+      font-size: 12px;
     }
     .button-container {
       margin-top: 10px;
@@ -202,7 +204,7 @@
     #toggleMenu:hover {
       color: var(--button-hover);
     }
-    
+
     /* 手机端优化 */
     @media (max-width: 600px) {
       #messageArea, textarea {
@@ -217,10 +219,16 @@
     }
     .message {
       padding: 0px;
-      margin: 0;
-      font-size: 11px;
+      margin: 0px;
+    }
+
+    /* 二维码容器样式 */
+    .qrcode-container {
+      display: inline-block; /* 让容器并排显示 */
+      margin: 0px;
     }
   </style>
+  <script src="https://cdn.jsdelivr.net/gh/davidshimjs/qrcodejs/qrcode.min.js"></script>
 </head>
 <body>
   <!-- 菜单栏 -->
@@ -278,6 +286,7 @@
       const pasteBtn = document.getElementById('pasteBtn');
       const copyBtn = document.getElementById('copyBtn');
       const clearBtn = document.getElementById('clearBtn');
+      const qrcodeContainers = document.querySelectorAll('.qrcode-container'); // 获取所有二维码容器
 
       let pollingTimer = null;
 
@@ -303,6 +312,9 @@
             toggleMenu();
           }
           pageId === 'pageMessage' ? startMessagePolling() : stopMessagePolling();
+          if (pageId === 'pageMessage') {
+            generateQRCodes(); // 当切换页面时生成二维码
+          }
         }
       }
 
@@ -311,7 +323,7 @@
 
       let lastMessage = { podflow: [], http: [] };
       let userScrolled = false;
-    
+
       // 监听滚动事件，检测用户是否手动滚动
       function onUserScroll(event) {
         const element = event.target;
@@ -319,7 +331,7 @@
         const nearBottom = element.scrollHeight - element.scrollTop <= element.clientHeight + 10;
         userScrolled = !nearBottom;
       }
-    
+
       messageArea.addEventListener('scroll', onUserScroll);
       messageHttp.addEventListener('scroll', onUserScroll);
 
@@ -341,7 +353,7 @@
       function appendMessages(container, newMessages, oldMessages) {
         // 判断当前是否在底部
         const isAtBottom = container.scrollHeight - container.scrollTop <= container.clientHeight + 10;
-    
+
         // 只追加新数据，避免重复渲染
         if (newMessages.length === oldMessages.length && newMessages.length > 0) {
           const lastNewMessage = newMessages[newMessages.length - 1];
@@ -370,7 +382,7 @@
             container.appendChild(p);
           });
         }
-    
+
         // 如果用户没有主动滚动，才自动滚动到底部
         if (!userScrolled) {
           container.scrollTop = container.scrollHeight;
@@ -474,6 +486,38 @@
         toggleMenuBtn.style.left = '0px';
         toggleMenuBtn.textContent = '❯';
       }
+
+      // 生成二维码的函数
+      function generateQRCodes() {
+        const rootStyles = getComputedStyle(document.documentElement);
+        const textColor = rootStyles.getPropertyValue('--text-color');
+        const inputBg = rootStyles.getPropertyValue('--input-bg');
+        
+        qrcodeContainers.forEach(container => {
+          const url = container.dataset.url;
+          // 清空容器中可能已有的内容
+          container.innerHTML = '';
+          if (url) {
+            new QRCode(container, {
+              text: url,
+              width: 128,
+              height: 128,
+              colorDark: textColor,
+              colorLight: inputBg,
+              correctLevel: QRCode.CorrectLevel.H
+            });
+          } else {
+            container.textContent = 'URL 未提供';
+          }
+        });
+      }
+
+      // 在页面加载完成后首次生成二维码（如果当前显示的是 Channel 页面）
+      window.addEventListener('load', () => {
+        if (pages.pageChannel.style.display === 'block') {
+          generateQRCodes();
+        }
+      });
     })();
   </script>
 </body>

{podflow-20250331.3 → podflow-20250401.1}/podflow.egg-info/PKG-INFO

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

{podflow-20250331.3 → podflow-20250401.1}/podflow.egg-info/SOURCES.txt

@@ -49,11 +49,11 @@ podflow/download/show_progress.py
 podflow/download/wait_animation.py
 podflow/download/youtube_and_bilibili_download.py
 podflow/httpfs/__init__.py
-podflow/httpfs/ansi_to_html.py
 podflow/httpfs/app_bottle.py
 podflow/httpfs/browser.py
 podflow/httpfs/get_channelid.py
 podflow/httpfs/port_judge.py
+podflow/httpfs/to_html.py
 podflow/makeup/__init__.py
 podflow/makeup/del_makeup_format_fail.py
 podflow/makeup/make_up_file.py

{podflow-20250331.3 → podflow-20250401.1}/podflow.egg-info/requires.txt

@@ -1,6 +1,6 @@
 astral>=3.2
 bottle>=0.13.2
-yt-dlp>=2025.3.27
+yt-dlp>=2025.3.31
 chardet>=5.2.0
 cherrypy>=18.10.0
 pyqrcode>=1.2.1

{podflow-20250331.3 → podflow-20250401.1}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250331.3",
+    version="20250401.1",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",
@@ -31,7 +31,7 @@ setup(
     install_requires=[
         "astral>=3.2", 
         "bottle>=0.13.2",
-        "yt-dlp>=2025.3.27",
+        "yt-dlp>=2025.3.31",
         "chardet>=5.2.0",
         "cherrypy>=18.10.0",
         "pyqrcode>=1.2.1",