transfer absolute path logic to own def
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user