daniel/material
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

transfer absolute path logic to own def

Browse Source
This commit is contained in:
Daniel Weschke
2019-02-09 21:48:35 +01:00
parent d6a99f0cc0
commit a882e8b6e7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/materials.py
View File

@@ -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): def read_dir(directory, exclude=None):
"""\ """\
Read all files in directory as list Read all files in directory as list
""" """
directory = os.path.join(os.path.abspath(os.path.dirname(__file__)), directory)
result = [] result = []
for data in os.listdir(directory): for data in os.listdir(directory):
file_name = data.split('.')[0] file_name = data.split('.')[0]
@@ -49,7 +55,6 @@ def read_file(filename):
"""\ """\
Read file as string Read file as string
""" """
filename = os.path.join(os.path.abspath(os.path.dirname(__file__)), filename)
try: try:
with open(filename) as data_file: with open(filename) as data_file:
return data_file.read() return data_file.read()
@@ -147,12 +152,12 @@ def main():
print(args) print(args)
if args.command == 'list': if args.command == 'list':
data_list = read_dir("data", "INFO") data_list = read_dir(absolute_path("data"), "INFO")
print_list(data_list) print_list(data_list)
elif args.command == 'get': elif args.command == 'get':
filename = os.path.join('data', args.materialname.lower() + '.json') filename = os.path.join('data', args.materialname.lower() + '.json')
data = read_file(filename) data = read_file(absolute_path(filename))
if args.debug: if args.debug:
print("filename: " + filename) print("filename: " + filename)
if args.const_collection: if args.const_collection: