Merge pull request #129 from minchik/master

Deluge: ssl and base url options

Author: styxit

modules/deluge.py

@@ -28,6 +28,8 @@ def __init__(self):
                 {'type': 'text', 'label': 'Menu name', 'name': 'deluge_name'},
                 {'type': 'text', 'label': 'IP / Host *', 'name': 'deluge_host'},
                 {'type': 'text', 'label': 'Port *', 'name': 'deluge_port'},
+                {'type': 'bool', 'label': 'Use SSL', 'name': 'deluge_ssl'},
+                {'type': 'text', 'label': 'Basepath', 'name': 'deluge_basepath'},
                 {'type': 'password', 'label': 'Password', 'name': 'deluge_password'}
         ]})
 
@@ -111,8 +113,10 @@ def read_data(self,data):
 
             host = htpc.settings.get('deluge_host', '')
             port = str(htpc.settings.get('deluge_port', ''))
+            deluge_basepath = str(htpc.settings.get('deluge_basepath', ''))
+            ssl = 's' if htpc.settings.get('deluge_ssl') else ''
 
-            url = 'http://' +  host + ':' + str(port) + '/json'
+            url = 'http' + ssl + '://' +  host + ':' + str(port) + deluge_basepath + '/json'
 
             post_data = dumps(data)
             buf = StringIO( self.opener.open(url, post_data,1).read())