From a882e8b6e7f489bfe0133cc88fe74acaca7c96a9 Mon Sep 17 00:00:00 2001 From: Daniel Weschke Date: Sat, 9 Feb 2019 21:48:35 +0100 Subject: [PATCH] transfer absolute path logic to own def --- src/materials.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/materials.py b/src/materials.py index 824cc27..f98708b 100755 --- a/src/materials.py +++ b/src/materials.py @@ -24,11 +24,17 @@ EPILOG = """\ """ +def absolute_path(filename): + """\ + Get full path. + """ + return os.path.join(os.path.abspath(os.path.dirname(__file__)), filename) + + def read_dir(directory, exclude=None): """\ Read all files in directory as list """ - directory = os.path.join(os.path.abspath(os.path.dirname(__file__)), directory) result = [] for data in os.listdir(directory): file_name = data.split('.')[0] @@ -49,7 +55,6 @@ def read_file(filename): """\ Read file as string """ - filename = os.path.join(os.path.abspath(os.path.dirname(__file__)), filename) try: with open(filename) as data_file: return data_file.read() @@ -147,12 +152,12 @@ def main(): print(args) if args.command == 'list': - data_list = read_dir("data", "INFO") + data_list = read_dir(absolute_path("data"), "INFO") print_list(data_list) elif args.command == 'get': filename = os.path.join('data', args.materialname.lower() + '.json') - data = read_file(filename) + data = read_file(absolute_path(filename)) if args.debug: print("filename: " + filename) if args.const_collection: