Hello community,
here is the log from the commit of package lollypop for openSUSE:Factory
checked in at 2019-03-04 09:24:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lollypop (Old)
and /work/SRC/openSUSE:Factory/.lollypop.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop"
Mon Mar 4 09:24:15 2019 rev:70 rq:681123 version:0.9.924
Changes:
--------
--- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-02-28
21:44:32.189496067 +0100
+++ /work/SRC/openSUSE:Factory/.lollypop.new.28833/lollypop.changes
2019-03-04 09:24:46.420553492 +0100
@@ -1,0 +2,6 @@
+Sun Mar 03 17:57:47 UTC 2019 - antoine.belv...@opensuse.org
+
+- Update to version 0.9.924:
+ * Fix an issue with compilations.
+
+-------------------------------------------------------------------
Old:
----
lollypop-0.9.923.tar.xz
New:
----
lollypop-0.9.924.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lollypop.spec ++++++
--- /var/tmp/diff_new_pack.eF4Ayg/_old 2019-03-04 09:24:47.160553359 +0100
+++ /var/tmp/diff_new_pack.eF4Ayg/_new 2019-03-04 09:24:47.164553358 +0100
@@ -17,7 +17,7 @@
Name: lollypop
-Version: 0.9.923
+Version: 0.9.924
Release: 0
Summary: GNOME music playing application
License: GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.eF4Ayg/_old 2019-03-04 09:24:47.204553351 +0100
+++ /var/tmp/diff_new_pack.eF4Ayg/_new 2019-03-04 09:24:47.204553351 +0100
@@ -1,7 +1,7 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="changesgenerate">enable</param>
- <param name="revision">0.9.923</param>
+ <param name="revision">0.9.924</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.eF4Ayg/_old 2019-03-04 09:24:47.240553345 +0100
+++ /var/tmp/diff_new_pack.eF4Ayg/_new 2019-03-04 09:24:47.240553345 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/World/lollypop.git</param>
- <param
name="changesrevision">e104f4356cc91ef45078c888aeae8e76c3dbff42</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">c1c1b13f8291845d783c9dc96f35bb75fa183aaf</param></service></servicedata>
\ No newline at end of file
++++++ lollypop-0.9.923.tar.xz -> lollypop-0.9.924.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/data/MiniPlayer.ui
new/lollypop-0.9.924/data/MiniPlayer.ui
--- old/lollypop-0.9.923/data/MiniPlayer.ui 2019-02-27 18:12:43.000000000
+0100
+++ new/lollypop-0.9.924/data/MiniPlayer.ui 2019-03-03 18:47:53.000000000
+0100
@@ -175,9 +175,9 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="margin_end">10</property>
+ <property name="spacing">20</property>
<child>
<object class="GtkButton" id="previous_button">
- <property name="width_request">80</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -199,7 +199,6 @@
</child>
<child>
<object class="GtkButton" id="play_button">
- <property name="width_request">100</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -221,7 +220,6 @@
</child>
<child>
<object class="GtkButton" id="next_button">
- <property name="width_request">80</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/lollypop/collectionscanner.py
new/lollypop-0.9.924/lollypop/collectionscanner.py
--- old/lollypop-0.9.923/lollypop/collectionscanner.py 2019-02-27
18:12:43.000000000 +0100
+++ new/lollypop-0.9.924/lollypop/collectionscanner.py 2019-03-03
18:47:53.000000000 +0100
@@ -476,32 +476,32 @@
except Exception as e:
Logger.error("CollectionScanner::__del_from_db: %s" % e)
- def __update_album(self, album_id, album_artist_ids,
- genre_ids, year, timestamp):
+ def __update_album(self, album_id, artist_ids, genre_ids, year, timestamp):
"""
Update album artists based on album-artist and artist tags
This code auto handle compilations: empty "album artist" with
different artists
- @param album_id as int
- @param album_artist_ids as [int]
- @param genre_ids as [int]
+ @param album id as int
+ @param artist ids as [int]
+ @param genre ids as [int]
@param year as int
@param timestmap as int
@commit needed
"""
+ album_artist_ids = []
add = True
# Set artist ids based on content
- if not album_artist_ids:
+ if not artist_ids:
new_artist_ids = App().albums.calculate_artist_ids(album_id)
current_artist_ids = App().albums.get_artist_ids(album_id)
if new_artist_ids != current_artist_ids:
+ album_artist_ids = new_artist_ids
if Type.COMPILATIONS in new_artist_ids:
add = False
album_artist_ids = current_artist_ids
else:
album_artist_ids = new_artist_ids
- if album_artist_ids:
- App().albums.set_artist_ids(album_id, album_artist_ids)
+ App().albums.set_artist_ids(album_id, new_artist_ids)
# Update UI based on previous artist calculation
if App().albums.get_tracks_count(album_id) > 1:
for artist_id in album_artist_ids:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/lollypop/container.py
new/lollypop-0.9.924/lollypop/container.py
--- old/lollypop-0.9.923/lollypop/container.py 2019-02-27 18:12:43.000000000
+0100
+++ new/lollypop-0.9.924/lollypop/container.py 2019-03-03 18:47:53.000000000
+0100
@@ -56,19 +56,6 @@
if view is not None:
view.stop()
- def show_genres(self, show):
- """
- Show/Hide genres
- @param bool
- """
- def select_list_one(selection_list):
- self._list_one.select_first()
- self._list_one.disconnect_by_func(select_list_one)
- if App().settings.get_value("show-sidebar"):
- self._list_two.hide()
- self.update_list_one()
- self._list_one.connect("populated", select_list_one)
-
def reload_view(self):
"""
Reload current view
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/lollypop/container_lists.py
new/lollypop-0.9.924/lollypop/container_lists.py
--- old/lollypop-0.9.923/lollypop/container_lists.py 2019-02-27
18:12:43.000000000 +0100
+++ new/lollypop-0.9.924/lollypop/container_lists.py 2019-03-03
18:47:53.000000000 +0100
@@ -148,7 +148,7 @@
self._list_two.connect("populated", select_list_two, state_two_ids)
if state_one_ids:
self._list_one.select_ids(state_one_ids)
- else:
+ elif not App().window.is_adaptive:
self._list_one.select_first()
############
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/lollypop/controller_information.py
new/lollypop-0.9.924/lollypop/controller_information.py
--- old/lollypop-0.9.923/lollypop/controller_information.py 2019-02-27
18:12:43.000000000 +0100
+++ new/lollypop-0.9.924/lollypop/controller_information.py 2019-03-03
18:47:53.000000000 +0100
@@ -29,6 +29,7 @@
"""
self._infobox = None
self.__effect = effect
+ self.__previous_artwork_id = None
self.__show_tooltip = show_tooltip
self.__per_track_cover = App().settings.get_value(
"allow-per-track-cover")
@@ -82,8 +83,11 @@
@param width as int
@param height as int
"""
- if width < 1 or height < 1:
+ same_artwork = self.__previous_artwork_id ==\
+ App().player.current_track.album.id
+ if width < 1 or height < 1 or same_artwork:
return
+ self.__previous_artwork_id = App().player.current_track.album.id
if App().player.current_track.id == Type.RADIOS:
App().art_helper.set_radio_artwork(
App().player.current_track.radio_name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/lollypop/database_albums.py
new/lollypop-0.9.924/lollypop/database_albums.py
--- old/lollypop-0.9.923/lollypop/database_albums.py 2019-02-27
18:12:43.000000000 +0100
+++ new/lollypop-0.9.924/lollypop/database_albums.py 2019-03-03
18:47:53.000000000 +0100
@@ -97,12 +97,14 @@
@warning: commit needed
"""
with SqlCursor(App().db, True) as sql:
- sql.execute("DELETE FROM album_artists\
- WHERE album_id=?", (album_id,))
- for artist_id in artist_ids:
- sql.execute("INSERT INTO album_artists\
- (album_id, artist_id)\
- VALUES (?, ?)", (album_id, artist_id))
+ currents = self.get_artist_ids(album_id)
+ if not currents or set(currents) - set(artist_ids):
+ sql.execute("DELETE FROM album_artists\
+ WHERE album_id=?", (album_id,))
+ for artist_id in artist_ids:
+ sql.execute("INSERT INTO album_artists\
+ (album_id, artist_id)\
+ VALUES (?, ?)", (album_id, artist_id))
def set_synced(self, album_id, synced):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/lollypop/objects.py
new/lollypop-0.9.924/lollypop/objects.py
--- old/lollypop-0.9.923/lollypop/objects.py 2019-02-27 18:12:43.000000000
+0100
+++ new/lollypop-0.9.924/lollypop/objects.py 2019-03-03 18:47:53.000000000
+0100
@@ -454,16 +454,22 @@
radios = Radios()
self.id = Type.RADIOS
self._radio_id = radio_id
+ self.album.id = radio_id
self._radio_name = radios.get_name(radio_id)
self._uri = radios.get_uri(radio_id)
def set_radio(self, name, uri):
"""
- Set radio
+ Set radio for non DB radios (Tunein)
@param name as string
@param uri as string
"""
self.id = Type.RADIOS
+ # Generate a tmp album id, needed by InfoController
+ album_id = 0
+ for i in list(map(ord, name)):
+ album_id += i
+ self.album.id = album_id
self._radio_name = name
self._uri = uri
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lollypop-0.9.923/lollypop/widgets_settings_collections.py
new/lollypop-0.9.924/lollypop/widgets_settings_collections.py
--- old/lollypop-0.9.923/lollypop/widgets_settings_collections.py
2019-02-27 18:12:43.000000000 +0100
+++ new/lollypop-0.9.924/lollypop/widgets_settings_collections.py
2019-03-03 18:47:53.000000000 +0100
@@ -14,7 +14,7 @@
from gettext import ngettext as ngettext
-from lollypop.define import App, ScanType, SidebarContent
+from lollypop.define import App, ScanType
from lollypop.database_history import History
from lollypop.database import Database
from lollypop.logger import Logger
@@ -254,9 +254,9 @@
App().player.stop()
App().db.drop_db()
App().db = Database()
- sidebar_content = App().settings.get_enum("sidebar-content")
- show_genres = sidebar_content == SidebarContent.GENRES
- App().window.container.show_genres(show_genres)
+ App().window.container.list_two.hide()
+ App().window.container.stack.destroy_children()
+ App().window.container.update_list_one()
App().scanner.update(ScanType.FULL)
self.__progress.get_toplevel().set_deletable(True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-0.9.923/meson.build
new/lollypop-0.9.924/meson.build
--- old/lollypop-0.9.923/meson.build 2019-02-27 18:12:43.000000000 +0100
+++ new/lollypop-0.9.924/meson.build 2019-03-03 18:47:53.000000000 +0100
@@ -1,5 +1,5 @@
project('lollypop',
- version: '0.9.923',
+ version: '0.9.924',
meson_version: '>= 0.40.0'
)
i18n = import('i18n')
