From 0d1c3c4cef19ffbac5a7b852834cf8af151bc11c Mon Sep 17 00:00:00 2001
From: Taras Terletskyi <888784+tropicoo@users.noreply.github.com>
Date: Sat, 11 Mar 2023 00:54:50 +0200
Subject: [PATCH] Bump version to 1.1

---
 app_bot/bot/version.py               |  2 +-
 app_worker/worker/core/downloader.py | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app_bot/bot/version.py b/app_bot/bot/version.py
index 7e49527..439eb0c 100644
--- a/app_bot/bot/version.py
+++ b/app_bot/bot/version.py
@@ -1 +1 @@
-__version__ = '1.0'
+__version__ = '1.1'
diff --git a/app_worker/worker/core/downloader.py b/app_worker/worker/core/downloader.py
index 981fd05..a16e147 100644
--- a/app_worker/worker/core/downloader.py
+++ b/app_worker/worker/core/downloader.py
@@ -34,6 +34,10 @@ except ImportError:
     )
 
 
+class MediaDownloaderError(Exception):
+    pass
+
+
 class MediaDownloader:
     _PLAYLIST_TYPE = 'playlist'
     _DESTINATION_TMP_DIR_NAME_LEN = 4
@@ -85,14 +89,19 @@ class MediaDownloader:
                 self._log.info('Downloading %s', url)
                 self._log.info('Downloading to %s', curr_tmp_dir)
                 self._log.info('Downloading with options %s', ytdl_opts)
-                meta = ytdl.extract_info(url, download=True)
+
+                meta: dict | None = ytdl.extract_info(url, download=True)
+                current_files = os.listdir(curr_tmp_dir)
+                if not meta and not current_files:
+                    err_msg = f'Nothing downloaded. Is URL valid? "{url}"'
+                    self._log.error(err_msg)
+                    raise MediaDownloaderError(err_msg)
+
                 meta_sanitized = ytdl.sanitize_info(meta)
 
             self._log.info('Finished downloading %s', url)
             self._log.info('Downloaded "%s" meta: %s', url, meta_sanitized)
-            self._log.info(
-                'Content of "%s": %s', curr_tmp_dir, os.listdir(curr_tmp_dir)
-            )
+            self._log.info('Content of "%s": %s', curr_tmp_dir, current_files)
 
             destination_dir = os.path.join(
                 os.path.join(