From 2f12ef7bdd0eb4841b37ac092132dd52a612bd94 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sat, 15 Aug 2020 16:50:34 +0300 Subject: [PATCH] minor yt fix --- app/tools/yt.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/tools/yt.py b/app/tools/yt.py index ba358fc9..92e5051d 100644 --- a/app/tools/yt.py +++ b/app/tools/yt.py @@ -43,7 +43,10 @@ class YouTube: self._callback = callback if self._settings.enable_yt_dl: - self._yt_dl = YouTubeDL.get_instance(self._settings, callback=self._callback) + try: + self._yt_dl = YouTubeDL.get_instance(self._settings, callback=self._callback) + except YouTubeException: + pass # NOP @classmethod def get_instance(cls, settings, callback=log): @@ -245,7 +248,7 @@ class YouTubeDL: if hasattr(youtube_dl.version, "__version__"): l_ver = self.get_last_release_id() cur_ver = youtube_dl.version.__version__ - if youtube_dl.version.__version__ < l_ver: + if l_ver and youtube_dl.version.__version__ < l_ver: msg = "youtube-dl has new release!\nCurrent: {}. Last: {}.".format(cur_ver, l_ver) show_notification(msg) log(msg) @@ -262,8 +265,11 @@ class YouTubeDL: def get_last_release_id(): """ Getting last release id. """ url = "https://api.github.com/repos/ytdl-org/youtube-dl/releases/latest" - with urlopen(url, timeout=10) as resp: - return json.loads(resp.read().decode("utf-8")).get("tag_name", "0") + try: + with urlopen(url, timeout=10) as resp: + return json.loads(resp.read().decode("utf-8")).get("tag_name", "0") + except URLError as e: + log("YouTubeDLHelper error [get last release id]: {}".format(e)) def get_latest_release(self): try: