Merge branch 'hotfix/0.25.7'

CHANGES.md

@@ -1,4 +1,11 @@
-### 0.25.6 (2021-09-26 17:45:00 UTC)
+### 0.25.7 (2021-09-29 18:40:00 UTC)
+
+* Fix ignore entire show runtimes when getting runtimes from IMDb
+* Change enable failure monitor for search_tvs
+* Change thexem server
+
+
+### 0.25.6 (2021-09-26 17:45:00 UTC)
 
 * Fix view-show on new browsers
 * Fix remove box in footer on certain setups

gui/slick/interfaces/default/displayShow.tmpl

@@ -220,7 +220,7 @@
 							</a>
 #end if
 #if $xem_numbering or $xem_absolute_numbering
-							<a class="service addQTip" href="$anon_url('http://thexem.de/search?q=', $show_obj.name)" rel="noreferrer" onclick="window.open(this.href, '_blank'); return !1;" title="View XEM info in new tab"><img alt="[xem]" height="16" width="16" src="$sbRoot/images/xem.png" /></a>
+							<a class="service addQTip" href="$anon_url('http://thexem.info/search?q=', $show_obj.name)" rel="noreferrer" onclick="window.open(this.href, '_blank'); return !1;" title="View XEM info in new tab"><img alt="[xem]" height="16" width="16" src="$sbRoot/images/xem.png" /></a>
 #end if
 						</span>
 					</div>

gui/slick/interfaces/default/history.tmpl

@@ -595,7 +595,7 @@
 	<div id="server-failures">
 		<div style="padding-bottom:10px">
     #for ($check, $check_name, $check_url) in [
-        ('tvdb', 'TVDB Api', 'api.thetvdb.com'), ('thexem', 'The Xem', 'thexem.de'), ('github', 'GitHub', 'github.com'),
+        ('tvdb', 'TVDB Api', 'api.thetvdb.com'), ('thexem', 'The Xem', 'thexem.info'), ('github', 'GitHub', 'github.com'),
     ]
 			<div id="check-$check" data-check="check_$check" class="check-site" style="margin-bottom:10px">
 				<input type="button" class="btn" value="Check $check_name">

gui/slick/interfaces/default/inc_addShowOptions.tmpl

@@ -103,7 +103,7 @@
 						<span class="component-title">Scene numbering</span>
 						<span class="component-desc">
 							<input type="checkbox" name="scene" id="scene"#if $sg_var('SCENE_DEFAULT') then $checked else ''# />
-							<p>if any exists, enable editable episode numbers from TheXEM.de for search and media processing</p>
+							<p>if any exists, enable editable episode numbers from TheXEM.info for search and media processing</p>
 						</span>
 					</label>
 				</div>

lib/api_tvdb/tvdb_api.py

@@ -762,7 +762,7 @@ class Tvdb(TVInfoBase):
                           'highlightPreTag=__ais-highlight__', 'highlightPostTag=__/ais-highlight__'
                           ])
                      }]},
-                language=language, parse_json=True, failure_monitor=False)
+                language=language, parse_json=True)
             return src
         except (KeyError, IndexError, Exception):
             pass

sickbeard/scene_exceptions.py

@@ -518,7 +518,7 @@ def _xem_exceptions_fetcher():
         for tvid in [i for i in sickbeard.TVInfoAPI().sources if 'xem_origin' in sickbeard.TVInfoAPI(i).config]:
             logger.log(u'Checking for XEM scene exception updates for %s' % sickbeard.TVInfoAPI(tvid).name)
 
-            url = 'http://thexem.de/map/allNames?origin=%s%s&seasonNumbers=1'\
+            url = 'http://thexem.info/map/allNames?origin=%s%s&seasonNumbers=1'\
                   % (sickbeard.TVInfoAPI(tvid).config['xem_origin'], ('&language=us', '')['xem' == xem_list])
 
             parsed_json = helpers.get_url(url, parse_json=True, timeout=90)
@@ -553,7 +553,7 @@ def _xem_get_ids(infosrc_name, xem_origin):
     """
     xem_ids = []
 
-    url = 'http://thexem.de/map/havemap?origin=%s' % xem_origin
+    url = 'http://thexem.info/map/havemap?origin=%s' % xem_origin
 
     task = 'Fetching show ids with%s xem scene mapping%s for origin'
     logger.log(u'%s %s' % (task % ('', 's'), infosrc_name))

sickbeard/scene_numbering.py

@@ -775,7 +775,7 @@ def xem_refresh(tvid, prodid, force=False):
 
     # XEM API URL
     # noinspection HttpUrlsUsage
-    url = 'http://thexem.de/map/all?id=%s&origin=%s&destination=scene' % (prodid, xem_origin)
+    url = 'http://thexem.info/map/all?id=%s&origin=%s&destination=scene' % (prodid, xem_origin)
 
     max_refresh_age_secs = 86400  # 1 day
 

sickbeard/tv.py

@@ -3062,8 +3062,19 @@ class TVShow(TVShowBase):
             imdb_info['title'] = imdb_tv.get('title')
         if isinstance(imdb_tv.get('year'), (int, string_types)):
             imdb_info['year'] = try_int(imdb_tv.get('year'), '')
-        if isinstance(imdb_tv.get('runningTimeInMinutes'), (int, string_types)):
-            imdb_info['runtimes'] = try_int(imdb_tv.get('runningTimeInMinutes'), '')
+        if isinstance(imdb_tv.get('runningTimes'), list):
+            try:
+                for _t in imdb_tv.get('runningTimes'):
+                    try:
+                        if isinstance(_t.get('attributes'), list) and \
+                                any(1 for _a in _t.get('attributes') if 'entire' in _a):
+                            continue
+                    except (BaseException, Exception):
+                        continue
+                    imdb_info['runtimes'] = try_int(_t.get('timeMinutes'), '')
+                    break
+            except (BaseException, Exception):
+                pass
         if isinstance(imdb_tv.get('titleType'), string_types):
             imdb_info['is_mini_series'] = 'mini' in imdb_tv.get('titleType').lower()
         if isinstance(imdb_tv.get('numberOfEpisodes'), (int, string_types)):

sickbeard/webserve.py

@@ -7409,7 +7409,7 @@ class History(MainHandler):
     def check_site(site_name=''):
 
         site_url = dict(
-            tvdb='api.thetvdb.com', thexem='thexem.de', github='github.com'
+            tvdb='api.thetvdb.com', thexem='thexem.info', github='github.com'
         ).get(site_name.replace('check_', ''))
 
         result = {}