Commit e72c38b5 authored by Florian Müllner's avatar Florian Müllner

dateMenu: Move weather forecast validity check

Commit b779f6f7 added a check to filter out invalid weather forecasts.

However the check is currently done when creating UI for the forecasts,
which means we end up with fewer forecasts than we could display if any
forecasts are invalid.

We can avoid that issue by checking the validity while collecting the
forecasts, so do that instead.

GNOME/gnome-shell#1927
parent f6f373b0
......@@ -315,7 +315,10 @@ class WeatherSection extends St.Button {
let current = GLib.DateTime.new_from_unix_local(0);
let infos = [];
for (let i = 0; i < forecasts.length; i++) {
let [ok_, timestamp] = forecasts[i].get_value_update();
const [valid, timestamp] = forecasts[i].get_value_update();
if (!valid || timestamp === 0)
continue; // 0 means 'never updated'
const datetime = GLib.DateTime.new_from_unix_local(timestamp);
if (now.difference(datetime) > 0)
continue; // Ignore earlier forecasts
......@@ -340,9 +343,7 @@ class WeatherSection extends St.Button {
let col = 0;
infos.forEach(fc => {
const [valid, timestamp] = fc.get_value_update();
if (!valid || timestamp === 0)
return; // 0 means 'never updated'
const [valid_, timestamp] = fc.get_value_update();
let timeStr = Util.formatTime(new Date(timestamp * 1000), {
timeOnly: true,
ampm: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment