@@ -59,7 +59,7 @@ def parse_page (data, chapter, chapter_num): def parse_image_url (data, page, page_num): soup = bs(data) image_url = soup.findAll("img", {"id":"mangaPage"})[0]["src"].split("_") - image_count = int(image_url[-1].split(".")[0]) + page_num + image_count = int(image_url[-1].split(".")[0])# + page_num ext = image_url[-1].split(".")[1] image_url = "%s_%s.%s" % (image_url[0], str(image_count), ext) backends/MangaVolume.py @@ -86,10 +86,10 @@ class DownloadManager (threading.Thread): if not name: name = str(len(self.queue)) self.queque[name] = (url, URL, CallBack) - def DirectDownload (self, url, URL, name=None): + def DirectDownload (self, url, URL, name=None, force_download=False): if not name: name = url - if name in self.completed: + if (name in self.completed) and (not force_download): return self.completed[name] if name in self.downloading: while name not in self.completed: gmangas/utils.py @@ -218,7 +218,7 @@ class Engine: self._image = image = MyImage(_result, cdir("pixmaps", "logo.png")) except: _result, old_result = self.LoadImage(id, value, use_cache=False) - self._image = image = MyImage(_result, cdir("pixmaps", "logo.png")) + self._image = image = MyImage(_result, cdir("pixmaps", "logo.png"), second_try=True) if old_result and (not image.big_image): image.Merge(old_result) result = image, image.path @@ -246,7 +246,7 @@ class Engine: if callback: callback(result) return result - def LoadImage (self, id, value, download_only=False, save=False, use_cache=True): + def LoadImage (self, id, value, download_only=False, save=False, use_cache=True, verbose=False): chapter_id = self.State["page"][0] page = (self.Values["page"][0][id], self.Values["page"][1][id]) values = map(lambda x: str(x[1]), (self.State["chapter"],self.State["page"],self.State["image"])) @@ -256,11 +256,13 @@ class Engine: if os.path.isfile(path) and use_cache: ext = "" result = [open(path, "rb").read(), path, ext] + cached = True else: url = self.Values["chapter"][1][chapter_id] + self.Values["page"][1][id] pickle_path = (self.clear_url(url) + "_IMGURL",) def Pickle_CallBack (): data = self.__Download(url, info="image") + print url if data == "offline": return data return self.BackEnd.parse_image_url(data, page[1], int(id)) @@ -271,7 +273,8 @@ class Engine: os.makedirs(os.path.dirname(path)) except OSError: pass - data = DM.DirectDownload(image_url, self.URL) + data = DM.DirectDownload(image_url, self.URL, force_download=not use_cache) + cached = False ext = image_url.rsplit(".", 1)[-1] # -- # if data == "offline": @@ -293,8 +296,11 @@ class Engine: old_result = cimg[id-1][0] cimg[id] = [result,self.State] - return [result, old_result] - + if verbose: + return [result, old_result, cached] + else: + return [result, old_result] + def __Download (self, url, ext=None, path=None, info=None): self.last_value_path = path = self.GetSavePath(self.clear_url(url)) self.last_value_path_per_info[info] = path @@ -324,6 +330,7 @@ class Engine: class BatchEngine (Engine): void = lambda *x:None auto_download = True + loaded_all = {} def __init__ (self, BackEnd): Engine.__init__(self, BackEnd) @@ -333,14 +340,27 @@ class BatchEngine (Engine): self.continuous = continuous def DownloadChapter (self, chapter): + if chapter not in self.loaded_all: + self.loaded_all[chapter] = False + elif self.loaded_all[chapter]: + if hasattr(self.parent, "gauge1"): + wx.CallAfter(self.parent.gauge1.SetRange, 1) + wx.CallAfter(self.parent.gauge1.SetValue, 1) + return self.Load("page", chapter, self.void) if hasattr(self.parent, "gauge1"): wx.CallAfter(self.parent.gauge1.SetRange, (len(self.Values["page"][0]))) for img_id, img_value in enumerate(self.Values["page"][0]): + self.loaded_all[chapter] = False if self.stopped or (not app.Running): return self.State["image"] = (img_id, img_value) - self.LoadImage(img_id, chapter[1], download_only=True, save=True) + result = self.LoadImage(img_id, chapter[1], download_only=True, save=True, verbose=True) + if result: + if result[2]: + self.loaded_all[chapter] = True + else: + self.loaded_all[chapter] = False if not self.auto_download: self.stopped = True if hasattr(self.parent, "gauge1"): gmangas2.py @@ -15,7 +15,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from StringIO import StringIO +try: + from cStringIO import StringIO +except: + from StringIO import StringIO try: from PIL import Image, ImageEnhance, ImageDraw, ImageFont, ImageOps, ImageStat import PIL @@ -25,6 +28,25 @@ import os import wx +def ConvertWxImageToPil (image): + w, h = image.GetSize() + data = image.GetData() + + redImage = Image.new("L", (w, h)) + redImage.fromstring(data[0::3]) + greenImage = Image.new("L", (w, h)) + greenImage.fromstring(data[1::3]) + blueImage = Image.new("L", (w, h)) + blueImage.fromstring(data[2::3]) + + if image.HasAlpha(): + alphaImage = Image.new("L", (w, h)) + alphaImage.fromstring(image.GetAlphaData()) + pil = Image.merge('RGBA', (redImage, greenImage, blueImage, alphaImage)) + else: + pil = Image.merge('RGB', (redImage, greenImage, blueImage)) + return pil + class BackgroundImage: Image = None __Image = None @@ -113,10 +135,24 @@ class MyImage_PIL: Image = None __Image = None rate = 100 - def __init__ (self, res, logo): + error_logo = "404.png" + def __init__ (self, res, logo, second_try=False): self.logo = Image.open(logo) self.img, self.path, self.ext, self.text = res - self.raw1 = bmp = Image.open(StringIO(self.img)) + img_data = StringIO(self.img) + img_data.seek(0) + try: + bmp = Image.open(img_data) + except: + try: + wximage = wx.ImageFromStream(img_data) + bmp = ConvertWxImageToPil(wximage) + except: + if second_try: + bmp = Image.open(cdir("pixmaps", self.error_logo)) + else: + raise IOError, "cannot identify image file" + self.raw1 = bmp bitmap = Image.new("RGBA", bmp.size) bitmap.paste(bmp, None) self.Image = self.Image1 = self.__Annotate(bitmap, self.text) image.py bc6a6a691714e8f60a4a9313c9277e681ffd1b1e unknown lux@.(none) http://github.com/luxkun/gmangas2/commit/9c0be1171b65502b3d7c27e1ef4f8907025c6d13 9c0be1171b65502b3d7c27e1ef4f8907025c6d13 2009-07-05T04:28:11-07:00 2009-07-05T04:28:11-07:00 Performance fix in DownloadChapter in the batchengine;mangavolume critical-bug fix;various 2c11eecfcdca9809cd605fc996b7076c44676d43 unknown lux@.(none)