[gnome-music/wip/mschraal/core] Remove old query.py and it's last use



commit 407a675f47fab8b49f0196d2a7853220ca630d5a
Author: Marinus Schraal <mschraal gnome org>
Date:   Mon Jul 15 17:19:39 2019 +0200

    Remove old query.py and it's last use

 gnomemusic/query.py           | 996 ------------------------------------------
 gnomemusic/views/emptyview.py |  17 +-
 po/POTFILES.in                |   1 -
 3 files changed, 14 insertions(+), 1000 deletions(-)
---
diff --git a/gnomemusic/views/emptyview.py b/gnomemusic/views/emptyview.py
index 2a72fb58..a9ae13da 100644
--- a/gnomemusic/views/emptyview.py
+++ b/gnomemusic/views/emptyview.py
@@ -25,11 +25,10 @@
 from enum import IntEnum
 
 from gettext import gettext as _
-from gi.repository import GObject, Gtk
+from gi.repository import GLib, GObject, Gtk, Tracker
 
 from gnomemusic import log
 from gnomemusic.albumartcache import Art
-from gnomemusic.query import Query
 
 
 @Gtk.Template(resource_path="/org/gnome/Music/ui/EmptyView.ui")
@@ -63,8 +62,20 @@ class EmptyView(Gtk.Stack):
     def __init__(self):
         super().__init__()
 
+        # FIXME: This is now duplicated here and in GrlTrackerWrapper.
+        try:
+            music_folder = GLib.get_user_special_dir(
+                GLib.UserDirectory.DIRECTORY_MUSIC)
+            assert music_folder is not None
+        except (TypeError, AssertionError):
+            print("XDG Music dir is not set")
+            return
+
+        music_folder = Tracker.sparql_escape_string(
+            GLib.filename_to_uri(music_folder))
+
         href_text = "<a href='{}'>{}</a>".format(
-            Query.MUSIC_URI, _("Music folder"))
+            music_folder, _("Music folder"))
 
         # TRANSLATORS: This is a label to display a link to open user's music
         # folder. {} will be replaced with the translated text 'Music folder'
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bb9adcef..9dfde76f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,6 @@ gnomemusic/grilowrappers/grltrackerplaylist.py
 gnomemusic/gstplayer.py
 gnomemusic/inhibitsuspend.py
 gnomemusic/mpris.py
-gnomemusic/query.py
 gnomemusic/utils.py
 gnomemusic/views/albumsview.py
 gnomemusic/views/artistsview.py


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]