codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#2466] [AutoAdd] Fix Copy Torrent File

This commit is contained in:
Calum Lind 2014-07-04 21:54:55 +01:00
parent a9274d4b52
commit 6c295cd314
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
View File

@ -39,6 +39,7 @@
# #
from deluge._libtorrent import lt from deluge._libtorrent import lt
import shutil
import os import os
import logging import logging
import base64 import base64
@ -334,27 +335,8 @@ class Core(CorePluginBase):
copy_torrent_file = os.path.join(copy_torrent_path, filename) copy_torrent_file = os.path.join(copy_torrent_path, filename)
log.debug("Moving added torrent file \"%s\" to \"%s\"", log.debug("Moving added torrent file \"%s\" to \"%s\"",
os.path.basename(filepath), copy_torrent_path) os.path.basename(filepath), copy_torrent_path)
try: shutil.move(filepath, copy_torrent_file)
os.rename(filepath, copy_torrent_file)
except OSError, why:
from errno import EXDEV
if why.errno == errno.EXDEV:
# This can happen for different mount points
from shutil import copyfile
try:
copyfile(filepath, copy_torrent_file)
os.remove(filepath)
except OSError:
# Last Resort!
try:
open(copy_torrent_file, 'wb').write(
open(filepath, 'rb').read()
)
os.remove(filepath)
except OSError, why:
raise why
else:
raise why
else: else:
os.remove(filepath) os.remove(filepath)