Skip to content

Commit

Permalink
Merge pull request #105 from exislow/87-feature-add-a-possibilty-to-f…
Browse files Browse the repository at this point in the history 
…ilter-columns

87 feature add a possibilty to filter columns
  • Loading branch information
@exislow
exislow authored May 15, 2024
2 parents 0427811 + 8fc6298 commit a41931f
Show file tree
Hide file tree
Showing 4 changed files with 227 additions and 104 deletions.
125 changes: 83 additions & 42 deletions tidal_dl_ng/gui.py
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import math
import sys
import time
from collections.abc import Callable
from collections.abc import Callable, Sequence

from PySide6.QtGui import QStandardItem
from requests.exceptions import HTTPError

from tidal_dl_ng import __version__, update_available
from tidal_dl_ng.dialog import DialogLogin, DialogPreferences, DialogVersion
from tidal_dl_ng.helper.gui import (
FilterHeader,
HumanProxyModel,
get_queue_download_media,
get_queue_download_quality,
get_results_media_item,
get_user_list_media_item,
set_queue_download_media,
set_results_media,
set_user_list_media,
)
from tidal_dl_ng.helper.path import get_format_template, resource_path
Expand Down Expand Up @@ -64,6 +66,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
tray: QtWidgets.QSystemTrayIcon
spinner: QtWaitingSpinner
cover_url_current: str = ""
model_tr_results: QtGui.QStandardItemModel = QtGui.QStandardItemModel()
proxy_tr_results: HumanProxyModel
s_spinner_start: QtCore.Signal = QtCore.Signal(QtWidgets.QWidget)
s_spinner_stop: QtCore.Signal = QtCore.Signal()
pb_item: QtWidgets.QProgressBar
Expand Down Expand Up @@ -98,7 +102,8 @@ def __init__(self, tidal: Tidal | None = None):
self.settings = Settings()

self._init_threads()
self._init_tree_results(self.tr_results)
self._init_tree_results_model(self.model_tr_results)
self._init_tree_results(self.tr_results, self.model_tr_results)
self._init_tree_lists(self.tr_lists_user)
self._init_tree_queue(self.tr_queue_download)
self._init_info()
Expand Down Expand Up @@ -213,7 +218,30 @@ def _populate_search_types(self, ui_target: QtWidgets.QComboBox, options: Search

self.cb_search_type.setCurrentIndex(2)

def _init_tree_results(self, tree: QtWidgets.QTableWidget):
def handle_filter_activated(self):
header: FilterHeader = self.tr_results.header()
filters = []

for i in range(header.count()):
text: str = header.filter_text(i)

if text:
filters.append((i, text))

proxy_model: HumanProxyModel = self.tr_results.model()
proxy_model.filters = filters

def _init_tree_results(self, tree: QtWidgets.QTreeView, model: QtGui.QStandardItemModel) -> None:
header: FilterHeader = FilterHeader(tree)
self.proxy_tr_results: HumanProxyModel = HumanProxyModel(self)

tree.setHeader(header)
tree.setModel(model)
self.proxy_tr_results.setSourceModel(model)
tree.setModel(self.proxy_tr_results)
header.set_filter_boxes(model.columnCount())
header.filter_activated.connect(self.handle_filter_activated)
## Styling
tree.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
tree.setColumnHidden(1, True)
tree.setColumnWidth(2, 150)
Expand All @@ -224,6 +252,11 @@ def _init_tree_results(self, tree: QtWidgets.QTableWidget):

header.setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeToContents)

def _init_tree_results_model(self, model: QtGui.QStandardItemModel) -> None:
model.setColumnCount(7)
model.setRowCount(0)
model.setHorizontalHeaderLabels(["#", "obj", "Artist", "Title", "Album", "Duration", "Quality"])

def _init_tree_queue(self, tree: QtWidgets.QTableWidget):
tree.setColumnHidden(1, True)
tree.setColumnWidth(2, 200)
Expand Down Expand Up @@ -357,28 +390,30 @@ def on_download_list_media(self, point: QtCore.QPoint = None):
self.queue_download_media(queue_dl_item)

def search_populate_results(self, query: str, type_media: SearchTypes):
self.tr_results.clear()
self.model_tr_results.removeRows(0, self.model_tr_results.rowCount())

results: [ResultItem] = self.search(query, [type_media])

self.populate_tree_results(results)

def populate_tree_results(self, results: [ResultItem], parent: QtWidgets.QTreeWidgetItem = None):
def populate_tree_results(self, results: [ResultItem], parent: QtGui.QStandardItem = None):
if not parent:
self.tr_results.clear()
self.model_tr_results.removeRows(0, self.model_tr_results.rowCount())

# Count how many digits the list length has,
count_digits: int = int(math.log10(len(results) if results else 1)) + 1

for item in results:
child = self.populate_tree_result_child(item=item, index_count_digits=count_digits)
child: tuple = self.populate_tree_result_child(item=item, index_count_digits=count_digits)

if parent:
parent.addChild(child)
parent.appendRow(child)
else:
self.s_tr_results_add_top_level_item.emit(child)

def populate_tree_result_child(self, item: [Track | Video | Mix | Album | Playlist], index_count_digits: int):
def populate_tree_result_child(
self, item: [Track | Video | Mix | Album | Playlist], index_count_digits: int
) -> Sequence[QStandardItem]:
duration: str = ""

# TODO: Duration needs to be calculated later to properly fill with zeros.
Expand All @@ -391,26 +426,30 @@ def populate_tree_result_child(self, item: [Track | Video | Mix | Album | Playli
index: str = str(item.position + 1).zfill(index_count_digits)

# Populate child
child: QtWidgets.QTreeWidgetItem = QtWidgets.QTreeWidgetItem()
child.setText(0, index)
set_results_media(child, item.obj)
child.setText(2, item.artist)
child.setText(3, item.title)
child.setText(4, item.album)
child.setText(5, duration)
child.setText(6, item.quality)
child_index: QtGui.QStandardItem = QtGui.QStandardItem(index)
# TODO: Move to own method
child_obj: QtGui.QStandardItem = QtGui.QStandardItem()

child_obj.setData(item.obj, QtCore.Qt.ItemDataRole.UserRole)
# set_results_media(child, item.obj)

child_artist: QtGui.QStandardItem = QtGui.QStandardItem(item.artist)
child_title: QtGui.QStandardItem = QtGui.QStandardItem(item.title)
child_album: QtGui.QStandardItem = QtGui.QStandardItem(item.album)
child_duration: QtGui.QStandardItem = QtGui.QStandardItem(duration)
child_quality: QtGui.QStandardItem = QtGui.QStandardItem(item.quality)

if isinstance(item.obj, Mix | Playlist | Album | Artist):
# Add a disabled dummy child, so expansion arrow will appear. This Child will be replaced on expansion.
child_dummy: QtWidgets.QTreeWidgetItem = QtWidgets.QTreeWidgetItem()
child_dummy: QtGui.QStandardItem = QtGui.QStandardItem()

child_dummy.setDisabled(True)
child.addChild(child_dummy)
child_dummy.setEnabled(False)
child_index.appendRow(child_dummy)

return child
return child_index, child_obj, child_artist, child_title, child_album, child_duration, child_quality

def on_tr_results_add_top_level_item(self, widget_item: QtWidgets.QTreeWidgetItem):
self.tr_results.addTopLevelItem(widget_item)
def on_tr_results_add_top_level_item(self, item_child: Sequence[QtGui.QStandardItem]):
self.model_tr_results.appendRow(item_child)

def on_settings_save(self):
self.settings.save()
Expand Down Expand Up @@ -625,11 +664,11 @@ def _init_signals(self):
self.a_version.triggered.connect(self.on_version)
self.a_preferences.triggered.connect(self.on_preferences)
self.a_logout.triggered.connect(self.on_logout)
self.a_updates_check.triggered.connect(lambda x: self.on_update_check(False))
self.a_updates_check.triggered.connect(lambda: self.on_update_check(False))

# Results
self.tr_results.itemExpanded.connect(self.on_tr_results_expanded)
self.tr_results.itemClicked.connect(self.on_result_item_clicked)
self.tr_results.expanded.connect(self.on_tr_results_expanded)
self.tr_results.clicked.connect(self.on_result_item_clicked)

# Download Queue
self.tr_queue_download.itemClicked.connect(self.on_queue_download_item_clicked)
Expand Down Expand Up @@ -678,8 +717,10 @@ def on_list_items_show(self, item: QtWidgets.QTreeWidgetItem):
self.list_items_show_result(media_list)
self.cover_show(media_list)

def on_result_item_clicked(self, item: QtWidgets.QTreeWidgetItem, column: int) -> None:
media: Track | Video | Album | Artist = get_results_media_item(item)
def on_result_item_clicked(self, index: QtCore.QModelIndex) -> None:
media: Track | Video | Album | Artist = get_results_media_item(
index, self.proxy_tr_results, self.model_tr_results
)

self.cover_show(media)

Expand All @@ -688,11 +729,6 @@ def on_queue_download_item_clicked(self, item: QtWidgets.QTreeWidgetItem, column

self.cover_show(media)

def on_download_item_clicked(self, item: QtWidgets.QTreeWidgetItem, column: int) -> None:
media: Track | Video | Album | Artist = get_results_media_item(item)

self.cover_show(media)

def cover_show(self, media: Album | Playlist | Track | Video | Album | Artist) -> None:
cover_url: str

Expand All @@ -715,7 +751,7 @@ def list_items_show_result(
self,
media_list: Album | Playlist | Mix | Artist | None = None,
point: QtCore.QPoint | None = None,
parent: QtWidgets.QTreeWidgetItem = None,
parent: QtGui.QStandardItem = None,
) -> None:
if point:
item = self.tr_lists_user.itemAt(point)
Expand Down Expand Up @@ -766,13 +802,15 @@ def on_queue_download_remove(self):

# TODO: Must happen in main thread. Do not thread this.
def on_download_results(self) -> None:
items: [QtWidgets.QTreeWidgetItem | None] = self.tr_results.selectedItems()
items: [HumanProxyModel | None] = self.tr_results.selectionModel().selectedRows()

if len(items) == 0:
logger_gui.error("Please select a row first.")
else:
for item in items:
media: Track | Album | Playlist | Video | Artist = get_results_media_item(item)
media: Track | Album | Playlist | Video | Artist = get_results_media_item(
item, self.proxy_tr_results, self.model_tr_results
)
queue_dl_item: QueueDownloadItem = self.media_to_queue_download_model(media)

if queue_dl_item:
Expand Down Expand Up @@ -921,15 +959,18 @@ def on_version(
def on_preferences(self) -> None:
DialogPreferences(settings=self.settings, settings_save=self.s_settings_save, parent=self)

def on_tr_results_expanded(self, list_item: QtWidgets.QTreeWidgetItem) -> None:
def on_tr_results_expanded(self, index: QtCore.QModelIndex) -> None:
# If the child is a dummy the list_item has not been expanded before
load_children: bool = list_item.child(0).isDisabled()
item: QtGui.QStandardItem = self.model_tr_results.itemFromIndex(self.proxy_tr_results.mapToSource(index))
load_children: bool = not item.child(0, 0).isEnabled()

if load_children:
list_item.removeChild(list_item.child(0))
media_list: [Mix | Album | Playlist | Artist] = list_item.data(1, QtCore.Qt.ItemDataRole.UserRole)
item.removeRow(0)
media_list: [Mix | Album | Playlist | Artist] = get_results_media_item(
index, self.proxy_tr_results, self.model_tr_results
)

self.list_items_show_result(media_list=media_list, parent=list_item)
self.list_items_show_result(media_list=media_list, parent=item)

def button_reload_status(self, status: bool):
button_text: str = "Reloading..."
Expand Down
Loading

0 comments on commit a41931f

Please sign in to comment.