Fixed several issues (javinizer#353) (javinizer#350) (javinizer#349) (j…

…avinizer#346) Signed-off-by: Seeyabye <[email protected]>
seeyabye · Feb 15, 2023 · b5d3165 · b5d3165
1 parent 5ddbdcf
commit b5d3165
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.5.11]
 
-### Changed
+### Fixed
 
-- Removed R18 support
+- Fixed missing `sort.renamefolderinplace` in GUI (#353)
+- Removed R18 support (#350)
+- Fixed javbus screenshot not being recognized (#349)
+- Fixed jav321 screenshots not being grabbed correctly (#346)
 
 ## [2.5.10]
 

diff --git a/src/Javinizer/Private/Scraper.Jav321.ps1 b/src/Javinizer/Private/Scraper.Jav321.ps1
@@ -201,7 +201,7 @@ function Get-Jav321CoverUrl {
 
     process {
         try {
-            $coverUrl = ((($Webrequest | Select-String -Pattern '"/snapshot/(.*)/\d/0"><img class="img-responsive" src="(.*)"').Matches.Groups[2].Value -split '" onerror')[0] -split '"></a>')[0].Trim()
+            $coverUrl = ((($Webrequest | Select-String -Pattern '"/snapshot/(.*)/\d/0"><img class="img-responsive" max-width="100%" src="(.*)"').Matches.Groups[2].Value -split '" onerror')[0] -split '"></a>')[0].Trim()
         } catch {
             return
         }
@@ -221,13 +221,13 @@ function Get-Jav321ScreenshotUrl {
 
         try {
             $screenshotUrl = (($Webrequest | ForEach-Object { $_ -split '\n' } |
-                    Select-String -Pattern '<a href="\/snapshot\/(.*)\/(.*)\/(.*)"><img class="img-responsive" src="(.*)"') -split "src=\'" |
+                    Select-String -Pattern '<a href="\/snapshot\/(.*)\/(.*)\/(.*)"><img class="img-responsive" max-width="100%" src="(.*)"') -split "src=\'" |
                 Select-String -Pattern "(https:\/\/www.jav321.com\/digital\/video\/(.*)\/(.*).jpg)(.*)<\/a>").Matches |
             ForEach-Object { $_.Groups[1].Value }
         } catch {
             try {
                 $screenshotUrl = (($Webrequest | ForEach-Object { $_ -split '\n' } |
-                        Select-String -Pattern '<a href="\/snapshot/(.*)\/(.*)\/(.*)"><img class="img-responsive"') -split 'src="' |
+                        Select-String -Pattern '<a href="\/snapshot/(.*)\/(.*)\/(.*)"><img class="img-responsive" max-width="100%"') -split 'src="' |
                     Select-String -Pattern '(https:\/\/www.jav321.com\/\/images\/(.*)\/(.*)\/(.*)\/(.*).jpg)"><\/a><\/p>').Matches |
                 ForEach-Object { $_.Groups[1].Value }
             } catch {

diff --git a/src/Javinizer/Private/Scraper.Javbus.ps1 b/src/Javinizer/Private/Scraper.Javbus.ps1
@@ -357,6 +357,7 @@ function Get-JavbusScreenshotUrl {
             $screenshots = ($Webrequest -split '<a class="sample-box"')
             $screenshots = $screenshots[1..$screenshots.Count] | ForEach-Object { ($_ | Select-String -Pattern 'href="(.*)"><div class=').Matches }
             $screenshotUrl += ($screenshots | ForEach-Object { if ($_.Groups[1].Value -match '"') { ($_.Groups[1].Value -split '"')[0] } else { $_.Groups[1].Value } })
+            $screenshotUrl = $screenshoturl | ForEach-Object { if ($_ -notmatch 'http') { 'https://www.javbus.com' + $_ } else { $_ } }
         } catch {
             return
         }

diff --git a/src/Javinizer/Universal/Repository/javinizergui.ps1 b/src/Javinizer/Universal/Repository/javinizergui.ps1
@@ -120,6 +120,7 @@ $formatStringSettings = @(
 
 $sortSettings = @(
     'sort.movetofolder',
+    'sort.renamefolderinplace'
     'sort.renamefile',
     'sort.movesubtitles',
     'sort.create.nfo',
@@ -3546,6 +3547,7 @@ $Pages += New-UDPage -Name "Settings" -Content {
                         foreach ($setting in $sortSettings) {
                             $sortTooltip = switch ($setting) {
                                 'sort.movetofolder' { 'Specifies to move the movie to its own folder after being sorted' }
+                                'sort.renamefolderinplace' { 'Specifies to rename folder in-place without moving files' }
                                 'sort.renamefile' { 'Specifies to rename the movie file after being sorted' }
                                 'sort.movesubtitles' { 'Specifies to automatically move subtitle files with the movie file after being sorted' }
                                 'sort.create.nfo' { 'Specifies to create the nfo file when sorting a movie' }