Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commited26165

Browse files
committed
fix(weather): improve alert handling in WeatherWidget
Refactor alert display logic to ensure that alerts are only shown when all necessary data is available. This includes checks for alert title, description, and expiration date to prevent potential errors or empty displays.
1 parentf6983ba commited26165

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

‎src/core/widgets/yasb/weather.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,19 @@ def _popup_card(self):
122122
today_label1.setProperty("class","label")
123123
today_label1.setAlignment(Qt.AlignmentFlag.AlignCenter)
124124

125-
today_label2=QLabel(f"{self.weather_data['{alert_title}']}<br>Alert expires{self.weather_data['{alert_end_date}']}<br>{self.weather_data['{alert_desc}']}")
125+
today_label2=QLabel(
126+
f"{self.weather_data['{alert_title}']}"
127+
f"{'<br>Alert expires '+self.weather_data['{alert_end_date}']ifself.weather_data['{alert_end_date}']else''}"
128+
f"<br>{self.weather_data['{alert_desc}']}"
129+
)
126130
today_label2.setProperty("class","label arert")
127131
today_label2.setAlignment(Qt.AlignmentFlag.AlignCenter)
128132
today_label2.setWordWrap(True)
129133

130134

131135
layout_today.addWidget(today_label0)
132136
layout_today.addWidget(today_label1)
133-
ifself._show_alertsandself.weather_data['{alert_title}']andself.weather_data['{alert_desc}']andself.weather_data['{alert_end_date}']:
137+
ifself._show_alertsandself.weather_data['{alert_title}']andself.weather_data['{alert_desc}']:
134138
layout_today.addWidget(today_label2)
135139

136140
# Create frames for each day
@@ -446,9 +450,9 @@ def get_weather_data(self, api_url):
446450
'{day2_icon}':f'http:{forecast2["day"]["condition"]["icon"]}',
447451

448452
# Alerts
449-
'{alert_title}':alerts['alert'][0]['headline']ifalerts['alert']elseNone,
450-
'{alert_desc}':alerts['alert'][0]['desc']ifalerts['alert']elseNone,
451-
'{alert_end_date}':self._format_alert_datetime(alerts['alert'][0]['expires'])ifalerts['alert']elseNone,
453+
'{alert_title}':alerts['alert'][0]['headline']ifalerts['alert']andalerts['alert'][0]['headline']elseNone,
454+
'{alert_desc}':alerts['alert'][0]['desc']ifalerts['alert']andalerts['alert'][0]['desc']elseNone,
455+
'{alert_end_date}':self._format_alert_datetime(alerts['alert'][0]['expires'])ifalerts['alert']andalerts['alert'][0]['expires']elseNone,
452456
}
453457
except (urllib.error.URLError,json.JSONDecodeError)ase:
454458
logging.error(f"Error fetching weather data:{e}")

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp