Optimize the MH50 code

Haleydu · Dec 4, 2020 · 6691723 · 6691723
1 parent 4ed0ec7
commit 6691723
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/MH50.java b/app/src/main/java/com/hiroshi/cimoc/source/MH50.java
@@ -15,8 +15,6 @@
 import com.hiroshi.cimoc.parser.NodeIterator;
 import com.hiroshi.cimoc.parser.SearchIterator;
 import com.hiroshi.cimoc.parser.UrlFilter;
-import com.hiroshi.cimoc.rx.RxBus;
-import com.hiroshi.cimoc.rx.RxEvent;
 import com.hiroshi.cimoc.soup.Node;
 import com.hiroshi.cimoc.utils.DecryptionUtils;
 import com.hiroshi.cimoc.utils.HttpUtils;
@@ -40,6 +38,7 @@ public class MH50 extends MangaParser {
 
     public static final int TYPE = 80;
     public static final String DEFAULT_TITLE = "漫画堆";
+    public static final String  baseUrl = "https://m.manhuadai.com";
 
     public static Source getDefaultSource() {
         return new Source(null, DEFAULT_TITLE, TYPE, true);
@@ -52,7 +51,7 @@ public MH50(Source source) {
     @Override
     public Request getSearchRequest(String keyword, int page) {
         if (page == 1) {
-            String url = StringUtils.format("https://m.manhuadai.com/search/?keywords=%s&page=%d", keyword, page);
+            String url = StringUtils.format(baseUrl+"/search/?keywords=%s&page=%d", keyword, page);
             return HttpUtils.getSimpleMobileRequest(url);
         }
         return null;
@@ -77,17 +76,17 @@ protected Comic parse(Node node) {
 
     @Override
     public String getUrl(String cid) {
-        return StringUtils.format("https://m.manhuadai.com/manhua/%s/", cid);
+        return StringUtils.format(baseUrl + "/manhua/%s/", cid);
     }
 
     @Override
     protected void initUrlFilterList() {
-        filter.add(new UrlFilter("m.manhuadai.com"));
+        filter.add(new UrlFilter(baseUrl));
     }
 
     @Override
     public Request getInfoRequest(String cid) {
-        String url = StringUtils.format("https://m.manhuadai.com/manhua/%s/", cid);
+        String url = StringUtils.format(baseUrl + "/manhua/%s/", cid);
         return HttpUtils.getSimpleMobileRequest(url);
     }
 
@@ -121,15 +120,16 @@ public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) {
 
     @Override
     public Request getImagesRequest(String cid, String path) {
-        String url = StringUtils.format("https://m.manhuadai.com/manhua/%s/%s", cid, path);
+        String url = StringUtils.format(baseUrl + "/manhua/%s/%s", cid, path);
         return HttpUtils.getSimpleMobileRequest(url);
     }
 
     private final String[] server = {
             "https://mhcdn.manhuazj.com",
             "https://manga8.mlxsc.com",
             "https://manga9.mlxsc.com",
-            "https://img01.eshanyao.com"
+            "https://img01.eshanyao.com",
+            "https://imgdm.eshanyao.com/"
     };
 
     @Nullable
@@ -147,7 +147,7 @@ private String decrypt(String code) {
     private String getImageUrlByKey(String key, String domain, String chapter) {
         if (key.startsWith("http://images.dmzj.com")) {
             try {
-                return domain +"/showImage.php?url=" + key;
+                return "https://imgdm.eshanyao.com/showImage.php?url=" + key;
             } catch (Exception e) {
                 return null;
             }
@@ -180,13 +180,12 @@ public List<ImageUrl> parseImages(String html,Chapter chapter) {
         int imageListSize = imageList.size();
         for (int i = 0; i != imageListSize; ++i) {
             String key = imageList.getString(i);
-            String imageUrl = getImageUrlByKey(key, server[3], chapterPath);
-            if(imageUrl.contains("images.dmzj.com")) {
+            String imageUrl = getImageUrlByKey(key, server[0], chapterPath);
+            if (imageUrl != null && imageUrl.contains("images.dmzj.com")) {
                 imageUrl = imageUrl.replace("%", "%25");
             }
             Long comicChapter = chapter.getId();
             Long id = Long.parseLong(comicChapter + "000" + i);
-            //list.add(new ImageUrl(i + 1, imageUrl, false));
             list.add(new ImageUrl(id, comicChapter, i + 1, imageUrl, false));
         }
         return list;
@@ -234,9 +233,9 @@ public String getFormat(String... args) {
                     .concat(args[CATEGORY_PROGRESS]).trim();
             String finalPath;
             if (path.isEmpty()) {
-                finalPath = StringUtils.format("https://m.manhuadai.com/list/");
+                finalPath = StringUtils.format(baseUrl + "/list/");
             } else {
-                finalPath = StringUtils.format("https://m.manhuadai.com/list/%s/?page=%%d", path).replaceAll("\\s+", "-");
+                finalPath = StringUtils.format(baseUrl + "/list/%s/?page=%%d", path).replaceAll("\\s+", "-");
             }
             return finalPath;
         }