Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2019-11-27 13:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop" Wed Nov 27 13:55:29 2019 rev:114 rq:751140 version:1.2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-11-25 11:25:14.462095674 +0100 +++ /work/SRC/openSUSE:Factory/.lollypop.new.26869/lollypop.changes 2019-11-27 13:55:52.984285870 +0100 @@ -1,0 +2,7 @@ +Tue Nov 26 19:22:19 UTC 2019 - [email protected] + +- Update to version 1.2.16: + * Fix a crash (glgo#World/lollypop#2106). + * Handle radios in lyrics view (glgo#World/lollypop#2131). + +------------------------------------------------------------------- Old: ---- lollypop-1.2.15.tar.xz New: ---- lollypop-1.2.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.dkzKeH/_old 2019-11-27 13:55:53.724285558 +0100 +++ /var/tmp/diff_new_pack.dkzKeH/_new 2019-11-27 13:55:53.728285556 +0100 @@ -17,7 +17,7 @@ Name: lollypop -Version: 1.2.15 +Version: 1.2.16 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dkzKeH/_old 2019-11-27 13:55:53.760285543 +0100 +++ /var/tmp/diff_new_pack.dkzKeH/_new 2019-11-27 13:55:53.760285543 +0100 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">1.2.15</param> + <param name="revision">1.2.16</param> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> <param name="versionformat">@PARENT_TAG@</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.dkzKeH/_old 2019-11-27 13:55:53.780285534 +0100 +++ /var/tmp/diff_new_pack.dkzKeH/_new 2019-11-27 13:55:53.780285534 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> - <param name="changesrevision">4d3387cbbd786937a43fd217d6abde3b059cd5a8</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">39beeb8b3f4d16fbb00ffd440d314e8bba315d7c</param></service></servicedata> \ No newline at end of file ++++++ lollypop-1.2.15.tar.xz -> lollypop-1.2.16.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/data/org.gnome.Lollypop.appdata.xml.in new/lollypop-1.2.16/data/org.gnome.Lollypop.appdata.xml.in --- old/lollypop-1.2.15/data/org.gnome.Lollypop.appdata.xml.in 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/data/org.gnome.Lollypop.appdata.xml.in 2019-11-26 12:51:41.000000000 +0100 @@ -17,7 +17,7 @@ </ul> </description> <releases> - <release version="1.2.15" date="2019-11-24"> + <release version="1.2.16" date="2019-11-26"> <description> </description> </release> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/lollypop/objects_radio.py new/lollypop-1.2.16/lollypop/objects_radio.py --- old/lollypop-1.2.15/lollypop/objects_radio.py 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/lollypop/objects_radio.py 2019-11-26 12:51:41.000000000 +0100 @@ -28,6 +28,7 @@ """ self.id = radio.id self.name = radio.name + self.storage_type = StorageType.COLLECTION self.artists = [_("Radio")] self.artist_ids = [Type.RADIOS] self.year = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/lollypop/view_lyrics.py new/lollypop-1.2.16/lollypop/view_lyrics.py --- old/lollypop-1.2.15/lollypop/view_lyrics.py 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/lollypop/view_lyrics.py 2019-11-26 12:51:41.000000000 +0100 @@ -18,6 +18,7 @@ from lollypop.define import App, ViewType, AdaptiveSize from lollypop.define import StorageType from lollypop.logger import Logger +from lollypop.objects_track import Track from lollypop.helper_lyrics import LyricsHelper from lollypop.helper_signals import SignalsHelper, signals_map from lollypop.widgets_banner_lyrics import LyricsBannerWidget @@ -118,36 +119,37 @@ if track.id is None: return self.__lyrics_label.set_text(_("Loading…")) - self.__lyrics_helper.load(track) - # First check synced lyrics - if self.__lyrics_helper.available: - if self.__lyrics_timeout_id is None: - self.__lyrics_timeout_id = GLib.timeout_add( - 500, self.__show_sync_lyrics) - return - else: - lyrics = "" - if self.__lyrics_timeout_id is not None: - GLib.source_remove(self.__lyrics_timeout_id) - self.__lyrics_timeout_id = None - if track.storage_type & StorageType.COLLECTION: - from lollypop.tagreader import TagReader, Discoverer - tagreader = TagReader() - discoverer = Discoverer() - try: - info = discoverer.get_info(track.uri) - except: - info = None - if info is not None: - tags = info.get_tags() - lyrics = tagreader.get_lyrics(tags) - if lyrics: - self.__lyrics_label.set_text(lyrics) + lyrics = "" + if isinstance(track, Track): + self.__lyrics_helper.load(track) + # First check synced lyrics + if self.__lyrics_helper.available: + if self.__lyrics_timeout_id is None: + self.__lyrics_timeout_id = GLib.timeout_add( + 500, self.__show_sync_lyrics) + return else: - self.__lyrics_helper.get_lyrics_from_web(track, - self.__on_lyrics, - False, - track) + if self.__lyrics_timeout_id is not None: + GLib.source_remove(self.__lyrics_timeout_id) + self.__lyrics_timeout_id = None + if track.storage_type & StorageType.COLLECTION: + from lollypop.tagreader import TagReader, Discoverer + tagreader = TagReader() + discoverer = Discoverer() + try: + info = discoverer.get_info(track.uri) + except: + info = None + if info is not None: + tags = info.get_tags() + lyrics = tagreader.get_lyrics(tags) + if lyrics: + self.__lyrics_label.set_text(lyrics) + else: + self.__lyrics_helper.get_lyrics_from_web(track, + self.__on_lyrics, + False, + track) @property def args(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/lollypop/widgets_banner_lyrics.py new/lollypop-1.2.16/lollypop/widgets_banner_lyrics.py --- old/lollypop-1.2.15/lollypop/widgets_banner_lyrics.py 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/lollypop/widgets_banner_lyrics.py 2019-11-26 12:51:41.000000000 +0100 @@ -17,6 +17,7 @@ from lollypop.define import App, MARGIN, ViewType from lollypop.define import ArtBehaviour, Size from lollypop.widgets_banner import BannerWidget +from lollypop.objects_radio import Radio from lollypop.utils import emit_signal from lollypop.helper_signals import SignalsHelper, signals_map @@ -131,7 +132,7 @@ markup = "%s\n" % GLib.markup_escape_text( App().player.current_track.name) artist_name = GLib.markup_escape_text( - ", ".join(App().player.current_track.album.artists)) + ", ".join(App().player.current_track.artists)) markup += "<span size='x-small' alpha='40000'>%s</span>" %\ artist_name self.__title_label.set_markup(markup) @@ -149,15 +150,26 @@ else: self._artwork.get_style_context().remove_class( "default-banner") - App().art_helper.set_album_artwork( - App().player.current_track.album, - # +100 to prevent resize lag - self.width + 100, - self.height, - self._artwork.get_scale_factor(), - ArtBehaviour.BLUR_HARD | - ArtBehaviour.DARKER, - self._on_artwork) + if isinstance(App().player.current_track, Radio): + App().art_helper.set_radio_artwork( + App().player.current_track.name, + # +100 to prevent resize lag + self.width + 100, + self.height, + self._artwork.get_scale_factor(), + ArtBehaviour.BLUR_HARD | + ArtBehaviour.DARKER, + self._on_artwork) + else: + App().art_helper.set_album_artwork( + App().player.current_track.album, + # +100 to prevent resize lag + self.width + 100, + self.height, + self._artwork.get_scale_factor(), + ArtBehaviour.BLUR_HARD | + ArtBehaviour.DARKER, + self._on_artwork) def __set_internal_size(self): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/lollypop/widgets_radio.py new/lollypop-1.2.16/lollypop/widgets_radio.py --- old/lollypop-1.2.15/lollypop/widgets_radio.py 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/lollypop/widgets_radio.py 2019-11-26 12:51:41.000000000 +0100 @@ -157,7 +157,7 @@ """ if self.__artwork is None: return - selected = isinstance(App().player.current_track.id, Radio) and\ + selected = isinstance(App().player.current_track, Radio) and\ self._track.id == App().player.current_track.id if selected: self.__artwork.set_state_flags(Gtk.StateFlags.SELECTED, True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/lollypop/widgets_row_album.py new/lollypop-1.2.16/lollypop/widgets_row_album.py --- old/lollypop-1.2.15/lollypop/widgets_row_album.py 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/lollypop/widgets_row_album.py 2019-11-26 12:51:41.000000000 +0100 @@ -64,6 +64,7 @@ self.__view_type = view_type self.__revealer = None self.__artwork = None + self.__gesture_list = None self.__album = album self.__cancellable = Gio.Cancellable() self.set_sensitive(False) @@ -293,7 +294,7 @@ """ Update button state """ - if self.__artwork is not None: + if self.__artwork is not None and self.__gesture_list is not None: self.__update_list_button(self.__gesture_list.widget) ####################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.15/meson.build new/lollypop-1.2.16/meson.build --- old/lollypop-1.2.15/meson.build 2019-11-24 13:10:53.000000000 +0100 +++ new/lollypop-1.2.16/meson.build 2019-11-26 12:51:41.000000000 +0100 @@ -1,5 +1,5 @@ project('lollypop', - version: '1.2.15', + version: '1.2.16', meson_version: '>= 0.40.0' ) i18n = import('i18n')
