Changeset 112a87

Timestamp:

03/17/2017 10:26:17 AM (8 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

9e303b

Parents:

642433

git-author:

Calum Lind <calumlind+deluge@gmail.com> (11/08/2016 03:44:30 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (03/17/2017 10:26:17 AM)

Message:

#2716 [Common] Update magnet funcs for tracker tiers tr.x

File:

• deluge/common.py (modified) (2 diffs)

deluge/common.py

@@ -622 +622 @@
     xt_param = 'xt=urn:btih:'
     dn_param = 'dn='
+    tr_param = 'tr='
+    tr0_param = re.compile('^tr.(\d+)=(\S+)')
     if uri.startswith(magnet_scheme):
         name = None
         info_hash = None
+        trackers = {}
+        tier = 0
         for param in uri[len(magnet_scheme):].split('&'):
             if param.startswith(xt_param):
@@ -640 +644 @@
             elif param.startswith(dn_param):
                 name = unquote_plus(param[len(dn_param):])
+            elif param.startswith(tr_param):
+                tracker = unquote_plus(param[len(tr_param):])
+                trackers[tracker] = tier
+                tier += 1
+            elif param.startswith('tr.'):
+                try:
+                    tier, tracker = re.match(tr0_param, param).groups()
+                    trackers[tracker] = tier
+                except AttributeError:
+                    pass
 
         if info_hash:
             if not name:
                 name = info_hash
-            return {'name': name, 'info_hash': info_hash, 'files_tree': ''}
+            return {'name': name, 'info_hash': info_hash, 'files_tree': '', 'trackers': trackers}
     return False
 
 
 def create_magnet_uri(infohash, name=None, trackers=None):
-    """
-    Creates a magnet uri
-
-    :param infohash: the info-hash of the torrent
-    :type infohash: string
-    :param name: the name of the torrent (optional)
-    :type name: string
-    :param trackers: the trackers to announce to (optional)
-    :type trackers: list of strings
-
-    :returns: a magnet uri string
-    :rtype: string
-
-    """
-    from base64 import b32encode
-    uri = 'magnet:?xt=urn:btih:' + b32encode(infohash.decode('hex'))
+    """Creates a magnet uri
+
+    Args:
+        infohash (str): The info-hash of the torrent.
+        name (str, optional): The name of the torrent.
+        trackers (dict, optional): The trackers to announce to.
+
+    Returns:
+        str: A magnet uri string.
+
+    """
+
+    uri = 'magnet:?xt=urn:btih:' + base64.b32encode(infohash.decode('hex'))
     if name:
         uri = uri + '&dn=' + name
     if trackers:
-        for t in trackers:
-            uri = uri + '&tr=' + t
+        try:
+            for tracker in sorted(trackers, key=trackers.__getitem__):
+                uri = ''.join([uri, '&tr.%d=' % trackers[tracker], tracker])
+        except TypeError:
+            for tracker in trackers:
+                uri = ''.join([uri, '&tr=', tracker])
 
     return uri