Changeset 560318

Timestamp:

09/29/2015 10:18:04 PM (9 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

4b9dcf

Parents:

244ae87

git-author:

Calum Lind <calumlind+deluge@gmail.com> (09/28/2015 06:05:43 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (09/29/2015 10:18:04 PM)

Message:

#2703 [Core] Stop moving files if target files exist

Location:

deluge/core

Files:

• torrent.py (modified) (1 diff)
• torrentmanager.py (modified) (1 diff)

deluge/core/torrent.py

@@ -856 +856 @@
                 return False
 
+        kwargs = {}
+        if deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("1.0.0.0"):
+            kwargs['flags'] = 1  # fail_if_exist
         dest_bytes = dest.encode('utf-8')
         try:
             # libtorrent needs unicode object if wstrings are enabled, utf8 bytestring otherwise
             try:
-                self.handle.move_storage(dest)
+                self.handle.move_storage(dest, **kwargs)
             except TypeError:
-                self.handle.move_storage(dest_bytes)
+                self.handle.move_storage(dest_bytes, **kwargs)
         except Exception, e:
             log.error("Error calling libtorrent move_storage: %s" % e)

deluge/core/torrentmanager.py

@@ -1065 +1065 @@
             return
 
+        log.error("Torrent %s, %s", torrent_id, decode_string(alert.message()))
         if torrent_id in self.waiting_on_finish_moving:
             self.waiting_on_finish_moving.remove(torrent_id)