Adjust line length to match Code Style Guide (see #103)

This commit is contained in:
coderkun 2024-05-27 12:46:46 +02:00
parent 6706695d61
commit befd2e06e7
10 changed files with 683 additions and 148 deletions

View file

@ -18,7 +18,10 @@ class Application(Gtk.Application):
DOMAIN = 'mcg'
def __init__(self):
super().__init__(application_id=Application.ID, flags=Gio.ApplicationFlags.FLAGS_NONE)
super().__init__(
application_id=Application.ID,
flags=Gio.ApplicationFlags.FLAGS_NONE
)
self._window = None
self._info_dialog = None
self._verbosity = logging.WARNING
@ -55,10 +58,16 @@ class Application(Gtk.Application):
self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
self._info_dialog.set_application_name("CoverGrid")
self._info_dialog.set_version("3.2.1")
self._info_dialog.set_comments("CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.")
self._info_dialog.set_comments(
"""CoverGrid is a client for the Music Player Daemon, focusing on
albums instead of single tracks.
"""
)
self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg")
self._info_dialog.set_license_type(Gtk.License.GPL_3_0)
self._info_dialog.set_issue_url("https://git.suruatoel.xyz/coderkun/mcg")
self._info_dialog.set_issue_url(
"https://git.suruatoel.xyz/coderkun/mcg"
)
self._info_dialog.present()
def on_menu_quit(self, action, value):

View file

@ -186,7 +186,10 @@ class Client(Base):
def get_output_devices(self):
"""Determine the list of audio output devices."""
self._logger.info("get output devices")
self._add_action_signal(Client.SIGNAL_LOAD_OUTPUT_DEVICES, self._get_output_devices)
self._add_action_signal(
Client.SIGNAL_LOAD_OUTPUT_DEVICES,
self._get_output_devices
)
def enable_output_device(self, device, enabled):
"""Enable/disable an audio output device."""
@ -203,7 +206,10 @@ class Client(Base):
def load_playlist(self):
self._logger.info("load playlist")
self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST, self._load_playlist)
self._add_action_signal(
Client.SIGNAL_LOAD_PLAYLIST,
self._load_playlist
)
def clear_playlist(self):
"""Clear the current playlist"""
@ -260,7 +266,10 @@ class Client(Base):
def get_albumart(self, album):
self._logger.info("get albumart")
self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART, self._get_albumart, album)
self._add_action_signal(
Client.SIGNAL_LOAD_ALBUMART,
self._get_albumart, album
)
def get_albumart_now(self, album):
self._logger.info("get albumart now")
@ -290,7 +299,14 @@ class Client(Base):
def _connect_socket(self, host, port):
sock = None
error = None
for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM, socket.IPPROTO_TCP):
resources = socket.getaddrinfo(
host,
port,
socket.AF_UNSPEC,
socket.SOCK_STREAM,
socket.IPPROTO_TCP
)
for res in resources:
af, socktype, proto, canonname, sa = res
try:
sock = socket.socket(af, socktype, proto)
@ -313,7 +329,9 @@ class Client(Base):
if not greeting.startswith(Client.PROTOCOL_GREETING):
self._disconnect_socket()
raise ProtocolException("invalid greeting: {}".format(greeting))
self._protocol_version = greeting[len(Client.PROTOCOL_GREETING):].strip()
self._protocol_version = greeting[
len(Client.PROTOCOL_GREETING):
].strip()
self._logger.debug("protocol version: %s", self._protocol_version)
def _disconnect(self):
@ -476,7 +494,14 @@ class Client(Base):
album = self._extract_album(album)
self._logger.debug("album: %r", album)
# Tracks
for song in self._parse_list(self._call('find album ', album.get_title()), ['file']):
songs = self._parse_list(
self._call(
'find album ',
album.get_title()
),
['file']
)
for song in songs:
track = self._extract_track(song)
if track:
self._logger.debug("track: %r", track)
@ -488,14 +513,23 @@ class Client(Base):
def _load_playlist(self):
self._playlist = []
for song in self._parse_list(self._call('playlistinfo'), ['file', 'playlist']):
songs = self._parse_list(
self._call(
'playlistinfo'
),
['file', 'playlist']
)
for song in songs:
self._logger.debug("song: %r", song)
# Track
track = self._extract_playlist_track(song)
self._logger.debug("track: %r", track)
# Album
album = self._extract_album(song, lookup=False)
if len(self._playlist) == 0 or self._playlist[len(self._playlist)-1] != album:
if (
len(self._playlist) == 0
or self._playlist[len(self._playlist)-1] != album
):
self._playlist.append(album)
else:
album = self._playlist[len(self._playlist)-1]
@ -547,7 +581,12 @@ class Client(Base):
for track in self._albums[album].get_tracks():
self._logger.info("addid: %r", track.get_file())
track_id = None
track_id_response = self._parse_dict(self._call('addid', track.get_file()))
track_id_response = self._parse_dict(
self._call(
'addid',
track.get_file()
)
)
if 'id' in track_id_response:
track_id = track_id_response['id']
self._logger.debug("track id: %r", track_id)
@ -572,19 +611,33 @@ class Client(Base):
def _get_albumart(self, album):
if album in self._albums:
album = self._albums[album]
self._logger.debug("get albumart for album \"%s\"", album.get_title())
self._logger.debug(
"get albumart for album \"%s\"",
album.get_title()
)
# Use "albumart" command
if album.get_tracks():
try:
return (album, self._read_binary('albumart', album.get_tracks()[0].get_file(), False))
return (
album,
self._read_binary(
'albumart',
album.get_tracks()[0].get_file(),
False
)
)
except CommandException as e:
# The "albumart" command throws an exception if not found
if e.get_error_number() != Client.PROTOCOL_ERROR_NOEXISTS:
raise e
# If no albumart can be found, use "readpicture" command
for track in album.get_tracks():
data = self._read_binary('readpicture', track.get_file(), True)
data = self._read_binary(
'readpicture',
track.get_file(),
True
)
if data:
return (album, data)
@ -593,7 +646,11 @@ class Client(Base):
def _start_worker(self):
"""Start the worker thread which waits for action to be performed."""
self._logger.debug("start worker")
self._worker = threading.Thread(target=self._run, name='mcg-worker', args=())
self._worker = threading.Thread(
target=self._run,
name='mcg-worker',
args=()
)
self._worker.setDaemon(True)
self._worker.start()
self._logger.debug("worker started")
@ -621,7 +678,12 @@ class Client(Base):
def _add_action_signal(self, signal, method, *args):
"""Add an action to the action list that triggers a callback."""
self._logger.debug("add action signal %r: %r (%r)", signal, method.__name__, args)
self._logger.debug(
"add action signal %r: %r (%r)",
signal,
method.__name__,
args
)
future = Future(signal)
future.add_done_callback(self._callback_future)
self._add_action_future(future, method, *args)
@ -656,7 +718,10 @@ class Client(Base):
self._write(command, args)
return self._read()
except MPDException as e:
if command == 'idle' and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION:
if (
command == 'idle'
and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION
):
self.disconnect()
self._callback(Client.SIGNAL_ERROR, e)
@ -664,13 +729,21 @@ class Client(Base):
try:
self._write(command, args)
except MPDException as e:
if command == 'idle' and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION:
if (
command == 'idle'
and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION
):
self.disconnect()
self._callback(Client.SIGNAL_ERROR, e)
def _write(self, command, args=None):
if args is not None and len(args) > 0:
line = '{} "{}"\n'.format(command, '" "'.join(str(x).replace('"', '\\\"') for x in args))
line = '{} "{}"\n'.format(
command,
'" "'.join(
str(x).replace('"', '\\\"') for x in args
)
)
else:
line = '{}\n'.format(command)
self._logger.debug("write: %r", line)
@ -681,7 +754,10 @@ class Client(Base):
self._logger.debug("reading response")
response = []
line = self._read_line()
while not line.startswith(Client.PROTOCOL_COMPLETION) and not line.startswith(Client.PROTOCOL_ERROR):
while (
not line.startswith(Client.PROTOCOL_COMPLETION)
and not line.startswith(Client.PROTOCOL_ERROR)
):
response.append(line.strip())
line = self._read_line()
if line.startswith(Client.PROTOCOL_COMPLETION):
@ -915,7 +991,11 @@ class MCGAlbum:
def get_artists(self):
if self._albumartists:
return [artist for artist in self._artists if artist not in self._albumartists]
return [
artist
for artist in self._artists
if artist not in self._albumartists
]
return self._artists
def get_albumartists(self):
@ -946,13 +1026,19 @@ class MCGAlbum:
for artist in track.get_albumartists():
if artist not in self._albumartists:
self._albumartists.append(artist)
if track.get_date() is not None and track.get_date() not in self._dates:
if (
track.get_date() is not None
and track.get_date() not in self._dates
):
self._dates.append(track.get_date())
path = os.path.dirname(track.get_file())
if path not in self._pathes:
self._pathes.append(path)
if track.get_last_modified():
if not self._last_modified or track.get_last_modified() > self._last_modified:
if (
not self._last_modified
or track.get_last_modified() > self._last_modified
):
self._last_modified = track.get_last_modified()
def get_tracks(self):
@ -982,7 +1068,10 @@ class MCGAlbum:
continue
# Search in track data
for track in self._tracks:
if keyword in track.get_title().lower() or keyword in track.get_file().lower():
if (
keyword in track.get_title().lower()
or keyword in track.get_file().lower()
):
result = True
break
if not result:
@ -1045,7 +1134,11 @@ class MCGTrack:
def get_artists(self):
if self._albumartists:
return [artist for artist in self._artists if artist not in self._albumartists]
return [
artist
for artist in self._artists
if artist not in self._albumartists
]
return self._artists
def set_albumartists(self, artists):
@ -1131,7 +1224,12 @@ class MCGConfig(configparser.ConfigParser):
def __init__(self, filename):
configparser.ConfigParser.__init__(self)
self._filename = os.path.expanduser(os.path.join(MCGConfig.CONFIG_DIR, filename))
self._filename = os.path.expanduser(
os.path.join(
MCGConfig.CONFIG_DIR,
filename
)
)
self._create_dir()
def load(self):
@ -1157,7 +1255,12 @@ class MCGCache():
self._logger = logging.getLogger(__name__)
self._host = host
self._size = size
self._dirname = os.path.expanduser(os.path.join(MCGCache.DIRNAME, host))
self._dirname = os.path.expanduser(
os.path.join(
MCGCache.DIRNAME,
host
)
)
if not os.path.exists(self._dirname):
os.makedirs(self._dirname)
self._read_size()
@ -1175,7 +1278,11 @@ class MCGCache():
try:
size = int(f.readline())
except:
self._logger.warning("invalid cache file: %s, deleting file", filename, exc_info=True)
self._logger.warning(
"invalid cache file: %s, deleting file",
filename,
exc_info=True
)
size = None
# Clear cache if size has changed
if size != self._size:

View file

@ -30,7 +30,10 @@ class ConnectionPanel(Adw.Bin):
# Zeroconf provider
self._zeroconf_provider = ZeroconfProvider()
self._zeroconf_provider.connect_signal(ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service)
self._zeroconf_provider.connect_signal(
ZeroconfProvider.SIGNAL_SERVICE_NEW,
self.on_new_service
)
def on_new_service(self, service):
name, host, port = service
@ -82,4 +85,9 @@ class ConnectionPanel(Adw.Bin):
return self.password_entry.get_text()
def _call_back(self):
self.emit('connection-changed', self.get_host(), self.get_port(), self.get_password(),)
self.emit(
'connection-changed',
self.get_host(),
self.get_port(),
self.get_password(),
)

View file

@ -48,7 +48,9 @@ class CoverPanel(Gtk.Overlay):
self._cover_pixbuf = None
self._timer = None
self._properties = {}
self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
self._icon_theme = Gtk.IconTheme.get_for_display(
Gdk.Display.get_default()
)
self._fullscreened = False
self._current_size = None
@ -63,7 +65,10 @@ class CoverPanel(Gtk.Overlay):
# Button controller for songs scale
buttonController = Gtk.GestureClick()
buttonController.connect('pressed', self.on_songs_scale_pressed)
buttonController.connect('unpaired-release', self.on_songs_scale_released)
buttonController.connect(
'unpaired-release',
self.on_songs_scale_released
)
self.songs_scale.add_controller(buttonController)
def get_toolbar(self):
@ -103,7 +108,11 @@ class CoverPanel(Gtk.Overlay):
# Set labels
self.album_title_label.set_label(album.get_title())
self.album_date_label.set_label(', '.join(album.get_dates()))
self.album_artist_label.set_label(', '.join(album.get_albumartists()))
self.album_artist_label.set_label(
', '.join(
album.get_albumartists()
)
)
# Set tracks
self._set_tracks(album)
@ -239,5 +248,11 @@ class CoverPanel(Gtk.Overlay):
height = int(math.floor(pixbuf.get_height()*ratio))
if width <= 0 or height <= 0:
return
self.cover_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
self.cover_image.set_from_pixbuf(
pixbuf.scale_simple(
width,
height,
GdkPixbuf.InterpType.HYPER
)
)
self.cover_image.show()

View file

@ -28,7 +28,9 @@ class LibraryPanel(Adw.Bin):
'update': (GObject.SIGNAL_RUN_FIRST, None, ()),
'play': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
'queue': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
'queue-multiple': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
'queue-multiple': (
GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)
),
'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
@ -86,7 +88,9 @@ class LibraryPanel(Adw.Bin):
self._old_ranges = {}
self._library_lock = threading.Lock()
self._library_stop = threading.Event()
self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
self._icon_theme = Gtk.IconTheme.get_for_display(
Gdk.Display.get_default()
)
self._standalone_pixbuf = None
self._selected_albums = []
self._is_selected = False
@ -94,13 +98,20 @@ class LibraryPanel(Adw.Bin):
# Widgets
# Header bar
self._headerbar_standalone = AlbumHeaderbar()
self._headerbar_standalone.connect('close', self.on_standalone_close_clicked)
self._headerbar_standalone.connect(
'close',
self.on_standalone_close_clicked
)
# Library Grid: Model
self._library_grid_model = Gio.ListStore()
self._library_grid_filter = Gtk.FilterListModel()
self._library_grid_filter.set_model(self._library_grid_model)
self._library_grid_selection_multi = Gtk.MultiSelection.new(self._library_grid_filter)
self._library_grid_selection_single = Gtk.SingleSelection.new(self._library_grid_filter)
self._library_grid_selection_multi = Gtk.MultiSelection.new(
self._library_grid_filter
)
self._library_grid_selection_single = Gtk.SingleSelection.new(
self._library_grid_filter
)
# Library Grid
self.library_grid.set_model(self._library_grid_selection_single)
# Toolbar menu
@ -114,7 +125,10 @@ class LibraryPanel(Adw.Bin):
# Button controller for grid scale
buttonController = Gtk.GestureClick()
buttonController.connect('unpaired-release', self.on_grid_scale_released)
buttonController.connect(
'unpaired-release',
self.on_grid_scale_released
)
self.grid_scale.add_controller(buttonController)
def get_headerbar_standalone(self):
@ -132,12 +146,16 @@ class LibraryPanel(Adw.Bin):
self.actionbar_revealer.set_reveal_child(True)
self.library_grid.set_model(self._library_grid_selection_multi)
self.library_grid.set_single_click_activate(False)
self.library_grid.get_style_context().add_class(Utils.CSS_SELECTION)
self.library_grid.get_style_context().add_class(
Utils.CSS_SELECTION
)
else:
self.actionbar_revealer.set_reveal_child(False)
self.library_grid.set_model(self._library_grid_selection_single)
self.library_grid.set_single_click_activate(True)
self.library_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
self.library_grid.get_style_context().remove_class(
Utils.CSS_SELECTION
)
@Gtk.Template.Callback()
def on_update_clicked(self, widget):
@ -164,7 +182,11 @@ class LibraryPanel(Adw.Bin):
@Gtk.Template.Callback()
def on_sort_toggled(self, widget):
if widget.get_active():
self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is widget][0]
self._sort_order = [
key
for key, value in self._toolbar_sort_buttons.items()
if value is widget
][0]
self._sort_grid_model()
self.emit('sort-order-changed', self._sort_order)
@ -183,7 +205,11 @@ class LibraryPanel(Adw.Bin):
@Gtk.Template.Callback()
def on_filter_entry_changed(self, widget):
self._library_grid_filter.set_filter(SearchFilter(self.filter_entry.get_text()))
self._library_grid_filter.set_filter(
SearchFilter(
self.filter_entry.get_text()
)
)
@Gtk.Template.Callback()
def on_library_grid_clicked(self, widget, position):
@ -243,13 +269,20 @@ class LibraryPanel(Adw.Bin):
def set_sort_order(self, sort):
button = self._toolbar_sort_buttons[sort]
if button:
self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is button][0]
self._sort_order = [
key
for key, value in self._toolbar_sort_buttons.items()
if value is button
][0]
if not button.get_active():
button.set_active(True)
self._sort_grid_model()
def set_sort_type(self, sort_type):
sort_type_gtk = Gtk.SortType.DESCENDING if sort_type else Gtk.SortType.ASCENDING
if sort_type:
sort_type_gtk = Gtk.SortType.DESCENDING
else:
sort_type_gtk = Gtk.SortType.ASCENDING
if sort_type_gtk != self._sort_type:
self._sort_type = sort_type_gtk
@ -268,7 +301,10 @@ class LibraryPanel(Adw.Bin):
def set_albums(self, host, albums):
self._host = host
self._library_stop.set()
threading.Thread(target=self._set_albums, args=(host, albums, self._item_size,)).start()
threading.Thread(
target=self._set_albums,
args=(host, albums, self._item_size,)
).start()
def set_albumart(self, album, data):
if album in self._selected_albums:
@ -285,10 +321,20 @@ class LibraryPanel(Adw.Bin):
GObject.idle_add(self._show_image)
def _sort_grid_model(self):
GObject.idle_add(self._library_grid_model.sort, self._grid_model_compare_func, self._sort_order, self._sort_type)
GObject.idle_add(
self._library_grid_model.sort,
self._grid_model_compare_func,
self._sort_order,
self._sort_type
)
def _grid_model_compare_func(self, item1, item2, criterion, order):
return client.MCGAlbum.compare(item1.get_album(), item2.get_album(), criterion, (order == Gtk.SortType.DESCENDING))
return client.MCGAlbum.compare(
item1.get_album(),
item2.get_album(),
criterion,
(order == Gtk.SortType.DESCENDING)
)
def stop_threads(self):
self._library_stop.set()
@ -297,7 +343,10 @@ class LibraryPanel(Adw.Bin):
self._library_lock.acquire()
self._albums = albums
stack_transition_type = self.stack.get_transition_type()
GObject.idle_add(self.stack.set_transition_type, Gtk.StackTransitionType.NONE)
GObject.idle_add(
self.stack.set_transition_type,
Gtk.StackTransitionType.NONE
)
GObject.idle_add(self.stack.set_visible_child, self.progress_box)
GObject.idle_add(self.progress_bar.set_fraction, 0.0)
GObject.idle_add(self.stack.set_transition_type, stack_transition_type)
@ -328,11 +377,17 @@ class LibraryPanel(Adw.Bin):
)
if pixbuf is not None:
self._grid_pixbufs[album.get_id()] = pixbuf
GObject.idle_add(self._library_grid_model.append, GridItem(album, pixbuf))
GObject.idle_add(
self._library_grid_model.append,
GridItem(album, pixbuf)
)
i += 1
GObject.idle_add(self.progress_bar.set_fraction, i/n)
GObject.idle_add(self.progress_bar.set_text, locale.gettext("Loading images"))
GObject.idle_add(
self.progress_bar.set_text,
locale.gettext("Loading images")
)
self._library_lock.release()
GObject.idle_add(self.stack.set_visible_child, self.scroll)
@ -340,7 +395,10 @@ class LibraryPanel(Adw.Bin):
def _set_widget_grid_size(self, grid_widget, size, vertical):
self._library_stop.set()
threading.Thread(target=self._set_widget_grid_size_thread, args=(grid_widget, size, vertical,)).start()
threading.Thread(
target=self._set_widget_grid_size_thread,
args=(grid_widget, size, vertical,)
).start()
def _set_widget_grid_size_thread(self, grid_widget, size, vertical):
self._library_lock.acquire()
@ -354,7 +412,11 @@ class LibraryPanel(Adw.Bin):
pixbuf = self._grid_pixbufs[album_id]
if pixbuf is not None:
pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.NEAREST)
pixbuf = pixbuf.scale_simple(
size,
size,
GdkPixbuf.InterpType.NEAREST
)
else:
pixbuf = self._icon_theme.lookup_icon(
Utils.STOCK_ICON_DEFAULT,
@ -435,7 +497,13 @@ class LibraryPanel(Adw.Bin):
if width <= 0 or height <= 0:
return
# Pixelpuffer auf Oberfläche zeichnen
self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
self.standalone_image.set_from_pixbuf(
pixbuf.scale_simple(
width,
height,
GdkPixbuf.InterpType.HYPER
)
)
self.standalone_image.show()
def _get_default_image(self):
@ -452,5 +520,10 @@ class LibraryPanel(Adw.Bin):
albums = []
for i in range(self.library_grid.get_model().get_n_items()):
if self.library_grid.get_model().is_selected(i):
albums.append(self.library_grid.get_model().get_item(i).get_album().get_id())
albums.append(
self.library_grid.get_model()
.get_item(i)
.get_album()
.get_id()
)
return albums

View file

@ -23,8 +23,16 @@ class PlaylistPanel(Adw.Bin):
'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
'clear-playlist': (GObject.SIGNAL_RUN_FIRST, None, ()),
'remove-album': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
'remove-multiple-albums': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
'remove-album': (
GObject.SIGNAL_RUN_FIRST,
None,
(GObject.TYPE_PYOBJECT,)
),
'remove-multiple-albums': (
GObject.SIGNAL_RUN_FIRST,
None,
(GObject.TYPE_PYOBJECT,)
),
'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
}
@ -58,7 +66,9 @@ class PlaylistPanel(Adw.Bin):
self._playlist_albums = None
self._playlist_lock = threading.Lock()
self._playlist_stop = threading.Event()
self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
self._icon_theme = Gtk.IconTheme.get_for_display(
Gdk.Display.get_default()
)
self._standalone_pixbuf = None
self._selected_albums = []
self._is_selected = False
@ -66,11 +76,18 @@ class PlaylistPanel(Adw.Bin):
# Widgets
# Header bar
self._headerbar_standalone = AlbumHeaderbar()
self._headerbar_standalone.connect('close', self.on_headerbar_close_clicked)
self._headerbar_standalone.connect(
'close',
self.on_headerbar_close_clicked
)
# Playlist Grid: Model
self._playlist_grid_model = Gio.ListStore()
self._playlist_grid_selection_multi = Gtk.MultiSelection.new(self._playlist_grid_model)
self._playlist_grid_selection_single = Gtk.SingleSelection.new(self._playlist_grid_model)
self._playlist_grid_selection_multi = Gtk.MultiSelection.new(
self._playlist_grid_model
)
self._playlist_grid_selection_single = Gtk.SingleSelection.new(
self._playlist_grid_model
)
# Playlist Grid
self.playlist_grid.set_model(self._playlist_grid_selection_single)
@ -89,12 +106,16 @@ class PlaylistPanel(Adw.Bin):
self.actionbar_revealer.set_reveal_child(True)
self.playlist_grid.set_model(self._playlist_grid_selection_multi)
self.playlist_grid.set_single_click_activate(False)
self.playlist_grid.get_style_context().add_class(Utils.CSS_SELECTION)
self.playlist_grid.get_style_context().add_class(
Utils.CSS_SELECTION
)
else:
self.actionbar_revealer.set_reveal_child(False)
self.playlist_grid.set_model(self._playlist_grid_selection_single)
self.playlist_grid.set_single_click_activate(True)
self.playlist_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
self.playlist_grid.get_style_context().remove_class(
Utils.CSS_SELECTION
)
@Gtk.Template.Callback()
def on_clear_clicked(self, widget):
@ -157,7 +178,10 @@ class PlaylistPanel(Adw.Bin):
def set_playlist(self, host, playlist):
self._host = host
self._playlist_stop.set()
threading.Thread(target=self._set_playlist, args=(host, playlist, self._item_size,)).start()
threading.Thread(
target=self._set_playlist,
args=(host, playlist, self._item_size,)
).start()
def set_albumart(self, album, data):
if album in self._selected_albums:
@ -258,7 +282,13 @@ class PlaylistPanel(Adw.Bin):
if width <= 0 or height <= 0:
return
# Pixelpuffer auf Oberfläche zeichnen
self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
self.standalone_image.set_from_pixbuf(
pixbuf.scale_simple(
width,
height,
GdkPixbuf.InterpType.HYPER
)
)
self.standalone_image.show()
def _get_default_image(self):
@ -275,5 +305,7 @@ class PlaylistPanel(Adw.Bin):
albums = []
for i in range(self.playlist_grid.get_model().get_n_items()):
if self.playlist_grid.get_model().is_selected(i):
albums.append(self.playlist_grid.get_model().get_item(i).get_album())
albums.append(
self.playlist_grid.get_model().get_item(i).get_album()
)
return albums

View file

@ -12,7 +12,11 @@ from gi.repository import Gtk, Adw, GObject
class ServerPanel(Adw.Bin):
__gtype_name__ = 'McgServerPanel'
__gsignals__ = {
'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,bool,)),
'change-output-device': (
GObject.SIGNAL_RUN_FIRST,
None,
(GObject.TYPE_PYOBJECT,bool,)
),
}
# Widgets
@ -60,7 +64,11 @@ class ServerPanel(Adw.Bin):
if audio:
parts = audio.split(":")
if len(parts) == 3:
audio = "{}Hz, {}bit, {}channels".format(parts[0], parts[1], parts[2])
audio = "{}Hz, {}bit, {}channels".format(
parts[0],
parts[1],
parts[2]
)
else:
audio = self._none_label
self.status_audio.set_markup(audio)
@ -93,17 +101,25 @@ class ServerPanel(Adw.Bin):
device_ids.append(device.get_id())
if device.get_id() in self._output_buttons.keys():
self._output_buttons[device.get_id()].freeze_notify()
self._output_buttons[device.get_id()].set_active(device.is_enabled())
self._output_buttons[device.get_id()].set_active(
device.is_enabled()
)
self._output_buttons[device.get_id()].thaw_notify()
else:
button = Gtk.CheckButton.new_with_label(device.get_name())
if device.is_enabled():
button.set_active(True)
handler = button.connect('toggled', self.on_output_device_toggled, device)
handler = button.connect(
'toggled',
self.on_output_device_toggled,
device
)
self.output_devices.insert(button, -1)
self._output_buttons[device.get_id()] = button
# Remove devices
for id in self._output_buttons.keys():
if id not in device_ids:
self.output_devices.remove(self._output_buttons[id].get_parent())
self.output_devices.remove(
self._output_buttons[id].get_parent()
)

View file

@ -35,7 +35,11 @@ class Utils:
if albumart:
pixbuf = Utils.load_pixbuf(albumart)
if pixbuf is not None:
pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.HYPER)
pixbuf = pixbuf.scale_simple(
size,
size,
GdkPixbuf.InterpType.HYPER
)
pixbuf.savev(cache_url, 'jpeg', [], [])
return pixbuf

View file

@ -92,20 +92,52 @@ class Window(Adw.ApplicationWindow):
self._panels.append(self._cover_panel)
# Playlist panel
self._playlist_panel = PlaylistPanel(self._mcg)
self._playlist_panel.connect('open-standalone', self.on_panel_open_standalone)
self._playlist_panel.connect('close-standalone', self.on_panel_close_standalone)
self._playlist_panel.connect(
'open-standalone',
self.on_panel_open_standalone
)
self._playlist_panel.connect(
'close-standalone',
self.on_panel_close_standalone
)
self._panels.append(self._playlist_panel)
# Library panel
self._library_panel = LibraryPanel(self._mcg)
self._library_panel.connect('open-standalone', self.on_panel_open_standalone)
self._library_panel.connect('close-standalone', self.on_panel_close_standalone)
self._library_panel.connect(
'open-standalone',
self.on_panel_open_standalone
)
self._library_panel.connect(
'close-standalone',
self.on_panel_close_standalone
)
self._panels.append(self._library_panel)
# Stack
self.content_stack.add_child(self._connection_panel)
self.panel_stack.add_titled_with_icon(self._server_panel, 'server-panel', locale.gettext("Server"), "network-wired-symbolic")
self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel', locale.gettext("Cover"), "image-x-generic-symbolic")
self.panel_stack.add_titled_with_icon(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist"), "view-list-symbolic")
self.panel_stack.add_titled_with_icon(self._library_panel, 'library-panel', locale.gettext("Library"), "emblem-music-symbolic")
self.panel_stack.add_titled_with_icon(
self._server_panel,
'server-panel',
locale.gettext("Server"),
"network-wired-symbolic"
)
self.panel_stack.add_titled_with_icon(
self._cover_panel,
'cover-panel',
locale.gettext("Cover"),
"image-x-generic-symbolic"
)
self.panel_stack.add_titled_with_icon(
self._playlist_panel,
'playlist-panel',
locale.gettext("Playlist"),
"view-list-symbolic"
)
self.panel_stack.add_titled_with_icon(
self._library_panel,
'library-panel',
locale.gettext("Library"),
"emblem-music-symbolic"
)
# Toolbar stack
self.toolbar_stack.add_child(self._server_panel.get_toolbar())
self.toolbar_stack.add_child(self._cover_panel.get_toolbar())
@ -114,56 +146,163 @@ class Window(Adw.ApplicationWindow):
# Properties
self._set_headerbar_sensitive(False, False)
self._connection_panel.set_host(self._settings.get_string(Window.SETTING_HOST))
self._connection_panel.set_port(self._settings.get_int(Window.SETTING_PORT))
self._connection_panel.set_host(
self._settings.get_string(Window.SETTING_HOST)
)
self._connection_panel.set_port(
self._settings.get_int(Window.SETTING_PORT)
)
if use_keyring:
self._connection_panel.set_password(keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME))
self._playlist_panel.set_item_size(self._settings.get_int(Window.SETTING_ITEM_SIZE))
self._library_panel.set_item_size(self._settings.get_int(Window.SETTING_ITEM_SIZE))
self._library_panel.set_sort_order(self._settings.get_enum(Window.SETTING_SORT_ORDER))
self._library_panel.set_sort_type(self._settings.get_boolean(Window.SETTING_SORT_TYPE))
self._connection_panel.set_password(
keyring.get_password(
ZeroconfProvider.KEYRING_SYSTEM,
ZeroconfProvider.KEYRING_USERNAME
)
)
self._playlist_panel.set_item_size(
self._settings.get_int(Window.SETTING_ITEM_SIZE)
)
self._library_panel.set_item_size(
self._settings.get_int(Window.SETTING_ITEM_SIZE)
)
self._library_panel.set_sort_order(
self._settings.get_enum(Window.SETTING_SORT_ORDER)
)
self._library_panel.set_sort_type(
self._settings.get_boolean(Window.SETTING_SORT_TYPE)
)
# Signals
self.connect("notify::default-width", self.on_resize)
self.connect("notify::default-height", self.on_resize)
self.connect("notify::maximized", self.on_maximized)
self.connect("notify::fullscreened", self.on_fullscreened)
self._connection_panel.connect('connection-changed', self.on_connection_panel_connection_changed)
self.panel_stack.connect('notify::visible-child', self.on_stack_switched)
self._server_panel.connect('change-output-device', self.on_server_panel_output_device_changed)
self._cover_panel.connect('toggle-fullscreen', self.on_cover_panel_toggle_fullscreen)
self._connection_panel.connect(
'connection-changed',
self.on_connection_panel_connection_changed
)
self.panel_stack.connect(
'notify::visible-child',
self.on_stack_switched
)
self._server_panel.connect(
'change-output-device',
self.on_server_panel_output_device_changed
)
self._cover_panel.connect(
'toggle-fullscreen',
self.on_cover_panel_toggle_fullscreen
)
self._cover_panel.connect('set-song', self.on_cover_panel_set_song)
self._cover_panel.connect('albumart', self.on_cover_panel_albumart)
self._playlist_panel.connect('clear-playlist', self.on_playlist_panel_clear_playlist)
self._playlist_panel.connect('remove-album', self.on_playlist_panel_remove)
self._playlist_panel.connect('remove-multiple-albums', self.on_playlist_panel_remove_multiple)
self._playlist_panel.connect(
'clear-playlist',
self.on_playlist_panel_clear_playlist
)
self._playlist_panel.connect(
'remove-album',
self.on_playlist_panel_remove
)
self._playlist_panel.connect(
'remove-multiple-albums',
self.on_playlist_panel_remove_multiple
)
self._playlist_panel.connect('play', self.on_playlist_panel_play)
self._playlist_panel.connect('albumart', self.on_playlist_panel_albumart)
self._playlist_panel.connect(
'albumart',
self.on_playlist_panel_albumart
)
self._library_panel.connect('update', self.on_library_panel_update)
self._library_panel.connect('play', self.on_library_panel_play)
self._library_panel.connect('queue', self.on_library_panel_queue)
self._library_panel.connect('queue-multiple', self.on_library_panel_queue_multiple)
self._library_panel.connect('item-size-changed', self.on_library_panel_item_size_changed)
self._library_panel.connect('sort-order-changed', self.on_library_panel_sort_order_changed)
self._library_panel.connect('sort-type-changed', self.on_library_panel_sort_type_changed)
self._library_panel.connect(
'queue-multiple',
self.on_library_panel_queue_multiple
)
self._library_panel.connect(
'item-size-changed',
self.on_library_panel_item_size_changed
)
self._library_panel.connect(
'sort-order-changed',
self.on_library_panel_sort_order_changed
)
self._library_panel.connect(
'sort-type-changed',
self.on_library_panel_sort_type_changed
)
self._library_panel.connect('albumart', self.on_library_panel_albumart)
self._mcg.connect_signal(client.Client.SIGNAL_CONNECTION, self.on_mcg_connect)
self._mcg.connect_signal(client.Client.SIGNAL_STATUS, self.on_mcg_status)
self._mcg.connect_signal(
client.Client.SIGNAL_CONNECTION,
self.on_mcg_connect
)
self._mcg.connect_signal(
client.Client.SIGNAL_STATUS,
self.on_mcg_status
)
self._mcg.connect_signal(client.Client.SIGNAL_STATS, self.on_mcg_stats)
self._mcg.connect_signal(client.Client.SIGNAL_LOAD_OUTPUT_DEVICES, self.on_mcg_load_output_devices)
self._mcg.connect_signal(client.Client.SIGNAL_LOAD_PLAYLIST, self.on_mcg_load_playlist)
self._mcg.connect_signal(client.Client.SIGNAL_PULSE_ALBUMS, self.on_mcg_pulse_albums)
self._mcg.connect_signal(client.Client.SIGNAL_INIT_ALBUMS, self.on_mcg_init_albums)
self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMS, self.on_mcg_load_albums)
self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMART, self.on_mcg_load_albumart)
self._mcg.connect_signal(client.Client.SIGNAL_ERROR, self.on_mcg_error)
self._settings.connect('changed::'+Window.SETTING_PANEL, self.on_settings_panel_changed)
self._settings.connect('changed::'+Window.SETTING_ITEM_SIZE, self.on_settings_item_size_changed)
self._settings.connect('changed::'+Window.SETTING_SORT_ORDER, self.on_settings_sort_order_changed)
self._settings.connect('changed::'+Window.SETTING_SORT_TYPE, self.on_settings_sort_type_changed)
self._settings.bind(Window.SETTING_WINDOW_WIDTH, self._state, WindowState.WIDTH, Gio.SettingsBindFlags.DEFAULT)
self._settings.bind(Window.SETTING_WINDOW_HEIGHT, self._state, WindowState.HEIGHT, Gio.SettingsBindFlags.DEFAULT)
self._settings.bind(Window.SETTING_WINDOW_MAXIMIZED, self._state, WindowState.IS_MAXIMIZED, Gio.SettingsBindFlags.DEFAULT)
self._mcg.connect_signal(
client.Client.SIGNAL_LOAD_OUTPUT_DEVICES,
self.on_mcg_load_output_devices
)
self._mcg.connect_signal(
client.Client.SIGNAL_LOAD_PLAYLIST,
self.on_mcg_load_playlist
)
self._mcg.connect_signal(
client.Client.SIGNAL_PULSE_ALBUMS,
self.on_mcg_pulse_albums
)
self._mcg.connect_signal(
client.Client.SIGNAL_INIT_ALBUMS,
self.on_mcg_init_albums
)
self._mcg.connect_signal(
client.Client.SIGNAL_LOAD_ALBUMS,
self.on_mcg_load_albums
)
self._mcg.connect_signal(
client.Client.SIGNAL_LOAD_ALBUMART,
self.on_mcg_load_albumart
)
self._mcg.connect_signal(
client.Client.SIGNAL_ERROR,
self.on_mcg_error
)
self._settings.connect(
'changed::'+Window.SETTING_PANEL,
self.on_settings_panel_changed
)
self._settings.connect(
'changed::'+Window.SETTING_ITEM_SIZE,
self.on_settings_item_size_changed
)
self._settings.connect(
'changed::'+Window.SETTING_SORT_ORDER,
self.on_settings_sort_order_changed
)
self._settings.connect(
'changed::'+Window.SETTING_SORT_TYPE,
self.on_settings_sort_type_changed
)
self._settings.bind(
Window.SETTING_WINDOW_WIDTH,
self._state,
WindowState.WIDTH,
Gio.SettingsBindFlags.DEFAULT
)
self._settings.bind(
Window.SETTING_WINDOW_HEIGHT,
self._state,
WindowState.HEIGHT,
Gio.SettingsBindFlags.DEFAULT
)
self._settings.bind(
Window.SETTING_WINDOW_MAXIMIZED,
self._state,
WindowState.IS_MAXIMIZED,
Gio.SettingsBindFlags.DEFAULT
)
# Actions
self.set_default_size(self._state.width, self._state.height)
@ -174,29 +313,59 @@ class Window(Adw.ApplicationWindow):
self._connect()
# Menu actions
self._connect_action = Gio.SimpleAction.new_stateful("connect", None, GLib.Variant.new_boolean(False))
self._connect_action = Gio.SimpleAction.new_stateful(
"connect",
None,
GLib.Variant.new_boolean(False)
)
self._connect_action.connect('change-state', self.on_menu_connect)
self.add_action(self._connect_action)
self._play_action = Gio.SimpleAction.new_stateful("play", None, GLib.Variant.new_boolean(False))
self._play_action = Gio.SimpleAction.new_stateful(
"play",
None,
GLib.Variant.new_boolean(False)
)
self._play_action.set_enabled(False)
self._play_action.connect('change-state', self.on_menu_play)
self.add_action(self._play_action)
self._clear_playlist_action = Gio.SimpleAction.new("clear-playlist", None)
self._clear_playlist_action = Gio.SimpleAction.new(
"clear-playlist",
None
)
self._clear_playlist_action.set_enabled(False)
self._clear_playlist_action.connect('activate', self.on_menu_clear_playlist)
self._clear_playlist_action.connect(
'activate',
self.on_menu_clear_playlist
)
self.add_action(self._clear_playlist_action)
panel_variant = GLib.Variant.new_string("0")
self._panel_action = Gio.SimpleAction.new_stateful("panel", panel_variant.get_type(), panel_variant)
self._panel_action = Gio.SimpleAction.new_stateful(
"panel",
panel_variant.get_type(),
panel_variant
)
self._panel_action.set_enabled(False)
self._panel_action.connect('change-state', self.on_menu_panel)
self.add_action(self._panel_action)
self._toggle_fullscreen_action = Gio.SimpleAction.new("toggle-fullscreen", None)
self._toggle_fullscreen_action = Gio.SimpleAction.new(
"toggle-fullscreen",
None
)
self._toggle_fullscreen_action.set_enabled(True)
self._toggle_fullscreen_action.connect('activate', self.on_menu_toggle_fullscreen)
self._toggle_fullscreen_action.connect(
'activate',
self.on_menu_toggle_fullscreen
)
self.add_action(self._toggle_fullscreen_action)
self._search_library_action = Gio.SimpleAction.new("search-library", None)
self._search_library_action = Gio.SimpleAction.new(
"search-library",
None
)
self._search_library_action.set_enabled(True)
self._search_library_action.connect('activate', self.on_menu_search_library)
self._search_library_action.connect(
'activate',
self.on_menu_search_library
)
self.add_action(self._search_library_action)
# Menu callbacks
@ -212,7 +381,9 @@ class Window(Adw.ApplicationWindow):
def on_menu_panel(self, action, value):
action.set_state(value)
self.panel_stack.set_visible_child(self._panels[int(value.get_string())])
self.panel_stack.set_visible_child(
self._panels[int(value.get_string())]
)
def on_menu_toggle_fullscreen(self, action, value):
self.panel_stack.set_visible_child(self._cover_panel)
@ -279,15 +450,31 @@ class Window(Adw.ApplicationWindow):
self.toolbar_view.add_top_bar(self.headerbar)
self.toolbar_view.remove(panel.get_headerbar_standalone())
def on_connection_panel_connection_changed(self, widget, host, port, password):
def on_connection_panel_connection_changed(
self,
widget,
host,
port,
password
):
self._settings.set_string(Window.SETTING_HOST, host)
self._settings.set_int(Window.SETTING_PORT, port)
if use_keyring:
if password:
keyring.set_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME, password)
keyring.set_password(
ZeroconfProvider.KEYRING_SYSTEM,
ZeroconfProvider.KEYRING_USERNAME,
password
)
else:
if keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME):
keyring.delete_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME)
if keyring.get_password(
ZeroconfProvider.KEYRING_SYSTEM,
ZeroconfProvider.KEYRING_USERNAME
):
keyring.delete_password(
ZeroconfProvider.KEYRING_SYSTEM,
ZeroconfProvider.KEYRING_USERNAME
)
def on_playlist_panel_clear_playlist(self, widget):
self._mcg.clear_playlist()
@ -333,7 +520,10 @@ class Window(Adw.ApplicationWindow):
def on_library_panel_item_size_changed(self, widget, size):
self._playlist_panel.set_item_size(size)
self._settings.set_int(Window.SETTING_ITEM_SIZE, self._library_panel.get_item_size())
self._settings.set_int(
Window.SETTING_ITEM_SIZE,
self._library_panel.get_item_size()
)
def on_library_panel_sort_order_changed(self, widget, sort_order):
self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order)
@ -365,7 +555,18 @@ class Window(Adw.ApplicationWindow):
self._clear_playlist_action.set_enabled(False)
self._panel_action.set_enabled(False)
def on_mcg_status(self, state, album, pos, time, volume, file, audio, bitrate, error):