colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding cover art to search results; Closes #87

Browse Source
This commit is contained in:
Sumner Evans
2019-12-28 22:47:53 -07:00
parent 026b147f7f
commit 42d2a71037
5 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sublime/ui/albums.py
View File

@@ -516,6 +516,7 @@ class AlbumsGrid(Gtk.Overlay):
loading=False,
image_name='grid-artwork',
spinner_name='grid-artwork-spinner',
image_size=200,
)
widget_box.pack_start(artwork, False, False, 0)

5
sublime/ui/app_styles.css
View File

@@ -152,6 +152,11 @@
.search-result-header {
font-weight: bold;
font-size: 1.2em;
}
#search-artwork {
margin-right: 5px;
}
/* ********** Artists & Albums ********** */

1
sublime/ui/common/album_with_songs.py
View File

@@ -42,6 +42,7 @@ class AlbumWithSongs(Gtk.Box):
loading=False,
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(

17
sublime/ui/common/spinner_image.py
View File

@@ -1,6 +1,6 @@
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
from gi.repository import Gtk, GdkPixbuf
class SpinnerImage(Gtk.Overlay):
@@ -9,9 +9,11 @@ class SpinnerImage(Gtk.Overlay):
loading=True,
image_name=None,
spinner_name=None,
image_size=None,
**kwargs,
):
Gtk.Overlay.__init__(self)
self.image_size = image_size
self.image = Gtk.Image(name=image_name, **kwargs)
self.add(self.image)
@@ -24,8 +26,17 @@ class SpinnerImage(Gtk.Overlay):
)
self.add_overlay(self.spinner)
def set_from_file(self, *args, **kwargs):
self.image.set_from_file(*args, **kwargs)
def set_from_file(self, filename):
if self.image_size is not None and filename:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(
filename,
self.image_size,
self.image_size,
True,
)
self.image.set_from_pixbuf(pixbuf)
else:
self.image.set_from_file(filename)
def set_loading(self, loading_status):
if loading_status:

52
sublime/ui/main.py
View File

@@ -5,7 +5,9 @@ from gi.repository import Gio, Gtk, GObject, Gdk, GLib
from . import albums, artists, playlists, player_controls
from sublime.state_manager import ApplicationState
from sublime.cache_manager import CacheManager
from sublime.server.api_objects import Child, AlbumWithSongsID3
from sublime.server.api_objects import Child
from sublime.ui import util
from sublime.ui.common import SpinnerImage
class MainWindow(Gtk.ApplicationWindow):
@@ -146,11 +148,12 @@ class MainWindow(Gtk.ApplicationWindow):
def create_label(self, text, *args, **kwargs):
label = Gtk.Label(
label=text,
use_markup=True,
halign=Gtk.Align.START,
*args,
**kwargs,
)
label.set_markup(text)
label.get_style_context().add_class('search-result-row')
return label
@@ -198,7 +201,7 @@ class MainWindow(Gtk.ApplicationWindow):
self.song_results = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
search_results_box.add(self.song_results)
search_results_box.add(make_search_result_header('Album'))
search_results_box.add(make_search_result_header('Albums'))
self.album_results = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
search_results_box.add(self.album_results)
@@ -214,8 +217,8 @@ class MainWindow(Gtk.ApplicationWindow):
self.search_popup.set_relative_to(self.search_entry)
rect = Gdk.Rectangle()
rect.x = 18
rect.y = 30
rect.x = 22
rect.y = 28
rect.width = 1
rect.height = 1
self.search_popup.set_pointing_to(rect)
@@ -295,13 +298,33 @@ class MainWindow(Gtk.ApplicationWindow):
for c in widget.get_children():
widget.remove(c)
def create_search_result_row(self, text, action_name, value):
def create_search_result_row(self, text, action_name, value, artwork):
row = Gtk.Button(relief=Gtk.ReliefStyle.NONE)
row.add(self.create_label(text))
row.connect(
'button-press-event',
lambda *a: self.emit('go-to', action_name, value),
)
box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
image = SpinnerImage(image_name='search-artwork', image_size=30)
box.add(image)
box.add(self.create_label(text))
row.add(box)
if artwork is None:
image.set_from_file(None)
image.set_loading(False)
def image_callback(f):
image.set_from_file(f.result())
image.set_loading(False)
if artwork is not None:
cover_art_future = CacheManager.get_cover_art_filename(
artwork, size=50)
cover_art_future.add_done_callback(
lambda f: GLib.idle_add(image_callback, f))
return row
def update_search_results(self, search_results):
@@ -309,22 +332,31 @@ class MainWindow(Gtk.ApplicationWindow):
self.remove_all_from_widget(self.album_results)
for album in search_results.album or []:
name = album.title if type(album) == Child else album.name
label_text = util.dot_join(
f'<b>{util.esc(name)}</b>',
util.esc(album.artist),
)
self.album_results.add(
self.create_search_result_row(name, 'album', album.id))
self.create_search_result_row(
label_text, 'album', album.id, album.coverArt))
# Artists
self.remove_all_from_widget(self.artist_results)
for artist in search_results.artist or []:
self.artist_results.add(
self.create_search_result_row(
artist.name, 'artist', artist.id))
artist.name, 'artist', artist.id, None))
# Songs
self.remove_all_from_widget(self.song_results)
for song in search_results.song or []:
label_text = util.dot_join(
f'<b>{util.esc(song.title)}</b>',
util.esc(song.artist),
)
self.song_results.add(
self.create_search_result_row(
song.title, 'album', song.albumId))
label_text, 'album', song.albumId, song.coverArt))
self.search_popup.show_all()