From c5b532b6183bf252a93706c6f82aa4401cc41e38 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Thu, 2 Dec 2021 18:54:56 +0100
Subject: [PATCH] Refactor nomie data ingestion

---
 habitmove/nomie.py | 8 ++++++++
 run.py             | 9 +++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/habitmove/nomie.py b/habitmove/nomie.py
index beef225..76a646a 100644
--- a/habitmove/nomie.py
+++ b/habitmove/nomie.py
@@ -33,3 +33,11 @@ def verify_continue(data):
     if not confirmation_question("Do you want to continue?", default_no=False):
         print("Aborted.")
         exit(0)
+
+
+# return the data belonging to nomie
+def get_data(file, interactive):
+    nomie_data = load_file(file)
+    if interactive:
+        verify_continue(nomie_data)
+    return nomie_data
diff --git a/run.py b/run.py
index 9a80be4..9b77a43 100755
--- a/run.py
+++ b/run.py
@@ -22,12 +22,9 @@ def migrate(trackers, events):
 
 
 def main():
-    # load nomie json
-    nomie_data = nomie.load_file(sys.argv[1])
-    nomie.verify_continue(nomie_data)
-    trackers = nomie_data["trackers"]
-    events = nomie_data["events"]
-    migrate(trackers, events)
+    file = sys.argv[1]
+    data = nomie.get_data(file, True)
+    migrate(data["trackers"], data["events"])
 
 
 if __name__ == "__main__":