diff --git a/Animelibk.ps1 b/Animelibk.ps1 index d4778a1..0bafd2c 100644 --- a/Animelibk.ps1 +++ b/Animelibk.ps1 @@ -68,14 +68,14 @@ function Get-StandName { # 因應檔名不同而設定多組正規方式 $EpisodeRegex = @( - "S\d{2}[\s\-]+E?(?\d{2})" + "(?:S\d{2})?[\s]?-[\s]E?(?\d{2})" "[\[\b\s](?\d{2})[\s_]?(?:[vV]\d|END|FIN)[\]\b\s]" "\[(?\d{1,2})\w{2}\]" "\[(?\d{1,2})\]" ) $NameRegex = @( - "[\[\b\s](?[^\[\]]*)[\]\b\s]$" + "[\[\b\s](?[^\[\]]*)[\]\b\s]?$" ) $Result = $File.Name | % { Get-NameRegex $_ -Regex $EpisodeRegex } | % { $(Get-NameRegex $_["L"] -Regex $NameRegex -Exclude "(BD|DVD|HDTV)RIP" -End) + $_ } @@ -145,8 +145,8 @@ exit 0; # SIG # Begin signature block # MIIFxwYJKoZIhvcNAQcCoIIFuDCCBbQCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR -# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUoj6O9AeGdF5M/FWDj5z18zw0 -# 4JqgggNSMIIDTjCCAjagAwIBAgIQdMnAQ4BDAo9Lgfn+QeDdhjANBgkqhkiG9w0B +# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUzpa6yRqDt6vn1FR492vYk7Qt +# K/OgggNSMIIDTjCCAjagAwIBAgIQdMnAQ4BDAo9Lgfn+QeDdhjANBgkqhkiG9w0B # AQUFADAqMRMwEQYDVQQDDApOaWNrIENoYW5nMRMwEQYDVQQKDAplYXJpY2sub3Jn # MB4XDTIxMTAzMTEwMDI1MVoXDTIyMTAzMTEwMjI1MVowMzEiMCAGCSqGSIb3DQEJ # ARYTcGNuaWNrMTAwQGdtYWlsLmNvbTENMAsGA1UEAwwETmljazCCASIwDQYJKoZI @@ -167,11 +167,11 @@ exit 0; # AgEBMD4wKjETMBEGA1UEAwwKTmljayBDaGFuZzETMBEGA1UECgwKZWFyaWNrLm9y # ZwIQdMnAQ4BDAo9Lgfn+QeDdhjAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEK # MAigAoAAoQKAADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3 -# AgELMQ4wDAYKKwYBBAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUZh3cBrwgHvdFbQwV -# WcdOMvw1legwDQYJKoZIhvcNAQEBBQAEggEAGR0QzX3t1drjorcTh759QopFrvNd -# bb9VtZx5OJsLD8/v4YuNBB0IYT+03OSK7jWyIyH5OEj/jTn/Uj1WG37vu/GDdsmm -# dp/3PWziGclgh0QrJmZjQPavqFXHpUrRCIQqT2J9Er4zMf95zWEu1Zsgpb/DNJqu -# 4gz5d7Yn+wllud0DuOiQDwz9fpSz+lgMhMybqR+wsW8ROLvzCuTHJaNvKffm7vFG -# NjbwZccH9xULGbAakX6H2lbcaMqGlkLYVkP3FRmk2zTG+qR4jxHzYhsttKb2ClSt -# L2qRWv7KJCPnw4RpFx/+L9buDHH25QERiINEOPF/pfpqHhaENTolaUe7vg== +# AgELMQ4wDAYKKwYBBAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUfy6S1ZZuvCyXbcTa +# +Mg7R++MiHYwDQYJKoZIhvcNAQEBBQAEggEADY8L0/u6xP/HsZnp4vFEMngDCcEU +# +tZYJZOk2bRN0BGMAnsVISg5EZ/3rilagNYT2LIDGpxUN8bQDltHviL5KGSiUVJB +# 9M/Ez58/SAXvmc1komq5iqWnLfxSc4GTPMoDZYrsZNT5HF6lThMeHul+tjFRo9vN +# z3yYj40hXHHqdpPm2s9Qk1xfi8eu05l3k98x4sB8tflvchZzzeNq18kK/VdjRVWm +# WW8Y+6tX6uk43sd9RJ5x10j/kBK89bm6FrtLrAoZj7bYPESsxHtn7wgNEqqi0stv +# 1BJrRj960K6Irhxx0jxTAj9xcv7LAFH/OuS/09/s5wbR6Os/fwGY3fILyg== # SIG # End signature block