From d2e1f6f5d85e2fac2fb673aa5f5353aeb4678f77 Mon Sep 17 00:00:00 2001 From: coderkun Date: Sun, 26 May 2024 18:29:10 +0200 Subject: [PATCH] Adjust blank lines to match Code Style Guide (see #103) --- src/__init__.py | 9 --- src/albumheaderbar.py | 7 +- src/application.py | 19 +---- src/client.py | 159 ++--------------------------------------- src/connectionpanel.py | 16 +---- src/coverpanel.py | 22 +----- src/librarypanel.py | 48 +------------ src/main.py | 1 - src/playlistpanel.py | 32 +-------- src/serverpanel.py | 11 +-- src/shortcutsdialog.py | 5 +- src/utils.py | 21 +----- src/window.py | 69 +----------------- src/zeroconf.py | 8 --- 14 files changed, 14 insertions(+), 413 deletions(-) diff --git a/src/__init__.py b/src/__init__.py index cb91a42..aae3b90 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,12 +1,8 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- - import os - - - # Set environment srcdir = os.path.abspath(os.path.dirname(__file__)) datadir = os.path.join(srcdir, 'data') @@ -23,19 +19,14 @@ if not os.environ.get('GSETTINGS_SCHEMA_DIR'): os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev - - class Environment: """Wrapper class to access environment settings.""" - def get_srcdir(): return srcdir - def get_data(subdir): return os.path.join(datadir, subdir) - def get_locale(): return localedir diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py index ab6607a..801e884 100644 --- a/src/albumheaderbar.py +++ b/src/albumheaderbar.py @@ -1,15 +1,13 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') from gi.repository import Gtk, GObject, Adw - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui') class AlbumHeaderbar(Adw.Bin): __gtype_name__ = 'McgAlbumHeaderbar' @@ -21,16 +19,13 @@ class AlbumHeaderbar(Adw.Bin): standalone_title = Gtk.Template.Child() standalone_artist = Gtk.Template.Child() - def __init__(self): super().__init__() - @Gtk.Template.Callback() def on_close_clicked(self, widget): self.emit('close') - def set_album(self, album): self.standalone_title.set_text(album.get_title()) self.standalone_artist.set_text(", ".join(album.get_albumartists())) diff --git a/src/application.py b/src/application.py index 7bbde2b..493dffd 100644 --- a/src/application.py +++ b/src/application.py @@ -1,25 +1,19 @@ #!/usr/bin/env python3 - import logging -import urllib - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') from gi.repository import Gio, Gtk, Gdk, GLib, Adw - from .window import Window - - class Application(Gtk.Application): TITLE = "CoverGrid" ID = 'xyz.suruatoel.mcg' DOMAIN = 'mcg' - def __init__(self): super().__init__(application_id=Application.ID, flags=Gio.ApplicationFlags.FLAGS_NONE) self._window = None @@ -38,7 +32,6 @@ class Application(Gtk.Application): self.set_accels_for_action('win.panel("2")', ['KP_3']) self.set_accels_for_action('win.panel("3")', ['KP_4']) - def do_startup(self): Gtk.Application.do_startup(self) self._setup_logging() @@ -48,14 +41,12 @@ class Application(Gtk.Application): self._setup_actions() self._setup_adw() - def do_activate(self): Gtk.Application.do_activate(self) if not self._window: self._window = Window(self, Application.TITLE, self._settings) self._window.present() - def on_menu_info(self, action, value): self._info_dialog = Adw.AboutDialog() self._info_dialog.set_application_icon("xyz.suruatoel.mcg") @@ -67,27 +58,22 @@ class Application(Gtk.Application): self._info_dialog.set_issue_url("https://git.suruatoel.xyz/coderkun/mcg") self._info_dialog.present() - def on_menu_quit(self, action, value): self.quit() - def _setup_logging(self): logging.basicConfig( level=self._verbosity, format="%(asctime)s %(levelname)s: %(message)s" ) - def _load_settings(self): self._settings = Gio.Settings.new(Application.ID) - def _set_default_settings(self): style_manager = Adw.StyleManager.get_default() style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK) - def _load_css(self): styleProvider = Gtk.CssProvider() styleProvider.load_from_resource(self._get_resource_path('gtk.css')) @@ -97,7 +83,6 @@ class Application(Gtk.Application): Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION ) - def _setup_actions(self): action = Gio.SimpleAction.new("info", None) action.connect('activate', self.on_menu_info) @@ -106,11 +91,9 @@ class Application(Gtk.Application): action.connect('activate', self.on_menu_quit) self.add_action(action) - def _get_resource_path(self, path): return "/{}/{}".format(Application.ID.replace('.', '/'), path) - def _setup_adw(self): Adw.HeaderBar() Adw.ToolbarView() diff --git a/src/client.py b/src/client.py index 551f524..382c414 100644 --- a/src/client.py +++ b/src/client.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 - import concurrent.futures import configparser import dateutil.parser @@ -15,14 +14,12 @@ from mcg.utils import SortOrder from mcg.utils import Utils - - class MPDException(Exception): + def __init__(self, error): super(MPDException, self).__init__(self._parse_error(error)) self._error = error - def _parse_error(self, error): if error: parts = re.match("\[(\d+)@(\d+)\]\s\{(\w+)\}\s(.*)", error) @@ -33,19 +30,15 @@ class MPDException(Exception): return parts.group(4) return error - def get_error(self): return self._error - def get_error_number(self): return self._error_number - def get_command_number(self): return self._command_number - def get_command_name(self): return self._command_name @@ -62,53 +55,43 @@ class CommandException(MPDException): pass - - class Future(concurrent.futures.Future): + def __init__(self, signal): concurrent.futures.Future.__init__(self) self._signal = signal - def get_signal(self): return self._signal - - class Base(): + def __init__(self): self._callbacks = {} - def connect_signal(self, signal, callback): """Connect a callback function to a signal (event).""" self._callbacks[signal] = callback - def disconnect_signal(self, signal): """Disconnect a callback function from a signal (event).""" if self._has_callback(signal): del self._callbacks[signal] - def _has_callback(self, signal): """Check if there is a registered callback function for a signal.""" return signal in self._callbacks - def _callback(self, signal, *data): if signal in self._callbacks: callback = self._callbacks[signal] callback(*data) - def _callback_future(self, future): self._callback(future.get_signal(), *future.result()) - - class Client(Base): """Client library for handling the connection to the Music Player Daemon. @@ -148,8 +131,6 @@ class Client(Base): # Buffer size for reading from socket SOCKET_BUFSIZE = 4096 - - def __init__(self): """Set class variables and instantiates the Client.""" Base.__init__(self) @@ -166,11 +147,9 @@ class Client(Base): self._playlist = [] self._state = None - def get_logger(self): return self._logger - # Client commands def connect(self, host, port, password=None): @@ -183,132 +162,108 @@ class Client(Base): self._stop.clear() self._start_worker() - def is_connected(self): """Return the connection status.""" return self._worker is not None and self._worker.is_alive() - def disconnect(self): """Disconnect from the connected MPD.""" self._logger.info("disconnect") self._stop.set() self._add_action(self._disconnect) - def join(self): self._actions.join() - def get_status(self): """Determine the current status.""" self._logger.info("get status") self._add_action_signal(Client.SIGNAL_STATUS, self._get_status) - def get_stats(self): """Load statistics.""" self._logger.info("get stats") self._add_action_signal(Client.SIGNAL_STATS, self._get_stats) - 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) - def enable_output_device(self, device, enabled): """Enable/disable an audio output device.""" self._logger.info("enable output device") self._add_action(self._enable_output_device, device, enabled) - - def load_albums(self): self._logger.info("load albums") self._add_action_signal(Client.SIGNAL_LOAD_ALBUMS, self._load_albums) - def update(self): self._logger.info("update") self._add_action(self._update) - def load_playlist(self): self._logger.info("load playlist") self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST, self._load_playlist) - def clear_playlist(self): """Clear the current playlist""" self._logger.info("clear playlist") self._add_action(self._clear_playlist) - def remove_album_from_playlist(self, album): """Remove the given album from the playlist.""" self._logger.info("remove album from playlist") self._add_action(self._remove_album_from_playlist, album) - def remove_albums_from_playlist(self, albums): """Remove multiple albums from the playlist in one step.""" self._logger.info("remove multiple albums from playlist") self._add_action(self._remove_albums_from_playlist, albums) - def play_album_from_playlist(self, album): """Play the given album from the playlist.""" self._logger.info("play album from playlist") self._add_action(self._play_album_from_playlist, album) - def playpause(self): """Play or pauses the current state.""" self._logger.info("playpause") self._add_action(self._playpause) - def play_album(self, album): """Add the given album to the queue and play it immediately.""" self._logger.info("play album") self._add_action(self._play_album, album) - def queue_album(self, album): """Add the given album to the queue.""" self._logger.info("play album") self._add_action(self._queue_album, album) - def queue_albums(self, albums): """Add the given albums to the queue.""" self._logger.info("play albums") self._add_action(self._queue_albums, albums) - def seek(self, pos, time): """Seeks to a song at a position""" self._logger.info("seek") self._add_action(self._seek, pos, time) - def stop(self): self._logger.info("stop") self._add_action(self._stop) - def set_volume(self, volume): self._logger.info("set volume") self._add_action(self._set_volume, volume) - def get_albumart(self, album): self._logger.info("get albumart") self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART, self._get_albumart, album) - def get_albumart_now(self, album): self._logger.info("get albumart now") future = concurrent.futures.Future() @@ -316,7 +271,6 @@ class Client(Base): (_, albumart) = future.result() return albumart - # Private methods def _connect(self, host, port, password): @@ -335,7 +289,6 @@ class Client(Base): except OSError as e: raise ConnectionException("connection failed: {}".format(e)) - def _connect_socket(self, host, port): sock = None error = None @@ -356,7 +309,6 @@ class Client(Base): else: raise ConnectionException("no suitable socket") - def _greet(self): greeting = self._read_line() self._logger.debug("greeting: %s", greeting.strip()) @@ -366,12 +318,10 @@ class Client(Base): self._protocol_version = greeting[len(Client.PROTOCOL_GREETING):].strip() self._logger.debug("protocol version: %s", self._protocol_version) - def _disconnect(self): self._logger.info("disconnecting") self._disconnect_socket() - def _disconnect_socket(self): if self._sock_write is not None: self._sock_write.close() @@ -382,7 +332,6 @@ class Client(Base): self._logger.info("disconnected") self._set_connection_status(False) - def _idle(self): """React to idle events from MPD.""" self._logger.info("idle") @@ -410,13 +359,11 @@ class Client(Base): self.get_output_devices() self.get_status() - def _noidle(self): if self._idling: self._logger.debug("noidle") self._write("noidle") - def _get_status(self): """Action: Perform the real status determination.""" self._logger.info("getting status") @@ -471,7 +418,6 @@ class Client(Base): bitrate = status['bitrate'] return (state, album, pos, time, volume, file, audio, bitrate, error) - def _get_stats(self): """Action: Perform the real statistics gathering.""" self._logger.info("getting statistics") @@ -504,7 +450,6 @@ class Client(Base): uptime = stats['uptime'] return (artists, albums, songs, dbplaytime, playtime, uptime) - def _get_output_devices(self): """Action: Perform the real loading of output devices.""" devices = [] @@ -514,7 +459,6 @@ class Client(Base): devices.append(device) return (devices, ) - def _enable_output_device(self, device, enabled): """Action: Perform the real enabling/disabling of an output device.""" if enabled: @@ -522,7 +466,6 @@ class Client(Base): else: self._call('disableoutput ', device.get_id()) - def _load_albums(self): """Action: Perform the real update.""" self._callback(Client.SIGNAL_INIT_ALBUMS) @@ -542,11 +485,9 @@ class Client(Base): album.add_track(track) return (self._albums, ) - def _update(self): self._call('update') - def _load_playlist(self): self._playlist = [] for song in self._parse_list(self._call('playlistinfo'), ['file', 'playlist']): @@ -565,19 +506,16 @@ class Client(Base): album.add_track(track) return (self._playlist, ) - def _clear_playlist(self): """Action: Perform the real clearing of the current playlist.""" self._call('clear') - def _remove_album_from_playlist(self, album): self._call_list('command_list_begin') for track in album.get_tracks(): self._call_list('deleteid', track.get_id()) self._call('command_list_end') - def _remove_albums_from_playlist(self, albums): self._call_list('command_list_begin') for album in albums: @@ -585,12 +523,10 @@ class Client(Base): self._call_list('deleteid', track.get_id()) self._call('command_list_end') - def _play_album_from_playlist(self, album): if album.get_tracks(): self._call('playid', album.get_tracks()[0].get_id()) - def _playpause(self): """Action: Perform the real play/pause command.""" #status = self._parse_dict(self._call('status')) @@ -600,14 +536,12 @@ class Client(Base): else: self._call('play') - def _play_album(self, album): track_ids = self._queue_album(album) if track_ids: self._logger.info("play track %d", track_ids[0]) self._call('playid', track_ids[0]) - def _queue_album(self, album): track_ids = [] if album in self._albums: @@ -623,25 +557,20 @@ class Client(Base): track_ids.append(track_id) return track_ids - def _queue_albums(self, albums): track_ids = [] for album in albums: track_ids.extend(self._queue_album(album)) - def _seek(self, pos, time): self._call('seek', pos, time) - def _stop(self): self._call('stop') - def _set_volume(self, volume): self._call('setvol', volume) - def _get_albumart(self, album): if album in self._albums: album = self._albums[album] @@ -663,7 +592,6 @@ class Client(Base): return (album, None) - def _start_worker(self): """Start the worker thread which waits for action to be performed.""" self._logger.debug("start worker") @@ -672,7 +600,6 @@ class Client(Base): self._worker.start() self._logger.debug("worker started") - def _run(self): while not self._stop.is_set() or not self._actions.empty(): if self._sock is not None and self._actions.empty(): @@ -684,7 +611,6 @@ class Client(Base): self._logger.debug("action done") self._logger.debug("worker finished") - def _add_action(self, method, *args): """Add an action to the action list.""" self._logger.debug("add action %r (%r)", method.__name__, args) @@ -695,7 +621,6 @@ class Client(Base): return future - 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) @@ -705,7 +630,6 @@ class Client(Base): return future - def _add_action_future(self, future, method, *args): """Add an action to the action list based on a futre.""" self._logger.debug("add action future %r (%r)", method.__name__, args) @@ -713,7 +637,6 @@ class Client(Base): self._actions.put(action) self._noidle() - def _work(self, action): (future, method, args) = action self._logger.debug("work: %r", method.__name__) @@ -730,7 +653,6 @@ class Client(Base): future.set_exception(e) self._callback(Client.SIGNAL_ERROR, e) - def _call(self, command, *args): try: self._write(command, args) @@ -740,7 +662,6 @@ class Client(Base): self.disconnect() self._callback(Client.SIGNAL_ERROR, e) - def _call_list(self, command, *args): try: self._write(command, args) @@ -749,7 +670,6 @@ class Client(Base): 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)) @@ -759,7 +679,6 @@ class Client(Base): self._sock_write.write(line) self._sock_write.flush() - def _read(self): self._logger.debug("reading response") response = [] @@ -776,7 +695,6 @@ class Client(Base): self._logger.debug("response: %r", response) return response - def _read_line(self): self._logger.debug("reading line") @@ -800,7 +718,6 @@ class Client(Base): return data.decode('utf-8') return None - def _read_binary(self, command, filename, has_mimetype): data = None size = 1 @@ -849,7 +766,6 @@ class Client(Base): break return data - def _read_bytes(self, buf, nbytes): self._logger.debug("reading bytes") # Use already buffered data @@ -863,7 +779,6 @@ class Client(Base): nbytes_read += self._sock.recv_into(buf_view, nbytes) return nbytes_read - def _buffer_get_char(self, char): pos = self._buffer.find(char) if pos < 0: @@ -872,7 +787,6 @@ class Client(Base): self._buffer = self._buffer[pos+1:] return buf - def _buffer_get_size(self, size): buf = self._buffer[0:size] self._logger.debug("get %d bytes from buffer", len(buf)) @@ -880,12 +794,10 @@ class Client(Base): self._logger.debug("leaving %d in the buffer", len(self._buffer)) return buf - def _buffer_set(self, buf): self._logger.debug("set %d %s as buffer", len(buf), type(buf)) self._buffer = buf - def _parse_dict(self, response): dict = {} if response: @@ -894,7 +806,6 @@ class Client(Base): dict[key] = value return dict - def _parse_list(self, response, delimiters): entry = {} if response: @@ -912,12 +823,10 @@ class Client(Base): if entry: yield entry - def _split_line(self, line): parts = line.split(':') return parts[0].lower(), ':'.join(parts[1:]).lstrip() - def _extract_album(self, song, lookup=True): album = None if 'album' not in song: @@ -931,7 +840,6 @@ class Client(Base): self._albums[id] = album return album - def _extract_track(self, song): track = None if 'artist' in song and 'title' in song and 'file' in song: @@ -948,54 +856,42 @@ class Client(Base): track.set_last_modified(song['last-modified']) return track - def _extract_playlist_track(self, song): track = self._extract_track(song) if track and 'id' in song and 'pos' in song: track = MCGPlaylistTrack(track, song['id'], song['pos']) return track - def _set_connection_status(self, status): self._callback(Client.SIGNAL_CONNECTION, status) - - class OutputDevice: - def __init__(self, id, name): self._id = id self._name = name self._enabled = None - def get_id(self): return self._id - def get_name(self): return self._name - def set_enabled(self, enabled): self._enabled = enabled - def is_enabled(self): return self._enabled - - class MCGAlbum: DEFAULT_ALBUM = 'Various' _FILE_NAMES = ['cover', 'folder'] _FILE_EXTS = ['jpg', 'png', 'jpeg'] _FILTER_DELIMITER = ' ' - def __init__(self, title, host): self._artists = [] self._albumartists = [] @@ -1010,49 +906,39 @@ class MCGAlbum: self._last_modified = None self._id = Utils.generate_id(title) - def __eq__(self, other): return (other and self.get_id() == other.get_id()) - def __hash__(self): return hash(self._title) - def get_id(self): return self._id - def get_artists(self): if self._albumartists: return [artist for artist in self._artists if artist not in self._albumartists] return self._artists - def get_albumartists(self): if self._albumartists: return self._albumartists return self._artists - def get_title(self): return self._title - def get_dates(self): return self._dates - def get_date(self): if len(self._dates) == 0: return None return self._dates[0] - def get_path(self): return self._path - def add_track(self, track): self._tracks.append(track) self._length = self._length + track.get_length() @@ -1071,19 +957,15 @@ class MCGAlbum: if not self._last_modified or track.get_last_modified() > self._last_modified: self._last_modified = track.get_last_modified() - def get_tracks(self): return self._tracks - def get_length(self): return self._length - def get_last_modified(self): return self._last_modified - def filter(self, filter_string): if len(filter_string) == 0: return True @@ -1109,7 +991,6 @@ class MCGAlbum: return False return True - def compare(album1, album2, criterion=None, reverse=False): if criterion == None: criterion = SortOrder.TITLE @@ -1140,9 +1021,8 @@ class MCGAlbum: return 1 * reverseMultiplier - - class MCGTrack: + def __init__(self, artists, title, file): if type(artists) is not list: artists = [artists] @@ -1160,41 +1040,33 @@ class MCGTrack: self._date = None self._last_modified = None - def __eq__(self, other): return self._file == other.get_file() - def __hash__(self): return hash(self._file) - def get_artists(self): if self._albumartists: return [artist for artist in self._artists if artist not in self._albumartists] return self._artists - def set_albumartists(self, artists): if type(artists) is not list: artists = [artists] self._albumartists = artists - def get_albumartists(self): if self._albumartists: return self._albumartists return self._artists - def get_title(self): return self._title - def get_track(self): return self._track - def set_track(self, track): if type(track) is list: track = track[0] @@ -1207,29 +1079,23 @@ class MCGTrack: track = 0 self._track = track - def get_length(self): return self._length - def set_length(self, length): self._length = int(length) - def get_date(self): return self._date - def set_date(self, date): if type(date) is list: date = date[0] self._date = date - def get_file(self): return self._file - def set_last_modified(self, date_string): if date_string: try: @@ -1237,13 +1103,10 @@ class MCGTrack: except ValueError as e: self._logger.debug("Invalid date format: %s", date_string) - def get_last_modified(self): return self._last_modified - - class MCGPlaylistTrack(MCGTrack): def __init__(self, track, id, pos): MCGTrack.__init__( @@ -1259,51 +1122,40 @@ class MCGPlaylistTrack(MCGTrack): self._id = int(id) self._pos = int(pos) - def get_id(self): return self._id - def get_pos(self): return self._pos - - class MCGConfig(configparser.ConfigParser): CONFIG_DIR = '~/.config/mcg/' - def __init__(self, filename): configparser.ConfigParser.__init__(self) self._filename = os.path.expanduser(os.path.join(MCGConfig.CONFIG_DIR, filename)) self._create_dir() - def load(self): if os.path.isfile(self._filename): self.read(self._filename) - def save(self): with open(self._filename, 'w') as configfile: self.write(configfile) - def _create_dir(self): dirname = os.path.dirname(self._filename) if not os.path.exists(dirname): os.makedirs(dirname) - - class MCGCache(): DIRNAME = '~/.cache/mcg/' SIZE_FILENAME = 'size' _lock = threading.Lock() - def __init__(self, host, size): self._logger = logging.getLogger(__name__) self._host = host @@ -1313,11 +1165,9 @@ class MCGCache(): os.makedirs(self._dirname) self._read_size() - def create_filename(self, album): return os.path.join(self._dirname, '-'.join([album.get_id()])) - def _read_size(self): size = 100 MCGCache._lock.acquire() @@ -1338,7 +1188,6 @@ class MCGCache(): f.write(str(self._size)) MCGCache._lock.release() - def _clear(self): for filename in os.listdir(self._dirname): path = os.path.join(self._dirname, filename) diff --git a/src/connectionpanel.py b/src/connectionpanel.py index 5cfd4ad..65a7cf1 100644 --- a/src/connectionpanel.py +++ b/src/connectionpanel.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') import locale @@ -11,8 +11,6 @@ from gi.repository import Gtk, Gio, GObject, Adw from mcg.zeroconf import ZeroconfProvider - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui') class ConnectionPanel(Adw.Bin): __gtype_name__ = 'McgConnectionPanel' @@ -27,7 +25,6 @@ class ConnectionPanel(Adw.Bin): port_spinner = Gtk.Template.Child() password_row = Gtk.Template.Child() - def __init__(self, **kwargs): super().__init__(**kwargs) @@ -35,7 +32,6 @@ class ConnectionPanel(Adw.Bin): self._zeroconf_provider = ZeroconfProvider() self._zeroconf_provider.connect_signal(ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service) - def on_new_service(self, service): name, host, port = service @@ -50,50 +46,40 @@ class ConnectionPanel(Adw.Bin): self.zeroconf_list.insert(row, -1) - def on_service_selected(self, widget, host, port): self.set_host(host) self.set_port(port) - @Gtk.Template.Callback() def on_host_entry_apply(self, widget): self._call_back() - @Gtk.Template.Callback() def on_port_spinner_value_changed(self, widget): self._call_back() - def set_host(self, host): self.host_row.set_text(host) - def get_host(self): return self.host_row.get_text() - def set_port(self, port): self.port_spinner.set_value(port) - def get_port(self): return self.port_spinner.get_value_as_int() - def set_password(self, password): if password is None: password = "" self.password_row.set_text(password) - def get_password(self): if self.password_row.get_text() == "": return None else: return self.password_entry.get_text() - def _call_back(self): self.emit('connection-changed', self.get_host(), self.get_port(), self.get_password(),) diff --git a/src/coverpanel.py b/src/coverpanel.py index 59c75a3..02fa545 100644 --- a/src/coverpanel.py +++ b/src/coverpanel.py @@ -1,18 +1,15 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') import logging import math from gi.repository import Gtk, Gdk, GObject, GdkPixbuf - from mcg.utils import Utils - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-panel.ui') class CoverPanel(Gtk.Overlay): __gtype_name__ = 'McgCoverPanel' @@ -42,8 +39,6 @@ class CoverPanel(Gtk.Overlay): # Songs songs_scale = Gtk.Template.Child() - - def __init__(self, **kwargs): super().__init__(**kwargs) @@ -70,25 +65,20 @@ class CoverPanel(Gtk.Overlay): buttonController.connect('unpaired-release', self.on_songs_scale_released) self.songs_scale.add_controller(buttonController) - def get_toolbar(self): return self.toolbar - def set_selected(self, selected): pass - def on_cover_box_pressed(self, widget, npress, x, y): if self._current_album and npress == 2: self.emit('toggle-fullscreen') - def set_width(self, width): GObject.idle_add(self._resize_image) self.cover_info_scroll.set_max_content_width(width // 2) - def on_songs_scale_pressed(self, widget, npress, x, y): if self._timer: GObject.source_remove(self._timer) @@ -107,7 +97,6 @@ class CoverPanel(Gtk.Overlay): time = max(value - time - 1, 0) self.emit('set-song', pos, time) - def set_album(self, album): if album: # Set labels @@ -129,7 +118,6 @@ class CoverPanel(Gtk.Overlay): self._enable_tracklist() self.fullscreen_button.set_sensitive(self._current_album is not None) - def set_play(self, pos, time): if self._timer is not None: GObject.source_remove(self._timer) @@ -141,13 +129,11 @@ class CoverPanel(Gtk.Overlay): self.songs_scale.set_value(time+1) self._timer = GObject.timeout_add(1000, self._playing) - def set_pause(self): if self._timer is not None: GObject.source_remove(self._timer) self._timer = None - def set_fullscreen(self, active): if active: self.info_revealer.set_reveal_child(False) @@ -159,7 +145,6 @@ class CoverPanel(Gtk.Overlay): self.info_revealer.set_reveal_child(True) GObject.idle_add(self._resize_image) - def set_albumart(self, album, data): if album == self._current_album: if data: @@ -177,7 +162,6 @@ class CoverPanel(Gtk.Overlay): # Show image GObject.idle_add(self._show_image) - def _set_tracks(self, album): self.songs_scale.clear_marks() self.songs_scale.set_range(0, album.get_length()) @@ -200,7 +184,6 @@ class CoverPanel(Gtk.Overlay): "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60)) ) - def _enable_tracklist(self): if self._current_album: # enable @@ -210,14 +193,12 @@ class CoverPanel(Gtk.Overlay): # disable self.info_revealer.set_reveal_child(False) - def _playing(self): value = self.songs_scale.get_value() + 1 self.songs_scale.set_value(value) return True - def _show_image(self): if self._cover_pixbuf: self._resize_image() @@ -226,7 +207,6 @@ class CoverPanel(Gtk.Overlay): self.cover_stack.set_visible_child(self.cover_default) self.cover_spinner.stop() - def _resize_image(self): """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse diff --git a/src/librarypanel.py b/src/librarypanel.py index aee5fcc..59a06a0 100644 --- a/src/librarypanel.py +++ b/src/librarypanel.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') import locale @@ -10,7 +10,6 @@ import math import threading from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw - from mcg import client from mcg.albumheaderbar import AlbumHeaderbar from mcg.utils import SortOrder @@ -19,8 +18,6 @@ from mcg.utils import GridItem from mcg.utils import SearchFilter - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui') class LibraryPanel(Adw.Bin): __gtype_name__ = 'McgLibraryPanel' @@ -37,7 +34,6 @@ class LibraryPanel(Adw.Bin): 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)), } - # Widgets library_stack = Gtk.Template.Child() panel_normal = Gtk.Template.Child() @@ -74,7 +70,6 @@ class LibraryPanel(Adw.Bin): standalone_scroll = Gtk.Template.Child() standalone_image = Gtk.Template.Child() - def __init__(self, client, **kwargs): super().__init__(**kwargs) self._logger = logging.getLogger(__name__) @@ -121,19 +116,15 @@ class LibraryPanel(Adw.Bin): buttonController.connect('unpaired-release', self.on_grid_scale_released) self.grid_scale.add_controller(buttonController) - def get_headerbar_standalone(self): return self._headerbar_standalone - def get_toolbar(self): return self.toolbar - def set_selected(self, selected): self._is_selected = selected - @Gtk.Template.Callback() def on_select_toggled(self, widget): if self.select_button.get_active(): @@ -147,12 +138,10 @@ class LibraryPanel(Adw.Bin): self.library_grid.set_single_click_activate(True) self.library_grid.get_style_context().remove_class(Utils.CSS_SELECTION) - @Gtk.Template.Callback() def on_update_clicked(self, widget): self.emit('update') - def on_grid_scale_released(self, widget, x, y, npress, sequence): size = math.floor(self.grid_scale.get_value()) range = self.grid_scale.get_adjustment() @@ -163,7 +152,6 @@ class LibraryPanel(Adw.Bin): self._redraw() GObject.idle_add(self.toolbar_popover.popdown) - @Gtk.Template.Callback() def on_grid_scale_changed(self, widget): size = math.floor(self.grid_scale.get_value()) @@ -172,7 +160,6 @@ class LibraryPanel(Adw.Bin): return self._set_widget_grid_size(self.library_grid, size, True) - @Gtk.Template.Callback() def on_sort_toggled(self, widget): if widget.get_active(): @@ -180,7 +167,6 @@ class LibraryPanel(Adw.Bin): self._sort_grid_model() self.emit('sort-order-changed', self._sort_order) - @Gtk.Template.Callback() def on_sort_order_toggled(self, button): if button.get_active(): @@ -190,17 +176,14 @@ class LibraryPanel(Adw.Bin): self._sort_grid_model() self.emit('sort-type-changed', button.get_active()) - def set_size(self, width, height): self._set_marks() self._resize_standalone_image() - @Gtk.Template.Callback() def on_filter_entry_changed(self, widget): self._library_grid_filter.set_filter(SearchFilter(self.filter_entry.get_text())) - @Gtk.Template.Callback() def on_library_grid_clicked(self, widget, position): # Get selected album @@ -222,49 +205,40 @@ class LibraryPanel(Adw.Bin): self.standalone_stack.set_visible_child(self.standalone_spinner) self.standalone_spinner.start() - @Gtk.Template.Callback() def on_selection_cancel_clicked(self, widget): self.select_button.set_active(False) - @Gtk.Template.Callback() def on_selection_add_clicked(self, widget): self.emit('queue-multiple', self._get_selected_albums()) self.select_button.set_active(False) - @Gtk.Template.Callback() def on_standalone_play_clicked(self, widget): self.emit('play', self._selected_albums[0].get_id()) self._close_standalone() - @Gtk.Template.Callback() def on_standalone_queue_clicked(self, widget): self.emit('queue', self._selected_albums[0].get_id()) self._close_standalone() - def on_standalone_close_clicked(self, widget): self._close_standalone() - def show_search(self): self.filter_bar.set_search_mode(True) - def set_item_size(self, item_size): if self._item_size != item_size: self._item_size = item_size self.grid_scale.set_value(item_size) self._redraw() - def get_item_size(self): return self._item_size - def set_sort_order(self, sort): button = self._toolbar_sort_buttons[sort] if button: @@ -273,7 +247,6 @@ class LibraryPanel(Adw.Bin): 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 @@ -282,25 +255,20 @@ class LibraryPanel(Adw.Bin): self.toolbar_sort_order_button.set_active(sort_type) self._sort_grid_model() - def get_sort_type(self): return (self._sort_type != Gtk.SortType.ASCENDING) - def init_albums(self): self.progress_bar.set_text(locale.gettext("Loading albums")) - def load_albums(self): self.progress_bar.pulse() - 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() - def set_albumart(self, album, data): if album in self._selected_albums: if data: @@ -315,19 +283,15 @@ class LibraryPanel(Adw.Bin): # Show image 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) - 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)) - def stop_threads(self): self._library_stop.set() - def _set_albums(self, host, albums, size): self._library_lock.acquire() self._albums = albums @@ -373,12 +337,10 @@ class LibraryPanel(Adw.Bin): GObject.idle_add(self.stack.set_visible_child, self.scroll) self._sort_grid_model() - 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() - def _set_widget_grid_size_thread(self, grid_widget, size, vertical): self._library_lock.acquire() self._library_stop.clear() @@ -409,18 +371,15 @@ class LibraryPanel(Adw.Bin): self._library_lock.release() - def _show_image(self): self._resize_standalone_image() self.standalone_stack.set_visible_child(self.standalone_scroll) self.standalone_spinner.stop() - def _redraw(self): if self._albums is not None: self.set_albums(self._host, self._albums) - def _set_marks(self): width = self.scroll.get_width() if width == self._grid_width: @@ -441,17 +400,14 @@ class LibraryPanel(Adw.Bin): None ) - def _open_standalone(self): self.library_stack.set_visible_child(self.panel_standalone) self.emit('open-standalone') - def _close_standalone(self): self.library_stack.set_visible_child(self.panel_normal) self.emit('close-standalone') - def _resize_standalone_image(self): """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse @@ -481,7 +437,6 @@ class LibraryPanel(Adw.Bin): self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) self.standalone_image.show() - def _get_default_image(self): return self._icon_theme.lookup_icon( Utils.STOCK_ICON_DEFAULT, @@ -492,7 +447,6 @@ class LibraryPanel(Adw.Bin): Gtk.IconLookupFlags.FORCE_SYMBOLIC ) - def _get_selected_albums(self): albums = [] for i in range(self.library_grid.get_model().get_n_items()): diff --git a/src/main.py b/src/main.py index 39e5be5..bc1476c 100644 --- a/src/main.py +++ b/src/main.py @@ -3,7 +3,6 @@ import sys from .application import Application - def main(version): app = Application() return app.run(sys.argv) diff --git a/src/playlistpanel.py b/src/playlistpanel.py index c705f1d..b181937 100644 --- a/src/playlistpanel.py +++ b/src/playlistpanel.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') import logging @@ -9,15 +9,12 @@ import math import threading from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw - from mcg import client from mcg.albumheaderbar import AlbumHeaderbar from mcg.utils import Utils from mcg.utils import GridItem - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-panel.ui') class PlaylistPanel(Adw.Bin): __gtype_name__ = 'McgPlaylistPanel' @@ -31,7 +28,6 @@ class PlaylistPanel(Adw.Bin): 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)), } - # Widgets playlist_stack = Gtk.Template.Child() panel_normal = Gtk.Template.Child() @@ -52,7 +48,6 @@ class PlaylistPanel(Adw.Bin): standalone_scroll = Gtk.Template.Child() standalone_image = Gtk.Template.Child() - def __init__(self, client, **kwargs): super().__init__(**kwargs) self._client = client @@ -78,19 +73,15 @@ class PlaylistPanel(Adw.Bin): # Playlist Grid self.playlist_grid.set_model(self._playlist_grid_selection_single) - def get_headerbar_standalone(self): return self._headerbar_standalone - def get_toolbar(self): return self.toolbar - def set_selected(self, selected): self._is_selected = selected - @Gtk.Template.Callback() def on_select_toggled(self, widget): if self.select_button.get_active(): @@ -104,12 +95,10 @@ class PlaylistPanel(Adw.Bin): self.playlist_grid.set_single_click_activate(True) self.playlist_grid.get_style_context().remove_class(Utils.CSS_SELECTION) - @Gtk.Template.Callback() def on_clear_clicked(self, widget): self.emit('clear-playlist') - @Gtk.Template.Callback() def on_playlist_grid_clicked(self, widget, position): # Get selected album @@ -131,54 +120,44 @@ class PlaylistPanel(Adw.Bin): self.standalone_stack.set_visible_child(self.standalone_spinner) self.standalone_spinner.start() - @Gtk.Template.Callback() def on_selection_cancel_clicked(self, widget): self.select_button.set_active(False) - @Gtk.Template.Callback() def on_selection_remove_clicked(self, widget): self.emit('remove-multiple-albums', self._get_selected_albums()) self.select_button.set_active(False) - def on_headerbar_close_clicked(self, widget): self._close_standalone() - @Gtk.Template.Callback() def on_standalone_remove_clicked(self, widget): self.emit('remove-album', self._get_selected_albums()[0]) self._close_standalone() - @Gtk.Template.Callback() def on_standalone_play_clicked(self, widget): self.emit('play', self._get_selected_albums()[0]) self._close_standalone() - def set_size(self, width, height): self._resize_standalone_image() - def set_item_size(self, item_size): if self._item_size != item_size: self._item_size = item_size self._redraw() - def get_item_size(self): return self._item_size - 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() - def set_albumart(self, album, data): if album in self._selected_albums: if data: @@ -193,11 +172,9 @@ class PlaylistPanel(Adw.Bin): # Show image GObject.idle_add(self._show_image) - def stop_threads(self): self._playlist_stop.set() - def _set_playlist(self, host, playlist, size): self._playlist_lock.acquire() self._playlist_stop.clear() @@ -237,28 +214,23 @@ class PlaylistPanel(Adw.Bin): self.playlist_grid.set_model(self._playlist_grid_selection_single) self._playlist_lock.release() - def _show_image(self): self._resize_standalone_image() self.standalone_stack.set_visible_child(self.standalone_scroll) self.standalone_spinner.stop() - def _redraw(self): if self._playlist is not None: self.set_playlist(self._host, self._playlist) - def _open_standalone(self): self.playlist_stack.set_visible_child(self.panel_standalone) self.emit('open-standalone') - def _close_standalone(self): self.playlist_stack.set_visible_child(self.panel_normal) self.emit('close-standalone') - def _resize_standalone_image(self): """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse @@ -288,7 +260,6 @@ class PlaylistPanel(Adw.Bin): self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) self.standalone_image.show() - def _get_default_image(self): return self._icon_theme.lookup_icon( Utils.STOCK_ICON_DEFAULT, @@ -299,7 +270,6 @@ class PlaylistPanel(Adw.Bin): Gtk.IconLookupFlags.FORCE_SYMBOLIC ) - def _get_selected_albums(self): albums = [] for i in range(self.playlist_grid.get_model().get_n_items()): diff --git a/src/serverpanel.py b/src/serverpanel.py index 75c3628..247860c 100644 --- a/src/serverpanel.py +++ b/src/serverpanel.py @@ -1,15 +1,13 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') from gi.repository import Gtk, Adw, GObject - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui') class ServerPanel(Adw.Bin): __gtype_name__ = 'McgServerPanel' @@ -34,7 +32,6 @@ class ServerPanel(Adw.Bin): # Audio ouptut devices widgets output_devices = Gtk.Template.Child() - def __init__(self, **kwargs): super().__init__(**kwargs) self._none_label = "" @@ -44,19 +41,15 @@ class ServerPanel(Adw.Bin): # Widgets self._none_label = self.status_file.get_label() - def set_selected(self, selected): self._is_selected = selected - def get_toolbar(self): return self.toolbar - def on_output_device_toggled(self, widget, device): self.emit('change-output-device', device, widget.get_active()) - def set_status(self, file, audio, bitrate, error): if file: file = GObject.markup_escape_text(file) @@ -84,7 +77,6 @@ class ServerPanel(Adw.Bin): error = self._none_label self.status_error.set_markup(error) - def set_stats(self, artists, albums, songs, dbplaytime, playtime, uptime): self.stats_artists.set_text(str(artists)) self.stats_albums.set_text(str(albums)) @@ -93,7 +85,6 @@ class ServerPanel(Adw.Bin): self.stats_playtime.set_text(str(playtime)) self.stats_uptime.set_text(str(uptime)) - def set_output_devices(self, devices): device_ids = [] diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py index 6bf16e5..2db83e3 100644 --- a/src/shortcutsdialog.py +++ b/src/shortcutsdialog.py @@ -1,18 +1,15 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') from gi.repository import Gtk - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/shortcuts-dialog.ui') class ShortcutsDialog(Gtk.ShortcutsWindow): __gtype_name__ = 'McgShortcutsDialog' - def __init__(self): super().__init__() diff --git a/src/utils.py b/src/utils.py index 3f2ef3a..7d817bd 100644 --- a/src/utils.py +++ b/src/utils.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') import hashlib import locale @@ -11,13 +11,10 @@ import urllib from gi.repository import Gdk, GdkPixbuf, GObject, Gtk - - class Utils: CSS_SELECTION = 'selection' STOCK_ICON_DEFAULT = 'image-x-generic-symbolic' - def load_pixbuf(data): loader = GdkPixbuf.PixbufLoader() try: @@ -26,7 +23,6 @@ class Utils: loader.close() return loader.get_pixbuf() - def load_thumbnail(cache, client, album, size): cache_url = cache.create_filename(album) pixbuf = None @@ -43,7 +39,6 @@ class Utils: pixbuf.savev(cache_url, 'jpeg', [], []) return pixbuf - def create_artists_label(album): label = ', '.join(album.get_albumartists()) if album.get_artists(): @@ -53,14 +48,12 @@ class Utils: ) return label - def create_length_label(album): minutes = album.get_length() // 60 seconds = album.get_length() - minutes * 60 return locale.gettext("{}:{} minutes").format(minutes, seconds) - def create_track_title(track): title = track.get_title() if track.get_artists(): @@ -70,7 +63,6 @@ class Utils: ) return title - def generate_id(values): if type(values) is not list: values = [values] @@ -80,8 +72,6 @@ class Utils: return m.hexdigest() - - class SortOrder: ARTIST = 0 TITLE = 1 @@ -89,15 +79,12 @@ class SortOrder: MODIFIED = 3 - - class GridItem(GObject.GObject): __gtype_name__ = "GridItem" tooltip = GObject.Property(type=str, default=None) cover = GObject.Property(type=Gdk.Paintable, default=None) - def __init__(self, album, cover): super().__init__() self._album = album @@ -110,24 +97,18 @@ class GridItem(GObject.GObject): Utils.create_length_label(album) ])) - def get_album(self): return self._album - def set_cover(self, cover): self.cover = Gdk.Texture.new_for_pixbuf(cover) - - class SearchFilter(Gtk.Filter): - def __init__(self, search_string): super().__init__() self._search_string = search_string - def do_match(self, grid_item): return grid_item.get_album().filter(self._search_string) diff --git a/src/window.py b/src/window.py index 26eed81..127e2f6 100644 --- a/src/window.py +++ b/src/window.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 - import gi + gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') try: @@ -25,8 +25,6 @@ from .librarypanel import LibraryPanel from .zeroconf import ZeroconfProvider - - class WindowState(GObject.Object): WIDTH = 'width' HEIGHT = 'height' @@ -37,13 +35,10 @@ class WindowState(GObject.Object): is_maximized = GObject.Property(type=bool, default=False) is_fullscreened = GObject.Property(type=bool, default=False) - def __init__(self): super().__init__() - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/window.ui') class Window(Adw.ApplicationWindow): __gtype_name__ = 'McgAppWindow' @@ -72,7 +67,6 @@ class Window(Adw.ApplicationWindow): # Infobar info_toast = Gtk.Template.Child() - def __init__(self, app, title, settings, **kwargs): super().__init__(**kwargs) self.set_application(app) @@ -205,26 +199,21 @@ class Window(Adw.ApplicationWindow): self._search_library_action.connect('activate', self.on_menu_search_library) self.add_action(self._search_library_action) - # Menu callbacks def on_menu_connect(self, action, value): self._connect() - def on_menu_play(self, action, value): self._mcg.playpause() - def on_menu_clear_playlist(self, action, value): self._mcg.clear_playlist() - def on_menu_panel(self, action, value): action.set_state(value) 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) if not self._state.get_property(WindowState.IS_FULLSCREENED): @@ -232,12 +221,10 @@ class Window(Adw.ApplicationWindow): else: self.unfullscreen() - def on_menu_search_library(self, action, value): self.panel_stack.set_visible_child(self.library_panel_page) self._library_panel.show_search() - # Window callbacks def on_resize(self, widget, event): @@ -251,15 +238,12 @@ class Window(Adw.ApplicationWindow): GObject.idle_add(self._playlist_panel.set_size, width, height) GObject.idle_add(self._library_panel.set_size, width, height) - def on_maximized(self, widget, maximized): self._state.set_property(WindowState.IS_MAXIMIZED, maximized is True) - def on_fullscreened(self, widget, fullscreened): self._fullscreen(self.is_fullscreen()) - # HeaderBar callbacks @Gtk.Template.Callback() @@ -267,20 +251,17 @@ class Window(Adw.ApplicationWindow): if self._headerbar_connection_button_active: self._connect() - @Gtk.Template.Callback() def on_headerbar_volume_changed(self, widget, value): if not self._setting_volume: self._mcg.set_volume(int(value*100)) - @Gtk.Template.Callback() def on_headerbar_playpause_toggled(self, widget): if self._headerbar_playpause_button_active: self._mcg.playpause() self._mcg.get_status() - # Panel callbacks def on_stack_switched(self, widget, prop): @@ -290,17 +271,14 @@ class Window(Adw.ApplicationWindow): for panel in self._panels: panel.set_selected(panel == self.panel_stack.get_visible_child()) - def on_panel_open_standalone(self, panel): self.toolbar_view.add_top_bar(panel.get_headerbar_standalone()) self.toolbar_view.remove(self.headerbar) - def on_panel_close_standalone(self, panel): 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): self._settings.set_string(Window.SETTING_HOST, host) self._settings.set_int(Window.SETTING_PORT, port) @@ -311,79 +289,61 @@ class Window(Adw.ApplicationWindow): 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() - def on_playlist_panel_remove(self, widget, album): self._mcg.remove_album_from_playlist(album) - def on_playlist_panel_remove_multiple(self, widget, albums): self._mcg.remove_albums_from_playlist(albums) - def on_playlist_panel_play(self, widget, album): self._mcg.play_album_from_playlist(album) - def on_playlist_panel_albumart(self, widget, album): self._mcg.get_albumart(album) - def on_server_panel_output_device_changed(self, widget, device, enabled): self._mcg.enable_output_device(device, enabled) - def on_cover_panel_toggle_fullscreen(self, widget): if not self._state.get_property(WindowState.IS_FULLSCREENED): self.fullscreen() else: self.unfullscreen() - def on_cover_panel_set_song(self, widget, pos, time): self._mcg.seek(pos, time) - def on_cover_panel_albumart(self, widget, album): self._mcg.get_albumart(album) - def on_library_panel_update(self, widget): self._mcg.update() - def on_library_panel_play(self, widget, album): self._mcg.play_album(album) - def on_library_panel_queue(self, widget, album): self._mcg.queue_album(album) - def on_library_panel_queue_multiple(self, widget, albums): self._mcg.queue_albums(albums) - 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()) - def on_library_panel_sort_order_changed(self, widget, sort_order): self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order) - def on_library_panel_sort_type_changed(self, widget, sort_type): self._settings.set_boolean(Window.SETTING_SORT_TYPE, sort_type) - def on_library_panel_albumart(self, widget, album): self._mcg.get_albumart(album) - # MCG callbacks def on_mcg_connect(self, connected): @@ -405,7 +365,6 @@ 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): # Album GObject.idle_add(self._cover_panel.set_album, album) @@ -428,64 +387,51 @@ class Window(Adw.ApplicationWindow): if error: self._show_error(error) - def on_mcg_stats(self, artists, albums, songs, dbplaytime, playtime, uptime): self._server_panel.set_stats(artists, albums, songs, dbplaytime, playtime, uptime) - def on_mcg_load_output_devices(self, devices): self._server_panel.set_output_devices(devices) - def on_mcg_load_playlist(self, playlist): self._playlist_panel.set_playlist(self._connection_panel.get_host(), playlist) - def on_mcg_init_albums(self): GObject.idle_add(self._library_panel.init_albums) - def on_mcg_pulse_albums(self): GObject.idle_add(self._library_panel.load_albums) - def on_mcg_load_albums(self, albums): self._library_panel.set_albums(self._connection_panel.get_host(), albums) - def on_mcg_load_albumart(self, album, data): self._cover_panel.set_albumart(album, data) self._playlist_panel.set_albumart(album, data) self._library_panel.set_albumart(album, data) - def on_mcg_error(self, error): GObject.idle_add(self._show_error, str(error)) - # Settings callbacks def on_settings_panel_changed(self, settings, key): panel_index = settings.get_int(key) self.panel_stack.set_visible_child(self._panels[panel_index]) - def on_settings_item_size_changed(self, settings, key): size = settings.get_int(key) self._playlist_panel.set_item_size(size) self._library_panel.set_item_size(size) - def on_settings_sort_order_changed(self, settings, key): sort_order = settings.get_enum(key) self._library_panel.set_sort_order(sort_order) - def on_settings_sort_type_changed(self, settings, key): sort_type = settings.get_boolean(key) self._library_panel.set_sort_type(sort_type) - # Private methods def _connect(self): @@ -501,14 +447,12 @@ class Window(Adw.ApplicationWindow): self._mcg.connect(host, port, password) self._settings.set_boolean(Window.SETTING_CONNECTED, True) - def _connect_connected(self): self._headerbar_connected() self._set_headerbar_sensitive(True, False) self.content_stack.set_visible_child(self.panel_stack) self.panel_stack.set_visible_child(self._panels[self._settings.get_int(Window.SETTING_PANEL)]) - def _connect_disconnected(self): self._playlist_panel.stop_threads(); self._library_panel.stop_threads(); @@ -518,7 +462,6 @@ class Window(Adw.ApplicationWindow): self.content_stack.set_visible_child(self._connection_panel) self._connection_panel.set_sensitive(True) - def _fullscreen(self, fullscreened_new): if fullscreened_new != self._state.get_property(WindowState.IS_FULLSCREENED): self._state.set_property(WindowState.IS_FULLSCREENED, fullscreened_new) @@ -531,35 +474,29 @@ class Window(Adw.ApplicationWindow): self._cover_panel.set_fullscreen(False) self.set_cursor(Gdk.Cursor.new_from_name("default", None)) - def _save_visible_panel(self): panel_index_selected = self._panels.index(self.panel_stack.get_visible_child()) self._settings.set_int(Window.SETTING_PANEL, panel_index_selected) - def _set_menu_visible_panel(self): panel_index_selected = self._panels.index(self.panel_stack.get_visible_child()) self._panel_action.set_state(GLib.Variant.new_string(str(panel_index_selected))) - def _set_visible_toolbar(self): panel_index_selected = self._panels.index(self.panel_stack.get_visible_child()) toolbar = self._panels[panel_index_selected].get_toolbar() self.toolbar_stack.set_visible_child(toolbar) - def _set_play(self): self._headerbar_playpause_button_active = False self.headerbar_button_playpause.set_active(True) self._headerbar_playpause_button_active = True - def _set_pause(self): self._headerbar_playpause_button_active = False self.headerbar_button_playpause.set_active(False) self._headerbar_playpause_button_active = True - def _set_volume(self, volume): if volume >= 0: self.headerbar_button_volume.set_visible(True) @@ -569,27 +506,23 @@ class Window(Adw.ApplicationWindow): else: self.headerbar_button_volume.set_visible(False) - def _headerbar_connected(self): self._headerbar_connection_button_active = False self.headerbar_button_connect.set_active(True) self.headerbar_button_connect.set_state(True) self._headerbar_connection_button_active = True - def _headerbar_disconnected(self): self._headerbar_connection_button_active = False self.headerbar_button_connect.set_active(False) self.headerbar_button_connect.set_state(False) self._headerbar_connection_button_active = True - def _set_headerbar_sensitive(self, sensitive, connecting): self.headerbar_button_playpause.set_sensitive(sensitive) self.headerbar_button_volume.set_sensitive(sensitive) self.headerbar_panel_switcher.set_sensitive(sensitive) self.headerbar_button_connect.set_sensitive(not connecting) - def _show_error(self, message): self.info_toast.add_toast(Adw.Toast.new(message)) diff --git a/src/zeroconf.py b/src/zeroconf.py index eaa1faa..226b9e1 100644 --- a/src/zeroconf.py +++ b/src/zeroconf.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 - import gi try: gi.require_version('Avahi', '0.6') @@ -13,15 +12,12 @@ import logging from mcg import client - - class ZeroconfProvider(client.Base): KEYRING_SYSTEM = 'mcg' KEYRING_USERNAME = 'mpd' SIGNAL_SERVICE_NEW = 'service-new' TYPE = '_mpd._tcp' - def __init__(self): client.Base.__init__(self) self._service_resolvers = [] @@ -31,7 +27,6 @@ class ZeroconfProvider(client.Base): if use_avahi: self._start_client() - def on_new_service(self, browser, interface, protocol, name, type, domain, flags): #if not (flags & Avahi.LookupResultFlags.GA_LOOKUP_RESULT_LOCAL): service_resolver = Avahi.ServiceResolver(interface=interface, protocol=protocol, name=name, type=type, domain=domain, aprotocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC, flags=0,) @@ -40,19 +35,16 @@ class ZeroconfProvider(client.Base): service_resolver.attach(self._client) self._service_resolvers.append(service_resolver) - def on_found(self, resolver, interface, protocol, name, type, domain, host, date, port, *args): if (host, port) not in self._services.keys(): service = (name,host,port) self._services[(host,port)] = service self._callback(ZeroconfProvider.SIGNAL_SERVICE_NEW, service) - def on_failure(self, resolver, date): if resolver in self._service_resolvers: self._service_resolvers.remove(resolver) - def _start_client(self): self._logger.info("Starting Avahi client") self._client = Avahi.Client(flags=0,)