1 files changed, 58 insertions, 10 deletions

diff --git a/library.py b/library.py
index dcb4630..0d490a1 100644
--- a/library.py
+++ b/library.py
@@ -23,12 +23,14 @@ def get_grid_data(latitude, longitude):
 
 
 def get_raw_data(grid_id, grid_x, grid_y):
-    raw_data = json.loads(requests.get(f"https://api.weather.gov/gridpoints/{grid_id}/{grid_x},{grid_y}").text)
+    headers = {"User-Agent": "pywttr 0.1"}
+    raw_data = json.loads(requests.get(f"https://api.weather.gov/gridpoints/{grid_id}/{grid_x},{grid_y}", headers=headers).text)
     return raw_data
 
 
 def get_raw_forecast(grid_id, grid_x, grid_y):
-    raw_data = json.loads(requests.get(f"https://api.weather.gov/gridpoints/{grid_id}/{grid_x},{grid_y}/forecast", user_agent="my-test-app").text)
+    headers = {"User-Agent": "pywttr 0.1"}
+    raw_data = json.loads(requests.get(f"https://api.weather.gov/gridpoints/{grid_id}/{grid_x},{grid_y}/forecast", headers=headers).text)
     return raw_data
 
 
@@ -136,11 +138,22 @@ def get_daily_lows(raw_data):
         time_str, duration_str = low["validTime"].split('/')
         time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
         duration = parse_duration(duration_str)
-        daily_lows.append({"time":time,"duration":duration,"low_celc":low_celc,"low_fahr":low_far})
+        daily_lows.append({"time":time,"duration":duration,"low_celc":low_celc,"low_fahr":low_fahr})
 
     return daily_lows
 
 
+def get_daily_forecast(raw_data):
+    daily_forecast_raw = raw_data["properties"]["periods"]
+
+    daily_forecast = []
+    for point in daily_forecast_raw:
+        time_str = point["startTime"]
+        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
+        daily_forecast.append({"time":time, "short_forecast":point["shortForecast"], "detailed_forecast":point["detailedForecast"]})
+    return make_current(set_timezone(daily_forecast))
+    
+
 def get_temperature(raw_data):
     raw_values = raw_data["properties"]["temperature"]["values"]
     ret = []
@@ -334,11 +347,9 @@ def get_hourly_data(raw_data, end_time):
     precip_amount = get_precip_amount(raw_data)
     wind_speed = get_wind_speed(raw_data)
     wind_direction = get_wind_direction(raw_data)
-
-    ret = []
+    ret_list = []
     i = 0
     while i < len(temps) and temps[i]["time"] < end_time:
-
         if i >= len(temps):
             temps.append({"value":"N/A"})
         if i >= len(humidity):
@@ -352,8 +363,6 @@ def get_hourly_data(raw_data, end_time):
         if i >= len(wind_direction):
             wind_direction.append({"value":"N/A"})
 
-
-
         val_dict = { "time": temps[i]["time"],
                      "temp": temps[i]["value_fahr"],
                      "humidity": humidity[i]["value"],
@@ -361,7 +370,46 @@ def get_hourly_data(raw_data, end_time):
                      "precip_amount": precip_amount[i]["value"],
                      "wind_speed": wind_speed[i]["value"],
                      "wind_direction": wind_direction[i]["value"] }
-        ret.append(val_dict)
+        ret_list.append(val_dict)
         i+=1
 
-    return ret
+    return ret_list
+
+
+def get_daily_data(raw_data, raw_forecast, end_time):
+    daily_highs = get_daily_highs(raw_data)
+    daily_lows = get_daily_lows(raw_data)
+    daily_forecasts = get_daily_forecast(raw_forecast)
+    ret_list = []
+    i = 0
+    while i < len(daily_highs) and daily_highs[i]["time"] < end_time:
+        val_dict = { "time": daily_highs[i]["time"],
+                     "high": daily_highs[i]["high_fahr"],
+                     "low": daily_lows[i]["low_fahr"],
+                     "short_forecast_am": daily_forecasts[i]["short_forecast"],
+                     "detailed_forecast_am": daily_forecasts[i]["detailed_forecast"],
+                     "short_forecast_pm": daily_forecasts[i+1]["short_forecast"],
+                     "detailed_forecast_pm": daily_forecasts[i+1]["detailed_forecast"] }
+        ret_list.append(val_dict)
+        i+=1
+    return ret_list
+
+
+def hourly_forecast(raw_data, days):
+    init_time = get_current_rounded_time()
+    if days > 0:
+        delta = datetime.timedelta(days=days)
+    else:
+        delta = datetime.timedelta(hours=(24-init_time.hour))
+    end_time = init_time + delta
+    return get_hourly_data(raw_data, end_time)
+
+
+def daily_forecast(raw_data, raw_forecast, days):
+    init_time = get_current_rounded_time()
+    if days > 0:
+        delta = datetime.timedelta(days=days)
+    else:
+        delta = datetime.timedelta(days=5)
+    end_time = init_time + delta
+    return get_daily_data(raw_data, raw_forecast, end_time)