Browse Source

Fix handle a provider response when in error case.

Change use wider min width for left column on About page.
Fix misaligned columns when expanding/collapsing a show on Episode Overview.
tags/release_0.24.11^2
JackDandy 4 years ago
parent
commit
4506b27dc1
  1. 9
      CHANGES.md
  2. 2
      gui/slick/interfaces/default/config.tmpl
  3. 3
      gui/slick/interfaces/default/manage_episodeStatuses.tmpl
  4. 31
      gui/slick/js/manageEpisodeStatuses.js
  5. 15
      sickbeard/providers/milkie.py

9
CHANGES.md

@ -1,4 +1,11 @@
### 0.24.10 (2021-07-06 20:00:00 UTC) ### 0.24.11 (2021-07-14 10:30:00 UTC)
* Fix handle a provider response when in error case
* Change use wider min width for left column on About page
* Fix misaligned columns when expanding/collapsing a show on Episode Overview
### 0.24.10 (2021-07-06 20:00:00 UTC)
* Fix package update detection * Fix package update detection
* Change add DSM 7 error messages * Change add DSM 7 error messages

2
gui/slick/interfaces/default/config.tmpl

@ -20,7 +20,7 @@
<div id="config-content"> <div id="config-content">
<table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%"> <table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%">
<tr> <tr>
<td class="infoTableHeader">Version: </td> <td class="infoTableHeader" style="min-width:180px">Version: </td>
<td class="infoTableCell"> <td class="infoTableCell">
BRANCH: #echo $sg_str('BRANCH') or 'UNKNOWN'# @ py#echo '.'.join(['%s' % x for x in sys.version_info[0:3]])# / COMMIT: #echo ($sg_str('CUR_COMMIT_HASH')[0:7] or 'UNKNOWN') + ('', ' @ ')[bool($version)]#$version<br /> BRANCH: #echo $sg_str('BRANCH') or 'UNKNOWN'# @ py#echo '.'.join(['%s' % x for x in sys.version_info[0:3]])# / COMMIT: #echo ($sg_str('CUR_COMMIT_HASH')[0:7] or 'UNKNOWN') + ('', ' @ ')[bool($version)]#$version<br />
<em class="red-text">This is BETA software</em><br /> <em class="red-text">This is BETA software</em><br />

3
gui/slick/interfaces/default/manage_episodeStatuses.tmpl

@ -91,7 +91,8 @@
<div class="form-group"> <div class="form-group">
<input type="button" class="btn btn-xs selectAllShows" value="Select all"> <input type="button" class="btn btn-xs selectAllShows" value="Select all">
<input type="button" class="btn btn-xs unselectAllShows" value="Clear all"> <input type="button" class="btn btn-xs unselectAllShows" value="Clear all">
<input type="button" class="btn btn-xs expandAll" value="Expand All Shows"> <input type="button" class="btn btn-xs expand-all" value="Expand all">
<input type="button" class="btn btn-xs collapse-all" value="Collapse all" style="display:none">
</div> </div>
<style> <style>

31
gui/slick/js/manageEpisodeStatuses.js

@ -52,13 +52,14 @@ $(document).ready(function() {
if (null == match) if (null == match)
return false; return false;
var tvid_prodid = match[1], action = match[2], checked = $(document.getElementById('allCheck-' + tvid_prodid)).prop('checked'), var tvid_prodid = match[1], expand = 'more' === match[2], btnExpand$ = $('input[id="' + match[0] + '"]'),
checked = $(document.getElementById('allCheck-' + tvid_prodid)).prop('checked'),
showHeader = $('tr[id="' + tvid_prodid + '"]'), episodeRows = $('tr[id*="ep-' + tvid_prodid + '"]'), showHeader = $('tr[id="' + tvid_prodid + '"]'), episodeRows = $('tr[id*="ep-' + tvid_prodid + '"]'),
void_var = 'more' == action && episodeRows.show() || episodeRows.hide(); void_var = episodeRows.css({'visibility': expand ? 'visible' : 'collapse'});
$('input[id="' + match[0] + '"]').val('more' == action ? 'Expanding...' : 'Collapsing...'); btnExpand$.val(expand ? 'Expanding...' : 'Collapsing...');
if (0 == episodeRows.length) { if (0 === episodeRows.length) {
$.getJSON(sbRoot + '/manage/get-status-episodes', $.getJSON(sbRoot + '/manage/get-status-episodes',
{ {
tvid_prodid: tvid_prodid, tvid_prodid: tvid_prodid,
@ -82,30 +83,40 @@ $(document).ready(function() {
setStatus$.find('option').last().after('<optgroup class="recommended" label="whatever is"><option value="recommended">suggested</option></optgroup>'); setStatus$.find('option').last().after('<optgroup class="recommended" label="whatever is"><option value="recommended">suggested</option></optgroup>');
selectRecommended(); selectRecommended();
} }
$('input[id="' + match[0] + '"]').val('more' == action ? 'Expand' : 'Collapse'); btnExpand$.val(expand ? 'Expand' : 'Collapse');
btnElement.hide(); btnElement.hide();
$('input[id="' + tvid_prodid + '-' + ('more' == action ? 'less' : 'more') + '"]').show(); $('input[id="' + tvid_prodid + '-' + (expand ? 'less' : 'more') + '"]').show();
}); });
} else { } else {
$('input[id="' + match[0] + '"]').val('more' == action ? 'Expand' : 'Collapse'); btnExpand$.val(expand ? 'Expand' : 'Collapse');
btnElement.hide(); btnElement.hide();
$('input[id="' + tvid_prodid + '-' + ('more' == action ? 'less' : 'more') + '"]').show(); $('input[id="' + tvid_prodid + '-' + (expand ? 'less' : 'more') + '"]').show();
} }
} }
$('.get_more_eps,.get_less_eps').on('click', function(){ $('.get_more_eps,.get_less_eps').on('click', function(){
show_episodes($(this)); show_episodes($(this));
($('.get_more_eps:visible').length == 0 ? $('.expandAll').hide() : ''); var btnExpandAll$ = $('.expand-all');
(0 === $('.get_more_eps:visible').length ? btnExpandAll$.hide() : btnExpandAll$.show());
}); });
$('.expandAll').on('click', function(){ $('.expand-all').on('click', function(){
$(this).hide(); $(this).hide();
$('.collapse-all').show();
$('.get_more_eps').each(function() { $('.get_more_eps').each(function() {
show_episodes($(this)); show_episodes($(this));
}); });
}); });
$('.collapse-all').on('click', function(){
$(this).hide();
$('.expand-all').show();
$('.get_less_eps').each(function() {
show_episodes($(this));
});
});
// selects all visible episode checkboxes. // selects all visible episode checkboxes.
$('.selectAllShows').on('click', function(){ $('.selectAllShows').on('click', function(){
$('.sickbeardTable input').each(function() { $('.sickbeardTable input').each(function() {

15
sickbeard/providers/milkie.py

@ -79,13 +79,14 @@ class MilkieProvider(generic.TorrentProvider):
search_url = getattr(Request( search_url = getattr(Request(
'GET', self.urls['search'] % cur_param, 'GET', self.urls['search'] % cur_param,
params={'query': search_string}).prepare(), 'url', None) params={'query': search_string}).prepare(), 'url', None)
data_json, sess = self.get_url(search_url, headers=dict(Authorization='Bearer %s' % self._token), try:
resp_sess=True, parse_json=True) data_json, sess = self.get_url(search_url, resp_sess=True, parse_json=True,
if isinstance(data_json, dict): headers=dict(Authorization='Bearer %s' % self._token))
break if isinstance(data_json, dict):
break
if self.should_skip(): except(BaseException, Exception):
return results if self.should_skip():
return results
cnt = len(items[mode]) cnt = len(items[mode])
if isinstance(data_json, dict): if isinstance(data_json, dict):

Loading…
Cancel
Save