From 5b83432361f2b8daf487ff3f407bb6be071f6f1b Mon Sep 17 00:00:00 2001
From: Chance Zibolski <chance.zibolski@gmail.com>
Date: Mon, 22 Dec 2014 14:33:17 -0800
Subject: [PATCH 1/6] Fix travis build status image in readme

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9c72cad1..69bff7c3 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@ SickRage
 Video File Manager for TV Shows, It watches for new episodes of your favorite shows and when they are posted it does its magic.
 
 ## Branch Build Status
-[![Build Status](https://travis-ci.org/SiCKRAGETV/SickRage.svg?branch=nightly)](https://travis-ci.org/SiCKRAGETV/SickRage)
+[![Build Status](https://travis-ci.org/SiCKRAGETV/SickRage.svg?branch=develop)](https://travis-ci.org/SiCKRAGETV/SickRage)
 
 ## Features
  - XBMC library updates, poster/fanart downloads, and NFO/TBN generation

From 03b17d63e0f3d2374abea66fd3002253cd8ff52d Mon Sep 17 00:00:00 2001
From: Joris Vandalon <joris@vandalon.nl>
Date: Thu, 15 Jan 2015 11:05:10 +0100
Subject: [PATCH 2/6] Added support for Plex Media Center updates with Auth
 Token. This because PMS does not allow unauthed connections when using Plex
 Home

---
 .../interfaces/default/config_notifications.tmpl   | 14 ++++++++++++++
 sickbeard/__init__.py                              |  5 ++++-
 sickbeard/notifiers/plex.py                        |  4 ++++
 sickbeard/webserve.py                              |  5 +++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl
index 4d3dd470..fa38177e 100644
--- a/gui/slick/interfaces/default/config_notifications.tmpl
+++ b/gui/slick/interfaces/default/config_notifications.tmpl
@@ -220,6 +220,20 @@
                                     <span class="component-desc">host running Plex Media Server (eg. 192.168.1.100:32400)</span>
                                 </label>
                             </div>
+                            <div class="field-pair">
+                                <label for="plex_server_token">
+                                    <span class="component-title">Plex Media Server Auth Token</span>
+                                    <input type="text" name="plex_server_token" id="plex_server_token" value="$sickbeard.PLEX_SERVER_TOKEN" class="form-control input-sm input250" />
+                                </label>
+                                <label>
+                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-desc">Auth Token used by plex</span>
+                                </label>
+                                <label>
+                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-desc">(<a href="<%= anon_url('https://support.plex.tv/hc/en-us/articles/204059436-Finding-your-account-token-X-Plex-Token') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;"><u>Finding your account token</u></a>)</span>
+                                </label>
+                            </div>
                             <div class="field-pair">
                                 <label for="plex_host">
                                     <span class="component-title">Plex Client IP:Port</span>
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index a97434ca..f8fbaa16 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -301,6 +301,7 @@ PLEX_NOTIFY_ONDOWNLOAD = False
 PLEX_NOTIFY_ONSUBTITLEDOWNLOAD = False
 PLEX_UPDATE_LIBRARY = False
 PLEX_SERVER_HOST = None
+PLEX_SERVER_TOKEN = None
 PLEX_HOST = None
 PLEX_USERNAME = None
 PLEX_PASSWORD = None
@@ -493,7 +494,7 @@ def initialize(consoleLogging=True):
             KODI_UPDATE_LIBRARY, KODI_HOST, KODI_USERNAME, KODI_PASSWORD, BACKLOG_FREQUENCY, \
             USE_TRAKT, TRAKT_USERNAME, TRAKT_PASSWORD, TRAKT_API, TRAKT_REMOVE_WATCHLIST, TRAKT_USE_WATCHLIST, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, traktCheckerScheduler, TRAKT_USE_RECOMMENDED, TRAKT_SYNC, TRAKT_DEFAULT_INDEXER, TRAKT_REMOVE_SERIESLIST, \
             USE_PLEX, PLEX_NOTIFY_ONSNATCH, PLEX_NOTIFY_ONDOWNLOAD, PLEX_NOTIFY_ONSUBTITLEDOWNLOAD, PLEX_UPDATE_LIBRARY, \
-            PLEX_SERVER_HOST, PLEX_HOST, PLEX_USERNAME, PLEX_PASSWORD, DEFAULT_BACKLOG_FREQUENCY, MIN_BACKLOG_FREQUENCY, BACKLOG_STARTUP, SKIP_REMOVED_FILES, \
+            PLEX_SERVER_HOST, PLEX_SERVER_TOKEN, PLEX_HOST, PLEX_USERNAME, PLEX_PASSWORD, DEFAULT_BACKLOG_FREQUENCY, MIN_BACKLOG_FREQUENCY, BACKLOG_STARTUP, SKIP_REMOVED_FILES, \
             showUpdateScheduler, __INITIALIZED__, LAUNCH_BROWSER, UPDATE_SHOWS_ON_START, TRASH_REMOVE_SHOW, TRASH_ROTATE_LOGS, SORT_ARTICLE, showList, loadingShowList, \
             NEWZNAB_DATA, NZBS, NZBS_UID, NZBS_HASH, INDEXER_DEFAULT, INDEXER_TIMEOUT, USENET_RETENTION, TORRENT_DIR, \
             QUALITY_DEFAULT, FLATTEN_FOLDERS_DEFAULT, SUBTITLES_DEFAULT, STATUS_DEFAULT, DAILYSEARCH_STARTUP, \
@@ -813,6 +814,7 @@ def initialize(consoleLogging=True):
         PLEX_NOTIFY_ONSUBTITLEDOWNLOAD = bool(check_setting_int(CFG, 'Plex', 'plex_notify_onsubtitledownload', 0))
         PLEX_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'Plex', 'plex_update_library', 0))
         PLEX_SERVER_HOST = check_setting_str(CFG, 'Plex', 'plex_server_host', '')
+        PLEX_SERVER_TOKEN = check_setting_str(CFG, 'Plex', 'plex_server_token', '')
         PLEX_HOST = check_setting_str(CFG, 'Plex', 'plex_host', '')
         PLEX_USERNAME = check_setting_str(CFG, 'Plex', 'plex_username', '', censor_log=True)
         PLEX_PASSWORD = check_setting_str(CFG, 'Plex', 'plex_password', '', censor_log=True)
@@ -1666,6 +1668,7 @@ def save_config():
     new_config['Plex']['plex_notify_onsubtitledownload'] = int(PLEX_NOTIFY_ONSUBTITLEDOWNLOAD)
     new_config['Plex']['plex_update_library'] = int(PLEX_UPDATE_LIBRARY)
     new_config['Plex']['plex_server_host'] = PLEX_SERVER_HOST
+    new_config['Plex']['plex_server_token'] = PLEX_SERVER_TOKEN
     new_config['Plex']['plex_host'] = PLEX_HOST
     new_config['Plex']['plex_username'] = PLEX_USERNAME
     new_config['Plex']['plex_password'] = helpers.encrypt(PLEX_PASSWORD, ENCRYPTION_VERSION)
diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py
index 840c2e58..735469a9 100644
--- a/sickbeard/notifiers/plex.py
+++ b/sickbeard/notifiers/plex.py
@@ -96,6 +96,8 @@ class PLEXNotifier(KODINotifier):
                        logger.INFO)
 
             url = "http://%s/library/sections" % sickbeard.PLEX_SERVER_HOST
+            if sickbeard.PLEX_SERVER_TOKEN:
+                url += "/?X-Plex-Token=" + sickbeard.PLEX_SERVER_TOKEN
             try:
                 xml_sections = minidom.parse(urllib.urlopen(url))
             except IOError, e:
@@ -110,6 +112,8 @@ class PLEXNotifier(KODINotifier):
             for s in sections:
                 if s.getAttribute('type') == "show":
                     url = "http://%s/library/sections/%s/refresh" % (sickbeard.PLEX_SERVER_HOST, s.getAttribute('key'))
+                    if sickbeard.PLEX_SERVER_TOKEN:
+                        url += "/?X-Plex-Token=" + sickbeard.PLEX_SERVER_TOKEN
                     try:
                         urllib.urlopen(url)
                     except Exception, e:
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 996e3086..32dedea4 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -4329,7 +4329,7 @@ class ConfigNotifications(Config):
                           kodi_password=None,
                           use_plex=None, plex_notify_onsnatch=None, plex_notify_ondownload=None,
                           plex_notify_onsubtitledownload=None, plex_update_library=None,
-                          plex_server_host=None, plex_host=None, plex_username=None, plex_password=None,
+                          plex_server_host=None, plex_server_token=None, plex_host=None, plex_username=None, plex_password=None,
                           use_growl=None, growl_notify_onsnatch=None, growl_notify_ondownload=None,
                           growl_notify_onsubtitledownload=None, growl_host=None, growl_password=None,
                           use_prowl=None, prowl_notify_onsnatch=None, prowl_notify_ondownload=None,
@@ -4388,6 +4388,7 @@ class ConfigNotifications(Config):
         sickbeard.PLEX_UPDATE_LIBRARY = config.checkbox_to_value(plex_update_library)
         sickbeard.PLEX_HOST = config.clean_hosts(plex_host)
         sickbeard.PLEX_SERVER_HOST = config.clean_host(plex_server_host)
+        sickbeard.PLEX_SERVER_TOKEN = config.clean_host(plex_server_token)
         sickbeard.PLEX_USERNAME = plex_username
         sickbeard.PLEX_PASSWORD = plex_password
 
@@ -4716,4 +4717,4 @@ class ErrorLogs(WebRoot):
             if issue:
                 ui.notifications.message('Your issue ticket #%s was submitted successfully!' % issue.number)
 
-        return self.redirect("/errorlogs/")
\ No newline at end of file
+        return self.redirect("/errorlogs/")

From 7e7cdb846f343a9f652ffd391e8227f3cb03da7e Mon Sep 17 00:00:00 2001
From: david <db@d1b.org>
Date: Thu, 29 Jan 2015 00:57:28 +1100
Subject: [PATCH 3/6] Use https://kickass.so/ instead of http://kickass.so/ .

Signed-off-by: david <db@d1b.org>
---
 sickbeard/providers/kat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
index 6fe91f6e..4dc5f4f3 100644
--- a/sickbeard/providers/kat.py
+++ b/sickbeard/providers/kat.py
@@ -55,7 +55,7 @@ class KATProvider(generic.TorrentProvider):
 
         self.cache = KATCache(self)
 
-        self.urls = {'base_url': 'http://kickass.so/'}
+        self.urls = {'base_url': 'https://kickass.so/'}
 
         self.url = self.urls['base_url']
 

From 02505b4d1e73b477a52ae5f4e450b8a45df00485 Mon Sep 17 00:00:00 2001
From: David <db@d1b.org>
Date: Tue, 10 Feb 2015 21:36:19 +1100
Subject: [PATCH 4/6] Switch to the kickass.to domain.

Signed-off-by: David <db@d1b.org>
---
 sickbeard/providers/kat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
index 4dc5f4f3..26e1f53f 100644
--- a/sickbeard/providers/kat.py
+++ b/sickbeard/providers/kat.py
@@ -55,7 +55,7 @@ class KATProvider(generic.TorrentProvider):
 
         self.cache = KATCache(self)
 
-        self.urls = {'base_url': 'https://kickass.so/'}
+        self.urls = {'base_url': 'https://kickass.to/'}
 
         self.url = self.urls['base_url']
 

From ac153cf2320b3b6d0a8aa9a1b1646a51347581d6 Mon Sep 17 00:00:00 2001
From: Fernando <fernandog@users.noreply.github.com>
Date: Thu, 19 Feb 2015 12:38:25 -0200
Subject: [PATCH 5/6] Update readme.md

---
 readme.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/readme.md b/readme.md
index 69bff7c3..0302171d 100644
--- a/readme.md
+++ b/readme.md
@@ -34,5 +34,13 @@ Video File Manager for TV Shows, It watches for new episodes of your favorite sh
 ## Bug/Issues
 [SickRage Issue Tracker](https://github.com/SiCKRAGETV/sickrage-issues)
 
+## FAQ
+
+https://github.com/SiCKRAGETV/SickRage/wiki/Frequently-Asked-Questions
+
+## Wiki
+
+https://github.com/SiCKRAGETV/SickRage/wiki
+
 ## Important
 Please before using this with your existing database (sickbeard.db) please make a backup copy of it and delete any other database files such as cache.db and failed.db if present, we HIGHLY recommend starting out with no database files at all to make this a fresh start but the choice is at your own risk

From 5d6c62417c8bde7d4da817968f72b8f39fcc4304 Mon Sep 17 00:00:00 2001
From: Alexandre Beloin <alexandre.beloin@gmail.com>
Date: Mon, 23 Feb 2015 11:17:31 -0500
Subject: [PATCH 6/6] T411: Change addresse from t411.me to t411.io

---
 sickbeard/providers/t411.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sickbeard/providers/t411.py b/sickbeard/providers/t411.py
index f555846f..97f2ffae 100644
--- a/sickbeard/providers/t411.py
+++ b/sickbeard/providers/t411.py
@@ -51,10 +51,10 @@ class T411Provider(generic.TorrentProvider):
 
         self.cache = T411Cache(self)
 
-        self.urls = {'base_url': 'http://www.t411.me/',
-                'search': 'http://www.t411.me/torrents/search/?name=%s&cat=210&subcat=%s&search=%s&submit=Recherche',
-                'login_page': 'http://www.t411.me/users/login/',
-                'download': 'http://www.t411.me/torrents/download/?id=%s',
+        self.urls = {'base_url': 'http://www.t411.io/',
+                'search': 'http://www.t411.io/torrents/search/?name=%s&cat=210&subcat=%s&search=%s&submit=Recherche',
+                'login_page': 'http://www.t411.io/users/login/',
+                'download': 'http://www.t411.io/torrents/download/?id=%s',
                 }
 
         self.url = self.urls['base_url']