windows version prepared (2)

musicbot/file.py

@@ -128,7 +128,7 @@ def music_input(self) -> dict[str, Any] | None:
         data["ipv4"] = folder.ipv4
         data["username"] = folder.username
         data["folder"] = folder.name
-        data["path"] = folder.path
+        data["path"] = str(folder.path)
         return data
 
     def set_tags(

musicbot/folder.py

@@ -1,5 +1,5 @@
+from dataclasses import asdict, dataclass
 from pathlib import Path
-from dataclasses import dataclass
 
 from beartype import beartype
 
@@ -32,11 +32,16 @@ class Folder(MusicbotObject):
     def __repr__(self) -> str:
         return f"{self.name} {self.ipv4} {self.username}"
 
+    def to_dict(self) -> dict:
+        data = asdict(self)
+        data["path"] = str(data["path"])
+        return data
+
     def effective_path(self, relative: bool = False) -> str:
         path = str(self.path)
         if relative:
             path = str(self.path.relative_to(self.name))
-        return path.replace(" ", "\ ")
+        return path.replace(" ", "\\ ")
 
     def http_link(self, relative: bool = False) -> str:
         return f"http://{self.ipv4}/{self.effective_path(relative)}"

musicbot/music.py

@@ -34,7 +34,7 @@ def human_repr(self) -> str:
         data: dict[str, Any] = asdict(self)
         data["size"] = bytes_to_human(data["size"])
         data["length"] = precise_seconds_to_human(data["length"])
-        data["folders"] = list(asdict(folder) for folder in data["folders"])
+        data["folders"] = list(folder.to_dict() for folder in data["folders"])
         data["keywords"] = list(data["keywords"])
         return yaml_dump(data)
 

musicbot/musicdb.py

@@ -93,7 +93,7 @@ async def folders(self) -> list[Folder]:
         folders = []
         for result in results:
             folder = Folder(
-                path=result.name,
+                path=Path(result.name),
                 name=result.name,
                 ipv4=result.ipv4,
                 username=result.username,

musicbot/object.py

@@ -10,6 +10,7 @@
 import traceback
 from collections.abc import Callable, Collection, Iterable, Sequence
 from datetime import datetime
+from pathlib import Path
 from typing import IO, Any, NoReturn, ParamSpec, TypeVar
 
 import attr
@@ -36,6 +37,8 @@ def default_encoder(data: Any) -> Any:
     """Encode in json structure which cannot"""
     if isinstance(data, (frozenset, set)):
         return list(data)
+    if isinstance(data, Path):
+        return str(data)
     if dataclasses.is_dataclass(data):
         return dataclasses.asdict(data)
     # if isinstance(data, CaseInsensitiveDict):