diff --git a/deluge/ui/webui/webui_plugin/debugerror.py b/deluge/ui/webui/webui_plugin/debugerror.py index eed0b2cab..5570f357e 100644 --- a/deluge/ui/webui/webui_plugin/debugerror.py +++ b/deluge/ui/webui/webui_plugin/debugerror.py @@ -173,7 +173,11 @@ $def with (exception_type, exception_value, frames, exception_message, version_i
-Paste the contents of this text-box when you are asked for a traceback:
+Paste the contents of this text-box when you are asked for a traceback.
+Try to explain what you where doing, +and how you could work around the problem.
+Don't paste without context and expect us to know what went wrong. +
diff --git a/deluge/ui/webui/webui_plugin/torrent_add.py b/deluge/ui/webui/webui_plugin/torrent_add.py index 31da1f7d9..0eb66276b 100644 --- a/deluge/ui/webui/webui_plugin/torrent_add.py +++ b/deluge/ui/webui/webui_plugin/torrent_add.py @@ -35,7 +35,6 @@ from render import render, error_page import page_decorators as deco import lib.newforms_plus as forms import lib.webpy022 as web -import base64 class OptionsForm(forms.Form): download_location = forms.ServerFolder(_("Download Location")) @@ -120,9 +119,7 @@ class torrent_add: log.debug("add-url:options :%s" % options) utils.do_redirect() elif torrent_name: - data_b64 = base64.b64encode(torrent_data) - #b64 because of strange bug-reports related to binary data - proxy.add_torrent_filecontent(vars.torrent.filename, data_b64, options) + proxy.add_torrent_file_binary(vars.torrent.filename, torrent_data, options) log.debug("add-file:options :%s" % options) utils.do_redirect() else: diff --git a/deluge/ui/webui/webui_plugin/webserver_common.py b/deluge/ui/webui/webui_plugin/webserver_common.py index d413cf4cc..82816ec1f 100644 --- a/deluge/ui/webui/webui_plugin/webserver_common.py +++ b/deluge/ui/webui/webui_plugin/webserver_common.py @@ -146,26 +146,6 @@ class Ws: def init_06(self, uri = 'http://localhost:58846'): proxy.set_core_uri(uri) - - #MONKEY PATCH, TODO->REMOVE!!! - def add_torrent_filecontent(name , data_b64, options): - log.debug('monkeypatched add_torrent_filecontent:%s,len(data:%s))' % - (name , len(data_b64))) - - name = name.replace('\\','/') - name = 'deluge06_' + str(random.random()) + '_' + name.split('/')[-1] - filename = os.path.join('/tmp', name) - - log.debug('write: %s' % filename) - f = open(filename,"wb") - f.write(base64.b64decode(data_b64)) - f.close() - log.debug("options:%s" % options) - - log.debug("TF:%s" % proxy.add_torrent_file) - proxy.add_torrent_file([filename] , [options]) - - proxy.add_torrent_filecontent = add_torrent_filecontent log.debug('cfg-file %s' % self.config_file) if not os.path.exists(self.config_file): @@ -211,6 +191,3 @@ class Ws: return (m.digest() == self.config.get('pwd_md5')) ws =Ws() - - -