Changeset 19302

Timestamp:

09/15/08 00:09:33 (5 years ago)

Author:

showyou

Message:

gui不具合修正

Location:

lang/python/crochet

Files:

• chat_allsrc.py (modified) (14 diffs)
• twitter3.py (modified) (1 diff)

lang/python/crochet/chat_allsrc.py

@@ -37 +37 @@
                 imagePath = urllib.urlopen(self.url).read()
                 #time.sleep(1)
-                print "load image"
                 self.lock.acquire()
                 self.func(imagePath,self.result)
@@ -55 +54 @@
                 #ここに通信処理を書く
                 self.lock.acquire()
-                a = self.tw.getDM("")
-                self.func(a)
-                self.lock.release()
+                try:
+                        a = self.tw.getDM("")
+                        self.func(a)
+                finally:
+                        self.lock.release()
 """
 twitterにhttpRequestを投げるスレッド
@@ -91 +92 @@
                 #a = self.tw.get("")
                 self.lock.acquire()
-                a = self.tw.getWithScraping("")
+                try:
+                        a = self.tw.getWithScraping("")
+                except:
+                        import traceback
+                        print traceback.print_exception()       
                 self.func(a)
                 self.lock.release()
@@ -100 +105 @@
 """
 class TmpTwitPage(wx.NotebookPage):
-
         def __init__(self, title, parent, threadLock):
                 
                 self.dataList = []
                 self.hiddenDataList = []
+                self.tmpDataList = []
+                self.tmpHiddenDataList = []
                 self.count = 0
                 self.owner = parent
@@ -149 +155 @@
                 self.count = 0
         # 後で多分実装        
-        def ChangeItemColour(index,data,re,color):
+        def ChangeItemColour(self,index,data,re,color):
                 pass    
         def OnDoubleClick(self,event):
@@ -217 +223 @@
                 self.list.Focus(self.selectedRow)
 
-        def InsertData(self,user,data,hiddenData):
+        def InsertData(self,data,hiddenData):
+
                 i = self.count
-                self.dataList.insert(i,data)# + self.dataList
-                self.hiddenDataList.insert(i,hiddenData)# + self.hiddenDataList
+                #ここでロック
+                self.tmpDataList.insert(i,data)# + self.dataList
+                self.tmpHiddenDataList.insert(i,hiddenData)# + self.hiddenDataList
+                #ここでアンロック
+                self.count += 1
+
+        #InsertDataで追加されてるかどうか確認して、あればリストに入れる
+        def CheckUpdate(self):
+                if len(self.tmpDataList) < 0 or len(self.tmpHiddenDataList) < 0:
+                        return
+
+                user = self.owner.tw.user['user']
                 import re
-                b = data        
-                j = 0
-                self.list.InsertStringItem(i,"")
-                for j in range(3):
-                        self.list.SetStringItem(i,j,b[j])
-                
-                if re.match(user,b[1]):
-                        self.list.SetItemBackgroundColour(i,g_config['mycolor'])
-
-                if re.search(user,b[2]):
-                        self.list.SetItemBackgroundColour(i,wx.Color(255,153,153))
-                #import time
-                #time.sleep(1)          
-                #if 先読み=on
-                #try:   
-                self.owner.GetImageListElement(b[4])
-                #except:
-                #       print "Error:GetImageListElement"
-                #       pass
-                self.count += 1
+                i = 0
+                for b in self.tmpDataList:
+        
+                        self.list.InsertStringItem(i,"")
+                        for j in range(3):
+                                self.list.SetStringItem(i,j,b[j])
+                
+                        if re.match(user,b[1]):
+                                self.list.SetItemBackgroundColour(i,g_config['mycolor'])
+
+                        if re.search(user,b[2]):
+                                self.list.SetItemBackgroundColour(i,wx.Color(255,153,153))
+                
+                        #import time
+                        #time.sleep(1)          
+                        #if 先読み=on
+                        #try:   
+                        self.owner.GetImageListElement(b[4])
+                        #except:
+                        #       print "Error:GetImageListElement"
+                        #       pass
+                        i += 1
+                self.dataList[:0] =self.tmpDataList
+                self.hiddenDataList[:0] = self.tmpHiddenDataList
+                self.tmpDataList = [] 
+                self.tmpHiddenDataList = []
+                self.ResetCount()
 """
 カスタムページ(自分でフィルタリングする)
@@ -259 +283 @@
         u"ゴミ"
 ]
-
-import Growl
+try:
+        import Growl
+        g_growl = True
+except:
+        print "not exist:Growl sdk"
+        g_growl = False
+
 class RecentPage(TmpTwitPage):
         def __init__(self, parent,threadLock):
                 TmpTwitPage.__init__(self,"Recent",parent,threadLock)
 
-                self.dataList = []
-                self.hiddenDataList = []
+                #self.dataList = []
+                #self.hiddenDataList = []
                 self.customPages = [] # フィルタリングページの固まり？
                 
-                self.g = Growl.GrowlNotifier(
-                        applicationName='crochet',notifications=['newTwit'])
-                self.g.register()
+                if g_growl == True:
+                        self.g = Growl.GrowlNotifier(
+                                applicationName='crochet',notifications=['newTwit'])
+                        self.g.register()
                 
         def ResetCount(self):
-                self.count = 0
+                TmpTwitPage.ResetCount(self)            
                 for p in self.customPages:
                         p.ResetCount()
@@ -322 +352 @@
                                         flag2 = 1
         
-                                if flag2 == 0:  
-                                        self.InsertData(user,dataListElement,hiddenDataListElement)
-                                        self.g.notify(noteType='newTwit',title=x[0],description=x[1],
-                                                                        sticky=False)
+                                if flag2 == 0:
+                                        self.InsertData(dataListElement,hiddenDataListElement)
+                                        if g_growl == True:
+                                                self.g.notify(noteType='newTwit',title=x[0],
+                                                        description=x[1],sticky=False)
+                                self.owner.SetNowTime2StatusBar()
                 print "end setdataList"
 
@@ -332 +364 @@
         def __init__(self, parent,threadLock):
                 TmpTwitPage.__init__(self,"Reply",parent,threadLock)
-                self.dataList = []
-                self.hiddenDataList = []
+                #self.dataList = []
+                #self.hiddenDataList = []
         
         def Reflesh(self):
@@ -362 +394 @@
                                 hiddenDataListElement.append(x[4])#発言id
         
-                                self.InsertData(user,dataListElement,hiddenDataListElement)     
+                                self.InsertData(dataListElement,hiddenDataListElement)  
                 print "end setdataList"
 
@@ -397 +429 @@
                                 hiddenDataListElement.append(x[4])#発言id
         
-                                self.InsertData(user,dataListElement,hiddenDataListElement)     
+                                self.InsertData(dataListElement,hiddenDataListElement)  
                 print "end setdataList"
         
@@ -490 +522 @@
                 wx.EVT_TIMER(self,self.TIMER_ID,self.OnUpdate)
                 self.timer.Start(60000)
+                
+                self.timer11 = wx.Timer(self,self.TIMER_ID3+1)
+                wx.EVT_TIMER(self,self.TIMER_ID3+1,self.OnUpdate2)
+                self.timer11.Start(10000)
 
                 self.timer2 = wx.Timer(self,self.TIMER_ID2)
@@ -521 +557 @@
                 self.RefleshTw()
         
+        def OnUpdate2(self, event):
+                self.SetStatusBar(u"新着取得中...")
+                self.recentPage.CheckUpdate()
+                self.replyPage.CheckUpdate()
+                self.directPage.CheckUpdate()
+                self.SetNowTime2StatusBar()
+
         def OnReplyUpdate(self, event):
         
@@ -601 +644 @@
 
 
-
         def WebImageCallback(self,imageData,result):
-
                 from cStringIO import StringIO
                 image_pil = Image.open(StringIO(imageData))

lang/python/crochet/twitter3.py

@@ -202 +202 @@
                 data = opener.open(s)
                 urlstring = data.read()
-                print urlstring
+                #print urlstring
                 if num == 1:
                         return self.scrapeTwit(urlstring,True)