podflow 20250429__py3-none-any.whl → 20250522__py3-none-any.whl

podflow/upload/linked_client.py

@@ -1,10 +1,10 @@
 # podflow/upload/linked_client.py
 # coding: utf-8
 
-import os
 import time
 import socket
-from datetime import datetime
+import struct
+import threading
 from podflow import gVar
 from podflow.upload.time_key import time_key
 from podflow.basic.time_print import time_print
@@ -16,24 +16,57 @@ TIMEOUT = 1  # 搜索超时时间（秒）
 MAX_BROADCAST_PORT = 37010  # 尝试广播的最大端口
 
 
+# 获取本机局域网 IP (此函数在有代理时可能失效，但保留作为fallback或无代理时的功能)
+def get_local_ip():
+    try:
+        # 尝试连接一个外部地址来确定哪个本地接口被用于路由
+        # 注意：在某些代理/VPN配置下，这可能返回代理或VPN分配的IP
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+            s.connect(("8.8.8.8", 80))  # 非真实连接
+            ip = s.getsockname()[0]
+            time_print(f"局域网IP:{ip}")
+            return ip
+    except Exception as e:
+        time_print(f"\033[31m获取本地 IP 失败:\033[0m {e}")
+        return None
+
+
+# 计算广播地址（默认 255.255.255.0）
+def calculate_broadcast(ip, netmask="255.255.255.0"):
+    try:
+        # 确保输入是有效的IPv4地址
+        socket.inet_aton(ip)
+        socket.inet_aton(netmask)
+
+        ip_packed = struct.unpack("!I", socket.inet_aton(ip))[0]
+        mask_packed = struct.unpack("!I", socket.inet_aton(netmask))[0]
+        broadcast_packed = ip_packed | ~mask_packed & 0xFFFFFFFF
+        address = socket.inet_ntoa(struct.pack("!I", broadcast_packed))
+        time_print(f"广播地址:{address}")
+        return address
+    except socket.error as e:
+        time_print(f"\033[31m计算广播地址失败(无效IP或掩码):\033[0m {e}")
+        return "255.255.255.255" # 回退地址
+    except Exception as e:
+        time_print(f"\033[31m计算广播地址失败:\033[0m {e}")
+        return "255.255.255.255"  # 回退地址
+
+
 # 发现局域网内的服务器
-def discover_server(broadcast_port, time_out):
+def discover_server(broadcast_ip, broadcast_port, time_out):
     servers = []
-
     # 创建UDP socket
     with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
         sock.settimeout(time_out)
         send_text = time_key("PODFLOW_DISCOVER_SERVER_REQUEST")
         send_text = send_text.encode("utf-8")
-
         try:
             # 发送广播请求
-            sock.sendto(send_text, ("<broadcast>", broadcast_port))
+            sock.sendto(send_text, (broadcast_ip, broadcast_port))
         except Exception:
             time_print("\033[31m请求发送失败\033[0m", False, True, False)
             return servers
-
         # 等待响应
         start_time = time.time()
         while time.time() - start_time < time_out:
@@ -57,31 +90,35 @@ def discover_server(broadcast_port, time_out):
 def connect_upload_server():
     # 如果配置中启用了上传功能
     if gVar.config["upload"]:
+        local_ip = get_local_ip()
+        if not local_ip:
+            # 如果无法获取本地IP，广播发现也无法进行
+            time_print("\033[31m无法获取本地IP，跳过广播发现。\033[0m")
+            return
+        broadcast_ip = calculate_broadcast(local_ip)
+        if broadcast_ip in ["255.255.255.255", local_ip, "0.0.0.0"]:
+            # 避免向无效或自己的地址广播
+            time_print(f"\033[31m计算出的广播地址无效或为本机地址: {broadcast_ip}，跳过广播发现。\033[0m")
+            return
         # 打印正在搜索上传服务器
         time_print("正在搜索上传服务器...")
-        # 当前端口设置为广播端口
-        current_port = BROADCAST_PORT
         # 服务器列表为空
         servers = []
-        # 获取当前时间
-        time_text = f"{datetime.now().strftime('%H:%M:%S')}|"
-        # 获取命令行字节宽度
-        try:
-            terminal_width = os.get_terminal_size().columns
-        except OSError:
-            terminal_width = 47
         # 在允许的端口范围内尝试发现服务器
-        while current_port < MAX_BROADCAST_PORT + 1:
-            # 清空终端
-            time_print(" " * terminal_width, True, True, False)
-            # 打印尝试广播端口
-            time_print(f"{time_text}尝试广播端口{current_port}...", True, True, False)
-            progress_update(0.0005, added=True)
-            servers = discover_server(current_port, TIMEOUT)
-            if servers:
-                break
-            current_port += 1
-        time_print("", Time=False)
+        progress_lock = threading.Lock()
+        def try_port(port, servers):
+            server = discover_server(broadcast_ip, port, TIMEOUT)
+            with progress_lock:
+                if server:
+                    servers.extend(server)
+                progress_update(0.0005, added=True)
+        threads = []
+        for port in range(BROADCAST_PORT, MAX_BROADCAST_PORT + 1):
+            t = threading.Thread(target=try_port, args=(port, servers))
+            t.start()
+            threads.append(t)
+        for t in threads:
+            t.join()
         if not servers:
             time_print("找不到上传服务器", True)
         else:

podflow/upload/upload_files.py

@@ -0,0 +1,58 @@
+# podflow/upload/upload_files.py
+# coding: utf-8
+
+import time
+from podflow.upload.build_hash import build_hash
+from podflow.basic.http_client import http_client
+
+
+def upload_file(username, password, channelid, filename):
+    filename = f"channel_audiovisual/{channelid}/{filename}"
+    with open(filename, "rb") as file:
+        file.seek(0)
+        hashs = build_hash(file)
+        file.seek(0)
+        data = {
+            "username": username,
+            "password": password,
+            "channel_id": channelid,
+            "hash": hashs,
+        }
+        if response := http_client(
+            url="http://10.0.3.231:5000/upload",
+            name="1",
+            data=data,
+            mode="post",
+            file=file,
+        ):
+            return response.json()
+        else:
+            return None
+    return None
+
+
+def find_media_index(upload_original, target_media_id):
+    for index, item in enumerate(upload_original):
+        if item.get("media_id") == target_media_id:
+            return index  # 返回找到的索引
+    return -1
+
+
+def filter_and_sort_media(media_list, day):
+    current_time = int(time.time())
+    one_month_ago = current_time - day * 24 * 60 * 60  # 30天前的时间戳
+    filtered_sorted = sorted(
+        (
+            item
+            for item in media_list
+            if not item["upload"]
+            and not item["remove"]
+            and item["media_time"] < one_month_ago
+        ),
+        key=lambda x: x["media_time"],
+    )
+    result = [
+        {"media_id": item["media_id"], "channel_id": item["channel_id"]}
+        for item in filtered_sorted
+    ]
+    return result

{podflow-20250429.dist-info → podflow-20250522.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250429
+Version: 20250522
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: astral>=3.2
 Requires-Dist: bottle>=0.13.2
-Requires-Dist: yt-dlp>=2025.3.31
+Requires-Dist: yt-dlp>=2025.4.30
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: cherrypy>=18.10.0
 Requires-Dist: pyqrcode>=1.2.1

{podflow-20250429.dist-info → podflow-20250522.dist-info}/RECORD

@@ -6,12 +6,12 @@ podflow/main_podcast.py,sha256=D1eBxeGNks0q8_zhVG2uUuE1pBcPEXGDAfd1CwAtuOs,12321
 podflow/main_upload.py,sha256=H_T5KQMYzToqzQbjGQ6DWDGziy8iMnpmf7A1qOStJuo,2296
 podflow/parse_arguments.py,sha256=h3a7EaRZS04kNMFYbxTW9Ch29KgZ7dyS-yqEEt_etQI,2592
 podflow/basic/__init__.py,sha256=CAfI6mVQtz7KKbAiTIZ9_IbvaTXeAqxR1U7ov9GDoDo,44
-podflow/basic/file_save.py,sha256=dbEgtA1JwFgadzhFBMsuBr422FzOAtpYH9mq5XrfeP0,841
+podflow/basic/file_save.py,sha256=JPrX0cWJmVSgI8XTb326AlneNJauEYj8oHKakkqYGfk,991
 podflow/basic/folder_build.py,sha256=5oHyfiDcSp2YITXQWIPwriBF9XuU3qs7wZQOWJHYJ1s,546
 podflow/basic/get_duration.py,sha256=eqdE85b7sgLyp6brhnGcOIQEWX6JqtNCGAsGyJOuXFI,532
 podflow/basic/get_file_list.py,sha256=XmnC4faObislyTsL9WUeyztyTQrvdi76lMzPudKEfXw,2389
 podflow/basic/get_html_dict.py,sha256=V-PgDtD6pm5mZC1LUPttUbZzxhjkS3WDYHxWR3yzIEY,869
-podflow/basic/http_client.py,sha256=h4IwxC7ZSi4rJ-mHvj26FQqz5krERzUg4hKEgj-yj-M,2895
+podflow/basic/http_client.py,sha256=lSDfWYF5nZ6LPEXyNjUVudPFTo1fcaPauFjIuq68JR4,2863
 podflow/basic/list_merge_tidy.py,sha256=7hWfSnsPh23edHNU92vxtI0nfpfN8m54GTEt2rGm2HQ,368
 podflow/basic/qr_code.py,sha256=lZo11jbYqFQYy9gjBtRRUoLjlaEmoES-phydnrOMcLo,1727
 podflow/basic/split_dict.py,sha256=Ir6GTortcWMUeFITFgY1v-INMla5y0IN3RN3nTgzWqM,401
@@ -40,7 +40,7 @@ podflow/download/show_progress.py,sha256=y46chchUC9eZCg4ZdNMFnx_bXJQV_IUq15jVzZt
 podflow/download/wait_animation.py,sha256=AUTvszXF89QA7XYjocFIauPKV7Qj8cFqry44teClaLQ,1314
 podflow/download/youtube_and_bilibili_download.py,sha256=VCEhz6pGXFWXusdbGWqkCzi4f4VsKQVn6sZz1pfGsns,1335
 podflow/httpfs/__init__.py,sha256=BxEXkufjcx-a0F7sDVXo65hmyANqCCbZUd6EH9i8T2c,45
-podflow/httpfs/app_bottle.py,sha256=_6yXYEMf9hxNwnj1kC1Sjf--fca3P8wadlmTKpcKSu8,20680
+podflow/httpfs/app_bottle.py,sha256=A-EZuuY1Xlpuu0_kQSeRgswhLbGw9J_3BbxuO8L2nZg,21305
 podflow/httpfs/browser.py,sha256=BJ4Xkfiki_tDr0Sc9RqAcEfIVpkAZ3RFOwo0aMHlY3U,197
 podflow/httpfs/download_bar.py,sha256=0n3HATEO3pdsIpx-E_IZG9OlXa6u-9SeBCoZVgUutyc,965
 podflow/httpfs/get_channelid.py,sha256=gcwy4IVHBWNQz7qPCpjwiAklGFLRGzvM33-UZz7oFvo,2296
@@ -83,26 +83,29 @@ podflow/remove/remove_dir.py,sha256=xQIhrnqnYjMzXjoSWaTvm7JwPYOFTN1muuTPdaLDXpQ,
 podflow/remove/remove_file.py,sha256=8wAJQehs-XBqvu0vPlEme2_tt0FZxc5ELwGMxXA_558,982
 podflow/repair/__init__.py,sha256=Gpc1i6xiSLodKjjmzH66c_Y1z0HQ9E9CS3p95FRnVFM,45
 podflow/repair/reverse_log.py,sha256=Wc_vAH0WB-z1fNdWx7FYaVH4caRPtot7tDwDwFhmpz4,1106
-podflow/templates/index.html,sha256=QFzKmMVfEgwaP-KRGJ_PuU178IS1G3Eojaw55R8aJC4,2302
+podflow/templates/index.html,sha256=kGsp1TAcf_qkV6hYRE8Ueq7CaTflR73rsTWtjnWuwwY,2775
+podflow/templates/css/config.css,sha256=-xjFlrbP2BAeTYTLs2M2u-4--klwSSC7HE2av58QUF0,5224
 podflow/templates/css/index.css,sha256=dgrlonF2BYdAtIFYpDChvSBnXAndbdoyY6c2ysOgdL0,9641
-podflow/templates/js/index.js,sha256=D_vcWiUzWjdvaSc0zvk3wSwX3G5wjAfnFjBaBNnvtHI,30465
+podflow/templates/js/config.js,sha256=VZmpvtQWszofoccjJZNhbjvNkpl-CjGOdTrPkI83ND4,43634
+podflow/templates/js/index.js,sha256=GUfFhZM3vjiwfJ7USQZIIv5c7cyZwt64QZt0VInq5TI,34051
 podflow/templates/js/qrcode.min.js,sha256=xUHvBjJ4hahBW8qN9gceFBibSFUzbe9PNttUvehITzY,19927
 podflow/upload/__init__.py,sha256=AtOSXDrE5EjUe3z-iBd1NTDaH8n_X9qA5WXdBLkONjA,45
 podflow/upload/add_upload.py,sha256=_2-V0z75Lwu-PUCfMD9HOSxZTB102yZlZW5hSdlHcsc,1432
 podflow/upload/build_hash.py,sha256=9opa3xLd7nJbGGX5xa3uuKPS6dxlbkAb87ZdEiUxmxI,473
 podflow/upload/get_upload_original.py,sha256=TEDnRutumm2FZNIesPJIlExHyKWpfB3ZAHb3sZt7V6A,4312
-podflow/upload/linked_client.py,sha256=cslPx9T2au21DYfLeHIeoR_O-NMx9AdR9MSLJHQogaU,3314
+podflow/upload/linked_client.py,sha256=gXcqwvyJtRZ-bAygQu6EyPoOa1y8GuJILTTVvGhu6DY,5130
 podflow/upload/linked_server.py,sha256=h-qSx13fP8_Ny2IKW3wCNPwqRqW6-Iz1pqxD9ga9-dM,2308
 podflow/upload/login.py,sha256=85sqr12T-3NH-TD3kAMzy4yb1KOheV3Tr0eGee7NCJo,4007
 podflow/upload/time_key.py,sha256=6jZ3cxUjzj_umYDwH27R0YNZlLXxfhNp-CqV_K22wlo,967
 podflow/upload/update_upload.py,sha256=_5tp1zPNsC9DdDnLzm-P8bLcOBuDov4eMRHp_861j80,3183
+podflow/upload/upload_files.py,sha256=5QZUjnfH3kVTfKCo0673j19bh00JLTyA92TLAN9oVfU,1634
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
 podflow/youtube/build.py,sha256=67m74rQOrvqU6ZZybP85ORpg3pOCkpoikttBbtO_PxY,12315
 podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
 podflow/youtube/login.py,sha256=KYl--ya6Z1u0uIcOp9l8i3DIIj9hsYUDH4dtJjI0MLM,1295
-podflow-20250429.dist-info/METADATA,sha256=CpRALr7Yyq_jsbypM6B-xyGBfiYb0PROY1GmNRr2FJ8,14195
-podflow-20250429.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250429.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250429.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250429.dist-info/RECORD,,
+podflow-20250522.dist-info/METADATA,sha256=xM46jtPG8HRrJ_IY4WYaOTqePoRHvZtct2Z6lIdkrv8,14195
+podflow-20250522.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250522.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250522.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250522.dist-info/RECORD,,