marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Change "not a in b" to more readable "a not in b", add comments in Metadata class

Browse Source
This commit is contained in:
Darius Arnold 2018-12-07 11:24:11 +01:00
parent 45949afca6
commit 2a22409145
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pylot/core/util/dataprocessing.py
View File

@ -52,7 +52,7 @@ class Metadata(object):
:return: None :return: None
""" """
assert (os.path.isdir(path_to_inventory)), '{} is no directory'.format(path_to_inventory) assert (os.path.isdir(path_to_inventory)), '{} is no directory'.format(path_to_inventory)
if not path_to_inventory in self.inventories: if path_to_inventory not in self.inventories:
self.inventories.append(path_to_inventory) self.inventories.append(path_to_inventory)
def add_inventory_file(self, path_to_inventory_file): def add_inventory_file(self, path_to_inventory_file):
@ -64,7 +64,7 @@ class Metadata(object):
""" """
assert (os.path.isfile(path_to_inventory_file)), '{} is no file'.format(path_to_inventory_file) assert (os.path.isfile(path_to_inventory_file)), '{} is no file'.format(path_to_inventory_file)
self.add_inventory(os.path.split(path_to_inventory_file)[0]) self.add_inventory(os.path.split(path_to_inventory_file)[0])
if not path_to_inventory_file in self.inventory_files.keys(): if path_to_inventory_file not in self.inventory_files.keys():
self.read_single_file(path_to_inventory_file) self.read_single_file(path_to_inventory_file)
def remove_all_inventories(self): def remove_all_inventories(self):
@ -133,7 +133,9 @@ class Metadata(object):
""" """
Read all metadata files found in all inventories Read all metadata files found in all inventories
""" """
# iterate over all inventory folders
for inventory in self.inventories: for inventory in self.inventories:
# iterate over all inventory files in the current folder
for inv_fname in os.listdir(inventory): for inv_fname in os.listdir(inventory):
inv_fname = os.path.join(inventory, inv_fname) inv_fname = os.path.join(inventory, inv_fname)
if not self.read_single_file(inv_fname): if not self.read_single_file(inv_fname):