You can subscribe to this list here.
2003 |
Jan
|
Feb
(20) |
Mar
(122) |
Apr
(16) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: baldridge <bal...@ro...> - 2004-03-10 05:40:01
|
Hey all, One of my friends put me on to using BT++ I havent been using it for = long but resently I setup about 30 files for it to download. I was = wondering why the program is using like 90% of a P4 2.66ghz with = Hyperthreading. I turned of using background hashing and im only = currently downloading 4 files the rest of them are paused. Any help would be great. Blaine Aldridge --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.609 / Virus Database: 389 - Release Date: 3/3/2004 |
From: <sir...@us...> - 2003-04-19 15:46:08
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans In directory sc8-pr-cvs1:/tmp/cvs-serv32515/src/TabTrans Modified Files: Grid.py Log Message: - Fixed bug with selection in grid. Index: Grid.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/Grid.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Grid.py 18 Apr 2003 16:04:52 -0000 1.16 --- Grid.py 19 Apr 2003 15:46:03 -0000 1.17 *************** *** 190,194 **** def OnMouseRightDown(self, evt): ! row = self.GetCursorRow(evt.GetY()) if row == -1: --- 190,195 ---- def OnMouseRightDown(self, evt): ! (x,y) = self.CalcUnscrolledPosition(evt.GetY(),evt.GetY()) ! row = self.GetCursorRow(y) if row == -1: *************** *** 267,273 **** self.LabelResize['Active'] = true self.LabelResize['Start'] = evt.GetX() ! x = evt.GetX() y = evt.GetY() row = self.GetCursorRow(y) --- 268,276 ---- self.LabelResize['Active'] = true self.LabelResize['Start'] = evt.GetX() ! x = evt.GetX() y = evt.GetY() + + (x,y) = self.CalcUnscrolledPosition(x,y) row = self.GetCursorRow(y) |
From: <sir...@us...> - 2003-04-18 16:04:56
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv26677/src Modified Files: SeedManager.py Log Message: - Small fix. - Seeds without the torrent are removed from the history. Index: SeedManager.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/SeedManager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SeedManager.py 11 Mar 2003 01:23:34 -0000 1.1 --- SeedManager.py 18 Apr 2003 16:04:53 -0000 1.2 *************** *** 25,43 **** # UPDATE TORRENT LIST tors = listdir( self.DirTorrent ) - if len(tors) == 0: - return for tor in tors: ! con = false for loader in self.Loaders: if loader.Config['Tor'] == tor: ! con = true ! if con == true: continue self.CreateNewLoader(tor) def CreateNewLoader(self, torrent): try: --- 25,45 ---- # UPDATE TORRENT LIST tors = listdir( self.DirTorrent ) for tor in tors: ! con = False for loader in self.Loaders: if loader.Config['Tor'] == tor: ! con = True ! if con == True: continue self.CreateNewLoader(tor) + for loader in self.Loaders: + if not path.exists( loader.Config['TorFull'] ): + self.Loaders.remove(loader) + def CreateNewLoader(self, torrent): try: *************** *** 53,58 **** CheckExist = true ) ! ## if not path.exists( loader.Config['Filename'] ): ! ## return None self.Loaders.append(loader) --- 55,60 ---- CheckExist = true ) ! if not path.exists( loader.Config['Filename'] ): ! return None self.Loaders.append(loader) *************** *** 62,66 **** return loader except: - ## if self.Log != None: - ## self.Log( 'Error adding seed "' + torrent + '"...', loglevel = LOG_ERROR ) return None --- 64,66 ---- |
From: <sir...@us...> - 2003-04-18 16:04:56
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans In directory sc8-pr-cvs1:/tmp/cvs-serv26677/src/TabTrans Modified Files: Grid.py Log Message: - Small fix. - Seeds without the torrent are removed from the history. Index: Grid.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/Grid.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Grid.py 31 Mar 2003 18:11:01 -0000 1.15 --- Grid.py 18 Apr 2003 16:04:52 -0000 1.16 *************** *** 134,142 **** wxYES_NO | wxICON_QUESTION | wxSTAY_ON_TOP ) if dlg.ShowModal() == wxID_NO: ! return try: l.PauseDownload() ! if l.Obj != None and l.Obj.has_key('Storage'): l.Obj['Storage'].close() unlink( l.Config['TorFull'] ) --- 134,142 ---- wxYES_NO | wxICON_QUESTION | wxSTAY_ON_TOP ) if dlg.ShowModal() == wxID_NO: ! continue try: l.PauseDownload() ! if l.Obj != None and l.Obj.has_key('Storage'): l.Obj['Storage'].close() unlink( l.Config['TorFull'] ) *************** *** 144,148 **** wxMessageBox("Couldn't delete torrent file.") ! self.Table.Update() ########################################################################################################### --- 144,148 ---- wxMessageBox("Couldn't delete torrent file.") ! self.Update() ########################################################################################################### |
From: <sir...@us...> - 2003-04-18 11:11:11
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv29029/src Modified Files: MaxSizer.py Loader.py Log Message: - Fix for Linux compatibility. - Fix for move after download finish. Index: MaxSizer.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/MaxSizer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MaxSizer.py 22 Feb 2003 13:34:53 -0000 1.1 --- MaxSizer.py 18 Apr 2003 11:11:07 -0000 1.2 *************** *** 22,25 **** ipt = item.GetWindow().GetPosition() ! item.SetDimension(ipt, wxSize( psize.GetWidth() - ipt.x, ! psize.GetHeight() - ipt.y ) ) --- 22,30 ---- ipt = item.GetWindow().GetPosition() ! if item.GetWindow().GetClassName() == 'wxToolBar': ! item.SetDimension( ipt, ! wxSize(psize.GetWidth(), ! item.GetWindow().GetSize().height) ) ! else: ! item.SetDimension(ipt, wxSize( psize.GetWidth() - ipt.x, ! psize.GetHeight() - ipt.y ) ) Index: Loader.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/Loader.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Loader.py 2 Apr 2003 19:44:30 -0000 1.10 --- Loader.py 18 Apr 2003 11:11:07 -0000 1.11 *************** *** 178,183 **** self.Obj['Storage'].close() ! self.Obj['Storage'] = None ! self.Obj['StorageWrapper'] = None self.UpdateStatus( fractionDone = -1 ) --- 178,182 ---- self.Obj['Storage'].close() ! del self.Obj['Storage'] self.UpdateStatus( fractionDone = -1 ) *************** *** 543,545 **** self.Obj['Rerequester'].d(0) self.Obj['RawServer'].listen_forever( self.Obj['Encrypter'] ) ! self.Obj['Rerequester'].announce(2) --- 542,544 ---- self.Obj['Rerequester'].d(0) self.Obj['RawServer'].listen_forever( self.Obj['Encrypter'] ) ! #self.Obj['Rerequester'].announce(2) |
From: <sir...@us...> - 2003-04-18 11:11:10
|
Update of /cvsroot/btplusplus/BT++/src/core In directory sc8-pr-cvs1:/tmp/cvs-serv29029/src/core Modified Files: Storage.py Log Message: - Fix for Linux compatibility. - Fix for move after download finish. Index: Storage.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/core/Storage.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Storage.py 31 Mar 2003 14:15:29 -0000 1.5 --- Storage.py 18 Apr 2003 11:11:07 -0000 1.6 *************** *** 69,83 **** def set_readonly(self): # may raise IOError or OSError ! for file in self.whandles.keys(): ! old = self.handles[file] ! old.flush() ! old.close() ! self.handles[file] = open(file, 'rb') def close(self): for file, old in self.handles.items(): old.close() ! def get_total_length(self): return self.total_length --- 69,84 ---- def set_readonly(self): + pass # may raise IOError or OSError ! #for file in self.whandles.keys(): ! #old = self.handles[file] ! #old.flush() ! #old.close() ! #self.handles[file] = open(file, 'rb') def close(self): for file, old in self.handles.items(): old.close() ! def get_total_length(self): return self.total_length |
From: <sir...@us...> - 2003-04-18 11:11:10
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans In directory sc8-pr-cvs1:/tmp/cvs-serv29029/src/TabTrans Modified Files: GridTable.py Log Message: - Fix for Linux compatibility. - Fix for move after download finish. Index: GridTable.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/GridTable.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GridTable.py 2 Apr 2003 19:44:27 -0000 1.10 --- GridTable.py 18 Apr 2003 11:11:05 -0000 1.11 *************** *** 155,158 **** --- 155,165 ---- activity = 'Done' ) + if loader.Obj.has_key('Storage') and loader.Obj['Storage'] != None: + loader.Obj['Storage'].close() + del loader.Obj['Storage'] + + if loader.Obj.has_key('StorageWrapper') and loader.Obj['StorageWrapper'] != None: + del loader.Obj['StorageWrapper'] + if loader.Config['DirTorFinish'] != '': try: |
From: <sir...@us...> - 2003-04-18 11:11:09
|
Update of /cvsroot/btplusplus/BT++/src/DlgPref In directory sc8-pr-cvs1:/tmp/cvs-serv29029/src/DlgPref Modified Files: DlgPref.py Log Message: - Fix for Linux compatibility. - Fix for move after download finish. Index: DlgPref.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/DlgPref/DlgPref.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DlgPref.py 29 Mar 2003 15:31:54 -0000 1.4 --- DlgPref.py 18 Apr 2003 11:11:06 -0000 1.5 *************** *** 101,108 **** wxWindow.__init__(self, parent, -1, name = name) ! wxStaticBox(self, -1, 'Downloading', wxPoint(5, 5), wxSize(314,82)) ! wxStaticBox(self, -1, 'Uploading', wxPoint(5, 92), wxSize(314,36)) ! wxStaticBox(self, -1, 'Transfer Limits', wxPoint(5,133), wxSize(314,41)) ! wxStaticBox(self, -1, 'Hashing', wxPoint(5,179), wxSize(314,82)) # Downloading --- 101,108 ---- wxWindow.__init__(self, parent, -1, name = name) ! wxStaticBox(self, -1, 'Downloading', wxPoint(5, 5), wxSize(314,82)) ! wxStaticBox(self, -1, 'Uploading', wxPoint(5, 92), wxSize(314,36)) ! wxStaticBox(self, -1, 'Transfer Limits (in KB/s)', wxPoint(5,133), wxSize(314,41)) ! wxStaticBox(self, -1, 'Hashing', wxPoint(5,179), wxSize(314,82)) # Downloading |
From: <sir...@us...> - 2003-04-05 15:15:49
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv17943/src Modified Files: Version.py Log Message: 0.5.3 Index: Version.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/Version.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Version.py 31 Mar 2003 14:30:25 -0000 1.4 --- Version.py 5 Apr 2003 15:15:39 -0000 1.5 *************** *** 1 **** ! CurrentVersion = '0.5.2' --- 1 ---- ! CurrentVersion = '0.5.3' |
From: <sir...@us...> - 2003-04-05 15:15:48
|
Update of /cvsroot/btplusplus/BT++/dist In directory sc8-pr-cvs1:/tmp/cvs-serv17943/dist Modified Files: CHANGELOG.txt BT++.nsi Log Message: 0.5.3 Index: CHANGELOG.txt =================================================================== RCS file: /cvsroot/btplusplus/BT++/dist/CHANGELOG.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG.txt 31 Mar 2003 14:30:27 -0000 1.3 --- CHANGELOG.txt 5 Apr 2003 15:15:39 -0000 1.4 *************** *** 1,2 **** --- 1,11 ---- + [0.5.3 (alpha)] + + - Fixed: Downloads wouldn't continue uploading after + finishing download. + - Fixed: BT++.exe would sometimes not terminate correctly, + leaving a running instance but no GUI behind. + - Started modifying/reworking the whole logging system. + It is work in progress... but working. + [0.5.2 (alpha)] Index: BT++.nsi =================================================================== RCS file: /cvsroot/btplusplus/BT++/dist/BT++.nsi,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BT++.nsi 31 Mar 2003 14:30:28 -0000 1.13 --- BT++.nsi 5 Apr 2003 15:15:40 -0000 1.14 *************** *** 1,4 **** !define MUI_PRODUCT "BitTorrent++" ! !define MUI_VERSION "0.5.2" !include "${NSISDIR}\Contrib\Modern UI\System.nsh" --- 1,4 ---- !define MUI_PRODUCT "BitTorrent++" ! !define MUI_VERSION "0.5.3" !include "${NSISDIR}\Contrib\Modern UI\System.nsh" *************** *** 18,22 **** ;General ! OutFile "BT++-${MUI_VERSION}-bin.exe" ;Text for License window --- 18,22 ---- ;General ! OutFile "BTpp-${MUI_VERSION}-bin.exe" ;Text for License window |
From: <sir...@us...> - 2003-04-05 15:15:48
|
Update of /cvsroot/btplusplus/BT++/src/TabLog In directory sc8-pr-cvs1:/tmp/cvs-serv17943/src/TabLog Modified Files: LogWindow.py Log Message: 0.5.3 Index: LogWindow.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabLog/LogWindow.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LogWindow.py 5 Apr 2003 11:05:37 -0000 1.5 --- LogWindow.py 5 Apr 2003 15:15:37 -0000 1.6 *************** *** 34,38 **** def Log(self, msg, severity): i = self.GetItemCount() ! self.InsertImageItem(i, 0) self.SetStringItem(i, 1, time.strftime('%d.%m.%Y - %H:%M:%S')) self.SetStringItem(i, 2, msg) --- 34,38 ---- def Log(self, msg, severity): i = self.GetItemCount() ! self.InsertImageItem(i, severity) self.SetStringItem(i, 1, time.strftime('%d.%m.%Y - %H:%M:%S')) self.SetStringItem(i, 2, msg) |
From: <sir...@us...> - 2003-04-05 11:41:58
|
Update of /cvsroot/btplusplus/BT++/src/TabLog In directory sc8-pr-cvs1:/tmp/cvs-serv7460/src/TabLog Modified Files: TabLog.py Log Message: - Fixed a wrong class name in the new logging. Index: TabLog.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabLog/TabLog.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TabLog.py 5 Apr 2003 11:05:37 -0000 1.5 --- TabLog.py 5 Apr 2003 11:41:53 -0000 1.6 *************** *** 25,31 **** s3 = wxBoxSizer(wxVERTICAL) ! l1 = LogWindow.LogWindow(self.p1, wxPoint(0,0)) ! l2 = LogWindow.LogWindow(self.p2, wxPoint(0,0)) ! l3 = LogWindow.LogWindow(self.p3, wxPoint(0,0)) s1.Add( l1, 1, wxEXPAND | wxALL, 0) --- 25,31 ---- s3 = wxBoxSizer(wxVERTICAL) ! l1 = LogWindow(self.p1, wxPoint(0,0)) ! l2 = LogWindow(self.p2, wxPoint(0,0)) ! l3 = LogWindow(self.p3, wxPoint(0,0)) s1.Add( l1, 1, wxEXPAND | wxALL, 0) *************** *** 42,44 **** Log.Info.AddHandler(l1) ! Log.Info( 'Starting up...' ) --- 42,44 ---- Log.Info.AddHandler(l1) ! Log.Info('Starting up...') |
From: <sir...@us...> - 2003-04-05 11:06:11
|
Update of /cvsroot/btplusplus/BT++/src/TabLog In directory sc8-pr-cvs1:/tmp/cvs-serv27446/src/TabLog Modified Files: TabLog.py LogWindow.py Added Files: MultiPartFrame.py Log Message: Started modifying/reworking the whole logging system. It is work in progress... but working. --- NEW FILE: MultiPartFrame.py --- from wxPython.wx import * import math ########################################################################################################### ########################################################################################################### class MultiPartFrame(wxPanel): ########################################################################################################### SubPanels = [] BitmapOn = None BitmapOff = None ########################################################################################################### def __init__(self, parent, pos, size, bitmapon = None, bitmapoff = None): wxPanel.__init__(self, parent, -1, pos, size, style = 0) self.BitmapOn = bitmapon self.BitmapOff = bitmapoff EVT_SIZE(self, self.OnSize) ########################################################################################################### def Attach(self, child, name): window = MultiPartWindow(self, name, None, self.BitmapOn, self.BitmapOff) child.Reparent(self) self.SubPanels.append( [window, child, False] ) self.DoLayout() ########################################################################################################### def ShowSubPanel(self, panel, show = True): for bit in self.SubPanels: if bit[1] == panel: bit[2] = show self.DoLayout() return ########################################################################################################### def OnLeft(self, evt): win = evt.GetEventObject() for bit in self.SubPanels: if bit[0] == win: bit[2] = not bit[2] self.DoLayout() return ########################################################################################################### def OnSize(self, evt): self.DoLayout() ########################################################################################################### def DoLayout(self): numwin = 0 numpan = 0 for bit in self.SubPanels: numwin = numwin + 1 if bit[2]: bit[1].Show(True) if bit[0].Bitmap != None: bit[0].Bitmap.SetBitmap(self.BitmapOn) numpan = numpan + 1 else: bit[1].Show(False) if bit[0].Bitmap != None: bit[0].Bitmap.SetBitmap(self.BitmapOff) width,height = self.GetSizeTuple() if numpan > 0: winheight = math.floor( (height - 30 * numwin - 5 * (numpan - 1)) / numpan ) else: winheight = 0 x = 0 y = -5 for bit in self.SubPanels: window,panel,show = bit window.SetDimensions(x, y + 5, width, 25, sizeFlags = 0) y = y + 30 if show == True: panel.SetDimensions(x, y + 5, width, winheight, sizeFlags = 0) y = y + winheight + 5 ########################################################################################################### ########################################################################################################### class MultiPartWindow(wxWindow): ########################################################################################################### def __init__(self, parent, name, menu = None, bm_on = None, bm_off = None): wxWindow.__init__(self, parent, -1, style = wxSIMPLE_BORDER) self.SetBackgroundColour( wxColour(206,206,255) ) t = wxStaticText(self, -1, name, wxPoint(5,5)) f = t.GetFont() f.SetWeight(wxBOLD) t.SetFont(f) if bm_on != None and bm_off != None: w,h = self.GetSizeTuple() b = wxStaticBitmap(self, -1, bm_off, wxPoint(w - 20,9)) else: b = None self.BitmapOn = bm_on self.BitmapOff = bm_off self.Text = t self.Bitmap = b EVT_SIZE(self, self.OnSize) EVT_LEFT_DCLICK(self, parent.OnLeft) ########################################################################################################### def OnSize(self, evt): w = evt.GetSize().GetWidth() if self.Bitmap != None: self.Bitmap.SetPosition(wxPoint(w - 20,9)) Index: TabLog.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabLog/TabLog.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TabLog.py 10 Mar 2003 18:45:57 -0000 1.4 --- TabLog.py 5 Apr 2003 11:05:37 -0000 1.5 *************** *** 1,4 **** ! from wxPython.wx import * ! from LogWindow import * class TabLog(wxPanel): --- 1,8 ---- ! from wxPython.wx import * ! from MultiPartFrame import MultiPartFrame ! from Images import GetBitmap ! from LogWindow import LogWindow ! ! import Log class TabLog(wxPanel): *************** *** 6,25 **** wxPanel.__init__(self, parent, -1, wxPoint(2,65), wxSize(786,347), style = 0) ! self.LogWnd = LogWindow( self, wxPoint(0,0), wxSize(786,180) ) ! self.LogWnd.SetHelpText("This is the log window, details on torrents (and errors) will appear here.") ! Log( '', window = self.LogWnd ) ! Log( 'Starting up...', [0,0,0], false ) ! self.ButClearLog = wxButton(self, -1, 'Clear Log', wxPoint(0,180) ) ! sizer = wxBoxSizer(wxVERTICAL) ! sizer.Add( self.LogWnd, 1, wxEXPAND | wxALL, 3) ! sizer.Add( self.ButClearLog, 0, wxALIGN_RIGHT | wxBOTTOM | wxLEFT | wxRIGHT, 3) ! self.SetSizer( sizer ) ! ! EVT_BUTTON( self, self.ButClearLog.GetId(), self.Func_ButClearLog ) ! def Func_ButClearLog(self, evt): ! self.LogWnd.Clear() --- 10,44 ---- wxPanel.__init__(self, parent, -1, wxPoint(2,65), wxSize(786,347), style = 0) ! self.mpf = MultiPartFrame(self, wxPoint(2,60), wxSize(500,250), GetBitmap('Log_On'), GetBitmap('Log_Off') ) ! self.mpf.SetHelpText("This is the log window, details on torrents (and errors) will appear here.") ! ! self.p1 = wxPanel(self.mpf, -1, style = 0) ! self.p2 = wxPanel(self.mpf, -1, style = 0) ! self.p3 = wxPanel(self.mpf, -1, style = 0) ! ! self.mpf.Attach(self.p1, 'General') ! self.mpf.Attach(self.p2, 'Downloads') ! self.mpf.Attach(self.p3, 'Seeds') ! s1 = wxBoxSizer(wxVERTICAL) ! s2 = wxBoxSizer(wxVERTICAL) ! s3 = wxBoxSizer(wxVERTICAL) ! l1 = LogWindow.LogWindow(self.p1, wxPoint(0,0)) ! l2 = LogWindow.LogWindow(self.p2, wxPoint(0,0)) ! l3 = LogWindow.LogWindow(self.p3, wxPoint(0,0)) ! s1.Add( l1, 1, wxEXPAND | wxALL, 0) ! s2.Add( l2, 1, wxEXPAND | wxALL, 0) ! s3.Add( l3, 1, wxEXPAND | wxALL, 0) ! self.p1.SetSizer( s1 ) ! self.p2.SetSizer( s2 ) ! self.p3.SetSizer( s3 ) ! sizer = wxBoxSizer(wxHORIZONTAL) ! sizer.Add( self.mpf, 1, wxEXPAND | wxALL, 3) ! self.SetSizer(sizer) ! ! Log.Info.AddHandler(l1) ! Log.Info( 'Starting up...' ) Index: LogWindow.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabLog/LogWindow.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LogWindow.py 3 Mar 2003 22:15:26 -0000 1.4 --- LogWindow.py 5 Apr 2003 11:05:37 -0000 1.5 *************** *** 1,25 **** from wxPython.wx import * from BTConstants import * ! class LogWindow(wxTextCtrl): ! def __init__(self, parent, pos, size): ! wxTextCtrl.__init__(self, parent, -1, '', pos, size, (wxSIMPLE_BORDER | wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_READONLY | wxTE_RICH)) ! ! def Log(self, text, color = [0, 0, 0], lbreak = true): ! self.SetDefaultStyle(wxTextAttr(wxColour( color[1], ! color[1], ! color[2] ))) ! if lbreak == true: ! self.AppendText('\n' + text) ! else: ! self.AppendText(text) ! global _UsedWindow ! _UsedWindow = None def Log(text, color = [255,0,0], lbreak = true, window = None, loglevel = LOG_INFO): - global _UsedWindow - if loglevel == LOG_TRIVIAL: return --- 1,52 ---- from wxPython.wx import * from BTConstants import * + from Images import GetBitmap ! import time ! import Logging ! import Log as NewLog ! ! ########################################################################################################### ! ########################################################################################################### ! ! class LogWindow(wxListCtrl,Logging.Handler): ! ! ########################################################################################################### ! ! def __init__(self, parent, pos): ! wxListCtrl.__init__(self, parent, -1, pos, style = wxSIMPLE_BORDER | wxLC_REPORT) ! imglist = wxImageList(16, 16) ! imglist.Add( GetBitmap('Log_Info') ) ! imglist.Add( GetBitmap('Log_Error') ) ! imglist.Add( GetBitmap('Log_Fatal') ) ! ! self.AssignImageList(imglist, wxIMAGE_LIST_SMALL) ! self.InsertColumn(0, '') ! self.InsertColumn(1, 'Timestap') ! self.InsertColumn(2, 'Message') ! ! EVT_SIZE(self, self.OnSize) ! ! ########################################################################################################### ! ! def Log(self, msg, severity): ! i = self.GetItemCount() ! self.InsertImageItem(i, 0) ! self.SetStringItem(i, 1, time.strftime('%d.%m.%Y - %H:%M:%S')) ! self.SetStringItem(i, 2, msg) ! ! ########################################################################################################### ! ! def OnSize(self, evt): ! self.SetColumnWidth(0, 22) ! self.SetColumnWidth(1, 130) ! self.SetColumnWidth(2, evt.GetSize().GetWidth() - 168) ! ! ########################################################################################################### ! ########################################################################################################### def Log(text, color = [255,0,0], lbreak = true, window = None, loglevel = LOG_INFO): if loglevel == LOG_TRIVIAL: return *************** *** 28,36 **** color = [255,0,0] ! if window != None: ! _UsedWindow = window ! else: ! if _UsedWindow: ! _UsedWindow.Log(text, color, lbreak) if loglevel == LOG_CRITICAL: --- 55,59 ---- color = [255,0,0] ! NewLog.Info(text, 0) if loglevel == LOG_CRITICAL: |
From: <sir...@us...> - 2003-04-05 11:05:45
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv27446/src Modified Files: Images.py Added Files: Logging.py Log.py Log Message: Started modifying/reworking the whole logging system. It is work in progress... but working. --- NEW FILE: Logging.py --- import new, types class Interface: Handlers = [] def __init__(self, *args): fullargs = 'self' cleanargs = '' for arg in args: if type(arg) == types.TupleType: name = arg[0] default = arg[1] else: name = arg default = NotImplemented cleanargs = cleanargs + name + ',' fullargs = fullargs + ',' + name if( default != NotImplemented ): if type(default) == types.StringType: fullargs = fullargs + '=\'' + default + '\'' else: fullargs = fullargs + '=' + str(default) cleanargs = cleanargs[0:len(cleanargs) - 1] callstr = 'lambda ' + fullargs + ': self.Log(' + cleanargs + ')' self.__call__ = new.instancemethod(eval(callstr), self, Interface) def __call__(self): pass def AddHandler(self, handler): if handler not in self.Handlers: self.Handlers.append(handler) def DelHandler(self, handler): self.Handlers.remove(handler) def Log(self, *args): for handler in self.Handlers: handler.Log(*args) class Handler: def Log(self, *args): print(str(args)) --- NEW FILE: Log.py --- import Logging Info = Logging.Interface( 'Message', ('Severity', 0) ) #Error = Logging.Interface( 'Message', ('Severity', 1) ) #Fatal = Logging.Interface( 'Massage', ('Severity', 2) ) #LoadInfo = Logging.Interface( 'File', 'Message' ) #SeedInfo = Logging.Interface( 'File', 'Message' ) Index: Images.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/Images.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Images.py 3 Mar 2003 20:46:14 -0000 1.9 --- Images.py 5 Apr 2003 11:05:42 -0000 1.10 *************** *** 776,779 **** --- 776,794 ---- \x17\xa6\xfdlI:>\x15\xe8)\x06OW?\x97uN\tM\x00\x9b\xc8g\xbd" , + 'Log_Off': + 'x\xda\xeb\x0c\xf0s\xe7\xe5\x92\xe2b``\xe0\xf5\xf4p\t\x02\xd2\xdc@\xcc\xce\ + \xc1\x06$\xef\xe5m\x8f\x05R,\xc5N\x9e!\x1c@P\xc3\x91\xd2\x01\xe4\x1bx\xba8\ + \x86T\xccI\x16\x11\x10HP\x103H\x14\xfe\xf3a\xe1g\xfb\xc0\xaeD\xae\x8d\x99\t\ + \x87\x96\t\x88\xcf\xe7\x9c\xcebV\xa8V\xc3u\xd1\xd4`\x92\x90\x14\xc3\x0fky\ + \xd1\xcc\xcc\xa7\x19@\xbd\x0c\x9e\xae~.\xeb\x9c\x12\x9a\x00R\xd6\x1f\x8b' , + + 'Log_On': + 'x\xda\xeb\x0c\xf0s\xe7\xe5\x92\xe2b``\xe0\xf5\xf4p\t\x02\xd2\xdc@\xcc\xce\ + \xc1\x06$\xef\xe5m\x8f\x05R,\xc5N\x9e!\x1c@P\xc3\x91\xd2\x01\xe4\xdbz\xba8\ + \x86T\xccI\x16\x11\x10HP\x10\xdb`\x00\x045?.\xfc\x9c?\xc1\x89\xb1\xb1\xc8MM\ + \xa2y\x82\x13\x1b\x10\xa8\x950\xc6p\x05\x8a$_n8\xe7\x1e\xd8\xb3\x86a\xb6o\ + \xcf\x92\x166\x86\xeb79\xf5\xf7\xa8}\xb4\x07\x1a\xc4\xe0\xe9\xea\xe7\xb2\xce\ + )\xa1\t\x00\xf4\xbb$/' , + 'Menu_MoveUp': 'x\xda\x01=\x01\xc2\xfe\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x0e\ *************** *** 806,809 **** --- 821,853 ---- \x00\x00\x00IEND\xaeB`\x82a1\x85Q' , + 'Log_Error': + 'x\xda\x01\xb3\x02L\xfd\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\ + \x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\ + \x08\x08\x08|\x08d\x88\x00\x00\x02jIDATx\x9c\xa5\x93MH\x14q\x18\xc6\x7f\xb33\ + ;\xeb\xac\xeb\xee\xec\xf6\xa1\x16\x08\x12H\x08\tI\xd4!\xbbh\xa7(\x85$\xe8\ + \x90T\xd0!\xccKDT\xd0\x87\x12EP\x1d"\x0b)\x88\xba\x15!v\x89\xf4"}\x08\x89\ + \xa1X\x071\x8a\xcc\xcaL1\xd7\x1dwg\x9c\xd9\x99\xf9w0?+"z\x8f//\xbf\xe7}x\x9f\ + W\xd2u\x9d\xff)\xe5w\xcd\xca\x86F1\x13O0%\x05\x08\t\x9f\x90\xe7\x116Rt67J\ + \xcbg\xa5\xe5\x1b\x94_\xbc->\xf9.\xd9\xa0\n\x80\xe7\xfax\xe6\x0c\xb2p)\xd1T\ + \xfa\xce\x1c\x91\xfe\x08Xw\xfe\xa60\xf4\x18Z$\x8f\x1c\x04\xe6t\x1a\xcf\xf5\ + \x010\xb3\x0e\x13c\x93\x14\xab\n_.\x1d\x9d\x87\x04\x16+\xdb\xb1\x18E1\x8d\ + \x12s\x82`XfUQ!\xe1\x88\x86\x99uXi\x1alLh\x0c9.\xa5g\x9b\xc5\x12@eC\xa3\x18V\ + \x02\x04W\xc4)\xf5fx\xb0\xb7\x86\x9a\x80\x87c\x9b\xf8\xb9a\n\xac\x14\xed\x07\ + ws\xa5j\x139\xce\x0c\x83\x19\x9b\xad\x87N\x88y@2\x9e\x00E!\xa2\x06\x19\x90s\ + \xe8\x1cx\xcb\xb1\xca\nvH.\xb9C\x1fh\xdbW\x8d\x16Th\xea\xecA\x8bF\xb0\x85\ + \xcfTT_\xb8B64\xeb\xc4L\xa6\x90\xd7\xac\xa6i\xf0#\x00\'\xab\xb6q\xb0<\t@\xf5\ + \x9dG\xbc\xb6@\x95\x14\x84\xeb\xe0\xa8\xca\x82\x05\xdf\x99\xf5c\xd86\xd3_\ + \xc7\xf9\xe6\x07i\xe9\xee\x07 ?\x1e\xa7\xeb\xdd\x10\xdd\xa3\x93\xe8z.\xb2pg\ + \xc5\xc4\xa2\x1cH\xe9i,)H,\x16f\xccH\xb2\x01\x8b{\x07j\x99\x9cN\xd3\xffy\x84\ + \xda\xcd\xe5\x98N\x96\xfa\x8e^\xc2\x91(\x9e\xeb\xa2+\x01F\xe6\x00\xf1\xac\ + \xc3p\xd6$\x95\x82r\xcd\xe5~]-\x00\x87\x1f>\xe6\xe9\xf0wn\xed\xb2\xa8\xab\ + \xd8\x02@}G/2\x105\xcd\x05\x0b]\xd7\xcfI\xf9\xb2\xccTr\x8aDH\xc5\xb0,\xf6\ + \xdcm\xa5}4\x83VX\xc0\xfe\xb6\xe7\xb4\xf6\xf4\xb16\xa1c\xa5\x0c\x8a\xb5\x1c^\ + \xb6\\\x90\x96\x04i\xe7\xf1\xcb\xe2\x99\xef3n\xb9D\x02>"\x14& +\xf8\x9e\x8b-\ + |D:\x83\x95\xc9\x90\x88G\xd9.\\:n4-\x05\xccA\xde\xa8*\xef\x93\x06\xde\xcf\ + \x8c\xc9\xf8\xd8\x8e\x07\xc2g\xbd\x9eG\x99k\xf3\xe4\xda\xe9\xf9$\xfe\xf2\x0b\ + s\xa0\x89\xa0\xc2+#\r@Y<F\xc4\xcc\xf0\xe2\xea\xa9\xbf?\xd3\xbf\xd6\x0fVu\x02\ + \xa4A\xcb\xde\x97\x00\x00\x00\x00IEND\xaeB`\x82\xa5[50' , + 'AboutIcon': 'x\xda\x01\xfb\x06\x04\xf9\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00&\ *************** *** 877,880 **** --- 921,972 ---- \xd7\xb6\xcd\xff\x04,\x12\t\xf3\xedg\x9e\xe6\xa5#/\xb7ms[\x7fC\xbd\x97\xf6/\ \xbf\x05\xdb\x82Q\xb7\xaa\x00\x00\x00\x00\x00IEND\xaeB`\x82\x0e\x1fU\xe3' , + + 'Log_Fatal': + 'x\xda\x01\x16\x02\xe9\xfd\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\ + \x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\ + \x08\x08\x08\x08|\x08d\x88\x00\x00\x01\xcdIDATx\x9c\xa5\x931k\x1bA\x10\x85\ + \xbf\xdb\x93\x83\xc1v\xbcj\xdc\x04RX8\x9d{\tR\xa55*\x82\n\x1b\x05\xdc\x08\ + \x15\xa9\xd2\xa4\xf3\x0f\xd0opeH\x11U&\x85paHcr\xa0@H#5\xc2\xc1\x98\xc86\x11\ + "X{\x08%\x92|{\x9b\xe2\xeeV\'Y]\xb6\xd9\xd9\xb9}of\xf6\xdes\xa4\x94,\xae\x92\ + R\xe6Q\x128\x95\xd2Y\xcce\x96\x01k\xe5\xe22<|l\x98E"KPR\xca$@\xf5\xbd\xc1\ + \xe1\x0f\x01\xc0\x87\x9d\xd0\xe2k\xe5"\x7f\xfa?\xe1s\xcbX\x12)%\x150\xfdr\ + \xd1\xb4s\x98\xbc\x10&/\x84\xb9\xbd\xba2\xbdn\xd7\x9e\xdb9L;\x87i\xe50\x9d\ + \xc2\xb6\xa9\x80\x91R"\xd2\x1dV\xaf\x05M\xad\xa9\xd5\xebd\xb7\xb6\xd8\xc8f\ + \xa9\xd5\xeb4\xb5\xa6z-\x98h\x98jP\xbf\xba<\x89\x91\x99\xa4\xf5\xcb/\r\x88\ + \xf9V\xd7\xd7-i:\x1e\xeb80\x01o\x9e\xc1\xf4F\x19\x010T\x03\xfe\x06\xb3N\\\ + \xd7]\x1aO4\xbc\xbf\x13L\xc2(&)9\xf8\xdd\xb7\t\x00\x1d\x04K\xe3\xa3^4\xe2QO\ + \xd8n2\x00\xfe\xfd=\xd3\x14\x01@\xeb\xe2\x02\x80\x91\xef\xdb\\S\xcf.M\x82\ + \x14\xc1@)\x1e\xe2o_\xcf\xce\xc8\xef\xed\xd9\x8b7\x9d\x0e\xdf\xce\xcf-\xf8\ + \xe4m\x95wOC\xdb\xb1S\x01\xf3r#:\x1c\x8f\xc4\\\x95\xb6\xe7\xb1\xbd\xbb\xcb\ + \xda\xe6\xa6\xcd\xbdr]\x0e\xd7"mxC\x10\xa7R:\xde\x90\xb97H\xd6\xc8\xf7\xe7\ + \xc0\x05\xd7e\x7f5\xaa\xee\r#EZ\x1d\x8c5\x1c\xac\x84\x14R\xaf\x9e\x1e\xa5\ + \xe0\xba\x1c\xac\x84\x8cu\xeaw\x02Nb\xa6\x92R\xe6E,\xecO\xe1\x9c\xbe\x00x-f\ + \x92\xbe\x0cf~p\xd2nL\xcc\xf4\xfc\xf14\x00t\xe3=m&\xe7\x7f\xed\xfc\x0f\xf6\ + \x88\xd2Q\xa6E\x86\xd7\x00\x00\x00\x00IEND\xaeB`\x82\xbc_\xf0\xfb' , + + 'Log_Info': + 'x\xda\x01C\x02\xbc\xfd\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\ + \x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\ + \x08\x08\x08|\x08d\x88\x00\x00\x01\xfaIDATx\x9c\xa5\x93=kTA\x14\x86\x9f\xb9{\ + ?\x9c\xbdw\xc3]4A\x02&\xa0\x12\x82H\xc4\xc2V"\xfe\x00+\x1b#ha\x91\xdeU\x08\ + \x04\xb1P\x08\xb2)\xc5\x14\x16Z\x04,\xac\xfc\x05\xfe\x03\x11\x0bqU\x90\x98\ + \x0fIP\xe3f\x93\xfb93\x16ws\xd7\xcd*"\xbe\xcd\x9c9\xcc\xfbr\xdes\xce\x880\ + \x0c\xf9\x1f\xd8\xbfK^Zxb>m}\xa1\x1d\xc7(#\xa8K\x8f\xf1#Gy1w]\x1c|+\x0eV0>;o\ + >tRv\x8d\xd3\x97\xf7E\xc6\x89\xc0ae\xe9\xbe\xf8\xa3\xc0\xd0\xb5\x9bf%?\x84\ + \xe398\x8e\x83\xb0\x04Zk\xb2$#\xcfr\x00\xc6\xec\x98\xf6\xd3E1 06;o\xde\xech<\ + _"}\x89\xeb\xb9\x85\x80\xd2$qB\xbc\x1b\x93D\t\x02\xc3\xe9\x9a\xc5\xe7\xa5{\ + \x02\xc0\x02\xb8x\xf7\x91y\xd7N\xb1=\x17\xe9KN\x86\x1e\xc7\xeaU6n]%\x08\x03\ + \x82Z\x15\xdf\x16\xd8v\x05\x83\xa0\xd5N\x99\xbe\xf3\xd0\x94\x02k\xdf\xbf\x92\ + \x08\x07\xc7up=\x97\xd5T\xb0\xd6\x8e\x19m.\x13\x04\x12m\xba}\xf0\x8a\x9e\'\ + \xc2ac\xfb[o\n\x9d$-\xfcX\x02\xabb\x01\xb0\xde\x98\x01`\xb4\xb9\\\xf6\xa8b\ + \xf5\xfa\xd7I\x0b\x8e\x05\xa0\x8c\x06@+\x8dRj\x80X\xc2\x982T\xdd\xd8\x02\x08\ + <\x0f\x80<\xcdI\xe3t\x90\xd8\x85\xce\xf32\xae\xb9nO\xe0\xb0\x1fP1\x8a,\xcd\ + \x88:Q\x9f\x85\xf5\xc6\x0c\xe7\x86\xdc\xbe\n*FQ\xaf\xfa\x85\xed\xfd1\x8e\xdc\ + \x983\xad\xa8\xf0?1\\\xc3\x08\xc1\xea^\x86V\x9a,-\xce}LH\xc5\xe6\xe3\x85\xde\ + \x18\x01.\x9c:\xc3\x88\x15\x03\xd0\xda\xda\xe1\xfdf\x9b\xa8\x13\x91DI\x1fy\ + \xd8\x8a9?9U\xde\xfb6\xf1\xf2\xe23\xf3\xf2\xedk>F\xa0{\xda]\xaf\x9a\xe3\xd20\ + =9\xc5\xf3\xc6\x95\xc1M\xfc\x15g\x1b\x0f\xccv\xb4\xc7\x8f(B#\x08\xa5\xa4.%\ + \xaf\x9a\xb7\xff\xfe\x99\xfe\x15?\x01\xb9[\xc6\xcc(,\xb6\x86\x00\x00\x00\x00\ + IEND\xaeB`\x82\xe1f\x00\xc6' , 'Icon_Small': |
From: <sir...@us...> - 2003-04-05 11:05:43
|
Update of /cvsroot/btplusplus/BT++/src/Images In directory sc8-pr-cvs1:/tmp/cvs-serv27446/src/Images Added Files: Log_On.png Log_Off.png Log_Info.png Log_Fatal.png Log_Error.png Log Message: Started modifying/reworking the whole logging system. It is work in progress... but working. --- NEW FILE: Log_On.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Log_Off.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Log_Info.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Log_Fatal.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Log_Error.png --- (This appears to be a binary file; contents omitted.) |
From: <sir...@us...> - 2003-04-02 19:44:35
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans In directory sc8-pr-cvs1:/tmp/cvs-serv29947/src/TabTrans Modified Files: GridTable.py Log Message: - Fixed: Downloads wouldn't continue uploading after finishing download. Index: GridTable.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/GridTable.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GridTable.py 31 Mar 2003 14:15:21 -0000 1.9 --- GridTable.py 2 Apr 2003 19:44:27 -0000 1.10 *************** *** 1,3 **** --- 1,4 ---- from os import path, rename + from time import sleep from wxPython.wx import * *************** *** 7,11 **** import Renderer ! from Managers import ManagerDown class GridTable: --- 8,12 ---- import Renderer ! from Managers import ManagerDown, ManagerUp class GridTable: *************** *** 147,152 **** loader.Hashed = true loader.Finished = true ! loader.Obj['Storage'].close() ! loader.UpdateStatus( fractionDone = 1, timeEst = 0, --- 148,152 ---- loader.Hashed = true loader.Finished = true ! loader.UpdateStatus( fractionDone = 1, timeEst = 0, *************** *** 171,175 **** if new == None: return ! if Config.Get('Download', 'KeepUpload'): new.StartDownload() --- 171,175 ---- if new == None: return ! if Config.Get('Download', 'KeepUpload'): new.StartDownload() |
From: <sir...@us...> - 2003-04-02 19:44:35
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv29947/src Modified Files: Loader.py Log Message: - Fixed: Downloads wouldn't continue uploading after finishing download. Index: Loader.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/Loader.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Loader.py 31 Mar 2003 14:15:35 -0000 1.9 --- Loader.py 2 Apr 2003 19:44:30 -0000 1.10 *************** *** 175,179 **** self.Hashed = false ! self.Obj['Storage'] = None self.Obj['StorageWrapper'] = None --- 175,182 ---- self.Hashed = false ! if self.Obj.has_key('Storage') and self.Obj['Storage'] != None: ! self.Obj['Storage'].close() ! ! self.Obj['Storage'] = None self.Obj['StorageWrapper'] = None |
From: <sir...@us...> - 2003-03-31 18:12:06
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans In directory sc8-pr-cvs1:/tmp/cvs-serv23577/src/TabTrans Modified Files: Grid.py Log Message: - Fixed a bug in deletion of torrent files on cancel. Index: Grid.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/Grid.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Grid.py 29 Mar 2003 10:45:17 -0000 1.14 --- Grid.py 31 Mar 2003 18:11:01 -0000 1.15 *************** *** 138,142 **** try: l.PauseDownload() ! l.Obj['Storage'].close() unlink( l.Config['TorFull'] ) except: --- 138,143 ---- try: l.PauseDownload() ! if l.Obj != None and l.Obj.has_key('Storage'): ! l.Obj['Storage'].close() unlink( l.Config['TorFull'] ) except: |
From: <bel...@us...> - 2003-03-31 17:42:32
|
Update of /cvsroot/btplusplus/BT++/src/WebTemplates In directory sc8-pr-cvs1:/tmp/cvs-serv12421/src/WebTemplates Modified Files: torrent.tmpl Log Message: Updated design Index: torrent.tmpl =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/WebTemplates/torrent.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** torrent.tmpl 31 Mar 2003 17:33:57 -0000 1.7 --- torrent.tmpl 31 Mar 2003 17:41:28 -0000 1.8 *************** *** 82,87 **** <td align=center nowrap><TMPL_VAR SpeedDown> <b>down</b><br> <TMPL_VAR SpeedUp> <b>up</b></td> <td align=center nowrap> ! <TMPL_VAR Uploaders> / <TMPL_VAR Downloaders><br> ! <TMPL_VAR SizeUp> / <TMPL_VAR SizeDown> </td> <td align=center nowrap><TMPL_VAR ETA></td> --- 82,87 ---- <td align=center nowrap><TMPL_VAR SpeedDown> <b>down</b><br> <TMPL_VAR SpeedUp> <b>up</b></td> <td align=center nowrap> ! <TMPL_VAR Uploaders> (<TMPL_VAR SizeUp>)<br> ! <TMPL_VAR Downloaders> (<TMPL_VAR SizeDown>) </td> <td align=center nowrap><TMPL_VAR ETA></td> *************** *** 112,117 **** <td align=center nowrap><TMPL_VAR SpeedUp></td> <td align=center nowrap> ! <TMPL_VAR Uploaders> / <TMPL_VAR Downloaders><br> ! <TMPL_VAR SizeUp> / <TMPL_VAR SizeDown> </td> <td align=center><TMPL_VAR Status></td> --- 112,117 ---- <td align=center nowrap><TMPL_VAR SpeedUp></td> <td align=center nowrap> ! <TMPL_VAR Uploaders> (<TMPL_VAR SizeUp>)<br> ! <TMPL_VAR Downloaders> (<TMPL_VAR SizeDown>) </td> <td align=center><TMPL_VAR Status></td> |
From: <bel...@us...> - 2003-03-31 17:34:45
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv9640/src Modified Files: InfoManager.py Log Message: InfoServer fix (hopefully) Display of SizeUp/SizeDown, server start time Added strict hasing to configure Index: InfoManager.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/InfoManager.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InfoManager.py 29 Mar 2003 11:40:12 -0000 1.3 --- InfoManager.py 31 Mar 2003 17:33:56 -0000 1.4 *************** *** 38,72 **** def DownLoader(self): self.Updating = True - h = self.opener.open(self.server) try: self.log('['+self.server+'] Info Download started', loglevel = LOG_TRIVIAL) except: pass ! data = h.read() ! if h.iscompressed(): ! try: self.log('['+self.server+'] Info Download finished (compressed)', loglevel = LOG_TRIVIAL) ! except: pass ! else: ! try: self.log('['+self.server+'] Info Download finished', loglevel = LOG_TRIVIAL) ! except: pass ! h.close() ! failed = False ! try: data = bdecode(data) except: - try: self.log('['+self.server+'] Info Download failed', loglevel = LOG_TRIVIAL) - except: pass failed = True - - files = {} - try: files = data['files'] - except: pass - for loader in self.loaders: - if files.has_key(loader.Config['InfoHash']): - info = files[loader.Config['InfoHash']] - loader.UpdateExtendedInfo(info['complete'], info['incomplete']) - else: - loader.UpdateExtendedInfo('error') if failed: self.refreshed = time() - (60 * self.update) else: self.refreshed = time() self.Updating = False --- 38,72 ---- def DownLoader(self): self.Updating = True try: self.log('['+self.server+'] Info Download started', loglevel = LOG_TRIVIAL) except: pass ! try: ! h = self.opener.open(self.server) ! data = h.read() ! compressed = h.iscompressed() ! h.close() data = bdecode(data) + files = data['files'] + failed = False except: failed = True if failed: + for loader in self.loaders: + loader.UpdateExtendedInfo('error') + try: self.log('['+self.server+'] Info Download failed', loglevel = LOG_TRIVIAL) + except: pass self.refreshed = time() - (60 * self.update) else: + for loader in self.loaders: + if files.has_key(loader.Config['InfoHash']): + info = files[loader.Config['InfoHash']] + loader.UpdateExtendedInfo(info['complete'], info['incomplete']) + else: + loader.UpdateExtendedInfo('error') + if compressed: + try: self.log('['+self.server+'] Info Download finished (compressed)', loglevel = LOG_TRIVIAL) + except: pass + else: + try: self.log('['+self.server+'] Info Download finished', loglevel = LOG_TRIVIAL) + except: pass self.refreshed = time() self.Updating = False |
From: <bel...@us...> - 2003-03-31 17:34:37
|
Update of /cvsroot/btplusplus/BT++/src/WebTemplates In directory sc8-pr-cvs1:/tmp/cvs-serv9640/src/WebTemplates Modified Files: config.tmpl log.tmpl torrent.tmpl Log Message: InfoServer fix (hopefully) Display of SizeUp/SizeDown, server start time Added strict hasing to configure Index: config.tmpl =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/WebTemplates/config.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.tmpl 29 Mar 2003 00:54:14 -0000 1.5 --- config.tmpl 31 Mar 2003 17:33:57 -0000 1.6 *************** *** 78,81 **** --- 78,86 ---- </tr> <tr> + <td>Use strict hashing<br>(If checked only the set number of files will be hashed, never more)</td> + <td width=5% align=center><input type=hidden name=Hash_Strict value="0"> + <input type=checkbox name=Hash_Strict <TMPL_IF hash_strict>CHECKED</TMPL_IF> value="1"></td> + </tr> + <tr> <td>Maximal simultanous files hashed (1-5)</td> <td width=5%><input type=text style="width:100%" name=Hash_NumSimHash value="<TMPL_VAR hash_numsimhash>"></td> Index: log.tmpl =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/WebTemplates/log.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** log.tmpl 7 Mar 2003 23:42:16 -0000 1.3 --- log.tmpl 31 Mar 2003 17:33:57 -0000 1.4 *************** *** 5,9 **** <body bgcolor=#AA6666> <h1>WebTorrent++ Log</h1> ! Log generated <TMPL_VAR logtime><p> <table border=1 cellpadding=4 width=100%> <TMPL_LOOP Logs> --- 5,10 ---- <body bgcolor=#AA6666> <h1>WebTorrent++ Log</h1> ! Log generated <TMPL_VAR logtime><br> ! Server started <TMPL_VAR starttime><p> <table border=1 cellpadding=4 width=100%> <TMPL_LOOP Logs> Index: torrent.tmpl =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/WebTemplates/torrent.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** torrent.tmpl 29 Mar 2003 00:54:15 -0000 1.6 --- torrent.tmpl 31 Mar 2003 17:33:57 -0000 1.7 *************** *** 81,85 **** <td align=center nowrap><TMPL_VAR FileSize></td> <td align=center nowrap><TMPL_VAR SpeedDown> <b>down</b><br> <TMPL_VAR SpeedUp> <b>up</b></td> ! <td align=center nowrap><TMPL_VAR Uploaders> / <TMPL_VAR Downloaders></td> <td align=center nowrap><TMPL_VAR ETA></td> </tr> --- 81,88 ---- <td align=center nowrap><TMPL_VAR FileSize></td> <td align=center nowrap><TMPL_VAR SpeedDown> <b>down</b><br> <TMPL_VAR SpeedUp> <b>up</b></td> ! <td align=center nowrap> ! <TMPL_VAR Uploaders> / <TMPL_VAR Downloaders><br> ! <TMPL_VAR SizeUp> / <TMPL_VAR SizeDown> ! </td> <td align=center nowrap><TMPL_VAR ETA></td> </tr> *************** *** 108,112 **** <td align=center nowrap><TMPL_VAR FileSize></td> <td align=center nowrap><TMPL_VAR SpeedUp></td> ! <td align=center nowrap><TMPL_VAR Uploaders> / <TMPL_VAR Downloaders></td> <td align=center><TMPL_VAR Status></td> </tr> --- 111,118 ---- <td align=center nowrap><TMPL_VAR FileSize></td> <td align=center nowrap><TMPL_VAR SpeedUp></td> ! <td align=center nowrap> ! <TMPL_VAR Uploaders> / <TMPL_VAR Downloaders><br> ! <TMPL_VAR SizeUp> / <TMPL_VAR SizeDown> ! </td> <td align=center><TMPL_VAR Status></td> </tr> |
From: <bel...@us...> - 2003-03-31 17:34:27
|
Update of /cvsroot/btplusplus/BT++/src/WebServer In directory sc8-pr-cvs1:/tmp/cvs-serv9640/src/WebServer Modified Files: BTWebServer.py Log Message: InfoServer fix (hopefully) Display of SizeUp/SizeDown, server start time Added strict hasing to configure Index: BTWebServer.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/WebServer/BTWebServer.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BTWebServer.py 29 Mar 2003 00:54:14 -0000 1.13 --- BTWebServer.py 31 Mar 2003 17:33:56 -0000 1.14 *************** *** 189,192 **** --- 189,194 ---- WTTimer = UpdateManager(int(HTTPConfig.Get('Display', 'Refresh')), UpdateManagers) + Started = localtime() + ########################################################################################################### ########################################################################################################### *************** *** 374,377 **** --- 376,381 ---- LoaderInfo['Uploaders'] = loader.Info['complete'] LoaderInfo['Downloaders'] = loader.Info['incomplete'] + LoaderInfo['SizeUp'] = '%.2f MB' % (float(loader.Info['SizeUp']) / 1024 / 1024) + LoaderInfo['SizeDown'] = '%.2f MB' % (float(loader.Info['SizeDown']) / 1024 / 1024) LoaderInfo['Seedless'] = (loader.Info['complete'] == 0) LoaderInfos.append(LoaderInfo) *************** *** 392,395 **** --- 396,401 ---- LoaderInfo['Uploaders'] = loader.Info['complete'] LoaderInfo['Downloaders'] = loader.Info['incomplete'] + LoaderInfo['SizeUp'] = '%.2f MB' % (float(loader.Info['SizeUp']) / 1024 / 1024) + LoaderInfo['SizeDown'] = '%.2f MB' % (float(loader.Info['SizeDown']) / 1024 / 1024) SeedInfos.append(LoaderInfo) tproc.set("Loaders", LoaderInfos) *************** *** 411,414 **** --- 417,421 ---- tproc.set('download_maxspeedup', Config.Get('Download', 'MaxSpeedUp')) tproc.set('hash_background', int(Config.Get('Hash', 'Background'))) + tproc.set('hash_strict', int(Config.Get('Hash', 'Strict'))) tproc.set('hash_numsimhash', Config.Get('Hash', 'NumSimHash')) tproc.set('bind_ip', Config.Get('Bind', 'Ip')) *************** *** 434,437 **** --- 441,445 ---- tproc.set("Logs", t) tproc.set("logtime", strftime("%a, %d %b %Y %H:%M:%S", localtime())) + tproc.set("starttime", strftime("%a, %d %b %Y %H:%M:%S", Started)) tproc.set("logs", len(WebLog)) self.wfile.write(tproc.process(templateLog)) |
From: <sir...@us...> - 2003-03-31 14:31:21
|
Update of /cvsroot/btplusplus/BT++/src In directory sc8-pr-cvs1:/tmp/cvs-serv25543/src Modified Files: Version.py Log Message: 0.5.2 Index: Version.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/Version.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Version.py 28 Mar 2003 16:51:02 -0000 1.3 --- Version.py 31 Mar 2003 14:30:25 -0000 1.4 *************** *** 1 **** ! CurrentVersion = '0.5.1' --- 1 ---- ! CurrentVersion = '0.5.2' |
From: <sir...@us...> - 2003-03-31 14:30:51
|
Update of /cvsroot/btplusplus/BT++/dist In directory sc8-pr-cvs1:/tmp/cvs-serv25543/dist Modified Files: CHANGELOG.txt BT++.nsi Log Message: 0.5.2 Index: CHANGELOG.txt =================================================================== RCS file: /cvsroot/btplusplus/BT++/dist/CHANGELOG.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGELOG.txt 28 Mar 2003 16:51:03 -0000 1.2 --- CHANGELOG.txt 31 Mar 2003 14:30:27 -0000 1.3 *************** *** 1,2 **** --- 1,12 ---- + [0.5.2 (alpha)] + + - Added strict hashing config option. + - Fixed upload limit updating (after pref change). + - Fixed core bug. + - Modified 'AddTorrent' downloading. + - History shows uploaded (transfered) MB. + - Fixed bug in right-click-menu of the history tab. + - Corrected some of the grid info display. + [0.5.1 (alpha)] Index: BT++.nsi =================================================================== RCS file: /cvsroot/btplusplus/BT++/dist/BT++.nsi,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** BT++.nsi 28 Mar 2003 16:51:03 -0000 1.12 --- BT++.nsi 31 Mar 2003 14:30:28 -0000 1.13 *************** *** 1,4 **** !define MUI_PRODUCT "BitTorrent++" ! !define MUI_VERSION "0.5.1" !include "${NSISDIR}\Contrib\Modern UI\System.nsh" --- 1,4 ---- !define MUI_PRODUCT "BitTorrent++" ! !define MUI_VERSION "0.5.2" !include "${NSISDIR}\Contrib\Modern UI\System.nsh" |
From: <sir...@us...> - 2003-03-31 14:16:22
|
Update of /cvsroot/btplusplus/BT++/src/core In directory sc8-pr-cvs1:/tmp/cvs-serv19487/src/core Modified Files: Storage.py Rerequester.py DownloaderFeedback.py Log Message: - Fixed core bug. - Modified 'AddTorrent' downloading. - History shows uploaded (transfered) MB. - Fixed bug in right-click-menu of the history tab. - Corrected some of the grid info display. Index: Storage.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/core/Storage.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Storage.py 28 Mar 2003 13:38:04 -0000 1.4 --- Storage.py 31 Mar 2003 14:15:29 -0000 1.5 *************** *** 70,76 **** def set_readonly(self): # may raise IOError or OSError ! for file, old in self.handles.items(): ! self.handles[file] = open(file, 'rb') old.close() def close(self): --- 70,78 ---- def set_readonly(self): # may raise IOError or OSError ! for file in self.whandles.keys(): ! old = self.handles[file] ! old.flush() old.close() + self.handles[file] = open(file, 'rb') def close(self): *************** *** 108,111 **** --- 110,114 ---- for file, begin, end in self._intervals(pos, len(s)): if not self.whandles.has_key(file): + self.handles[file].close() self.handles[file] = open(file, 'rb+') self.whandles[file] = 1 Index: Rerequester.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/core/Rerequester.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Rerequester.py 28 Mar 2003 12:44:28 -0000 1.2 --- Rerequester.py 31 Mar 2003 14:15:30 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- from threading import Thread, Lock from traceback import print_exc + from socket import error true = 1 false = 0 *************** *** 80,84 **** self.postrequest(r, callback) self.externalsched(add) ! except IOError, e: if set(): def fail(self = self, r = 'Problem connecting to tracker - ' + str(e)): --- 81,85 ---- self.postrequest(r, callback) self.externalsched(add) ! except (IOError, error), e: if set(): def fail(self = self, r = 'Problem connecting to tracker - ' + str(e)): Index: DownloaderFeedback.py =================================================================== RCS file: /cvsroot/btplusplus/BT++/src/core/DownloaderFeedback.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DownloaderFeedback.py 28 Mar 2003 12:44:28 -0000 1.2 --- DownloaderFeedback.py 31 Mar 2003 14:15:31 -0000 1.3 *************** *** 17,21 **** finflag, interval, ! sp ): self.choker = choker self.add_task = add_task --- 17,23 ---- finflag, interval, ! sp, ! up, ! down ): self.choker = choker self.add_task = add_task *************** *** 29,32 **** --- 31,36 ---- self.interval = interval self.sp = sp + self.up = up + self.down = down self.lastids = [] self.display() *************** *** 87,91 **** self.spew() if self.finflag.isSet(): ! self.statusfunc(upRate = self.upfunc()) return timeEst = self.remainingfunc() --- 91,95 ---- self.spew() if self.finflag.isSet(): ! self.statusfunc(upRate = self.upfunc(), up = self.up (), down = self.down ()) return timeEst = self.remainingfunc() *************** *** 95,100 **** if timeEst is not None: self.statusfunc(timeEst = timeEst, fractionDone = fractionDone, ! downRate = self.downfunc(), upRate = self.upfunc()) else: self.statusfunc(fractionDone = fractionDone, ! downRate = self.downfunc(), upRate = self.upfunc()) --- 99,104 ---- if timeEst is not None: self.statusfunc(timeEst = timeEst, fractionDone = fractionDone, ! downRate = self.downfunc(), upRate = self.upfunc(), up = self.up(), down = self.down()) else: self.statusfunc(fractionDone = fractionDone, ! downRate = self.downfunc(), upRate = self.upfunc(), up = self.up(), down = self.down()) |