diff --git a/app/chain/transfer.py b/app/chain/transfer.py index d1b48290..a10a982b 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -482,7 +482,7 @@ class TransferChain(ChainBase): return @staticmethod - def get_root_path(path: str, type_name: str, category: str) -> Path: + def get_root_path(path: str, type_name: str, category: str) -> Optional[Path]: """ 计算媒体库目录的根路径 """ diff --git a/app/db/downloadhistory_oper.py b/app/db/downloadhistory_oper.py index d23fbb27..4348f6e4 100644 --- a/app/db/downloadhistory_oper.py +++ b/app/db/downloadhistory_oper.py @@ -10,12 +10,12 @@ class DownloadHistoryOper(DbOper): 下载历史管理 """ - def get_by_path(self, path: Path) -> DownloadHistory: + def get_by_path(self, path: str) -> DownloadHistory: """ 按路径查询下载记录 :param path: 数据key """ - return DownloadHistory.get_by_path(self._db, str(path)) + return DownloadHistory.get_by_path(self._db, path) def get_by_hash(self, download_hash: str) -> DownloadHistory: """ diff --git a/app/modules/emby/emby.py b/app/modules/emby/emby.py index 40f5b393..67ddeefe 100644 --- a/app/modules/emby/emby.py +++ b/app/modules/emby/emby.py @@ -932,9 +932,9 @@ class Emby: """ if not self._host or not self._apikey: return None - url = url.replace("[HOST]", self._host) \ - .replace("[APIKEY]", self._apikey) \ - .replace("[USER]", self.user) + url = url.replace("[HOST]", self._host or '') \ + .replace("[APIKEY]", self._apikey or '') \ + .replace("[USER]", self.user or '') try: return RequestUtils(content_type="application/json").get_res(url=url) except Exception as e: @@ -950,9 +950,9 @@ class Emby: """ if not self._host or not self._apikey: return None - url = url.replace("[HOST]", self._host) \ - .replace("[APIKEY]", self._apikey) \ - .replace("[USER]", self.user) + url = url.replace("[HOST]", self._host or '') \ + .replace("[APIKEY]", self._apikey or '') \ + .replace("[USER]", self.user or '') try: return RequestUtils( headers=headers, diff --git a/app/modules/jellyfin/jellyfin.py b/app/modules/jellyfin/jellyfin.py index 0953a20b..aa4e0079 100644 --- a/app/modules/jellyfin/jellyfin.py +++ b/app/modules/jellyfin/jellyfin.py @@ -632,9 +632,9 @@ class Jellyfin: """ if not self._host or not self._apikey: return None - url = url.replace("[HOST]", self._host) \ - .replace("[APIKEY]", self._apikey) \ - .replace("[USER]", self.user) + url = url.replace("[HOST]", self._host or '') \ + .replace("[APIKEY]", self._apikey or '') \ + .replace("[USER]", self.user or '') try: return RequestUtils(accept_type="application/json").get_res(url=url) except Exception as e: @@ -650,9 +650,9 @@ class Jellyfin: """ if not self._host or not self._apikey: return None - url = url.replace("[HOST]", self._host) \ - .replace("[APIKEY]", self._apikey) \ - .replace("[USER]", self.user) + url = url.replace("[HOST]", self._host or '') \ + .replace("[APIKEY]", self._apikey or '') \ + .replace("[USER]", self.user or '') try: return RequestUtils( headers=headers