GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-05-19 23:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix scraping

Browse Source
This commit is contained in:
jxxghp
2024-09-20 12:51:32 +08:00
parent 91fc41261f
commit 117bd80528
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/endpoints/history.py
View File

@@ -5,7 +5,7 @@ from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
from app import schemas
from app.chain.transfer import TransferChain
from app.chain.storage import StorageChain
from app.core.event import eventmanager
from app.core.security import verify_token
from app.db import get_db
@@ -87,15 +87,15 @@ def delete_transfer_history(history_in: schemas.TransferHistory,
# 册除媒体库文件
if deletedest and history.dest_fileitem:
dest_fileitem = schemas.FileItem(**json.loads(history.dest_fileitem))
state, msg = TransferChain().delete_files(dest_fileitem)
state = StorageChain().delete_file(dest_fileitem)
if not state:
return schemas.Response(success=False, msg=msg)
return schemas.Response(success=False, msg=f"{dest_fileitem.path}删除失败")
# 删除源文件
if deletesrc and history.dest_fileitem:
dest_fileitem = schemas.FileItem(**json.loads(history.dest_fileitem))
state, msg = TransferChain().delete_files(dest_fileitem)
state = StorageChain().delete_file(dest_fileitem)
if not state:
return schemas.Response(success=False, msg=msg)
return schemas.Response(success=False, msg=f"{dest_fileitem.path}删除失败")
# 发送事件
eventmanager.send_event(
EventType.DownloadFileDeleted,

6
app/api/endpoints/transfer.py
View File

@@ -7,6 +7,7 @@ from sqlalchemy.orm import Session
from app import schemas
from app.chain.media import MediaChain
from app.chain.storage import StorageChain
from app.chain.transfer import TransferChain
from app.core.metainfo import MetaInfoPath
from app.core.security import verify_token, verify_apitoken
@@ -89,7 +90,6 @@ def manual_transfer(fileitem: FileItem = None,
"""
force = False
target_path = Path(target_path) if target_path else None
transfer = TransferChain()
if logid:
# 查询历史记录
history: TransferHistory = TransferHistory.get(db, logid)
@@ -107,7 +107,7 @@ def manual_transfer(fileitem: FileItem = None,
if history.dest_fileitem:
# 删除旧的已整理文件
dest_fileitem = FileItem(**json.loads(history.dest_fileitem))
transfer.delete_files(dest_fileitem)
StorageChain().delete_file(dest_fileitem)
# 从历史数据获取信息
if from_history:
@@ -144,7 +144,7 @@ def manual_transfer(fileitem: FileItem = None,
offset=episode_offset,
)
# 开始转移
state, errormsg = transfer.manual_transfer(
state, errormsg = TransferChain().manual_transfer(
fileitem=src_fileitem,
target_storage=target_storage,
target_path=target_path,