Merge branch 'dev' of https://github.com/jvlflame/JAV-Organizer into dev

javinizer · Oct 3, 2020 · 9032a27 · 9032a27
2 parents 0414e2c + 4e02b01
commit 9032a27
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -570,6 +570,7 @@ For example, if your jvGenres.csv file looks like this:
 | `sort.metadata.nfo.format.tagline` | Specifies the format string to add a tagline to the aggregated data object | [Format Strings](#Metadata-Format-Strings)
 | `sort.metadata.nfo.actresslanguageja` | Specifies to prefer Japanese names when creating the metadata nfo. | 0, 1
 | `sort.metadata.nfo.unknownactress` | Specifies to add an 'Unknown' actress to scraped movies without any actresses | 0, 1
+| `sort.metadata.nfo.originalpath` | Specifies to add an 'originalpath' field to the nfo specifying the location the movie was last sorted from | 0, 1
 | `sort.metadata.thumbcsv` | Specifies to use the thumbnail csv when aggregating metadata. | 0, 1
 | `sort.metadata.thumbcsv.autoadd` | Specifies to automatically add missing actresses to the thumbnail csv when scraping using the R18 or R18Zh scrapers. | 0, 1
 | `sort.metadata.thumbcsv.convertalias` | Specifies to use the thumbnail csv alias field to replace actresses in the metadata. | 0, 1

diff --git a/src/Javinizer/Private/Test-JVSettings.ps1 b/src/Javinizer/Private/Test-JVSettings.ps1
@@ -94,6 +94,7 @@ function Test-JVSettings {
             'sort.metadata.nfo.actresslanguageja',
             'sort.metadata.nfo.firstnameorder',
             'sort.metadata.nfo.translatedescription',
+            'sort.metadata.nfo.originalpath',
             'sort.metadata.thumbcsv.convertalias',
             'sort.metadata.thumbcsv.autoadd',
             'sort.metadata.thumbcsv',

diff --git a/src/Javinizer/Public/Get-JVNfo.ps1 b/src/Javinizer/Public/Get-JVNfo.ps1
@@ -79,7 +79,10 @@ function Get-JVNfo {
         [Boolean]$ActressLanguageJa,
 
         [Parameter()]
-        [Boolean]$NameOrder
+        [Boolean]$NameOrder,
+
+        [Parameter()]
+        [String]$OriginalPath
     )
 
     process {
@@ -128,6 +131,15 @@ function Get-JVNfo {
 
 "@
 
+        if ($OriginalPath) {
+            $originalPathNfoString = @"
+    <originalpath>$OriginalPath</originalpath>
+
+"@
+            $nfoString = $nfoString + $originalPathNfoString
+
+        }
+
         foreach ($item in $Tag) {
             $tagNfoString = @"
     <tag>$item</tag>

diff --git a/src/Javinizer/Public/Set-JVMovie.ps1 b/src/Javinizer/Public/Set-JVMovie.ps1
@@ -108,13 +108,17 @@ function Set-JVMovie {
         [Alias('sort.metadata.nfo.firstnameorder')]
         [Boolean]$FirstNameOrder,
 
-        [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')]
+        [Parameter(ValueFromPipelineByPropertyName = $true)]
         [Alias('sort.format.delimiter')]
         [String]$DelimiterFormat,
 
-        [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')]
+        [Parameter(ValueFromPipelineByPropertyName = $true)]
         [Alias('sort.metadata.nfo.actresslanguageja')]
-        [Boolean]$ActressLanguageJa
+        [Boolean]$ActressLanguageJa,
+
+        [Parameter(ValueFromPipelineByPropertyName = $true)]
+        [Alias('sort.metadata.nfo.originalpath')]
+        [Boolean]$OriginalPath
     )
 
     begin {
@@ -151,6 +155,7 @@ function Set-JVMovie {
             $FirstNameOrder = $Settings.'sort.metadata.nfo.firstnameorder'
             $DelimiterFormat = $Settings.'sort.format.delimiter'
             $ActressLanguageJa = $Settings.'sort.metadata.nfo.actresslanguageja'
+            $OriginalPath = $Settings.'sort.metadata.nfo.originalpath'
         }
 
         if ($RenameFile) {
@@ -215,7 +220,11 @@ function Set-JVMovie {
             if ($CreateNfo) {
                 try {
                     $nfoPath = Join-Path -Path $folderPath -ChildPath "$nfoName.nfo"
-                    $nfoContents = $Data | Get-JVNfo -NameOrder $FirstNameOrder -ActressLanguageJa:$ActressLanguageJa
+                    if ($OriginalPath) {
+                        $nfoContents = $Data | Get-JVNfo -NameOrder $FirstNameOrder -ActressLanguageJa:$ActressLanguageJa -OriginalPath:$Path
+                    } else {
+                        $nfoContents = $Data | Get-JVNfo -NameOrder $FirstNameOrder -ActressLanguageJa:$ActressLanguageJa
+                    }
                     $nfoContents | Out-File -LiteralPath $nfoPath -Force:$Force
                     Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$($Data.Id)] [$($MyInvocation.MyCommand.Name)] [Nfo] created at path [$nfoPath]"
                 } catch {

diff --git a/src/Javinizer/jvSettings.json b/src/Javinizer/jvSettings.json
@@ -63,6 +63,7 @@
     "sort.metadata.nfo.firstnameorder": 0,
     "sort.metadata.nfo.actresslanguageja": 0,
     "sort.metadata.nfo.unknownactress": 1,
+    "sort.metadata.nfo.originalpath": 0,
     "sort.metadata.nfo.format.tag": ["<SET>"],
     "sort.metadata.nfo.format.tagline": "",
     "sort.metadata.thumbcsv": 1,