Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

better stacking solution if the filename "avatar.part1.avi" (stack no…

…w to "avatar", not "avatar.")
  • Loading branch information...
commit 2d12b3ab6151c8fc2c2b139c8cd0e155c4d8cd65 1 parent 71b1527
@DanCooper authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 EmberAPI/clsAPIStringUtils.vb
View
6 EmberAPI/clsAPIStringUtils.vb
@@ -40,7 +40,7 @@ Public Class StringUtils
Public Shared Function CleanStackingMarkers(ByVal sPath As String, Optional ByVal Asterisk As Boolean = False) As String
If AdvancedSettings.GetBooleanSetting("DisableMultiPartMedia", False) Then Return sPath
If String.IsNullOrEmpty(sPath) Then Return String.Empty
- Dim sReturn As String = Regex.Replace(sPath, AdvancedSettings.GetSetting("DeleteStackMarkers", "\|?((cd|dvd|part|dis[ck])([0-9]))"), If(Asterisk, "*", " "), RegexOptions.IgnoreCase).Trim
+ Dim sReturn As String = Regex.Replace(sPath, AdvancedSettings.GetSetting("DeleteStackMarkers", "\|?\-*\.*((cd|dvd|part|dis[ck])([0-9]))"), If(Asterisk, "*", " "), RegexOptions.IgnoreCase).Trim
If Not sReturn = sPath Then
Return Regex.Replace(sReturn, "\s\s(\s+)?", " ").Trim
Else
@@ -305,9 +305,9 @@ Public Class StringUtils
If AdvancedSettings.GetBooleanSetting("DisableMultiPartMedia", False) Then Return False
Dim bReturn As Boolean = False
If VTS Then
- bReturn = Regex.IsMatch(sName, AdvancedSettings.GetSetting("CheckStackMarkers", "\|?((cd|dvd|part|dis[ck])([0-9]))"), RegexOptions.IgnoreCase) OrElse Regex.IsMatch(sName, "^vts_[0-9]+_[0-9]+", RegexOptions.IgnoreCase)
+ bReturn = Regex.IsMatch(sName, AdvancedSettings.GetSetting("CheckStackMarkers", "\|?\-*\.*((cd|dvd|part|dis[ck])([0-9]))"), RegexOptions.IgnoreCase) OrElse Regex.IsMatch(sName, "^vts_[0-9]+_[0-9]+", RegexOptions.IgnoreCase)
Else
- bReturn = Regex.IsMatch(sName, AdvancedSettings.GetSetting("CheckStackMarkers", "\|?((cd|dvd|part|dis[ck])([0-9]))"), RegexOptions.IgnoreCase)
+ bReturn = Regex.IsMatch(sName, AdvancedSettings.GetSetting("CheckStackMarkers", "\|?\-*\.*((cd|dvd|part|dis[ck])([0-9]))"), RegexOptions.IgnoreCase)
End If
Return bReturn
End Function
Please sign in to comment.
Something went wrong with that request. Please try again.