Changeset 18730

Timestamp:

09/03/08 17:44:55 (5 years ago)

Author:

showyou

Message:

httpと画面更新部分に排他入れた

Files:

• lang/python/crochet/chat_allsrc.py (modified) (16 diffs)

lang/python/crochet/chat_allsrc.py

@@ -40 +40 @@
 """
 class TwDMHttpFrame(wx.Frame):
-        def __init__(self,tw,func):
+        def __init__(self,tw,func,lock):
                 self.tw = tw
                 self.func = func
+                self.lock = lock
         def start(self):
                 thread.start_new_thread(self.run, ())
         def run(self):
                 #ここに通信処理を書く
+                self.lock.acquire()
                 a = self.tw.getDM("")
                 self.func(a)
+                self.lock.release()
 """
 twitterにhttpRequestを投げるスレッド
 """
 class TwReplyHttpFrame(wx.Frame):
-        def __init__(self,tw,func):
+        def __init__(self,tw,func,lock):
                 self.tw = tw
                 self.func = func
+                self.lock = lock
         def start(self):
 
@@ -62 +66 @@
         def run(self):
                 #ここに通信処理を書く
+                self.lock.acquire()     
                 a = self.tw.getReplies("")
                 self.func(a)
+                self.lock.release()
 """
 twitterにhttpRequestを投げるスレッド
 """
 class TwHttpFrame(wx.Frame):
-        def __init__(self,tw,func):
+        def __init__(self,tw,func,lock):
                 self.tw = tw
                 self.func = func
+                self.lock = lock
         def start(self):
                 thread.start_new_thread(self.run, ())
@@ -77 +84 @@
                 #ここに通信処理を書く
                 #a = self.tw.get("")
+                self.lock.acquire()
                 a = self.tw.getWithScraping("")
                 self.func(a)
-
+                self.lock.release()
 """
 カスタムページ(自分でフィルタリングする)
@@ -86 +94 @@
 
         dataList = []
-        def __init__(self, parent):
+        def __init__(self, parent,threadLock):
                 
                 self.owner = parent
+                self.lock = threadLock
                 wx.NotebookPage.__init__(self,parent.getNotebook(),-1)
                 parent.getNotebook().AddPage(self,'DM')
@@ -101 +110 @@
         
         def Reflesh(self):
-                t = TwDMHttpFrame(self.owner.tw,self.RefleshList)
+                t = TwDMHttpFrame(self.owner.tw,self.RefleshList,self.lock)
                 t.start()
 """
@@ -109 +118 @@
 
         dataList = []
-        def __init__(self, parent):
+        def __init__(self, parent,threadLock):
                 self.owner = parent
+                self.lock = threadLock
                 wx.NotebookPage.__init__(self,parent.getNotebook(),-1)
                 parent.getNotebook().AddPage(self,'Recent')
@@ -205 +215 @@
 
         def Reflesh(self):
-                t = TwHttpFrame(self.owner.tw,self.RefleshList)
+                t = TwHttpFrame(self.owner.tw,self.RefleshList,self.lock)
                 t.start()
         
@@ -251 +261 @@
                                 self.owner.GetImageListElement(b[4])
                         except:
+                                #       print "Error:GetImageListElement"
                                 pass
                         i+=1
                 self.dataList = dataList + self.dataList
+                print "end setdataList"
                 #if self.selectRow != -1 :self.selectRow+=len(dataList) 
 
@@ -259 +271 @@
 
         dataList = []
-        def __init__(self, parent):
+        def __init__(self, parent,threadLock):
                 
                 self.owner = parent
+                self.lock = threadLock
                 wx.NotebookPage.__init__(self,parent.getNotebook(),-1)
                 parent.getNotebook().AddPage(self,'Reply')
@@ -274 +287 @@
         
         def Reflesh(self):
-                t = TwReplyHttpFrame(self.owner.tw,self.RefleshList)
+                t = TwReplyHttpFrame(self.owner.tw,self.RefleshList,self.lock)
                 t.start()
 
@@ -281 +294 @@
 
         dataList = []
-        def __init__(self, parent):
+        def __init__(self, parent,threadLock):
                 
                 self.owner = parent
+                self.lock = threadLock
                 wx.NotebookPage.__init__(self,parent.getNotebook(),-1)
                 parent.getNotebook().AddPage(self,'DM')
@@ -296 +310 @@
         
         def Reflesh(self):
-                t = TwDMHttpFrame(self.owner.tw,self.RefleshList)
+                t = TwDMHttpFrame(self.owner.tw,self.RefleshList,self.lock)
                 t.start()
                 pass
@@ -335 +349 @@
                 notebook = self.notebook = wx.Notebook(self,-1)
 
-                self.recentPage = RecentPage(self)
-                self.replyPage = ReplyPage(self)
-                self.directPage = DMPage(self) 
+
+                self.imageThreadLock = thread.allocate_lock()
+                self.httpThreadLock = thread.allocate_lock()
+                
+                self.recentPage = RecentPage(self,self.httpThreadLock)
+                self.replyPage = ReplyPage(self,self.httpThreadLock)
+                self.directPage = DMPage(self,self.httpThreadLock) 
 
                 inputSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -392 +410 @@
                 self.SetNowTime2StatusBar()
         
-                self.imageThreadLock = thread.allocate_lock()
+
         def OnSendTW(self, event):
                 # 送信する
@@ -464 +482 @@
 
                         #self.userIcon.SetBitmap(self.imageList[unicodeUrl].ConvertToBitmap())
-                        pass
+                        return self.imageList[unicodeUrl]
                 else:
                         self.imageList[unicodeUrl] = "" 
                         self.WebImage2StringIO(url,unicodeUrl)
-                return self.imageList[unicodeUrl]
+                return null 
         
         # Web上の画像を引っ張ってくる
@@ -485 +503 @@
 
                 from cStringIO import StringIO
-
                 image_pil = Image.open(StringIO(imageData))
                 image_pil.thumbnail((64,64))