Run black on entire project
This commit is contained in:
Sumner Evans
@@ -2,7 +2,8 @@ from random import randint
|
||||
from typing import Any, Union
|
||||
|
||||
import gi
|
||||
gi.require_version('Gtk', '3.0')
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk, GLib, GObject, Gtk, Pango
|
||||
|
||||
from sublime.cache_manager import CacheManager
|
||||
@@ -16,12 +17,8 @@ from sublime.ui.common.spinner_image import SpinnerImage
|
||||
|
||||
class AlbumWithSongs(Gtk.Box):
|
||||
__gsignals__ = {
|
||||
'song-selected': (
|
||||
GObject.SignalFlags.RUN_FIRST,
|
||||
GObject.TYPE_NONE,
|
||||
(),
|
||||
),
|
||||
'song-clicked': (
|
||||
"song-selected": (GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE, (),),
|
||||
"song-clicked": (
|
||||
GObject.SignalFlags.RUN_FIRST,
|
||||
GObject.TYPE_NONE,
|
||||
(int, object, object),
|
||||
@@ -40,13 +37,12 @@ class AlbumWithSongs(Gtk.Box):
|
||||
box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
|
||||
artist_artwork = SpinnerImage(
|
||||
loading=False,
|
||||
image_name='artist-album-list-artwork',
|
||||
spinner_name='artist-artwork-spinner',
|
||||
image_name="artist-album-list-artwork",
|
||||
spinner_name="artist-artwork-spinner",
|
||||
image_size=cover_art_size,
|
||||
)
|
||||
# Account for 10px margin on all sides with "+ 20".
|
||||
artist_artwork.set_size_request(
|
||||
cover_art_size + 20, cover_art_size + 20)
|
||||
artist_artwork.set_size_request(cover_art_size + 20, cover_art_size + 20)
|
||||
box.pack_start(artist_artwork, False, False, 0)
|
||||
box.pack_start(Gtk.Box(), True, True, 0)
|
||||
self.pack_start(box, False, False, 0)
|
||||
@@ -56,64 +52,62 @@ class AlbumWithSongs(Gtk.Box):
|
||||
artist_artwork.set_loading(False)
|
||||
|
||||
cover_art_filename_future = CacheManager.get_cover_art_filename(
|
||||
album.coverArt,
|
||||
before_download=lambda: artist_artwork.set_loading(True),
|
||||
album.coverArt, before_download=lambda: artist_artwork.set_loading(True),
|
||||
)
|
||||
cover_art_filename_future.add_done_callback(
|
||||
lambda f: GLib.idle_add(cover_art_future_done, f))
|
||||
lambda f: GLib.idle_add(cover_art_future_done, f)
|
||||
)
|
||||
|
||||
album_details = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
|
||||
album_title_and_buttons = Gtk.Box(
|
||||
orientation=Gtk.Orientation.HORIZONTAL)
|
||||
album_title_and_buttons = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
|
||||
|
||||
# TODO (#43): deal with super long-ass titles
|
||||
album_title_and_buttons.add(
|
||||
Gtk.Label(
|
||||
label=album.get('name', album.get('title')),
|
||||
name='artist-album-list-album-name',
|
||||
label=album.get("name", album.get("title")),
|
||||
name="artist-album-list-album-name",
|
||||
halign=Gtk.Align.START,
|
||||
ellipsize=Pango.EllipsizeMode.END,
|
||||
))
|
||||
)
|
||||
)
|
||||
|
||||
self.play_btn = IconButton(
|
||||
'media-playback-start-symbolic',
|
||||
'Play all songs in this album',
|
||||
"media-playback-start-symbolic",
|
||||
"Play all songs in this album",
|
||||
sensitive=False,
|
||||
)
|
||||
self.play_btn.connect('clicked', self.play_btn_clicked)
|
||||
self.play_btn.connect("clicked", self.play_btn_clicked)
|
||||
album_title_and_buttons.pack_start(self.play_btn, False, False, 5)
|
||||
|
||||
self.shuffle_btn = IconButton(
|
||||
'media-playlist-shuffle-symbolic',
|
||||
'Shuffle all songs in this album',
|
||||
"media-playlist-shuffle-symbolic",
|
||||
"Shuffle all songs in this album",
|
||||
sensitive=False,
|
||||
)
|
||||
self.shuffle_btn.connect('clicked', self.shuffle_btn_clicked)
|
||||
self.shuffle_btn.connect("clicked", self.shuffle_btn_clicked)
|
||||
album_title_and_buttons.pack_start(self.shuffle_btn, False, False, 5)
|
||||
|
||||
self.play_next_btn = IconButton(
|
||||
'go-top-symbolic',
|
||||
'Play all of the songs in this album next',
|
||||
action_name='app.play-next',
|
||||
"go-top-symbolic",
|
||||
"Play all of the songs in this album next",
|
||||
action_name="app.play-next",
|
||||
)
|
||||
album_title_and_buttons.pack_start(self.play_next_btn, False, False, 5)
|
||||
|
||||
self.add_to_queue_btn = IconButton(
|
||||
'go-jump-symbolic',
|
||||
'Add all the songs in this album to the end of the play queue',
|
||||
action_name='app.add-to-queue',
|
||||
"go-jump-symbolic",
|
||||
"Add all the songs in this album to the end of the play queue",
|
||||
action_name="app.add-to-queue",
|
||||
)
|
||||
album_title_and_buttons.pack_start(
|
||||
self.add_to_queue_btn, False, False, 5)
|
||||
album_title_and_buttons.pack_start(self.add_to_queue_btn, False, False, 5)
|
||||
|
||||
self.download_all_btn = IconButton(
|
||||
'folder-download-symbolic',
|
||||
'Download all songs in this album',
|
||||
"folder-download-symbolic",
|
||||
"Download all songs in this album",
|
||||
sensitive=False,
|
||||
)
|
||||
self.download_all_btn.connect('clicked', self.on_download_all_click)
|
||||
album_title_and_buttons.pack_end(
|
||||
self.download_all_btn, False, False, 5)
|
||||
self.download_all_btn.connect("clicked", self.on_download_all_click)
|
||||
album_title_and_buttons.pack_end(self.download_all_btn, False, False, 5)
|
||||
|
||||
album_details.add(album_title_and_buttons)
|
||||
|
||||
@@ -122,30 +116,26 @@ class AlbumWithSongs(Gtk.Box):
|
||||
album.year,
|
||||
album.genre,
|
||||
util.format_sequence_duration(album.duration)
|
||||
if album.get('duration') else None,
|
||||
if album.get("duration")
|
||||
else None,
|
||||
]
|
||||
|
||||
album_details.add(
|
||||
Gtk.Label(
|
||||
label=util.dot_join(*stats),
|
||||
halign=Gtk.Align.START,
|
||||
margin_left=10,
|
||||
))
|
||||
|
||||
self.album_song_store = Gtk.ListStore(
|
||||
str, # cache status
|
||||
str, # title
|
||||
str, # duration
|
||||
str, # song ID
|
||||
label=util.dot_join(*stats), halign=Gtk.Align.START, margin_left=10,
|
||||
)
|
||||
)
|
||||
|
||||
self.loading_indicator = Gtk.Spinner(
|
||||
name='album-list-song-list-spinner')
|
||||
self.album_song_store = Gtk.ListStore(
|
||||
str, str, str, str, # cache status # title # duration # song ID
|
||||
)
|
||||
|
||||
self.loading_indicator = Gtk.Spinner(name="album-list-song-list-spinner")
|
||||
album_details.add(self.loading_indicator)
|
||||
|
||||
self.album_songs = Gtk.TreeView(
|
||||
model=self.album_song_store,
|
||||
name='album-songs-list',
|
||||
name="album-songs-list",
|
||||
headers_visible=False,
|
||||
margin_top=15,
|
||||
margin_left=10,
|
||||
@@ -157,19 +147,18 @@ class AlbumWithSongs(Gtk.Box):
|
||||
# Song status column.
|
||||
renderer = Gtk.CellRendererPixbuf()
|
||||
renderer.set_fixed_size(30, 35)
|
||||
column = Gtk.TreeViewColumn('', renderer, icon_name=0)
|
||||
column = Gtk.TreeViewColumn("", renderer, icon_name=0)
|
||||
column.set_resizable(True)
|
||||
self.album_songs.append_column(column)
|
||||
|
||||
self.album_songs.append_column(SongListColumn('TITLE', 1, bold=True))
|
||||
self.album_songs.append_column(
|
||||
SongListColumn('DURATION', 2, align=1, width=40))
|
||||
self.album_songs.append_column(SongListColumn("TITLE", 1, bold=True))
|
||||
self.album_songs.append_column(SongListColumn("DURATION", 2, align=1, width=40))
|
||||
|
||||
self.album_songs.connect('row-activated', self.on_song_activated)
|
||||
self.album_songs.connect(
|
||||
'button-press-event', self.on_song_button_press)
|
||||
self.album_songs.connect("row-activated", self.on_song_activated)
|
||||
self.album_songs.connect("button-press-event", self.on_song_button_press)
|
||||
self.album_songs.get_selection().connect(
|
||||
'changed', self.on_song_selection_change)
|
||||
"changed", self.on_song_selection_change
|
||||
)
|
||||
album_details.add(self.album_songs)
|
||||
|
||||
self.pack_end(album_details, True, True, 0)
|
||||
@@ -180,12 +169,12 @@ class AlbumWithSongs(Gtk.Box):
|
||||
# =========================================================================
|
||||
def on_song_selection_change(self, event: Any):
|
||||
if not self.album_songs.has_focus():
|
||||
self.emit('song-selected')
|
||||
self.emit("song-selected")
|
||||
|
||||
def on_song_activated(self, treeview: Any, idx: Gtk.TreePath, column: Any):
|
||||
# The song ID is in the last column of the model.
|
||||
self.emit(
|
||||
'song-clicked',
|
||||
"song-clicked",
|
||||
idx.get_indices()[0],
|
||||
[m[-1] for m in self.album_song_store],
|
||||
{},
|
||||
@@ -212,10 +201,8 @@ class AlbumWithSongs(Gtk.Box):
|
||||
song_ids = [self.album_song_store[p][-1] for p in paths]
|
||||
|
||||
# Used to adjust for the header row.
|
||||
bin_coords = tree.convert_tree_to_bin_window_coords(
|
||||
event.x, event.y)
|
||||
widget_coords = tree.convert_tree_to_widget_coords(
|
||||
event.x, event.y)
|
||||
bin_coords = tree.convert_tree_to_bin_window_coords(event.x, event.y)
|
||||
widget_coords = tree.convert_tree_to_widget_coords(event.x, event.y)
|
||||
|
||||
util.show_song_popover(
|
||||
song_ids,
|
||||
@@ -241,20 +228,16 @@ class AlbumWithSongs(Gtk.Box):
|
||||
def play_btn_clicked(self, btn: Any):
|
||||
song_ids = [x[-1] for x in self.album_song_store]
|
||||
self.emit(
|
||||
'song-clicked',
|
||||
0,
|
||||
song_ids,
|
||||
{'force_shuffle_state': False},
|
||||
"song-clicked", 0, song_ids, {"force_shuffle_state": False},
|
||||
)
|
||||
|
||||
def shuffle_btn_clicked(self, btn: Any):
|
||||
song_ids = [x[-1] for x in self.album_song_store]
|
||||
self.emit(
|
||||
'song-clicked',
|
||||
randint(0,
|
||||
len(self.album_song_store) - 1),
|
||||
"song-clicked",
|
||||
randint(0, len(self.album_song_store) - 1),
|
||||
song_ids,
|
||||
{'force_shuffle_state': True},
|
||||
{"force_shuffle_state": True},
|
||||
)
|
||||
|
||||
# Helper Methods
|
||||
@@ -287,22 +270,20 @@ class AlbumWithSongs(Gtk.Box):
|
||||
):
|
||||
new_store = [
|
||||
[
|
||||
util.get_cached_status_icon(
|
||||
CacheManager.get_cached_status(song)),
|
||||
util.get_cached_status_icon(CacheManager.get_cached_status(song)),
|
||||
util.esc(song.title),
|
||||
util.format_song_duration(song.duration),
|
||||
song.id,
|
||||
] for song in (album.get('child') or album.get('song') or [])
|
||||
]
|
||||
for song in (album.get("child") or album.get("song") or [])
|
||||
]
|
||||
|
||||
song_ids = [song[-1] for song in new_store]
|
||||
|
||||
self.play_btn.set_sensitive(True)
|
||||
self.shuffle_btn.set_sensitive(True)
|
||||
self.play_next_btn.set_action_target_value(
|
||||
GLib.Variant('as', song_ids))
|
||||
self.add_to_queue_btn.set_action_target_value(
|
||||
GLib.Variant('as', song_ids))
|
||||
self.play_next_btn.set_action_target_value(GLib.Variant("as", song_ids))
|
||||
self.add_to_queue_btn.set_action_target_value(GLib.Variant("as", song_ids))
|
||||
self.download_all_btn.set_sensitive(True)
|
||||
|
||||
util.diff_song_store(self.album_song_store, new_store)
|
||||
|
||||
Reference in New Issue
Block a user