codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-11 20:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

AutoAdd plugin fix for #1863

Browse Source 
In some cases, using `os.rename` between different mount points can trigger an `OSError`. Try to address these issues properly.
This commit is contained in:
Pedro Algarvio 2011-05-29 11:35:12 +01:00
parent 6dc393ed23
commit af24542856
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
deluge/plugins/autoadd/autoadd/core.py
View File

@ -226,9 +226,10 @@ class Core(CorePluginBase):
if filename in self.invalid_torrents: if filename in self.invalid_torrents:
self.invalid_torrents[filename] += 1 self.invalid_torrents[filename] += 1
if self.invalid_torrents[filename] >= MAX_NUM_ATTEMPTS: if self.invalid_torrents[filename] >= MAX_NUM_ATTEMPTS:
log.warning("Maximum attepts reached while trying " log.warning(
"to add the torrent file with the path" "Maximum attempts reached while trying to add the "
" %s", filepath) "torrent file with the path %s", filepath
)
os.rename(filepath, filepath + ".invalid") os.rename(filepath, filepath + ".invalid")
del self.invalid_torrents[filename] del self.invalid_torrents[filename]
else: else:
@ -261,16 +262,37 @@ class Core(CorePluginBase):
os.rename(filepath, filepath + watchdir['append_extension']) os.rename(filepath, filepath + watchdir['append_extension'])
elif watchdir.get('copy_torrent_toggle'): elif watchdir.get('copy_torrent_toggle'):
copy_torrent_path = watchdir['copy_torrent'] copy_torrent_path = watchdir['copy_torrent']
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)
os.rename( try:
filepath, os.path.join(copy_torrent_path, filename) os.rename(filepath, copy_torrent_file)
) except OSError, why:
if why.errno == 18:
# 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()
)
except OSError, why:
raise why
else:
os.remove(filepath)
else:
os.remove(filepath)
else:
raise why
else: else:
os.remove(filepath) os.remove(filepath)
def on_update_watchdir_error(self, failure, watchdir_id): def on_update_watchdir_error(self, failure, watchdir_id):
"""Disables any watch folders with unhandled exceptions.""" """Disables any watch folders with un-handled exceptions."""
self.disable_watchdir(watchdir_id) self.disable_watchdir(watchdir_id)
log.error("Disabling '%s', error during update: %s", log.error("Disabling '%s', error during update: %s",
self.watchdirs[watchdir_id]["path"], failure) self.watchdirs[watchdir_id]["path"], failure)