Merge pull request #56 from jvlflame/staging

1.7.3
javinizer · Jul 13, 2020 · 9582c5d · 9582c5d
2 parents 939681b + f5dd84f
commit 9582c5d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,6 +5,17 @@ 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/).
 
+## [1.7.3]
+### Changed
+- Restored some scraper settings defaults
+    - .wmv to file extension default
+    - scrape-r18/dmm to true
+
+### Fixed
+- Added `-Strict` functionality to `-SetJavlibraryOwned`
+- Error when running with `-Multi` due to dev code
+
+
 ## [1.7.2]
 ### Added
 - Settings file validation for:

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

diff --git a/src/Javinizer/Public/Javinizer.ps1 b/src/Javinizer/Public/Javinizer.ps1
@@ -241,6 +241,7 @@ function Javinizer {
         [Parameter(ParameterSetName = 'JavLibrary')]
         [switch]$Recurse,
         [Parameter(ParameterSetName = 'Path', Mandatory = $false)]
+        [Parameter(ParameterSetName = 'JavLibrary')]
         [switch]$Strict,
         [Parameter(ParameterSetName = 'Path', Mandatory = $false)]
         [switch]$Force,
@@ -579,7 +580,7 @@ function Javinizer {
                     if (Test-Path -Path $SetJavLibraryOwned -PathType Leaf) {
                         $movieList = Get-Content -LiteralPath $SetJavLibraryOwned
                     } else {
-                        $movieList = (Convert-JavTitle -Path $SetJavLibraryOwned -Recurse:$Recurse -Settings $Settings).Id
+                        $movieList = (Convert-JavTitle -Path $SetJavLibraryOwned -Recurse:$Recurse -Settings $Settings -Strict:$Strict).Id
                     }
                 } catch {
                     Write-Error "[$(Get-TimeStamp)][$($MyInvocation.MyCommand.Name)] Error getting movies [$SetJavLibraryOwned]: $PSItem"
@@ -822,7 +823,6 @@ function Javinizer {
                                     if ($Settings.JavLibrary.'set-owned' -eq 'True') {
                                         $global:javlibraryOwnedMovies = $using:javlibraryOwnedMovies
                                     }
-                                    Import-Module X:\git\Projects\JAV-Organizer\src\Javinizer\Javinizer.psm1
                                     Javinizer -Path $using:filePath -DestinationPath:($using:DestinationPath) -ScriptRoot $using:ScriptRoot -Strict:($using:Strict) -MoveToFolder:($using:movePreference) -RenameFile:($using:renamePreference) -Force:($using:Force)
                                 } | Out-Null
                             }

diff --git a/src/Javinizer/settings.ini b/src/Javinizer/settings.ini
@@ -1,7 +1,7 @@
 [Main]
-scrape-r18=False
+scrape-r18=True
 scrape-r18zh=False
-scrape-dmm=False
+scrape-dmm=True
 scrape-javlibrary=True
 scrape-javlibraryja=False
 scrape-javlibraryzh=False
@@ -39,7 +39,7 @@ max-title-length=100
 max-path-length=255
 # This option will allow Javinizer to ignore video files below a certain size (in MB)
 minimum-filesize-to-sort=0
-included-file-extensions=asf,avi,flv,m4v,mkv,mp4,mov,rmvb
+included-file-extensions=asf,avi,flv,m4v,mkv,mp4,mov,rmvb,wmv
 excluded-file-strings=*-trailer.*,*-5.*
 # Allows you to use a regex string to match files if the default Javinizer matcher doesn't work
 # (e.g. In regex ([a-zA-Z|tT28]+-\d+z{0,1}Z{0,1}e{0,1}E{0,1})(?:-pt){0,1}(\d{1,2})? , "[ABP-123] Title text-pt3.mp4", match 1 is "ABP-123, match 2 is "3")