@@ -6,6 +6,7 @@

     "csvTemp": "output.temp",

     "debug": 0,

     "logfile": "output.log",

+    "favorite": "favorite.txt",

     "name": "Proxy",

     "port": 8080,

     "version": "1.0",

@@ -42,6 +42,7 @@ default_config = {

     "port": 8080,

     "address": "0.0.0.0",

     "logfile": "output.log",

+    "favorite": "favorite.txt",

     "csv": "output.csv",

     "csvTemp": "output.temp",

     "csvMax": 10,

@@ -59,6 +60,9 @@ def get_debug():

 def get_logfile():

     return server['logfile']

+def get_favorite():

+    return server['favorite']

+    

 def get_pageBegin():

     return server['pageStart']

@@ -60,11 +60,16 @@ def completedManganeloTV(genre):

 def getManganeloTV(url):

   debug("Downloading: "+url)

-  if "manganelo.com" in url:

-    url=url.replace("manganelo.com","manganelo.tv")

-    say("Replace URL:"+url)

+  #if "manganelo.com" in url:

+  #  url=url.replace("manganelo.com","manganelo.tv")

+  #  say("Replace URL:"+url)

   r = requests.get(url, allow_redirects=True)

   content = r.text

+

+  isMangakakalot = 0

+  if "mangakakalot.com" in url:

+    isMangakakalot = 1

+

   #print(r.text)

   lineNextChapter = None

   linePreviousChapter = None

@@ -76,10 +81,21 @@ def getManganeloTV(url):

     if "navi-change-chapter-btn-prev a-h" in line and linePreviousChapter is None:

       linePreviousChapter = line

     elif "navi-change-chapter-btn-next a-h" in line and lineNextChapter is None:

-      # ~ print("Found at"+str(line))

+      print("Found at"+str(line))

       lineNextChapter = line

+

     elif "<meta property=\"og:title\" content=\"" in line and lineTitle is None:

       lineTitle = line

+

+    elif isMangakakalot == 1 and "<div class='btn-navigation-chap'>" in line and lineNextChapter is None and linkNext is None:

+      for subLine in line.split("><"):

+        if "NEXT CHAPTER" in subLine:

+          linkNext=subLine.split("'")[1]

+    elif isMangakakalot == 1 and "<div class='btn-navigation-chap'>" in line and linePreviousChapter is None and linkPrev is None:

+      for subLine in line.split("><"):

+        if "PREV CHAPTER" in subLine:

+          linkPrev=subLine.split("'")[1]

+

     elif "<img class=\"img-loading\" data-src=\"" in line:

       if ".jpg" in line:

         listImages.append(line.split("\"")[3])    

@@ -120,7 +136,10 @@ def getManganeloTV(url):

       linkNext="https://manganelo.tv"+lineNextChapter.split("\"")[5]

   mangaImagesNum = len(listImages)

-  mangaTitle=lineTitle.split("\"")[3].split(" - Manganelo")[0]

+  if not isMangakakalot:

+    mangaTitle=lineTitle.split("\"")[3].split(" - Manganelo")[0]

+  else:

+    mangaTitle=lineTitle.split("\"")[3].split(" - Mangakakalot.com")[0]

   say("Manga :"+mangaTitle)

   pageContent = ""

   pageContent += "<div class=\"mangaChapNavig\">\n"

@@ -130,8 +149,6 @@ def getManganeloTV(url):

   if linkNext is not None:

     pageContent += "  <div class=\"mangaChapNavigNext\"><a href=\"?url="+linkNext+"\"><div class=\"arrow-right\"></div><div class=\"arrow-right\"></div></a></div>\n"

   pageContent += "  <div class=\"mangaChapNavigHome\"><a href=\".\"><div class=\"arrow-up\"></div></a></div>\n"

-  #pageContent += "  <div class=\"mangaRead\" onclick=\"onArticle(0)\">&#x1F4D6;</div>\n"

-  #pageContent += "  <div class=\"mangaChapNavigHome\"><div class=\"arrow-down\" onclick=\"onArticle(0)\"></div><a></div>\n"

   pageContent += "  <span id=\"mangaCurrPage\"></span><span id=\"mangaNumPages\"> / "+str(mangaImagesNum)+"</span>\n"

   pageContent += "  <span id=\"mangaFSStatus\" style=\"display: none;\">0</span>\n"

   pageContent += "  <span id=\"mangaFSToggle\" onclick=\"openFullscreen();\"><div class=\"fs-on\"></div></span>\n"

@@ -142,8 +159,6 @@ def getManganeloTV(url):

   pageContent += "  <span id=\"mangaOpacityValue\">"+str(opacityValue)+"</span>"

   pageContent += "  <span id=\"mangaOpacityPlus\" onclick=\"onOpacityPlus()\">&#9728;</span>\n"

   pageContent += "  <span id=\"mangaReload\" onClick=\"window.location.reload();\"><div class=\"reload-circle\"></div></span>\n" 

-  #pageContent += "  <div class=\"column\" id=\"colLeft\" onclick=\"onArticle("+str(cpt-1)+")\">\n"

-  #pageContent += "  <div class=\"column\" id=\"colRight\" onclick=\"onArticle("+str(cpt+1)+")\">\n"

   pageContent += "</div>\n"

   pageContent += "<a name=\"article-top\"></a><div id=\"article-current\"></div>\n"

@@ -185,25 +200,23 @@ class MyServer(BaseHTTPRequestHandler):

         csvFilename = rootdir + server['csv']

         csvFilenameTemp = rootdir + server['csvTemp']

-        if '/genre.html' in self.path:

+        if '/list.html' in self.path:

             page=[]

             data_begin = ""

-            s = self.path

-            genre = None

-            if "genre" in s:

-                strGenre = "genre="

-                indexGenre = s.index(strGenre) 

-                genre = s[indexGenre+len(strGenre):len(s)] 

-            say(genre)

-

             with open(configuration.get_pageBegin(),'r') as fStart:

                 data_begin += fStart.read().replace( 'CSTAPPNAME', server['name'] )

             data_end = ""

             with open(configuration.get_pageEnd(),'r') as fEnd:

                 data_end += fEnd.read().replace( 'CSTAPPNAME', server['name'] ).replace( 'CSTAPPVERSION', server['version'] )

-            data_page = completedManganeloTV(genre)

+

+            data_page = ""

+            with open("list.html", "rt") as f:

+                lines=f.readlines()

+                for line in lines:

+                    data_page += "<li><a href=\"./?url="+line.split("@")[0]+"\">"+line.split("@")[1]+"</a></li>"

+                    f.close()

             page.append(data_begin)

             page.append(data_page)

             page.append(data_end)

@@ -248,10 +261,22 @@ class MyServer(BaseHTTPRequestHandler):

                     data_page += getManganeloTV(url)

                 elif "readmanganato.com" in url:

                     data_page += getManganeloTV(url)

+                elif "mangakakalot.com" in url:

+                    data_page += getManganeloTV(url)

                 else:

-                    date_page += "Unsupported hoster at "+url

+                    warn("Unsupported Hoster at "+url)

+                    data_page += "<span id=\"lbl\">Unsupported hoster at "+url+"</span>"

+                    data_page += "<div class=\"mangaChapNavigHome\"><a href=\".\"><div class=\"arrow-up\"></div></a></div>"

             else:

+                try:

+                    with open(server['favorite'], "rt") as f:

+                        lines=f.readlines()

+                        for line in lines:

+                            data_page += "<li><a href=\"./?url="+line+"\">"+line+"</a></li>"

+                        f.close()

+                except:

+                    pass

                 data_form = "<form action=\"\">\n\

 <span id=\"lbl\">Url:</span>\n\

 <input type=\"text\" id=\"srvIp\" name=\"url\" value=\"\">\n\

@@ -1,3 +1,4 @@

 #!/bin/bash

+cd /home/ycawidro/dev/mangaProxy

 screen -S manga python3 mangaProxy.py