From ccccf0287a440fafe5c0a16055e742b396fb0924 Mon Sep 17 00:00:00 2001 From: Lukas Ruzicka Date: Jul 09 2019 15:51:02 +0000 Subject: improve list function. --- diff --git a/modular_functions.py b/modular_functions.py index c97926c..6baffa7 100755 --- a/modular_functions.py +++ b/modular_functions.py @@ -314,26 +314,29 @@ class ModuleTest: if module in modules.keys(): modInfo = modules[module] self.overall['list'] = 'pass' + print(f"Showing information for: {module}\n========================================") + for rec in modInfo: + print(f"Stream: {rec['stream']}") + try: + d = rec['default-stream'] + print(f"Default stream: yes") + except KeyError: + print(f"Default stream: no") + print(f"Available profiles: {rec['profile']}") + try: + d = rec['default-profile'] + print(f"Default profile: {d}") + except KeyError: + print(f"Default profile: none") + print('------------------------------') + logging.info("The list method finished successfully.") + return(modInfo) else: + print('Module does not exist.') + logging.error("Module does not exist.") self.overall['list'] = 'fail' + return None - print(f"Showing information for: {module}\n========================================") - for rec in modInfo: - print(f"Stream: {rec['stream']}") - try: - d = rec['default-stream'] - print(f"Default stream: yes") - except KeyError: - print(f"Default stream: no") - print(f"Available profiles: {rec['profile']}") - try: - d = rec['default-profile'] - print(f"Default stream: {d}") - except KeyError: - print(f"Default stream: none") - print('------------------------------') - - return(modInfo) def check_install(self, module, stream): print('-------- Checking for module in list --------')