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

WIP

Browse Source
This commit is contained in:
Benjamin Schaaf
2021-12-21 00:17:46 +11:00
parent bef07bcdf1
commit cec0bf1285
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
flatpak/app.sublimemusic.SublimeMusic.json
View File

0
flatpak/flatpak_build.sh
View File

2
sublime_music/ui/artists.py
View File

@@ -399,7 +399,7 @@ class ArtistDetailPanel(Gtk.Box):
biography = "" biography = ""
if artist.biography: if artist.biography:
biography += util.esc(artist.biography) biography += bleach.clean(artist.biography)
if artist.similar_artists: if artist.similar_artists:
biography += "\n\n<b>Similar Artists:</b> " biography += "\n\n<b>Similar Artists:</b> "

2
sublime_music/ui/main.py
View File

@@ -577,7 +577,7 @@ class MainWindow(Handy.ApplicationWindow):
) )
def _create_stack(self, **kwargs: Gtk.Widget) -> Gtk.Stack: def _create_stack(self, **kwargs: Gtk.Widget) -> Gtk.Stack:
stack = Gtk.Stack(homogeneous=True) stack = Gtk.Stack(homogeneous=True, transition_type=Gtk.StackTransitionType.NONE)
for name, child in kwargs.items(): for name, child in kwargs.items():
child.connect( child.connect(
"song-clicked", "song-clicked",

12
sublime_music/ui/player_controls/manager.py
View File

@@ -3,6 +3,8 @@ from datetime import timedelta
from typing import Any, Optional, Callable, Dict, Set, Tuple from typing import Any, Optional, Callable, Dict, Set, Tuple
from functools import partial from functools import partial
import bleach
from gi.repository import GObject, Gtk, GLib from gi.repository import GObject, Gtk, GLib
from .. import util from .. import util
@@ -221,12 +223,12 @@ class Manager(GObject.GObject):
new_store = [] new_store = []
def calculate_label(song_details: Song) -> str: def calculate_label(song_details: Song) -> str:
title = util.esc(song_details.title) title = bleach.clean(song_details.title)
# TODO (#71): use walrus once MYPY works with this # TODO (#71): use walrus once MYPY works with this
# album = util.esc(album.name if (album := song_details.album) else None) # album = bleach.clean(album.name if (album := song_details.album) else None)
# artist = util.esc(artist.name if (artist := song_details.artist) else None) # noqa # artist = bleach.clean(artist.name if (artist := song_details.artist) else None) # noqa
album = util.esc(song_details.album.name if song_details.album else None) album = bleach.clean(song_details.album.name if song_details.album else None)
artist = util.esc(song_details.artist.name if song_details.artist else None) artist = bleach.clean(song_details.artist.name if song_details.artist else None)
return f"<b>{title}</b>\n{util.dot_join(album, artist)}" return f"<b>{title}</b>\n{util.dot_join(album, artist)}"
def make_idle_index_capturing_function( def make_idle_index_capturing_function(

2
sublime_music/ui/player_controls/mobile.py
View File

@@ -2,6 +2,8 @@ from typing import Any, Callable, Dict, Optional, Set, Tuple
from gi.repository import Gdk, GdkPixbuf, GLib, GObject, Gtk, Pango, Handy from gi.repository import Gdk, GdkPixbuf, GLib, GObject, Gtk, Pango, Handy
import bleach
from .. import util from .. import util
from ..common import IconButton, IconToggleButton, SpinnerImage, SpinnerPicture from ..common import IconButton, IconToggleButton, SpinnerImage, SpinnerPicture
from ...config import AppConfiguration from ...config import AppConfiguration