From 6fa2ccb94e6e5d7c162733db7dc3eb5c4b60fb04 Mon Sep 17 00:00:00 2001 From: Seeyabye Date: Sat, 26 Sep 2020 17:38:40 +0900 Subject: [PATCH 1/5] Convert DMM's ContentID to standard ID --- src/Javinizer/Private/Scraper.Dmm.ps1 | 22 ++++++++++++++++++++++ src/Javinizer/Public/Get-DmmData.ps1 | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/Javinizer/Private/Scraper.Dmm.ps1 b/src/Javinizer/Private/Scraper.Dmm.ps1 index 6c31759e..4af18ad4 100644 --- a/src/Javinizer/Private/Scraper.Dmm.ps1 +++ b/src/Javinizer/Private/Scraper.Dmm.ps1 @@ -14,6 +14,28 @@ function Get-DmmContentId { } } +function Get-DmmId { + param ( + [Parameter(Mandatory = $true, Position = 0, ValueFromPipeline = $true)] + [Object]$Webrequest + ) + + process { + try { + # Expects ###ID##### or ID##### + $contentId = Get-DmmContentId $Webrequest + $Id = $contentId + $m = ($contentId | Select-String -Pattern '\d*([a-z]+)(\d+)$' -AllMatches).Matches + if($m.Groups.Count -gt 2 -and $m.Groups[1] -and $m.Groups[2]) { + $Id = $m.Groups[1].Value.ToUpper() + "-" + ($m.Groups[2].Value -replace '^0{1,5}', '').PadLeft(3, '0') + } + } catch { + return + } + Write-Output $Id + } +} + function Get-DmmTitle { param ( [Parameter(Mandatory = $true, Position = 0, ValueFromPipeline = $true)] diff --git a/src/Javinizer/Public/Get-DmmData.ps1 b/src/Javinizer/Public/Get-DmmData.ps1 index 1ce71407..53ad44ff 100644 --- a/src/Javinizer/Public/Get-DmmData.ps1 +++ b/src/Javinizer/Public/Get-DmmData.ps1 @@ -44,7 +44,8 @@ function Get-DmmData { $movieDataObject = [PSCustomObject]@{ Source = if ($Url -match '/en/') { 'dmm' } else { 'dmmja' } Url = $Url - Id = Get-DmmContentId -WebRequest $webRequest + Id = Get-DmmId -WebRequest $webRequest + ContentId = Get-DmmContentId -WebRequest $webRequest Title = Get-DmmTitle -WebRequest $webRequest Description = Get-DmmDescription -WebRequest $webRequest ReleaseDate = Get-DmmReleaseDate -WebRequest $webRequest From 7b22c4419c76b4fc9f8ea4fe31b1c82c4a523739 Mon Sep 17 00:00:00 2001 From: Seeyabye Date: Sun, 27 Sep 2020 14:03:14 +0900 Subject: [PATCH 2/5] Fixed regex for ID with suffix --- src/Javinizer/Private/Scraper.Dmm.ps1 | 5 +++-- src/Javinizer/Public/Get-DmmData.ps1 | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Javinizer/Private/Scraper.Dmm.ps1 b/src/Javinizer/Private/Scraper.Dmm.ps1 index 4af18ad4..2dc8e113 100644 --- a/src/Javinizer/Private/Scraper.Dmm.ps1 +++ b/src/Javinizer/Private/Scraper.Dmm.ps1 @@ -25,9 +25,10 @@ function Get-DmmId { # Expects ###ID##### or ID##### $contentId = Get-DmmContentId $Webrequest $Id = $contentId - $m = ($contentId | Select-String -Pattern '\d*([a-z]+)(\d+)$' -AllMatches).Matches + $m = ($contentId | Select-String -Pattern '\d*([a-z]+)(\d+)(.*)$' -AllMatches).Matches + if($m.Groups.Count -gt 2 -and $m.Groups[1] -and $m.Groups[2]) { - $Id = $m.Groups[1].Value.ToUpper() + "-" + ($m.Groups[2].Value -replace '^0{1,5}', '').PadLeft(3, '0') + $Id = $m.Groups[1].Value.ToUpper() + "-" + ($m.Groups[2].Value -replace '^0{1,5}', '').PadLeft(3, '0') + $m.Groups[3].Value.ToUpper() } } catch { return diff --git a/src/Javinizer/Public/Get-DmmData.ps1 b/src/Javinizer/Public/Get-DmmData.ps1 index 53ad44ff..1ce5288d 100644 --- a/src/Javinizer/Public/Get-DmmData.ps1 +++ b/src/Javinizer/Public/Get-DmmData.ps1 @@ -12,8 +12,14 @@ function Get-DmmData { process { $movieDataObject = @() + $session = New-Object Microsoft.PowerShell.Commands.WebRequestSession + $cookie = New-Object System.Net.Cookie + $cookie.Name = 'age_check_done' + $cookie.Value = '1' + $cookie.Domain = 'dmm.co.jp' + $session.Cookies.Add($cookie) + if ($Url -match '/en/') { - $session = New-Object Microsoft.PowerShell.Commands.WebRequestSession $cookie = New-Object System.Net.Cookie $cookie.Name = 'ckcy' $cookie.Value = '2' @@ -24,11 +30,6 @@ function Get-DmmData { $cookie.Value = 'en' $cookie.Domain = 'dmm.co.jp' $session.Cookies.Add($cookie) - $cookie = New-Object System.Net.Cookie - $cookie.Name = 'age_check_done' - $cookie.Value = '1' - $cookie.Domain = 'dmm.co.jp' - $session.Cookies.Add($cookie) } try { From 7d90fbb552d6e3bfbb6b24dd0cac17eaed725222 Mon Sep 17 00:00:00 2001 From: Seeyabye Date: Sun, 27 Sep 2020 14:12:42 +0900 Subject: [PATCH 3/5] Fixed bug for dmm-ja not extracting maker and label --- src/Javinizer/Private/Scraper.Dmm.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Javinizer/Private/Scraper.Dmm.ps1 b/src/Javinizer/Private/Scraper.Dmm.ps1 index 2dc8e113..a4e84a08 100644 --- a/src/Javinizer/Private/Scraper.Dmm.ps1 +++ b/src/Javinizer/Private/Scraper.Dmm.ps1 @@ -147,7 +147,7 @@ function Get-DmmMaker { process { try { - $maker = ($Webrequest.Content | Select-String -Pattern '(.*)<\/a>').Matches.Groups[2].Value + $maker = ($Webrequest.Content | Select-String -Pattern '(.*)<\/a>').Matches.Groups[2].Value } catch { return } @@ -163,7 +163,7 @@ function Get-DmmLabel { process { try { - $label = ($Webrequest.Content | Select-String -Pattern '(.*)<\/a>').Matches.Groups[2].Value + $label = ($Webrequest.Content | Select-String -Pattern '(.*)<\/a>').Matches.Groups[2].Value } catch { return } @@ -179,7 +179,7 @@ function Get-DmmSeries { process { try { - $series = ($Webrequest.Content | Select-String -Pattern '(.*)<\/a><\/td>').Matches.Groups[2].Value + $series = ($Webrequest.Content | Select-String -Pattern '(.*)<\/a><\/td>').Matches.Groups[2].Value } catch { return } From 9e2d7e55bae0a7465447ce4e56252064fae49efe Mon Sep 17 00:00:00 2001 From: Seeyabye Date: Sun, 27 Sep 2020 16:57:53 +0900 Subject: [PATCH 4/5] Added ContentId tag to aggregateData --- src/Javinizer/Private/Convert-JVString.ps1 | 1 + src/Javinizer/Private/Scraper.Dmm.ps1 | 1 - src/Javinizer/Public/Get-DmmData.ps1 | 7 +++-- src/Javinizer/Public/Get-JVAggregatedData.ps1 | 9 +++++- src/Javinizer/Public/Get-JVData.ps1 | 28 +++++++++++++------ src/Javinizer/Public/Get-R18Data.ps1 | 7 +++-- src/Javinizer/jvSettings.json | 3 ++ 7 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/Javinizer/Private/Convert-JVString.ps1 b/src/Javinizer/Private/Convert-JVString.ps1 index 905b7d75..2c9103ec 100644 --- a/src/Javinizer/Private/Convert-JVString.ps1 +++ b/src/Javinizer/Private/Convert-JVString.ps1 @@ -90,6 +90,7 @@ function Convert-JVString { $actresses = ($actressObject | Sort-Object) -join $Delimiter $convertedName = $FormatString ` -replace '', "$($Data.Id)" ` + -replace '', "$($Data.ContentId)" ` -replace '', "$($Data.Title)" ` -replace '<RELEASEDATE>', "$($Data.ReleaseDate)" ` -replace '<YEAR>', "$(($Data.ReleaseDate -split '-')[0])" ` diff --git a/src/Javinizer/Private/Scraper.Dmm.ps1 b/src/Javinizer/Private/Scraper.Dmm.ps1 index a4e84a08..8d72fe1d 100644 --- a/src/Javinizer/Private/Scraper.Dmm.ps1 +++ b/src/Javinizer/Private/Scraper.Dmm.ps1 @@ -24,7 +24,6 @@ function Get-DmmId { try { # Expects ###ID##### or ID##### $contentId = Get-DmmContentId $Webrequest - $Id = $contentId $m = ($contentId | Select-String -Pattern '\d*([a-z]+)(\d+)(.*)$' -AllMatches).Matches if($m.Groups.Count -gt 2 -and $m.Groups[1] -and $m.Groups[2]) { diff --git a/src/Javinizer/Public/Get-DmmData.ps1 b/src/Javinizer/Public/Get-DmmData.ps1 index 1ce5288d..413b1d80 100644 --- a/src/Javinizer/Public/Get-DmmData.ps1 +++ b/src/Javinizer/Public/Get-DmmData.ps1 @@ -7,7 +7,10 @@ function Get-DmmData { [String]$Url, [Parameter()] - [Boolean]$ScrapeActress + [Boolean]$ScrapeActress, + + [Parameter()] + [String]$IdPreference = "id" ) process { @@ -45,7 +48,7 @@ function Get-DmmData { $movieDataObject = [PSCustomObject]@{ Source = if ($Url -match '/en/') { 'dmm' } else { 'dmmja' } Url = $Url - Id = Get-DmmId -WebRequest $webRequest + Id = if ($IdPreference -eq "id") { Get-DmmId -WebRequest $webRequest } elseif ($IdPreference -eq "contentid") { Get-DmmContentId -WebRequest $webRequest } ContentId = Get-DmmContentId -WebRequest $webRequest Title = Get-DmmTitle -WebRequest $webRequest Description = Get-DmmDescription -WebRequest $webRequest diff --git a/src/Javinizer/Public/Get-JVAggregatedData.ps1 b/src/Javinizer/Public/Get-JVAggregatedData.ps1 index 34b813be..6fbd37e2 100644 --- a/src/Javinizer/Public/Get-JVAggregatedData.ps1 +++ b/src/Javinizer/Public/Get-JVAggregatedData.ps1 @@ -37,6 +37,10 @@ function Get-JVAggregatedData { [Alias('sort.metadata.priority.id')] [Array]$IdPriority, + [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] + [Alias('sort.metadata.priority.contentid')] + [Array]$ContentIdPriority, + [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] [Alias('sort.metadata.priority.label')] [Array]$LabelPriority, @@ -151,6 +155,7 @@ function Get-JVAggregatedData { $DirectorPriority = $Settings.'sort.metadata.priority.director' $GenrePriority = $Settings.'sort.metadata.priority.genre' $IdPriority = $Settings.'sort.metadata.priority.id' + $ContentIdPriority = $Settings.'sort.metadata.priority.contentid' $LabelPriority = $Settings.'sort.metadata.priority.label' $MakerPriority = $Settings.'sort.metadata.priority.maker' $RatingPriority = $Settings.'sort.metadata.priority.rating' @@ -184,6 +189,7 @@ function Get-JVAggregatedData { $aggregatedDataObject = [PSCustomObject]@{ Id = $null + ContentId = $null DisplayName = $null Title = $null AlternateTitle = $null @@ -220,7 +226,8 @@ function Get-JVAggregatedData { 'Series', 'ScreenshotUrl', 'Title', - 'TrailerUrl' + 'TrailerUrl', + 'ContentId' ) foreach ($field in $metadataFields) { diff --git a/src/Javinizer/Public/Get-JVData.ps1 b/src/Javinizer/Public/Get-JVData.ps1 index d76b6f93..6010beb3 100644 --- a/src/Javinizer/Public/Get-JVData.ps1 +++ b/src/Javinizer/Public/Get-JVData.ps1 @@ -58,6 +58,14 @@ function Get-JVData { [Alias('scraper.movie.dmm.scrapeactress')] [Boolean]$DmmScrapeActress, + [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] + [Alias('scraper.movie.dmm.idpreference')] + [String]$DmmIdPreference, + + [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] + [Alias('scraper.movie.dmm.r18preference')] + [String]$R18IdPreference, + [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Url')] [Alias('location.uncensorcsv')] @@ -68,7 +76,7 @@ function Get-JVData { [PSObject]$Settings, [Parameter(ParameterSetName = 'Url')] - [Array]$Url + [PSObject]$Url ) process { @@ -96,6 +104,8 @@ function Get-JVData { $JavbusJa = $Settings.'scraper.movie.javbusja' $JavbusZh = $Settings.'scraper.movie.javbuszh' $DmmScrapeActress = $Settings.'scraper.option.dmm.scrapeactress' + $DmmIdPreference = $Settings.'scraper.option.dmm.idpreference' + $R18IdPreference = $Settings.'scraper.option.r18.idpreference' if ($Settings.'location.uncensorcsv' -ne '') { $UncensorCsvPath = $Settings.'location.uncensorcsv' } @@ -128,11 +138,11 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-R18" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:R18Url) { - $using:R18Url | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath + $using:R18Url | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference } elseif ($using:jvR18Url) { $jvR18Url = $using:jvR18Url if ($jvR18Url) { - $jvR18Url.En | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath + $jvR18Url.En | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference } } } | Out-Null @@ -143,11 +153,11 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-R18Zh" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:R18ZhUrl) { - $using:R18ZhUrl | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath + $using:R18ZhUrl | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference } elseif ($using:jvR18Url) { $jvR18Url = $using:jvR18Url if ($jvR18Url) { - $jvR18Url.Zh | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath + $jvR18Url.Zh | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference } } } | Out-Null @@ -213,10 +223,10 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-Dmm" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:DmmUrl) { - $using:DmmUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress + $using:DmmUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference } elseif ($using:jvDmmUrl) { $jvDmmUrl = $using:jvDmmUrl - $jvDmmUrl.En | Get-DmmData -ScrapeActress:$using:DmmScrapeActress + $jvDmmUrl.En | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference } } | Out-Null } @@ -226,10 +236,10 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-Dmm" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:DmmJaUrl) { - $using:DmmJaUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress + $using:DmmJaUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference } elseif ($using:jvDmmUrl) { $jvDmmUrl = $using:jvDmmUrl - $jvDmmUrl.Ja | Get-DmmData -ScrapeActress:$using:DmmScrapeActress + $jvDmmUrl.Ja | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference } } | Out-Null } diff --git a/src/Javinizer/Public/Get-R18Data.ps1 b/src/Javinizer/Public/Get-R18Data.ps1 index 28a67e65..5b28fa21 100644 --- a/src/Javinizer/Public/Get-R18Data.ps1 +++ b/src/Javinizer/Public/Get-R18Data.ps1 @@ -7,7 +7,10 @@ function Get-R18Data { [String]$Url, [Parameter()] - [System.IO.FileInfo]$UncensorCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvUncensor.csv') + [System.IO.FileInfo]$UncensorCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvUncensor.csv'), + + [Parameter()] + [String]$IdPreference = "id" ) process { @@ -29,7 +32,7 @@ function Get-R18Data { Source = if ($Url -match 'lg=zh') { 'r18zh' } else { 'r18' } Url = $Url ContentId = Get-R18ContentId -WebRequest $webRequest - Id = Get-R18Id -WebRequest $webRequest + Id = if ($IdPreference -eq "id") { Get-R18Id -WebRequest $webRequest } elseif ($IdPreference -eq "contentid") { Get-R18ContentId -WebRequest $webRequest } Title = Get-R18Title -WebRequest $webRequest -Replace $replaceHashTable Description = Get-R18Description -WebRequest $webRequest ReleaseDate = Get-R18ReleaseDate -WebRequest $webRequest diff --git a/src/Javinizer/jvSettings.json b/src/Javinizer/jvSettings.json index 6798f704..5d867698 100644 --- a/src/Javinizer/jvSettings.json +++ b/src/Javinizer/jvSettings.json @@ -18,6 +18,8 @@ "scraper.movie.r18": 1, "scraper.movie.r18zh": 0, "scraper.option.dmm.scrapeactress": 0, + "scraper.option.dmm.idpreference": "id", + "scraper.option.r18.idpreference": "id", "match.minimumfilesize": 0, "match.includedfileextension": [ ".asf", @@ -76,6 +78,7 @@ "sort.metadata.priority.director": ["r18", "javlibrary"], "sort.metadata.priority.genre": ["r18", "javlibrary"], "sort.metadata.priority.id": ["r18", "javlibrary"], + "sort.metadata.priority.contentid": ["r18", "dmmja"], "sort.metadata.priority.label": ["r18", "javlibrary"], "sort.metadata.priority.maker": ["r18", "javlibrary"], "sort.metadata.priority.releasedate": ["r18", "javlibrary", "dmmja"], From 51a3dc712e355a2bb83ff4ce80f7a2acdf02296b Mon Sep 17 00:00:00 2001 From: Seeyabye <seeyabye91@gmail.com> Date: Mon, 28 Sep 2020 18:57:00 +0900 Subject: [PATCH 5/5] Modified Id Preference setting --- src/Javinizer/Public/Get-DmmData.ps1 | 7 ++--- src/Javinizer/Public/Get-JVAggregatedData.ps1 | 13 +++++++- src/Javinizer/Public/Get-JVData.ps1 | 30 +++++++------------ src/Javinizer/Public/Get-R18Data.ps1 | 7 ++--- src/Javinizer/jvSettings.json | 3 +- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/Javinizer/Public/Get-DmmData.ps1 b/src/Javinizer/Public/Get-DmmData.ps1 index 413b1d80..1ce5288d 100644 --- a/src/Javinizer/Public/Get-DmmData.ps1 +++ b/src/Javinizer/Public/Get-DmmData.ps1 @@ -7,10 +7,7 @@ function Get-DmmData { [String]$Url, [Parameter()] - [Boolean]$ScrapeActress, - - [Parameter()] - [String]$IdPreference = "id" + [Boolean]$ScrapeActress ) process { @@ -48,7 +45,7 @@ function Get-DmmData { $movieDataObject = [PSCustomObject]@{ Source = if ($Url -match '/en/') { 'dmm' } else { 'dmmja' } Url = $Url - Id = if ($IdPreference -eq "id") { Get-DmmId -WebRequest $webRequest } elseif ($IdPreference -eq "contentid") { Get-DmmContentId -WebRequest $webRequest } + Id = Get-DmmId -WebRequest $webRequest ContentId = Get-DmmContentId -WebRequest $webRequest Title = Get-DmmTitle -WebRequest $webRequest Description = Get-DmmDescription -WebRequest $webRequest diff --git a/src/Javinizer/Public/Get-JVAggregatedData.ps1 b/src/Javinizer/Public/Get-JVAggregatedData.ps1 index 6fbd37e2..a03096a6 100644 --- a/src/Javinizer/Public/Get-JVAggregatedData.ps1 +++ b/src/Javinizer/Public/Get-JVAggregatedData.ps1 @@ -143,7 +143,11 @@ function Get-JVAggregatedData { [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] [Alias('sort.metadata.nfo.format.tagline')] - [String]$Tagline + [String]$Tagline, + + [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Setting')] + [Alias('scraper.option.idpreference')] + [String]$IdPreference ) process { @@ -179,6 +183,7 @@ function Get-JVAggregatedData { $UnknownActress = $Settings.'sort.metadata.nfo.unknownactress' $Tag = $Settings.'sort.metadata.nfo.format.tag' $Tagline = $Settings.'sort.metadata.nfo.format.tagline' + $IdPreference = $Settings.'scraper.option.idpreference' if ($Settings.'location.genrecsv' -ne '') { $GenreCsvPath = $Settings.'location.genrecsv' } @@ -238,6 +243,12 @@ function Get-JVAggregatedData { if ($null -eq $aggregatedDataObject.$field) { if ($field -eq 'AlternateTitle') { $aggregatedDataObject.$field = $sourceData.Title + } elseif ($field -eq 'Id') { + if ($IdPreference -eq 'contentid') { + $aggregatedDataObject.$field = $sourceData.ContentId + } else { + $aggregatedDataObject.$field = $sourceData.Id + } } else { $aggregatedDataObject.$field = $sourceData.$field } diff --git a/src/Javinizer/Public/Get-JVData.ps1 b/src/Javinizer/Public/Get-JVData.ps1 index 6010beb3..3ab3dbf6 100644 --- a/src/Javinizer/Public/Get-JVData.ps1 +++ b/src/Javinizer/Public/Get-JVData.ps1 @@ -55,17 +55,9 @@ function Get-JVData { [String]$JavlibraryBaseUrl = 'https://www.javlibrary.com', [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] - [Alias('scraper.movie.dmm.scrapeactress')] + [Alias('scraper.option.dmm.scrapeactress')] [Boolean]$DmmScrapeActress, - [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] - [Alias('scraper.movie.dmm.idpreference')] - [String]$DmmIdPreference, - - [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] - [Alias('scraper.movie.dmm.r18preference')] - [String]$R18IdPreference, - [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Id')] [Parameter(ValueFromPipelineByPropertyName = $true, ParameterSetName = 'Url')] [Alias('location.uncensorcsv')] @@ -104,8 +96,6 @@ function Get-JVData { $JavbusJa = $Settings.'scraper.movie.javbusja' $JavbusZh = $Settings.'scraper.movie.javbuszh' $DmmScrapeActress = $Settings.'scraper.option.dmm.scrapeactress' - $DmmIdPreference = $Settings.'scraper.option.dmm.idpreference' - $R18IdPreference = $Settings.'scraper.option.r18.idpreference' if ($Settings.'location.uncensorcsv' -ne '') { $UncensorCsvPath = $Settings.'location.uncensorcsv' } @@ -138,11 +128,11 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-R18" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:R18Url) { - $using:R18Url | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference + $using:R18Url | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath } elseif ($using:jvR18Url) { $jvR18Url = $using:jvR18Url if ($jvR18Url) { - $jvR18Url.En | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference + $jvR18Url.En | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath } } } | Out-Null @@ -153,11 +143,11 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-R18Zh" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:R18ZhUrl) { - $using:R18ZhUrl | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference + $using:R18ZhUrl | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath } elseif ($using:jvR18Url) { $jvR18Url = $using:jvR18Url if ($jvR18Url) { - $jvR18Url.Zh | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath -IdPreference:$using:R18IdPreference + $jvR18Url.Zh | Get-R18Data -UncensorCsvPath:$using:UncensorCsvPath } } } | Out-Null @@ -223,23 +213,23 @@ function Get-JVData { Start-ThreadJob -Name "jvdata-Dmm" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:DmmUrl) { - $using:DmmUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference + $using:DmmUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress } elseif ($using:jvDmmUrl) { $jvDmmUrl = $using:jvDmmUrl - $jvDmmUrl.En | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference + $jvDmmUrl.En | Get-DmmData -ScrapeActress:$using:DmmScrapeActress } } | Out-Null } if ($DmmJa) { Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] [Search - DmmJa] [Url - $DmmJaUrl]" - Start-ThreadJob -Name "jvdata-Dmm" -ThrottleLimit $throttleLimit -ScriptBlock { + Start-ThreadJob -Name "jvdata-DmmJa" -ThrottleLimit $throttleLimit -ScriptBlock { Import-Module $using:jvModulePath if ($using:DmmJaUrl) { - $using:DmmJaUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference + $using:DmmJaUrl | Get-DmmData -ScrapeActress:$using:DmmScrapeActress } elseif ($using:jvDmmUrl) { $jvDmmUrl = $using:jvDmmUrl - $jvDmmUrl.Ja | Get-DmmData -ScrapeActress:$using:DmmScrapeActress -IdPreference:$using:DmmIdPreference + $jvDmmUrl.Ja | Get-DmmData -ScrapeActress:$using:DmmScrapeActress } } | Out-Null } diff --git a/src/Javinizer/Public/Get-R18Data.ps1 b/src/Javinizer/Public/Get-R18Data.ps1 index 5b28fa21..28a67e65 100644 --- a/src/Javinizer/Public/Get-R18Data.ps1 +++ b/src/Javinizer/Public/Get-R18Data.ps1 @@ -7,10 +7,7 @@ function Get-R18Data { [String]$Url, [Parameter()] - [System.IO.FileInfo]$UncensorCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvUncensor.csv'), - - [Parameter()] - [String]$IdPreference = "id" + [System.IO.FileInfo]$UncensorCsvPath = (Join-Path -Path ((Get-Item $PSScriptRoot).Parent) -ChildPath 'jvUncensor.csv') ) process { @@ -32,7 +29,7 @@ function Get-R18Data { Source = if ($Url -match 'lg=zh') { 'r18zh' } else { 'r18' } Url = $Url ContentId = Get-R18ContentId -WebRequest $webRequest - Id = if ($IdPreference -eq "id") { Get-R18Id -WebRequest $webRequest } elseif ($IdPreference -eq "contentid") { Get-R18ContentId -WebRequest $webRequest } + Id = Get-R18Id -WebRequest $webRequest Title = Get-R18Title -WebRequest $webRequest -Replace $replaceHashTable Description = Get-R18Description -WebRequest $webRequest ReleaseDate = Get-R18ReleaseDate -WebRequest $webRequest diff --git a/src/Javinizer/jvSettings.json b/src/Javinizer/jvSettings.json index 5d867698..659c421c 100644 --- a/src/Javinizer/jvSettings.json +++ b/src/Javinizer/jvSettings.json @@ -18,8 +18,7 @@ "scraper.movie.r18": 1, "scraper.movie.r18zh": 0, "scraper.option.dmm.scrapeactress": 0, - "scraper.option.dmm.idpreference": "id", - "scraper.option.r18.idpreference": "id", + "scraper.option.idpreference": "id", "match.minimumfilesize": 0, "match.includedfileextension": [ ".asf",