windows version prepared

musicbot/file.py

@@ -96,7 +96,7 @@ def music(self) -> Music | None:
             return None
         folder = Folder(
             name=str(self.folder),
-            path=str(self.path),
+            path=self.path,
             username=current_user(),
             ipv4=public_ip,
         )

musicbot/folder.py

@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 from dataclasses import dataclass
 
 from beartype import beartype
@@ -13,7 +13,7 @@ class Folder(MusicbotObject):
     name: str
     ipv4: str
     username: str
-    path: str
+    path: Path
 
     n_genres: int = 0
     all_genres: str = ""
@@ -33,9 +33,10 @@ def __repr__(self) -> str:
         return f"{self.name} {self.ipv4} {self.username}"
 
     def effective_path(self, relative: bool = False) -> str:
+        path = str(self.path)
         if relative:
-            return self.path[len(self.name) + 1 :]
-        return self.path
+            path = str(self.path.relative_to(self.name))
+        return path.replace(" ", "\ ")
 
     def http_link(self, relative: bool = False) -> str:
         return f"http://{self.ipv4}/{self.effective_path(relative)}"
@@ -48,27 +49,27 @@ def remote_ssh_link(self) -> str:
 
     def links(self, playlist_options: PlaylistOptions) -> frozenset[str]:
         paths = []
-        if "all" in playlist_options.kinds:
-            return frozenset({self.local_ssh_link(), self.remote_ssh_link(), self.http_link(playlist_options.relative), self.effective_path(playlist_options.relative)})
 
         # if "local-ssh" in playlist_options.kinds and self.ipv4 == self.public_ip():
-        if "local-ssh" in playlist_options.kinds:
+        if "all" in playlist_options.kinds or "local-ssh" in playlist_options.kinds:
             paths.append(self.local_ssh_link())
 
         # if "remote-ssh" in playlist_options.kinds and self.ipv4 != self.public_ip():
-        if "remote-ssh" in playlist_options.kinds:
+        if "all" in playlist_options.kinds or "remote-ssh" in playlist_options.kinds:
             paths.append(self.remote_ssh_link())
 
         # if "local-http" in playlist_options.kinds and self.ipv4 == self.public_ip():
-        if "local-http" in playlist_options.kinds:
+        if "all" in playlist_options.kinds or "local-http" in playlist_options.kinds:
             paths.append(self.http_link(playlist_options.relative))
 
         # if "remote-http" in playlist_options.kinds and self.ipv4 != self.public_ip():
-        if "remote-http" in playlist_options.kinds:
+        if "all" in playlist_options.kinds or "remote-http" in playlist_options.kinds:
             paths.append(self.http_link(playlist_options.relative))
 
-        if "local" in playlist_options.kinds and os.path.isfile(self.path):
+        if "all" in playlist_options.kinds or "local" in playlist_options.kinds and self.path.is_file():
             paths.append(self.effective_path(playlist_options.relative))
-        if "remote" in playlist_options.kinds and not os.path.isfile(self.path):
+
+        if "all" in playlist_options.kinds or "remote" in playlist_options.kinds and not self.path.is_file():
             paths.append(self.effective_path(playlist_options.relative))
+
         return frozenset(paths)

musicbot/musicdb.py

@@ -188,7 +188,7 @@ async def upsert_path(
                 result = await upsert(self.client, **input_music)
 
                 keywords = frozenset(keyword.name for keyword in result.keywords)
-                folders = [Folder(path=folder.path, name=folder.name, ipv4=folder.ipv4, username=folder.username) for folder in result.folders if folder.path is not None]
+                folders = [Folder(path=Path(folder.path), name=folder.name, ipv4=folder.ipv4, username=folder.username) for folder in result.folders if folder.path is not None]
                 output_music = Music(
                     title=result.name,
                     artist=result.artist.name,

musicbot/playlist.py

@@ -3,6 +3,7 @@
 import random
 from codecs import StreamReaderWriter
 from dataclasses import asdict, dataclass
+from pathlib import Path
 from typing import Self
 
 import click
@@ -49,8 +50,8 @@ def from_edgedb(
         musics = []
         for result in results:
             keywords = frozenset(keyword.name for keyword in result.keywords)
-            # folders = frozenset(Folder(path=folder["@path"], name=folder.name, ipv4=folder.ipv4, username=folder.username) for folder in result.folders)
-            folders = frozenset(Folder(path=folder.path, name=folder.name, ipv4=folder.ipv4, username=folder.username) for folder in result.folders)
+            # folders = frozenset(Folder(path=Path(folder["@path"]), name=folder.name, ipv4=folder.ipv4, username=folder.username) for folder in result.folders)
+            folders = frozenset(Folder(path=Path(folder.path), name=folder.name, ipv4=folder.ipv4, username=folder.username) for folder in result.folders)
             music = Music(
                 title=result.name,
                 artist=result.artist.name,