Merge pull request #6 from Koha9/token-connect

Token connect support

app/config.json

@@ -2,5 +2,6 @@
     "theme": "auto",
     "token": "",
     "server_url": "",
-    "server_port": "32400"
+    "server_port": "",
+    "server_scheme": ""
 }

app/main.py

@@ -14,11 +14,12 @@ templates = Jinja2Templates(directory=os.path.join(os.path.dirname(__file__), "t
 app.mount("/static", StaticFiles(directory=os.path.join(os.path.dirname(__file__), "static")), name="static")
 
 
+# 显示主页
 @app.get("/", response_class=HTMLResponse)
 async def home(request: Request):
     config = load_config()
     theme = config.get("theme", "auto")
-    scheme, host, port = get_server_settings(config)
+    token,scheme, host, port = get_server_settings(config)
     return templates.TemplateResponse(
         "login.html",
         {
@@ -26,22 +27,25 @@ async def home(request: Request):
             "theme": theme,
             "path": "/login",
             "scheme": scheme,
+            "token": token,
             "server_url": host,
             "port": port,
         },
     )
 
+# 登录页面和处理
 @app.get("/login", response_class=HTMLResponse)
 async def login_page(request: Request):
     config = load_config()
     theme = config.get("theme", "auto")
-    scheme, host, port = get_server_settings(config)
+    token, scheme, host, port = get_server_settings(config)
     return templates.TemplateResponse(
         "login.html",
         {
             "request": request,
             "theme": theme,
             "path": "/login",
+            "token": token,
             "scheme": scheme,
             "server_url": host,
             "port": port,
@@ -53,19 +57,26 @@ async def login(
     request: Request,
     user: str = Form(...),
     pw: str = Form(...),
+    token: str = Form(...),
     scheme: str = Form("https"),
     url: str = Form(...),
-    port: str = Form("32400")
+    port: str = Form("32400"),
 ):
     config = load_config()
     theme = config.get("theme", "auto")
+    # 尝试连接到 Plex 服务器
     try:
-        full_url = url
+        # 优先使用 token 连接，如果 token 为空则使用用户名和密码连接
-        if not full_url.startswith("http://") and not full_url.startswith("https://"):
+        _, token_success = connect_plex(user, pw, token, scheme, url, port)
-            full_url = f"{scheme}://{url}"
+        # 成功连接后保存配置到配置文件
-        connect_plex(config, user, pw, full_url, port)
+        config.update({
+            "server_url": url,
+            "server_scheme": scheme,
+            "server_port": port,
+            "token": token_success,
+        })
         save_config(config)
-        scheme, host, port = get_server_settings(config)
+        token, scheme, host, port = get_server_settings(config)
         return templates.TemplateResponse(
             "login.html",
             {
@@ -74,6 +85,7 @@ async def login(
                 "success": True,
                 "theme": theme,
                 "path": "/login",
+                "token": token,
                 "scheme": scheme,
                 "server_url": host,
                 "port": port,

app/templates/login.html

@@ -6,12 +6,16 @@
 <h2>🔐 登录信息</h2>
 <form method="post" action="/login">
     <div class="mb-3">
-        <label for="user" class="form-label">用户名</label>
+        <label for="user" class="form-label" id="user-label">用户名</label>
         <input type="text" class="form-control" id="user" name="user">
     </div>
     <div class="mb-3">
-        <label for="pw" class="form-label">密码</label>
+        <label for="pw" class="form-label" id="pw-label">密码</label>
         <input type="password" class="form-control" id="pw" name="pw">
+    </div>
+        <div class="mb-3">
+        <label for="token" class="form-label">Token</label>
+        <input type="text" class="form-control" id="token" name="token" value="{{ token }}">
     </div>
     <div class="mb-3">
         <label for="scheme" class="form-label">协议</label>
@@ -34,4 +38,31 @@
 {% if message %}
 <div class="alert alert-{{ 'success' if success else 'danger' }} mt-4">{{ message }}</div>
 {% endif %}
-{% endblock %}
+<script>
+    document.addEventListener('DOMContentLoaded', () => {
+        const tokenInput = document.getElementById('token');
+        const inputs = [document.getElementById('user'), document.getElementById('pw')];
+        const labels = [document.getElementById('user-label'), document.getElementById('pw-label')];
+        const fieldClasses = ['bg-body-secondary', 'text-body-secondary', 'text-decoration-line-through'];
+
+        function toggleCredFields() {
+            const inactive = tokenInput.value.trim() !== '';
+            inputs.forEach(el => {
+                el.readOnly = inactive;
+                el.tabIndex = inactive ? -1 : 0;
+                el.style.pointerEvents = inactive ? 'none' : '';
+                if (inactive && document.activeElement === el) {
+                    el.blur();
+                }
+                fieldClasses.forEach(cls => el.classList.toggle(cls, inactive));
+            });
+            labels.forEach(el => {
+                ['text-decoration-line-through', 'text-body-secondary'].forEach(cls => el.classList.toggle(cls, inactive));
+            });
+        }
+
+        tokenInput.addEventListener('input', toggleCredFields);
+        toggleCredFields();
+    });
+</script>
+{% endblock %}

app/utils/common.py

@@ -0,0 +1,6 @@
+def str_is_empty(s: str) -> bool:
+    """Check if a string is empty or contains only whitespace."""
+    if s is None:
+        return True
+    stripped = s.replace(" ", "　")
+    return not bool(stripped)

app/utils/config.py

@@ -17,7 +17,8 @@ def save_config(new_config):
 
 def get_server_settings(config):
     """Return (scheme, host, port) using defaults when not configured."""
-    scheme = "https"
+    scheme = config.get("server_scheme", "https")
+    token = config.get("token", "") or ""
     host = ""
     port = config.get("server_port", "32400") or "32400"
 
@@ -31,5 +32,5 @@ def get_server_settings(config):
                 port = str(parsed.port)
         else:
             host = url
-
+    print(f"server_scheme: {scheme}, host: {host}, port: {port}")
-    return scheme, host, port
+    return token, scheme, host, port

app/utils/plex_client.py

@@ -1,17 +1,15 @@
 from plexapi.myplex import MyPlexAccount
 from plexapi.server import PlexServer
 from urllib.parse import urlparse
+from app.utils.common import str_is_empty
 
-
+def build_plex_url(scheme, url, port="32400"):
-def connect_plex(config, username, password, url, port="32400"):
+    """Build a full Plex URL from scheme, url, and port."""
-    """Return a connected PlexServer instance and update config with token and server info."""
+    # 如果url不以http://或https://开头，则添加scheme
-    token = config.get("token")
+    full_url = url
-    if not token:
+    if not full_url.startswith("http://") and not full_url.startswith("https://"):
-        account = MyPlexAccount(username, password)
+        full_url = f"{scheme}://{url}"
-        token = account.authenticationToken
+    parsed = urlparse(full_url)
-        config["token"] = token
-
-    parsed = urlparse(url)
 
     if parsed.scheme in ("http", "https"):
         netloc = parsed.netloc or parsed.path
@@ -20,6 +18,33 @@ def connect_plex(config, username, password, url, port="32400"):
         base_url = f"{parsed.scheme}://{netloc}"
     else:
         base_url = f"http://{url}:{port}"
+    return base_url
+
+def connect_plex(username, password, token, scheme, url, port="32400"):
+    """Return a connected PlexServer instance and update config with token and server info."""
+    # 如果token存在且不为空，则使用token连接
+    if not str_is_empty(token):
+        return connect_plex_with_token(token, scheme, url, port)
+    else:
+        return connect_plex_with_pw(username, password, scheme, url, port)
+
+
+def connect_plex_with_pw(username, password, scheme, url, port="32400"):
+    """Return a connected PlexServer instance and update config with token and server info."""
+    # url 初始化
+    base_url = build_plex_url(scheme, url, port)
+    # account 初始化
+    account = MyPlexAccount(username, password)
+    # token 获取
+    token = account.authenticationToken
+
     server = PlexServer(base_url, token)
-    config.update({"server_url": url, "server_port": port})
+    return server, token
-    return server
+
+def connect_plex_with_token(token, scheme, url, port="32400"):
+    """Return a connected PlexServer instance using a token."""
+    # URL 初始化
+    base_url = build_plex_url(scheme, url, port)
+    
+    server = PlexServer(base_url, token)
+    return server, token