diff --git a/earthquakes.py b/earthquakes.py index 5618968..a122bb5 100644 --- a/earthquakes.py +++ b/earthquakes.py @@ -137,7 +137,7 @@ def main(): fname = _get_usr_input("Nome do ficheiro a guardar? ") if fname is None: fname = "valores.json" - guardar_json(db, fname) + utils.save_as_json(db, fname, EVENT_COLS, STATION_COLS) else: retInfo = "Base de dados não encontrada!" diff --git a/utils/utils.py b/utils/utils.py index 2bca49b..1e04fd7 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -9,9 +9,10 @@ from typing import Any import pandas as pd -def save_as_json(info: dict[str, Any]) -> bool: - with open("test.json", "w") as fp: - json.dump(info, fp) +def save_as_json(df: pd.DataFrame, fname, event_cols, station_cols) -> bool: + info = create_dict_struct(df, event_cols, station_cols) + with open(fname, "w") as fp: + json.dump(info, fp, indent=4) return True