/head: changeset 69

More updates

head/offlineimap/folder/Base.py

@@ -18,6 +18,8 @@
 
 import __main__
 from threading import *
+from offlineimap import threadutil
+from offlineimap.threadutil import InstanceLimitedThread
 
 class BaseFolder:
     def getname(self):
@@ -34,6 +36,11 @@ class BaseFolder:
         before firing off a thread.  For all others, returns immediately."""
         pass
 
+    def getcopyinstancelimit(self):
+        """For threading folders, returns the instancelimitname for
+        InstanceLimitedThreads."""
+        raise NotImplementedException
+
     def getvisiblename(self):
         return self.name
 
@@ -189,8 +196,10 @@ class BaseFolder:
             if not uid in dest.getmessagelist():
                 if self.suggeststhreads():
                     self.waitforthread()
-                    thread = Thread(target = self.copymessageto,
-                                    args = (uid, applyto))
+                    thread = InstanceLimitedThread(\
+                        self.getcopyinstancelimit(),
+                        target = self.copymessageto,
+                        args = (uid, applyto))
                     thread.start()
                     threads.append(thread)
                 else:

head/offlineimap/folder/IMAP.py

@@ -22,13 +22,14 @@ import rfc822
 from StringIO import StringIO
 
 class IMAPFolder(BaseFolder):
-    def __init__(self, imapserver, name, visiblename):
+    def __init__(self, imapserver, name, visiblename, accountname):
         self.name = imaputil.dequote(name)
         self.root = imapserver.root
         self.sep = imapserver.delim
         self.imapserver = imapserver
         self.messagelist = None
         self.visiblename = visiblename
+        self.accountname = accountname
 
     def suggeststhreads(self):
         return 1
@@ -36,6 +37,9 @@ class IMAPFolder(BaseFolder):
     def waitforthread(self):
         self.imapserver.connectionwait()
 
+    def getcopyinstancelimit(self):
+        return 'MSGCOPY_' + self.accountname
+
     def getvisiblename(self):
         return self.visiblename
 
@@ -116,7 +120,7 @@ class IMAPFolder(BaseFolder):
             self.imapserver.releaseconnection(imapobj)
 
     def savemessageflags(self, uid, flags):
-        imapobj = self.imapserver.acquireconnection(imapobj)
+        imapobj = self.imapserver.acquireconnection()
         try:
             imapobj.select(self.getfullname())
             result = imapobj.uid('store', '%d' % uid, 'FLAGS',

head/offlineimap/repository/IMAP.py

@@ -38,7 +38,8 @@ class IMAPRepository(BaseRepository):
 
     def getfolder(self, foldername):
         return folder.IMAP.IMAPFolder(self.imapserver, foldername,
-                                      self.nametrans(foldername))
+                                      self.nametrans(foldername),
+                                      accountname)
 
     def getfolders(self):
         if self.folders != None:
@@ -54,7 +55,8 @@ class IMAPRepository(BaseRepository):
             if '\\Noselect' in imaputil.flagsplit(flags):
                 continue
             retval.append(folder.IMAP.IMAPFolder(self.imapserver, name,
-                                                 self.nametrans(imaputil.dequote(name))))
+                                                 self.nametrans(imaputil.dequote(name)),
+                                                 self.accountname))
         retval.sort(lambda x, y: cmp(x.getvisiblename(), y.getvisiblename()))
         self.folders = retval
         return retval

head/offlineimap/threadutil.py

@@ -34,3 +34,30 @@ def semaphorewait(semaphore):
 def threadsreset(threadlist):
     for thread in threadlist:
         thread.join()
+
+instancelimitedsems = {}
+instancelimitedlock = Lock()
+
+def initInstanceLimit(instancename, instancemax):
+    instancelimitedlock.acquire()
+    if not instancelimitedsems.has_key(instancename):
+        instancelimitedsems[instancename] = BoundedSemaphore(instancemax)
+    instancelimitedlock.release()
+
+class InstanceLimitedThread(Thread):
+    def __init__(self, instancename, *args, **kwargs):
+        self.instancename = instancename
+                                                   
+        apply(Thread.__init__, (self,) + args, kwargs)
+
+    def start(self):
+        instancelimitedsems[self.instancename].acquire()
+        Thread.start(self)
+        
+    def run(self):
+        try:
+            Thread.run(self)
+        finally:
+            instancelimitedsems[self.instancename].release()
+        
+