Refactor timestamp handle in HubSpot scripts to improve error messaging on n8n

python/hubspot_audit.py

@@ -243,10 +243,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
             print(
-                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
             sys.exit(1)
+        main(since_ms=since)
     else:
         main()

python/hubspot_billing.py

@@ -445,10 +445,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
             print(
-                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
-            raise SystemExit(1)
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
+            sys.exit(1)
+        main(since_ms=since)
     else:
         main()

python/hubspot_contacts.py

@@ -430,9 +430,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
-            print(f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
+            print(
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
             sys.exit(1)
+        main(since_ms=since)
     else:
         main()

python/hubspot_deals.py

@@ -443,9 +443,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
-            print(f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
+            print(
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
             sys.exit(1)
+        main(since_ms=since)
     else:
         main()

python/hubspot_emails.py

@@ -484,10 +484,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
             print(
-                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
             sys.exit(1)
+        main(since_ms=since)
     else:
         main()

python/hubspot_lineitems.py

@@ -386,9 +386,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
-            print(f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
+            print(
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
             sys.exit(1)
+        main(since_ms=since)
     else:
         main()

python/hubspot_tickets.py

@@ -486,10 +486,12 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
         try:
-            main(since_ms=_parse_cli_arg_to_ms(sys.argv[1]))
+            since = _parse_cli_arg_to_ms(sys.argv[1])
         except Exception as e:
             print(
-                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}")
+                f"Invalid timestamp. Provide epoch ms, ISO-8601, or YYYY-MM-DD. Error: {e}"
+            )
             sys.exit(1)
+        main(since_ms=since)
     else:
         main()