Hello community,
here is the log from the commit of package lollypop for openSUSE:Leap:15.2
checked in at 2020-04-20 12:55:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/lollypop (Old)
and /work/SRC/openSUSE:Leap:15.2/.lollypop.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop"
Mon Apr 20 12:55:31 2020 rev:59 rq:795495 version:1.2.35
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/lollypop/lollypop.changes 2020-04-12
15:38:10.230002100 +0200
+++ /work/SRC/openSUSE:Leap:15.2/.lollypop.new.2738/lollypop.changes
2020-04-20 12:55:46.388755264 +0200
@@ -1,0 +2,11 @@
+Fri Apr 17 19:12:57 UTC 2020 - antoine.belv...@opensuse.org
+
+- Update to version 1.2.35:
+ * Fix an issue with smart playlists.
+ * Do not show genres without albums (glgo#World/lollypop#2301).
+ * Fix bug preventing deletion of empty playlist
+ (glgo#World/lollypop#2299).
+ * Fix an issue with Ctrl+I filter in album view
+ (glgo#World/lollypop#2291).
+
+-------------------------------------------------------------------
Old:
----
lollypop-1.2.34.tar.xz
New:
----
lollypop-1.2.35.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lollypop.spec ++++++
--- /var/tmp/diff_new_pack.hfphnr/_old 2020-04-20 12:55:46.708755767 +0200
+++ /var/tmp/diff_new_pack.hfphnr/_new 2020-04-20 12:55:46.708755767 +0200
@@ -17,7 +17,7 @@
Name: lollypop
-Version: 1.2.34
+Version: 1.2.35
Release: 0
Summary: GNOME music playing application
License: GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.hfphnr/_old 2020-04-20 12:55:46.736755810 +0200
+++ /var/tmp/diff_new_pack.hfphnr/_new 2020-04-20 12:55:46.740755817 +0200
@@ -1,7 +1,7 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="changesgenerate">enable</param>
- <param name="revision">1.2.34</param>
+ <param name="revision">1.2.35</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.hfphnr/_old 2020-04-20 12:55:46.756755842 +0200
+++ /var/tmp/diff_new_pack.hfphnr/_new 2020-04-20 12:55:46.756755842 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/World/lollypop.git</param>
- <param
name="changesrevision">f838d252985edcbeb4a3161b4163f0d5eb14d486</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">279742c4ead01d4b66ee42778dca735ca0eb38ad</param></service></servicedata>
\ No newline at end of file
++++++ lollypop-1.2.34.tar.xz -> lollypop-1.2.35.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/README.md
new/lollypop-1.2.35/README.md
--- old/lollypop-1.2.34/README.md 2020-04-06 00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/README.md 2020-04-17 09:58:08.000000000 +0200
@@ -43,6 +43,7 @@
- `python-gobject`
- `python-sqlite`
- `python-pylast >= 1.0`
+- `beautifulsoup4`
## Building from Git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lollypop-1.2.34/data/org.gnome.Lollypop.appdata.xml.in
new/lollypop-1.2.35/data/org.gnome.Lollypop.appdata.xml.in
--- old/lollypop-1.2.34/data/org.gnome.Lollypop.appdata.xml.in 2020-04-06
00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/data/org.gnome.Lollypop.appdata.xml.in 2020-04-17
09:58:08.000000000 +0200
@@ -17,7 +17,7 @@
</ul>
</description>
<releases>
- <release version="1.2.33" date="2020-04-04">
+ <release version="1.2.35" date="2020-04-17">
<description>
</description>
</release>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/database_genres.py
new/lollypop-1.2.35/lollypop/database_genres.py
--- old/lollypop-1.2.34/lollypop/database_genres.py 2020-04-06
00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/lollypop/database_genres.py 2020-04-17
09:58:08.000000000 +0200
@@ -122,13 +122,16 @@
result = sql.execute("SELECT DISTINCT\
genres.rowid, genres.name, genres.name\
FROM genres\
- WHERE genres.rowid IN (\
- SELECT album_genres.genre_id\
- FROM album_genres, albums\
- WHERE album_genres.album_id=albums.rowid\
- AND albums.mtime!=0)\
+ WHERE EXISTS (\
+ SELECT *\
+ FROM album_genres, album_artists\
+ WHERE album_genres.album_id=\
+ album_artists.album_id AND\
+ album_artists.artist_id != ? AND\
+ album_genres.genre_id=genres.rowid)\
ORDER BY genres.name\
- COLLATE NOCASE COLLATE LOCALIZED")
+ COLLATE NOCASE COLLATE LOCALIZED",
+ (Type.COMPILATIONS,))
return list(result)
def get_ids(self):
@@ -139,13 +142,16 @@
with SqlCursor(App().db) as sql:
result = sql.execute("SELECT DISTINCT genres.rowid\
FROM genres\
- WHERE genres.rowid IN (\
- SELECT album_genres.genre_id\
- FROM album_genres, albums\
- WHERE album_genres.album_id=albums.rowid\
- AND albums.mtime!=0)\
+ WHERE EXISTS (\
+ SELECT *\
+ FROM album_genres, album_artists\
+ WHERE album_genres.album_id=\
+ album_artists.album_id AND\
+ album_artists.artist_id != ? AND\
+ album_genres.genre_id=genres.rowid)\
ORDER BY genres.name\
- COLLATE NOCASE COLLATE LOCALIZED")
+ COLLATE NOCASE COLLATE LOCALIZED",
+ (Type.COMPILATIONS,))
return list(itertools.chain(*result))
def get_random(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/menu_playback.py
new/lollypop-1.2.35/lollypop/menu_playback.py
--- old/lollypop-1.2.34/lollypop/menu_playback.py 2020-04-06
00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/lollypop/menu_playback.py 2020-04-17
09:58:08.000000000 +0200
@@ -14,7 +14,7 @@
from gettext import gettext as _
-from lollypop.define import App, ViewType
+from lollypop.define import App, ViewType, Type
from lollypop.utils_album import tracks_to_albums
from lollypop.utils import get_default_storage_type, emit_signal
from lollypop.objects_track import Track
@@ -96,13 +96,18 @@
@param playlist_id as int
"""
if App().playlists.get_smart(playlist_id):
- tracks = []
request = App().playlists.get_smart_sql(playlist_id)
- for track_id in App().db.execute(request):
- tracks.append(Track(track_id))
+ # We need to inject skipped/storage_type
+ storage_type = get_default_storage_type()
+ split = request.split("ORDER BY")
+ split[0] += " AND loved != %s" % Type.NONE
+ split[0] += " AND tracks.storage_type&%s " % storage_type
+ track_ids = App().db.execute("ORDER BY".join(split))
+ albums = tracks_to_albums(
+ [Track(track_id) for track_id in track_ids])
else:
tracks = App().playlists.get_tracks(playlist_id)
- albums = tracks_to_albums(tracks)
+ albums = tracks_to_albums(tracks)
App().player.play_albums(albums)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/menu_playlist.py
new/lollypop-1.2.35/lollypop/menu_playlist.py
--- old/lollypop-1.2.34/lollypop/menu_playlist.py 2020-04-06
00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/lollypop/menu_playlist.py 2020-04-17
09:58:08.000000000 +0200
@@ -41,12 +41,13 @@
App().add_action(save_action)
save_action.connect("activate", self.__on_save_action_activate)
menu.append(_("Save playlist"), "app.save_pl_action")
- if playlist_id >= 0 and\
- not App().playlists.get_track_uris(playlist_id):
- smart_action = Gio.SimpleAction(name="smart_action")
- App().add_action(smart_action)
- smart_action.connect("activate", self.__on_smart_action_activate)
- menu.append(_("Manage smart playlist"), "app.smart_action")
+ if playlist_id >= 0:
+ if not App().playlists.get_track_uris(playlist_id):
+ smart_action = Gio.SimpleAction(name="smart_action")
+ App().add_action(smart_action)
+ smart_action.connect("activate",
+ self.__on_smart_action_activate)
+ menu.append(_("Manage smart playlist"), "app.smart_action")
remove_action = Gio.SimpleAction(name="remove_pl_action")
App().add_action(remove_action)
remove_action.connect("activate", self.__on_remove_action_activate)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/mpris.py
new/lollypop-1.2.35/lollypop/mpris.py
--- old/lollypop-1.2.34/lollypop/mpris.py 2020-04-06 00:05:08.000000000
+0200
+++ new/lollypop-1.2.35/lollypop/mpris.py 2020-04-17 09:58:08.000000000
+0200
@@ -423,7 +423,9 @@
cover_path = App().art.get_album_cache_path(
App().player.current_track.album,
ArtSize.MPRIS, ArtSize.MPRIS)
- if cover_path is not None:
+ if cover_path is None:
+ self.__metadata["mpris:artUrl"] = GLib.Variant("s", "")
+ else:
self.__metadata["mpris:artUrl"] = GLib.Variant(
"s",
"file://" + cover_path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/view.py
new/lollypop-1.2.35/lollypop/view.py
--- old/lollypop-1.2.34/lollypop/view.py 2020-04-06 00:05:08.000000000
+0200
+++ new/lollypop-1.2.35/lollypop/view.py 2020-04-17 09:58:08.000000000
+0200
@@ -172,20 +172,6 @@
except Exception as e:
Logger.error("View::activate_child: %s" % e)
- def search_prev(self, text):
- """
- Search and hilight prev child
- @param text as str
- """
- pass
-
- def search_next(self, text):
- """
- Search and hilight next child
- @param text as str
- """
- pass
-
def set_populated_scrolled_position(self, position):
"""
Set scrolled position on populated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/view_playlists.py
new/lollypop-1.2.35/lollypop/view_playlists.py
--- old/lollypop-1.2.34/lollypop/view_playlists.py 2020-04-06
00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/lollypop/view_playlists.py 2020-04-17
09:58:08.000000000 +0200
@@ -228,7 +228,7 @@
# We need to inject skipped/storage_type
storage_type = get_default_storage_type()
split = request.split("ORDER BY")
- split[0] += " AND loved != ?" % Type.NONE
+ split[0] += " AND loved != %s" % Type.NONE
split[0] += " AND tracks.storage_type&%s " % storage_type
track_ids = App().db.execute("ORDER BY".join(split))
return tracks_to_albums(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/lollypop/widgets_album_simple.py
new/lollypop-1.2.35/lollypop/widgets_album_simple.py
--- old/lollypop-1.2.34/lollypop/widgets_album_simple.py 2020-04-06
00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/lollypop/widgets_album_simple.py 2020-04-17
09:58:08.000000000 +0200
@@ -164,7 +164,10 @@
Get name
@return str
"""
- return "%s %s" % (self.__album.name, self.__album.artists)
+ if self.__view_type & ViewType.ALBUM:
+ return self.__album.name
+ else:
+ return "%s %s" % (self.__album.name, self.__album.artists)
@property
def artwork(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.2.34/meson.build
new/lollypop-1.2.35/meson.build
--- old/lollypop-1.2.34/meson.build 2020-04-06 00:05:08.000000000 +0200
+++ new/lollypop-1.2.35/meson.build 2020-04-17 09:58:08.000000000 +0200
@@ -1,5 +1,5 @@
project('lollypop',
- version: '1.2.34',
+ version: '1.2.35',
meson_version: '>= 0.40.0'
)
revision = run_command('bin/revision.sh').stdout().strip()
