christen: prevent utf8 slash from turning into subfolders

chapmanjacobd · Mar 4, 2025 · a781094 · a781094
1 parent 49ecda8
commit a781094
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/library/playback/torrents_info.py b/library/playback/torrents_info.py
@@ -549,13 +549,12 @@ def set_download_path(t):
         qbt_client.torrents_recheck(torrent_hashes=torrent_hashes)
 
     if args.export:
-        print("Exporting", len(torrents))
         p = Path("exported_torrents")
         p.mkdir(exist_ok=True)
         for idx, t in enumerate(torrents):
             printing.print_overwrite("Exporting", idx + 1, "of", len(torrents), "to", p)
 
-            file_name = f"{t.tracker_domain()}_{t.name}_{t.hash}.torrent".replace("/", "-").replace("\\", "-")
+            file_name = f"{t.tracker_domain()}_{t.name}_{t.hash}.torrent"
             file_name = path_utils.clean_path(file_name.encode())
             (p / file_name).write_bytes(qbt_client.torrents_export(torrent_hash=t.hash))
 

diff --git a/library/utils/path_utils.py b/library/utils/path_utils.py
@@ -39,7 +39,6 @@ def clean_path(b, max_name_len=255, dot_space=False, case_insensitive=False, low
     import ftfy
 
     p = b.decode("utf-8", "backslashreplace")
-    p = ftfy.fix_text(p, explain=False)
     path = Path(p)
     ext = path.suffix
 
@@ -55,6 +54,10 @@ def clean_path(b, max_name_len=255, dot_space=False, case_insensitive=False, low
     stem = strings.clean_string(path.stem)
     # log.debug("cleaned %s %s", parent, stem)
 
+    parent = [ftfy.fix_text(s, explain=False) for s in parent]
+    stem = ftfy.fix_text(stem, explain=False)
+    # log.debug("ftfy %s %s", parent, stem)
+
     parent = [strings.remove_prefixes(part, [" ", "-"]) for part in parent]
     # log.debug("parent_prefixes %s %s", parent, stem)
     parent = [strings.remove_suffixes(part, [" ", "-", "_", "."]) for part in parent]

diff --git a/library/utils/strings.py b/library/utils/strings.py
@@ -137,8 +137,15 @@ def clean_string(p) -> str:
         .replace(":", "")
         .replace(">", "")
         .replace("<", "")
-        .replace("\\", "")
-        .replace("/", "")
+        .replace("\\", " ")
+        .replace("/", " ")
+        .replace("／", " ")
+        .replace("∕", " ")
+        .replace("⁄", " ")
+        .replace("﹨", " ")
+        .replace("＼", " ")
+        .replace("∖", " ")
+        .replace("﹨", " ")
     )
     p = remove_consecutives(p, chars=["."])
     p = (

diff --git a/tests/utils/test_path_utils.py b/tests/utils/test_path_utils.py
@@ -52,7 +52,7 @@ def test_clean_path():
     if consts.IS_WINDOWS:
         assert path_utils.clean_path(b"test/\xff\xfeH") == utils.p("test\\xff\\xfeH")
     else:
-        assert path_utils.clean_path(b"test/\xff\xfeH") == utils.p("test/xffxfeH")
+        assert path_utils.clean_path(b"test/\xff\xfeH") == utils.p("test/xff xfeH")
 
 
 @mock.patch("library.utils.consts.random_string", return_value="abcdef")