[Debtorrent-commits] r21 - in /debtorrent/trunk:
DebTorrent/BT1/Encrypter.py
DebTorrent/BT1/NatCheck.py DebTorrent/BT1/StreamCheck.py
DebTorrent/BT1/track.py DebTorrent/ConfigReader.py DebTorrent/__init__.py
TODO bt-t-make.py btshowmetainfo.py
camrdale-guest at users.alioth.debian.org
camrdale-guest at users.alioth.debian.org
Sun Apr 29 01:49:56 UTC 2007
Author: camrdale-guest
Date: Sun Apr 29 01:49:55 2007
New Revision: 21
URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=21
Log:
Modify the protocol name to be DebTorrent/0.1
Modified:
debtorrent/trunk/DebTorrent/BT1/Encrypter.py
debtorrent/trunk/DebTorrent/BT1/NatCheck.py
debtorrent/trunk/DebTorrent/BT1/StreamCheck.py
debtorrent/trunk/DebTorrent/BT1/track.py
debtorrent/trunk/DebTorrent/ConfigReader.py
debtorrent/trunk/DebTorrent/__init__.py
debtorrent/trunk/TODO
debtorrent/trunk/bt-t-make.py
debtorrent/trunk/btshowmetainfo.py
Modified: debtorrent/trunk/DebTorrent/BT1/Encrypter.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/Encrypter.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/Encrypter.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/Encrypter.py Sun Apr 29 01:49:55 2007
@@ -7,6 +7,7 @@
from urllib import quote
from traceback import print_exc
from DebTorrent.BTcrypto import Crypto
+from DebTorrent.__init__ import protocol_name
try:
True
@@ -19,7 +20,6 @@
MAX_INCOMPLETE = 8
-protocol_name = 'BitTorrent protocol'
option_pattern = chr(0)*8
def toint(s):
Modified: debtorrent/trunk/DebTorrent/BT1/NatCheck.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/NatCheck.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/NatCheck.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/NatCheck.py Sun Apr 29 01:49:55 2007
@@ -5,6 +5,7 @@
from socket import error as socketerror
from traceback import print_exc
from DebTorrent.BTcrypto import Crypto, CRYPTO_OK
+from DebTorrent.__init__ import protocol_name
try:
True
@@ -13,8 +14,6 @@
False = 0
CHECK_PEER_ID_ENCRYPTED = True
-
-protocol_name = 'BitTorrent protocol'
# header, reserved, download id, my id, [length, message]
Modified: debtorrent/trunk/DebTorrent/BT1/StreamCheck.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/StreamCheck.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/StreamCheck.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/StreamCheck.py Sun Apr 29 01:49:55 2007
@@ -6,6 +6,7 @@
from socket import error as socketerror
from urllib import quote
from traceback import print_exc
+from DebTorrent.__init__ import protocol_name
import Connecter
try:
True
@@ -16,7 +17,6 @@
DEBUG = True
-protocol_name = 'BitTorrent protocol'
option_pattern = chr(0)*8
def toint(s):
Modified: debtorrent/trunk/DebTorrent/BT1/track.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/track.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/track.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/track.py Sun Apr 29 01:49:55 2007
@@ -427,11 +427,11 @@
s = StringIO()
s.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n' \
- '<html><head><title>BitTorrent download info</title>\n')
+ '<html><head><title>DebTorrent download info</title>\n')
if self.favicon is not None:
s.write('<link rel="shortcut icon" href="/favicon.ico">\n')
s.write('</head>\n<body>\n' \
- '<h3>BitTorrent download info</h3>\n'\
+ '<h3>DebTorrent download info</h3>\n'\
'<ul>\n'
'<li><strong>tracker version:</strong> %s</li>\n' \
'<li><strong>server time:</strong> %s</li>\n' \
@@ -555,7 +555,7 @@
return (404, 'Not Found', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, alas)
fname = self.allowed[hash]['file']
fpath = self.allowed[hash]['path']
- return (200, 'OK', {'Content-Type': 'application/x-bittorrent',
+ return (200, 'OK', {'Content-Type': 'application/x-debtorrent',
'Content-Disposition': 'attachment; filename=' + fname},
open(fpath, 'rb').read())
Modified: debtorrent/trunk/DebTorrent/ConfigReader.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/ConfigReader.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/ConfigReader.py (original)
+++ debtorrent/trunk/DebTorrent/ConfigReader.py Sun Apr 29 01:49:55 2007
@@ -89,7 +89,7 @@
class configReader:
def __init__(self):
- self.configfile = wxConfig("BitTorrent",style=wxCONFIG_USE_LOCAL_FILE)
+ self.configfile = wxConfig("DebTorrent",style=wxCONFIG_USE_LOCAL_FILE)
self.configMenuBox = None
self.advancedMenuBox = None
self.cryptoMenuBox = None
@@ -133,7 +133,7 @@
def importOldGUIConfig(self):
- oldconfig = wxConfig("BitTorrent",style=wxCONFIG_USE_LOCAL_FILE)
+ oldconfig = wxConfig("DebTorrent",style=wxCONFIG_USE_LOCAL_FILE)
cont, s, i = oldconfig.GetFirstEntry()
if not cont:
oldconfig.DeleteAll()
@@ -461,7 +461,7 @@
savesizer.Add(advancedButton, 0, wxALIGN_CENTER)
colsizer.Add(savesizer, 1, wxALIGN_CENTER)
- resizewarningtext=StaticText('* These settings will not take effect until the next time you start BitTorrent', self.FONT-2)
+ resizewarningtext=StaticText('* These settings will not take effect until the next time you start DebTorrent', self.FONT-2)
colsizer.Add(resizewarningtext, 1, wxALIGN_CENTER)
border = wxBoxSizer(wxHORIZONTAL)
@@ -823,7 +823,7 @@
savesizer.Add(defaultsButton, 0, wxALIGN_CENTER)
colsizer.Add(savesizer, 1, wxALIGN_CENTER)
- resizewarningtext=StaticText('None of these settings will take effect until the next time you start BitTorrent', self.FONT-2)
+ resizewarningtext=StaticText('None of these settings will take effect until the next time you start DebTorrent', self.FONT-2)
colsizer.Add(resizewarningtext, 1, wxALIGN_CENTER)
border = wxBoxSizer(wxHORIZONTAL)
@@ -977,7 +977,7 @@
def locking_hint(evt, self = self):
self.hinttext.SetLabel('\n\n\n\nFile locking prevents other\n' +
'programs (including other instances\n' +
- 'of BitTorrent) from accessing files\n' +
+ 'of DebTorrent) from accessing files\n' +
"you are downloading.")
def doublecheck_hint(evt, self = self):
@@ -1134,7 +1134,7 @@
savesizer.Add(defaultsButton, 0, wxALIGN_CENTER)
colsizer.Add(savesizer, 1, wxALIGN_CENTER)
- resizewarningtext=StaticText('None of these settings will take effect until the next time you start BitTorrent', self.FONT-2)
+ resizewarningtext=StaticText('None of these settings will take effect until the next time you start DebTorrent', self.FONT-2)
colsizer.Add(resizewarningtext, 1, wxALIGN_CENTER)
border = wxBoxSizer(wxHORIZONTAL)
Modified: debtorrent/trunk/DebTorrent/__init__.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/__init__.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/__init__.py (original)
+++ debtorrent/trunk/DebTorrent/__init__.py Sun Apr 29 01:49:55 2007
@@ -1,8 +1,8 @@
product_name = 'DebTorrent'
-version_short = 'T-0.3.18'
+version_short = 'T-0.1.0'
version = version_short+' ('+product_name+')'
-report_email = version_short+'@degreez.net'
+report_email = 'debtorrent-devel at lists.alioth.debian.org'
from types import StringType
from sha import sha
@@ -12,6 +12,8 @@
except ImportError:
def getpid():
return 1
+
+protocol_name = product_name+'/'+'.'.join(version_short[2:].split('.')[:2])
mapbase64 = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-'
Modified: debtorrent/trunk/TODO
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/TODO?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/TODO (original)
+++ debtorrent/trunk/TODO Sun Apr 29 01:49:55 2007
@@ -1,4 +1,13 @@
Below are some things that still need to be done, in order of priority.
+
+
+Remove the 'name' entry from the info hash (or make it mirror-independent)
+
+
+Add pre-created dtorrents to the distribution
+
+
+Move the data cache from ~/.DebTorrent
Pre-allocating files is necessary
Modified: debtorrent/trunk/bt-t-make.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/bt-t-make.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/bt-t-make.py (original)
+++ debtorrent/trunk/bt-t-make.py Sun Apr 29 01:49:55 2007
@@ -912,7 +912,7 @@
class T_make:
def __init__(self):
- self.configobj = wxConfig('BitTorrent_T-make',style=wxCONFIG_USE_LOCAL_FILE)
+ self.configobj = wxConfig('DebTorrent_T-make',style=wxCONFIG_USE_LOCAL_FILE)
self.getConfig()
self.currentTHost = self.config['thost']
# self.d = AdvancedDownloadInfo(self.config, self.getCalls())
Modified: debtorrent/trunk/btshowmetainfo.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/btshowmetainfo.py?rev=21&op=diff
==============================================================================
--- debtorrent/trunk/btshowmetainfo.py (original)
+++ debtorrent/trunk/btshowmetainfo.py Sun Apr 29 01:49:55 2007
@@ -12,7 +12,7 @@
NAME, EXT = splitext(basename(argv[0]))
VERSION = '20030621'
-print '%s %s - decode BitTorrent metainfo files' % (NAME, VERSION)
+print '%s %s - decode DebTorrent metainfo files' % (NAME, VERSION)
print
if len(argv) == 1:
More information about the Debtorrent-commits
mailing list