From 70ec08f8d6fd0d4782cbe01d8c08306821de6be7 Mon Sep 17 00:00:00 2001 From: Will Usher Date: Mon, 15 Jun 2020 23:14:41 +0200 Subject: [PATCH] Fix #46 while we are at it --- src/otoole/cli.py | 8 ++++++++ src/otoole/preprocess/excel_to_osemosys.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/otoole/cli.py b/src/otoole/cli.py index 28bf9135..498ad52b 100644 --- a/src/otoole/cli.py +++ b/src/otoole/cli.py @@ -158,8 +158,10 @@ def conversion_matrix(args): raise NotImplementedError(msg) elif args.from_format == "excel": + if args.to_format == "csv": generate_csv_from_excel(args.from_path, args.to_path) + elif args.to_format == "datafile": with TemporaryDirectory() as temp_folder: @@ -167,6 +169,12 @@ def conversion_matrix(args): csv_to_datapackage(temp_folder) from_path = os.path.join(temp_folder, "datapackage.json") convert_datapackage_to_datafile(from_path, args.to_path) + + elif args.to_format == "datapackage": + with TemporaryDirectory() as temp_folder: + generate_csv_from_excel(args.from_path, temp_folder) + csv_to_datapackage(temp_folder) + else: raise NotImplementedError(msg) diff --git a/src/otoole/preprocess/excel_to_osemosys.py b/src/otoole/preprocess/excel_to_osemosys.py index 8b7c1fc9..1d91ea30 100644 --- a/src/otoole/preprocess/excel_to_osemosys.py +++ b/src/otoole/preprocess/excel_to_osemosys.py @@ -228,7 +228,7 @@ def read_config(path_to_user_config: str = None) -> Dict: def generate_csv_from_excel(input_workbook, output_folder): - """Generate a folder of CSV files from a spreadsheet + """Generate a folder of narrow, well formatted CSV files from a spreadsheet Arguments ---------