monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/0.14.6'

Browse source
This commit is contained in:
JackDandy 2018-03-05 15:40:57 +00:00
commit 8f45337a5a
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES.md
View file

@ -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 NZB.is usenet provider
Remove HD4Free torrent provider Remove HD4Free torrent provider

10
gui/slick/interfaces/default/config_notifications.tmpl
View file

@ -1486,11 +1486,11 @@
<label for="trakt-accounts"> <label for="trakt-accounts">
<span class="component-title">Trakt account (status):</span> <span class="component-title">Trakt account (status):</span>
<span class="component-desc"> <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> <option value="new" selected="selected">Add account</option>
#set $trakt_accounts = $sickbeard.TRAKT_ACCOUNTS #set $trakt_accounts = $sickbeard.TRAKT_ACCOUNTS
#for $void, $account in $trakt_accounts.items() #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 #end for
</select> </select>
<input type="button" class="btn" value="Delete" id="trakt-delete" disabled="disabled"> <input type="button" class="btn" value="Delete" id="trakt-delete" disabled="disabled">
@ -1499,7 +1499,7 @@
<label for="trakt-pin"> <label for="trakt-pin">
<span class="component-title">Trakt PIN:</span> <span class="component-title">Trakt PIN:</span>
<span class="component-desc"> <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"> <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> <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 <br>tip: easily add accounts by using the link in other browsers "signed in" to Trakt
@ -2085,14 +2085,14 @@
<div class="field-pair"> <div class="field-pair">
<label for="email-show"> <label for="email-show">
<span class="component-title">Notify on a per show basis</span> <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> <option value="-1">-- Shows appear here --</option>
</select> </select>
</label> </label>
<label> <label>
<span class="component-title">&nbsp;</span> <span class="component-title">&nbsp;</span>
<span class="component-desc"> <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"> <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> <div class="clear-left"><p>comma separated email list for each show</p></div>
</span> </span>

3
lib/libtrakt/trakt.py
View file

@ -210,7 +210,8 @@ class TraktAPI:
return {} return {}
# wait before retry # 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 headers = headers or self.headers
if None is not send_oauth and send_oauth in sickbeard.TRAKT_ACCOUNTS: if None is not send_oauth and send_oauth in sickbeard.TRAKT_ACCOUNTS:

2
sickbeard/trakt_helpers.py
View file

@ -25,7 +25,7 @@ def build_config(**kwargs):
root_pieces = sickbeard.ROOT_DIRS.split('|') root_pieces = sickbeard.ROOT_DIRS.split('|')
root_dirs = root_pieces[1:] 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: for account_id, location in item:
account_id = tryInt(account_id, None) account_id = tryInt(account_id, None)
if None is account_id: if None is account_id: