some code cleanup

Author: amit9838

src/Models.py

@@ -1,6 +1,4 @@
 # Models for All weather data data
-import time
-
 
 class CurrentWeather:
     total_instances = 0

src/__init__.py

@@ -21,7 +21,7 @@ def current_air_pollution(latitude: float, longitude: float, **kwargs):
         except requests.exceptions.RequestException as e:
             print(f"Error: {e}")
 
-    def _get_current_air_pollution(self,lat,lon):
+    def _get_current_air_pollution(self, lat, lon):
         current_args = [
             "european_aqi",
             "us_aqi",

src/backendAirPollution.py

@@ -1,48 +1,48 @@
-from typing import List
 import requests
 import datetime
 
 from gi.repository import Gio
 
 
-
 base_url = "https://api.open-meteo.com/v1/forecast"
 
-class Weather():
+
+class Weather:
     """
     See Documentation at: https://open-meteo.com/en/docs
     """
+
     def __init__(self) -> None:
-        global settings,measurement_type,temperature_unit,wind_speed_unit
+        global settings, measurement_type, temperature_unit, wind_speed_unit
         settings = Gio.Settings(schema_id="io.github.amit9838.weather")
-        measurement_type = settings.get_string('measure-type')
+        measurement_type = settings.get_string("measure-type")
         if measurement_type == "imperial":
             temperature_unit = "fahrenheit"
             wind_speed_unit = "mph"
+
     # Current Weather =============================================
     @staticmethod
     def current_weather(latitude: float, longitude: float, **kwargs):
-
         url = base_url + f"?latitude={latitude}&longitude={longitude}"
 
         # Check for kwargs keyword parameters
-        if 'current' in kwargs:
-            current_fields = ",".join(kwargs.get('current'))
-            url = url+f"&current={current_fields}"
-        
+        if "current" in kwargs:
+            current_fields = ",".join(kwargs.get("current"))
+            url = url + f"&current={current_fields}"
+
         if measurement_type == "imperial":
             url += f"&temperature_unit={temperature_unit}&wind_speed_unit={wind_speed_unit}"
 
         try:
-            url = url+f"&timeformat=unixtime"
+            url = url + f"&timeformat=unixtime"
             response = requests.get(url)
             response.raise_for_status()  # Raise an exception if the request was unsuccessful
             data = response.json()
             return data
         except requests.exceptions.RequestException as e:
             print(f"Error: {e}")
 
-    def _get_current_weather(self,lat,lon):
+    def _get_current_weather(self, lat, lon):
         current_args = [
             "temperature_2m",
             "relativehumidity_2m",
@@ -53,85 +53,83 @@ def _get_current_weather(self,lat,lon):
             "weathercode",
             "surface_pressure",
             "windspeed_10m",
-            "winddirection_10m"
+            "winddirection_10m",
         ]
-        return self.current_weather(lat,lon,current = current_args)
-
+        return self.current_weather(lat, lon, current=current_args)
 
     # Hourly Forecast ==============================================
     @staticmethod
     def forecast_hourly(latitude: float, longitude: float, **kwargs):
-
         url = base_url + f"?latitude={latitude}&longitude={longitude}"
 
         # Check for kwargs keyword parameters
-        if 'hourly' in kwargs:
-            hourly_fields = ",".join(kwargs.get('hourly'))
-            url = url+f"&hourly={hourly_fields}"
-        
+        if "hourly" in kwargs:
+            hourly_fields = ",".join(kwargs.get("hourly"))
+            url = url + f"&hourly={hourly_fields}"
+
         if measurement_type == "imperial":
             url += f"&temperature_unit={temperature_unit}&wind_speed_unit={wind_speed_unit}"
 
         try:
-            url = url+f"&timeformat=unixtime"
+            url = url + f"&timeformat=unixtime"
             response = requests.get(url)
             response.raise_for_status()  # Raise an exception if the request was unsuccessful
             data = response.json()
             return data
         except requests.exceptions.RequestException as e:
             print(f"Error: {e}")
 
-
-    def _get_hourly_forecast(self,lat,lon):
+    def _get_hourly_forecast(self, lat, lon):
         hourly_args = [
-            'temperature_2m',
-            'relativehumidity_2m',
-            'dewpoint_2m',
-            'apparent_temperature',
-            'weathercode',
-            'precipitation',
-            'surface_pressure',
-            'visibility',
-            'windspeed_10m',
-            'wind_direction_10m',
-            'uv_index',
-            'is_day'
+            "temperature_2m",
+            "relativehumidity_2m",
+            "dewpoint_2m",
+            "apparent_temperature",
+            "weathercode",
+            "precipitation",
+            "surface_pressure",
+            "visibility",
+            "windspeed_10m",
+            "wind_direction_10m",
+            "uv_index",
+            "is_day",
         ]
 
         today = datetime.datetime.today().date()
-        tomorrow = today+datetime.timedelta(days=1)
-        return self.forecast_hourly(lat, lon,hourly=hourly_args,start_date=today,end_date=tomorrow)
-
+        tomorrow = today + datetime.timedelta(days=1)
+        return self.forecast_hourly(
+            lat, lon, hourly=hourly_args, start_date=today, end_date=tomorrow
+        )
 
     # Forecast daily ====================================================
     @staticmethod
     def forecast_daily(latitude: float, longitude: float, **kwargs):
         url = base_url + f"?latitude={latitude}&longitude={longitude}"
-        if 'daily' in kwargs:
-            hourly_fields = ",".join(kwargs.get('daily'))
-            url = url+f"&daily={hourly_fields}"
+        if "daily" in kwargs:
+            hourly_fields = ",".join(kwargs.get("daily"))
+            url = url + f"&daily={hourly_fields}"
 
-        if 'timezone' in kwargs:
-            url = url+f"&timezone={kwargs.get('timezone')}"
-        if 'start_date' in kwargs:
-            url = url+f"&start_date={kwargs.get('start_date')}"
+        if "timezone" in kwargs:
+            url = url + f"&timezone={kwargs.get('timezone')}"
+        if "start_date" in kwargs:
+            url = url + f"&start_date={kwargs.get('start_date')}"
 
-        if 'end_date' in kwargs:
-            url = url+f"&end_date={kwargs.get('end_date')}"
+        if "end_date" in kwargs:
+            url = url + f"&end_date={kwargs.get('end_date')}"
 
         if measurement_type == "imperial":
             url += f"&temperature_unit={temperature_unit}&wind_speed_unit={wind_speed_unit}"
 
         try:
-            url = url+f"&timeformat=unixtime"
+            url = url + f"&timeformat=unixtime"
             response = requests.get(url)
             response.raise_for_status()  # Raise an exception if the request was unsuccessful
             data = response.json()
             return data
         except requests.exceptions.RequestException as e:
             print(f"Error: {e}")
 
-    def _get_daily_forecast(self,lat,lon):
+    def _get_daily_forecast(self, lat, lon):
         daily_args = [
             "weathercode",
             "temperature_2m_max",
@@ -143,4 +141,4 @@ def _get_daily_forecast(self,lat,lon):
             "windspeed_10m_max",
         ]
 
-        return self.forecast_daily(lat,lon,daily=daily_args,timezone="GMT")
+        return self.forecast_daily(lat, lon, daily=daily_args, timezone="GMT")

src/backendWeather.py

@@ -1,6 +1,6 @@
 # main.py
 #
-# Copyright 2023 Amit
+# Copyright 2024 Amit
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/main.py

@@ -28,7 +28,6 @@ configure_file(
 
 
 weather_sources = [
-  '__init__.py',
   'main.py',
   'weather.py',
   'weatherData.py',

src/meson.build

@@ -3,15 +3,3 @@
 def get_measurement_type():
         settings = Gio.Settings.new("io.github.amit9838.weather")
         return settings.get_string("measure-type")
-
-# Units and measurements
-measurements = {
-                "metric":{"temp_unit":"°C",
-                          "speed_unit":'km/h',"speed_mul":3.6,   # convert speed from m/s to km/h
-                          "dist_unit":'km',"dist_mul":0.001
-                        },
-                "imperial":{"temp_unit":"°F",
-                            "speed_unit":'mph',"speed_mul":1,  #speed miles/hr
-                            "dist_unit":'miles',"dist_mul":0.0006213712,
-                        }
-                }

src/units.py

@@ -2,20 +2,12 @@
 import socket
 import json
 from datetime import datetime, timedelta, timezone
-from gi.repository import Adw,Gio
+from gi.repository import Adw, Gio
 
 current_weather_data = None
 air_pollution_data = None
 forecast_weather_data = None
 
-def get_weather_data():
-    return current_weather_data,air_pollution_data,forecast_weather_data
-
-def set_weather_data(current,air_pollution,forecast):
-    global current_weather_data, air_pollution_data,forecast_weather_data
-    current_weather_data = current
-    air_pollution_data = air_pollution
-    forecast_weather_data = forecast
 
 def check_internet_connection():
     has_active_internet = False
@@ -26,21 +18,26 @@ def check_internet_connection():
     except OSError:
         return has_active_internet
 
+
 def get_selected_city_coords():
     settings = Gio.Settings.new("io.github.amit9838.weather")
-    selected_city = int(str(settings.get_value('selected-city')))
-    added_cities = list(settings.get_value('added-cities'))
-    city_loc = added_cities[selected_city].split(',')
-    return city_loc[-2],city_loc[-1]  #latitude,longitude
+    selected_city = int(str(settings.get_value("selected-city")))
+    added_cities = list(settings.get_value("added-cities"))
+    city_loc = added_cities[selected_city].split(",")
+    return city_loc[-2], city_loc[-1]  # latitude,longitude
+
 
-def create_toast(text,priority=0):
+def create_toast(text, priority=0):
     toast = Adw.Toast.new(text)
     toast.set_priority(Adw.ToastPriority(priority))
     return toast
 
+
 def convert_to_local_time(timestamp, timezone_stamp):
-    hour_offset_from_utc = (timezone_stamp)/3600
-    return datetime.fromtimestamp(timestamp,tz=timezone.utc) + timedelta(hours=hour_offset_from_utc)
+    hour_offset_from_utc = (timezone_stamp) / 3600
+    return datetime.fromtimestamp(timestamp, tz=timezone.utc) + timedelta(
+        hours=hour_offset_from_utc
+    )
 
 
 def get_cords():
@@ -60,28 +57,28 @@ def get_my_tz_offset_from_utc():
         return f"Error: {str(e)}"
 
 
-def get_tz_offset_by_cord(lat,lon):
+def get_tz_offset_by_cord(lat, lon):
     url = f"https://api.geotimezone.com/public/timezone?latitude={lat}&longitude={lon}"
 
     res = requests.get(url)
     if res.status_code != 200:
         return 0
-    
+
     res = json.loads(res.text)
     if res.get("offset") is None:
         return 0
-    
+
     offset_arr = res.get("offset")[3:].split(":")
     offset_arr = [int(x) for x in offset_arr]
-    epoch_hr = abs(offset_arr[0])*3600
+    epoch_hr = abs(offset_arr[0]) * 3600
     epoch_s = 0
-    
+
     if len(offset_arr) > 1:
-        epoch_s = offset_arr[1]*60
-        
-    epoch_offset = epoch_hr+epoch_s
+        epoch_s = offset_arr[1] * 60
+
+    epoch_offset = epoch_hr + epoch_s
 
     if offset_arr[0] < 0:
         epoch_offset *= -1
-    
+
     return epoch_offset

src/utils.py

@@ -2,7 +2,7 @@
 
 # weather.in
 #
-# Copyright 2023 Amit
+# Copyright 2024 Amit
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/weather.in

@@ -4,7 +4,7 @@
 
 gi.require_version("Gtk", "4.0")
 gi.require_version("Adw", "1")
-from gi.repository import Gtk, Adw, Gio, GLib
+from gi.repository import Gtk, Adw, Gio
 
 # module import
 from .utils import create_toast,check_internet_connection
@@ -123,8 +123,6 @@ def show_loader(self):
         container_loader.append(loader_label)
 
         loader.start()
-        # loader = Gtk.Label(label=f"Loading…")
-        # loader.set_css_classes(["text-1", "bold-2"])
         loader.set_hexpand(True)
         loader.set_vexpand(True)
         self.main_stack.add_named(container_loader, "loader")
@@ -211,8 +209,6 @@ def get_weather(self,reload_type=None,title = ""):
             self.settings.reset('added-cities')
             self.settings.reset('selected-city')
 
-
-
         child = self.main_stack.get_child_by_name('main_grid')
         if child is not None:
             self.main_stack.remove(child)
@@ -317,7 +313,6 @@ def _refresh_weather(self,widget):
             thread.start()
 
 
-
     # ============= Menu buttom methods ==============
     def _on_about_clicked(self, *args, **kwargs ):
         AboutWindow(application)

src/weather.py

@@ -5,7 +5,7 @@
 
 def AboutWindow(parent,*args):
         dialog = Adw.AboutWindow.new()
-        dialog.set_application_name(_("Weather"))
+        dialog.set_application_name("Weather")
         dialog.set_application_icon("io.github.amit9838.weather")
         dialog.set_version("1.0.1")
         dialog.set_developer_name("Amit Chaudhary")
@@ -14,7 +14,7 @@ def AboutWindow(parent,*args):
         dialog.set_website("https://amit9838.github.io/weather/")
         dialog.set_issue_url("https://github.com/amit9838/weather/issues")
         # dialog.add_credit_section("Contributors", ["name url"])
-        dialog.set_copyright(_("Copyright © 2023 Weather Developers"))
+        dialog.set_copyright(_("Copyright © 2024 Weather Developers"))
         dialog.set_developers(["Amit Chaudhary"])
         # Translators: Please enter your credits here. (format: "Name https://example.com" or "Name <email@example.com>", no quotes)
         dialog.set_translator_credits(_("translator_credits"))