fix: show all search results instead of limiting to 8 songs / 2 card rows

Author: LWWZH

feeluown/gui/components/search.py

@@ -1,6 +1,13 @@
 from datetime import datetime
 
-from PyQt6.QtWidgets import QAbstractItemView, QFrame, QVBoxLayout, QScrollArea
+from PyQt6.QtWidgets import (
+    QFrame,
+    QHBoxLayout,
+    QScrollArea,
+    QVBoxLayout,
+)
+
+from feeluown.gui.widgets.textbtn import TextButton
 
 from feeluown.library import SearchType
 from feeluown.utils.aio import run_afn
@@ -22,6 +29,20 @@
 from feeluown.i18n import t
 
 
+def _toggle_rows(checked, default_count, table, btn):
+    table.set_fixed_row_count(default_count if checked else -1)
+    btn.setText(t("show-more") if checked else t("show-less"))
+
+
+_ACTIVE_TABLE_ATTR = {
+    "songs": "songs_table",
+    "albums": "albums_table",
+    "artists": "artists_table",
+    "playlists": "playlists_table",
+    "videos": "videos_table",
+}
+
+
 Tabs = [
     (t("track"), SearchType.so),
     (t("album"), SearchType.al),
@@ -111,7 +132,6 @@ async def search_and_render(self, q, search_type, source_in):
         tab_index = get_tab_idx(search_type)
         succeed = 0
         start = datetime.now()
-        is_first = True  # Is first search result.
         if source_in is not None:
             source_count = len(source_in)
         else:
@@ -135,21 +155,27 @@ async def search_and_render(self, q, search_type, source_in):
             table_container = TableContainer(app, view.accordion)
             table_container.layout().setContentsMargins(0, 0, 0, 0)
 
-            # HACK: set fixed row for tables.
-            # pylint: disable=protected-access
-            for table in table_container._tables:
-                assert isinstance(table, QAbstractItemView)
-                delegate = table.itemDelegate()
-                if isinstance(delegate, ImgCardListDelegate):
-                    table.set_fixed_row_count(2)
-                    delegate.update_settings("card_min_width", 140)
-                elif isinstance(table, SongsTableView):
-                    table.set_fixed_row_count(8)
-                    table.set_row_height(table.verticalHeader().defaultSectionSize())
-
             renderer = SearchResultRenderer(q, tab_index, source_in=source_in)
             await table_container.set_renderer(renderer)
             _, search_type, attrname, show_handler = renderer.tabs[tab_index]
+
+            # Find the active table and set its fixed row count.
+            active_table = getattr(
+                table_container, _ACTIVE_TABLE_ATTR[attrname]
+            )
+            if isinstance(active_table, SongsTableView):
+                default_count = 8
+                active_table.set_fixed_row_count(default_count)
+                active_table.set_row_height(
+                    active_table.verticalHeader().defaultSectionSize()
+                )
+            else:
+                default_count = 2
+                delegate = active_table.itemDelegate()
+                if isinstance(delegate, ImgCardListDelegate):
+                    active_table.set_fixed_row_count(default_count)
+                    delegate.update_settings("card_min_width", 140)
+
             objects = getattr(result, attrname) or []
             if not objects:  # Result is empty.
                 hint_msgs.append(
@@ -168,12 +194,35 @@ async def search_and_render(self, q, search_type, source_in):
             source = objects[0].source
             provider = app.library.get(source)
             provider_name = provider.name
-            if is_first is False:
-                table_container.hide()
-            view.accordion.add_section(MidHeader(provider_name), table_container, 6, 12)
+
+            header_label = MidHeader(provider_name)
+
+            expand_btn = TextButton(t("show-more"))
+            expand_btn.setCheckable(True)
+            expand_btn.setChecked(True)
+            expand_btn.toggled.connect(
+                lambda checked, tbl=active_table, count=default_count,
+                btn=expand_btn: _toggle_rows(checked, count, tbl, btn)
+            )
+
+            content_widget = QFrame()
+            content_layout = QVBoxLayout(content_widget)
+            content_layout.setContentsMargins(0, 0, 0, 0)
+            content_layout.setSpacing(0)
+            content_layout.addWidget(table_container)
+
+            footer = QFrame()
+            footer_layout = QHBoxLayout(footer)
+            footer_layout.setContentsMargins(0, 0, 0, 0)
+            footer_layout.addStretch()
+            footer_layout.addWidget(expand_btn)
+            content_layout.addWidget(footer)
+
+            view.accordion.add_section(
+                header_label, content_widget, 6, 12
+            )
             renderer.meta_widget.hide()
             renderer.toolbar.hide()
-            is_first = False
         time_cost = (datetime.now() - start).total_seconds()
         hint_msgs.pop(0)
         hint_msgs.insert(

feeluown/gui/widgets/accordion.py

@@ -11,7 +11,7 @@ class ClickableHeader(ClickableMixin, QWidget):
     def __init__(self, header, checked=False, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self._is_checked = False
+        self._is_checked = checked
 
         self.inner_header = header
         self.btn = TextButton(self._get_btn_text(self._is_checked))
@@ -68,3 +68,4 @@ def toggle_content():
         self._layout.addSpacing(header_spacing)
         self._layout.addWidget(content)
         self._layout.addSpacing(section_spacing)
+        return clickable_header

feeluown/i18n/assets/en-US/app.ftl

@@ -585,6 +585,8 @@ remove-item-succeed = Removed { $item } successfully
 # ----------------------------------------
 fold-expand = Expand
 fold-collapse = Collapse
+show-more = Show More
+show-less = Show Less
 fold-tooltip = { fold-expand }/{ fold-collapse }
 recommended-playlist = Made for You
 recommended-daily-playlist = Daily Mixes

feeluown/i18n/assets/ja-JP/app.ftl

@@ -578,6 +578,8 @@ remove-item-succeed = { $item } を削除しました
 # ----------------------------------------
 fold-expand = 展開
 fold-collapse = 収縮
+show-more = もっと見る
+show-less = 収縮
 fold-tooltip = { fold-expand }/{ fold-collapse }
 
 recommended-playlist = おすすめプレイリスト

feeluown/i18n/assets/zh-CN/app.ftl

@@ -578,6 +578,8 @@ remove-item-succeed = 移除 { $item } 成功
 # ----------------------------------------
 fold-expand = 展开
 fold-collapse = 收起
+show-more = 显示更多
+show-less = 收起
 fold-tooltip = { fold-expand }/{ fold-collapse }
 
 recommended-playlist = 推荐歌单