Changeset 6f7770

Timestamp:

02/23/2012 12:49:54 AM (13 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

8452b63

Parents:

2b01ba

git-author:

Thomas Hipp <thomashipp@googlemail.com> (02/22/2012 05:44:00 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (02/23/2012 12:49:54 AM)

Message:

Magnet link support in autoadd plugin

Check the watch folders for .magnet files which contain valid magnet links
and add them.

File:

• deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py (modified) (5 diffs)

deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py

@@ -162 +162 @@
         component.get("EventManager").emit(AutoaddOptionsChangedEvent())
 
-    def load_torrent(self, filename):
+    def load_torrent(self, filename, magnet):
         try:
             log.debug("Attempting to open %s for add.", filename)
-            _file = open(filename, "rb")
+            if magnet == False:
+                _file = open(filename, "rb")
+            elif magnet == True:
+                _file = open(filename, "r")
             filedump = _file.read()
             if not filedump:
@@ -175 +178 @@
 
         # Get the info to see if any exceptions are raised
-        lt.torrent_info(lt.bdecode(filedump))
+        if magnet == False:
+            lt.torrent_info(lt.bdecode(filedump))
 
         return filedump
@@ -216 +220 @@
                 # Skip directories
                 continue
-            elif os.path.splitext(filename)[1] == ".torrent":
+            else:
+                ext = os.path.splitext(filename)[1]
+                if ext == ".torrent":
+                    magnet = False
+                elif ext == ".magnet":
+                    magnet = True
+                else:
+                    continue
                 try:
-                    filedump = self.load_torrent(filepath)
+                    filedump = self.load_torrent(filepath, magnet)
                 except (RuntimeError, Exception), e:
                     # If the torrent is invalid, we keep track of it so that we
@@ -238 +249 @@
 
                 # The torrent looks good, so lets add it to the session.
-                torrent_id = component.get("TorrentManager").add(
-                    filedump=filedump, filename=filename, options=opts,
-                    owner=watchdir.get("owner", "localclient")
-                )
+                if magnet == False:
+                    torrent_id = component.get("TorrentManager").add(
+                        filedump=filedump, filename=filename, options=opts,
+                        owner=watchdir.get("owner", "localclient")
+                    )
+                elif magnet == True:
+                    torrent_id = component.get("TorrentManager").add(
+                        magnet=filedump, options=opts,
+                        owner=watchdir.get("owner", "localclient")
+                    )
                 # If the torrent added successfully, set the extra options.
                 if torrent_id:
@@ -255 +272 @@
                         else:
                             component.get("TorrentManager").queue_bottom(torrent_id)
+                else:
+                    # torrent handle is invalid and so is the magnet link
+                    if magnet == True:
+                        log.debug("invalid magnet link")
+                        os.rename(filepath, filepath + ".invalid")
+                        continue
 
                 # Rename, copy or delete the torrent once added to deluge.