Fix corrupted wave art on Windows and clean up codebase

src/art.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+import sys
 
 logger = logging.getLogger(__name__)
 
@@ -71,9 +72,27 @@ def print_wave(show_wave, show_large_wave, color):
         color = "blue"
 
     if show_large_wave:
-        print(
-            colors[color]
-            + """
+        if sys.platform == "win32" and sys.stdout.encoding.lower() != "utf-8":
+            print(
+                colors[color]
+                + """
+           .-``'.
+         .`   .`
+     _.-'     '._
+   .'            `.
+  /                \\
+ |                  |
+ |                  |
+  \\                /
+   `._          _.'
+      `-......-`
+"""
+                + colors["end"]
+            )
+        else:
+            print(
+                colors[color]
+                + """
 ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⣶⠾⠿⠿⠯⣷⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⣾⠛⠁⠀⠀⠀⠀⠀⠀⠈⢻⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⠿⠁⠀⠀⠀⢀⣤⣾⣟⣛⣛⣶⣬⣿⣆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
@@ -84,8 +103,8 @@ def print_wave(show_wave, show_large_wave, color):
 ⢀⣄⣠⣶⣿⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠓⠚⠋⠉⠀⠀⠀⠀⠀⠀⠈⠛⡛⡻⠿⠿⠙⠓⢒⣺⡿⠋⠁
 ⠉⠉⠉⠛⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠁⠀
 """
-            + colors["end"]
-        )
+                + colors["end"]
+            )
     elif show_wave:
         print(
             colors[color]

src/cli.py

@@ -103,32 +103,30 @@ def _build_args_string(ns):
         tokens.append("metric")
     if ns.imperial:
         tokens.append("imperial")
-    flag_map = {
-        "json": "json",
-        "gpt": "gpt",
-        "hide_wave": "hide_wave",
-        "hide_uv": "hide_uv",
-        "hide_height": "hide_height",
-        "hide_direction": "hide_direction",
-        "hide_period": "hide_period",
-        "hide_location": "hide_location",
-        "hide_date": "hide_date",
-        "show_large_wave": "show_large_wave",
-        "show_past_uv": "show_past_uv",
-        "show_height_history": "show_height_history",
-        "show_direction_history": "show_direction_history",
-        "show_period_history": "show_period_history",
-        "show_air_temp": "show_air_temp",
-        "show_wind_speed": "show_wind_speed",
-        "show_wind_direction": "show_wind_direction",
-        "show_rain_sum": "show_rain_sum",
-        "show_precipitation_prob": "show_precipitation_prob",
-        "show_cloud_cover": "show_cloud_cover",
-        "show_visibility": "show_visibility",
-    }
-    for attr, token in flag_map.items():
-        if getattr(ns, attr, False):
-            tokens.append(token)
+    flags = [
+        "json",
+        "gpt",
+        "hide_wave",
+        "hide_uv",
+        "hide_height",
+        "hide_direction",
+        "hide_period",
+        "hide_location",
+        "hide_date",
+        "show_large_wave",
+        "show_past_uv",
+        "show_height_history",
+        "show_direction_history",
+        "show_period_history",
+        "show_air_temp",
+        "show_wind_speed",
+        "show_wind_direction",
+        "show_rain_sum",
+        "show_precipitation_prob",
+        "show_cloud_cover",
+        "show_visibility",
+    ]
+    tokens.extend([flag for flag in flags if getattr(ns, flag, False)])
     return ",".join(tokens)
 
 

src/helper.py

@@ -203,6 +203,16 @@ def print_location(city, show_city):
         print("\n")
 
 
+def _print_mapped_data(mappings, arguments_dict, data_dict):
+    """
+    Helper function to print mapped data from a dictionary
+    if the argument is set.
+    """
+    for arg_key, data_key, label in mappings:
+        if arguments_dict.get(arg_key) and data_key in data_dict:
+            print(f"{label}{data_dict[data_key]}")
+
+
 def print_ocean_data(arguments_dict, ocean_data_dict):
     """
     Prints ocean data (height, wave direction, period, etc).
@@ -242,9 +252,7 @@ def print_ocean_data(arguments_dict, ocean_data_dict):
         ("show_sea_temp", "Sea Surface Temperature", "Sea Surface Temp: "),
     ]
 
-    for arg_key, data_key, label in mappings:
-        if arguments_dict.get(arg_key) and data_key in ocean_data_dict:
-            print(f"{label}{ocean_data_dict[data_key]}")
+    _print_mapped_data(mappings, arguments_dict, ocean_data_dict)
 
     if arguments_dict.get("show_tide") and ocean_data_dict.get("Tide"):
         tide = ocean_data_dict["Tide"]
@@ -292,14 +300,18 @@ def print_forecast(ocean, forecast):
     ]
 
     for day in range(ocean["forecast_days"]):
-        for arg_key, data_key, label in mappings:
-            if ocean[arg_key]:
+        # Extract day's data into a temporary dictionary
+        day_data = {}
+        for _, data_key, _ in mappings:
+            if data_key in forecast:
                 try:
-                    data = forecast[data_key][day]
-                    formatted = round(float(data), ocean["decimal"])
-                    print(f"{label}{formatted}")
+                    raw = forecast[data_key][day]
+                    formatted = round(float(raw), ocean["decimal"])
                 except TypeError:
-                    print(f"{label}{forecast[data_key][day]}")
+                    formatted = forecast[data_key][day]
+                day_data[data_key] = formatted
+
+        _print_mapped_data(mappings, ocean, day_data)
         print("\n")