From 4506b27dc1293d48cabecc1ed982ec9581573ae2 Mon Sep 17 00:00:00 2001
From: JackDandy <jackdandy@users.noreply.github.com>
Date: Wed, 14 Jul 2021 10:29:30 +0100
Subject: [PATCH] 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.
---
 CHANGES.md                                         |  9 ++++++-
 gui/slick/interfaces/default/config.tmpl           |  2 +-
 .../interfaces/default/manage_episodeStatuses.tmpl |  3 ++-
 gui/slick/js/manageEpisodeStatuses.js              | 31 +++++++++++++++-------
 sickbeard/providers/milkie.py                      | 15 ++++++-----
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9d5c298..828551b 100644
--- a/CHANGES.md
+++ b/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
 * Change add DSM 7 error messages
diff --git a/gui/slick/interfaces/default/config.tmpl b/gui/slick/interfaces/default/config.tmpl
index 00bfe8b..f3bf351 100644
--- a/gui/slick/interfaces/default/config.tmpl
+++ b/gui/slick/interfaces/default/config.tmpl
@@ -20,7 +20,7 @@
 <div id="config-content">
 	<table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%">
 		<tr>
-			<td class="infoTableHeader">Version: </td>
+			<td class="infoTableHeader" style="min-width:180px">Version: </td>
 			<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 />
 				<em class="red-text">This is BETA software</em><br />
diff --git a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
index cbf017e..b37e930 100644
--- a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
+++ b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
@@ -91,7 +91,8 @@
 		<div class="form-group">
 			<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 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>
 
 <style>
diff --git a/gui/slick/js/manageEpisodeStatuses.js b/gui/slick/js/manageEpisodeStatuses.js
index 64d8b8c..604ff43 100644
--- a/gui/slick/js/manageEpisodeStatuses.js
+++ b/gui/slick/js/manageEpisodeStatuses.js
@@ -52,13 +52,14 @@ $(document).ready(function() {
 		if (null == match)
 			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 + '"]'),
-			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',
 				{
 					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>');
 						selectRecommended();
 					}
-					$('input[id="' + match[0] + '"]').val('more' == action ? 'Expand' : 'Collapse');
+					btnExpand$.val(expand ? 'Expand' : 'Collapse');
 					btnElement.hide();
-					$('input[id="' + tvid_prodid + '-' + ('more' == action ? 'less' : 'more') + '"]').show();
+					$('input[id="' + tvid_prodid + '-' + (expand ? 'less' : 'more') + '"]').show();
 				});
 		} else {
-			$('input[id="' + match[0] + '"]').val('more' == action ? 'Expand' : 'Collapse');
+			btnExpand$.val(expand ? 'Expand' : 'Collapse');
 			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(){
 		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();
+		$('.collapse-all').show();
 		$('.get_more_eps').each(function() {
 			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.
 	$('.selectAllShows').on('click', function(){
 		$('.sickbeardTable input').each(function() {
diff --git a/sickbeard/providers/milkie.py b/sickbeard/providers/milkie.py
index 0266ba7..5e88c00 100644
--- a/sickbeard/providers/milkie.py
+++ b/sickbeard/providers/milkie.py
@@ -79,13 +79,14 @@ class MilkieProvider(generic.TorrentProvider):
                     search_url = getattr(Request(
                         'GET', self.urls['search'] % cur_param,
                         params={'query': search_string}).prepare(), 'url', None)
-                    data_json, sess = self.get_url(search_url, headers=dict(Authorization='Bearer %s' % self._token),
-                                                   resp_sess=True, parse_json=True)
-                    if isinstance(data_json, dict):
-                        break
-
-                if self.should_skip():
-                    return results
+                    try:
+                        data_json, sess = self.get_url(search_url, resp_sess=True, parse_json=True,
+                                                       headers=dict(Authorization='Bearer %s' % self._token))
+                        if isinstance(data_json, dict):
+                            break
+                    except(BaseException, Exception):
+                        if self.should_skip():
+                            return results
 
                 cnt = len(items[mode])
                 if isinstance(data_json, dict):