podflow 20250317__tar.gz → 20250318__tar.gz

{podflow-20250317 → podflow-20250318}/PKG-INFO

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

{podflow-20250317 → podflow-20250318}/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-20250317 → podflow-20250318}/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-20250317 → podflow-20250318}/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-20250317 → podflow-20250318}/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-20250318/Podflow/upload/login.py

@@ -0,0 +1,119 @@
+# Podflow/upload/login.py
+# coding: utf-8
+
+import os
+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():
+    try:
+        with open("channel_data/upload_login.json", "r") as file:
+            upload_data = file.read()
+        gVar.upload_data = json.loads(upload_data)
+    except Exception:
+        file_save(gVar.upload_data, "upload_login.json", "channel_data")
+
+
+def create():
+    new_username = str(uuid.uuid4())
+    while new_username in gVar.upload_data:
+        new_username = str(uuid.uuid4())
+    new_password = hashlib.sha256(os.urandom(64)).hexdigest()
+    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-20250317 → podflow-20250318}/podflow.egg-info/PKG-INFO

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

{podflow-20250317 → podflow-20250318}/setup.py

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

podflow-20250317/Podflow/upload/login.py

@@ -1,28 +0,0 @@
-# Podflow/upload/login.py
-# coding: utf-8
-
-import os
-import json
-import uuid
-import hashlib
-from Podflow import gVar
-from Podflow.basic.file_save import file_save
-
-
-def get_login():
-    try:
-        with open("channel_data/upload_login.json", "r") as file:
-            upload_data = file.read()
-        gVar.upload_data = json.loads(upload_data)
-    except Exception:
-        file_save(gVar.upload_data, "upload_login.json", "channel_data")
-
-
-def create():
-    new_username = str(uuid.uuid4())
-    while new_username in gVar.upload_data:
-        new_username = str(uuid.uuid4())
-    new_password = hashlib.sha256(os.urandom(64)).hexdigest()
-    gVar.upload_data[new_username] = new_password
-    file_save(gVar.upload_data, "upload_login.json", "channel_data")
-    return new_username, new_password