Compare commits

..

No commits in common. "main" and "codex/add-notification-popup-with-bootstrap" have entirely different histories.

4 changed files with 8 additions and 59 deletions

View File

@ -5,7 +5,6 @@ from fastapi.responses import HTMLResponse, RedirectResponse
from fastapi.templating import Jinja2Templates
from fastapi.staticfiles import StaticFiles
from app.utils.plex_client import plex_client
from app.utils.logger import logger
app = FastAPI()
templates = Jinja2Templates(
@ -24,7 +23,6 @@ app.mount(
# 显示主页
@app.get("/", response_class=HTMLResponse)
async def home(request: Request):
server_config.load()
return templates.TemplateResponse(
"login.html",
{
@ -42,7 +40,6 @@ async def home(request: Request):
# 登录页面和处理
@app.get("/login", response_class=HTMLResponse)
async def login_page(request: Request):
server_config.load()
return templates.TemplateResponse(
"login.html",
{
@ -80,7 +77,7 @@ async def login(
)
# 成功连接后保存配置到配置文件
if plex_client.connected:
server_config.set_and_save_config(
server_config.set_config(
token=token_success, scheme=scheme, url=url, port=port
)
return templates.TemplateResponse(
@ -91,10 +88,10 @@ async def login(
"message_type": "success",
"theme": server_config.theme,
"path": "/login",
"token": server_config.token,
"scheme": server_config.scheme,
"token": token,
"scheme": scheme,
"server_url": server_config.url,
"port": server_config.port,
"port": port,
},
)
except Exception as e:
@ -140,5 +137,5 @@ async def set_playlist(
@app.post("/set-theme")
async def set_theme(theme: str = Form(...)):
server_config.set_and_save_config(theme=theme)
server_config.set_config(theme=theme)
return RedirectResponse("/login", status_code=303)

View File

@ -1,6 +1,5 @@
import json
import os
from app.utils.logger import logger
CONFIG_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), "..", "config.json")
@ -21,23 +20,20 @@ class ServerConfig:
try:
with open(CONFIG_PATH, "r", encoding="utf-8") as f:
config = json.load(f)
logger.debug(f"Loaded server config: {config}")
except FileNotFoundError:
# 如果配置文件不存在,使用默认值
self.save()
logger.debug("Config file not found, using default values.")
return
except json.JSONDecodeError:
# 如果配置文件格式错误,使用默认值
self.save()
logger.debug("Config file is invalid, using default values.")
return
self.theme = config.get("theme", "auto")
self.token = config.get("token", "")
self.url = config.get("server_url", "")
self.scheme = config.get("server_scheme", "https")
self.port = config.get("server_port", "32400")
logger.info(f"Server config loaded: {self.__dict__}")
def save(self):
config = {
@ -49,7 +45,6 @@ class ServerConfig:
}
with open(CONFIG_PATH, "w", encoding="utf-8") as f:
json.dump(config, f, indent=4, ensure_ascii=False)
logger.info(f"Server config saved: {config}")
def set_url(self, url: str) -> None:
self.url = url
@ -66,11 +61,10 @@ class ServerConfig:
def set_theme(self, theme: str) -> None:
# check theme is valid
if theme not in ["auto", "dark", "light"]:
logger.error(f"Invalid theme: {theme}")
raise ValueError("Invalid theme. Must be 'auto', 'dark', or 'light'.")
self.theme = theme
def set_and_save_config(
def set_config(
self,
theme: str = None,
token: str = None,

View File

@ -1,33 +0,0 @@
import logging
import os
LOG_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), "..", "logs", "app.log"))
LOG_LEVEL = logging.DEBUG
def logger_initialize() -> logging.Logger:
"""Initialize the logger for the application. Return a logger that logs to console and a app.log."""
logger = logging.getLogger("PlexPlaylistSync")
if logger.hasHandlers():
return logger
# check log path exists, if not create it
os.makedirs(os.path.dirname(LOG_PATH), exist_ok=True)
logger.setLevel(LOG_LEVEL)
# 2025-07-19 17:23:05,116 [levelname]: message
formatter = logging.Formatter("%(asctime)s [%(levelname)s]: %(message)s")
file_handler = logging.FileHandler(LOG_PATH, encoding="utf-8")
file_handler.setFormatter(formatter)
# add file handler
logger.addHandler(file_handler)
# console handler
console_handler = logging.StreamHandler()
console_handler.setFormatter(formatter)
logger.addHandler(console_handler)
return logger
logger = logger_initialize()

View File

@ -2,7 +2,6 @@ from plexapi.myplex import MyPlexAccount
from plexapi.server import PlexServer
from urllib.parse import urlparse
from app.utils.common import str_is_empty
from app.utils.logger import logger
def build_plex_url(scheme, url, port="32400"):
@ -53,10 +52,8 @@ class PlexClient:
# Update the base URL and connection status
self.base_url = build_plex_url(scheme, url, port)
self.connected = True
logger.info(f"Connected to Plex server at {self.base_url} with token: {self.token}")
return self.server, self.token
except Exception as e:
logger.warning(f"Failed to connect to Plex server: {str(e)}")
self.connected = False
raise
@ -70,7 +67,6 @@ class PlexClient:
self.token = account.authenticationToken
self.server = PlexServer(self.base_url, self.token)
logger.debug(f"Connected to Plex server with username: {username}, token: {self.token}")
return self.server, self.token
def _connect_with_token(self, token: str, scheme: str, url: str, port: str = "32400"):
@ -79,28 +75,23 @@ class PlexClient:
self.base_url = build_plex_url(scheme, url, port)
self.server = PlexServer(self.base_url, token)
logger.debug(f"Connected to Plex server with token: {token}")
return self.server, token
return self.server, self.token
def get_server(self) -> PlexServer | None:
"""Return the connected Plex server instance."""
if not self.connected:
logger.error("Plex client is not connected.")
raise RuntimeError("Plex client is not connected.")
return self.server
def get_all_playlist(self) -> list | None:
"""Return all playlists from the Plex server."""
if not self.connected or not self.server:
logger.error("Plex server is not connected.")
raise ValueError("Plex server is not connected.")
try:
playlists = self.server.playlists()
logger.info(f"Fetched {len(playlists)} playlists from the server.")
return playlists
except Exception as e:
logger.warning(f"Failed to fetch playlists: {str(e)}")
raise RuntimeError(f"Failed to fetch playlists: {str(e)}")
plex_client = PlexClient()