Changeset 29508

Timestamp:

02/04/09 12:24:16 (4 years ago)

Author:

showyou

Message:

各種設定記憶. .chat/configは一回消したほうがいいかも

Location:

lang/python/crochet

Files:

• config.py (modified) (1 diff)
• crochet.py (modified) (22 diffs)
• toDate.py (modified) (1 diff)

lang/python/crochet/config.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+import cPickle as pickle 
 import wx
 
+class Config():
+        def __init__(self):
+                self.Load()
+        def __del__(self):
+                self.Save()     
+        def LoadDefaults(self):
+                self.d = {}
+                self.d['mycolor'] = wx.Color(240,248,255)
+                self.d['forMeColor'] = wx.Color(255,153,153)
+                self.d['listIcon'] = False
+                self.d['popup'] = True
+                self.d['narrowmsg'] = True
+                self.d['timestring_twitter_api'] = "%a %b %d %H:%M:%S +0000 %Y"
+                self.d['timestring_twitter_friend_scraping'] = "%Y-%m-%dT%H:%M:%S+00:00"
+                self.d['x'] = 0
+                self.d['y'] = 0
+                self.d['w'] = 600
+                self.d['h'] = 400
 
-#chgdep = ConfigDialog(None, -1, 'crochet config')
+        def Load(self):
+                try:
+                        file = open(".chat/config","r")
+                        self.d = pickle.load(file)
+                        file.close()
+                except:
+                        print ("config file not exist: create config file")
+                        self.LoadDefaults()
+                        self.Save()
 
-class ConfigDialog(wx.Dialog):
-    # ダイアログを表示しイベント処理を行う
-    def __init__(self, parent, id, title, user='', password=''):
-        self.dialog = wx.Dialog(parent, id, title, size=(250, 150))
-        self.user = user
-        self.password = password
-        
-        panel = wx.Panel(self.dialog, -1)
-        vbox = wx.BoxSizer(wx.VERTICAL)
 
-        wx.StaticBox(panel, -1, 'Twitter Account', (5, 5), (240, 90))
-        wx.StaticText(panel, -1, 'ID', (15, 30))
-        wx.StaticText(panel, -1, 'Password', (15, 60))
-        self.userFld = wx.TextCtrl(panel, -1, self.user, (100, 30))
-        self.passwordFld = wx.TextCtrl(panel, -1, self.password, (100, 60), style=wx.TE_PASSWORD)
+        def Save(self):
+                
+                wfile = open(".chat/config","w")        
+                pickle.dump(self.d, wfile)
+                wfile.close()
+                #except:
+                #       print ("write config error")
 
-        okButton = wx.Button(self.dialog, 1, 'OK', size=(70, 30))
-        okButton.SetDefault()
-        self.dialog.Bind(wx.EVT_BUTTON, self.OnSave, id=1)
+        def __getitem__(self,key):
+                return self.d[key]
 
-        vbox.Add(panel)
-        vbox.Add(okButton, 1, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 10)
-        self.dialog.SetSizer(vbox)
-        self.dialog.ShowModal() # ダイアログが閉じられるまで待機
-        self.dialog.Destroy()
-
-    # OKボタンが押されたら値を保存してダイアログを閉じる
-    def OnSave(self, event):
-        self.user = self.userFld.GetValue()
-        self.password = self.passwordFld.GetValue()
-        self.dialog.EndModal(1)
-    
-    # ユーザ,パスワードを返す
-    def GetAccount(self):
-        return {"user": self.user, "pass": self.password}
+        def __setitem__(self,key,item):
+                self.d[key] = item

lang/python/crochet/crochet.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# -*- coding:utf-8 -*-
 
 import sys,os,time,re
@@ -8 +8 @@
 import urllib
 
-import twitter3
+import twitterscraping
 import simplejson
 import Image
@@ -16 +16 @@
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
+import configDialog
 import config
 
@@ -22 +23 @@
 os.chdir(dir)
 
-
-g_config = {}
-g_config['mycolor'] = wx.Color(240,248,255)
-g_config['listIcon'] = False
-g_config['popup'] = True
-g_config['narrowmsg'] = True
-g_config['timestring_twitter_api'] = "%a %b %d %H:%M:%S +0000 %Y"
-g_config['timestring_twitter_friend_scraping'] = "%Y-%m-%dT%H:%M:%S+00:00"
-
+g_config = config.Config()
 """自動リサイズするListCtrl"""
 class ListCtrlAutoWidth(wx.ListCtrl, ListCtrlAutoWidthMixin):
@@ -225 +218 @@
                 self.lock = threadLock
                 self.dataListLock = thread.allocate_lock() 
-                wx.NotebookPage.__init__(self,parent.getNotebook(),-1)
-                parent.getNotebook().AddPage(self,title)
+                wx.NotebookPage.__init__(self,parent.GetNotebook(),-1)
+                parent.GetNotebook().AddPage(self,title)
                 list = self.list = ListCtrlAutoWidth(self)
                 list.Bind(wx.EVT_KEY_DOWN, self.myKeyHandler)
@@ -253 +246 @@
 
                 """ 30文字折り返し"""
-                if g_config['narrowmsg']:
-                        tmpTextLen = len(mainText);
-                        tmpText = mainText;
-                        tmpTagRe = re.compile("(<.+?>)")
-                        tmpTagSplit = tmpTagRe.split(tmpText);
-                        mainText = ""
-                        tb = 30
-                        tbc = 0
-                        for s in tmpTagSplit:
-                                tmplen = len(s);
-                                #print "s:",s,",",tmplen,",",tbc
-                                if tmpTagRe.match(s) != None:
-                                        mainText += s
-                                        continue
-                                if tbc != 0:
-                                        if  tb <= tbc+tmplen:
-                                                mainText+=s[0:tb-tbc]
-                                                mainText += u"<BR>"
-                                                i = tb-tbc
-                                                tbc = 0
-                                        else:
-                                                mainText+=s
-                                                tbc += tmplen
-                                                continue
-                                else: i=0
-                                
-                                while i<tmplen-tb:
-                                        mainText += s[i:i+tb]
-                                        mainText += u"<BR>"
-                                        i+=tb
-                                if i<tmplen:
-                                        mainText += s[i:tmplen]
-                                        tbc+=tmplen-i;
+
                                         
                 #print "mainText",mainText
@@ -309 +270 @@
 
                         if re.search(user,self.dataList[i][2]):
-                                self.list.SetItemBackgroundColour(i,wx.Color(255,153,153))
+                                self.list.SetItemBackgroundColour(i,g_config['forMeColor'])
 
         def ResetCount(self):
@@ -319 +280 @@
                 selectedRow = event.GetIndex()
                 user = "@" + self.dataList[selectedRow][1] + ' '
-                self.owner.addUser2Inputbox(user)
+                self.owner.AddUser2Inputbox(user)
 
         def myKeyHandler(self,evt):
@@ -427 +388 @@
 
                         if re.search(user,b[2]):
-                                self.list.SetItemBackgroundColour(i,wx.Color(255,153,153))
+                                self.list.SetItemBackgroundColour(i,g_config['forMeColor'])
                 
                         #import time
@@ -470 +431 @@
 customPageは上に移った
 """
-
 class RecentPage(TmpTwitPage):
         def __init__(self, parent,threadLock,filter):
+                 
                 TmpTwitPage.__init__(self,u"最新",parent,threadLock)
 
-                #self.dataList = []
-                #self.hiddenDataList = []
                 self.customPages = {}# フィルタリングページの固まり？
                 self.filter = filter
@@ -519 +478 @@
                                 dataListElement.append(x[0])
                                 dataListElement.append(x[1])
-                                x2 = toDate.toDate(x[2],g_config["timestring_twitter_api"]).strftime("%b %d %H:%M:%S")
+                                #x2 = "--"
+                                x2 = x[2]
+                                #x2 = toDate.toDate(x[2],g_config["timestring_twitter_api"]).strftime("%b %d %H:%M:%S")
                                 dataListElement.append(x2)
                                 dataListElement.append(x[3])
@@ -551 +512 @@
                                 TmpTwitPage.CallGrowl(self,"Recent 新着"+str(outCount)+"件",outString)
 
-                #print ("xe"),
-                #print self.owner,
-                #self.owner.SetNowTime2StatusBar()
-                #print ("end recent:refreshlist")
-
 class ReplyPage(TmpTwitPage):
-
         def __init__(self, parent,threadLock):
                 TmpTwitPage.__init__(self,"Re",parent,threadLock)
@@ -608 +563 @@
 
 class DMPage(TmpTwitPage):
-
         def __init__(self, parent,threadLock):
                 TmpTwitPage.__init__(self,"DM",parent,threadLock)
@@ -670 +624 @@
         """MainFrame class deffinition.
         """
-        #binder = wx_utils.bind_manager()
 
         TIMER_ID = 1
@@ -696 +649 @@
                         twUserdata = self.loadUserData(".chat/twdata")
                 except:
-                        twUserdata = config.ConfigDialog(None, -1, 'crochet config').GetAccount()
+                        twUserdata = configDialog.ConfigDialog(None, -1, 'crochet config').GetAccount()
                         if twUserdata["user"] and twUserdata["pass"]:
                                 file = open(".chat/twdata","w")
@@ -728 +681 @@
                 filter = []
                 for f in twTabConfig['tabFilter']:
-                        filter.append(BranchFilter(f[0],f[1],f[2],f[3],f[4],f[5],f[6])  )       
+                        filter.append(BranchFilter(*f[0:7] ))   
                 
                 self.recentPage = RecentPage(self,self.httpThreadLock,filter)
@@ -773 +726 @@
                 self.sizer.Fit(self)
         
-                self.tw = twitter3.Twitter(twUserdata)
+                self.tw = twitterscraping.Twitter(twUserdata)
                 self.tw.setAuthService("twitter")
                 self.SetIcon(main_icon.getIcon())
-                self.SetSize((600,400))
+                self.SetSize((g_config['w'],g_config['h']))
+                self.MoveXY(g_config['x'], g_config['y'])
                 self.timer = wx.Timer(self,self.TIMER_ID)
                 wx.EVT_TIMER(self,self.TIMER_ID,self.OnUpdate)
@@ -792 +746 @@
                 wx.EVT_TIMER(self,self.TIMER_ID3,self.OnDMUpdate)
                 self.timer3.Start(300000)
-                
+
+                wx.EVT_CLOSE(self,self.OnClose) 
                 self.RefreshTw()
                 self.replyPage.Refresh()
@@ -799 +754 @@
                 self.SetNowTime2StatusBar()
                 self.CreateMenu()       
+                
         def CreateMenu(self):
                 #表示メニュー項目作る
@@ -818 +774 @@
         def OnMenuViewListIcon_Click(self,e):
                 g_config['listIcon'] = self.listIconCheck.IsChecked();
-
+        
+        # 送信する
+        # コンボボックスの中身を空にする
         def OnSendTW(self, event):
-                # 送信する
-                # コンボボックスの中身を空にする
                 combo = self.text 
                 self.tw.put(combo.GetValue())   
                 combo.SetValue("")
                 self.RefreshTw()
-        
+
         # チャットのログデータをListCtrlに表示
         def RefreshTw(self):
                 self.recentPage.Refresh()       
         
+        def OnClose(self, event):
+                size = self.GetRect()
+                g_config['x'] = size.x
+                g_config['y'] = size.y
+                g_config['w'] = size.width
+                g_config['h'] = size.height
+                self.Destroy()
+
         def OnUpdate(self, event):
                 self.SetStatusBar(u"新着取得中...")
@@ -934 +898 @@
                         bmp.SetBitmap(image.ConvertToBitmap())
         
-        def addUser2Inputbox(self,user):
+        def AddUser2Inputbox(self,user):
                 
                 text = self.text
@@ -947 +911 @@
                         text.SetValue(user+value)
 
-        def getNotebook(self):
+        def GetNotebook(self):
                 return self.notebook
 
 # startup application.
 if __name__=='__main__':
+        
         app = wx.App(False)
         frame = MainFrame()

lang/python/crochet/toDate.py

@@ -16 +16 @@
                 return 0
 
+# 自作strptime
+"""
+strpTable = [ "a":0, "b":0, "d":0, "H":0, "M":0, "S":0, "Y":0 ]
+strpWeek = [ "Sun", "Mon", "Thu", "Wen", "Thi", "Fri", "Sut" ]
+def mystrptime(str, format, assign):
+        import re
+        m = re.search(str, format)
+        if !m:
+                print ("Value error: bad format"+str+":"+format)
+        else:
+                        
+                for a in assign:
+                        if a == "a":
+                                result
+"""                              
+                
 def toDate(date,str):
-        import time
-        dates = time.strptime(date,str)
-        dt = datetime.datetime(dates[0],dates[1],dates[2],dates[3],dates[4],dates[5],dates[6])+datetime.timedelta(hours=getLocalTime("JP"))
+        dates = datetime.datetime.strptime(date,str)
+        dt = dates+datetime.timedelta(hours=getLocalTime("JP"))
         
         return dt
 
-if __name__ == "__main__":
-        date = "2008-02-24T06:39:37+00:00"
-        apiDate = "Thu Jan 22 05:19:28 +0000 2009" 
-        apiFormat = "%a %b %d %H:%M:%S +0000 %Y"
-        scrapingFormat = "%Y-%m-%dT%H:%M:%S+00:00"
-        print toDate(apiDate,apiFormat)
-        print datetime.datetime.today()
-