Add nested output folder (#136)

javinizer · Oct 18, 2020 · 3bd7d72 · 3bd7d72
1 parent c2f1e84
commit 3bd7d72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/Javinizer/Private/Test-JVSettings.ps1 b/src/Javinizer/Private/Test-JVSettings.ps1
@@ -140,6 +140,7 @@ function Test-JVSettings {
         $arraySettings = @(
             'match.excludedfilestring',
             'match.includedfileextension',
+            "sort.format.outputfolder",
             'sort.format.posterimg',
             'sort.metadata.genre.ignore',
             'sort.metadata.nfo.format.tag',

diff --git a/src/Javinizer/Public/Set-JVMovie.ps1 b/src/Javinizer/Public/Set-JVMovie.ps1
@@ -74,7 +74,7 @@ function Set-JVMovie {
 
         [Parameter(ValueFromPipelineByPropertyName = $true)]
         [Alias('sort.format.outputfolder')]
-        [String]$OutputFolderFormat,
+        [Array]$OutputFolderFormat,
 
         [Parameter(ValueFromPipelineByPropertyName = $true)]
         [Alias('sort.format.posterimg')]
@@ -179,7 +179,11 @@ function Set-JVMovie {
             $fileName = (Get-Item -LiteralPath $Path).BaseName
         }
         if ($outputFolderFormat -ne '') {
-            $outputFolderName = Convert-JVstring -Data $Data -Format $OutputFolderFormat -MaxTitleLength $MaxTitleLength -Delimiter $DelimiterFormat -ActressLanguageJa:$ActressLanguageJa -FirstNameOrder:$FirstNameOrder -GroupActress:$GroupActress
+            $outputFolders = @()
+            foreach ($format in $outputFolderFormat) {
+                $outputFolders += Convert-JVstring -Data $Data -Format $format -MaxTitleLength $MaxTitleLength -Delimiter $DelimiterFormat -ActressLanguageJa:$ActressLanguageJa -FirstNameOrder:$FirstNameOrder -GroupActress:$GroupActress
+            }
+            $outputFolderName = $outputFolders -join '/'
         }
         $folderName = Convert-JVString -Data $Data -Format $FolderFormat -MaxTitleLength $MaxTitleLength -Delimiter $DelimiterFormat -ActressLanguageJa:$ActressLanguageJa -FirstNameOrder:$FirstNameOrder -GroupActress:$GroupActress
         $thumbName = Convert-JVString -Data $Data -Format $ThumbnailFormat -MaxTitleLength $MaxTitleLength -Delimiter $DelimiterFormat -ActressLanguageJa:$ActressLanguageJa -FirstNameOrder:$FirstNameOrder -GroupActress:$GroupActress

diff --git a/src/Javinizer/jvSettings.json b/src/Javinizer/jvSettings.json
@@ -50,7 +50,7 @@
     "sort.format.delimiter": ", ",
     "sort.format.file": "<ID>",
     "sort.format.folder": "<ID> [<STUDIO>] - <TITLE> (<YEAR>)",
-    "sort.format.outputfolder": "",
+    "sort.format.outputfolder": [],
     "sort.format.posterimg": ["folder"],
     "sort.format.thumbimg": "fanart",
     "sort.format.trailervid": "<ID>-trailer",