diff --git a/fHDHR/config/__init__.py b/fHDHR/config/__init__.py index df62768..f624c35 100644 --- a/fHDHR/config/__init__.py +++ b/fHDHR/config/__init__.py @@ -94,7 +94,10 @@ class Config(): # Run Plugin Setup Checks for plugin_item in list(self.plugins.plugin_dict.keys()): - eval("self.plugins.%s_Setup(self)" % self.plugins.plugin_dict[plugin_item]["NAME"].upper()) + try: + eval("self.plugins.%s_Setup(self)" % self.plugins.plugin_dict[plugin_item]["NAME"].upper()) + except AttributeError: + pass self.dict["epg"]["valid_methods"].extend([self.plugins.plugin_dict[x]["NAME"] for x in list(self.plugins.plugin_dict.keys()) if self.plugins.plugin_dict[x]["TYPE"] == "alt_epg"]) self.dict["streaming"]["valid_methods"].extend([self.plugins.plugin_dict[x]["NAME"] for x in list(self.plugins.plugin_dict.keys()) if self.plugins.plugin_dict[x]["TYPE"] == "alt_stream"]) diff --git a/plugins/__init__.py b/plugins/__init__.py index 5780e3c..26ffe0b 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -54,7 +54,10 @@ for entry in os.scandir(plugins_top_dir): imp_string = "from .%s import origin" % entry.name exec(imp_string) imp_string = "from .%s import %s_Setup" % (entry.name, curr_dict["NAME"].upper()) - exec(imp_string) + try: + exec(imp_string) + except ImportError: + pass elif curr_dict["TYPE"] == "alt_epg": imp_string = "from .%s import *" % entry.name exec(imp_string)