v1.99

raulhaag · Mar 11, 2019 · dd1f256 · dd1f256
1 parent f036397
commit dd1f256
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,11 @@ Downloads
 
 Changelog
 ---------
+Cambios en v1.99:
+* Fix mangahere and fanfox.
+
+Changes in v1.99:
+* Fix mangahere and fanfox.
 
 Cambios en v1.98:
 * Un par de server arreglados y una mejora.

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     buildToolsVersion '28.0.2'
     defaultConfig {
         applicationId "ar.rulosoft.mimanganu"
-        versionCode 98
-        versionName "1.98"
+        versionCode 99
+        versionName "1.99"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         minSdkVersion 15
     }

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/MTownBase.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/MTownBase.java
@@ -137,25 +137,32 @@ public String getImageFrom(Chapter chapter, int page) throws Exception {
     public void chapterInit(Chapter chapter) throws Exception {
         String web = getHost() + chapter.getPath();
         String data = getNavigatorWithNeededHeader().get(web);
-        int pages = Integer.parseInt(getLastMatchDefault("data-page=\"(\\d+)\">(\\d+)", data, "1"));
-        if (pages == -1 && !data.contains(">&gt;</a>")) pages = 1;
+        int pages = Integer.parseInt(getLastMatchDefault("data-page=\"(\\d+)\">(\\d+)", data, "-1"));
         if (pages != -1) {
-            String cid = getFirstMatch("chapterid\\s*=\\s*(\\d+)", data, "Error on chapter initialization (1)");
-            data = getFirstMatch("javascript\">\\s*(eval\\(.+?)</script>", data, "Error on chapter initialization (3)");
-            data = getFirstMatch("guidkey\\s*=(.+?);", Util.getInstance().unpack(data), "Error on chapter initialization (4)");
-            ArrayList<String> keyp = getAllMatch("'([\\d|a|b|c|d|e|f])'", data);
-            StringBuilder key = new StringBuilder();
-            for (String string : keyp) {
-                key.append(string);
-            }
-            web = web.substring(0, web.length() - 6);
-            chapter.setPages(pages);
-            chapter.setExtra("1|" + cid + "|" + web + "|" + key.toString());
+            cim1(data, web, chapter, pages);
         } else {
-            data = getFirstMatch("\\['(.+?)'\\]", Util.getInstance().unpack(data), "Error on chapter initialization (0)");
-            chapter.setExtra("0|" + data.replaceAll("','", "|"));
-            chapter.setPages(data.split("','").length);
+            String data2 = getFirstMatchDefault("\\['(.+?)'\\]", Util.getInstance().unpack(data), "");
+            if (data2.equals("")) {
+                cim1(data, web, chapter, 1);
+                return;
+            }
+            chapter.setExtra("0|" + data2.replaceAll("','", "|"));
+            chapter.setPages(data2.split("','").length);
+        }
+    }
+
+    private void cim1(String data, String web, Chapter chapter, int pages) throws Exception {
+        String cid = getFirstMatch("chapterid\\s*=\\s*(\\d+)", data, "Error on chapter initialization (1)");
+        data = getFirstMatch("javascript\">\\s*(eval\\(.+?)</script>", data, "Error on chapter initialization (3)");
+        data = getFirstMatch("guidkey\\s*=(.+?);", Util.getInstance().unpack(data), "Error on chapter initialization (4)");
+        ArrayList<String> keyp = getAllMatch("'([\\d|a|b|c|d|e|f])'", data);
+        StringBuilder key = new StringBuilder();
+        for (String string : keyp) {
+            key.append(string);
         }
+        web = web.substring(0, web.length() - 6);
+        chapter.setPages(pages);
+        chapter.setExtra("1|" + cid + "|" + web + "|" + key.toString());
     }
 
     @Override

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="update_message">Cambios en v1.98:\n\t* Un par de server arreglados y una mejora.\n\t* Arreglado error en preferencias y removido el sufijo de fdroid.</string>
+    <string name="update_message">Cambios en v1.99:\n\t* Fix mangahere and fanfox.</string>
     <string name="action_ajustar_a">Ajustar a</string>
     <string name="descargas">Descargas</string>
     <string name="datosde">Datos de </string>
@@ -32,8 +32,8 @@
     <string name="descargando">(Descargando)</string>
     <string name="descargado">(Descargado)</string>
     <string name="error">(Error)</string>
-    <string name="apachelic">Licencia Apache</string>
     <string name="mitlic">Licencia MIT</string>
+    <string name="apachelic">Licencia Apache</string>
     <string name="marcarleido">Marcar como leído</string>
     <string name="esconder_de_galeria_subtitle">Esconder imágenes descargadas de la galería</string>
     <string name="descarga_no_leidos">Descargar no leídos</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="update_message">Changes in v1.98:\n\t* A couple of server fixed and a improve.\n\t* Fix pref look and remove fdroid suffix.</string>
+    <string name="update_message">Changes in v1.99:\n\t* Fix mangahere and fanfox.</string>
     <string name="_12hours">12 Hours</string>
     <string name="_1day">1 day</string>
     <string name="_2day">2 days</string>