From 03e321f6e159fdfc9e684172114193105591c1a0 Mon Sep 17 00:00:00 2001 From: jvlflame Date: Tue, 1 Sep 2020 01:56:24 -0700 Subject: [PATCH] Fix file declarations --- src/Javinizer/Public/Get-JVAggregatedData.ps1 | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Javinizer/Public/Get-JVAggregatedData.ps1 b/src/Javinizer/Public/Get-JVAggregatedData.ps1 index 43ff5404..5b1757db 100644 --- a/src/Javinizer/Public/Get-JVAggregatedData.ps1 +++ b/src/Javinizer/Public/Get-JVAggregatedData.ps1 @@ -81,7 +81,7 @@ function Get-JVAggregatedData { [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] [Alias('sort.metadata.thumbcsv.path')] - [Boolean]$ThumbCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvThumbs.csv'), + [System.IO.FileInfo]$ThumbCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvThumbs.csv'), [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] [Alias('sort.metadata.thumbcsv.convertalias')] @@ -93,7 +93,7 @@ function Get-JVAggregatedData { [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] [Alias('sort.metadata.genrecsv.path')] - [Boolean]$GenreCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvGenres.csv'), + [System.IO.FileInfo]$GenreCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvGenres.csv'), [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] [Alias('sort.metadata.genre.ignore')] @@ -136,16 +136,12 @@ function Get-JVAggregatedData { $IgnoreGenre = $Settings.'sort.metadata.genre.ignore' $Translate = $Settings.'sort.metadata.nfo.translate' $TranslateLanguage = $Settings.'sort.metadata.nfo.translate.language' - $GenreCsvPath = $Settings.'sort.metadata.genrecsv.path' - $ThumbCsvPath = $Settings.'sort.metadata.thumbcsv.path' - } - - if ($ThumbCsvPath -eq '') { - $ThumbCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvThumbs.csv') - } - - if ($GenreCsvPath -eq '') { - $GenreCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvGenres.csv') + if ($Settings.'sort.metadata.genrecsv.path' -ne '') { + $GenreCsvPath = $Settings.'sort.metadata.genrecsv.path' + } + if ($Settings.'sort.metadata.thumbcsv.path' -ne '') { + $ThumbCsvPath = $Settings.'sort.metadata.genrecsv.path' + } } $aggregatedDataObject = [PSCustomObject]@{