X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=manga%2Fmangafox.py;h=b165d21aa4e11eddf6c02aa2a32ccda699073237;hb=30053c2cfe18b77da52df38daebbc91b3a2b5240;hp=8c23630c42a43b1419581ec9150b0eb394272c05;hpb=46b3b90eef4007f3f4e871afd4854f7a06c8bfc8;p=automanga.git

diff --git a/manga/mangafox.py b/manga/mangafox.py
index 8c23630..b165d21 100644
--- a/manga/mangafox.py
+++ b/manga/mangafox.py
@@ -6,7 +6,19 @@ soup = BeautifulSoup.BeautifulSoup
 class imgstream(lib.imgstream):
     def __init__(self, url):
         self.bk = urllib.urlopen(url)
-        self.ctype = self.bk.info()["Content-Type"]
+        ok = False
+        try:
+            if self.bk.getcode() != 200:
+                raise IOError("Server error: " + str(self.bk.getcode()))
+            self.ctype = self.bk.info()["Content-Type"]
+            self.clen = int(self.bk.info()["Content-Length"])
+            ok = True
+        finally:
+            if not ok:
+                self.bk.close()
+
+    def fileno(self):
+        return self.bk.fileno()
 
     def close(self):
         self.bk.close()
@@ -25,6 +37,7 @@ class page(lib.page):
         self.manga = self.volume.manga
         self.n = n
         self.id = str(n)
+        self.name = u"Page %s" % n
         self.url = url
         self.ciurl = None
 
@@ -37,6 +50,12 @@ class page(lib.page):
     def open(self):
         return imgstream(self.iurl())
 
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        return "<mangafox.page %r.%r.%r.%r>" % (self.manga.name, self.volume.name, self.chapter.name, self.name)
+
 class chapter(lib.pagelist):
     def __init__(self, volume, stack, id, name, url):
         self.stack = stack
@@ -116,7 +135,7 @@ class manga(lib.manga):
         if self.cvol is None:
             page = soup(htcache.fetch(self.url))
             vls = page.find("div", id="chapters").findAll("div", attrs={"class": "slide"})
-            self.cvol = []
+            cvol = []
             for i, vn in enumerate(reversed(vls)):
                 name = vn.find("h3", attrs={"class": "volume"}).contents[0].strip()
                 vid = name.encode("utf8")
@@ -138,7 +157,8 @@ class manga(lib.manga):
                     if url[-7:] != "/1.html":
                         raise Exception("parse error: unexpected chapter URL for %r: %s" % (self, url))
                     vol.ch.append(chapter(vol, vol.stack + [(vol, o)], chid, name, url[:-6]))
-                self.cvol.append(vol)
+                cvol.append(vol)
+            self.cvol = cvol
         return self.cvol
 
     def __str__(self):
@@ -152,7 +172,7 @@ def libalphacmp(a, b):
 
 class library(lib.library):
     def __init__(self):
-        self.base = "http://www.mangafox.com/"
+        self.base = "http://mangafox.me/"
 
     def alphapage(self, pno):
         page = soup(htcache.fetch(self.base + ("directory/%i.htm?az" % pno)))