-import threading, gtk, gio, gobject
-import lib
+import threading, gtk, gobject
+import lib, profile
class notdone(Exception): pass
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.progcb()
- self.st = None
- with gtk.gdk.lock:
- try:
- return gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(str(buf)))
- finally:
- gtk.gdk.flush()
+ 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):
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.allocation = alloc
if self.fit:
self.zoom = self.fitzoom()
+ else:
+ aw, ah = self.get_asize()
+ zw, zh = self.get_zsize()
+ ox, oy = self.off
+ if zw >= aw and ox + aw > zw:
+ ox = zw - aw
+ if zh >= ah and oy + ah > zh:
+ oy = zh - ah
+ self.off = ox, oy
if self.flags() & gtk.REALIZED:
self.window.move_resize(*alloc)
self._prog = None
def prog(self, p):
- if p is not None and self._prog is None:
- self._prog = gtk.ProgressBar()
+ if p is not None:
+ if self._prog is None:
+ self._prog = gtk.ProgressBar()
+ self.hlay.pack_start(self._prog, padding=5)
+ self._prog.show()
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 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, profile=None):
+ 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.pagefetch = procslot(self)
self.imgfetch = procslot(self)
self.preload = procslot(self)
- self.profile = profile
+ self.profile = prof if prof else profile.memmanga(None, None, manga.id)
self.manga = manga
self.page = None
self.add(vlay)
vlay.show()
- if self.profile and "curpage" in self.profile:
- self.fetchpage(idpageget(self.manga, self.profile["curpage"]))
+ 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("")
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()
if self.point is not None:
self.point = None
if page is not None:
- if self.profile:
- self.profile.setprop("curpage", page.idlist())
- self.profile.saveprops()
+ self.curpage = page.idlist()
self.point = ccursor(page, self.cache)
self.imgfetch.set(imgfetch(self.cache[page]))
else:
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.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))))
+ if self.page and self.page.off[1] + self.page.get_asize()[1] < self.page.get_zsize()[1]:
+ self.pan((0, self.page.get_asize()[1] - 50))
+ else:
+ 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))))
+ if self.page and self.page.off[1] > 0:
+ self.pan((0, -(self.page.get_asize()[1] - 50)))
+ else:
+ 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()