@@ -17,52 +17,11 @@ from userio import *

 server = None

 csvFilename = None

 connectionResults = None

-

-def completedManganeloTV(genre):

-  if genre is None:

-    genre=""

-  url = "https://manganelo.tv/genre/"+genre+"?state=completed" 

-  say("display by genre: ["+genre+"]")

-  say(url)

-  pageContent = ""

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

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

-  pageContent += "</div>\n"

-  pageContent += "<div class=\"row\">\n"

-  if configuration.get_debug() != 0:

-    pageContent += "<p>Request: "+url+"</p>\n"

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

-  content = r.text

-  #pageContent += content

-  articleCstBegin="<div class=\"panel-content-genres\">"

-  articleCstEnd="<div class=\"panel-page-number\">"

-  indexBegin = content.index(articleCstBegin)

-  indexEnd   = content.index(articleCstEnd)

-  dataContent = content[indexBegin+len(articleCstBegin):indexEnd]

-  dataContent = re.sub(r"<span class=\"genres-item-time\">(.*?)</span>", '', dataContent)

-  dataContent = re.sub(r"<span class=\"genres-item-view\">(.*?)", '<span>', dataContent)

-  dataContent = re.sub(r"onerror=\"javascript:this.src='/res/img/404_not_found.webp';\" ", '', dataContent)

-  dataContent = re.sub(r"href=\"\/", 'href=\"//manganelo.tv/', dataContent)

-  dataContent = re.sub(r"src=\"\/", 'src=\"//manganelo.tv/', dataContent)

-  dataContent = re.sub(r"<a rel=\"nofollow\" class=\"genres-item-img\" href=\"", '<a target="new" href="', dataContent)

-  dataContent = re.sub(r"<a rel=\"nofollow\" class=\"genres-item-chap text-nowrap a-h\" href=\"", '<a target="new" href="./?url=https:', dataContent)

-  dataContent = re.sub(r"<a rel=\"nofollow\" class=\"genres-item-readmore\" href=\"(.*)\">Read more</a>", '', dataContent)

-  dataContent = re.sub(r"<i class=\"genres-item-description-linear\"></i>", '', dataContent)

-  dataContent = re.sub(r"<em class=\"genres-item-rate\">(.*)</em>", '', dataContent)

-  dataContent = re.sub(r"<span class=\"genres-item-author\">(.*?)</span>", '<p class="genres-item-description">\g<1></p>', dataContent)

-  dataContent = re.sub(r"<div class=\"genres-item-info\">", '<div>', dataContent)

-  dataContent = re.sub(r"<div class=\"content-genres-item\">", '<div class="content-genres-item"><hr>', dataContent)

-  dataContent = re.sub(r"<span>(.*),(.*)", '<span>', dataContent)

-  pageContent += "</div>\n"

-  pageContent += dataContent

-

-  return pageContent

+opacity = -1

 def getReadManganatoCOM(url):

-  debug("getReadManganatoCOM: "+url)

-  #if "manganelo.com" in url:

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

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

+  global opacity

+  say("getReadManganatoCOM: "+url)

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

   content = r.text

@@ -90,12 +49,8 @@ def getReadManganatoCOM(url):

             linkPrev=subLine.split("\"")[5]

     elif "<img src=\"" in line:

       if ".jpg" in line:

-        #print("============="+line)

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

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

-          #print("============="+subLine)

           if ".jpg" in subLine:

-            #print(line.split("\"")[1])

             listImages.append(subLine.split("\"")[1])

             debug(line.split("\"")[1])

@@ -140,11 +95,13 @@ def getReadManganatoCOM(url):

   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"

-  opacityValue=2;

-  if 7 <= datetime.datetime.now().hour and 20 >= datetime.datetime.now().hour:

-    opacityValue=10;

+  if opacity == -1:

+    opacityValue=2;

+    if 7 <= datetime.datetime.now().hour and 20 >= datetime.datetime.now().hour:

+      opacityValue=10;

+    opacity=opacityValue

   pageContent += "  <span id=\"mangaOpacityMinus\" onclick=\"onOpacityMinus()\">&#9788;</span>"

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

+  pageContent += "  <span id=\"mangaOpacityValue\">"+str(opacity)+"</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>\n"

@@ -177,6 +134,7 @@ def getReadManganatoCOM(url):

   return pageContent

 def getMangakakalotCom(url):

+  global opacity

   debug("getMangakakalotCom :"+url)

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

   content = r.text

@@ -256,11 +214,13 @@ def getMangakakalotCom(url):

   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"

-  opacityValue=2;

-  if 7 <= datetime.datetime.now().hour and 20 >= datetime.datetime.now().hour:

-    opacityValue=10;

+  if opacity == -1:

+    opacityValue=2;

+    if 7 <= datetime.datetime.now().hour and 20 >= datetime.datetime.now().hour:

+      opacityValue=10;

+    opacity=opacityValue

   pageContent += "  <span id=\"mangaOpacityMinus\" onclick=\"onOpacityMinus()\">&#9788;</span>"

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

+  pageContent += "  <span id=\"mangaOpacityValue\">"+str(opacity)+"</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>\n"

@@ -293,17 +253,12 @@ def getMangakakalotCom(url):

   return pageContent

 def getManganeloTV(url):

+  global opacity

   debug("getManganeloTV :"+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

@@ -333,8 +288,10 @@ def getManganeloTV(url):

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

       if ".jpg" in line:

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

-  print("NEXT :"+linkNext)

-  print("PREV :"+linkPrev)

+  if None is not linkNext:

+    print("NEXT :"+linkNext)

+  if None is not linkPrev:

+    print("PREV :"+linkPrev)

   if 0 == len(listImages):

     # Attempt to extract images once more, most likely all are on one line

@@ -385,11 +342,13 @@ def getManganeloTV(url):

   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"

-  opacityValue=2;

-  if 7 <= datetime.datetime.now().hour and 20 >= datetime.datetime.now().hour:

-    opacityValue=10;

+  if opacity == -1:

+    opacityValue=2;

+    if 7 <= datetime.datetime.now().hour and 20 >= datetime.datetime.now().hour:

+      opacityValue=10;

+    opacity=opacityValue

   pageContent += "  <span id=\"mangaOpacityMinus\" onclick=\"onOpacityMinus()\">&#9788;</span>"

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

+  pageContent += "  <span id=\"mangaOpacityValue\">"+str(opacity)+"</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>\n"

@@ -426,6 +385,7 @@ class MyServer(BaseHTTPRequestHandler):

         # To silence the default output of server (too verbose)

         return  

     def do_GET(self):

+        global opacity

         global csvFilename

         global csvFilenameTemp

         global connectionResults

@@ -484,6 +444,14 @@ class MyServer(BaseHTTPRequestHandler):

             data_page = ""

+            opacity=-1

+            #try:

+                #if urlArgs['opacity'] is not None:

+                #    opacity=urlArgs['opacity'][0]

+                #print(self)

+            #except:

+                #pass

+

             #Forging response

             #if configuration.get_debug() != 0:

             #    data_page += "<p>Request: "+self.path+"</p>\n"

@@ -13,9 +13,15 @@

     setTimeout(onArticle(0), 500);

   }

   window.onload = init;

+  function changeHref() {

+    var curOpacity = parseInt(document.getElementById("mangaOpacityValue").innerHTML);

+    var curPage = parseInt(document.getElementById("mangaCurrPage").innerHTML);

+    location.href="#opacity="+curOpacity+"&page="+curPage;

+  }

   function changeOpacity() {

     var curOpacity = parseInt(document.getElementById("mangaOpacityValue").innerHTML);

     document.getElementById("article-current").style.opacity = curOpacity/10;

+    changeHref();

   }

   function onOpacityPlus() {

     var curOpacity = parseInt(document.getElementById("mangaOpacityValue").innerHTML);

@@ -44,7 +50,14 @@

   function onChapterNext() {

     var el = document.getElementsByClassName("mangaChapNavigNext")[0];

     var elLink = el.getElementsByTagName("a")[0].getAttribute("href");

-    location.href=elLink;

+    var indexHash=location.href.indexOf("#");

+    if( -1 != indexHash) {

+      var curHref = location.href.substring(indexHash);

+      location.href=elLink + curHref;

+    } else {

+      location.href=elLink;

+    }

+    //location.href=elLink;

   }

   function onChapterPrev() {

     var el = document.getElementsByClassName("mangaChapNavigPrev")[0];

@@ -100,7 +113,7 @@

       x.className = string_index;

       document.getElementById("article-current").innerHTML =

       document.getElementById(string_index).innerHTML;

-      location.href = "#article-top";

+      location.href = "#";

       //console.log(document.getElementById(string_index).innerHTML);

       document.getElementById("mangaCurrPage").innerHTML = index+1;

     }