From d0105a2f6a5d8b95de4d3d33bb6e435602886751 Mon Sep 17 00:00:00 2001
From: tlex <tlex@e-tel.eu>
Date: Sun, 11 May 2014 10:31:38 +0300
Subject: [PATCH] Fixed a couple of bugs related to deluge

---
 gui/slick/interfaces/default/config_search.tmpl |  8 ++++++++
 gui/slick/js/configSearch.js                    |  1 +
 sickbeard/__init__.py                           |  5 ++++-
 sickbeard/clients/deluge.py                     | 12 ++++++------
 sickbeard/webserve.py                           |  3 ++-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl
index acc78733..3bf76b1b 100644
--- a/gui/slick/interfaces/default/config_search.tmpl
+++ b/gui/slick/interfaces/default/config_search.tmpl
@@ -362,6 +362,14 @@
                                 </label>
                             </div>
                             
+                            <div class="field-pair" id="Torrent_Verify_Cert">
+                                <input type="checkbox" name="torrent_verify_cert" class="enabler" id="torrent_verify_cert" #if $sickbeard.TORRENT_VERIFY_CERT == True then "checked=\"checked\"" else ""# />
+                                <label class="nocheck clearfix" for="torrent_verify_cert">
+                        	    <span class="component-title" id="torrent_verify_cert_desc">Verify Certificate</span>
+                                    <span class="component-desc">Disable if you get "Deluge: Authentication Error" in your log</span>
+                                </label>
+                            </div>
+                            
                             <div class="field-pair" id="Torrent_username">
                                 <label class="nocheck clearfix">
                                     <span class="component-title" id="username_desc">Torrent Username</span>
diff --git a/gui/slick/js/configSearch.js b/gui/slick/js/configSearch.js
index 72529f06..dbe21000 100644
--- a/gui/slick/js/configSearch.js
+++ b/gui/slick/js/configSearch.js
@@ -71,6 +71,7 @@ $(document).ready(function(){
         } else if (selectedProvider == "deluge"){
             $('#t_blackhole_settings').hide();
             $('#torrent_settings').show();
+            $('#Torrent_Verify_Cert').show();
             $('#Torrent_Label').show();
             $('#Torrent_username').show();
             $('#Torrent_Path').show();
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 8fa273fd..1b2e9a21 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -304,6 +304,7 @@ TORRENT_SEED_TIME = ''
 TORRENT_PAUSED = False
 TORRENT_HIGH_BANDWIDTH = False
 TORRENT_LABEL = ''
+TORRENT_VERIFY_CERT = True
 
 USE_XBMC = False
 XBMC_ALWAYS_ON = True
@@ -489,7 +490,7 @@ def initialize(consoleLogging=True):
             HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, PREFER_EPISODE_RELEASES, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \
             SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \
             NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_HOST, NZBGET_USE_HTTPS, currentSearchScheduler, backlogSearchScheduler, \
-            TORRENT_USERNAME, TORRENT_PASSWORD, TORRENT_HOST, TORRENT_PATH, TORRENT_RATIO, TORRENT_SEED_TIME, TORRENT_PAUSED, TORRENT_HIGH_BANDWIDTH, TORRENT_LABEL, \
+            TORRENT_USERNAME, TORRENT_PASSWORD, TORRENT_HOST, TORRENT_PATH, TORRENT_RATIO, TORRENT_SEED_TIME, TORRENT_PAUSED, TORRENT_HIGH_BANDWIDTH, TORRENT_LABEL, TORRENT_VERIFY_CERT, \
             USE_XBMC, XBMC_ALWAYS_ON, XBMC_NOTIFY_ONSNATCH, XBMC_NOTIFY_ONDOWNLOAD, XBMC_NOTIFY_ONSUBTITLEDOWNLOAD, XBMC_UPDATE_FULL, XBMC_UPDATE_ONLYFIRST, \
             XBMC_UPDATE_LIBRARY, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, \
             USE_TRAKT, TRAKT_USERNAME, TRAKT_PASSWORD, TRAKT_API, TRAKT_REMOVE_WATCHLIST, TRAKT_USE_WATCHLIST, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, traktWatchListCheckerSchedular, \
@@ -809,6 +810,7 @@ def initialize(consoleLogging=True):
         TORRENT_PAUSED = bool(check_setting_int(CFG, 'TORRENT', 'torrent_paused', 0))
         TORRENT_HIGH_BANDWIDTH = bool(check_setting_int(CFG, 'TORRENT', 'torrent_high_bandwidth', 0))
         TORRENT_LABEL = check_setting_str(CFG, 'TORRENT', 'torrent_label', '')
+        TORRENT_VERIFY_CERT = bool(check_setting_int(CFG, 'TORRENT', 'torrent_verify_cert', 0))
 
         USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0))
         XBMC_ALWAYS_ON = bool(check_setting_int(CFG, 'XBMC', 'xbmc_always_on', 1))
@@ -1568,6 +1570,7 @@ def save_config():
     new_config['TORRENT']['torrent_paused'] = int(TORRENT_PAUSED)
     new_config['TORRENT']['torrent_high_bandwidth'] = int(TORRENT_HIGH_BANDWIDTH)
     new_config['TORRENT']['torrent_label'] = TORRENT_LABEL
+    new_config['TORRENT']['torrent_verify_cert'] = TORRENT_VERIFY_CERT
 
     new_config['XBMC'] = {}
     new_config['XBMC']['use_xbmc'] = int(USE_XBMC)
diff --git a/sickbeard/clients/deluge.py b/sickbeard/clients/deluge.py
index 10c25e59..7a50a30f 100644
--- a/sickbeard/clients/deluge.py
+++ b/sickbeard/clients/deluge.py
@@ -38,7 +38,7 @@ class DelugeAPI(GenericClient):
                                 "id": 1
         })
         try:
-            self.response = self.session.post(self.url, data=post_data.encode('utf-8'))
+            self.response = self.session.post(self.url, data=post_data.encode('utf-8'), verify=sickbeard.TORRENT_VERIFY_CERT)
         except:
             return None
 
@@ -49,7 +49,7 @@ class DelugeAPI(GenericClient):
                                 "id": 10
         })
         try:
-            self.response = self.session.post(self.url, data=post_data.encode('utf-8'))
+            self.response = self.session.post(self.url, data=post_data.encode('utf-8'), verify=sickbeard.TORRENT_VERIFY_CERT)
         except:
             return None
 
@@ -61,7 +61,7 @@ class DelugeAPI(GenericClient):
                                     "id": 11
             })
             try:
-                self.response = self.session.post(self.url, data=post_data.encode('utf-8'))
+                self.response = self.session.post(self.url, data=post_data.encode('utf-8'), verify=sickbeard.TORRENT_VERIFY_CERT)
             except:
                 return None
             hosts = self.response.json()['result']
@@ -74,7 +74,7 @@ class DelugeAPI(GenericClient):
                                     "id": 11
             })
             try:
-                self.response = self.session.post(self.url, data=post_data.encode('utf-8'))
+                self.response = self.session.post(self.url, data=post_data.encode('utf-8'), verify=sickbeard.TORRENT_VERIFY_CERT)
             except:
                 return None
 
@@ -83,7 +83,7 @@ class DelugeAPI(GenericClient):
                                     "id": 10
             })
             try:
-                self.response = self.session.post(self.url, data=post_data.encode('utf-8'))
+                self.response = self.session.post(self.url, data=post_data.encode('utf-8'), verify=sickbeard.TORRENT_VERIFY_CERT)
             except:
                 return None
 
@@ -123,7 +123,7 @@ class DelugeAPI(GenericClient):
 
     def _set_torrent_label(self, result):
 
-        label = sickbeard.TORRENT_LABEL.lower()
+        label = sickbeard.TORRENT_LABEL
         if ' ' in label:
             logger.log(self.name + u': Invalid label. Label must not contain a space', logger.ERROR)
             return False
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 13918c48..a1b022f8 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1070,7 +1070,7 @@ class ConfigSearch:
                    nzb_method=None, torrent_method=None, usenet_retention=None, search_frequency=None,
                    download_propers=None, prefer_episode_releases=None, allow_high_priority=None, backlog_startup=None,
                    torrent_dir=None, torrent_username=None, torrent_password=None, torrent_host=None,
-                   torrent_label=None, torrent_path=None,
+                   torrent_label=None, torrent_path=None, torrent_verify_cert=None,
                    torrent_ratio=None, torrent_seed_time=None, torrent_paused=None, torrent_high_bandwidth=None, ignore_words=None):
 
         results = []
@@ -1121,6 +1121,7 @@ class ConfigSearch:
         sickbeard.TORRENT_USERNAME = torrent_username
         sickbeard.TORRENT_PASSWORD = torrent_password
         sickbeard.TORRENT_LABEL = torrent_label
+        sickbeard.TORRENT_VERIFY_CERT = config.checkbox_to_value(torrent_verify_cert)
         sickbeard.TORRENT_PATH = torrent_path
         sickbeard.TORRENT_RATIO = torrent_ratio
         sickbeard.TORRENT_SEED_TIME = torrent_seed_time