query: fix default value type for fs paths. Fixes #2142

quodlibet · Dec 17, 2016 · 47d50be · 47d50be
1 parent 60a2f00
commit 47d50be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/quodlibet/quodlibet/query/_match.py b/quodlibet/quodlibet/query/_match.py
@@ -471,11 +471,13 @@ def __init__(self, names, res):
                 self._names.append(name)
 
     def search(self, data):
+        fs_default = fsnative()
+
         for name in self._names:
             val = data.get(name)
             if val is None:
                 if name in ("filename", "mountpoint"):
-                    val = fsn2text(data.get("~" + name, fsnative()))
+                    val = fsn2text(data.get("~" + name, fs_default))
                 else:
                     val = data.get("~" + name, "")
 
@@ -487,7 +489,7 @@ def search(self, data):
                 return True
 
         for name in self.__fs:
-            if self.res.search(fsn2text(data(name))):
+            if self.res.search(fsn2text(data(name, fs_default))):
                 return True
 
         return False

diff --git a/quodlibet/tests/test_query.py b/quodlibet/tests/test_query.py
@@ -396,6 +396,10 @@ def test_mountpoint_utf8_fallback(self):
         self.failUnless(Query(u"mountpoint=foü").search(self.s3))
         self.failUnless(Query(u"mountpoint=öä").search(self.s3))
 
+    def test_mountpoint_no_value(self):
+        af = AudioFile({"~filename": fsnative(u"foo")})
+        assert not Query(u"~mountpoint=bla").search(af)
+
     def test_star_numeric(self):
         self.assertRaises(ValueError, Query, u"foobar", star=["~#mtime"])