import threading, gtk, gio, gobject
-import lib
+import lib, profile
class notdone(Exception): pass
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.rd.fetchpage(pageget(self.pnode[self.get_active()]))
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 "curpage" in self.profile.props:
+ self.fetchpage(idpageget(self.manga, self.profile.props["curpage"]))
else:
self.fetchpage(pageget(self.manga))
self.updtitle()
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.profile.props["curpage"] = page.idlist()
+ self.profile.save()
self.point = ccursor(page, self.cache)
self.imgfetch.set(imgfetch(self.cache[page]))
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))))
+ 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()