a3x/nyaa
1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2024-12-22 14:49:59 +00:00
Code Issues Projects Releases Wiki Activity

Remove tracker limit and always add our trackers (#417)

Browse source 
With all trackers.txt trackers being included in generated .torrents,
we can now be certain the magnet (which use trackers.txt) and the .torrent
uses will not be split up in different swarms in case the main announce dies.
(That is, if uploaders add enough of their own trackers and additional trackers
were deemed unnecessary (at least 5 already), the magnet and .torrent would only
share the main site announce)
This commit is contained in:
Anna-Maria Meriniemi 2017-11-22 10:02:22 +02:00 committed by Arylide
parent 4cdf7f4ab3
commit 5990cf2f50
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nyaa/torrents.py
View file

@ -11,16 +11,13 @@ from nyaa import bencode
USED_TRACKERS = OrderedSet() USED_TRACKERS = OrderedSet()
# Limit the amount of trackers added into .torrent files
MAX_TRACKERS = 5
def read_trackers_from_file(file_object): def read_trackers_from_file(file_object):
USED_TRACKERS.clear() USED_TRACKERS.clear()
for line in file_object: for line in file_object:
line = line.strip() line = line.strip()
if line: if line and not line.startswith('#'):
USED_TRACKERS.add(line) USED_TRACKERS.add(line)
return USED_TRACKERS return USED_TRACKERS
@ -104,7 +101,7 @@ def create_default_metadata_base(torrent, trackers=None, webseeds=None):
metadata_base = { metadata_base = {
'created by': 'NyaaV2', 'created by': 'NyaaV2',
'creation date': int(time.time()), 'creation date': int(time.time()),
'comment': 'NyaaV2 Torrent #' + str(torrent.id), # Throw the url here or something neat 'comment': 'NyaaV2 Torrent #' + str(torrent.id),
# 'encoding' : 'UTF-8' # It's almost always UTF-8 and expected, but if it isn't... # 'encoding' : 'UTF-8' # It's almost always UTF-8 and expected, but if it isn't...
} }
@ -112,7 +109,7 @@ def create_default_metadata_base(torrent, trackers=None, webseeds=None):
metadata_base['announce'] = trackers[0] metadata_base['announce'] = trackers[0]
if len(trackers) > 1: if len(trackers) > 1:
# Yes, it's a list of lists with a single element inside. # Yes, it's a list of lists with a single element inside.
metadata_base['announce-list'] = [[tracker] for tracker in trackers[:MAX_TRACKERS]] metadata_base['announce-list'] = [[tracker] for tracker in trackers]
# Add webseeds # Add webseeds
if webseeds: if webseeds:

3
trackers.txt
View file

@ -1,3 +1,6 @@
# These trackers will be added to all generated torrents,
# to ensure the torrents' continued life in case one or two die.
# One tracker per line, lines starting with # are disregarded
udp://open.stealth.si:80/announce udp://open.stealth.si:80/announce
udp://tracker.opentrackr.org:1337/announce udp://tracker.opentrackr.org:1337/announce
udp://tracker.coppersurfer.tk:6969/announce udp://tracker.coppersurfer.tk:6969/announce