From 49bc1faf4e17159674d08cab7f8da48589a61a46 Mon Sep 17 00:00:00 2001 From: Javinator9889 Date: Mon, 7 Oct 2019 12:04:50 +0200 Subject: [PATCH] Permissions --- .gitlab-ci.yml | 0 YouTubeMDBot/__init__.py | 0 YouTubeMDBot/__main__.py | 0 YouTubeMDBot/api/__init__.py | 0 YouTubeMDBot/api/youtube_api.py | 0 YouTubeMDBot/audio/__init__.py | 0 YouTubeMDBot/audio/fpcalc.py | 0 YouTubeMDBot/bot.py | 0 YouTubeMDBot/commands/StartHandler.py | 0 YouTubeMDBot/commands/__init__.py | 0 YouTubeMDBot/constants/__init__.py | 0 YouTubeMDBot/constants/app_constants.py | 0 YouTubeMDBot/decorators/__init__.py | 0 YouTubeMDBot/decorators/decorators.py | 0 YouTubeMDBot/downloader/__init__.py | 0 YouTubeMDBot/downloader/youtube_downloader.py | 10 +++++++++- YouTubeMDBot/errors/EmptyBodyError.py | 0 YouTubeMDBot/errors/InvalidCredentialsError.py | 0 YouTubeMDBot/errors/NoMatchError.py | 0 YouTubeMDBot/errors/__init__.py | 0 YouTubeMDBot/logging_utils/__init__.py | 0 YouTubeMDBot/logging_utils/utils.py | 0 YouTubeMDBot/requirements.txt | 1 + YouTubeMDBot/tests/downloader.py | 0 YouTubeMDBot/tests/song_search.py | 0 YouTubeMDBot/utils/__init__.py | 1 + YouTubeMDBot/utils/youtube_utils.py | 0 27 files changed, 11 insertions(+), 1 deletion(-) mode change 100644 => 100755 .gitlab-ci.yml mode change 100644 => 100755 YouTubeMDBot/__init__.py mode change 100644 => 100755 YouTubeMDBot/__main__.py mode change 100644 => 100755 YouTubeMDBot/api/__init__.py mode change 100644 => 100755 YouTubeMDBot/api/youtube_api.py mode change 100644 => 100755 YouTubeMDBot/audio/__init__.py mode change 100644 => 100755 YouTubeMDBot/audio/fpcalc.py mode change 100644 => 100755 YouTubeMDBot/bot.py mode change 100644 => 100755 YouTubeMDBot/commands/StartHandler.py mode change 100644 => 100755 YouTubeMDBot/commands/__init__.py mode change 100644 => 100755 YouTubeMDBot/constants/__init__.py mode change 100644 => 100755 YouTubeMDBot/constants/app_constants.py mode change 100644 => 100755 YouTubeMDBot/decorators/__init__.py mode change 100644 => 100755 YouTubeMDBot/decorators/decorators.py mode change 100644 => 100755 YouTubeMDBot/downloader/__init__.py mode change 100644 => 100755 YouTubeMDBot/downloader/youtube_downloader.py mode change 100644 => 100755 YouTubeMDBot/errors/EmptyBodyError.py mode change 100644 => 100755 YouTubeMDBot/errors/InvalidCredentialsError.py mode change 100644 => 100755 YouTubeMDBot/errors/NoMatchError.py mode change 100644 => 100755 YouTubeMDBot/errors/__init__.py mode change 100644 => 100755 YouTubeMDBot/logging_utils/__init__.py mode change 100644 => 100755 YouTubeMDBot/logging_utils/utils.py mode change 100644 => 100755 YouTubeMDBot/requirements.txt mode change 100644 => 100755 YouTubeMDBot/tests/downloader.py mode change 100644 => 100755 YouTubeMDBot/tests/song_search.py mode change 100644 => 100755 YouTubeMDBot/utils/__init__.py mode change 100644 => 100755 YouTubeMDBot/utils/youtube_utils.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/__init__.py b/YouTubeMDBot/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/__main__.py b/YouTubeMDBot/__main__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/api/__init__.py b/YouTubeMDBot/api/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/api/youtube_api.py b/YouTubeMDBot/api/youtube_api.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/audio/__init__.py b/YouTubeMDBot/audio/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/audio/fpcalc.py b/YouTubeMDBot/audio/fpcalc.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/bot.py b/YouTubeMDBot/bot.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/commands/StartHandler.py b/YouTubeMDBot/commands/StartHandler.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/commands/__init__.py b/YouTubeMDBot/commands/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/constants/__init__.py b/YouTubeMDBot/constants/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/constants/app_constants.py b/YouTubeMDBot/constants/app_constants.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/decorators/__init__.py b/YouTubeMDBot/decorators/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/decorators/decorators.py b/YouTubeMDBot/decorators/decorators.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/downloader/__init__.py b/YouTubeMDBot/downloader/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/downloader/youtube_downloader.py b/YouTubeMDBot/downloader/youtube_downloader.py old mode 100644 new mode 100755 index 6139205..dfbb934 --- a/YouTubeMDBot/downloader/youtube_downloader.py +++ b/YouTubeMDBot/downloader/youtube_downloader.py @@ -17,6 +17,7 @@ from typing import Tuple from ..constants.app_constants import YDL_CLI_OPTIONS +from ..audio.ffmpeg import FFmpegOpener class YouTubeDownloader(object): @@ -25,7 +26,7 @@ def __init__(self, url: str): self.__options: list = YDL_CLI_OPTIONS.copy() self.__options.append(self.__url) - def download(self) -> Tuple[BytesIO, bytes]: + def download(self, ffmpeg: bool = False) -> Tuple[BytesIO, bytes]: import subprocess proc = subprocess.Popen(self.__options, @@ -34,6 +35,13 @@ def download(self) -> Tuple[BytesIO, bytes]: stdout, stderr = proc.communicate() retcode = proc.returncode if retcode == 0: + # if ffmpeg: + # opener = FFmpegOpener(stdout) + # opener.open() + # stdout = opener.get_output() + # err = opener.get_extra() + # if err: + # print(err.decode("utf-8")) return BytesIO(stdout), stdout else: raise RuntimeError("youtube-dl downloader exception - more info: " + diff --git a/YouTubeMDBot/errors/EmptyBodyError.py b/YouTubeMDBot/errors/EmptyBodyError.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/errors/InvalidCredentialsError.py b/YouTubeMDBot/errors/InvalidCredentialsError.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/errors/NoMatchError.py b/YouTubeMDBot/errors/NoMatchError.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/errors/__init__.py b/YouTubeMDBot/errors/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/logging_utils/__init__.py b/YouTubeMDBot/logging_utils/__init__.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/logging_utils/utils.py b/YouTubeMDBot/logging_utils/utils.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/requirements.txt b/YouTubeMDBot/requirements.txt old mode 100644 new mode 100755 index d00dddf..e341c34 --- a/YouTubeMDBot/requirements.txt +++ b/YouTubeMDBot/requirements.txt @@ -1,3 +1,4 @@ +mutagen isodate google-api-python-client musicbrainzngs diff --git a/YouTubeMDBot/tests/downloader.py b/YouTubeMDBot/tests/downloader.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/tests/song_search.py b/YouTubeMDBot/tests/song_search.py old mode 100644 new mode 100755 diff --git a/YouTubeMDBot/utils/__init__.py b/YouTubeMDBot/utils/__init__.py old mode 100644 new mode 100755 index d12bbb3..1315c64 --- a/YouTubeMDBot/utils/__init__.py +++ b/YouTubeMDBot/utils/__init__.py @@ -14,3 +14,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . from ..utils import youtube_utils +from ..utils.timeout import timeout diff --git a/YouTubeMDBot/utils/youtube_utils.py b/YouTubeMDBot/utils/youtube_utils.py old mode 100644 new mode 100755