Add output for missing required fields after sort fail

javinizer · Sep 4, 2020 · 59f185f · 59f185f
1 parent 7f453bf
commit 59f185f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/Javinizer/Private/Test-JVData.ps1 b/src/Javinizer/Private/Test-JVData.ps1
@@ -22,12 +22,16 @@ function Test-JVData {
             $nullFields = $nullFields -join ', '
         }
 
-        if ($errors -eq 0) {
-            $dataObject = [PSCustomObject]@{
-                Data = $Data
-            }
+        if ($nullFields.Count -eq 0) {
+            $nullFields = $null
+        }
 
-            Write-Output $dataObject
+        $dataObject = [PSCustomObject]@{
+            Data       = $Data
+            NullFields = $nullFields
         }
+
+        Write-Output $dataObject
+
     }
 }
diff --git a/src/Javinizer/Public/Javinizer.ps1 b/src/Javinizer/Public/Javinizer.ps1
@@ -567,7 +567,7 @@ function Javinizer {
                         return
                     }
 
-                    $javData = Get-JVData  -Url $Url -Settings $Settings
+                    $javData = Get-JVData -Url $Url -Settings $Settings
                     if ($null -ne $javData) {
                         $javAggregatedData = $javData | Get-JVAggregatedData -Settings $Settings | Test-JVData -RequiredFields $Settings.'sort.metadata.requiredfield'
                         if ($null -ne $javAggregatedData) {
@@ -594,10 +594,10 @@ function Javinizer {
                             $javData = Get-JVData -Id $movie.Id -Settings $Settings
                             if ($null -ne $javData) {
                                 $javAggregatedData = $javData | Get-JVAggregatedData -Settings $Settings | Test-JVData -RequiredFields $Settings.'sort.metadata.requiredfield'
-                                if ($null -ne $javAggregatedData) {
+                                if ($javAggregatedData.NullFields -eq '') {
                                     $javAggregatedData | Set-JVMovie -Path $movie.FullName -DestinationPath $DestinationPath -Settings $Settings -PartNumber $movie.Partnumber -Force:$Force
                                 } else {
-                                    Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Warning -Message "[$($movie.FileName)] Skipped -- missing required metadata fields"
+                                    Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Warning -Message "[$($movie.FileName)] Skipped -- missing required fields [$($javAggregatedData.NullFields)]"
                                     return
                                 }
                             } else {