Fixed several issues (#353) (#350) (#349) (#346)

Signed-off-by: Seeyabye <seeyabye91@gmail.com>
javinizer · Feb 15, 2023 · 3398317 · 3398317
1 parent 26fc17b
commit 3398317
Show file tree

Hide file tree

Showing 15 changed files with 2,395 additions and 2,539 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.5.11]
+
+### Fixed
+
+- 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]
 
 ### Fixed

diff --git a/dashboard/pages/1.0 sort.ps1 b/dashboard/pages/1.0 sort.ps1
diff --git a/dashboard/pages/2.0 settings.ps1 b/dashboard/pages/2.0 settings.ps1
@@ -19,7 +19,6 @@ New-UDPage -Name "Settings" -Content {
         'JavlibraryZh',
         'MGStageJa',
         'R18',
-        'R18Zh',
         'Javbus',
         'JavbusJa',
         'JavbusZh',

diff --git a/src/Javinizer/Javinizer.psd1 b/src/Javinizer/Javinizer.psd1
@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.5.10'
+    ModuleVersion     = '2.5.11'
 
     # Supported PSEditions
     # CompatiblePSEditions = @('Core')
@@ -100,8 +100,6 @@
         'Get-MaleActors',
         'Get-MgstageData',
         'Get-MgstageUrl',
-        'Get-R18Data',
-        'Get-R18Url',
         'Install-JVGui',
         'Set-JavlibraryOwned',
         'Set-JVEmbyThumbs',

diff --git a/src/Javinizer/Private/Get-JVUrlLocation.ps1 b/src/Javinizer/Private/Get-JVUrlLocation.ps1
@@ -11,19 +11,7 @@ function Get-JVUrlLocation {
     process {
         $testUrlObject = @()
         foreach ($link in $Url) {
-            if ($link -match 'r18.com') {
-                if ($link -match 'lg=zh') {
-                    $testUrlObject += [PSCustomObject]@{
-                        Url    = $link
-                        Source = 'r18zh'
-                    }
-                } else {
-                    $testUrlObject += [PSCustomObject]@{
-                        Url    = $link
-                        Source = 'r18'
-                    }
-                }
-            } elseif ($link -match 'javlibrary.com' -or $link -match 'g46e.com' -or $link -match 'm45e.com' -or $link -match ($Settings.'javlibrary.baseurl' -replace 'http(s)?:\/\/')) {
+            if ($link -match 'javlibrary.com' -or $link -match 'g46e.com' -or $link -match 'm45e.com' -or $link -match ($Settings.'javlibrary.baseurl' -replace 'http(s)?:\/\/')) {
                 if ($link -match '/ja/') {
                     $testUrlObject += [PSCustomObject]@{
                         Url    = $link