Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop

2013-11-09 23:42:15 +01:00
parent 3ef9591abd 0d3c0c4077
commit ddba0e318f
1 changed files with 3 additions and 2 deletions
--- a/couchpotato/core/downloaders/rtorrent/main.py
+++ b/couchpotato/core/downloaders/rtorrent/main.py
@@ -210,8 +210,9 @@ class rTorrent(Downloader):
        if torrent is None:
            return False

-        for file_item in torrent.get_files():
-            os.unlink(os.path.join(torrent.directory, file_item.path))
+        if delete_files:
+            for file_item in torrent.get_files(): # will only delete files, not dir/sub-dir
+                os.unlink(os.path.join(torrent.directory, file_item.path))

        torrent.erase() # just removes the torrent, doesn't delete data