diff --git a/CHANGES.md b/CHANGES.md index 44f6fade..bfc40ed5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 3.27.11 (2023-03-06 23:40:00 UTC) +### 3.27.12 (2023-03-08 23:30:00 UTC) + +* Change meta providers to new TVInfoAPI get_show to make sure language is used + + +### 3.27.11 (2023-03-06 23:40:00 UTC) * Fix "Change File Date" not using timestamp of episode if available diff --git a/sickgear/metadata/generic.py b/sickgear/metadata/generic.py index 8b61869f..906a065b 100644 --- a/sickgear/metadata/generic.py +++ b/sickgear/metadata/generic.py @@ -521,7 +521,8 @@ class GenericMetadata(object): t = sickgear.TVInfoAPI(TVINFO_TVDB).setup(**tvinfo_config) - ep_info = t[cur_ep_obj.show_obj.prodid][cur_ep_obj.season][cur_ep_obj.episode] + ep_info = t.get_show(cur_ep_obj.show_obj.prodid, language=show_lang)[ + cur_ep_obj.season][cur_ep_obj.episode] except (BaseTVinfoEpisodenotfound, BaseTVinfoSeasonnotfound, TypeError): ep_info = None else: @@ -1095,7 +1096,7 @@ class GenericMetadata(object): tvinfo_config['language'] = show_obj.lang t = sickgear.TVInfoAPI(show_obj.tvid).setup(**tvinfo_config) - tvinfo_obj_show = t[show_obj.prodid] + tvinfo_obj_show = t.get_show(show_obj.prodid, language=show_obj.lang) except (BaseTVinfoError, IOError) as e: logger.log(u'Unable to look up show on ' + sickgear.TVInfoAPI( show_obj.tvid).name + ', not downloading images: ' + ex(e), logger.WARNING) diff --git a/sickgear/metadata/kodi.py b/sickgear/metadata/kodi.py index 15f0e3cc..dcd873cb 100644 --- a/sickgear/metadata/kodi.py +++ b/sickgear/metadata/kodi.py @@ -127,7 +127,7 @@ class KODIMetadata(generic.GenericMetadata): tv_node = etree.Element('tvshow') try: - show_info = t[int(show_ID)] + show_info = t.get_show(show_obj.prodid, language=show_obj.lang) except BaseTVinfoShownotfound as e: logger.log('Unable to find show with id %s on %s, skipping it' % (show_ID, sickgear.TVInfoAPI( show_obj.tvid).name), logger.ERROR) @@ -290,7 +290,7 @@ class KODIMetadata(generic.GenericMetadata): try: t = sickgear.TVInfoAPI(ep_obj.show_obj.tvid).setup(**tvinfo_config) - show_info = t[ep_obj.show_obj.prodid] + show_info = t.get_show(ep_obj.show_obj.prodid, language=ep_obj.show_obj.lang) except BaseTVinfoShownotfound as e: raise exceptions_helper.ShowNotFoundException(ex(e)) except BaseTVinfoError as e: diff --git a/sickgear/metadata/mede8er.py b/sickgear/metadata/mede8er.py index 3b9759d1..37a52e65 100644 --- a/sickgear/metadata/mede8er.py +++ b/sickgear/metadata/mede8er.py @@ -125,7 +125,7 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata): tv_node.attrib['isTV'] = 'true' try: - show_info = t[int(show_obj.prodid)] + show_info = t.get_show(show_obj.prodid, language=show_obj.lang) except BaseTVinfoShownotfound as e: logger.log(u'Unable to find show with id ' + str(show_obj.prodid) + ' on tvdb, skipping it', logger.ERROR) raise e @@ -237,7 +237,7 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata): tvinfo_config['dvdorder'] = True t = sickgear.TVInfoAPI(ep_obj.show_obj.tvid).setup(**tvinfo_config) - show_info = t[ep_obj.show_obj.prodid] + show_info = t.get_show(ep_obj.show_obj.prodid, language=ep_obj.show_obj.lang) except BaseTVinfoShownotfound as e: raise exceptions_helper.ShowNotFoundException(ex(e)) except BaseTVinfoError as e: diff --git a/sickgear/metadata/mediabrowser.py b/sickgear/metadata/mediabrowser.py index ad73b059..5f4f7e29 100644 --- a/sickgear/metadata/mediabrowser.py +++ b/sickgear/metadata/mediabrowser.py @@ -254,7 +254,7 @@ class MediaBrowserMetadata(generic.GenericMetadata): tv_node = etree.Element("Series") try: - show_info = t[int(show_obj.prodid)] + show_info = t.get_show(show_obj.prodid, language=show_obj.lang) except BaseTVinfoShownotfound as e: logger.log("Unable to find show with id %s on %s, skipping it" % (show_obj.prodid, sickgear.TVInfoAPI(show_obj.tvid).name), logger.ERROR) @@ -415,7 +415,7 @@ class MediaBrowserMetadata(generic.GenericMetadata): t = sickgear.TVInfoAPI(ep_obj.show_obj.tvid).setup(**tvinfo_config) - show_info = t[ep_obj.show_obj.prodid] + show_info = t.get_show(ep_obj.show_obj.prodid, language=ep_obj.show_obj.lang) except BaseTVinfoShownotfound as e: raise exceptions_helper.ShowNotFoundException(ex(e)) except BaseTVinfoError as e: diff --git a/sickgear/metadata/tivo.py b/sickgear/metadata/tivo.py index 4a3f78e9..e93b4ace 100644 --- a/sickgear/metadata/tivo.py +++ b/sickgear/metadata/tivo.py @@ -201,7 +201,7 @@ class TIVOMetadata(generic.GenericMetadata): tvinfo_config['dvdorder'] = True t = sickgear.TVInfoAPI(ep_obj.show_obj.tvid).setup(**tvinfo_config) - show_info = t[ep_obj.show_obj.prodid] + show_info = t.get_show(ep_obj.show_obj.prodid, language=ep_obj.show_obj.lang) except BaseTVinfoShownotfound as e: raise exceptions_helper.ShowNotFoundException(ex(e)) except BaseTVinfoError as e: diff --git a/sickgear/metadata/wdtv.py b/sickgear/metadata/wdtv.py index 97ae9611..23385dcb 100644 --- a/sickgear/metadata/wdtv.py +++ b/sickgear/metadata/wdtv.py @@ -203,7 +203,7 @@ class WDTVMetadata(generic.GenericMetadata): tvinfo_config['dvdorder'] = True t = sickgear.TVInfoAPI(ep_obj.show_obj.tvid).setup(**tvinfo_config) - show_info = t[ep_obj.show_obj.prodid] + show_info = t.get_show(ep_obj.show_obj.prodid, language=ep_obj.show_obj.lang) except BaseTVinfoShownotfound as e: raise exceptions_helper.ShowNotFoundException(ex(e)) except BaseTVinfoError as e: diff --git a/sickgear/metadata/xbmc_12plus.py b/sickgear/metadata/xbmc_12plus.py index f0b709a4..7ffc76a2 100644 --- a/sickgear/metadata/xbmc_12plus.py +++ b/sickgear/metadata/xbmc_12plus.py @@ -121,7 +121,7 @@ class XBMC12PlusMetadata(generic.GenericMetadata): tv_node = etree.Element('tvshow') try: - show_info = t[int(show_id)] + show_info = t.get_show(show_id, language=show_lang) except BaseTVinfoShownotfound as e: logger.log('Unable to find show with id %s on %s, skipping it' % (show_id, sickgear.TVInfoAPI(show_obj.tvid).name), logger.ERROR) @@ -223,7 +223,7 @@ class XBMC12PlusMetadata(generic.GenericMetadata): try: t = sickgear.TVInfoAPI(ep_obj.show_obj.tvid).setup(**tvinfo_config) - show_info = t[ep_obj.show_obj.prodid] + show_info = t.get_show(ep_obj.show_obj.prodid, language=ep_obj.show_obj.lang) except BaseTVinfoShownotfound as e: raise exceptions_helper.ShowNotFoundException(ex(e)) except BaseTVinfoError as e: