From 7b929b3b841362e91adf8375dda17ff6313d0901 Mon Sep 17 00:00:00 2001
From: Jake Pullen <hello@jake-is.me>
Date: Fri, 12 Dec 2025 19:50:04 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fixed=20time=20calculatio?=
 =?UTF-8?q?ns=20for=20ETA=20&=20Completion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py        | 15 +++++++++++----
 pyproject.toml |  2 +-
 uv.lock        |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 1497723..4a52b93 100644
--- a/main.py
+++ b/main.py
@@ -167,13 +167,13 @@ if __name__ == "__main__":
 
                     completed_count += 1
                     if completed_count % 100 == 0:
-                        elapsed_time = time.time() - start
-                        rate_per_second = completed_count / elapsed_time
-
                         files_processed_previous = i * files_per_tar
                         files_processed_so_far = (
                             files_processed_previous + completed_count
                         )
+                        
+                        elapsed_time = time.time() - start
+                        rate_per_second = files_processed_so_far / elapsed_time
 
                         remaining_files = estimated_total_files - files_processed_so_far
 
@@ -213,4 +213,11 @@ if __name__ == "__main__":
     end = time.time()
     elapsed_time = end - start
 
-    logging.info(f"All Complete total time {elapsed_time:.2f} seconds")
+    if elapsed_time < 60:
+        elapsed_time_str = f"{int(elapsed_time)}s"
+    elif elapsed_time < 3600:
+        elapsed_time_str = f"{int(elapsed_time // 60)}m {int(elapsed_time % 60)}s"
+    else:
+        elapsed_time_str = f"{int(elapsed_time // 3600)}h {int((elapsed_time % 3600) // 60)}m"
+
+    logging.info(f"All Complete total time {elapsed_time_str}")
diff --git a/pyproject.toml b/pyproject.toml
index 2db3550..46833a1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "met-office"
-version = "1.3.0"
+version = "1.3.1"
 description = "Convert .dat nimrod files to .asc files"
 readme = "README.md"
 requires-python = ">=3.14"
diff --git a/uv.lock b/uv.lock
index 1a98d28..6d8e156 100644
--- a/uv.lock
+++ b/uv.lock
@@ -4,7 +4,7 @@ requires-python = ">=3.14"
 
 [[package]]
 name = "met-office"
-version = "1.3.0"
+version = "1.3.1"
 source = { virtual = "." }
 dependencies = [
     { name = "numpy" },