Merge pull request #166 from jvlflame/dev

2.2.3
javinizer · Dec 23, 2020 · e5a0b37 · e5a0b37
2 parents 838e83e + 7d28da8
commit e5a0b37
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.2.3]
+
+### Fixed
+
+-   Additional fixes to Dmm ID matcher
+
 ## [2.2.2]
 
 ### Fixed

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

diff --git a/src/Javinizer/Private/Scraper.Dmm.ps1 b/src/Javinizer/Private/Scraper.Dmm.ps1
@@ -6,7 +6,7 @@ function Get-DmmContentId {
 
     process {
         try {
-            $contentId = ($Url | Select-String -Pattern 'cid=(.*)(\/)?').Matches.Groups[1].Value
+            $contentId = (($Url | Select-String -Pattern 'cid=(.*)(\/)?').Matches.Groups[1].Value -split '/')[0]
         } catch {
             return
         }

diff --git a/src/Javinizer/Public/Get-DmmUrl.ps1 b/src/Javinizer/Public/Get-DmmUrl.ps1
@@ -75,7 +75,7 @@ function Get-DmmUrl {
 
                         $resultId = Get-DmmId -Url $result
                         Write-JVLog -Write:$script:JVLogWrite -LogPath $script:JVLogPath -WriteLevel $script:JVLogWriteLevel -Level Debug -Message "[$originalId] [$($MyInvocation.MyCommand.Name)] Result [$count] is [$resultId]"
-                        if ($resultId -eq "$Id") {
+                        if ($resultId -eq $originalId) {
                             $directUrl = $result
                             break
                         }