Skip to content

Commit

Permalink
Fixed missing TokyoHot and GUI problems (javinizer#326) (javinizer#367)
Browse files Browse the repository at this point in the history
  • Loading branch information
@seeyabye
seeyabye committed May 6, 2023
1 parent eabd618 commit b32eb1c
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 24 deletions.
68 changes: 44 additions & 24 deletions src/Javinizer/Universal/Repository/javinizergui.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ $scraperSettings = @(
'Dmm',
'DmmJa',
'Jav321Ja',
'Javdb',
'JavdbZh',
'Javbus',
'JavbusJa',
'JavbusZh',
'Javdb',
'JavdbZh',
'Javlibrary',
'JavlibraryJa',
'JavlibraryZh',
'MGStageJa',
'R18Dev',
'TokyoHot',
'TokyoHotJa',
'TokyoHotZh'
Expand Down Expand Up @@ -2314,18 +2315,27 @@ $Pages += New-UDPage -Name "Sort" -Content {
$searchInput = ($searchInput -split ',').Trim()
}
$findParams = @{
Find = $searchInput
Dmm = $cache:settings.'web.sort.manualsearch.dmm'
DmmJa = $cache:settings.'web.sort.manualsearch.dmmja'
Jav321Ja = $cache:settings.'web.sort.manualsearch.jav321ja'
Javbus = $cache:settings.'web.sort.manualsearch.javbus'
JavbusJa = $cache:settings.'web.sort.manualsearch.javbusja'
JavbusZh = $cache:settings.'web.sort.manualsearch.javbuszh'
Javlibrary = $cache:settings.'web.sort.manualsearch.javlibrary'
JavlibraryJa = $cache:settings.'web.sort.manualsearch.javlibraryja'
JavlibraryZh = $cache:settings.'web.sort.manualsearch.javlibraryzh'
Aggregated = $true
Search = $true
Find = $searchInput
Aventertainment = $cache:settings.'web.sort.manualsearch.aventertainment'
AventertainmentJa = $cache:settings.'web.sort.manualsearch.aventertainmentja'
Dmm = $cache:settings.'web.sort.manualsearch.dmm'
DmmJa = $cache:settings.'web.sort.manualsearch.dmmja'
Jav321Ja = $cache:settings.'web.sort.manualsearch.jav321ja'
Javdb = $cache:settings.'web.sort.manualsearch.javdb'
JavdbZh = $cache:settings.'web.sort.manualsearch.javdbzh'
Javbus = $cache:settings.'web.sort.manualsearch.javbus'
JavbusJa = $cache:settings.'web.sort.manualsearch.javbusja'
JavbusZh = $cache:settings.'web.sort.manualsearch.javbuszh'
Javlibrary = $cache:settings.'web.sort.manualsearch.javlibrary'
JavlibraryJa = $cache:settings.'web.sort.manualsearch.javlibraryja'
JavlibraryZh = $cache:settings.'web.sort.manualsearch.javlibraryzh'
MGStageJa = $cache:settings.'web.sort.manualsearch.mgstageja'
R18Dev = $cache:settings.'web.sort.manualsearch.r18dev'
Tokyohot = $cache:settings.'web.sort.manualsearch.tokyohot'
TokyohotJa = $cache:settings.'web.sort.manualsearch.tokyohotja'
TokyohotZh = $cache:settings.'web.sort.manualsearch.tokyohotzh'
Aggregated = $true
Search = $true
}

$jvData = Javinizer @findParams
Expand Down Expand Up @@ -2381,16 +2391,25 @@ $Pages += New-UDPage -Name "Sort" -Content {
}

$findParams = @{
Find = $cache:searchInput
Dmm = $cache:settings.'web.sort.manualsearch.dmm'
DmmJa = $cache:settings.'web.sort.manualsearch.dmmja'
Jav321Ja = $cache:settings.'web.sort.manualsearch.jav321ja'
Javbus = $cache:settings.'web.sort.manualsearch.javbus'
JavbusJa = $cache:settings.'web.sort.manualsearch.javbusja'
JavbusZh = $cache:settings.'web.sort.manualsearch.javbuszh'
Javlibrary = $cache:settings.'web.sort.manualsearch.javlibrary'
JavlibraryJa = $cache:settings.'web.sort.manualsearch.javlibraryja'
JavlibraryZh = $cache:settings.'web.sort.manualsearch.javlibraryzh'
Find = $cache:searchInput
Aventertainment = $cache:settings.'web.sort.manualsearch.aventertainment'
AventertainmentJa = $cache:settings.'web.sort.manualsearch.aventertainmentja'
Dmm = $cache:settings.'web.sort.manualsearch.dmm'
DmmJa = $cache:settings.'web.sort.manualsearch.dmmja'
Jav321Ja = $cache:settings.'web.sort.manualsearch.jav321ja'
Javdb = $cache:settings.'web.sort.manualsearch.javdb'
JavdbZh = $cache:settings.'web.sort.manualsearch.javdbzh'
Javbus = $cache:settings.'web.sort.manualsearch.javbus'
JavbusJa = $cache:settings.'web.sort.manualsearch.javbusja'
JavbusZh = $cache:settings.'web.sort.manualsearch.javbuszh'
Javlibrary = $cache:settings.'web.sort.manualsearch.javlibrary'
JavlibraryJa = $cache:settings.'web.sort.manualsearch.javlibraryja'
JavlibraryZh = $cache:settings.'web.sort.manualsearch.javlibraryzh'
MGStageJa = $cache:settings.'web.sort.manualsearch.mgstageja'
R18Dev = $cache:settings.'web.sort.manualsearch.r18dev'
Tokyohot = $cache:settings.'web.sort.manualsearch.tokyohot'
TokyohotJa = $cache:settings.'web.sort.manualsearch.tokyohotja'
TokyohotZh = $cache:settings.'web.sort.manualsearch.tokyohotzh'
AllResults = $true
}

Expand Down Expand Up @@ -3272,6 +3291,7 @@ $Pages += New-UDPage -Name "Settings" -Content {
'Javlibrary' { 'English Javlibrary scraper' }
'JavlibraryJa' { 'Japanese Javlibrary scraper' }
'JavlibraryZh' { 'Chinese Javlibrary scraper' }
'R18Dev' { 'English R18.dev scraper'}
'MgStageJa' { 'Japanese Mgstage scraper' }
'TokyoHot' { 'English TokyoHot scraper' }
'TokyoHotJa' { 'Japanese TokyoHot scraper' }
Expand Down
3 changes: 3 additions & 0 deletions src/Javinizer/jvSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@
"web.sort.manualsearch.javlibraryzh": false,
"web.sort.manualsearch.mgstageja": false,
"web.sort.manualsearch.r18dev": true,
"web.sort.manualsearch.tokyohot": true,
"web.sort.manualsearch.tokyohotja": true,
"web.sort.manualsearch.tokyohotzh": true,
"web.theme": "light",
"admin.log": true,
"admin.log.level": "info",
Expand Down

0 comments on commit b32eb1c

Please sign in to comment.