try:
val = self.value()
except Exception as e:
- with gtk.gdk.lock:
- self._exc = e
- for cb in self._notlist:
- cb()
- self._notlist = []
+ self._exc = e
+ gobject.idle_add(self._callcbs, True)
else:
- with gtk.gdk.lock:
- self._val = [val]
- for cb in self._notlist:
- cb()
- self._notlist = []
+ 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):
cb()
def progcb(self):
- with gtk.gdk.lock:
- nls = []
- for cb in self._notlist:
- if cb():
- nls.append(cb)
- self._notlist = nls
+ gobject.idle_add(self._callcbs, False)
@property
def val(self):
buf.extend(read)
self.progcb()
self.st = None
- return gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(str(buf)))
+ 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()
@property
def prog(self):
f = imgload(page)
self.bk.append((idl, f))
if len(self.bk) > self.sz:
- self.bk = self.bk[-sz:]
+ self.bk = self.bk[-self.sz:]
return f
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__()
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_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([ch.name])
+ 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)
self.rd.fetchpage(pageget(self.pnode[self.get_active()]))
class reader(gtk.Window):
- def __init__(self, manga):
+ def __init__(self, manga, profile=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.manga = manga
self.page = None
self.add(vlay)
vlay.show()
- self.fetchpage(pageget(self.manga))
+ if self.profile and "curpage" in self.profile:
+ self.fetchpage(idpageget(self.manga, self.profile["curpage"]))
+ else:
+ self.fetchpage(pageget(self.manga))
self.updtitle()
def updpagelbl(self):
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.point = ccursor(page, self.cache)
self.imgfetch.set(imgfetch(self.cache[page]))
else: