diff options
Diffstat (limited to 'net-p2p/py-kenosis-bittorrent/files')
16 files changed, 0 insertions, 635 deletions
diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-gui-patch-setup.py b/net-p2p/py-kenosis-bittorrent/files/extra-gui-patch-setup.py deleted file mode 100644 index 1b41d84d9bd..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-gui-patch-setup.py +++ /dev/null @@ -1,25 +0,0 @@ ---- setup.py.orig Fri Jan 14 22:03:18 2005 -+++ setup.py Fri Jan 14 22:03:44 2005 -@@ -9,18 +9,19 @@ - import BitTorrent - - setup( -- name = "BitTorrent", -- version = BitTorrent.version, -+ name = "%%KENOSIS-BITTORRENT%%", -+ version = %%KENOSIS-BITTORRENT%%.version, - author = "Bram Cohen", - author_email = "<bram@bitconjurer.org>", - url = "http://www.bitconjurer.org/BitTorrent/", - license = "MIT", - -- packages = ["BitTorrent"], -+ packages = ["%%KENOSIS-BITTORRENT%%"], - - scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", - "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py", - "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", - "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py", -+ "btunittest.py", - "bttest.py"] - ) diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py b/net-p2p/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py deleted file mode 100644 index 4c72f66ad46..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py +++ /dev/null @@ -1,27 +0,0 @@ ---- setup.py.orig Fri Jan 14 22:12:02 2005 -+++ setup.py Fri Jan 14 22:12:54 2005 -@@ -9,18 +9,19 @@ - import BitTorrent - - setup( -- name = "BitTorrent", -- version = BitTorrent.version, -+ name = "%%KENOSIS-BITTORRENT%%", -+ version = %%KENOSIS-BITTORRENT%%.version, - author = "Bram Cohen", - author_email = "<bram@bitconjurer.org>", - url = "http://www.bitconjurer.org/BitTorrent/", - license = "MIT", - -- packages = ["BitTorrent"], -+ packages = ["%%KENOSIS-BITTORRENT%%"], - -- 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", -+ "btunittest.py", - "bttest.py"] - ) diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedir.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedir.py deleted file mode 100644 index 7313c0b3b81..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedir.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btcompletedir.py Thu Dec 16 11:03:11 2004 -+++ btcompletedir.py Thu Dec 16 11:12:55 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from os.path import join, split - from threading import Event - from traceback import print_exc diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedirgui.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedirgui.py deleted file mode 100644 index 750f7f3b4ff..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedirgui.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btcompletedirgui.py Thu Dec 16 11:03:11 2004 -+++ btcompletedirgui.py Thu Dec 16 11:13:34 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv, version - - from btcompletedir import completedir diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadcurses.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadcurses.py deleted file mode 100644 index f9914687c61..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadcurses.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btdownloadcurses.py Thu Dec 16 11:03:11 2004 -+++ btdownloadcurses.py Thu Dec 16 11:13:54 2004 -@@ -3,6 +3,15 @@ - # Written by Henry 'Pi' James - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Event - from os.path import abspath diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadgui.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadgui.py deleted file mode 100644 index d9f8aa0300d..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadgui.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btdownloadgui.py Thu Dec 16 11:03:11 2004 -+++ btdownloadgui.py Thu Dec 16 11:14:07 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen and Myers Carpenter - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv - from BitTorrent import version - from BitTorrent.download import download diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadheadless.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadheadless.py deleted file mode 100644 index ba6038187d0..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadheadless.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btdownloadheadless.py Thu Dec 16 11:03:11 2004 -+++ btdownloadheadless.py Thu Dec 16 11:14:16 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Event - from os.path import abspath diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmany.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmany.py deleted file mode 100644 index b52ef8d9673..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmany.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btlaunchmany.py Thu Dec 16 11:03:11 2004 -+++ btlaunchmany.py Thu Dec 16 11:14:54 2004 -@@ -7,6 +7,15 @@ - # fmttime and fmtsize stolen from btdownloadcurses. - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Thread, Event, Lock - from os import listdir diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py deleted file mode 100644 index 7cf9c34eefd..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btlaunchmanycurses.py Thu Dec 16 11:03:11 2004 -+++ btlaunchmanycurses.py Thu Dec 16 11:14:47 2004 -@@ -7,6 +7,15 @@ - # fmttime and fmtsize stolen from btdownloadcurses. - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Thread, Event, Lock - from os import listdir diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btmakemetafile.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btmakemetafile.py deleted file mode 100644 index 27caf5b0379..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-btmakemetafile.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btmakemetafile.py Thu Dec 16 11:03:11 2004 -+++ btmakemetafile.py Thu Dec 16 11:15:10 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv - from os.path import getsize, split, join, abspath, isdir - from os import listdir diff --git a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-bttrack.py b/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-bttrack.py deleted file mode 100644 index eee72f22c62..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/extra-psyco-patch-bttrack.py +++ /dev/null @@ -1,18 +0,0 @@ ---- bttrack.py Thu Dec 16 11:03:11 2004 -+++ bttrack.py Thu Dec 16 11:15:33 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv - from BitTorrent.track import track - diff --git a/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::Rerequester.py b/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::Rerequester.py deleted file mode 100644 index 49c5bd167da..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::Rerequester.py +++ /dev/null @@ -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 -@@ -45,8 +45,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 -@@ -108,6 +107,8 @@ - - def rerequest(self, url, set): - try: -+ if self.ip: -+ url += '&ip=' + gethostbyname(self.ip) - print "opening url %s" % url - h = urlopen(url) - r = h.read() diff --git a/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::track.py b/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::track.py deleted file mode 100644 index 7a98123784d..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::track.py +++ /dev/null @@ -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' diff --git a/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::zurllib.py b/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::zurllib.py deleted file mode 100644 index deca5e24f02..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/patch-BitTorrent::zurllib.py +++ /dev/null @@ -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): diff --git a/net-p2p/py-kenosis-bittorrent/files/patch-btcompletedir.py b/net-p2p/py-kenosis-bittorrent/files/patch-btcompletedir.py deleted file mode 100644 index f70d4e932b7..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/patch-btcompletedir.py +++ /dev/null @@ -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] diff --git a/net-p2p/py-kenosis-bittorrent/files/zurllib.py b/net-p2p/py-kenosis-bittorrent/files/zurllib.py deleted file mode 100644 index a99ca51142b..00000000000 --- a/net-p2p/py-kenosis-bittorrent/files/zurllib.py +++ /dev/null @@ -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() |