mirror of
https://github.com/qaiu/netdisk-fast-download.git
synced 2026-04-19 23:26:55 +00:00
Merge pull request #177 from qaiu/pr-177
# Conflicts: # parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java # parser/src/test/java/cn/qaiu/parser/PanDomainTemplateTest.java
This commit is contained in:
@@ -115,9 +115,9 @@ public enum PanDomainTemplate {
|
|||||||
"https://www.feijix.com/s/{shareKey}",
|
"https://www.feijix.com/s/{shareKey}",
|
||||||
FjTool.class),
|
FjTool.class),
|
||||||
|
|
||||||
// https://lecloud.lenovo.com/share/
|
// https://lecloud.lenovo.com/share/ https://lecloud.lenovo.com/mshare/
|
||||||
LE("联想乐云",
|
LE("联想乐云",
|
||||||
compile("https://lecloud\\.lenovo\\.com/share/(?<KEY>.+)"),
|
compile("https://lecloud\\.lenovo\\.com/m?share/(?<KEY>.+)"),
|
||||||
"https://lecloud.lenovo.com/share/{shareKey}",
|
"https://lecloud.lenovo.com/share/{shareKey}",
|
||||||
LeTool.class),
|
LeTool.class),
|
||||||
|
|
||||||
|
|||||||
@@ -161,14 +161,23 @@ public class PanDomainTemplateTest {
|
|||||||
public void testLePatternFix() {
|
public void testLePatternFix() {
|
||||||
Pattern lePattern = PanDomainTemplate.LE.getPattern();
|
Pattern lePattern = PanDomainTemplate.LE.getPattern();
|
||||||
|
|
||||||
// lecloud.lenovo.com 应匹配
|
// /share/ 格式应匹配
|
||||||
Matcher m1 = lePattern.matcher("https://lecloud.lenovo.com/share/abc123");
|
Matcher m1 = lePattern.matcher("https://lecloud.lenovo.com/share/abc123");
|
||||||
assertTrue("LE should match lecloud.lenovo.com", m1.find());
|
assertTrue("LE should match /share/ format", m1.find());
|
||||||
assertEquals("abc123", m1.group("KEY"));
|
assertEquals("abc123", m1.group("KEY"));
|
||||||
|
|
||||||
// leclou.lenovo.com (去掉'd') 不应匹配(原 lecloud? 的 bug)
|
// /mshare/ 格式应匹配
|
||||||
|
Matcher m2 = lePattern.matcher("https://lecloud.lenovo.com/mshare/xyz789");
|
||||||
|
assertTrue("LE should match /mshare/ format", m2.find());
|
||||||
|
assertEquals("xyz789", m2.group("KEY"));
|
||||||
|
|
||||||
|
// leclou.lenovo.com (去掉'd') 不应匹配
|
||||||
assertFalse("LE should NOT match leclou.lenovo.com",
|
assertFalse("LE should NOT match leclou.lenovo.com",
|
||||||
lePattern.matcher("https://leclou.lenovo.com/share/abc123").find());
|
lePattern.matcher("https://leclou.lenovo.com/share/abc123").find());
|
||||||
|
|
||||||
|
// 错误路径不应匹配
|
||||||
|
assertFalse("LE should NOT match wrong path",
|
||||||
|
lePattern.matcher("https://lecloud.lenovo.com/s/abc123").find());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user