Update url retrycount to 3

javinizer · Dec 13, 2020 · a29c166 · a29c166
1 parent 70cda15
commit a29c166
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/src/Javinizer/Public/Get-Jav321Url.ps1 b/src/Javinizer/Public/Get-Jav321Url.ps1
@@ -18,7 +18,7 @@ function Get-Jav321Url {
         }
 
 
-        $Tries = 5
+        $Tries = 3
         # Get the page search results
         $searchResults = $webRequest.Links.OuterHtml | Where-Object { $_ -match 'jav321.com/video/' } |
         Select-String -Pattern 'jav321.com/video/(.*)" target' |

diff --git a/src/Javinizer/Public/Get-JavbusUrl.ps1 b/src/Javinizer/Public/Get-JavbusUrl.ps1
@@ -14,9 +14,15 @@ 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'
+            }
         }
 
-        $Tries = 5
+        $retryCount = 3
         # Get the page search results
         try {
             $searchResults = (($webRequest | ForEach-Object { $_ -split '\n' } | Select-String '<a class="movie-box" href="(.*)">').Matches) | ForEach-Object { $_.Groups[1].Value }
@@ -25,12 +31,12 @@ function Get-JavbusUrl {
         }
         $numResults = $searchResults.Count
 
-        if ($Tries -gt $numResults) {
-            $Tries = $numResults
+        if ($retryCount -gt $numResults) {
+            $retryCount = $numResults
         }
 
         if ($numResults -ge 1) {
-            Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Searching [$Tries] of [$numResults] results for [$Id]"
+            Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Searching [$retryCount] of [$numResults] results for [$Id]"
 
             $count = 1
             foreach ($result in $searchResults) {
@@ -49,7 +55,7 @@ function Get-JavbusUrl {
                     break
                 }
 
-                if ($count -eq $Tries) {
+                if ($count -eq $retryCount) {
                     break
                 }
 
@@ -65,7 +71,7 @@ function Get-JavbusUrl {
             } catch {
             }
 
-            $Tries = 5
+            $retryCount = 3
             # Get the page search results
             try {
                 $searchResults = (($webRequest | ForEach-Object { $_ -split '\n' } | Select-String '<a class="movie-box" href="(.*)">').Matches) | ForEach-Object { $_.Groups[1].Value }
@@ -74,12 +80,12 @@ function Get-JavbusUrl {
             }
             $numResults = $searchResults.Count
 
-            if ($Tries -gt $numResults) {
-                $Tries = $numResults
+            if ($retryCount -gt $numResults) {
+                $retryCount = $numResults
             }
 
             if ($numResults -ge 1) {
-                Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Searching [$Tries] of [$numResults] results for [$Id]"
+                Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Searching [$retryCount] of [$numResults] results for [$Id]"
 
                 $count = 1
                 foreach ($result in $searchResults) {
@@ -98,7 +104,7 @@ function Get-JavbusUrl {
                         break
                     }
 
-                    if ($count -eq $Tries) {
+                    if ($count -eq $retryCount) {
                         break
                     }
 
@@ -115,7 +121,7 @@ function Get-JavbusUrl {
             } catch {
             }
 
-            $Tries = 5
+            $retryCount = 3
             # Get the page search results
             try {
                 $searchResults = (($webRequest | ForEach-Object { $_ -split '\n' } | Select-String '<a class="movie-box" href="(.*)">').Matches) | ForEach-Object { $_.Groups[1].Value }
@@ -124,12 +130,12 @@ function Get-JavbusUrl {
             }
             $numResults = $searchResults.Count
 
-            if ($Tries -gt $numResults) {
-                $Tries = $numResults
+            if ($retryCount -gt $numResults) {
+                $retryCount = $numResults
             }
 
             if ($numResults -ge 1) {
-                Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Searching [$Tries] of [$numResults] results for [$Id]"
+                Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$Id] [$($MyInvocation.MyCommand.Name)] Searching [$retryCount] of [$numResults] results for [$Id]"
 
                 $count = 1
                 foreach ($result in $searchResults) {
@@ -148,7 +154,7 @@ function Get-JavbusUrl {
                         break
                     }
 
-                    if ($count -eq $Tries) {
+                    if ($count -eq $retryCount) {
                         break
                     }
 

diff --git a/src/Javinizer/Public/Get-JavlibraryUrl.ps1 b/src/Javinizer/Public/Get-JavlibraryUrl.ps1
@@ -53,12 +53,12 @@ function Get-JavlibraryUrl {
         }
 
         if ($null -eq $javlibraryUrl) {
-            $Tries = 5
+            $retryCount = 3
             $searchResults = $webRequest.Links.href | Where-Object { $_ -match '\.\/\?v=(.*)' }
             $numResults = $searchResults.count
 
-            if ($Tries -gt $numResults) {
-                $Tries = $numResults
+            if ($retryCount -gt $numResults) {
+                $retryCount = $numResults
             }
 
             if ($numResults -ge 1) {
@@ -82,7 +82,7 @@ function Get-JavlibraryUrl {
                         break
                     }
 
-                    if ($count -eq $Tries) {
+                    if ($count -eq $retryCount) {
                         break
                     }