Puqns67/ncmlyrics
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: uncatchable exception will be thrown if cookies.txt not found

Browse Source 
Fixes: 097e5410036cb69f6eae8c75073c0ef14de00b48 (fix: cookie load and save errors, pure music track save error, lrc class creating error)
This commit is contained in:
Puqns67 2024-10-15 19:32:23 +08:00
parent 5492aee0d6
commit a5911b670a
Signed by: Puqns67
GPG Key ID: 9669DF042554F536
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ncmlyrics/api.py
View File

@ -191,11 +191,12 @@ class NCMLyrics:
class NCMApi:
def __init__(self, http2: bool = True) -> None:
self._cookiePath = PLATFORM.user_config_path / "cookies.txt"
self._cookieJar = MozillaCookieJar()
try:
self._cookieJar.load(str(PLATFORM.user_config_path / "cookies.txt"))
except FileNotFoundError | LoadError:
self._cookieJar.load(str(self._cookiePath))
except (FileNotFoundError, LoadError):
pass
self._httpClient = HttpXClient(
@ -225,7 +226,7 @@ class NCMApi:
raise NCMApiRequestError
def saveCookies(self) -> None:
self._cookieJar.save(str(PLATFORM.user_config_path / "cookies.txt"))
self._cookieJar.save(str(self._cookiePath))
def getDetailsForTrack(self, trackId: int) -> NCMTrack:
request = self._httpClient.build_request("GET", "/v3/song/detail", params={"c": f"[{{'id':{trackId}}}]"})