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-09-13 08:55:33 +08:00
parent 48797ddf8f
commit f1625e7d92
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xiaomusic/analytics.py
View File

@ -72,4 +72,3 @@ class Analytics:
event.set_event_param(name="sec", value=sec) event.set_event_param(name="sec", value=sec)
event_list = [event] event_list = [event]
self.gtag.send(events=event_list) self.gtag.send(events=event_list)

9
xiaomusic/httpserver.py
View File

@ -6,6 +6,7 @@ import re
import secrets import secrets
import shutil import shutil
import tempfile import tempfile
import urllib.parse
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
from dataclasses import asdict from dataclasses import asdict
from typing import Annotated from typing import Annotated
@ -145,7 +146,7 @@ def playingmusic(did: str = "", Verifcation=Depends(verification)):
is_playing = xiaomusic.isplaying(did) is_playing = xiaomusic.isplaying(did)
cur_music = xiaomusic.playingmusic(did) cur_music = xiaomusic.playingmusic(did)
# 播放进度 # 播放进度
offset,duration = xiaomusic.get_offset_duration(did) offset, duration = xiaomusic.get_offset_duration(did)
return { return {
"ret": "OK", "ret": "OK",
"is_playing": is_playing, "is_playing": is_playing,
@ -293,9 +294,9 @@ def downloadlog(Verifcation=Depends(verification)):
async def playurl(did: str, url: str, Verifcation=Depends(verification)): async def playurl(did: str, url: str, Verifcation=Depends(verification)):
if not xiaomusic.did_exist(did): if not xiaomusic.did_exist(did):
return {"ret": "Did not exist"} return {"ret": "Did not exist"}
decoded_url = urllib.parse.unquote(url)
log.info(f"playurl did: {did} url: {url}") log.info(f"playurl did: {did} url: {decoded_url}")
return await xiaomusic.play_url(did=did, arg1=url) return await xiaomusic.play_url(did=did, arg1=decoded_url)
@app.post("/debug_play_by_music_url") @app.post("/debug_play_by_music_url")

3
xiaomusic/static/app.js
View File

@ -175,7 +175,8 @@ $(function(){
$("#playurl").on("click", () => { $("#playurl").on("click", () => {
var url = $("#music-url").val(); var url = $("#music-url").val();
$.get(`/playurl?url=${url}&did=${did}`, function(data, status) { const encoded_url = encodeURIComponent(url);
$.get(`/playurl?url=${encoded_url}&did=${did}`, function(data, status) {
console.log(data); console.log(data);
}); });
}); });