media: fix non-local playlists query

Author: chapmanjacobd

library/mediadb/db_media.py

@@ -415,7 +415,7 @@ def func_sort_key(sort_key):
         @strings.output_filter(ignore_pattern)
         def fn_key(d):
             if sort_key in ("parent", "stem", "ps", "pts"):
-                path = Path(d["path"])
+                path = Path(d.get("path") or "")
 
                 if sort_key == "parent":
                     return path.parent
@@ -533,7 +533,7 @@ def get_playlist_media(args, playlist_paths) -> list[dict]:
         + ",".join(f":playlist{i}" for i, _ in enumerate(playlist_paths))
         + "))"
     )
-    playlists_params = {f"playlist{i}": str(Path(p).resolve()) for i, p in enumerate(playlist_paths)}
+    playlists_params = {f"playlist{i}": p for i, p in enumerate(playlist_paths)}
 
     query = f"""WITH m as (
             SELECT

library/playback/play_actions.py

@@ -403,7 +403,7 @@ def process_playqueue(args) -> None:
             processes.no_media_found()
 
         path = " ".join(args.include)
-        media = db_media.get_playlist_media(args, [path])
+        media = db_media.get_playlist_media(args, [path if path.startswith("http") else str(Path(path).resolve())])
         if not media and os.path.exists(path):
             media = db_media.get_dir_media(args, [path])
         if not media and os.path.exists(args.include[0]):

library/utils/path_utils.py

@@ -399,18 +399,21 @@ def gen_rel_path(source: str, dest: str, relative_to):
 
     if relative_to:
         if str(relative_to).startswith("::") and dest.strip(os.sep) in source:
-            rel = source.split(dest.strip(os.sep), 1)[0]
-            rel = Path(rel, dest.strip(os.sep), str(relative_to).lstrip(":").lstrip(os.sep)).resolve()
+            rel_to = source.split(dest.strip(os.sep), 1)[0]
+            rel_to = Path(rel_to, dest.strip(os.sep), str(relative_to).lstrip(":").lstrip(os.sep)).resolve()
         elif str(relative_to).startswith(":"):
-            rel = os.path.commonpath([abspath, dest])
-            rel = Path(rel, str(relative_to).lstrip(":").lstrip(os.sep)).resolve()
+            rel_to = os.path.commonpath([abspath, dest])
+            rel_to = Path(rel_to, str(relative_to).lstrip(":").lstrip(os.sep)).resolve()
         else:
-            rel = Path(relative_to).expanduser().resolve()
+            rel_to = Path(relative_to).expanduser().resolve()
 
-        log.debug("rel %s", rel)
+        if not rel_to:
+            rel_to = mountpoint(abspath)
+
+        log.debug("rel_to %s", rel_to)
         try:
-            relpath = abspath.relative_to(rel)
-            log.debug("abspath %s relative to %s = %s", abspath, rel, relpath)
+            relpath = abspath.relative_to(rel_to)
+            log.debug("abspath %s relative to %s = %s", abspath, rel_to, relpath)
         except ValueError:
             relpath = relativize(abspath)
             log.debug("ValueError using abspath %s", relpath)