修改字幕库下载失败问题

Andyfoo · Jan 1, 2020 · 225ba3a · 225ba3a
1 parent 849f7b1
commit 225ba3a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/__upgrade_files/SubTitleSearcher.exe b/__upgrade_files/SubTitleSearcher.exe
diff --git a/_upgrade/last b/_upgrade/last
@@ -1,7 +1,7 @@
 {
- "version" : "2.0.6",
+ "version" : "2.0.7",
  "type" : "exe",
- "sign" : "E29DE3FE0C52B62EA70B13859B48CD33",
+ "sign" : "607ABA7C06977F72B35339FBD9A2FF27",
  "desc" : "修改字幕库下载失败问题",
  "url" : "https://github.com/Andyfoo/SubTitleSearcher/raw/master/__upgrade_files/SubTitleSearcher.exe",
 } 
diff --git a/src/main/java/zimu/AppConfig.java b/src/main/java/zimu/AppConfig.java
@@ -7,7 +7,7 @@ public class AppConfig {
  public static String appName = "SubTitleSearcher";
  public static String appTitle = "字幕下载";
  //public static String appTitle = "SubTitleSearcher";
- public static String appVer = "2.0.6";
+ public static String appVer = "2.0.7";
 
  public static String appPath;
  public static boolean isExe;

diff --git a/src/main/java/zimu/common/sites/ZIMuKuCommon.java b/src/main/java/zimu/common/sites/ZIMuKuCommon.java
@@ -71,10 +71,13 @@ public static JSONArray DownList(String fileName) throws Exception {
  public static JSONObject downContent(String url) {
  String result = httpGet(baseUrl+url);
  String downUrl = RegexUtil.getMatchStr(result, 
- "<a\\s+id=\"down1\"\\s+href=\"(/dld/[\\w]+\\.html)\""
+ "<a\\s+id=\"down1\"\\s+href=\"([^\"]*/dld/[\\w]+\\.html)\""
  , Pattern.DOTALL);
  if(downUrl == null)return null;
- downUrl = baseUrl + downUrl;
+ if(!downUrl.startsWith("http")) {
+ downUrl = baseUrl + downUrl;
+ }
+
  result = httpGet(downUrl);
  if(result == null)return null;
  //System.out.println(result);