Merge pull request #18 from casualsnek/development

Handle unavailable tracks properly

Author: casualsnek

gui/mainui.py

@@ -24,9 +24,10 @@ def dl_progress_update(data):
     progress = data[2]
     try:
         if status is not None:
-            if 'failed' == status.lower() or 'cancelled' == status.lower():
+            if status.lower() in ['failed', 'cancelled', 'unavailable']:
                 downloads_status[media_id]["btn"]['cancel'].hide()
-                downloads_status[media_id]["btn"]['retry'].show()
+                if status.lower() != "unavailable":
+                    downloads_status[media_id]["btn"]['retry'].show()
             if 'downloading' == status.lower():
                 downloads_status[media_id]["btn"]['cancel'].show()
                 downloads_status[media_id]["btn"]['retry'].hide()
@@ -52,7 +53,7 @@ def dl_progress_update(data):
 
 
 def retry_all_failed_downloads():
-    for dl_id in failed_downloads.keys():
+    for dl_id in list(failed_downloads.keys()):
         downloads_status[dl_id]["status_label"].setText("Waiting")
         downloads_status[dl_id]["btn"]['cancel'].show()
         downloads_status[dl_id]["btn"]['retry'].hide()
@@ -62,12 +63,12 @@ def retry_all_failed_downloads():
 
 def cancel_all_downloads():
     for did in downloads_status.keys():
+        print('Trying to cancel : ', did)
         try:
-            if downloads_status[did]['progress_bar'].value() < 95:
-                if did not in cancel_list:
-                    cancel_list[did] = {}
+            if downloads_status[did]['progress_bar'].value() < 95 and did not in cancel_list:
+                cancel_list[did] = {}
         except (KeyError, RuntimeError):
-            pass
+            logger.info('Cannot cancel media id: {did}, this might have been cleared')
 
 
 class MainWindow(QMainWindow):
@@ -251,6 +252,23 @@ def __toggle_advanced(self):
 
     def __add_item_to_downloads(self, item):
         # Create progress status
+        if item['item_id'] in downloads_status:
+            # If the item is in download status dictionary, it's not cleared from view
+            logger.info('The media: {item["item"]} was already in view')
+            if item['item_id'] in cancel_list:
+                logger.info('The media: {item["item"]} was being cancelled, preventing cancellation !')
+                cancel_list.pop(item['item_id'])
+            elif item['item_id'] in failed_downloads:
+                dl_id = item['item_id']
+                logger.info('The media: {item["item"]} had failed to download, re-downoading ! !')
+                downloads_status[dl_id]["status_label"].setText("Waiting")
+                downloads_status[dl_id]["btn"]['cancel'].show()
+                downloads_status[dl_id]["btn"]['retry'].hide()
+                download_queue.put(failed_downloads[dl_id].copy())
+                failed_downloads.pop(dl_id)
+            else:
+                logger.info('The media: {item["item"]} is already in queue and is being downloaded, ignoring.. !')
+            return None
         pbar = QProgressBar()
         pbar.setValue(0)
         cancel_btn = QPushButton()
@@ -654,21 +672,10 @@ def __mass_action_dl(self, result_type):
 
     def rem_complete_from_table(self):
         logger.info('Clearing complete downloads')
-        complete_ids = []
-        for dl_id in downloads_status.keys():
-            try:
-                logger.info(f"Checking download status for media id: {dl_id}, "
-                            f"{downloads_status[dl_id]['progress_bar'].value()}")
-                if downloads_status[dl_id]['progress_bar'].value() == 100 or \
-                        downloads_status[dl_id]['status_label'].text().lower() == 'cancelled':
-                    logger.info(f'ID: {dl_id} is complete or cancelled')
-                    complete_ids.append(dl_id)
-            except (RuntimeError, AttributeError):
-                logger.info(f"Checking download status for media id: {dl_id}, Runtime error->Removing")
-                complete_ids.append(dl_id)
         rows = self.tbl_dl_progress.rowCount()
         for i in range(rows):
-            id_val = self.tbl_dl_progress.item(i, 0).text()
-            if id_val in complete_ids:
+            progress = self.tbl_dl_progress.item(i, 5).value()
+            status = self.tbl_dl_progress.item(i, 4).text()
+            if progress == 100 or status in ['cancelled', 'unavailable']:
                 self.tbl_dl_progress.removeRow(i)
-            downloads_status.pop(id_val)
+            downloads_status.pop(self.tbl_dl_progress.item(i, 0).text())

runtimedata.py

@@ -25,6 +25,7 @@
 downloads_status = {}
 playlist_m3u_queue = {}
 downloaded_data = {}
+unavailable = set()
 
 loglevel = int(os.environ.get("LOG_LEVEL", 20))
 

worker/downloader.py

@@ -7,7 +7,7 @@
 from librespot.audio.decoders import AudioQuality, VorbisOnlyAudioQuality
 from librespot.metadata import TrackId, EpisodeId
 from otsconfig import config
-from runtimedata import get_logger, cancel_list, failed_downloads
+from runtimedata import get_logger, cancel_list, failed_downloads, unavailable
 from utils.spotify import check_premium, get_song_info, convert_audio_format, set_music_thumbnail, set_audio_tags, \
     get_episode_info, get_track_lyrics
 
@@ -30,9 +30,11 @@ def download_track(self, session, track_id_str, extra_paths="", force_album_form
             f"Downloading track by id '{track_id_str}', extra_paths: '{extra_paths}', "
             f"extra_path_as_root: '{extra_path_as_root}' ")
         if trk_track_id_str in cancel_list:
+            logger.info(f'The media : {trk_track_id_str} was cancelled !')
             self.progress.emit([trk_track_id_str, "Cancelled", [0, 100]])
             cancel_list.pop(trk_track_id_str)
             failed_downloads[trk_track_id_str] = {}
+            self.__last_cancelled = True
             return False
         skip_existing_file = True
         chunk_size = config.get("chunk_size")
@@ -67,13 +69,15 @@ def download_track(self, session, track_id_str, extra_paths="", force_album_form
             return False
         try:
             if not is_playable:
-                self.progress.emit([trk_track_id_str, "Unavailable", None])
                 logger.error(f"Track is unavailable, track id '{trk_track_id_str}'")
+                self.progress.emit([trk_track_id_str, "Unavailable", [0, 100]])
+                self.__last_cancelled = True
                 return False
             else:
                 if os.path.isfile(filename) and os.path.getsize(filename) and skip_existing_file:
                     self.progress.emit([trk_track_id_str, "Already exists", [100, 100],
                                         filename, f'{name} [{_artist} - {album_name}:{release_year}].mp3'])
+                    unavailable.add(trk_track_id_str)
                     logger.info(f"File already exists, Skipping download for track by id '{trk_track_id_str}'")
                     self.__last_cancelled = True
                     return True

worker/utility.py

@@ -2,7 +2,7 @@
 import time
 from PyQt5.QtCore import QObject, pyqtSignal
 from otsconfig import config
-from runtimedata import get_logger, playlist_m3u_queue, downloaded_data, session_pool
+from runtimedata import get_logger, playlist_m3u_queue, downloaded_data, session_pool, unavailable
 from utils.spotify import get_album_tracks, get_album_name, get_artist_albums, get_show_episodes, get_episode_info, \
     get_song_info, get_tracks_from_playlist, get_playlist_data
 
@@ -17,22 +17,24 @@ class PlayListMaker(QObject):
     def run(self):
         logger.info('Playlist m3u8 builder is running....')
         while not self.__stop:
-            play_queue = playlist_m3u_queue.copy()
-            ddc = downloaded_data.copy()
-            for play_id in play_queue:
+            ddc = set(downloaded_data.keys()).difference(unavailable)
+            for play_id in list(playlist_m3u_queue.keys()):
                 logger.info(f'Playlist m3u8 checking ID {play_id}')
-                if set(play_queue[play_id]['tracks']).intersection(set(ddc.keys())) == set(
-                        play_queue[play_id]['tracks']):
+                if set(playlist_m3u_queue[play_id]['tracks']).intersection(ddc) == set(
+                        playlist_m3u_queue[play_id]['tracks']):
                     logger.info(f'Playlist {play_id} has all items ready, making m3u8 playlist at: '
                                 f'{{play_queue[play_id]["filename"]}}!')
                     # Write the m3u8 header
-                    os.makedirs(os.path.dirname(play_queue[play_id]['filename']), exist_ok=True)
-                    with open(play_queue[play_id]['filename'], 'w') as f:
+                    os.makedirs(os.path.dirname(playlist_m3u_queue[play_id]['filename']), exist_ok=True)
+                    with open(playlist_m3u_queue[play_id]['filename'], 'w') as f:
                         f.write('#EXTM3U\n')
                     tid = 1
-                    for track_id in play_queue[play_id]['tracks']:
+                    for track_id in playlist_m3u_queue[play_id]['tracks']:
                         logger.info(f'Playlist: {play_id}, adding track: {track_id} to m3u8')
-                        with open(play_queue[play_id]['filename'], 'a') as f:
+                        if track_id in unavailable:
+                            logger.info(f'Playlist: {play_id}, track: {track_id}  unavailable for adding, skipping')
+                            continue
+                        with open(playlist_m3u_queue[play_id]['filename'], 'a') as f:
                             f.write(
                                 f'#EXTINF:{tid}, {downloaded_data[track_id]["media_name"]}\n'
                                 f'{downloaded_data[track_id]["media_path"]}\n'