X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=manga%2Freader.py;h=12089e7b1b40dfe1109da271bd68514d5fe3ef90;hb=a133683da68efa3e4b9b01dc8474bdccac0a2b01;hp=af272899ba32e9729acf20b3cf03dccd96f76673;hpb=32b804f27eb8039865855f6e8e5922368f62f85b;p=automanga.git

diff --git a/manga/reader.py b/manga/reader.py
index af27289..12089e7 100644
--- a/manga/reader.py
+++ b/manga/reader.py
@@ -23,17 +23,18 @@ class future(threading.Thread):
         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):
@@ -44,12 +45,7 @@ class future(threading.Thread):
             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):
@@ -91,7 +87,11 @@ class imgload(future):
                 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):
@@ -112,9 +112,17 @@ class pagecache(object):
         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
 
+    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__()
@@ -136,6 +144,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__()
@@ -185,7 +202,8 @@ class pageview(gtk.Widget):
         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()
@@ -428,6 +446,7 @@ class sbox(gtk.ComboBox):
         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))
@@ -435,7 +454,7 @@ class sbox(gtk.ComboBox):
     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)
@@ -444,7 +463,7 @@ class sbox(gtk.ComboBox):
         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())
@@ -453,6 +472,7 @@ class reader(gtk.Window):
         self.pagefetch = procslot(self)
         self.imgfetch = procslot(self)
         self.preload = procslot(self)
+        self.profile = profile
 
         self.manga = manga
         self.page = None
@@ -485,7 +505,10 @@ class reader(gtk.Window):
         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):
@@ -525,6 +548,9 @@ class reader(gtk.Window):
         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:
@@ -590,6 +616,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()