weathergrabber 0.0.10__py3-none-any.whl → 0.0.11__py3-none-any.whl

weathergrabber/__init__.py

@@ -4,7 +4,7 @@ from .core import main
 from .cli import main_cli
 
 __all__ = ["main", "main_cli"]
-__version__ = "0.0.10"
+__version__ = "0.0.11"
 
 def get_version():
     return __version__

weathergrabber/application/services/extract_current_conditions_service.py

@@ -1,4 +1,5 @@
 import logging
+import json
 from pyquery import PyQuery
 from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
 from weathergrabber.domain.entities.city_location import CityLocation
@@ -16,12 +17,12 @@ class ExtractCurrentConditionsService:
 
         data = PyQuery(weather_data('div[data-testid="CurrentConditionsContainer"]'))
     
-        city_location_data = data.find('h1').text() #'Nova Friburgo, Rio de Janeiro, Brazil'
+    
         timestamp_data = data.find('span[class*="timestamp"]').text() # 'As of 8:01 pm GMT-03:00'
         icon_data = data.find('svg[class*="wxIcon"]').attr('name') # 'partly-cloudy-night'
         temp_day_night = data.find('div[class*="tempHiLoValue"]').text() #'Day\xa063°\xa0•\xa0Night\xa046°'
 
-        city_location = CityLocation.from_string(city_location_data)
+        city_location = self.__location(weather_data)
         timestamp = Timestamp.from_string(timestamp_data)
         temperature = data.find('span[class*="tempValue"]').text() # '48°'
         icon = WeatherIconEnum.from_name(icon_data)
@@ -39,4 +40,15 @@ class ExtractCurrentConditionsService:
 
         self.logger.debug(f"Extracted current conditions: {current_conditions}")
 
-        return current_conditions
+        return current_conditions
+    
+    def __location(self, weather_data: PyQuery) -> CityLocation:
+        location_str = weather_data.find('script[type="application/ld+json"]').contents().eq(2).text()
+        location_data = json.loads(location_str)
+        address = location_data.get("address", {})
+        
+        return CityLocation(
+            city=address.get("addressLocality"),
+            state_province=address.get("addressRegion"),
+            country=address.get("addressCountry")
+        )

{weathergrabber-0.0.10.dist-info → weathergrabber-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.10
+Version: 0.0.11
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
 License: MIT

{weathergrabber-0.0.10.dist-info → weathergrabber-0.0.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-weathergrabber/__init__.py,sha256=Va0sMEDstFkxITOxgjKch6t71YsUCU7gPI_1Pqu0Ngw,217
+weathergrabber/__init__.py,sha256=jyad_PXvxFjRMqfok4rwKL7ULoOSuH6Cwf7SJef7XIE,217
 weathergrabber/__main__.py,sha256=yYL-jc4kVHqaYVADzjKZfmCN2mziRofsXgnzrECbGDo,68
 weathergrabber/cli.py,sha256=oGHgkWWC3wnMDuisV2XgImQpQRHWNUL_yoqNhnJT2V4,2474
 weathergrabber/core.py,sha256=ARQrqtLI-UMqJVS_T2l16dpANXLj-3bxctui2RGChpA,1618
@@ -11,7 +11,7 @@ weathergrabber/adapter/tty/statistics_tty.py,sha256=6ES5AsnCAnXl6Bp_8tyqz2_C2j92
 weathergrabber/adapter/tty/waybar_tty.py,sha256=vGErv9NshqPVzP2eh-O3govZRumUM-VXiwWRBsiRGzo,6191
 weathergrabber/application/weathergrabber_application.py,sha256=yFbo920vGLi6TreDMw6n1bZ-wy1lcBJewKurP0qKfCA,5190
 weathergrabber/application/services/extract_aqi_service.py,sha256=OIDbdXankKCn3LrxUsZkAlpf0tIgniFxuGiSDviL5UM,1099
-weathergrabber/application/services/extract_current_conditions_service.py,sha256=lUo7meqt5SMCuZTKEjVW-iWYpxsYksvsDOGZdHD57ac,1883
+weathergrabber/application/services/extract_current_conditions_service.py,sha256=2LUkHwF8zS9xQg-TjchbdK8_4DR8KmZb80lG_57e7ig,2269
 weathergrabber/application/services/extract_daily_forecast_oldstyle_service.py,sha256=HPODxFKinUIhZrE6O-1PyaKavWtp1go4Xp5yY2KnC10,2226
 weathergrabber/application/services/extract_daily_forecast_service.py,sha256=tJ7Lvi3bEiAT1cN6byoq4nx00BG91fG16iXEhwT0MDc,2762
 weathergrabber/application/services/extract_health_activities_service.py,sha256=efrJMsVXEGTURGqOTmlbD973eF00vrX53tQqwbtytmo,1023
@@ -72,9 +72,9 @@ weathergrabber/domain/entities/today_details.py,sha256=EUlV7xerYw5QhEsBfvO5m6-9G
 weathergrabber/domain/entities/uv_index.py,sha256=7XalamfjJdVSqo4x7G4JVf_HJtrPJxO1BpbvmAfBhnw,1481
 weathergrabber/domain/entities/weather_icon_enum.py,sha256=2JqK3MJEAdbmL_jqzJUw0V31qF9EXJFq6zF1J653eRU,4165
 weathergrabber/domain/entities/wind.py,sha256=wTDz3X1rYsnw_eNoDi1miwaomxwhiJkY_q6xrdZtLak,789
-weathergrabber-0.0.10.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
-weathergrabber-0.0.10.dist-info/METADATA,sha256=jUtmerghLvf8yOG2qKbenOOIRrq8keEidosBoy1JERA,7474
-weathergrabber-0.0.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-weathergrabber-0.0.10.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
-weathergrabber-0.0.10.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
-weathergrabber-0.0.10.dist-info/RECORD,,
+weathergrabber-0.0.11.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
+weathergrabber-0.0.11.dist-info/METADATA,sha256=q0ESC-yO8eh_aNuDF_ASFuXg6GZPeG1ryX9qawdA-kk,7474
+weathergrabber-0.0.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+weathergrabber-0.0.11.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
+weathergrabber-0.0.11.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
+weathergrabber-0.0.11.dist-info/RECORD,,