ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Fix ANOTHER youtube-dl bug.

Browse source
This commit is contained in:
Steffo 2019-04-15 16:03:34 +02:00
parent 8cd9254ebe
commit cd8f2b5bff
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
royalnet/audio/youtubedl.py
View file

@ -1,5 +1,6 @@
import typing import typing
import logging as _logging import logging as _logging
import os
from youtube_dl import YoutubeDL from youtube_dl import YoutubeDL
from contextlib import contextmanager from contextlib import contextmanager
@ -21,32 +22,21 @@ class YtdlFile:
progress_hooks = [] progress_hooks = []
self.info: "YtdlInfo" = info self.info: "YtdlInfo" = info
self.filename: str self.filename: str
self.downloaded_bytes: typing.Optional[int]
self.elapsed: typing.Optional[float]
# Download the file
ytdl = YoutubeDL({ ytdl = YoutubeDL({
"logger": log, # Log messages to a logging.Logger instance. "logger": log, # Log messages to a logging.Logger instance.
"quiet": True, # Do not print messages to stdout. "quiet": True, # Do not print messages to stdout.
"noplaylist": True, # Download single video instead of a playlist if in doubt. "noplaylist": True, # Download single video instead of a playlist if in doubt.
"no_warnings": True, # Do not print out anything for warnings. "no_warnings": True, # Do not print out anything for warnings.
"outtmpl": outtmpl, "outtmpl": outtmpl,
"progress_hooks": [self._progress_hook, *progress_hooks], "progress_hooks": progress_hooks,
**ytdl_args **ytdl_args
}) })
# Find the file name
self.filename = ytdl.prepare_filename(self.info.__dict__)
# Download the file
ytdl.download([self.info.webpage_url]) ytdl.download([self.info.webpage_url])
# Final checks
def _progress_hook(self, data: dict): assert os.path.exists(self.filename)
# Check the status
status = data.get("status")
# Ignore unknown values
if status not in ["downloading", "error", "finished"]:
return
# If the download is finished, set the filename
if status == "finished":
# Filename is always present
self.filename = data["filename"]
self.downloaded_bytes = data.get("downloaded_bytes")
self.elapsed = data.get("elapsed")
def _stop_download(self): def _stop_download(self):
raise InterruptDownload() raise InterruptDownload()
@ -56,6 +46,10 @@ class YtdlFile:
info_list = YtdlInfo.create_from_url(url) info_list = YtdlInfo.create_from_url(url)
return [info.download(outtmpl, progress_hooks, **ytdl_args) for info in info_list] return [info.download(outtmpl, progress_hooks, **ytdl_args) for info in info_list]
def delete_file(self):
# TODO: _might_ be unsafe, test this
os.remove(self.filename)
class YtdlInfo: class YtdlInfo:
"""A wrapper around youtube_dl extracted info.""" """A wrapper around youtube_dl extracted info."""
@ -150,3 +144,7 @@ class YtdlInfo:
if self.webpage_url: if self.webpage_url:
return self.webpage_url return self.webpage_url
return self.id return self.id
if __name__ == "__main__":
f = YtdlFile.create_from_url("https://www.youtube.com/watch?v=BaW_jenozKc&v=UxxajLWwzqY", "./lovely.mp4")