Merge pull request #257 from jvlflame/dev

2.4.9
javinizer · Apr 5, 2021 · e930d29 · e930d29
2 parents 2ab4eff + 2977648
commit e930d29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,11 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.4.9]
+
+### Fixed
+- Fixed setting `sort.metadata.nfo.preferactressalias` on JAVLibrary titles with only single actress (#219)
+
 ## [2.4.8]
 
 ### Added
 - Added `EnglishAlias` and `JapaneseAlias` properties to JAVLibrary scraper output
-- Setting `sort.metadata.nfo.preferactressalias` added to replace the default actress with the oldest alias in the aggregated metadata
+- Setting `sort.metadata.nfo.preferactressalias` added to replace the default actress with the oldest alias in the aggregated metadata (#219)
     - This can be used to "normalize" your actresses if you use JAVLibrary as your primary actress metadata
 ### Fixed
 - Various fixes to regex matcher which were altering results

diff --git a/src/Javinizer/Javinizer.psd1 b/src/Javinizer/Javinizer.psd1
@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.4.8'
+    ModuleVersion     = '2.4.9'
 
     # Supported PSEditions
     # CompatiblePSEditions = @('Core')

diff --git a/src/Javinizer/Public/Get-JVAggregatedData.ps1 b/src/Javinizer/Public/Get-JVAggregatedData.ps1
@@ -587,9 +587,8 @@ function Get-JVAggregatedData {
         }
 
         if ($PreferActressAlias) {
+            $originalActress = ($Data | Where-Object { $_.Source -eq $selectedDataObject.Actress }).Actress
             if ($aggregatedDataObject.Actress.Count -gt 1) {
-                $originalActress = ($Data | Where-Object { $_.Source -eq $selectedDataObject.Actress }).Actress
-                $originalActress | Out-String | Write-Debug
                 for ($x = 0; $x -lt $aggregatedDataObject.Actress.Count; $x++) {
                     if ($originalActress[$x].EnglishAlias.Count -gt 1) {
                         $aggregatedDataObject.Actress[$x].FirstName = $originalActress[$x].EnglishAlias[-1].FirstName
@@ -605,14 +604,14 @@ function Get-JVAggregatedData {
                 }
             } elseif ($aggregatedDataObject.Actress.Count -eq 1) {
                 if ($originalActress.EnglishAlias.Count -gt 1) {
-                    $aggregatedDataObject.Actress.FirstName = $originalActress.EnglishAlias[-1].FirstName
-                    $aggregatedDataObject.Actress.LastName = $originalActress.EnglishAlias[-1].LastName
-                    $aggregatedDataObject.Actress.JapaneseName = $originalActress.EnglishAlias[-1].JapaneseName
+                    $aggregatedDataObject.Actress[0].FirstName = $originalActress.EnglishAlias[-1].FirstName
+                    $aggregatedDataObject.Actress[0].LastName = $originalActress.EnglishAlias[-1].LastName
+                    $aggregatedDataObject.Actress[0].JapaneseName = $originalActress.EnglishAlias[-1].JapaneseName
                 } else {
-                    if ($originalActress.Alias) {
-                        $aggregatedDataObject.Actress.FirstName = $originalActress.EnglishAlias.FirstName
-                        $aggregatedDataObject.Actress.LastName = $originalActress.EnglishAlias.LastName
-                        $aggregatedDataObject.Actress.JapaneseName = $originalActress.JapaneseAlias.JapaneseName
+                    if ($originalActress.EnglishAlias) {
+                        $aggregatedDataObject.Actress[0].FirstName = $originalActress.EnglishAlias.FirstName
+                        $aggregatedDataObject.Actress[0].LastName = $originalActress.EnglishAlias.LastName
+                        $aggregatedDataObject.Actress[0].JapaneseName = $originalActress.JapaneseAlias.JapaneseName
                     }
                 }
             }

diff --git a/src/Javinizer/Universal/Repository/javinizergui.ps1 b/src/Javinizer/Universal/Repository/javinizergui.ps1
@@ -1,4 +1,4 @@
-$cache:guiVersion = '2.4.8-1'
+$cache:guiVersion = '2.4.9-1'
 
 # Define Javinizer module file paths
 $cache:modulePath = (Get-InstalledModule -Name Javinizer).InstalledLocation