X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=manga%2Freader.py;h=ca8f43337d5d374de45308a324a02763fc9af7df;hb=04f773e3923930aa517e196962e4304eecabd1ce;hp=6f98beee3a9c5932f6c2d840aba7de0d992d141a;hpb=d9163efe24c7d8653fa1880612ab8e0864d5ae9d;p=automanga.git diff --git a/manga/reader.py b/manga/reader.py index 6f98bee..ca8f433 100644 --- a/manga/reader.py +++ b/manga/reader.py @@ -1,5 +1,5 @@ -import threading, gtk, gio, gobject -import lib +import threading, gtk, gobject +import lib, profile class notdone(Exception): pass @@ -23,23 +23,18 @@ class future(threading.Thread): try: val = self.value() except Exception as e: - with gtk.gdk.lock: - try: - self._exc = e - for cb in self._notlist: - cb() - self._notlist = [] - finally: - gtk.gdk.flush() + self._exc = e + gobject.idle_add(self._callcbs, True) else: - with gtk.gdk.lock: - try: - self._val = [val] - for cb in self._notlist: - cb() - self._notlist = [] - finally: - gtk.gdk.flush() + self._val = [val] + gobject.idle_add(self._callcbs, True) + + def _callcbs(self, final): + nls = [] + for cb in self._notlist: + if cb(): + nls.append(cb) + self._notlist = [] if final else nls # Caller must hold GDK lock def notify(self, cb): @@ -50,15 +45,7 @@ class future(threading.Thread): cb() def progcb(self): - with gtk.gdk.lock: - try: - nls = [] - for cb in self._notlist: - if cb(): - nls.append(cb) - self._notlist = nls - finally: - gtk.gdk.flush() + gobject.idle_add(self._callcbs, False) @property def val(self): @@ -88,7 +75,7 @@ class imgload(future): self.start() def value(self): - buf = bytearray() + buf = gtk.gdk.PixbufLoader() with self.page.open() as st: self.p = 0 self.st = st @@ -97,10 +84,11 @@ class imgload(future): if read == "": break self.p += len(read) - buf.extend(read) + buf.write(read) self.progcb() self.st = None - return gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(str(buf))) + buf.close() + return buf.get_pixbuf() @property def prog(self): @@ -124,6 +112,14 @@ class pagecache(object): self.bk = self.bk[-self.sz:] return f + def __delitem__(self, page): + idl = page.idlist() + for i, (ol, f) in enumerate(self.bk): + if ol == idl: + del self.bk[i] + return + raise KeyError(idl) + class relpageget(future): def __init__(self, cur, prev, cache=None): super(relpageget, self).__init__() @@ -145,6 +141,15 @@ class relpageget(future): self.cache[page] return page +class idpageget(future): + def __init__(self, base, idlist): + super(idpageget, self).__init__() + self.bnode = base + self.idlist = idlist + + def value(self): + return lib.cursor(self.bnode.byidlist(self.idlist)).cur + class pageget(future): def __init__(self, fnode): super(pageget, self).__init__() @@ -454,8 +459,24 @@ class sbox(gtk.ComboBox): def changed_cb(self, wdg, data=None): self.rd.fetchpage(pageget(self.pnode[self.get_active()])) +class profprop(object): + def __init__(self, key, default=None): + self.key = key + self.default = default + + def __get__(self, ins, cls): + return ins.profile.props.get(self.key, self.default) + + def __set__(self, ins, val): + ins.profile.props[self.key] = val + ins.profile.save() + + def __delete__(self, ins): + del ins.profile.props[self.key] + ins.profile.save() + class reader(gtk.Window): - def __init__(self, manga): + def __init__(self, manga, prof=None): super(reader, self).__init__(gtk.WINDOW_TOPLEVEL) self.connect("delete_event", lambda wdg, ev, data=None: False) self.connect("destroy", lambda wdg, data=None: self.quit()) @@ -464,6 +485,7 @@ class reader(gtk.Window): self.pagefetch = procslot(self) self.imgfetch = procslot(self) self.preload = procslot(self) + self.profile = prof if prof else profile.memmanga(None, None, manga.id) self.manga = manga self.page = None @@ -496,9 +518,15 @@ class reader(gtk.Window): self.add(vlay) vlay.show() - self.fetchpage(pageget(self.manga)) + if self.curpage is not None: + self.fetchpage(idpageget(self.manga, self.curpage)) + else: + self.fetchpage(pageget(self.manga)) self.updtitle() + zmode = profprop("zmode", "fit") + curpage = profprop("curpage") + def updpagelbl(self): if self.page is None: self.pagelbl.set_text("") @@ -528,6 +556,9 @@ class reader(gtk.Window): self.page = None if img is not None: self.page = pageview(img) + if self.zmode == "1": + self.page.set_zoom(1) + self.page.set_off((0, 0)) self.pfr.add(self.page) self.page.show() self.updpagelbl() @@ -536,6 +567,7 @@ class reader(gtk.Window): if self.point is not None: self.point = None if page is not None: + self.curpage = page.idlist() self.point = ccursor(page, self.cache) self.imgfetch.set(imgfetch(self.cache[page])) else: @@ -574,8 +606,10 @@ class reader(gtk.Window): if self.page is not None: if ev.keyval in [ord('O'), ord('o')]: self.zoom = 1.0 + self.zmode = "1" elif ev.keyval in [ord('P'), ord('p')]: self.zoom = None + self.zmode = "fit" elif ev.keyval in [ord('[')]: self.zoom = min(self.zoom * 1.25, 3) elif ev.keyval in [ord(']')]: @@ -601,6 +635,10 @@ class reader(gtk.Window): self.fetchpage(self.point.next, lambda page: self.preload.set(preload(relpageget(page, False, self.cache)))) elif ev.keyval in [65288]: self.fetchpage(self.point.prev, lambda page: self.preload.set(preload(relpageget(page, True, self.cache)))) + elif ev.keyval in [ord('R'), ord('r')]: + page = self.point.cur.cur + del self.cache[page] + self.imgfetch.set(imgfetch(self.cache[page])) def quit(self): self.hide()