-import threading, gtk, gio, gobject
-import lib
+import threading, gtk, gobject
+import lib, profile
class notdone(Exception): pass
super(future, self).__init__()
self._val = None
self._exc = None
- self.start()
+ self._notlist = []
+ self._started = False
+ self.setDaemon(True)
+
+ def start(self):
+ if not self._started:
+ super(future, self).start()
+ self._started = True
def run(self):
try:
val = self.value()
except Exception as e:
self._exc = e
+ gobject.idle_add(self._callcbs, True)
else:
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):
+ self.start()
+ if not self.done:
+ self._notlist.append(cb)
+ else:
+ cb()
+
+ def progcb(self):
+ gobject.idle_add(self._callcbs, False)
@property
def val(self):
+ self.start()
if self._exc is not None:
raise self._exc
if self._val is None:
@property
def done(self):
+ self.start()
return self._exc != None or self._val != None
+ def wait(self):
+ self.start()
+ while self.is_alive():
+ self.join()
+ return self.val
+
class imgload(future):
def __init__(self, page):
+ super(imgload, self).__init__()
self.page = page
self.st = None
- super(imgload, self).__init__()
+ self.start()
def value(self):
- buf = bytearray()
- with self.page.open() as st:
- self.p = 0
- self.st = st
- while True:
- read = st.read(1024)
- if read == "":
- break
- self.p += len(read)
- buf.extend(read)
- self.st = None
- return gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(str(buf)))
+ buf = gtk.gdk.PixbufLoader()
+ try:
+ with self.page.open() as st:
+ self.p = 0
+ self.st = st
+ while True:
+ read = st.read(1024)
+ if read == "":
+ break
+ self.p += len(read)
+ buf.write(read)
+ self.progcb()
+ self.st = None
+ finally:
+ buf.close()
+ return buf.get_pixbuf()
@property
def prog(self):
return None
return float(self.p) / float(self.st.clen)
+class pagecache(object):
+ def __init__(self, sz=50):
+ self.sz = sz
+ self.bk = []
+
+ def __getitem__(self, page):
+ idl = page.idlist()
+ for ol, f in self.bk:
+ if ol == idl:
+ return f
+ f = imgload(page)
+ self.bk.append((idl, f))
+ if len(self.bk) > self.sz:
+ 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__()
+ self.cur = lib.cursor(cur)
+ self.prev = prev
+ self.cache = cache
+ self.start()
+
+ def value(self):
+ try:
+ if self.prev:
+ page = self.cur.prev()
+ else:
+ page = self.cur.next()
+ except StopIteration:
+ page = None
+ else:
+ if self.cache:
+ 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__()
+ self.fnode = fnode
+ self.start()
+
+ def value(self):
+ return lib.cursor(self.fnode).cur
+
+class ccursor(object):
+ def __init__(self, ob, cache=None):
+ self.cur = lib.cursor(ob)
+ self.prev = relpageget(self.cur, True, cache)
+ self.next = relpageget(self.cur, False, cache)
+
class pageview(gtk.Widget):
def __init__(self, pixbuf):
super(pageview, self).__init__()
self.window.set_user_data(None)
def do_size_request(self, req):
- req.width, req.height = self.get_osize()
+ w, h = self.get_osize()
+ req.width, req.height = max(min(w, 4096), 0), max(min(h, 4096), 0)
def fitzoom(self):
w, h = self.get_osize()
self.set_off((ox, oy))
gobject.type_register(pageview)
+class msgproc(object):
+ def attach(self, reader):
+ self.rd = reader
+ self.msg = gtk.Alignment(0, 0.5, 0, 0)
+ self.hlay = gtk.HBox()
+ self.lbl = gtk.Label("")
+ self.hlay.pack_start(self.lbl)
+ self.lbl.show()
+ self.msg.add(self.hlay)
+ self.hlay.show()
+ self.rd.sbar.pack_start(self.msg)
+ self.msg.show()
+ self._prog = None
+
+ def prog(self, p):
+ if p is not None and self._prog is None:
+ self._prog = gtk.ProgressBar()
+ self._prog.set_fraction(p)
+ self.hlay.pack_start(self._prog, padding=5)
+ self._prog.show()
+ elif p is None and self._prog is not None:
+ self.hlay.remove(self._prog)
+ self._prog = None
+
+ def abort(self):
+ self.rd.sbar.remove(self.msg)
+
+class pagefetch(msgproc):
+ def __init__(self, fpage, setcb=None):
+ self.pg = fpage
+ self.setcb = setcb
+
+ def attach(self, reader):
+ super(pagefetch, self).attach(reader)
+ self.lbl.set_text("Fetching page...")
+ self.pg.notify(self.haspage)
+
+ def haspage(self):
+ if self.rd.pagefetch.cur != self: return False
+ if not self.pg.done:
+ return True
+ if self.pg.val is not None:
+ self.rd.setpage(self.pg.val)
+ if self.setcb is not None:
+ self.setcb(self.pg.val)
+ self.rd.pagefetch.set(None)
+
+class imgfetch(msgproc):
+ def __init__(self, fimage):
+ self.img = fimage
+ self.upd = False
+ self.error = None
+
+ def attach(self, reader):
+ super(imgfetch, self).attach(reader)
+ self.lbl.set_text("Fetching image...")
+ self.img.notify(self.imgprog)
+
+ def imgprog(self):
+ if self.rd.imgfetch.cur != self: return False
+ if self.img.done:
+ try:
+ img = self.img.val
+ except Exception as e:
+ self.error = str(e)
+ else:
+ self.rd.setimg(img)
+ self.upd = True
+ self.rd.imgfetch.set(None)
+ else:
+ self.prog(self.img.prog)
+ return True
+
+ def abort(self):
+ self.rd.sbar.remove(self.msg)
+ if not self.upd:
+ self.rd.setimg(None)
+ if self.error is not None:
+ self.rd.pagelbl.set_text("Error fetching image: " + self.error)
+
+class preload(msgproc):
+ def __init__(self, fpage):
+ self.pg = fpage
+
+ def attach(self, reader):
+ super(preload, self).attach(reader)
+ self.lbl.set_text("Fetching next page...")
+ self.pg.notify(self.haspage)
+
+ def haspage(self):
+ if self.rd.preload.cur != self: return False
+ if not self.pg.done: return True
+ if self.pg.val is not None:
+ self.img = self.rd.cache[self.pg.val]
+ self.lbl.set_text("Loading next page...")
+ self.img.notify(self.imgprog)
+ else:
+ self.rd.preload.set(None)
+
+ def imgprog(self):
+ if self.rd.preload.cur != self: return False
+ if self.img.done:
+ self.rd.preload.set(None)
+ else:
+ self.prog(self.img.prog)
+ return True
+
+ def abort(self):
+ self.rd.sbar.remove(self.msg)
+
+class procslot(object):
+ __slots__ = ["cur", "p"]
+ def __init__(self, p):
+ self.cur = None
+ self.p = p
+
+ def set(self, proc):
+ if self.cur is not None:
+ self.cur.abort()
+ self.cur = None
+ if proc is not None:
+ self.cur = proc
+ try:
+ proc.attach(self.p)
+ except:
+ self.cur = None
+ raise
+
+class plistget(future):
+ def __init__(self, node):
+ super(plistget, self).__init__()
+ self.node = node
+
+ def value(self):
+ return list(self.node)
+
+class loadplist(object):
+ def __init__(self, pnode):
+ self.pnode = pnode
+ self.flist = plistget(self.pnode)
+
+ def attach(self, sbox):
+ self.sbox = sbox
+ self.flist.notify(self.haslist)
+
+ def haslist(self):
+ if self.sbox.loadlist.cur != self: return False
+ if not self.flist.done: return True
+ self.sbox.setlist(self.flist.val)
+
+class sbox(gtk.ComboBox):
+ def __init__(self, reader, ptnode):
+ super(sbox, self).__init__()
+ self.rd = reader
+ self.node = ptnode
+ self.pnode, self.pidx = self.node.stack[-1]
+
+ self.bk = gtk.ListStore(str)
+ self.set_model(self.bk)
+ cell = gtk.CellRendererText()
+ self.pack_start(cell, True)
+ self.add_attribute(cell, "text", 0)
+ self.set_active(0)
+
+ self.set_sensitive(False)
+ self.set_focus_on_click(False)
+ self.bk.append([ptnode.name])
+ self.loadlist = procslot(self)
+ self.loadlist.set(loadplist(self.pnode))
+
+ def setlist(self, ls):
+ self.bk.clear()
+ for i, ch in enumerate(ls):
+ self.bk.append(["%i/%i: %s" % (i + 1, len(ls), ch.name)])
+ self.set_active(self.pidx)
+ self.set_sensitive(True)
+ self.connect("changed", self.changed_cb)
+
+ 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())
self.connect("key_press_event", self.key)
- self.pfr = gtk.Frame(None)
- self.pfr.set_shadow_type(gtk.SHADOW_NONE)
- self.add(self.pfr)
- self.pfr.show()
+ self.cache = pagecache()
+ 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
- self.cursor = lib.cursor(manga)
- self.setpage(self.cursor.cur)
+ self.sboxes = []
+ self.point = None
+
+ vlay = gtk.VBox()
+ self.pfr = gtk.Frame(None)
+ self.pfr.set_shadow_type(gtk.SHADOW_NONE)
+ vlay.pack_start(self.pfr)
+ self.pfr.show()
+ self.sboxbar = gtk.HBox()
+ algn = gtk.Alignment(0, 0.5, 0, 0)
+ sboxlbl = gtk.Label(self.manga.name + u": ")
+ algn.add(sboxlbl)
+ sboxlbl.show()
+ self.sboxbar.pack_start(algn, False)
+ algn.show()
+ vlay.pack_start(self.sboxbar, False)
+ self.sboxbar.show()
+ self.sbar = gtk.HBox()
+ self.pagelbl = gtk.Label("")
+ algn = gtk.Alignment(0, 0.5, 0, 0)
+ algn.add(self.pagelbl)
+ self.pagelbl.show()
+ self.sbar.pack_start(algn)
+ algn.show()
+ vlay.pack_end(self.sbar, False)
+ self.sbar.show()
+ self.add(vlay)
+ vlay.show()
+
+ if self.curpage is not None:
+ self.fetchpage(idpageget(self.manga, self.curpage))
+ else:
+ self.fetchpage(pageget(self.manga))
self.updtitle()
- def setpage(self, page):
+ zmode = profprop("zmode", "fit")
+ curpage = profprop("curpage")
+
+ def updpagelbl(self):
+ if self.page is None:
+ self.pagelbl.set_text("")
+ else:
+ w, h = self.page.get_osize()
+ self.pagelbl.set_text(u"%s\u00d7%s (%d%%)" % (w, h, int(self.page.zoom * 100)))
+
+ def updsboxes(self, page):
+ nodes = [node for node, idx in page.stack[1:]] + [page]
+ l = min(len(self.sboxes), len(nodes))
+ for i, (pbox, node) in enumerate(zip(self.sboxes, nodes)):
+ if pbox.node != node:
+ l = i
+ break
+ for i in xrange(l, len(self.sboxes)):
+ self.sboxbar.remove(self.sboxes[i])
+ self.sboxes = self.sboxes[:l]
+ for i in xrange(l, len(nodes)):
+ new = sbox(self, nodes[i])
+ self.sboxbar.pack_start(new, False, padding=5)
+ self.sboxes.append(new)
+ new.show()
+
+ def setimg(self, img):
if self.page is not None:
self.pfr.remove(self.page)
self.page = None
- if page is not None:
- with self.cursor.cur.open() as inp:
- pb = gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(inp.read()))
- self.page = pageview(pb)
+ 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()
+
+ def setpage(self, page):
+ 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:
+ self.setimg(None)
+ self.updsboxes(page)
+
+ def fetchpage(self, fpage, setcb=None):
+ self.imgfetch.set(None)
+ proc = pagefetch(fpage, setcb)
+ self.pagefetch.set(proc)
+ return proc
def updtitle(self):
self.set_title(u"Automanga \u2013 " + self.manga.name)
@zoom.setter
def zoom(self, zoom):
self.page.set_zoom(zoom)
+ self.updpagelbl()
def pan(self, off):
ox, oy = self.page.off
self.page.set_off((ox + px, oy + py))
def key(self, wdg, ev, data=None):
- if ev.keyval in [ord('Q'), ord('q'), 65307]:
+ if ev.keyval in [ord('Q'), ord('q')]:
self.quit()
- if ev.keyval in [ord('O'), ord('o')]:
- self.zoom = 1.0
- elif ev.keyval in [ord('P'), ord('p')]:
- self.zoom = None
- elif ev.keyval in [ord('[')]:
- self.zoom = min(self.zoom * 1.25, 3)
- elif ev.keyval in [ord(']')]:
- self.zoom /= 1.25
- elif ev.keyval in [ord('h')]:
- self.pan((-100, 0))
- elif ev.keyval in [ord('j')]:
- self.pan((0, 100))
- elif ev.keyval in [ord('k')]:
- self.pan((0, -100))
- elif ev.keyval in [ord('l')]:
- self.pan((100, 0))
- elif ev.keyval in [ord('H')]:
- self.page.set_off((0, self.page.off[1]))
- elif ev.keyval in [ord('J')]:
- self.page.set_off((self.page.off[0], self.page.get_asize()[1]))
- elif ev.keyval in [ord('K')]:
- self.page.set_off((self.page.off[1], 0))
- elif ev.keyval in [ord('L')]:
- self.page.set_off((self.page.get_asize()[0], self.page.off[1]))
- elif ev.keyval in [ord(' ')]:
- self.setpage(self.cursor.next())
- elif ev.keyval in [65288]:
- self.setpage(self.cursor.prev())
+ elif ev.keyval in [65307]:
+ if self.page is not None:
+ self.pagefetch.set(None)
+ self.imgfetch.set(None)
+ 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(']')]:
+ self.zoom /= 1.25
+ elif ev.keyval in [ord('h')]:
+ self.pan((-100, 0))
+ elif ev.keyval in [ord('j')]:
+ self.pan((0, 100))
+ elif ev.keyval in [ord('k')]:
+ self.pan((0, -100))
+ elif ev.keyval in [ord('l')]:
+ self.pan((100, 0))
+ elif ev.keyval in [ord('H')]:
+ self.page.set_off((0, self.page.off[1]))
+ elif ev.keyval in [ord('J')]:
+ self.page.set_off((self.page.off[0], self.page.get_asize()[1]))
+ elif ev.keyval in [ord('K')]:
+ self.page.set_off((self.page.off[1], 0))
+ elif ev.keyval in [ord('L')]:
+ self.page.set_off((self.page.get_asize()[0], self.page.off[1]))
+ if self.point is not None:
+ if ev.keyval in [ord(' ')]:
+ 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()
+ gtk.main_quit()
gobject.type_register(reader)
Dolda2000 GitWeb / automanga.git / blobdiff