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-07-05 22:23:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lollypop (Old)
and /work/SRC/openSUSE:Factory/.lollypop.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop"
Mon Jul 5 22:23:25 2021 rev:151 rq:904258 version:1.4.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2021-06-24
18:22:45.768928771 +0200
+++ /work/SRC/openSUSE:Factory/.lollypop.new.2625/lollypop.changes
2021-07-05 22:24:25.745049137 +0200
@@ -1,0 +2,11 @@
+Mon Jul 05 18:02:10 UTC 2021 - antoine.belv...@opensuse.org
+
+- Update to version 1.4.22:
+ * Fix a permission issue with Flatpak (glgo#World/lollypop#2791).
+- Changes from version 1.4.21:
+ * Fix some crashes (glgo#World/lollypop#2797,
+ glgo#World/lollypop#2802).
+ * Fix album duration computation for albums featuring several
+ artists (glgo#World/lollypop#2798).
+
+-------------------------------------------------------------------
Old:
----
lollypop-1.4.20.obscpio
New:
----
lollypop-1.4.22.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lollypop.spec ++++++
--- /var/tmp/diff_new_pack.k0slBK/_old 2021-07-05 22:24:26.337044556 +0200
+++ /var/tmp/diff_new_pack.k0slBK/_new 2021-07-05 22:24:26.341044524 +0200
@@ -17,7 +17,7 @@
Name: lollypop
-Version: 1.4.20
+Version: 1.4.22
Release: 0
Summary: GNOME music playing application
License: GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.k0slBK/_old 2021-07-05 22:24:26.377044246 +0200
+++ /var/tmp/diff_new_pack.k0slBK/_new 2021-07-05 22:24:26.377044246 +0200
@@ -1,7 +1,7 @@
<services>
<service mode="disabled" name="obs_scm">
<param name="changesgenerate">enable</param>
- <param name="revision">1.4.20</param>
+ <param name="revision">1.4.22</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.k0slBK/_old 2021-07-05 22:24:26.397044092 +0200
+++ /var/tmp/diff_new_pack.k0slBK/_new 2021-07-05 22:24:26.397044092 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/World/lollypop.git</param>
- <param
name="changesrevision">7cd766b798a2c89ad460c87547333ee4e52803ff</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">15e7dc899502c5ed1f8e50e8c2c9224a3236f8e2</param></service></servicedata>
\ No newline at end of file
++++++ lollypop-1.4.20.obscpio -> lollypop-1.4.22.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.4.20/lollypop/collection_scanner.py
new/lollypop-1.4.22/lollypop/collection_scanner.py
--- old/lollypop-1.4.20/lollypop/collection_scanner.py 2021-06-23
10:57:38.000000000 +0200
+++ new/lollypop-1.4.22/lollypop/collection_scanner.py 2021-07-05
09:32:19.000000000 +0200
@@ -505,6 +505,8 @@
self.__flatpak_migration()
App().notify.send("Lollypop",
_("Scan disabled, missing collection"))
+ App().settings.set_value("flatpak-access-migration",
+ GLib.Variant("b", True))
return
if scan_type == ScanType.NEW_FILES:
db_uris = App().tracks.get_uris(uris)
@@ -559,8 +561,6 @@
except Exception as e:
Logger.warning("CollectionScanner::__scan(): %s", e)
SqlCursor.remove(App().db)
- App().settings.set_value("flatpak-access-migration",
- GLib.Variant("b", True))
def __scan_to_handle(self, uri):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.4.20/lollypop/database_albums.py
new/lollypop-1.4.22/lollypop/database_albums.py
--- old/lollypop-1.4.20/lollypop/database_albums.py 2021-06-23
10:57:38.000000000 +0200
+++ new/lollypop-1.4.22/lollypop/database_albums.py 2021-07-05
09:32:19.000000000 +0200
@@ -1195,12 +1195,13 @@
"""
genre_ids = remove_static(genre_ids)
artist_ids = remove_static(artist_ids)
+ request = "SELECT SUM(duration) FROM ("
with SqlCursor(self.__db) as sql:
if genre_ids and artist_ids:
filters = (album_id,)
filters += tuple(genre_ids)
filters += tuple(artist_ids)
- request = "SELECT SUM(duration)\
+ request += "SELECT duration\
FROM tracks, track_genres, track_artists\
WHERE tracks.album_id=?\
AND track_genres.track_id = tracks.rowid\
@@ -1215,7 +1216,7 @@
elif artist_ids:
filters = (album_id,)
filters += tuple(artist_ids)
- request = "SELECT SUM(duration)\
+ request += "SELECT duration\
FROM tracks, track_artists\
WHERE tracks.album_id=?\
AND track_artists.track_id = tracks.rowid AND"
@@ -1225,7 +1226,7 @@
elif genre_ids:
filters = (album_id,)
filters += tuple(genre_ids)
- request = "SELECT SUM(duration)\
+ request += "SELECT duration\
FROM tracks, track_genres\
WHERE tracks.album_id=?\
AND track_genres.track_id = tracks.rowid AND"
@@ -1234,12 +1235,13 @@
len(genre_ids))
else:
filters = (album_id,)
- request = "SELECT SUM(duration)\
+ request += "SELECT duration\
FROM tracks\
WHERE tracks.album_id=?"
if disc_number is not None:
filters += (disc_number,)
request += " AND discnumber=?"
+ request += " GROUP BY tracks.id)"
result = sql.execute(request, filters)
v = result.fetchone()
if v and v[0] is not None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.4.20/lollypop/helper_lyrics.py
new/lollypop-1.4.22/lollypop/helper_lyrics.py
--- old/lollypop-1.4.20/lollypop/helper_lyrics.py 2021-06-23
10:57:38.000000000 +0200
+++ new/lollypop-1.4.22/lollypop/helper_lyrics.py 2021-07-05
09:32:19.000000000 +0200
@@ -199,6 +199,8 @@
artist = track.artists[0]
elif track.album_artists:
artist = track.album_artists[0]
+ else:
+ artist = ""
if escape:
return GLib.uri_escape_string(artist, None, False)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.4.20/lollypop/tagreader.py
new/lollypop-1.4.22/lollypop/tagreader.py
--- old/lollypop-1.4.20/lollypop/tagreader.py 2021-06-23 10:57:38.000000000
+0200
+++ new/lollypop-1.4.22/lollypop/tagreader.py 2021-07-05 09:32:19.000000000
+0200
@@ -278,7 +278,6 @@
if compilation:
return compilation == 1
artists = self.get_album_artists(tags)
- print(artists)
if artists.lower() == "various artists":
return True
except Exception as e:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.4.20/lollypop/view_current_albums.py
new/lollypop-1.4.22/lollypop/view_current_albums.py
--- old/lollypop-1.4.20/lollypop/view_current_albums.py 2021-06-23
10:57:38.000000000 +0200
+++ new/lollypop-1.4.22/lollypop/view_current_albums.py 2021-07-05
09:32:19.000000000 +0200
@@ -17,6 +17,7 @@
from lollypop.widgets_row_track import TrackRow
from lollypop.view_albums_list import AlbumsListView
from lollypop.view_tracks_queue import QueueTracksView
+from lollypop.logger import Logger
from lollypop.define import App, ViewType, Size, MARGIN
from lollypop.helper_signals import SignalsHelper, signals_map
from lollypop.widgets_banner_current_albums import CurrentAlbumsBannerWidget
@@ -177,12 +178,15 @@
Remove album from playback
@param row as AlbumRow
"""
- if row.album.id in App().player.album_ids:
- if App().player.current_track in row.album.tracks:
- App().player.skip_album()
- App().player.remove_album(row.album)
- else:
- App().player.add_album(row.album)
+ try:
+ if row.album.id in App().player.album_ids:
+ if App().player.current_track in row.album.tracks:
+ App().player.skip_album()
+ App().player.remove_album(row.album)
+ else:
+ App().player.add_album(row.album)
+ except Exception as e:
+ Logger.error("CurrentAlbumsView::_on_row_destroy()", e)
def _on_track_removed(self, row, track):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.4.20/meson.build
new/lollypop-1.4.22/meson.build
--- old/lollypop-1.4.20/meson.build 2021-06-23 10:57:38.000000000 +0200
+++ new/lollypop-1.4.22/meson.build 2021-07-05 09:32:19.000000000 +0200
@@ -1,5 +1,5 @@
project('lollypop',
- version: '1.4.20',
+ version: '1.4.22',
meson_version: '>= 0.46.0'
)
revision = run_command('bin/revision.sh').stdout().strip()
++++++ lollypop.obsinfo ++++++
--- /var/tmp/diff_new_pack.k0slBK/_old 2021-07-05 22:24:26.673041956 +0200
+++ /var/tmp/diff_new_pack.k0slBK/_new 2021-07-05 22:24:26.673041956 +0200
@@ -1,5 +1,5 @@
name: lollypop
-version: 1.4.20
-mtime: 1624438658
-commit: 7cd766b798a2c89ad460c87547333ee4e52803ff
+version: 1.4.22
+mtime: 1625470339
+commit: 15e7dc899502c5ed1f8e50e8c2c9224a3236f8e2
