Fix possible weird duplicated path on Windows

I really forgot that common_tv and common_movie will also handle categorization, wth.
nattadasu · Jul 27, 2024 · f1f7aa5 · f1f7aa5
1 parent d2f46af
commit f1f7aa5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -17,10 +17,6 @@ favor of my personal preference, and might be not suitable for you.
 
 However, the most important files were:
 
-* Anything that starts with `_posix` or `_windows` are the main scripts, defines
-  how the file will be stored. By default it's on `{default_drive}/{media_type}`
-  (e.g. `D:\Videos`, or `/mnt/drive/Music`, where `Videos` and `Music` are
-  media types). `{default_drive}` behavior will be explained below.
 * `filepath_posix.groovy` and `filepath_windows.groovy` are the scripts that
   handles <u>(default) drive logic</u>. By default, it tries to find the drive
   that have most free space, and if it's not found, it will use the default

diff --git a/_posix_movie.groovy b/_posix_movie.groovy
@@ -1,3 +1,2 @@
 @./filepath_posix.groovy
-Videos/
-@./common_movie.groovy
+@./common_movie.groovy
diff --git a/_posix_music_shared.groovy b/_posix_music_shared.groovy
@@ -1,4 +1,3 @@
 {/* This script is dedicated to be used to share their music files with other users. */}
 @./filepath_posix.groovy
-Torrent Uploads/
-@./common_music_shared.groovy
+@./common_music_shared.groovy
diff --git a/_posix_tv.groovy b/_posix_tv.groovy
@@ -1,3 +1,2 @@
 @./filepath_posix.groovy
-Videos/
-@./common_tv.groovy
+@./common_tv.groovy
diff --git a/_windows_movie.groovy b/_windows_movie.groovy
@@ -1,3 +1,2 @@
 @./filepath_windows.groovy
-Videos/
-@./common_movie.groovy
+@./common_movie.groovy
diff --git a/_windows_music_shared.groovy b/_windows_music_shared.groovy
@@ -1,4 +1,3 @@
 {/* This script is dedicated to be used to share their music files with other users. */}
 @./filepath_posix.groovy
-Torrent Uploads/
-@./common_music_shared.groovy
+@./common_music_shared.groovy
diff --git a/_windows_tv.groovy b/_windows_tv.groovy
@@ -1,3 +1,2 @@
 @./filepath_windows.groovy
-Videos/
-@./common_tv.groovy
+@./common_tv.groovy
diff --git a/common_music_shared.groovy b/common_music_shared.groovy
@@ -1,3 +1,4 @@
+Torrent Uploads/
 {ext.upper()}/
 {y}/
 [
@@ -8,4 +9,4 @@
 ]
 {media.CATALOGNUMBER ? "[" + media.CATALOGNUMBER + "]" : ""}/
 {dc? di + "-": ""}{pi.pad(2)} {t}
-{media.ISRC ? " [" + media.ISRC + "]" : ""}
+{media.ISRC ? " [" + media.ISRC + "]" : ""}
diff --git a/filepath_posix.groovy b/filepath_posix.groovy
@@ -5,7 +5,7 @@
     def mntp = "/run/media/$user"
 
     //! OVERRIDE THIS PATH IF NEEDED, ELSE, BLANK IT ("")
-    def override = "$mntp"
+    def override = "$mntp/Videos"
 
     def guess = [
         home,