Save copies of torrent files from magnet links.

This patch is meant for 1.3-stable (1.3.15 as of the commit date).

The bug is: when you add a new magnet link to download, even if you tick
the option *Copy of .torrent files to:*, deluge still fails to save a
copy of torrent. This patch adds extra code to do so.

ChangeLog

@@ -1,4 +1,9 @@
-=== Deluge 1.3.15 (3 May 2017) ===
+=== Deluge 1.3.16 (unreleased) ===
+
+==== Core ====
+	* Fix saving copy of torrent file for magnet links.
+
+=== Deluge 1.3.15 (12 May 2017) ===
 
 ==== Core ====
 	* #2991: Fix issues with displaying libtorrent single proxy.

deluge/config.py

@@ -111,8 +111,13 @@ def find_json_objects(s):
     if start < 0:
         return []
 
+    quoted = False
     for index, c in enumerate(s[offset:]):
-        if c == "{":
+        if c == '"':
+            quoted = not quoted
+        elif quoted:
+            continue
+        elif c == "{":
             opens += 1
         elif c == "}":
             opens -= 1

deluge/core/core.py

@@ -107,6 +107,8 @@ class Core(component.Component):
         self.settings.user_agent = "Deluge %s" % deluge.common.get_version()
         # Increase the alert queue size so that alerts don't get lost
         self.settings.alert_queue_size = 10000
+        # Ignore buggy resume data timestamps checking #3044.
+        self.settings.ignore_resume_timestamps = True
 
         # Set session settings
         self.settings.send_redundant_have = True

deluge/core/preferencesmanager.py

@@ -319,6 +319,8 @@ class PreferencesManager(component.Component):
                 self.session.start_dht(None)
             self.session.add_dht_router("router.bittorrent.com", 6881)
             self.session.add_dht_router("router.utorrent.com", 6881)
+            self.session.add_dht_router("dht.transmissionbt.com", 6881)
+            self.session.add_dht_router("dht.aelitis.com", 6881)
             self.session.add_dht_router("router.bitcomet.com", 6881)
         else:
             self.core.save_dht_state()

deluge/core/torrent.py

@@ -144,7 +144,7 @@ class Torrent(object):
         # We store the filename just in case we need to make a copy of the torrentfile
         if not filename:
             # If no filename was provided, then just use the infohash
-            filename = self.torrent_id
+            filename = self.torrent_id + '.torrent'
 
         self.filename = filename
 
@@ -972,6 +972,11 @@ class Torrent(object):
             torrent_file["info"] = md
             with open(path, "wb") as _file:
                 _file.write(lt.bencode(torrent_file))
+            if self.config["copy_torrent_file"]:
+                config_dir = self.config['torrentfiles_location']
+                filepath = os.path.join(config_dir, self.filename)
+                with open(filepath, "wb") as _file:
+                    _file.write(lt.bencode(torrent_file))
         except Exception, e:
             log.warning("Unable to save torrent file: %s", e)
 

deluge/core/torrentmanager.py

@@ -111,10 +111,22 @@ class TorrentState:
         self.move_completed = move_completed
         self.move_completed_path = move_completed_path
 
+    def __eq__(self, other):
+        return isinstance(other, TorrentState) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not self == other
+
 class TorrentManagerState:
     def __init__(self):
         self.torrents = []
 
+    def __eq__(self, other):
+        return isinstance(other, TorrentManagerState) and self.torrents == other.torrents
+
+    def __ne__(self, other):
+        return not self == other
+
 class TorrentManager(component.Component):
     """
     TorrentManager contains a list of torrents in the current libtorrent
@@ -157,6 +169,9 @@ class TorrentManager(component.Component):
         # Workaround to determine if TorrentAddedEvent is from state file
         self.session_started = False
 
+        # Keep the previous saved state
+        self.prev_saved_state = None
+
         # Register set functions
         self.config.register_set_function("max_connections_per_torrent",
             self.on_set_max_connections_per_torrent)
@@ -719,6 +734,10 @@ class TorrentManager(component.Component):
             )
             state.torrents.append(torrent_state)
 
+        # If the state hasn't changed, no need to save it
+        if self.prev_saved_state == state:
+            return
+
         # Pickle the TorrentManagerState object
         filepath = os.path.join(get_config_dir(), "state", "torrents.state")
         filepath_tmp = filepath + ".tmp"
@@ -741,6 +760,7 @@ class TorrentManager(component.Component):
             os.fsync(state_file.fileno())
             state_file.close()
             os.rename(filepath_tmp, filepath)
+            self.prev_saved_state = state
         except IOError, ex:
             log.error("Unable to save %s: %s", filepath, ex)
             if os.path.isfile(filepath_bak):