v0.74.0: Sync Settings shares one selection with every friend by default, scrolls on a small screen, and searches playlists
- "Share the same selection with all friends" is on by default (a saved choice is kept) - each page scrolls and the window opens no bigger than the screen; the General page with its selector held the window taller than a laptop - a search box over the Playlists list (every word, case-folded, in the name, like the sidebar's); while either search is up, Select All / Select None reach only what it shows
This commit is contained in:
@@ -1,3 +1,3 @@
|
|||||||
"""LinTunes — iTunes-style music library manager and player for Linux."""
|
"""LinTunes — iTunes-style music library manager and player for Linux."""
|
||||||
|
|
||||||
__version__ = "0.73.2"
|
__version__ = "0.74.0"
|
||||||
|
|||||||
@@ -160,7 +160,9 @@ class Friend:
|
|||||||
class CassetteState:
|
class CassetteState:
|
||||||
display_name: str = field(default_factory=default_display_name)
|
display_name: str = field(default_factory=default_display_name)
|
||||||
avatar: str = "" # filename inside the cassette root, "" = none
|
avatar: str = "" # filename inside the cassette root, "" = none
|
||||||
share_same_for_all: bool = False
|
# On by default (Round 105): one selection for everyone is what a first
|
||||||
|
# friend expects; per-friend pages are the exception.
|
||||||
|
share_same_for_all: bool = True
|
||||||
general: Selection = field(default_factory=Selection)
|
general: Selection = field(default_factory=Selection)
|
||||||
invites: dict = field(default_factory=dict) # token -> Invite
|
invites: dict = field(default_factory=dict) # token -> Invite
|
||||||
friends: dict = field(default_factory=dict) # token -> Friend
|
friends: dict = field(default_factory=dict) # token -> Friend
|
||||||
@@ -189,7 +191,7 @@ class CassetteState:
|
|||||||
d = d or {}
|
d = d or {}
|
||||||
state = cls(display_name=d.get("display_name") or default_display_name(),
|
state = cls(display_name=d.get("display_name") or default_display_name(),
|
||||||
avatar=d.get("avatar", ""),
|
avatar=d.get("avatar", ""),
|
||||||
share_same_for_all=bool(d.get("share_same_for_all", False)),
|
share_same_for_all=bool(d.get("share_same_for_all", True)),
|
||||||
general=Selection.from_dict(d.get("general")),
|
general=Selection.from_dict(d.get("general")),
|
||||||
probing=dict(d.get("probing", {})),
|
probing=dict(d.get("probing", {})),
|
||||||
rejected=dict(d.get("rejected", {})),
|
rejected=dict(d.get("rejected", {})),
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ Two independent sections. **Library** is a column browser like the main
|
|||||||
window's (genre / artist / album, then the tracks), with a checkbox beside
|
window's (genre / artist / album, then the tracks), with a checkbox beside
|
||||||
every artist, album and track and a **Share whole library** box above it.
|
every artist, album and track and a **Share whole library** box above it.
|
||||||
**Playlists** is every playlist with a checkbox and **Share all playlists**.
|
**Playlists** is every playlist with a checkbox and **Share all playlists**.
|
||||||
Both have Select All / Select None. Nothing is shared by default.
|
Both have Select All / Select None and a search box that filters the way
|
||||||
|
the main window's do (every word, case-folded: the song search's fields for
|
||||||
|
the library, the name for playlists); while a search is up, Select All /
|
||||||
|
Select None reach only what it shows. Nothing is shared by default.
|
||||||
|
|
||||||
Checking an artist or album checks the tracks shown under it (a snapshot: a
|
Checking an artist or album checks the tracks shown under it (a snapshot: a
|
||||||
new album appears unchecked later). A shared playlist's tracks are checked
|
new album appears unchecked later). A shared playlist's tracks are checked
|
||||||
@@ -143,6 +146,8 @@ class ShareSelector(QWidget):
|
|||||||
top.addWidget(self.search)
|
top.addWidget(self.search)
|
||||||
self.lib_all = QPushButton("Select All")
|
self.lib_all = QPushButton("Select All")
|
||||||
self.lib_none = QPushButton("Select None")
|
self.lib_none = QPushButton("Select None")
|
||||||
|
self.lib_all.setToolTip("Select every song shown")
|
||||||
|
self.lib_none.setToolTip("Unselect every song shown")
|
||||||
self.lib_all.clicked.connect(lambda: self._select_all_tracks(True))
|
self.lib_all.clicked.connect(lambda: self._select_all_tracks(True))
|
||||||
self.lib_none.clicked.connect(lambda: self._select_all_tracks(False))
|
self.lib_none.clicked.connect(lambda: self._select_all_tracks(False))
|
||||||
top.addWidget(self.lib_all)
|
top.addWidget(self.lib_all)
|
||||||
@@ -195,6 +200,11 @@ class ShareSelector(QWidget):
|
|||||||
self.all_playlists.toggled.connect(self._on_all_playlists)
|
self.all_playlists.toggled.connect(self._on_all_playlists)
|
||||||
top.addWidget(self.all_playlists)
|
top.addWidget(self.all_playlists)
|
||||||
top.addStretch(1)
|
top.addStretch(1)
|
||||||
|
self.playlist_search = QLineEdit()
|
||||||
|
self.playlist_search.setPlaceholderText("search")
|
||||||
|
self.playlist_search.setClearButtonEnabled(True)
|
||||||
|
self.playlist_search.textChanged.connect(self._on_playlist_search)
|
||||||
|
top.addWidget(self.playlist_search)
|
||||||
self.pl_all = QPushButton("Select All")
|
self.pl_all = QPushButton("Select All")
|
||||||
self.pl_none = QPushButton("Select None")
|
self.pl_none = QPushButton("Select None")
|
||||||
self.pl_all.clicked.connect(lambda: self._select_all_playlists(True))
|
self.pl_all.clicked.connect(lambda: self._select_all_playlists(True))
|
||||||
@@ -345,6 +355,13 @@ class ShareSelector(QWidget):
|
|||||||
if tokens else self._tracks)
|
if tokens else self._tracks)
|
||||||
self._populate_genres()
|
self._populate_genres()
|
||||||
|
|
||||||
|
def _on_playlist_search(self, text: str):
|
||||||
|
tokens = text.casefold().split()
|
||||||
|
for row in range(self.playlists.count()):
|
||||||
|
item = self.playlists.item(row)
|
||||||
|
name = item.text().casefold()
|
||||||
|
item.setHidden(not all(token in name for token in tokens))
|
||||||
|
|
||||||
def _on_whole_library(self, on: bool):
|
def _on_whole_library(self, on: bool):
|
||||||
self.selection.all_library = on
|
self.selection.all_library = on
|
||||||
self._browser_host.setEnabled(not on)
|
self._browser_host.setEnabled(not on)
|
||||||
@@ -391,7 +408,13 @@ class ShareSelector(QWidget):
|
|||||||
self.changed.emit()
|
self.changed.emit()
|
||||||
|
|
||||||
def _select_all_tracks(self, on: bool):
|
def _select_all_tracks(self, on: bool):
|
||||||
|
if self._search_text:
|
||||||
|
shown = {t.track_id for t in self._visible}
|
||||||
if on:
|
if on:
|
||||||
|
self.selection.track_ids |= shown
|
||||||
|
else:
|
||||||
|
self.selection.track_ids -= shown
|
||||||
|
elif on:
|
||||||
self.selection.track_ids = set(self._library.tracks)
|
self.selection.track_ids = set(self._library.tracks)
|
||||||
else:
|
else:
|
||||||
self.selection.track_ids = set()
|
self.selection.track_ids = set()
|
||||||
@@ -399,11 +422,18 @@ class ShareSelector(QWidget):
|
|||||||
self.changed.emit()
|
self.changed.emit()
|
||||||
|
|
||||||
def _select_all_playlists(self, on: bool):
|
def _select_all_playlists(self, on: bool):
|
||||||
pids = {p.persistent_id for p in share.shareable_playlists(self._library)}
|
shown = [self.playlists.item(row) for row in range(self.playlists.count())
|
||||||
|
if not self.playlists.item(row).isHidden()]
|
||||||
|
pids = {item.data(KEY_ROLE) for item in shown}
|
||||||
|
if len(shown) == self.playlists.count():
|
||||||
self.selection.playlist_ids = set(pids) if on else set()
|
self.selection.playlist_ids = set(pids) if on else set()
|
||||||
|
elif on:
|
||||||
|
self.selection.playlist_ids |= pids
|
||||||
|
else:
|
||||||
|
self.selection.playlist_ids -= pids
|
||||||
self.playlists.blockSignals(True)
|
self.playlists.blockSignals(True)
|
||||||
for row in range(self.playlists.count()):
|
for item in shown:
|
||||||
self.playlists.item(row).setCheckState(CHECKED if on else UNCHECKED)
|
item.setCheckState(CHECKED if on else UNCHECKED)
|
||||||
self.playlists.blockSignals(False)
|
self.playlists.blockSignals(False)
|
||||||
self.refresh()
|
self.refresh()
|
||||||
self.changed.emit()
|
self.changed.emit()
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ from pathlib import Path
|
|||||||
from PyQt6.QtCore import Qt, pyqtSignal
|
from PyQt6.QtCore import Qt, pyqtSignal
|
||||||
from PyQt6.QtGui import QImage, QPixmap
|
from PyQt6.QtGui import QImage, QPixmap
|
||||||
from PyQt6.QtWidgets import (
|
from PyQt6.QtWidgets import (
|
||||||
QButtonGroup, QCheckBox, QDialog, QRadioButton, QDialogButtonBox, QFileDialog, QFormLayout, QGroupBox,
|
QButtonGroup, QCheckBox, QDialog, QRadioButton, QDialogButtonBox, QFileDialog, QFormLayout, QFrame, QGroupBox,
|
||||||
QHBoxLayout, QLabel, QLineEdit, QListWidget, QMessageBox, QPushButton,
|
QHBoxLayout, QLabel, QLineEdit, QListWidget, QMessageBox, QPushButton,
|
||||||
QSplitter, QStackedWidget, QVBoxLayout, QWidget,
|
QScrollArea, QSplitter, QStackedWidget, QVBoxLayout, QWidget,
|
||||||
)
|
)
|
||||||
|
|
||||||
from lintunes.cassette import probe as probe_mod
|
from lintunes.cassette import probe as probe_mod
|
||||||
@@ -29,6 +29,8 @@ from lintunes.gui.file_filters import IMAGE_FILTER
|
|||||||
AVATAR_PX = 256
|
AVATAR_PX = 256
|
||||||
AVATAR_PREVIEW_PX = 72
|
AVATAR_PREVIEW_PX = 72
|
||||||
AVATAR_FILE = "avatar.png"
|
AVATAR_FILE = "avatar.png"
|
||||||
|
# The size the window opens at, when the screen has room for it.
|
||||||
|
WANTED_SIZE = (1080, 880)
|
||||||
|
|
||||||
|
|
||||||
def load_avatar_image(path: Path) -> QImage | None:
|
def load_avatar_image(path: Path) -> QImage | None:
|
||||||
@@ -400,7 +402,6 @@ class SyncSettingsDialog(QDialog):
|
|||||||
self._service = service
|
self._service = service
|
||||||
self._library = library
|
self._library = library
|
||||||
self.setWindowTitle("Sync Settings")
|
self.setWindowTitle("Sync Settings")
|
||||||
self.resize(1080, 880)
|
|
||||||
self.state = state.copy()
|
self.state = state.copy()
|
||||||
self._root = root
|
self._root = root
|
||||||
self._config = config
|
self._config = config
|
||||||
@@ -416,10 +417,12 @@ class SyncSettingsDialog(QDialog):
|
|||||||
self.general = GeneralPage(self.state, root, config)
|
self.general = GeneralPage(self.state, root, config)
|
||||||
self._add_page("General", self.general)
|
self._add_page("General", self.general)
|
||||||
self.friend_pages = {}
|
self.friend_pages = {}
|
||||||
|
self._page_widgets: list[QWidget] = [self.general]
|
||||||
for friend in sorted(self.state.friends.values(),
|
for friend in sorted(self.state.friends.values(),
|
||||||
key=lambda f: f.name.casefold()):
|
key=lambda f: f.name.casefold()):
|
||||||
page = FriendPage(friend, root)
|
page = FriendPage(friend, root)
|
||||||
self.friend_pages[friend.token] = page
|
self.friend_pages[friend.token] = page
|
||||||
|
self._page_widgets.append(page)
|
||||||
self._add_page(friend.name, page)
|
self._add_page(friend.name, page)
|
||||||
self.pages_list.currentRowChanged.connect(self._show_page)
|
self.pages_list.currentRowChanged.connect(self._show_page)
|
||||||
self.general.same_for_all.toggled.connect(self._on_same_for_all)
|
self.general.same_for_all.toggled.connect(self._on_same_for_all)
|
||||||
@@ -434,6 +437,7 @@ class SyncSettingsDialog(QDialog):
|
|||||||
layout = QVBoxLayout(self)
|
layout = QVBoxLayout(self)
|
||||||
layout.addWidget(splitter, stretch=1)
|
layout.addWidget(splitter, stretch=1)
|
||||||
layout.addWidget(buttons)
|
layout.addWidget(buttons)
|
||||||
|
self._fit_to_screen()
|
||||||
|
|
||||||
self._probe = probe or probe_mod.SyncthingProbe(self)
|
self._probe = probe or probe_mod.SyncthingProbe(self)
|
||||||
self._probe.finished.connect(self.general.show_probe)
|
self._probe.finished.connect(self.general.show_probe)
|
||||||
@@ -466,7 +470,7 @@ class SyncSettingsDialog(QDialog):
|
|||||||
|
|
||||||
def _show_page(self, row: int):
|
def _show_page(self, row: int):
|
||||||
self.pages.setCurrentIndex(row)
|
self.pages.setCurrentIndex(row)
|
||||||
page = self.pages.widget(row)
|
page = self._page_widgets[row] if 0 <= row < len(self._page_widgets) else None
|
||||||
if isinstance(page, FriendPage):
|
if isinstance(page, FriendPage):
|
||||||
page.ensure_selector(self._library, self.state.share_same_for_all)
|
page.ensure_selector(self._library, self.state.share_same_for_all)
|
||||||
|
|
||||||
@@ -486,8 +490,26 @@ class SyncSettingsDialog(QDialog):
|
|||||||
page.set_same_for_all(on)
|
page.set_same_for_all(on)
|
||||||
|
|
||||||
def _add_page(self, label: str, page: QWidget):
|
def _add_page(self, label: str, page: QWidget):
|
||||||
|
"""Each page scrolls (Round 105): the General page with its share
|
||||||
|
selector is taller than a laptop screen, and a window that can't
|
||||||
|
shrink below its contents fought every resize."""
|
||||||
self.pages_list.addItem(label)
|
self.pages_list.addItem(label)
|
||||||
self.pages.addWidget(page)
|
scroll = QScrollArea()
|
||||||
|
scroll.setWidgetResizable(True)
|
||||||
|
scroll.setFrameShape(QFrame.Shape.NoFrame)
|
||||||
|
scroll.setWidget(page)
|
||||||
|
self.pages.addWidget(scroll)
|
||||||
|
|
||||||
|
def _fit_to_screen(self):
|
||||||
|
"""Open at WANTED_SIZE, or as much of it as the screen holds — the
|
||||||
|
title bar and panels need room too, hence the margin."""
|
||||||
|
width, height = WANTED_SIZE
|
||||||
|
screen = self.screen()
|
||||||
|
if screen is not None:
|
||||||
|
room = screen.availableGeometry()
|
||||||
|
width = min(width, room.width() - 80)
|
||||||
|
height = min(height, room.height() - 120)
|
||||||
|
self.resize(max(width, 400), max(height, 300))
|
||||||
|
|
||||||
def _probe_config(self) -> dict:
|
def _probe_config(self) -> dict:
|
||||||
config = dict(self._config)
|
config = dict(self._config)
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
"""Round 105: Sync Settings — "same for all friends" on by default, pages
|
||||||
|
that scroll on a small screen, and a playlist search in the share selector."""
|
||||||
|
from lintunes.cassette.state import CassetteState, Friend, Selection
|
||||||
|
from tests.test_round66 import _library
|
||||||
|
|
||||||
|
|
||||||
|
def test_same_for_all_is_on_by_default():
|
||||||
|
assert CassetteState().share_same_for_all
|
||||||
|
assert CassetteState.from_dict({}).share_same_for_all
|
||||||
|
# A choice already saved is kept.
|
||||||
|
saved = CassetteState(share_same_for_all=False).to_dict()
|
||||||
|
assert not CassetteState.from_dict(saved).share_same_for_all
|
||||||
|
|
||||||
|
|
||||||
|
def _selector(qapp, selection=None):
|
||||||
|
from lintunes.gui.share_selector import ShareSelector
|
||||||
|
return ShareSelector(_library(), selection or Selection())
|
||||||
|
|
||||||
|
|
||||||
|
def _shown_playlists(selector):
|
||||||
|
return [selector.playlists.item(r).text()
|
||||||
|
for r in range(selector.playlists.count())
|
||||||
|
if not selector.playlists.item(r).isHidden()]
|
||||||
|
|
||||||
|
|
||||||
|
class TestPlaylistSearch:
|
||||||
|
def test_every_word_case_folded(self, qapp):
|
||||||
|
selector = _selector(qapp)
|
||||||
|
assert _shown_playlists(selector) == ["Morning", "Road Trip"]
|
||||||
|
selector.playlist_search.setText("TRIP")
|
||||||
|
assert _shown_playlists(selector) == ["Road Trip"]
|
||||||
|
selector.playlist_search.setText("road morning")
|
||||||
|
assert _shown_playlists(selector) == []
|
||||||
|
selector.playlist_search.clear()
|
||||||
|
assert _shown_playlists(selector) == ["Morning", "Road Trip"]
|
||||||
|
|
||||||
|
def test_select_all_reaches_only_what_is_shown(self, qapp):
|
||||||
|
selection = Selection(playlist_ids={"P2"})
|
||||||
|
selector = _selector(qapp, selection)
|
||||||
|
selector.playlist_search.setText("road")
|
||||||
|
selector.pl_all.click()
|
||||||
|
assert selection.playlist_ids == {"P1", "P2"}
|
||||||
|
selector.pl_none.click()
|
||||||
|
assert selection.playlist_ids == {"P2"}
|
||||||
|
selector.playlist_search.clear()
|
||||||
|
selector.pl_none.click()
|
||||||
|
assert selection.playlist_ids == set()
|
||||||
|
|
||||||
|
|
||||||
|
class TestLibrarySearch:
|
||||||
|
def test_select_all_reaches_only_matching_songs(self, qapp):
|
||||||
|
selection = Selection(track_ids={1})
|
||||||
|
selector = _selector(qapp, selection)
|
||||||
|
selector.search.setText("marguerite")
|
||||||
|
selector.lib_all.click()
|
||||||
|
assert selection.track_ids == {1, 4, 5}
|
||||||
|
selector.lib_none.click()
|
||||||
|
assert selection.track_ids == {1}
|
||||||
|
selector.search.clear()
|
||||||
|
selector.lib_all.click()
|
||||||
|
assert selection.track_ids == {1, 2, 3, 4, 5}
|
||||||
|
|
||||||
|
|
||||||
|
class TestDialogFitsTheScreen:
|
||||||
|
def _dialog(self, tmp_path):
|
||||||
|
from lintunes.gui.sync_settings_dialog import SyncSettingsDialog
|
||||||
|
from tests.test_round64 import _NoProbe
|
||||||
|
state = CassetteState()
|
||||||
|
state.friends["a"] = Friend(token="a", device_id="A", name="Amy")
|
||||||
|
return SyncSettingsDialog(state, tmp_path, {}, probe=_NoProbe(),
|
||||||
|
library=_library())
|
||||||
|
|
||||||
|
def test_opens_no_bigger_than_the_screen(self, qapp, tmp_path):
|
||||||
|
dialog = self._dialog(tmp_path)
|
||||||
|
room = dialog.screen().availableGeometry()
|
||||||
|
assert dialog.width() <= room.width()
|
||||||
|
assert dialog.height() <= room.height()
|
||||||
|
|
||||||
|
def test_can_shrink_below_its_pages(self, qapp, tmp_path):
|
||||||
|
"""The General page with its selector is taller than a laptop screen;
|
||||||
|
it scrolls instead of holding the window open."""
|
||||||
|
dialog = self._dialog(tmp_path)
|
||||||
|
dialog._show_page(1)
|
||||||
|
assert dialog.general.selector is not None
|
||||||
|
assert dialog.minimumSizeHint().height() < 600
|
||||||
|
assert dialog.general.minimumSizeHint().height() > \
|
||||||
|
dialog.pages.minimumSizeHint().height()
|
||||||
|
|
||||||
|
def test_friend_page_still_gets_its_selector(self, qapp, tmp_path):
|
||||||
|
dialog = self._dialog(tmp_path)
|
||||||
|
dialog.pages_list.setCurrentRow(1)
|
||||||
|
assert dialog.friend_pages["a"].selector is not None
|
||||||
@@ -121,6 +121,7 @@ class TestRepublish:
|
|||||||
library = _library()
|
library = _library()
|
||||||
service = CassetteService(root=tmp_path, config_loader=lambda: {})
|
service = CassetteService(root=tmp_path, config_loader=lambda: {})
|
||||||
service.set_library_provider(lambda: library)
|
service.set_library_provider(lambda: library)
|
||||||
|
service._state.share_same_for_all = False
|
||||||
service._state.friends["a"] = Friend(token="a", device_id="A", name="Amy",
|
service._state.friends["a"] = Friend(token="a", device_id="A", name="Amy",
|
||||||
selection=Selection(track_ids={1}))
|
selection=Selection(track_ids={1}))
|
||||||
service._state.friends["b"] = Friend(token="b", device_id="B", name="Bo",
|
service._state.friends["b"] = Friend(token="b", device_id="B", name="Bo",
|
||||||
|
|||||||
@@ -224,6 +224,7 @@ def test_loop_between_two_libraries(qapp, tmp_path, mp3_file):
|
|||||||
|
|
||||||
def service(name, manager, selection=None):
|
def service(name, manager, selection=None):
|
||||||
s = CassetteService(root=tmp_path / name, config_loader=lambda: {})
|
s = CassetteService(root=tmp_path / name, config_loader=lambda: {})
|
||||||
|
s._state.share_same_for_all = False
|
||||||
s._state.friends[token] = Friend(token=token, device_id=name.upper(),
|
s._state.friends[token] = Friend(token=token, device_id=name.upper(),
|
||||||
name=name, in_folder="x",
|
name=name, in_folder="x",
|
||||||
selection=selection or Selection())
|
selection=selection or Selection())
|
||||||
|
|||||||
Reference in New Issue
Block a user