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

Use a temp filename with add_torrent_url

Browse Source
This commit is contained in:
John Garland 2010-08-30 23:56:16 +10:00
parent eaad867885
commit 6c3b216b40
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deluge/core/core.py
View File

@ -42,6 +42,7 @@ import shutil
import threading import threading
import pkg_resources import pkg_resources
import warnings import warnings
import tempfile
from twisted.internet import reactor, defer from twisted.internet import reactor, defer
@ -238,7 +239,13 @@ class Core(component.Component):
log.info("Attempting to add url %s", url) log.info("Attempting to add url %s", url)
def on_get_file(filename): def on_get_file(filename):
# We got the file, so add it to the session # 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) return self.add_torrent_file(filename, base64.encodestring(data), options)
def on_get_file_error(failure): def on_get_file_error(failure):
@ -247,7 +254,7 @@ class Core(component.Component):
log.error("Reason: %s", failure.getErrorMessage()) log.error("Reason: %s", failure.getErrorMessage())
return failure 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.addCallback(on_get_file)
d.addErrback(on_get_file_error) d.addErrback(on_get_file_error)
return d return d