Dantenerosas/video_downloader_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
nikili0n 2023-09-26 16:33:09 +03:00
commit 4c6e0e30d6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/master_service.py
View File

@ -102,7 +102,6 @@ class MasterService:
"status": "done" "status": "done"
}) })
except FileAlreadyExistException as ex: except FileAlreadyExistException as ex:
# TODO: сделать так, чтобы грузился обычный, нам не нужно записывать что-то в редис
return Result(result_type=ResultTypeEnum.EXIST, value={ return Result(result_type=ResultTypeEnum.EXIST, value={
"link": video_params["link"], "link": video_params["link"],
"result": ex.message, "result": ex.message,
@ -120,6 +119,11 @@ class MasterService:
"result": traceback.format_exc(), "result": traceback.format_exc(),
"status": "error" "status": "error"
}) })
return Result(result_type=ResultTypeEnum.EXCEPTION, value={
"link": video_params["link"],
"result": "Unknown exception encountered",
"status": "error"
})
# TODO upload to server # TODO upload to server

6
src/web/schemes/submit.py
View File

@ -40,9 +40,9 @@ class MergeOutputFormatEnum(Enum):
@dataclass @dataclass
class SubmitIn: class SubmitIn:
link: str = Form(...) link: str = Form(...)
video_format: VideoFormatEnum = Form(default=MergeOutputFormatEnum.format_mp4) video_format: VideoFormatEnum = Form(default=MergeOutputFormatEnum.format_webm)
audio_format: AudioFormatEnum = Form(default=AudioFormatEnum.format_m4a) audio_format: AudioFormatEnum = Form(default=AudioFormatEnum.format_webm)
merge_output_format: MergeOutputFormatEnum = Form(default=MergeOutputFormatEnum.format_mp4) merge_output_format: MergeOutputFormatEnum = Form(default=MergeOutputFormatEnum.format_mkv)
class CheckIn(BaseModel): class CheckIn(BaseModel):