Merge pull request #242 from jvlflame/dev

2.4.5
javinizer · Mar 3, 2021 · a8cfed6 · a8cfed6
2 parents 732bac8 + a883786
commit a8cfed6
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 168 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.4.5]
+
+### Changed
+
+-   Screenshot filename index padding is now configurable via setting `"sort.format.screenshotimg.padding": 1`
+
+### Fixed
+
+-   GUI: Fixed issue where checkbox for sort.metadata.nfo.translate.keeporiginaldescription would always be checked if sort.metadata.nfo.translate was true
+
 ## [2.4.4]
 
 ### Added

diff --git a/src/Javinizer.build.ps1 b/src/Javinizer.build.ps1
@@ -34,7 +34,7 @@ $ModuleName = (Split-Path -Path $BuildFile -Leaf).Split('.')[0]
 #Default Build
 $str = @()
 $str = 'Clean', 'ValidateRequirements'
-$str += 'FormattingCheck'
+# $str += 'FormattingCheck'
 $str += 'Analyze', 'Test', 'InfraTest'
 
 $str += 'Build', 'Archive'

diff --git a/src/Javinizer/Javinizer.psd1 b/src/Javinizer/Javinizer.psd1
@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.4.4'
+    ModuleVersion     = '2.4.5'
 
     # Supported PSEditions
     # CompatiblePSEditions = @('Core')

diff --git a/src/Javinizer/Public/Set-JVMovie.ps1 b/src/Javinizer/Public/Set-JVMovie.ps1
@@ -76,7 +76,11 @@ function Set-JVMovie {
 
         [Parameter(ValueFromPipelineByPropertyName = $true)]
         [Alias('sort.metadata.nfo.altnamerole')]
-        [Boolean]$AltNameRole
+        [Boolean]$AltNameRole,
+
+        [Parameter(ValueFromPipelineByPropertyName = $true)]
+        [Alias('sort.format.screenshotimg.padding')]
+        [Int]$ScreenshotImgPadding
     )
 
     begin {
@@ -104,6 +108,7 @@ function Set-JVMovie {
             $ActressLanguageJa = $Settings.'sort.metadata.nfo.actresslanguageja'
             $OriginalPath = $Settings.'sort.metadata.nfo.originalpath'
             $AltNameRole = $Settings.'sort.metadata.nfo.altnamerole'
+            $ScreenshotImgPadding = $Settings.'sort.format.screenshotimg.padding'
         }
 
         <# if ($RenameFile -and (!($Update))) {
@@ -321,7 +326,7 @@ function Set-JVMovie {
                         }
 
                         foreach ($screenshot in $Data.ScreenshotUrl) {
-                            $paddedIndex = $index.ToString().PadLeft(2, '0')
+                            $paddedIndex = $index.ToString().PadLeft($ScreenshotImgPadding, '0')
                             $screenshotName = "$($sortData.ScreenshotImgName)$paddedIndex.jpg"
                             $webClient = New-Object System.Net.WebClient
                             $webclient.Headers.Add("User-Agent: Other")

diff --git a/src/Javinizer/Universal/Repository/javinizergui.ps1 b/src/Javinizer/Universal/Repository/javinizergui.ps1
@@ -1,4 +1,4 @@
-$cache:guiVersion = '2.4.4-1'
+$cache:guiVersion = '2.4.5-1'
 
 # Define Javinizer module file paths
 $cache:modulePath = (Get-InstalledModule -Name Javinizer).InstalledLocation
@@ -933,7 +933,7 @@ function New-JVAppBar {
     )
 
     $drawer = New-UDDrawer -Children {
-        New-UDList -SubHeader "Javinzer Web GUI v$($cache:javinizerInfo.Version)" -Children {
+        New-UDList -SubHeader "Javinzer Web GUI v$($cache:guiVersion)" -Children {
             New-UDListItem -Label 'Sort' -Icon $iconSearchLocation -OnClick {
                 Invoke-UDRedirect -Url '/sort'
             }
@@ -3630,7 +3630,7 @@ $Pages += New-UDPage -Name "Settings" -Content {
 
                         New-UDGrid -Item -ExtraSmallSize 12 -SmallSize 12 -MediumSize 6 -Content {
                             New-UDTooltip -TooltipContent { 'Specifies to append the original Japanese description to the nfo file when translating the description.' } -Content {
-                                New-UDCheckBox -Label 'sort.metadata.nfo.translate.keeporiginaldescription' -Id 'checkbox-settings-translate-originaldescription' -LabelPlacement end -Checked ($cache:settings.'sort.metadata.nfo.translate')
+                                New-UDCheckBox -Label 'sort.metadata.nfo.translate.keeporiginaldescription' -Id 'checkbox-settings-translate-originaldescription' -LabelPlacement end -Checked ($cache:settings.'sort.metadata.nfo.translate.keeporiginaldescription')
                             }  -Place right -Type dark -Effect float
                         }
                         New-UDGrid -Item -ExtraSmallSize 12 -SmallSize 12 -MediumSize 12 -Content {
@@ -3669,7 +3669,7 @@ $Pages += New-UDPage -Name "Settings" -Content {
                         <LABEL>
                         <ACTORS>
                         <ORIGINALTITLE>
-                        <FILENAME
+                        <FILENAME>
                         <RESOLUTION>'
                         New-UDGrid -Item -ExtraSmallSize 12 -SmallSize 12 -Content {
                             New-UDGrid -Container -Content {

diff --git a/src/Javinizer/jvGenres.csv b/src/Javinizer/jvGenres.csv
@@ -1,161 +1,2 @@
 Original,Replacement
-Overseas,Caucasian Actress
-Daughter,Adopted Daughter
-Hostesses,Club Hostess & Sex Worker
-"Eyes-Roll-Back, Fainting","Eyes-Roll-Back, Fainting"
-Yukata,KIMONO
-Subordinates / Colleagues,Employee-Coworker
-Adopted Daughter,Adopted Daughter
-Business Attire,Business Suit
-Candle,Candle Drippings
-Nose Hook,Nose Fuck
-Affair,Adultery
-Black Actor,Black Man
-Bus Guide,Bus Tour Guide
-Booth Girl,Campaign Girl
-Virgin Man,Cherry Boy
-Prostitutes,Club Hostess & Sex Worker
-Female College Student,College Girl
-Anchorwoman,Female Anchor
-Female Warrior,Female Soldier
-Companion,Hostess
-"Landlady, Hostess",Housewife
-Look-alike,Lookalike
-Submissive Woman,M-jo
-Magic Gal,Magical Girl
-Fighters,Martial Arts
-Mother,MILF
-OL,Office Lady
-Pregnant Woman,Pregnant
-Miss,Princess & Mademoiselle
-Tutor,Private Tutor
-Soapland,Soapland Girl
-School Stuff,School
-School Girls,Schoolgirl
-Stepmother,Stepmom
-Transformed Heroine,Super Heroine
-Various Professions,Various Worker
-Widow,Widow
-"Bride, Young Wife",Young Wife
-Other Asian,Asian Actress
-Breasts,Beautiful Tits
-Huge Butt,Big Asses
-Catgirl,Cat Cosplay
-White Actress,Caucasian Actress
-BBW,Chubby
-Female Investigator,Female Detective
-Futanari,Hermaphrodite
-Ultra-Huge Tits,Huge Tits
-Entertainer,Idol & Celebrity
-Mini,Petite
-Tits,Small Tits
-Sun tan,Suntan
-Tall,Tall Girl
-Tsundere,TSUNDERE
-Girl,Youthful
-Restraints,Bondage
-Cheongsam,Chinese Dress
-Cross Dressing,Cross Dresser
-Bloomers,Gym Clothes
-"Kimono, Mourning",KIMONO
-Knee Socks,Knee-High Socks
-Leotard,Leotards
-Mini Skirt,Miniskirt
-Mini Skirt Police,Miniskirt Police
-Sailor Suit,Sailor Uniform
-School Swimsuit,School Swimsuits
-Body Conscious,Tight Dress
-Fighting Action,Action & Fighting
-Butt,Ass Lover
-SM,BDSM
-Busty Fetish,Big Tits Lover
-Boys Love,BL
-Cuckold,Cheating Wife
-Gag · Comedy,Comedy
-Delusion,Daydream
-Dead Drunk,Drunk Girl
-Fan Appreciation,Fan Appreciation- Home Visit
-US/EU Porn,Foreign Imports
-Leg Fetish,Foot Fetish
-Oversea Import,Foreign Imports
-Cervix,G-Spot
-Close Up,Genital Close-Up
-Molester,Groping
-Reverse Play,Horny
-Beauty Shop,Massage Parlor
-Muscle,Muscular
-Erotic Wear,Non-nude Erotica
-"Nasty, Hardcore",Nymphomaniac
-Promiscuity,Orgy
-Original Collaboration,Original Collaboration
-Other Fetish,Other Fetishes
-Underwear,Panty Shot
-Nampa,Picking Up Girls
-Prank,Pranks
-Incest,Relatives
-Rape,Reluctant
-Reserved Role,Reverse Pick Up
-SF,Sci-Fi
-Shaved,Shaved Pussy
-Transsexual,Shemale
-Sport,Sports
-"Psycho, Thriller",Thriller
-Slave,Training
-Planning,Variety
-Anal,Anal Play
-Electric Massager,Big Vibrator
-Blow,Blowjob
-Restraints,Bondage
-Breast Milk,Breast Milk
-Bukkake,BUKKAKE
-Cum,Cum Swallowing
-Deep Throating,Deep Throat
-Dirty Words,Dirty Talk
-Cruel Expression,Domination
-Egg Vibrator,Egg Vibrator
-Facesitting,Face Sitting
-Facials,Facial
-Finger Fuck,Fingering
-Piss Drinking,Golden Shower
-Speculum,Gyno Exam
-Evil,Hard Sex
-Promiscuity,Harlem
-Huge Cock,Huge Dick - Large Dick
-Abuse,Humiliation
-Hypnosis,Hypnotism
-Kiss,Kiss Kiss
-Lesbian Kiss,Lesbian Kissing
-Submissive Men,Masochist Man
-Foreign Objects,Object Insertion
-Defecation,Pooping
-Subjectivity,POV
-Premature Ejaculation,Premature Ejaculation
-Impromptu Sex,Quickie
-Restraint,Ropes & Ties
-Dark System,Serious
-Toy,Sex Toys
-Humiliation,Shame
-Tentacle,Shokushu
-Drug,Substance Use
-Sweat,Sweating
-"3P, 4P",Threesome - Foursome
-Time Stop,Time Warp
-Vibe,Vibrator
-"Best, Omnibus",Actress Best Compilation
-"Best, Omnibus",Compilation
-Experience Confession,Confessional
-Debut Production,Debut
-Digital Mosaic,Digital Mosaic
-VR,VR Exclusive
-POV,Gonzo
-High Quality VR,High-Quality VR
-User Submission,Homemade
-Image Video,Idol Video
-Independents,Independent
-Exposure,Outdoor
-Risky Mosaic,Minimal Mosaic
-Over 16 Hours,More Than 16 Hours Of Footage
-Other,Others
-4HR+,Over 4 Hours
-Reprinted Edition,Reprint
-Multiple Story,Series
+
diff --git a/src/Javinizer/jvSettings.json b/src/Javinizer/jvSettings.json
@@ -67,6 +67,7 @@
   "sort.format.trailervid": "<ID>-trailer",
   "sort.format.nfo": "<ID>",
   "sort.format.screenshotimg": "fanart",
+  "sort.format.screenshotimg.padding": 1,
   "sort.format.screenshotfolder": "extrafanart",
   "sort.format.actressimgfolder": ".actors",
   "sort.metadata.nfo.mediainfo": false,