more robust dirname processing
This commit is contained in:
parent
2847289886
commit
c6cee1a2b1
|
@ -11,6 +11,8 @@ logging.basicConfig(level=logging.INFO)
|
||||||
def process(directory):
|
def process(directory):
|
||||||
for subdir in [f.path for f in os.scandir(directory) if f.is_dir()]: #iterate over folders in directory
|
for subdir in [f.path for f in os.scandir(directory) if f.is_dir()]: #iterate over folders in directory
|
||||||
dirname = os.path.basename(subdir)
|
dirname = os.path.basename(subdir)
|
||||||
|
if dirname == '':
|
||||||
|
dirname = os.path.basename(os.path.dirname(subdir))
|
||||||
mainCSV = pd.read_csv(os.path.join(subdir, f"{dirname}.csv"))
|
mainCSV = pd.read_csv(os.path.join(subdir, f"{dirname}.csv"))
|
||||||
candCSV = pd.read_csv(os.path.join(subdir, "cands","results_a.csv"))
|
candCSV = pd.read_csv(os.path.join(subdir, "cands","results_a.csv"))
|
||||||
merge(mainCSV, candCSV, os.path.join(subdir, f"{dirname}_merged.csv"))
|
merge(mainCSV, candCSV, os.path.join(subdir, f"{dirname}_merged.csv"))
|
||||||
|
@ -57,6 +59,8 @@ if __name__ == "__main__":
|
||||||
process(path)
|
process(path)
|
||||||
elif values.directory is not None:
|
elif values.directory is not None:
|
||||||
dirname = os.path.basename(values.directory)
|
dirname = os.path.basename(values.directory)
|
||||||
|
if dirname == '':
|
||||||
|
dirname = os.path.basename(os.path.dirname(values.directory))
|
||||||
mainCSV = pd.read_csv(os.path.join(values.directory, f"{dirname}.csv"))
|
mainCSV = pd.read_csv(os.path.join(values.directory, f"{dirname}.csv"))
|
||||||
candCSV = pd.read_csv(os.path.join(values.directory, "cands","results_a.csv"))
|
candCSV = pd.read_csv(os.path.join(values.directory, "cands","results_a.csv"))
|
||||||
merge(mainCSV, candCSV, os.path.join(values.directory, f"{dirname}_merged.csv"))
|
merge(mainCSV, candCSV, os.path.join(values.directory, f"{dirname}_merged.csv"))
|
Loading…
Reference in a new issue