podflow 20250315__py3-none-any.whl → 20250318__py3-none-any.whl

Podflow/httpfs/app_bottle.py

@@ -247,7 +247,6 @@ class bottle_app:
         upload_data = gVar.upload_data
         username = request.query.get("username")
         password = request.query.get("password")
-        
         if username in upload_data:
             if upload_data[username] == password:
                 self.print_out("login", 200)

Podflow/main_podcast.py

@@ -53,6 +53,7 @@ from Podflow.remove.remove_dir import remove_dir
 from Podflow.youtube.build import print_fail_youtube
 
 # 长期媒体进行上传模块
+from Podflow.upload.login import login_upload
 from Podflow.upload.add_upload import add_upload
 from Podflow.upload.update_upload import update_upload
 from Podflow.upload.linked_client import connect_upload_server
@@ -116,10 +117,17 @@ def main_podcast():
         gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail = (
             get_original_rss()
         )
+        # 连接上传服务器
+        upload_url = connect_upload_server()
+        # 登陆上传服务器
+        if upload_url:
+            upload_json = login_upload(upload_url)
+            if upload_json:
+                gVar.config["upload"] = False
+        else:
+            gVar.config["upload"] = False
         # 初始化原始上传信息
         get_upload_original()
-        # 连接上传服务器
-        connect_upload_server()
         # 更新Youtube和哔哩哔哩频道xml
         update_youtube_bilibili_rss()
         # 判断是否有更新内容

Podflow/repair/reverse_log.py

@@ -2,13 +2,14 @@
 # coding: utf-8
 
 import re
+from itertools import islice
 from Podflow.basic.time_print import time_print
 
 
 def reverse_log(filename):
     try:
         with open(f"{filename}.log", "r", encoding="utf-8") as file:
-            lines = file.readlines()
+            lines = list(islice(file, 10))
     except Exception:
         return
     num = 0
@@ -24,8 +25,10 @@ def reverse_log(filename):
     while not date_time(end_num):
         end_num -= 1
     if end_num > num and lines[num][:19] > lines[end_num][:19]:
-        # 反转行的顺序
-        reversed_lines = lines[::-1]
+        with open(f"{filename}.log", "r", encoding="utf-8") as file:
+            lines = file.readlines()
+            # 反转行的顺序
+            reversed_lines = lines[::-1]
         with open(f"{filename}.log", "w", encoding="utf-8") as file:
             file.writelines(reversed_lines)
             time_print(f"{filename}.log反转成功")

Podflow/upload/linked_client.py

@@ -86,7 +86,4 @@ def connect_upload_server():
             # 选择第一个找到的服务器
             server_ip, server_port = servers[0]
             time_print(f"正在连接到{server_ip}:{server_port}...", True)
-            return {
-                "ip": server_ip,
-                "port": server_port
-            }
+            return f"http://{server_ip}:{server_port}"

Podflow/upload/linked_server.py

@@ -2,6 +2,7 @@
 # coding: utf-8
 
 import socket
+from Podflow.basic.write_log import write_log
 from Podflow.basic.time_print import time_print
 from Podflow.httpfs.port_judge import port_judge
 from Podflow.upload.time_key import check_time_key
@@ -45,11 +46,11 @@ def handle_discovery(broadcast_port, service_port):
             # 检查消息是否包含时间关键字
             if check_time_key(data ,"PODFLOW_DISCOVER_SERVER_REQUEST"):
                 # 打印接收到的发现请求成功
-                time_print(f"来自{addr[0]}的发现请求\033[32m成功\033[0m")
+                write_log(f"来自{addr[0]}的发现请求\033[32m成功\033[0m")
                 # 构造响应消息
                 response = f"PODFLOW_SERVER_INFO|{service_port}".encode()
                 # 发送响应消息
                 sock.sendto(response, addr)
             else:
                 # 打印接收到的发现请求失败
-                time_print(f"来自{addr[0]}的发现请求\033[31m失败\033[0m")
+                write_log(f"来自{addr[0]}的发现请求\033[31m失败\033[0m")

Podflow/upload/login.py

@@ -6,7 +6,11 @@ import json
 import uuid
 import hashlib
 from Podflow import gVar
+from Podflow.upload.time_key import time_key
 from Podflow.basic.file_save import file_save
+from Podflow.basic.write_log import write_log
+from Podflow.basic.time_print import time_print
+from Podflow.basic.http_client import http_client
 
 
 def get_login():
@@ -26,3 +30,90 @@ def create():
     gVar.upload_data[new_username] = new_password
     file_save(gVar.upload_data, "upload_login.json", "channel_data")
     return new_username, new_password
+
+
+def get_account(url):
+    url = f"{url}/newuser"
+    token = time_key(
+        "We need to generate an account password for uploading non one-time items that need to be saved."
+    )
+    data = {"token": token}
+    if response := http_client(
+        url=url,
+        name="获取上传服务账号密码",
+        data=data,
+    ):
+        return response.json()
+
+
+def login(url, username, password):
+    url = f"{url}/login"
+    data = {
+        "username": username,
+        "password": password,
+    }
+    if response := http_client(
+        url=url,
+        name="登陆上传服务",
+        data=data,
+    ):
+        return response.json()
+
+
+def login_upload(url):
+    try:
+        # 尝试打开并读取 JSON 文件
+        with open("channel_data/upload_data.json", "r") as file:
+            upload_json = file.read()
+        upload_json = json.loads(
+            upload_json
+        )
+    except Exception:
+        upload_json = {}
+    if "username" not in upload_json:
+        write_log("上传服务账号密码不存在")
+        time_print("获取上传服务账号密码...")
+        account_data = get_account(url)
+        if "code" in account_data:
+            if account_data["code"] == 0:
+                write_log("账号密码获取\033[32m成功\033[0m")
+                username = account_data["data"]["username"]
+                password = account_data["data"]["password"]
+                upload_json = {
+                    "username": username,
+                    "password": password,
+                }
+                file_save(upload_json, "upload_data.json", "channel_data")
+                return upload_json
+            elif account_data["code"] == -1:
+                write_log("账号密码获取\033[31m失败\033[0m: 认证失败")
+                return
+            else:
+                write_log("账号密码获取\033[31m失败\033[0m")
+                return
+        else:
+            write_log("账号密码获取\033[31m失败\033[0m: 无法连接")
+            return
+    else:
+        username = upload_json["username"]
+        password = upload_json.get("password", "")
+        login_data = login(url, username, password)
+        if "code" in login_data:
+            if login_data["code"] == 0:
+                time_print("登陆上传服务\033[32m成功\033[0m")
+                return upload_json
+            elif login_data["code"] == -1:
+                write_log("登陆上传服务\033[31m失败\033[0m: 认证失败")
+                return
+            elif login_data["code"] == -2:
+                write_log("登陆上传服务\033[31m失败\033[0m: 账号错误")
+                return
+            elif login_data["code"] == -3:
+                write_log("登陆上传服务\033[31m失败\033[0m: 密码错误")
+                return
+            else:
+                write_log("登陆上传服务\033[31m失败\033[0m")
+                return
+        else:
+            write_log("登陆上传服务\033[31m失败\033[0m: 无法连接")
+            return

{podflow-20250315.dist-info → podflow-20250318.dist-info}/METADATA

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

{podflow-20250315.dist-info → podflow-20250318.dist-info}/RECORD

@@ -2,7 +2,7 @@ Podflow/__init__.py,sha256=-TdRoLAAMAPVNx2S2qSWR2vN-ZRD8wsEjZR4X1-7U1Q,6964
 Podflow/download_and_build.py,sha256=LeLjLHnF5N9vdrroDsB-mT4UKY2OwPSL3APUAkhTuwc,671
 Podflow/ffmpeg_judge.py,sha256=krttVs1PDot_0CDq5rmtUIpchiaiqtAkPYFQRLG6OQM,1275
 Podflow/main.py,sha256=tevbRqCDPuIrKuViI1Zm2lfdfjushYd7Nai6xZCGF4k,739
-Podflow/main_podcast.py,sha256=6p-JrDfLVOYic_X_wsVrtjOZKH1SbMRWOEe7KO2vsZQ,8455
+Podflow/main_podcast.py,sha256=O9wS_5gxC3Akl09z3nN1kp1nJGQOL93D2qhYKk06XeM,8750
 Podflow/main_upload.py,sha256=9FoIEO7kRwGwyyF-KKKEz5vRO9vE9_ab2VE6xTMroeM,2296
 Podflow/parse_arguments.py,sha256=H2OXiOIHUuEUKOD0fk3zt_m1VsorGkL0eTcvx4N_C3Y,2441
 Podflow/basic/__init__.py,sha256=SyFA_F_0-zn1VejCL83IPeZx1k2HCiqNY-0l0bp1N88,44
@@ -40,7 +40,7 @@ Podflow/download/show_progress.py,sha256=7oGzhj_frO2A1o5JeGuHn7bHtma5oPpD_IWcctI
 Podflow/download/wait_animation.py,sha256=E2V3cm-10e5Iif40oU722OfzDe7YiLMbDqsjZ6dshBE,1056
 Podflow/download/youtube_and_bilibili_download.py,sha256=0uuEO2ybyLlg9uOButjqFvmIkCfq6xiQ7QLV2_u4c_M,1294
 Podflow/httpfs/__init__.py,sha256=agnAtd2Xe0qfOrElKgoBattAVqUBdj79wU2e2UOpcJM,45
-Podflow/httpfs/app_bottle.py,sha256=ZkCRXYrBJFUEatboUEB6Og35JoguWGnnuxImFLflsVA,11424
+Podflow/httpfs/app_bottle.py,sha256=190_gqxM-VBRTmB5Xecb0a1LnIbuzfPI8Zoec2QhtwE,11415
 Podflow/httpfs/port_judge.py,sha256=RrBTxD6lXHbkfiDMu69-EUv0kbflfu1HpPfpB5Wz3MU,764
 Podflow/makeup/__init__.py,sha256=HaBchKbUjRqqXSGCkMfEqLOyx3tlqB2htXvTDs59owI,45
 Podflow/makeup/del_makeup_format_fail.py,sha256=rUSJD5lXMBM5pCde1amrtF6s93MMHp66-NHCXZy56AI,642
@@ -76,21 +76,21 @@ Podflow/remove/__init__.py,sha256=kns-jfTXH8lXh9OQ5E5-llsrAPlET5rl6RYpjoZKav8,45
 Podflow/remove/remove_dir.py,sha256=tah3LCD0bCcf5dDg3NrHuseaje3-31C5NLNupMg15TU,1099
 Podflow/remove/remove_file.py,sha256=ACO2iK8RAZKGJ08uABbzGwu5-B0RLklQ-EOOkSuPFiU,982
 Podflow/repair/__init__.py,sha256=sfrjrUGdBuCri8x51oassbkHJMDqmEp0MMZHodMxYNM,45
-Podflow/repair/reverse_log.py,sha256=nGVM4DOcnPz-VXJG6aHoKc1E461edYlaYoQYx7i6atQ,957
+Podflow/repair/reverse_log.py,sha256=LNzpYEYsLvNkhMkhwzhmVIavD9rplcDmcBgR8t8DC-w,1106
 Podflow/upload/__init__.py,sha256=9uOIL8vr_vP_XYrhfZ4IDZmfSGyCf0_MpLOc-KnbpSY,45
 Podflow/upload/add_upload.py,sha256=8kxHDLFa225WFze3oTPNtOWbcECF--bQXuALfsRJLoo,1432
 Podflow/upload/get_upload_original.py,sha256=h2aoutZ-po40N8auRDbKvse14261Y5H7vHgfAN23vV0,4358
-Podflow/upload/linked_client.py,sha256=ODaS95VNKcAUpfcnMxZBM4nHlZ6S9jBDFpDEmapzT5I,3242
-Podflow/upload/linked_server.py,sha256=Tf3ANSryGuqjHsH1EqCrCA_pxo_dDuoYfCBzSgVVTrI,2264
-Podflow/upload/login.py,sha256=ovQKdtrddsoea_4s-SpnMHTVstH1pWoo0dFx1dpU_sU,798
+Podflow/upload/linked_client.py,sha256=P-6mvHFO4C4wppb75cHzgBswVeNktfxz7uZTSXqzTdo,3193
+Podflow/upload/linked_server.py,sha256=_upOctwNxg7p82tDK1qIuMO8CTZiYoB6dI4wZ3G4A98,2308
+Podflow/upload/login.py,sha256=8BciQddfs7xfmVl5PWYC54-TEt52NjPw3kU-ksFgfV8,4007
 Podflow/upload/time_key.py,sha256=aR6xVe9x7ry8dKSHKoFLSUIfor2CoCuv8N9NRmsnUVo,967
 Podflow/upload/update_upload.py,sha256=4B5HyWwfmc_4Z5ZS_Wt2VcL6sgQFvq3JEl0Qubh7TwE,3183
 Podflow/youtube/__init__.py,sha256=-bdMyuw-wxoz2miVkp284amS4Qg0k7VN0JPuGF-cXlM,46
 Podflow/youtube/build.py,sha256=o6gld4qMph7UKq9pdO2E4dmtOA8brCK4sa_-vKEtYMM,12006
 Podflow/youtube/get.py,sha256=dFLyiHttygqdJltwC29jD_v8wwoLynE5NUdow_0wERI,16970
 Podflow/youtube/login.py,sha256=DlS_ZG4g6CKWqS5ojE4UwFJSCSZDsXbeuDVgHtQAa4A,1380
-podflow-20250315.dist-info/METADATA,sha256=sWLPHwYRGI7rcDccvaXhU_KSsgq30adtNg2lgiN_Yjo,14030
-podflow-20250315.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250315.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
-podflow-20250315.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
-podflow-20250315.dist-info/RECORD,,
+podflow-20250318.dist-info/METADATA,sha256=B90P97zSINoC0OD2qRBtLf9juVPT3dfxNlq4IeVmlc0,14030
+podflow-20250318.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250318.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
+podflow-20250318.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
+podflow-20250318.dist-info/RECORD,,