1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

- After repo copy from py-bittorrent:

o Update to development version 3.9.0

Repo copied by:		portmgr (marcus)

Reviewed by:		freebsd-ports@,
			mezz
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2004-12-24 09:10:04 +00:00
parent 589cde12a2
commit 2701339369
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=125045
18 changed files with 192 additions and 928 deletions

View File

@ -6,13 +6,14 @@
#
PORTNAME= BitTorrent
PORTVERSION= 3.4.2
PORTREVISION= 3
PORTVERSION= 3.9.0
PORTEPOCH= 1
CATEGORIES?= net python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
MASTER_SITES= http://www.bittorrent.com/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
#MASTER_SITE_SUBDIR= ${PORTNAME:L}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX?= -devel
#DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
MAINTAINER= lioux@FreeBSD.org
@ -24,16 +25,22 @@ USE_REINPLACE= yes
CONFLICTS= py??-*[Bb]it[Tt]orrent* py??-*[Bb]it[Tt]ornado* btqueue*
PORTDOCS= BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \
README.txt credits.txt
NO_LATEST_LINK= yes
PORTDOCS= \
LICENSE.txt \
README.txt \
credits.txt \
redirdonate.html
PLIST_SUB+= PORTVERSION=${PORTVERSION}
# required for GUI
.ifndef(WITHOUT_GUI)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
PLIST_SUB+= GUI=''
PLIST_FILES+= \
bin/btcompletedirgui.py \
bin/btmaketorrentgui.py \
bin/btdownloadgui.py
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-nogui-patch-setup.py
@ -44,27 +51,23 @@ pre-everything::
@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
.endif
#post-extract:
# patch to work with python 2.4
# @${CP} ${FILESDIR}/zurllib.py ${WRKSRC}/BitTorrent
post-patch:
@${FIND} ${WRKSRC} -type f | \
${XARGS} -x -n 10 \
${REINPLACE_CMD} -E \
-e 's|/usr/bin/env python2|${LOCALBASE}/bin/python|'
.ifdef(WITHOUT_GUI)
@${REINPLACE_CMD} -E \
-e 's|btdownloadgui.py|btdownloadcurses.py|' \
${WRKSRC}/INSTALL.unix.txt
.endif
-e 's|/usr/bin/env python|${LOCALBASE}/bin/python|'
post-install:
.ifndef(NOPORTDOCS)
.ifndef(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
# set proper permissions
@${CHMOD} -R ${SHAREMODE} \
${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
@${CHMOD} ${SHAREMODE} ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
@${CHMOD} a+x ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (BitTorrent-3.4.2.tar.gz) = b854f25a33289565bcaeaded04955c1a
SIZE (BitTorrent-3.4.2.tar.gz) = 198026
MD5 (BitTorrent-3.9.0.tar.gz) = 749d676687accf62f963ee395cc510ff
SIZE (BitTorrent-3.9.0.tar.gz) = 136383

View File

@ -1,14 +1,13 @@
--- setup.py.orig Sun Mar 30 17:01:05 2003
+++ setup.py Sun Mar 30 17:01:20 2003
@@ -18,9 +18,9 @@
packages = ["BitTorrent"],
--- setup.py.orig Fri Dec 24 06:56:00 2004
+++ setup.py Fri Dec 24 06:56:10 2004
@@ -19,8 +19,8 @@
- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py",
+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.py",
"bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
- "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py",
+ "btdownloadcurses.py", "btlaunchmanycurses.py",
"btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
"bttest.py"]
)
import glob
-scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py",
- "btmaketorrentgui.py", "btmaketorrent.py",
+scripts = ["btdownloadcurses.py", "btdownloadheadless.py",
+ "btmaketorrent.py",
"btlaunchmany.py", "btlaunchmanycurses.py",
"bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
"bttest.py"]

View File

@ -1,30 +0,0 @@
--- BitTorrent/Rerequester.py Sat Apr 3 01:10:23 2004
+++ BitTorrent/Rerequester.py Sun Apr 18 17:03:33 2004
@@ -5,7 +5,7 @@
from btformats import check_peers
from bencode import bdecode
from threading import Thread, Lock
-from socket import error
+from socket import error, gethostbyname
from time import time
from random import randrange
from binascii import b2a_hex
@@ -18,8 +18,7 @@
self.url = ('%s?info_hash=%s&peer_id=%s&port=%s&key=%s' %
(url, quote(infohash), quote(myid), str(port),
b2a_hex(''.join([chr(randrange(256)) for i in xrange(4)]))))
- if ip != '':
- self.url += '&ip=' + quote(ip)
+ self.ip = ip
self.interval = interval
self.last = None
self.trackerid = None
@@ -81,6 +80,8 @@
def rerequest(self, url, set):
try:
+ if self.ip:
+ url += '&ip=' + gethostbyname(self.ip)
h = urlopen(url)
r = h.read()
h.close()

View File

@ -1,300 +0,0 @@
--- BitTorrent/track.py Sun Mar 21 16:32:55 2004
+++ BitTorrent/track.py Sun Jun 6 09:33:07 2004
@@ -37,12 +37,15 @@
'minimum time it must have been since the last flush to do another one'),
('allowed_dir', '', 'only allow downloads for .torrents in this dir'),
('parse_allowed_interval', 15, 'minutes between reloading of allowed_dir'),
+ ('show_infopage', 1, "whether to display an info page when the tracker's root dir is loaded"),
+ ('infopage_redirect', '', 'a URL to redirect the info page to'),
('show_names', 1, 'whether to display names from allowed dir'),
('favicon', '', 'file containing x-icon data to return when browser requests favicon.ico'),
('only_local_override_ip', 1, "ignore the ip GET parameter from machines which aren't on local network IPs"),
('logfile', '', 'file to write the tracker logs, use - for stdout (default)'),
('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'),
('keep_dead', 0, 'keep dead torrents after they expire (so they still show up on your /scrape and web page)'),
+ ('scrape_allowed', 'full', 'scrape access allowed (can be none, specific or full)'),
('max_give', 200, 'maximum number of peers to give with any one request'),
]
@@ -124,11 +127,11 @@
favicon = config['favicon']
self.favicon = None
if favicon:
- if isfile(favicon):
+ try:
h = open(favicon, 'rb')
self.favicon = h.read()
h.close()
- else:
+ except:
print "**warning** specified favicon file -- %s -- does not exist." % favicon
self.rawserver = rawserver
self.becache1 = {}
@@ -190,6 +193,130 @@
self.uq_broken = 0
self.keep_dead = config['keep_dead']
+ def get_infopage(self):
+ if not self.config['show_infopage']:
+ return (404, 'Not Found', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, alas)
+ red = self.config['infopage_redirect']
+ if red != '':
+ return (302, 'Found', {'Content-Type': 'text/html', 'Location': red},
+ '<A HREF="'+red+'">Click Here</A>')
+
+ 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')
+ if self.favicon != None:
+ s.write('<link rel="shortcut icon" href="/favicon.ico" />\n')
+ s.write('</head>\n<body>\n' \
+ '<h3>BitTorrent download info</h3>\n'\
+ '<ul>\n'
+ '<li><strong>tracker version:</strong> %s</li>\n' \
+ '<li><strong>server time:</strong> %s</li>\n' \
+ '</ul>\n' % (version, isotime()))
+ names = self.downloads.keys()
+ if not names:
+ s.write('<p>not tracking any files yet...</p>\n')
+ else:
+ names.sort()
+ tn = 0
+ tc = 0
+ td = 0
+ tt = 0 # Total transferred
+ ts = 0 # Total size
+ nf = 0 # Number of files displayed
+ uc = {}
+ ud = {}
+ if self.allowed != None and self.show_names:
+ s.write('<table summary="files" border="1">\n' \
+ '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n')
+ else:
+ s.write('<table summary="files">\n' \
+ '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n')
+ for name in names:
+ l = self.downloads[name]
+ n = self.completed.get(name, 0)
+ tn = tn + n
+ lc = []
+ for i in l.values():
+ if type(i) == DictType:
+ if i['left'] == 0:
+ lc.append(1)
+ uc[i['ip']] = 1
+ else:
+ ud[i['ip']] = 1
+ c = len(lc)
+ tc = tc + c
+ d = len(l) - c
+ td = td + d
+ if self.allowed != None and self.show_names:
+ if self.allowed.has_key(name):
+ nf = nf + 1
+ sz = self.allowed[name]['length'] # size
+ ts = ts + sz
+ szt = sz * n # Transferred for this torrent
+ tt = tt + szt
+ if self.allow_get == 1:
+ linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>'
+ else:
+ linkname = self.allowed[name]['name']
+ s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \
+ % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt)))
+ else:
+ s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \
+ % (b2a_hex(name), c, d, n))
+ ttn = 0
+ for i in self.completed.values():
+ ttn = ttn + i
+ if self.allowed != None and self.show_names:
+ s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n'
+ % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt)))
+ else:
+ s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n'
+ % (nf, len(uc), tc, len(ud), td, tn, ttn))
+ s.write('</table>\n' \
+ '<ul>\n' \
+ '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \
+ '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \
+ '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \
+ '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \
+ '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \
+ '</ul>\n')
+ s.write('</body>\n' \
+ '</html>\n')
+ return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue())
+
+ def scrapedata(self, name, return_name = True):
+ l = self.downloads[name]
+ n = self.completed.get(name, 0)
+ c = len([1 for i in l.values() if i['left'] == 0])
+ d = len(l) - c
+ f = {'complete': c, 'incomplete': d, 'downloaded': n}
+ if ( return_name and self.show_names
+ and self.allowed is not None and self.allowed.has_key(name) ):
+ f['name'] = self.allowed[name]['name']
+ return (f)
+
+ def get_scrape(self, paramslist):
+ fs = {}
+ if paramslist.has_key('info_hash'):
+ if self.config['scrape_allowed'] not in ['specific', 'full']:
+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'},
+ bencode({'failure reason':
+ 'specific scrape function is not available with this tracker.'}))
+ for infohash in paramslist['info_hash']:
+ if infohash in self.downloads.keys():
+ fs[infohash] = self.scrapedata(infohash)
+ else:
+ if self.config['scrape_allowed'] != 'full':
+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'},
+ bencode({'failure reason':
+ 'full scrape function is not available with this tracker.'}))
+ names = self.downloads.keys()
+ names.sort()
+ for name in names:
+ fs[name] = self.scrapedata(name)
+
+ return (200, 'OK', {'Content-Type': 'text/plain'}, bencode({'files': fs}))
+
def get(self, connection, path, headers):
try:
(scheme, netloc, path, pars, query, fragment) = urlparse(path)
@@ -197,117 +324,22 @@
path = path.replace('+',' ')
query = query.replace('+',' ')
path = unquote(path)[1:]
+ paramslist = {}
params = {}
for s in query.split('&'):
if s != '':
i = s.index('=')
- params[unquote(s[:i])] = unquote(s[i+1:])
+ kw = unquote(s[:i])
+ key, value = unquote(s[:i]), unquote(s[i+1:])
+ paramslist.setdefault(key, []).append(value)
+ params[key] = value
except ValueError, e:
return (400, 'Bad Request', {'Content-Type': 'text/plain'},
'you sent me garbage - ' + str(e))
if path == '' or path == 'index.html':
- 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')
- if self.favicon != None:
- s.write('<link rel="shortcut icon" href="/favicon.ico" />\n')
- s.write('</head>\n<body>\n' \
- '<h3>BitTorrent download info</h3>\n'\
- '<ul>\n'
- '<li><strong>tracker version:</strong> %s</li>\n' \
- '<li><strong>server time:</strong> %s</li>\n' \
- '</ul>\n' % (version, isotime()))
- names = self.downloads.keys()
- if names:
- names.sort()
- tn = 0
- tc = 0
- td = 0
- tt = 0 # Total transferred
- ts = 0 # Total size
- nf = 0 # Number of files displayed
- uc = {}
- ud = {}
- if self.allowed != None and self.show_names:
- s.write('<table summary="files" border="1">\n' \
- '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n')
- else:
- s.write('<table summary="files">\n' \
- '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n')
- for name in names:
- l = self.downloads[name]
- n = self.completed.get(name, 0)
- tn = tn + n
- lc = []
- for i in l.values():
- if type(i) == DictType:
- if i['left'] == 0:
- lc.append(1)
- uc[i['ip']] = 1
- else:
- ud[i['ip']] = 1
- c = len(lc)
- tc = tc + c
- d = len(l) - c
- td = td + d
- if self.allowed != None and self.show_names:
- if self.allowed.has_key(name):
- nf = nf + 1
- sz = self.allowed[name]['length'] # size
- ts = ts + sz
- szt = sz * n # Transferred for this torrent
- tt = tt + szt
- if self.allow_get == 1:
- linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>'
- else:
- linkname = self.allowed[name]['name']
- s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \
- % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt)))
- else:
- s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \
- % (b2a_hex(name), c, d, n))
- ttn = 0
- for i in self.completed.values():
- ttn = ttn + i
- if self.allowed != None and self.show_names:
- s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n'
- % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt)))
- else:
- s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n'
- % (nf, len(uc), tc, len(ud), td, tn, ttn))
- s.write('</table>\n' \
- '<ul>\n' \
- '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \
- '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \
- '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \
- '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \
- '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \
- '</ul>\n')
- else:
- s.write('<p>not tracking any files yet...</p>\n')
- s.write('</body>\n' \
- '</html>\n')
- return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue())
+ return self.get_infopage()
elif path == 'scrape':
- fs = {}
- names = []
- if params.has_key('info_hash'):
- if self.downloads.has_key(params['info_hash']):
- names = [ params['info_hash'] ]
- # else return nothing
- else:
- names = self.downloads.keys()
- names.sort()
- for name in names:
- l = self.downloads[name]
- n = self.completed.get(name, 0)
- c = len([1 for i in l.values() if type(i) == DictType and i['left'] == 0])
- d = len(l) - c
- fs[name] = {'complete': c, 'incomplete': d, 'downloaded': n}
- if (self.allowed is not None) and self.allowed.has_key(name) and self.show_names:
- fs[name]['name'] = self.allowed[name]['name']
- r = {'files': fs}
- return (200, 'OK', {'Content-Type': 'text/plain'}, bencode(r))
+ return self.get_scrape(paramslist)
elif (path == 'file') and (self.allow_get == 1) and params.has_key('info_hash') and self.allowed.has_key(params['info_hash']):
hash = params['info_hash']
fname = self.allowed[hash]['file']
@@ -506,9 +538,9 @@
r = str(s) + 'B'
elif (s < 1048576):
r = str(int(s/1024)) + 'KiB'
- elif (s < 1073741824l):
+ elif (s < 1073741824L):
r = str(int(s/1048576)) + 'MiB'
- elif (s < 1099511627776l):
+ elif (s < 1099511627776L):
r = str(int((s/1073741824.0)*100.0)/100.0) + 'GiB'
else:
r = str(int((s/1099511627776.0)*100.0)/100.0) + 'TiB'

View File

@ -1,18 +0,0 @@
--- BitTorrent/zurllib.py.orig Thu Dec 9 10:36:43 2004
+++ BitTorrent/zurllib.py Thu Dec 9 10:38:19 2004
@@ -35,7 +35,14 @@
if DEBUG:
pprint.pprint(headers.dict)
url = fp.url
- return addinfourldecompress(fp, headers, url)
+ resp = addinfourldecompress(fp, headers, url)
+ # As of Python 2.4 http_open response also has 'code' and 'msg'
+ # members, and HTTPErrorProcessor breaks if they don't exist.
+ if 'code' in dir(fp):
+ resp.code = fp.code
+ if 'msg' in dir(fp):
+ resp.msg = fp.msg
+ return resp
class addinfourldecompress(addinfourl):

View File

@ -1,12 +0,0 @@
diff -ruN BitTorrent-3.4.2/btcompletedir.py BitTorrent.cvs/btcompletedir.py
--- btcompletedir.py Wed Mar 3 14:44:06 2004
+++ btcompletedir.py Sun May 23 04:31:44 2004
@@ -30,6 +30,8 @@
subtotal[0] += x
vc(float(subtotal[0]) / total)
for i in togen:
+ if flag.isSet():
+ break
t = split(i)
if t[1] == '':
i = t[0]

View File

@ -1,61 +0,0 @@
# Written by John Hoffman
# see LICENSE.txt for license information
from httplib import HTTPConnection
from urlparse import urlparse
import socket
from gzip import GzipFile
from StringIO import StringIO
from urllib import quote, unquote
from __init__ import version
MAX_REDIRECTS = 10
class urlopen:
def __init__(self, url):
self.tries = 0
self._open(url)
def _open(self, url):
self.tries += 1
if self.tries > MAX_REDIRECTS:
raise IOError, ('http error', 500,
"Internal Server Error: Redirect Recursion")
(scheme, netloc, path, pars, query, fragment) = urlparse(url)
if scheme != 'http':
raise IOError, ('url error', 'unknown url type', scheme, url)
url = path
if pars:
url += ';'+pars
if query:
url += '?'+query
# if fragment:
self.connection = HTTPConnection(netloc)
self.connection.request('GET', url, None,
{ 'User-Agent': 'BitTorrent/' + version,
'Accept-Encoding': 'gzip' } )
self.response = self.connection.getresponse()
status = self.response.status
if status in (301,302):
try:
self.connection.close()
except:
pass
self._open(self.response.getheader('Location'))
return
if status != 200:
raise IOError, ('http error', status, self.response.reason)
def read(self):
data = self.response.read()
if self.response.getheader('Content-Encoding','').find('gzip') >= 0:
try:
compressed = StringIO(data)
f = GzipFile(fileobj = compressed)
data = f.read()
except:
raise IOError, ('http error', 'got corrupt response')
return data
def close(self):
self.connection.close()

View File

@ -1,10 +1,8 @@
bin/btcompletedir.py
bin/btdownloadcurses.py
bin/btdownloadheadless.py
bin/btdownloadlibrary.py
bin/btlaunchmany.py
bin/btlaunchmanycurses.py
bin/btmakemetafile.py
bin/btmaketorrent.py
bin/btreannounce.py
bin/btrename.py
bin/btshowmetainfo.py
@ -13,30 +11,48 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.py
%%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.py
%%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.py
%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.py
%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.py
%%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
@ -52,6 +68,9 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.py
%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
@ -67,15 +86,33 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/configfile.py
%%PYTHON_SITELIBDIR%%/BitTorrent/configfile.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/configfile.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/controlsocket.py
%%PYTHON_SITELIBDIR%%/BitTorrent/controlsocket.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/controlsocket.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.py
%%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.py
%%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/makemetafile.py
%%PYTHON_SITELIBDIR%%/BitTorrent/makemetafile.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/makemetafile.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/obsoletepythonsupport.py
%%PYTHON_SITELIBDIR%%/BitTorrent/obsoletepythonsupport.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/obsoletepythonsupport.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.py
%%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
@ -88,6 +125,20 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
share/pixmaps/BitTorrent-%%PORTVERSION%%/bittorrent.ico
share/pixmaps/BitTorrent-%%PORTVERSION%%/broken.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/finished.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/info.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/logo/bittorrent_32.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/logo/bittorrent_96.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/pause.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/play.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/queued.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/remove.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/running.png
@dirrm share/pixmaps/BitTorrent-%%PORTVERSION%%/logo
@dirrm share/pixmaps/BitTorrent-%%PORTVERSION%%
@unexec rmdir %D/share/pixmaps 2>/dev/null || true
@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true

View File

@ -6,13 +6,14 @@
#
PORTNAME= BitTorrent
PORTVERSION= 3.4.2
PORTREVISION= 3
PORTVERSION= 3.9.0
PORTEPOCH= 1
CATEGORIES?= net python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
MASTER_SITES= http://www.bittorrent.com/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
#MASTER_SITE_SUBDIR= ${PORTNAME:L}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX?= -devel
#DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
MAINTAINER= lioux@FreeBSD.org
@ -24,16 +25,22 @@ USE_REINPLACE= yes
CONFLICTS= py??-*[Bb]it[Tt]orrent* py??-*[Bb]it[Tt]ornado* btqueue*
PORTDOCS= BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \
README.txt credits.txt
NO_LATEST_LINK= yes
PORTDOCS= \
LICENSE.txt \
README.txt \
credits.txt \
redirdonate.html
PLIST_SUB+= PORTVERSION=${PORTVERSION}
# required for GUI
.ifndef(WITHOUT_GUI)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
PLIST_SUB+= GUI=''
PLIST_FILES+= \
bin/btcompletedirgui.py \
bin/btmaketorrentgui.py \
bin/btdownloadgui.py
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-nogui-patch-setup.py
@ -44,27 +51,23 @@ pre-everything::
@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
.endif
#post-extract:
# patch to work with python 2.4
# @${CP} ${FILESDIR}/zurllib.py ${WRKSRC}/BitTorrent
post-patch:
@${FIND} ${WRKSRC} -type f | \
${XARGS} -x -n 10 \
${REINPLACE_CMD} -E \
-e 's|/usr/bin/env python2|${LOCALBASE}/bin/python|'
.ifdef(WITHOUT_GUI)
@${REINPLACE_CMD} -E \
-e 's|btdownloadgui.py|btdownloadcurses.py|' \
${WRKSRC}/INSTALL.unix.txt
.endif
-e 's|/usr/bin/env python|${LOCALBASE}/bin/python|'
post-install:
.ifndef(NOPORTDOCS)
.ifndef(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
# set proper permissions
@${CHMOD} -R ${SHAREMODE} \
${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
@${CHMOD} ${SHAREMODE} ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
@${CHMOD} a+x ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (BitTorrent-3.4.2.tar.gz) = b854f25a33289565bcaeaded04955c1a
SIZE (BitTorrent-3.4.2.tar.gz) = 198026
MD5 (BitTorrent-3.9.0.tar.gz) = 749d676687accf62f963ee395cc510ff
SIZE (BitTorrent-3.9.0.tar.gz) = 136383

View File

@ -1,14 +1,13 @@
--- setup.py.orig Sun Mar 30 17:01:05 2003
+++ setup.py Sun Mar 30 17:01:20 2003
@@ -18,9 +18,9 @@
packages = ["BitTorrent"],
--- setup.py.orig Fri Dec 24 06:56:00 2004
+++ setup.py Fri Dec 24 06:56:10 2004
@@ -19,8 +19,8 @@
- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py",
+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.py",
"bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
- "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py",
+ "btdownloadcurses.py", "btlaunchmanycurses.py",
"btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
"bttest.py"]
)
import glob
-scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py",
- "btmaketorrentgui.py", "btmaketorrent.py",
+scripts = ["btdownloadcurses.py", "btdownloadheadless.py",
+ "btmaketorrent.py",
"btlaunchmany.py", "btlaunchmanycurses.py",
"bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
"bttest.py"]

View File

@ -1,30 +0,0 @@
--- BitTorrent/Rerequester.py Sat Apr 3 01:10:23 2004
+++ BitTorrent/Rerequester.py Sun Apr 18 17:03:33 2004
@@ -5,7 +5,7 @@
from btformats import check_peers
from bencode import bdecode
from threading import Thread, Lock
-from socket import error
+from socket import error, gethostbyname
from time import time
from random import randrange
from binascii import b2a_hex
@@ -18,8 +18,7 @@
self.url = ('%s?info_hash=%s&peer_id=%s&port=%s&key=%s' %
(url, quote(infohash), quote(myid), str(port),
b2a_hex(''.join([chr(randrange(256)) for i in xrange(4)]))))
- if ip != '':
- self.url += '&ip=' + quote(ip)
+ self.ip = ip
self.interval = interval
self.last = None
self.trackerid = None
@@ -81,6 +80,8 @@
def rerequest(self, url, set):
try:
+ if self.ip:
+ url += '&ip=' + gethostbyname(self.ip)
h = urlopen(url)
r = h.read()
h.close()

View File

@ -1,300 +0,0 @@
--- BitTorrent/track.py Sun Mar 21 16:32:55 2004
+++ BitTorrent/track.py Sun Jun 6 09:33:07 2004
@@ -37,12 +37,15 @@
'minimum time it must have been since the last flush to do another one'),
('allowed_dir', '', 'only allow downloads for .torrents in this dir'),
('parse_allowed_interval', 15, 'minutes between reloading of allowed_dir'),
+ ('show_infopage', 1, "whether to display an info page when the tracker's root dir is loaded"),
+ ('infopage_redirect', '', 'a URL to redirect the info page to'),
('show_names', 1, 'whether to display names from allowed dir'),
('favicon', '', 'file containing x-icon data to return when browser requests favicon.ico'),
('only_local_override_ip', 1, "ignore the ip GET parameter from machines which aren't on local network IPs"),
('logfile', '', 'file to write the tracker logs, use - for stdout (default)'),
('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'),
('keep_dead', 0, 'keep dead torrents after they expire (so they still show up on your /scrape and web page)'),
+ ('scrape_allowed', 'full', 'scrape access allowed (can be none, specific or full)'),
('max_give', 200, 'maximum number of peers to give with any one request'),
]
@@ -124,11 +127,11 @@
favicon = config['favicon']
self.favicon = None
if favicon:
- if isfile(favicon):
+ try:
h = open(favicon, 'rb')
self.favicon = h.read()
h.close()
- else:
+ except:
print "**warning** specified favicon file -- %s -- does not exist." % favicon
self.rawserver = rawserver
self.becache1 = {}
@@ -190,6 +193,130 @@
self.uq_broken = 0
self.keep_dead = config['keep_dead']
+ def get_infopage(self):
+ if not self.config['show_infopage']:
+ return (404, 'Not Found', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, alas)
+ red = self.config['infopage_redirect']
+ if red != '':
+ return (302, 'Found', {'Content-Type': 'text/html', 'Location': red},
+ '<A HREF="'+red+'">Click Here</A>')
+
+ 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')
+ if self.favicon != None:
+ s.write('<link rel="shortcut icon" href="/favicon.ico" />\n')
+ s.write('</head>\n<body>\n' \
+ '<h3>BitTorrent download info</h3>\n'\
+ '<ul>\n'
+ '<li><strong>tracker version:</strong> %s</li>\n' \
+ '<li><strong>server time:</strong> %s</li>\n' \
+ '</ul>\n' % (version, isotime()))
+ names = self.downloads.keys()
+ if not names:
+ s.write('<p>not tracking any files yet...</p>\n')
+ else:
+ names.sort()
+ tn = 0
+ tc = 0
+ td = 0
+ tt = 0 # Total transferred
+ ts = 0 # Total size
+ nf = 0 # Number of files displayed
+ uc = {}
+ ud = {}
+ if self.allowed != None and self.show_names:
+ s.write('<table summary="files" border="1">\n' \
+ '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n')
+ else:
+ s.write('<table summary="files">\n' \
+ '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n')
+ for name in names:
+ l = self.downloads[name]
+ n = self.completed.get(name, 0)
+ tn = tn + n
+ lc = []
+ for i in l.values():
+ if type(i) == DictType:
+ if i['left'] == 0:
+ lc.append(1)
+ uc[i['ip']] = 1
+ else:
+ ud[i['ip']] = 1
+ c = len(lc)
+ tc = tc + c
+ d = len(l) - c
+ td = td + d
+ if self.allowed != None and self.show_names:
+ if self.allowed.has_key(name):
+ nf = nf + 1
+ sz = self.allowed[name]['length'] # size
+ ts = ts + sz
+ szt = sz * n # Transferred for this torrent
+ tt = tt + szt
+ if self.allow_get == 1:
+ linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>'
+ else:
+ linkname = self.allowed[name]['name']
+ s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \
+ % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt)))
+ else:
+ s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \
+ % (b2a_hex(name), c, d, n))
+ ttn = 0
+ for i in self.completed.values():
+ ttn = ttn + i
+ if self.allowed != None and self.show_names:
+ s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n'
+ % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt)))
+ else:
+ s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n'
+ % (nf, len(uc), tc, len(ud), td, tn, ttn))
+ s.write('</table>\n' \
+ '<ul>\n' \
+ '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \
+ '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \
+ '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \
+ '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \
+ '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \
+ '</ul>\n')
+ s.write('</body>\n' \
+ '</html>\n')
+ return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue())
+
+ def scrapedata(self, name, return_name = True):
+ l = self.downloads[name]
+ n = self.completed.get(name, 0)
+ c = len([1 for i in l.values() if i['left'] == 0])
+ d = len(l) - c
+ f = {'complete': c, 'incomplete': d, 'downloaded': n}
+ if ( return_name and self.show_names
+ and self.allowed is not None and self.allowed.has_key(name) ):
+ f['name'] = self.allowed[name]['name']
+ return (f)
+
+ def get_scrape(self, paramslist):
+ fs = {}
+ if paramslist.has_key('info_hash'):
+ if self.config['scrape_allowed'] not in ['specific', 'full']:
+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'},
+ bencode({'failure reason':
+ 'specific scrape function is not available with this tracker.'}))
+ for infohash in paramslist['info_hash']:
+ if infohash in self.downloads.keys():
+ fs[infohash] = self.scrapedata(infohash)
+ else:
+ if self.config['scrape_allowed'] != 'full':
+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'},
+ bencode({'failure reason':
+ 'full scrape function is not available with this tracker.'}))
+ names = self.downloads.keys()
+ names.sort()
+ for name in names:
+ fs[name] = self.scrapedata(name)
+
+ return (200, 'OK', {'Content-Type': 'text/plain'}, bencode({'files': fs}))
+
def get(self, connection, path, headers):
try:
(scheme, netloc, path, pars, query, fragment) = urlparse(path)
@@ -197,117 +324,22 @@
path = path.replace('+',' ')
query = query.replace('+',' ')
path = unquote(path)[1:]
+ paramslist = {}
params = {}
for s in query.split('&'):
if s != '':
i = s.index('=')
- params[unquote(s[:i])] = unquote(s[i+1:])
+ kw = unquote(s[:i])
+ key, value = unquote(s[:i]), unquote(s[i+1:])
+ paramslist.setdefault(key, []).append(value)
+ params[key] = value
except ValueError, e:
return (400, 'Bad Request', {'Content-Type': 'text/plain'},
'you sent me garbage - ' + str(e))
if path == '' or path == 'index.html':
- 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')
- if self.favicon != None:
- s.write('<link rel="shortcut icon" href="/favicon.ico" />\n')
- s.write('</head>\n<body>\n' \
- '<h3>BitTorrent download info</h3>\n'\
- '<ul>\n'
- '<li><strong>tracker version:</strong> %s</li>\n' \
- '<li><strong>server time:</strong> %s</li>\n' \
- '</ul>\n' % (version, isotime()))
- names = self.downloads.keys()
- if names:
- names.sort()
- tn = 0
- tc = 0
- td = 0
- tt = 0 # Total transferred
- ts = 0 # Total size
- nf = 0 # Number of files displayed
- uc = {}
- ud = {}
- if self.allowed != None and self.show_names:
- s.write('<table summary="files" border="1">\n' \
- '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n')
- else:
- s.write('<table summary="files">\n' \
- '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n')
- for name in names:
- l = self.downloads[name]
- n = self.completed.get(name, 0)
- tn = tn + n
- lc = []
- for i in l.values():
- if type(i) == DictType:
- if i['left'] == 0:
- lc.append(1)
- uc[i['ip']] = 1
- else:
- ud[i['ip']] = 1
- c = len(lc)
- tc = tc + c
- d = len(l) - c
- td = td + d
- if self.allowed != None and self.show_names:
- if self.allowed.has_key(name):
- nf = nf + 1
- sz = self.allowed[name]['length'] # size
- ts = ts + sz
- szt = sz * n # Transferred for this torrent
- tt = tt + szt
- if self.allow_get == 1:
- linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>'
- else:
- linkname = self.allowed[name]['name']
- s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \
- % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt)))
- else:
- s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \
- % (b2a_hex(name), c, d, n))
- ttn = 0
- for i in self.completed.values():
- ttn = ttn + i
- if self.allowed != None and self.show_names:
- s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n'
- % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt)))
- else:
- s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n'
- % (nf, len(uc), tc, len(ud), td, tn, ttn))
- s.write('</table>\n' \
- '<ul>\n' \
- '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \
- '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \
- '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \
- '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \
- '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \
- '</ul>\n')
- else:
- s.write('<p>not tracking any files yet...</p>\n')
- s.write('</body>\n' \
- '</html>\n')
- return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue())
+ return self.get_infopage()
elif path == 'scrape':
- fs = {}
- names = []
- if params.has_key('info_hash'):
- if self.downloads.has_key(params['info_hash']):
- names = [ params['info_hash'] ]
- # else return nothing
- else:
- names = self.downloads.keys()
- names.sort()
- for name in names:
- l = self.downloads[name]
- n = self.completed.get(name, 0)
- c = len([1 for i in l.values() if type(i) == DictType and i['left'] == 0])
- d = len(l) - c
- fs[name] = {'complete': c, 'incomplete': d, 'downloaded': n}
- if (self.allowed is not None) and self.allowed.has_key(name) and self.show_names:
- fs[name]['name'] = self.allowed[name]['name']
- r = {'files': fs}
- return (200, 'OK', {'Content-Type': 'text/plain'}, bencode(r))
+ return self.get_scrape(paramslist)
elif (path == 'file') and (self.allow_get == 1) and params.has_key('info_hash') and self.allowed.has_key(params['info_hash']):
hash = params['info_hash']
fname = self.allowed[hash]['file']
@@ -506,9 +538,9 @@
r = str(s) + 'B'
elif (s < 1048576):
r = str(int(s/1024)) + 'KiB'
- elif (s < 1073741824l):
+ elif (s < 1073741824L):
r = str(int(s/1048576)) + 'MiB'
- elif (s < 1099511627776l):
+ elif (s < 1099511627776L):
r = str(int((s/1073741824.0)*100.0)/100.0) + 'GiB'
else:
r = str(int((s/1099511627776.0)*100.0)/100.0) + 'TiB'

View File

@ -1,18 +0,0 @@
--- BitTorrent/zurllib.py.orig Thu Dec 9 10:36:43 2004
+++ BitTorrent/zurllib.py Thu Dec 9 10:38:19 2004
@@ -35,7 +35,14 @@
if DEBUG:
pprint.pprint(headers.dict)
url = fp.url
- return addinfourldecompress(fp, headers, url)
+ resp = addinfourldecompress(fp, headers, url)
+ # As of Python 2.4 http_open response also has 'code' and 'msg'
+ # members, and HTTPErrorProcessor breaks if they don't exist.
+ if 'code' in dir(fp):
+ resp.code = fp.code
+ if 'msg' in dir(fp):
+ resp.msg = fp.msg
+ return resp
class addinfourldecompress(addinfourl):

View File

@ -1,12 +0,0 @@
diff -ruN BitTorrent-3.4.2/btcompletedir.py BitTorrent.cvs/btcompletedir.py
--- btcompletedir.py Wed Mar 3 14:44:06 2004
+++ btcompletedir.py Sun May 23 04:31:44 2004
@@ -30,6 +30,8 @@
subtotal[0] += x
vc(float(subtotal[0]) / total)
for i in togen:
+ if flag.isSet():
+ break
t = split(i)
if t[1] == '':
i = t[0]

View File

@ -1,61 +0,0 @@
# Written by John Hoffman
# see LICENSE.txt for license information
from httplib import HTTPConnection
from urlparse import urlparse
import socket
from gzip import GzipFile
from StringIO import StringIO
from urllib import quote, unquote
from __init__ import version
MAX_REDIRECTS = 10
class urlopen:
def __init__(self, url):
self.tries = 0
self._open(url)
def _open(self, url):
self.tries += 1
if self.tries > MAX_REDIRECTS:
raise IOError, ('http error', 500,
"Internal Server Error: Redirect Recursion")
(scheme, netloc, path, pars, query, fragment) = urlparse(url)
if scheme != 'http':
raise IOError, ('url error', 'unknown url type', scheme, url)
url = path
if pars:
url += ';'+pars
if query:
url += '?'+query
# if fragment:
self.connection = HTTPConnection(netloc)
self.connection.request('GET', url, None,
{ 'User-Agent': 'BitTorrent/' + version,
'Accept-Encoding': 'gzip' } )
self.response = self.connection.getresponse()
status = self.response.status
if status in (301,302):
try:
self.connection.close()
except:
pass
self._open(self.response.getheader('Location'))
return
if status != 200:
raise IOError, ('http error', status, self.response.reason)
def read(self):
data = self.response.read()
if self.response.getheader('Content-Encoding','').find('gzip') >= 0:
try:
compressed = StringIO(data)
f = GzipFile(fileobj = compressed)
data = f.read()
except:
raise IOError, ('http error', 'got corrupt response')
return data
def close(self):
self.connection.close()

View File

@ -1,10 +1,8 @@
bin/btcompletedir.py
bin/btdownloadcurses.py
bin/btdownloadheadless.py
bin/btdownloadlibrary.py
bin/btlaunchmany.py
bin/btlaunchmanycurses.py
bin/btmakemetafile.py
bin/btmaketorrent.py
bin/btreannounce.py
bin/btrename.py
bin/btshowmetainfo.py
@ -13,30 +11,48 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.py
%%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.py
%%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.py
%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.py
%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.py
%%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
@ -52,6 +68,9 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.py
%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
@ -67,15 +86,33 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/configfile.py
%%PYTHON_SITELIBDIR%%/BitTorrent/configfile.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/configfile.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/controlsocket.py
%%PYTHON_SITELIBDIR%%/BitTorrent/controlsocket.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/controlsocket.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.py
%%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.py
%%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/makemetafile.py
%%PYTHON_SITELIBDIR%%/BitTorrent/makemetafile.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/makemetafile.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/obsoletepythonsupport.py
%%PYTHON_SITELIBDIR%%/BitTorrent/obsoletepythonsupport.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/obsoletepythonsupport.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.py
%%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.pyo
%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
@ -88,6 +125,20 @@ bin/bttrack.py
%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
share/pixmaps/BitTorrent-%%PORTVERSION%%/bittorrent.ico
share/pixmaps/BitTorrent-%%PORTVERSION%%/broken.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/finished.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/info.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/logo/bittorrent_32.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/logo/bittorrent_96.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/pause.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/play.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/queued.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/remove.png
share/pixmaps/BitTorrent-%%PORTVERSION%%/running.png
@dirrm share/pixmaps/BitTorrent-%%PORTVERSION%%/logo
@dirrm share/pixmaps/BitTorrent-%%PORTVERSION%%
@unexec rmdir %D/share/pixmaps 2>/dev/null || true
@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true