Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2021-01-19 16:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop" Tue Jan 19 16:02:26 2021 rev:144 rq:864129 version:1.4.14 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2021-01-18 11:32:30.364693559 +0100 +++ /work/SRC/openSUSE:Factory/.lollypop.new.28504/lollypop.changes 2021-01-19 16:02:54.167444213 +0100 @@ -1,0 +2,8 @@ +Mon Jan 18 17:43:36 UTC 2021 - antoine.belv...@opensuse.org + +- Update to version 1.4.14: + * Fix an issue with HiDPI (glgo#World/lollypop#2665). +- Changes from version 1.4.13: + * Fix a crash with per-track artwork (glgo#World/lollypop#2684). + +------------------------------------------------------------------- Old: ---- lollypop-1.4.12.tar.xz New: ---- lollypop-1.4.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.SGYJIW/_old 2021-01-19 16:02:55.071445575 +0100 +++ /var/tmp/diff_new_pack.SGYJIW/_new 2021-01-19 16:02:55.075445582 +0100 @@ -17,7 +17,7 @@ Name: lollypop -Version: 1.4.12 +Version: 1.4.14 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SGYJIW/_old 2021-01-19 16:02:55.111445635 +0100 +++ /var/tmp/diff_new_pack.SGYJIW/_new 2021-01-19 16:02:55.115445642 +0100 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">1.4.12</param> + <param name="revision">1.4.14</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.SGYJIW/_old 2021-01-19 16:02:55.135445672 +0100 +++ /var/tmp/diff_new_pack.SGYJIW/_new 2021-01-19 16:02:55.139445677 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> - <param name="changesrevision">0b01adcdeb33ad3af86f2336dd067759cae9d4b8</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2796866a5e73f18783b19806d0fdd65d8d5f6415</param></service></servicedata> \ No newline at end of file ++++++ lollypop-1.4.12.tar.xz -> lollypop-1.4.14.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/lollypop/artwork.py new/lollypop-1.4.14/lollypop/artwork.py --- old/lollypop-1.4.12/lollypop/artwork.py 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/lollypop/artwork.py 2021-01-18 13:35:31.000000000 +0100 @@ -34,18 +34,19 @@ ArtworkManager.__init__(self) create_dir(CACHE_PATH) - def add_to_cache(self, name, surface, prefix): + def add_to_cache(self, name, surface, prefix, scale_factor): """ Add artwork to cache @param name as str @param surface as cairo.Surface @param prefix as str + @param scale_factor as int @thread safe """ try: encoded = md5(name.encode("utf-8")).hexdigest() - width = surface.get_width() - height = surface.get_height() + width = surface.get_width() * scale_factor + height = surface.get_height() * scale_factor cache_path = "%s/@%s@%s_%s_%s" % (CACHE_PATH, prefix, encoded, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/lollypop/database_albums.py new/lollypop-1.4.14/lollypop/database_albums.py --- old/lollypop-1.4.12/lollypop/database_albums.py 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/lollypop/database_albums.py 2021-01-18 13:35:31.000000000 +0100 @@ -940,7 +940,6 @@ @param skipped as bool @return [int] """ - print("::", skipped) genre_ids = remove_static(genre_ids) artist_ids = remove_static(artist_ids) with SqlCursor(self.__db) as sql: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/lollypop/database_artists.py new/lollypop-1.4.14/lollypop/database_artists.py --- old/lollypop-1.4.12/lollypop/database_artists.py 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/lollypop/database_artists.py 2021-01-18 13:35:31.000000000 +0100 @@ -14,7 +14,7 @@ import itertools from lollypop.sqlcursor import SqlCursor -from lollypop.define import App, Type, StorageType, OrderBy +from lollypop.define import App, Type, StorageType, OrderBy, LovedFlags from lollypop.utils import get_default_storage_type, make_subrequest from lollypop.utils import format_artist_name, remove_static @@ -243,10 +243,11 @@ WHERE album_artists.artist_id=artists.rowid\ AND album_artists.album_id=albums.rowid\ AND albums.storage_type & ?\ - AND albums.loved != -1\ + AND not albums.loved & ?\ ORDER BY random() LIMIT ?\ COLLATE NOCASE COLLATE LOCALIZED" - result = sql.execute(request, (storage_type, limit)) + result = sql.execute( + request, (storage_type, LovedFlags.SKIPPED, limit)) return [(row[0], row[1], row[2]) for row in result] def get_ids(self, genre_ids, storage_type): @@ -379,7 +380,8 @@ "OR", len(genre_ids)) if not skipped: - request += " AND albums.loved != -1" + filters += (LovedFlags.SKIPPED,) + request += " AND not albums.loved & ?" request += order result = sql.execute(request, filters) return list(itertools.chain(*result)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/lollypop/fullscreen.py new/lollypop-1.4.14/lollypop/fullscreen.py --- old/lollypop-1.4.12/lollypop/fullscreen.py 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/lollypop/fullscreen.py 2021-01-18 13:35:31.000000000 +0100 @@ -53,18 +53,9 @@ self.__signal1_id = self.__signal2_id = None self.__background_id = None self.set_decorated(False) - # Calculate cover size - screen = Gdk.Screen.get_default() - monitor = screen.get_monitor_at_window(App().main_window.get_window()) - geometry = screen.get_monitor_geometry(monitor) - art_size_fs = ArtSize.FULLSCREEN / self.get_scale_factor() - font_size_fs = 30 / self.get_scale_factor() - if geometry.width > geometry.height: - art_size = int(art_size_fs * geometry.height / 1080) - font_size = int(font_size_fs * geometry.height / 1080) - else: - art_size = int(art_size_fs * geometry.width / 1920) - font_size = int(font_size_fs * geometry.width / 1920) + scale_factor = self.get_scale_factor() + art_size = ArtSize.FULLSCREEN / scale_factor + font_size = 30 / scale_factor builder = Gtk.Builder() builder.add_from_resource("/org/gnome/Lollypop/FullScreen.ui") builder.connect_signals(self) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/lollypop/widgets_albums_rounded.py new/lollypop-1.4.14/lollypop/widgets_albums_rounded.py --- old/lollypop-1.4.12/lollypop/widgets_albums_rounded.py 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/lollypop/widgets_albums_rounded.py 2021-01-18 13:35:31.000000000 +0100 @@ -157,7 +157,10 @@ rounded = get_round_surface( surface, self._scale_factor, self._art_size / 4) self._artwork.set_from_surface(rounded) - App().art.add_to_cache(self.artwork_name, rounded, "ROUNDED") + App().art.add_to_cache(self.artwork_name, + rounded, + "ROUNDED", + self._artwork.get_scale_factor()) emit_signal(self, "populated") def __draw_surface(self, surface, ctx, positions, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/lollypop/widgets_player_artwork.py new/lollypop-1.4.14/lollypop/widgets_player_artwork.py --- old/lollypop-1.4.12/lollypop/widgets_player_artwork.py 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/lollypop/widgets_player_artwork.py 2021-01-18 13:35:31.000000000 +0100 @@ -89,9 +89,9 @@ if self.__per_track_cover: behaviour |= ArtBehaviour.NO_CACHE album = Album(App().player.current_track.album.id) - App().album_art.clean(album, - width * scale_factor, - height * scale_factor) + App().album_art.uncache(album, + width * scale_factor, + height * scale_factor) album.set_tracks([App().player.current_track]) else: album = App().player.current_track.album diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.4.12/meson.build new/lollypop-1.4.14/meson.build --- old/lollypop-1.4.12/meson.build 2021-01-17 20:48:13.000000000 +0100 +++ new/lollypop-1.4.14/meson.build 2021-01-18 13:35:31.000000000 +0100 @@ -1,5 +1,5 @@ project('lollypop', - version: '1.4.12', + version: '1.4.14', meson_version: '>= 0.46.0' ) revision = run_command('bin/revision.sh').stdout().strip()