Fix actress name order on dmm scraper (#155)

javinizer · Dec 14, 2020 · e8600f7 · e8600f7
1 parent 87bd17a
commit e8600f7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/src/Javinizer/Private/Scraper.Javbus.ps1 b/src/Javinizer/Private/Scraper.Javbus.ps1
@@ -223,10 +223,10 @@ function Get-JavbusActress {
         foreach ($actress in $actresses) {
             $baseUrl = ($actress.Groups[1].Value) -replace '/ja', '' -replace '/en', ''
             if ($baseUrl -match '/uncensored') {
-                $engActressUrl = "https://www.javbus.com/en/uncensored/star/$($actress.Groups[2].Value)"
+                $enActressUrl = "https://www.javbus.com/en/uncensored/star/$($actress.Groups[2].Value)"
                 $jaActressUrl = "https://www.javbus.com/ja/uncensored/star/$($actress.Groups[2].Value)"
             } else {
-                $engActressUrl = "$baseUrl/en/star/$($actress.Groups[2].Value)"
+                $enActressUrl = "$baseUrl/en/star/$($actress.Groups[2].Value)"
                 $jaActressUrl = "$baseUrl/ja/star/$($actress.Groups[2].Value)"
             }
 
@@ -239,19 +239,25 @@ function Get-JavbusActress {
             # Match if the name contains Japanese characters
             if ($actressName -match '[\u3040-\u309f]|[\u30a0-\u30ff]|[\uff66-\uff9f]|[\u4e00-\u9faf]') {
                 try {
-                    $engActressName = ((Invoke-RestMethod -Uri $engactressUrl | Select-String -Pattern '<title>(.*)<\/title>').Matches.Groups[1].Value -split '-')[0].Trim()
+                    $wr = Invoke-RestMethod -Uri $enActressUrl | Out-Null
+                    $enActressName = (($wr | Select-String -Pattern '<title>(.*)<\/title>').Matches.Groups[1].Value -split '-')[0].Trim()
                 } catch {
-                    $engActressName = $null
+                    $enActressName = $null
                 }
 
-                if ($engActressName -notmatch '[\u3040-\u309f]|[\u30a0-\u30ff]|[\uff66-\uff9f]|[\u4e00-\u9faf]') {
-                    $nameParts = ($engActressName -split ' ').Count
+                if ($enActressName -notmatch '[\u3040-\u309f]|[\u30a0-\u30ff]|[\uff66-\uff9f]|[\u4e00-\u9faf]') {
+                    $nameParts = ($enActressName -split ' ').Count
                     if ($nameParts -eq 1) {
                         $lastName = $null
-                        $firstName = $engActressName
+                        $firstName = $enActressName
                     } else {
-                        $lastName = ($engActressName -split ' ')[0]
-                        $firstName = ($engActressName -split ' ')[1]
+                        if ($wr -match 'D\.O\.B:') {
+                            $lastName = ($enActressName -split ' ')[0]
+                            $firstName = ($enActressName -split ' ')[1]
+                        } else {
+                            $lastName = ($enActressName -split ' ')[1]
+                            $firstName = ($enActressName -split ' ')[0]
+                        }
                     }
 
                     if ($null -ne $firstName) {
@@ -284,8 +290,13 @@ function Get-JavbusActress {
                     $lastName = $null
                     $firstName = $actressName
                 } else {
-                    $lastName = ($actressName -split ' ')[0]
-                    $firstName = ($actressName -split ' ')[1]
+                    if ($wr -match 'D\.O\.B:') {
+                        $lastName = ($actressName -split ' ')[0]
+                        $firstName = ($actressName -split ' ')[1]
+                    } else {
+                        $lastName = ($actressName -split ' ')[1]
+                        $firstName = ($actressName -split ' ')[0]
+                    }
                 }
 
                 if ($null -ne $firstName) {

diff --git a/src/Javinizer/Public/Get-JavbusUrl.ps1 b/src/Javinizer/Public/Get-JavbusUrl.ps1
@@ -12,12 +12,7 @@ function Get-JavbusUrl {
             Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Performing [GET] on URL [$searchUrl]"
             $webRequest = Invoke-RestMethod -Uri $searchUrl -Method Get -Verbose:$false
         } catch {
-            try {
-                Start-Sleep -Seconds 3
-                $webRequest = Invoke-RestMethod -Uri $searchUrl -Method Get -Verbose:$false
-            } catch {
-                Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Error -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Error occured on [GET] on URL [$searchUrl]: $PSItem" -Action 'Continue'
-            }
+            # Do nothing
         }
 
         $retryCount = 3
@@ -67,6 +62,7 @@ function Get-JavbusUrl {
                 Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Performing [GET] on URL [$searchUrl]"
                 $webRequest = Invoke-RestMethod -Uri $searchUrl -Method Get -Verbose:$false
             } catch {
+                # Do nothing
             }
 
             $retryCount = 3
@@ -117,6 +113,7 @@ function Get-JavbusUrl {
                 Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Performing [GET] on URL [$searchUrl]"
                 $webRequest = Invoke-RestMethod -Uri $searchUrl -Method Get -Verbose:$false
             } catch {
+                # Do nothing
             }
 
             $retryCount = 3