From 41206c2de74b35272a7b4dd281af5455d3efbd4a Mon Sep 17 00:00:00 2001
From: Prinz23 <Prinz2311@gmail.com>
Date: Sat, 3 Mar 2018 21:44:41 +0100
Subject: [PATCH 1/2] Fix notifications Trakt "inactive" status not displayed
 when it should be.

Fix prevent waiting loops for deactivated accounts that can result in long loading times for the notification page on first time opened.
---
 gui/slick/interfaces/default/config_notifications.tmpl | 2 +-
 lib/libtrakt/trakt.py                                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl
index cc2abf91..70d8ccba 100644
--- a/gui/slick/interfaces/default/config_notifications.tmpl
+++ b/gui/slick/interfaces/default/config_notifications.tmpl
@@ -1490,7 +1490,7 @@
 										<option value="new" selected="selected">Add account</option>
 #set $trakt_accounts = $sickbeard.TRAKT_ACCOUNTS
 #for $void, $account in $trakt_accounts.items()
-											<option value="$account.account_id">$account.account_id - $account.name #if $account.active then '(ok)' else '(inactive)'#</option>
+											<option value="$account.account_id">$account.account_id - $account.name #if $account.active and $account.name then '(ok)' else '(inactive)'#</option>
 #end for
 									</select>
 									<input type="button" class="btn" value="Delete" id="trakt-delete" disabled="disabled">
diff --git a/lib/libtrakt/trakt.py b/lib/libtrakt/trakt.py
index d09a9da0..d9c11ccf 100644
--- a/lib/libtrakt/trakt.py
+++ b/lib/libtrakt/trakt.py
@@ -210,7 +210,8 @@ class TraktAPI:
             return {}
 
         # wait before retry
-        count > 1 and time.sleep(sleep_retry)
+        if 'users/settings' != path:
+            count > 1 and time.sleep(sleep_retry)
 
         headers = headers or self.headers
         if None is not send_oauth and send_oauth in sickbeard.TRAKT_ACCOUNTS:

From a71e186973dea4a818d8dfab6b36fd030c22399c Mon Sep 17 00:00:00 2001
From: JackDandy <jackdandy@users.noreply.github.com>
Date: Mon, 5 Mar 2018 15:34:16 +0000
Subject: [PATCH 2/2] Fix saving multiple account "Update collection" selection
 at config/notifications Trakt.

Change config/notifications remove redundant values being sent when saving.
---
 CHANGES.md                                             | 8 +++++++-
 gui/slick/interfaces/default/config_notifications.tmpl | 8 ++++----
 sickbeard/trakt_helpers.py                             | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a730c9d9..422b54b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
-### 0.14.5 (2018-02-23 22:15:00 UTC)
+### 0.14.6 (2018-03-05 15:40:00 UTC)
+
+Fix config/notifications Trakt "inactive" status not displayed when it should be
+Fix saving multiple account "Update collection" selection at config/notifications Trakt
+
+
+### 0.14.5 (2018-02-23 22:15:00 UTC)
 
 Remove NZB.is usenet provider
 Remove HD4Free torrent provider
diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl
index 70d8ccba..bfaec904 100644
--- a/gui/slick/interfaces/default/config_notifications.tmpl
+++ b/gui/slick/interfaces/default/config_notifications.tmpl
@@ -1486,7 +1486,7 @@
 								<label for="trakt-accounts">
 									<span class="component-title">Trakt account (status):</span>
 									<span class="component-desc">
-									<select name="trakt_accounts" id="trakt-accounts" class="pull-left form-control input-sm">
+									<select id="trakt-accounts" class="pull-left form-control input-sm">
 										<option value="new" selected="selected">Add account</option>
 #set $trakt_accounts = $sickbeard.TRAKT_ACCOUNTS
 #for $void, $account in $trakt_accounts.items()
@@ -1499,7 +1499,7 @@
 								<label for="trakt-pin">
 									<span class="component-title">Trakt PIN:</span>
 									<span class="component-desc">
-										<input type="text" name="trakt_pin" id="trakt-pin" value="" class="form-control input-sm input250">
+										<input type="text" id="trakt-pin" value="" class="form-control input-sm input250">
 										<input type="button" class="btn" value="Connect" id="trakt-authenticate">
 										<div class="clear-left"><p>get an active PIN using: <a href="<%= anon_url(sickbeard.TRAKT_PIN_URL) %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;"><b>$sickbeard.TRAKT_PIN_URL</b></a>
 										<br>tip: easily add accounts by using the link in other browsers "signed in" to Trakt
@@ -2085,14 +2085,14 @@
 							<div class="field-pair">
 								<label for="email-show">
 									<span class="component-title">Notify on a per show basis</span>
-									<select name="email_show" id="email-show" class="showlist-select form-control input-sm">
+									<select id="email-show" class="showlist-select form-control input-sm">
 										<option value="-1">-- Shows appear here --</option>
 									</select>
 								</label>
 								<label>
 									<span class="component-title">&nbsp;</span>
 									<span class="component-desc">
-										<input type="text" name="show_email_list" id="show-email-list" class="form-control input-sm input350">
+										<input type="text" id="show-email-list" class="form-control input-sm input350">
 										<input type="button" value="Save Show" id="save-show-email" class="btn">
 										<div class="clear-left"><p>comma separated email list for each show</p></div>
 									</span>
diff --git a/sickbeard/trakt_helpers.py b/sickbeard/trakt_helpers.py
index 6b3e3cc2..c3432d49 100644
--- a/sickbeard/trakt_helpers.py
+++ b/sickbeard/trakt_helpers.py
@@ -25,7 +25,7 @@ def build_config(**kwargs):
         root_pieces = sickbeard.ROOT_DIRS.split('|')
         root_dirs = root_pieces[1:]
 
-    for item in [re.findall('update_trakt_(\d+)_(.*)', k) for k, v in kwargs.items() if k.startswith('update_trakt_')]:
+    for item in [re.findall('update-trakt-(\d+)-(.*)', k) for k, v in kwargs.items() if k.startswith('update-trakt-')]:
         for account_id, location in item:
             account_id = tryInt(account_id, None)
             if None is account_id: