Merge branch 'hotfix/0.18.4'

CHANGES.md

@@ -1,4 +1,11 @@
-### 0.18.3 (2018-12-01 17:35:00 UTC)
+### 0.18.4 (2018-12-04 15:45:00 UTC)
+
+* Fix "Test Emby" notifications output when there are not enough API keys for hosts
+* Change About page to include current base @ version number
+* Change handle when a known season is deleted from indexer but ep data is not deletable locally
+
+
+### 0.18.3 (2018-12-01 17:35:00 UTC)
 
 * Add Milkie torrent provider
 

gui/slick/interfaces/default/config.tmpl

@@ -22,7 +22,7 @@
 		<tr>
 			<td class="infoTableHeader">Version: </td>
 			<td class="infoTableCell">
-				BRANCH: #echo $sg_str('BRANCH') or 'UNKNOWN'# / COMMIT: #echo $sg_str('CUR_COMMIT_HASH') or 'UNKNOWN'#<br />
+				BRANCH: #echo $sg_str('BRANCH') or 'UNKNOWN'# / 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 />
 #if not $sg_var('VERSION_NOTIFY'):
 				You don't have version checking turned on, see "Check software updates" in Config > General.

sickbeard/notifiers/emby.py

@@ -146,7 +146,7 @@ class EmbyNotifier(Notifier):
         """
         hosts, keys, message = self._check_config(hosts, apikeys)
         if not hosts:
-            return False, message
+            return self._choose(message, False)
 
         success = True
         message = []

sickbeard/tv.py

@@ -636,7 +636,7 @@ class TVShow(object):
                     curEp.deleteEpisode()
 
                 curEp.loadFromDB(curSeason, curEpisode)
-                curEp.loadFromIndexer(tvapi=t, cachedSeason=cachedSeasons[curSeason], update=update)
+                curEp.loadFromIndexer(tvapi=t, cachedSeason=cachedSeasons.get(curSeason), update=update)
                 scannedEps[curSeason][curEpisode] = True
             except exceptions.EpisodeDeletedException:
                 logger.log('Tried loading an episode from [%s] from the DB that should have been deleted, skipping it' % self.name,

sickbeard/webserve.py

@@ -5773,6 +5773,12 @@ class Config(MainHandler):
         t = PageTemplate(web_handler=self, file='config.tmpl')
         t.submenu = self.ConfigMenu()
 
+        try:
+            with open(ek.ek(os.path.join, sickbeard.PROG_DIR, 'CHANGES.md')) as fh:
+                t.version = re.findall('###[^0-9]+([0-9]+\.[0-9]+\.[0-9]+)', fh.readline())[0]
+        except (StandardError, BaseException):
+            t.version = ''
+
         return t.respond()