Module: deluge Branch: master Commit: 0a0383d075bce6b5902a9803404f69efd77bf882
Author: John Garland <[email protected]> Date: Mon Aug 30 23:56:16 2010 +1000 Use a temp filename with add_torrent_url --- deluge/core/core.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index c9fcfd1..82fa4a5 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -42,6 +42,7 @@ import shutil import threading import pkg_resources import warnings +import tempfile from twisted.internet import reactor, defer @@ -238,7 +239,13 @@ class Core(component.Component): log.info("Attempting to add url %s", url) def on_get_file(filename): # We got the file, so add it to the session - data = open(filename, "rb").read() + f = open(filename, "rb") + data = f.read() + f.close() + try: + os.remove(filename) + except Exception, e: + log.warning("Couldn't remove temp file: %s", e) return self.add_torrent_file(filename, base64.encodestring(data), options) def on_get_file_error(failure): @@ -247,7 +254,7 @@ class Core(component.Component): log.error("Reason: %s", failure.getErrorMessage()) return failure - d = download_file(url, url.split("/")[-1], headers=headers) + d = download_file(url, tempfile.mkstemp()[1], headers=headers) d.addCallback(on_get_file) d.addErrback(on_get_file_error) return d -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
