ar0c/xiaomusic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复音乐路径设置后找不到音乐的问题

Browse Source
This commit is contained in:
涵曦 2024-07-14 09:52:14 +00:00
parent dd77176035
commit d8a66ca152
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xiaomusic/httpserver.py
View File

@ -1,5 +1,6 @@
import asyncio import asyncio
import json import json
from pathlib import Path
import os import os
import secrets import secrets
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
@ -73,7 +74,6 @@ def reset_http_server():
app.dependency_overrides[verification] = no_verification app.dependency_overrides[verification] = no_verification
else: else:
app.dependency_overrides = {} app.dependency_overrides = {}
app.mount("/music", StaticFiles(directory=config.music_path), name="music")
def HttpInit(_xiaomusic): def HttpInit(_xiaomusic):
@ -86,6 +86,24 @@ def HttpInit(_xiaomusic):
reset_http_server() reset_http_server()
@app.get("/music/{file_path:path}")
async def read_music_file(file_path: str):
base_dir = Path(config.music_path).resolve()
real_path = os.path.join(base_dir, file_path)
file_location = Path(real_path).resolve()
log.info(f"read_music_file. file_path:{file_path} real_path:{real_path}")
if not file_location.exists() or not file_location.is_file():
raise HTTPException(status_code=404, detail="File not found")
# 确保请求的文件在我们的基础目录下
if base_dir not in file_location.parents:
raise HTTPException(
status_code=403, detail="Access to this file is not permitted"
)
return FileResponse(file_location)
@app.get("/") @app.get("/")
async def read_index(): async def read_index():
return FileResponse("xiaomusic/static/index.html") return FileResponse("xiaomusic/static/index.html")

10
xiaomusic/xiaomusic.py
View File

@ -145,9 +145,9 @@ class XiaoMusic:
async def poll_latest_ask(self): async def poll_latest_ask(self):
async with ClientSession() as session: async with ClientSession() as session:
while True: while True:
#self.log.debug( # self.log.debug(
# f"Listening new message, timestamp: {self.last_timestamp}" # f"Listening new message, timestamp: {self.last_timestamp}"
#) # )
session._cookie_jar = self.cookie_jar session._cookie_jar = self.cookie_jar
# 拉取所有音箱的对话记录 # 拉取所有音箱的对话记录
@ -158,11 +158,11 @@ class XiaoMusic:
await asyncio.gather(*tasks) await asyncio.gather(*tasks)
start = time.perf_counter() start = time.perf_counter()
#self.log.debug(f"Polling_event, timestamp: {self.last_timestamp}") # self.log.debug(f"Polling_event, timestamp: {self.last_timestamp}")
await self.polling_event.wait() await self.polling_event.wait()
if (d := time.perf_counter() - start) < 1: if (d := time.perf_counter() - start) < 1:
# sleep to avoid too many request # sleep to avoid too many request
#self.log.debug(f"Sleep {d}, timestamp: {self.last_timestamp}") # self.log.debug(f"Sleep {d}, timestamp: {self.last_timestamp}")
await asyncio.sleep(1 - d) await asyncio.sleep(1 - d)
async def init_all_data(self, session): async def init_all_data(self, session):
@ -269,7 +269,7 @@ class XiaoMusic:
hardware=hardware, hardware=hardware,
timestamp=str(int(time.time() * 1000)), timestamp=str(int(time.time() * 1000)),
) )
#self.log.debug(f"url:{url} device_id:{device_id} hardware:{hardware}") # self.log.debug(f"url:{url} device_id:{device_id} hardware:{hardware}")
r = await session.get(url, timeout=timeout, cookies=cookies) r = await session.get(url, timeout=timeout, cookies=cookies)
except Exception as e: except Exception as e:
self.log.exception(f"Execption {e}") self.log.exception(f"Execption {e}")