Merge branch 'master' into develop

CHANGES.md

@@ -65,6 +65,11 @@
 * Change improve history menu images for light themes
 
 
+### 0.17.14 (2018-11-15 08:00:00 UTC)
+
+* Change remove required restart of SickGear after changing label or path settings for rTorrent and qBittorrent
+
+
 ### 0.17.13 (2018-11-08 21:12:00 UTC)
 
 * Fix add filter to data used for alternative scene episode numbers

sickbeard/clients/qbittorrent.py

@@ -14,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with SickGear.  If not, see <http://www.gnu.org/licenses/>.
 
-from sickbeard import helpers, TORRENT_LABEL, TORRENT_PATH
+import sickbeard
+from sickbeard import helpers
 from sickbeard.clients.generic import GenericClient
 
 
@@ -43,8 +44,8 @@ class QbittorrentAPI(GenericClient):
 
     def _add_torrent(self, cmd, **kwargs):
 
-        label = TORRENT_LABEL.replace(' ', '_')
-        label_dict = {'label': label, 'category': label, 'savepath': TORRENT_PATH}
+        label = sickbeard.TORRENT_LABEL.replace(' ', '_')
+        label_dict = {'label': label, 'category': label, 'savepath': sickbeard.TORRENT_PATH}
         if 'post_data' in kwargs:
             kwargs['post_data'].update(label_dict)
         else:

sickbeard/clients/rtorrent.py

@@ -17,7 +17,8 @@
 # along with SickGear.  If not, see <http://www.gnu.org/licenses/>.
 
 import xmlrpclib
-from sickbeard import helpers, TORRENT_LABEL, TORRENT_PATH
+import sickbeard
+from sickbeard import helpers
 from sickbeard.clients.generic import GenericClient
 from lib.rtorrent import RTorrent
 
@@ -58,11 +59,11 @@ class RtorrentAPI(GenericClient):
 
                 if torrent:
 
-                    if TORRENT_LABEL:
-                        torrent.set_custom(1, TORRENT_LABEL)
+                    if sickbeard.TORRENT_LABEL:
+                        torrent.set_custom(1, sickbeard.TORRENT_LABEL)
 
-                    if TORRENT_PATH:
-                        torrent.set_directory(TORRENT_PATH)
+                    if sickbeard.TORRENT_PATH:
+                        torrent.set_directory(sickbeard.TORRENT_PATH)
 
                     torrent.start()