Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2019-01-25 22:45:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop" Fri Jan 25 22:45:11 2019 rev:65 rq:668417 version:0.9.914 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-01-24 14:12:42.211411739 +0100 +++ /work/SRC/openSUSE:Factory/.lollypop.new.28833/lollypop.changes 2019-01-25 22:45:14.135089864 +0100 @@ -1,0 +2,9 @@ +Wed Jan 23 19:25:25 UTC 2019 - [email protected] + +- Update to version 0.9.914: + * Fix a crash in radios (glgo#World/lollypop#1606). +- Changes from version 0.9.913: + * Fix issues in collection scanner. + * Enhance mini-player (glgo#World/lollypop#1607). + +------------------------------------------------------------------- Old: ---- lollypop-0.9.912.tar.xz New: ---- lollypop-0.9.914.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.upkuKD/_old 2019-01-25 22:45:15.067088715 +0100 +++ /var/tmp/diff_new_pack.upkuKD/_new 2019-01-25 22:45:15.071088711 +0100 @@ -17,7 +17,7 @@ Name: lollypop -Version: 0.9.912 +Version: 0.9.914 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.upkuKD/_old 2019-01-25 22:45:15.099088675 +0100 +++ /var/tmp/diff_new_pack.upkuKD/_new 2019-01-25 22:45:15.099088675 +0100 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">0.9.912</param> + <param name="revision">0.9.914</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.upkuKD/_old 2019-01-25 22:45:15.115088656 +0100 +++ /var/tmp/diff_new_pack.upkuKD/_new 2019-01-25 22:45:15.115088656 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> - <param name="changesrevision">d3a808d4a3274bf9b9a4c670c5433227eca5094b</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">ddb232d9eb8d91917e3eb12192f1006d1f498990</param></service></servicedata> \ No newline at end of file ++++++ lollypop-0.9.912.tar.xz -> lollypop-0.9.914.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/data/MiniPlayer.ui new/lollypop-0.9.914/data/MiniPlayer.ui --- old/lollypop-0.9.912/data/MiniPlayer.ui 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/data/MiniPlayer.ui 2019-01-23 19:00:51.000000000 +0100 @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.2 --> +<!-- Generated with glade 3.22.1 --> <interface> <requires lib="gtk+" version="3.14"/> <object class="GtkEventBox" id="widget"> <property name="visible">True</property> <property name="can_focus">False</property> + <signal name="enter-notify-event" handler="_on_enter_notify_event" swapped="no"/> + <signal name="leave-notify-event" handler="_on_leave_notify_event" swapped="no"/> <child> <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/data/application.css new/lollypop-0.9.914/data/application.css --- old/lollypop-0.9.912/data/application.css 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/data/application.css 2019-01-23 19:00:51.000000000 +0100 @@ -242,6 +242,16 @@ border-radius: 50%; } +.slow-show { + transition: 1000ms linear; + opacity: 1; +} + +.slow-hide { + transition: 1000ms linear; + opacity: 0; +} + .rounded-icon { background: none; border: none; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/data/org.gnome.Lollypop.appdata.xml.in new/lollypop-0.9.914/data/org.gnome.Lollypop.appdata.xml.in --- old/lollypop-0.9.912/data/org.gnome.Lollypop.appdata.xml.in 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/data/org.gnome.Lollypop.appdata.xml.in 2019-01-23 19:00:51.000000000 +0100 @@ -27,9 +27,9 @@ </ul> </description> <releases> - <release version="0.9.912" date="2019-01-18"> + <release version="0.9.913" date="2019-01-23"> <description> - <ul>Fix an issue with playback</ul> + <ul>Fix issues in collection scanner</ul> </description> </release> </releases> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/lollypop/application.py new/lollypop-0.9.914/lollypop/application.py --- old/lollypop-0.9.912/lollypop/application.py 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/lollypop/application.py 2019-01-23 19:00:51.000000000 +0100 @@ -112,6 +112,8 @@ self.debug = False self.shown_sidebar_tooltip = False self.__fs = None + self.__scanner_timeout_id = None + self.__scanner_uris = [] GLib.set_application_name("Lollypop") GLib.set_prgname("lollypop") self.add_main_option("play-ids", b"a", GLib.OptionFlags.NONE, @@ -436,6 +438,12 @@ uris.append(uri) elif is_pls(f): pls.append(uri) + else: + info = f.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, + Gio.FileQueryInfoFlags.NONE, + None) + if info.get_file_type() == Gio.FileType.DIRECTORY: + uris.append(uri) if pls: from gi.repository import TotemPlParser parser = TotemPlParser.Parser.new() @@ -462,7 +470,16 @@ @param result as Gio.AsyncResult @param uris as [str] """ - GLib.timeout_add(500, self.scanner.update, uris, False) + def scanner_update(): + self.__scanner_timeout_id = None + self.scanner.update(self.__scanner_uris, False) + self.__scanner_uris = [] + + if self.__scanner_timeout_id is not None: + GLib.source_remove(self.__scanner_timeout_id) + self.__scanner_uris += uris + self.__scanner_timeout_id = GLib.timeout_add(500, + scanner_update) def __on_entry_parsed(self, parser, uri, metadata, uris): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/lollypop/collectionscanner.py new/lollypop-0.9.914/lollypop/collectionscanner.py --- old/lollypop-0.9.912/lollypop/collectionscanner.py 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/lollypop/collectionscanner.py 2019-01-23 19:00:51.000000000 +0100 @@ -76,7 +76,7 @@ # Stop previous scan if self.is_locked(): self.stop() - GLib.timeout_add(250, self.update) + GLib.timeout_add(250, self.update, uris, saved) else: self.__disable_compilations = not App().settings.get_value( "show-compilations") @@ -205,7 +205,7 @@ GLib.idle_add(self.__finish, new_tracks and saved) - if not saved: + if not saved and self.__thread is not None: self.__play_new_tracks(new_tracks) del self.__history @@ -275,7 +275,7 @@ while files: # Handle a stop request if self.__thread is None: - return new_tracks + raise Exception("Scan cancelled") try: (mtime, uri) = files.pop(0) f = Gio.File.new_for_uri(uri) @@ -292,16 +292,17 @@ self.__scan_del(uri) self.__scan_add(uri, mtime if saved else 0) new_tracks.append(uri) - GLib.idle_add(self.__update_progress, i, count) except Exception as e: Logger.error( "CollectionScanner:: __scan_files: % s" % e) i += 1 + GLib.idle_add(self.__update_progress, i, count) # This files are not in collection anymore - for uri in to_delete: - self.__scan_del(uri) + if saved: + for uri in to_delete: + self.__scan_del(uri) except Exception as e: - Logger.error("CollectionScanner:: __scan_files: % s" % e) + Logger.warning("CollectionScanner:: __scan_files: % s" % e) SqlCursor.commit(App().db) SqlCursor.remove(App().db) return new_tracks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/lollypop/miniplayer.py new/lollypop-0.9.914/lollypop/miniplayer.py --- old/lollypop-0.9.912/lollypop/miniplayer.py 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/lollypop/miniplayer.py 2019-01-23 19:00:51.000000000 +0100 @@ -127,6 +127,33 @@ except: Logger.warning(_("You are using a broken cursor theme!")) + def _on_enter_notify_event(self, eventbox, event): + """ + Show controls + @param eventbox as Gtk.EventBox + @param event as Gdk.EventCrossing + """ + context = self.__grid.get_style_context() + context.remove_class("slow-hide") + context.add_class("slow-show") + + def _on_leave_notify_event(self, eventbox, event): + """ + Hide controls + @param eventbox as Gtk.EventBox + @param event as Gdk.EventCrossing + """ + if self.__height == self.get_preferred_height()[0]: + return + allocation = eventbox.get_allocation() + if event.x <= 0 or\ + event.x >= allocation.width or\ + event.y <= 0 or\ + event.y >= allocation.height: + context = self.__grid.get_style_context() + context.add_class("slow-hide") + context.remove_class("slow-show") + ####################### # PRIVATE # ####################### @@ -156,8 +183,13 @@ if self.__height == allocation.height: return self.__height = allocation.height + context = self.__grid.get_style_context() if self.__height == widget.get_preferred_height()[0]: InformationController.__init__(self, True, ArtHelperEffect.BLUR) + context.remove_class("slow-hide") + context.add_class("slow-show") else: InformationController.__init__(self, True, ArtHelperEffect.NONE) + context.add_class("slow-hide") + context.remove_class("slow-show") InformationController.on_current_changed(self, self.__width, None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/lollypop/widgets_radio.py new/lollypop-0.9.914/lollypop/widgets_radio.py --- old/lollypop-0.9.912/lollypop/widgets_radio.py 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/lollypop/widgets_radio.py 2019-01-23 19:00:51.000000000 +0100 @@ -44,6 +44,7 @@ Gtk.FlowBoxChild.__init__(self) OverlayHelper.__init__(self) self._widget = None + self._artwork = None self.__art_size = 120\ if App().window.is_adaptive\ else ArtSize.BIG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-0.9.912/meson.build new/lollypop-0.9.914/meson.build --- old/lollypop-0.9.912/meson.build 2019-01-18 17:24:14.000000000 +0100 +++ new/lollypop-0.9.914/meson.build 2019-01-23 19:00:51.000000000 +0100 @@ -1,5 +1,5 @@ project('lollypop', - version: '0.9.912', + version: '0.9.914', meson_version: '>= 0.40.0' ) i18n = import('i18n')
