From 7d6f9fc6e1d3f51aa2f45da071969b89e8d59724 Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Mon, 23 Oct 2023 13:41:17 +0200 Subject: [PATCH] * Playlist content will be displayed in table. * Can select multiple items to download. --- TIDALDL-PY/tidal_dl/gui.py | 43 ++++++++++++++++++++++++++---------- TIDALDL-PY/tidal_dl/tidal.py | 3 ++- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/TIDALDL-PY/tidal_dl/gui.py b/TIDALDL-PY/tidal_dl/gui.py index ddb10dc..8e6b004 100644 --- a/TIDALDL-PY/tidal_dl/gui.py +++ b/TIDALDL-PY/tidal_dl/gui.py @@ -111,7 +111,7 @@ else: self.c_tableInfo.setShowGrid(False) self.c_tableInfo.verticalHeader().setVisible(False) self.c_tableInfo.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) - self.c_tableInfo.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection) + self.c_tableInfo.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.c_tableInfo.horizontalHeader().setStretchLastSection(True) self.c_tableInfo.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.ResizeToContents) self.c_tableInfo.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) @@ -128,12 +128,12 @@ else: self.tree_playlists.resize(200, 400) self.tree_playlists.setColumnCount(2) self.tree_playlists.setHeaderLabels(("Name", "# Tracks")) - self.tree_playlists.setColumnWidth(0, 250) + self.tree_playlists.setColumnWidth(0, 200) # print self.c_printTextEdit = QtWidgets.QTextEdit() self.c_printTextEdit.setReadOnly(True) - self.c_printTextEdit.setFixedHeight(150) + self.c_printTextEdit.setFixedHeight(100) sys.stdout = EmittingStream(textWritten=self.__output__) sys.stderr = EmittingStream(textWritten=self.__output__) @@ -158,17 +158,19 @@ else: self.funcGrid.addWidget(self.c_printTextEdit) self.mainGrid = QtWidgets.QGridLayout(self) - self.mainGrid.addWidget(self.tree_playlists, 0, 0) - self.mainGrid.addLayout(self.funcGrid, 0, 1) + self.mainGrid.addWidget(self.tree_playlists, 0, 0, 1, 2) + self.mainGrid.addLayout(self.funcGrid, 0, 2, 1, 3) self.mainGrid.addWidget(self.c_widgetSetting, 0, 0) # connect self.c_btnSearch.clicked.connect(self.search) + self.c_lineSearch.returnPressed.connect(self.search) self.c_btnDownload.clicked.connect(self.download) self.s_downloadEnd.connect(self.downloadEnd) self.c_combTQuality.currentIndexChanged.connect(self.changeTQuality) self.c_combVQuality.currentIndexChanged.connect(self.changeVQuality) self.c_btnSetting.clicked.connect(self.showSettings) + self.tree_playlists.itemClicked.connect(self.playlist_display_tracks) def addItem(self, rowIdx: int, colIdx: int, text): if isinstance(text, str): @@ -205,22 +207,25 @@ else: self.__info__('No result！') return - self.c_tableInfo.setRowCount(len(self.s_array)) - for index, item in enumerate(self.s_array): + self.set_table_search_results(self.s_array, self.s_type) + + def set_table_search_results(self, s_array, s_type): + self.c_tableInfo.setRowCount(len(s_array)) + for index, item in enumerate(s_array): self.addItem(index, 0, str(index + 1)) - if self.s_type in [Type.Album, Type.Track]: + if s_type in [Type.Album, Type.Track]: self.addItem(index, 1, item.title) self.addItem(index, 2, TIDAL_API.getArtistsName(item.artists)) self.addItem(index, 3, item.audioQuality) - elif self.s_type in [Type.Video]: + elif s_type in [Type.Video]: self.addItem(index, 1, item.title) self.addItem(index, 2, TIDAL_API.getArtistsName(item.artists)) self.addItem(index, 3, item.quality) - elif self.s_type in [Type.Playlist]: + elif s_type in [Type.Playlist]: self.addItem(index, 1, item.title) self.addItem(index, 2, '') self.addItem(index, 3, '') - elif self.s_type in [Type.Artist]: + elif s_type in [Type.Artist]: self.addItem(index, 1, item.name) self.addItem(index, 2, '') self.addItem(index, 3, '') @@ -228,10 +233,16 @@ else: def download(self): index = self.c_tableInfo.currentIndex().row() - if index < 0: + selection = self.c_tableInfo.selectionModel() + has_selection = selection.hasSelection() + + if has_selection == False: self.__info__('Please select a row first.') return + rows = self.c_tableInfo.selectionModel().selectedRows() + index = rows[0].row() + self.c_btnDownload.setEnabled(False) item_to_download = "" if isinstance(self.s_array[index], Artist): @@ -287,6 +298,14 @@ else: item = QtWidgets.QTreeWidgetItem(self.tree_playlists) item.setText(0, playlist.name) item.setText(1, str(playlist.num_tracks)) + item.setText(2, playlist.id) + + def playlist_display_tracks(self, item, column): + tracks = TIDAL_API.get_playlist_items(item.text(2)) + self.s_array = tracks + self.s_type = Type.Track + + self.set_table_search_results(tracks, Type.Track) def startGui(): aigpy.cmd.enableColor(False) diff --git a/TIDALDL-PY/tidal_dl/tidal.py b/TIDALDL-PY/tidal_dl/tidal.py index 1e5c137..b590692 100644 --- a/TIDALDL-PY/tidal_dl/tidal.py +++ b/TIDALDL-PY/tidal_dl/tidal.py @@ -492,7 +492,8 @@ class TidalAPI(object): return playlists def get_playlist_items(self, playlist_id: int) -> Union[tidalapi.Playlist, tidalapi.UserPlaylist]: - tracks = self.session.playlist(playlist_id).items() + #tracks = self.session.playlist(playlist_id).items() + tracks, videos = TIDAL_API.getItems(playlist_id, Type.Playlist) return tracks