From feea05b7c1fcd12ba8bf33670f4d2c40a773718d Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Wed, 5 Apr 2023 21:55:36 +0200
Subject: Renamed CLI utility to more obvious waterspout-pull

---
 contrib/waterspout-pull.service |  2 +-
 pyproject.toml                  |  2 +-
 waterspout_radar/cli.py         | 18 ------------------
 waterspout_radar/pull.py        | 23 +++++++++++++++++++++++
 4 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 waterspout_radar/cli.py
 create mode 100644 waterspout_radar/pull.py

diff --git a/contrib/waterspout-pull.service b/contrib/waterspout-pull.service
index a212b63..74cebd1 100644
--- a/contrib/waterspout-pull.service
+++ b/contrib/waterspout-pull.service
@@ -3,5 +3,5 @@ Description=Pull data for Waterspout Radar
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/env waterspout-radar -c /etc/waterspout-radar.ini
+ExecStart=/usr/bin/env waterspout-pull -c /etc/waterspout-radar.ini
 User=waterspout
diff --git a/pyproject.toml b/pyproject.toml
index 714518f..167090b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ dynamic=["version"]
 
 
 [project.scripts]
-waterspout-radar="waterspout_radar.cli:main"
+waterspout-pull="waterspout_radar.pull:main"
 
 
 [tool.setuptools]
diff --git a/waterspout_radar/cli.py b/waterspout_radar/cli.py
deleted file mode 100644
index b8fb041..0000000
--- a/waterspout_radar/cli.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import argparse
-
-from . import _config, _radar, _storage
-
-
-def main():
-	parser = argparse.ArgumentParser()
-	parser.add_argument("-c", "--config", help="Overrides configuration file pathname.")
-	args = parser.parse_args()
-	config = _config.load(_config.effective_pathname(args.config))
-	storage = _storage.Storage(config.db)
-	storage.extend(_radar.calculate(config))
-	for prediction in sorted(storage, key=lambda x: (x.time, x.swi)):
-		print(prediction.time, prediction.low_clouds, prediction.swi)
-
-
-if __name__ == "__main__":
-	main()
diff --git a/waterspout_radar/pull.py b/waterspout_radar/pull.py
new file mode 100644
index 0000000..89c569d
--- /dev/null
+++ b/waterspout_radar/pull.py
@@ -0,0 +1,23 @@
+"""
+Pulls weather data, makes predictions and pushes them to persistent storage.
+"""
+
+import argparse
+
+from . import _config, _radar, _storage
+
+
+def main():
+	parser = argparse.ArgumentParser()
+	parser.add_argument("-c", "--config", help="Overrides configuration file pathname.")
+	args = parser.parse_args()
+	config = _config.load(_config.effective_pathname(args.config))
+	storage = _storage.Storage(config.db)
+	predictions = _radar.calculate(config)
+	storage.extend(predictions)
+	for prediction in sorted(predictions, key=lambda x: (x.time, x.swi)):
+		print(prediction.time, prediction.swi)
+
+
+if __name__ == "__main__":
+	main()
-- 
cgit v1.1