jenna
/
gnome-shell-extension-openweather
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use different timers to update actual weather and forecast (save bandwidth on owm-server); minimal update interval is 10 min

Browse Source
openweathermap_3.6
Jens Lody 11 years ago
parent a297a604c9
commit e21aa6b869
3 changed files with 75 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      data/org.gnome.shell.extensions.weather.gschema.xml.in
  2. 62
      src/extension.js
  3. 25
      src/prefs.js

10
data/org.gnome.shell.extensions.weather.gschema.xml.in
Unescape View File

@ -84,9 +84,13 @@
<default>'center'</default> <default>'center'</default>
<_summary>Position in Panel</_summary> <_summary>Position in Panel</_summary>
</key> </key>
<key name="refresh-interval" type="i"> <key name="refresh-interval-current" type="i">
<default>300</default> <default>600</default>
<_summary>Refresh interval</_summary> <_summary>Refresh interval (actual weather)</_summary>
</key>
<key name="refresh-interval-forecast" type="i">
<default>3600</default>
<_summary>Refresh interval (forecast)</_summary>
</key> </key>
<key name="center-forecast" type="b"> <key name="center-forecast" type="b">
<default>false</default> <default>false</default>

62
src/extension.js
Unescape View File

@ -67,7 +67,8 @@ const WEATHER_USE_SYMBOLIC_ICONS_KEY = 'use-symbolic-icons';
const WEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel'; const WEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel';
const WEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel'; const WEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel';
const WEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel'; const WEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel';
const WEATHER_REFRESH_INTERVAL = 'refresh-interval'; const WEATHER_REFRESH_INTERVAL_CURRENT = 'refresh-interval-current';
const WEATHER_REFRESH_INTERVAL_FORECAST = 'refresh-interval-forecast';
const WEATHER_CENTER_FORECAST_KEY = 'center-forecast'; const WEATHER_CENTER_FORECAST_KEY = 'center-forecast';
const WEATHER_DAYS_FORECAST = 'days-forecast'; const WEATHER_DAYS_FORECAST = 'days-forecast';
@ -235,7 +236,8 @@ const WeatherMenuButton = new Lang.Class({
let item = new PopupMenu.PopupMenuItem(_("Reload Weather Information")); let item = new PopupMenu.PopupMenuItem(_("Reload Weather Information"));
item.connect('activate', Lang.bind(this, function() { item.connect('activate', Lang.bind(this, function() {
this.refreshWeather(false); this.refreshWeatherCurrent(false);
this.refreshWeatherForecast(false);
})); }));
this.menu.addMenuItem(item); this.menu.addMenuItem(item);
@ -250,7 +252,8 @@ const WeatherMenuButton = new Lang.Class({
this.rebuildFutureWeatherUi(); this.rebuildFutureWeatherUi();
// Show weather // Show weather
this.refreshWeather(true); this.refreshWeatherCurrent(true);
this.refreshWeatherForecast(true);
this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged)); this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
}, },
@ -275,7 +278,8 @@ const WeatherMenuButton = new Lang.Class({
this._settings = Convenience.getSettings(WEATHER_SETTINGS_SCHEMA); this._settings = Convenience.getSettings(WEATHER_SETTINGS_SCHEMA);
this._settingsC = this._settings.connect("changed", function() { this._settingsC = this._settings.connect("changed", function() {
that.rebuildFutureWeatherUi(); that.rebuildFutureWeatherUi();
that.refreshWeather(false); that.refreshWeatherCurrent(false);
that.refreshWeatherForecast(false);
}); });
}, },
@ -288,7 +292,8 @@ const WeatherMenuButton = new Lang.Class({
schema: schemaInterface schema: schemaInterface
}); });
this._settingsInterfaceC = this._settingsInterface.connect("changed", function() { this._settingsInterfaceC = this._settingsInterface.connect("changed", function() {
that.refreshWeather(false); that.refreshWeatherCurrent(false);
that.refreshWeatherForecast(false);
}); });
}, },
@ -489,16 +494,30 @@ const WeatherMenuButton = new Lang.Class({
this._settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v); this._settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v);
}, },
get _refresh_interval() { get _refresh_interval_current() {
if (!this._settings) if (!this._settings)
this.loadConfig(); this.loadConfig();
return this._settings.get_int(WEATHER_REFRESH_INTERVAL); let v = this._settings.get_int(WEATHER_REFRESH_INTERVAL_CURRENT);
return ((v >= 600)?v:600);
}, },
set _refresh_interval(v) { set _refresh_interval_current(v) {
if (!this._settings) if (!this._settings)
this.loadConfig(); this.loadConfig();
this._settings.set_int(WEATHER_REFRESH_INTERVAL, v); this._settings.set_int(WEATHER_REFRESH_INTERVAL_CURRENT, ((v >= 600)?v:600));
},
get _refresh_interval_forecast() {
if (!this._settings)
this.loadConfig();
let v = this._settings.get_int(WEATHER_REFRESH_INTERVAL_FORECAST);
return ((v >= 600)?v:600);
},
set _refresh_interval_forecast(v) {
if (!this._settings)
this.loadConfig();
this._settings.set_int(WEATHER_REFRESH_INTERVAL_FORECAST, ((v >= 600)?v:600));
}, },
get _center_forecast() { get _center_forecast() {
@ -607,7 +626,6 @@ const WeatherMenuButton = new Lang.Class({
for (let a in cities) { for (let a in cities) {
if (!this.extractCity(cities[a])) { if (!this.extractCity(cities[a])) {
this._weatherInfo.text = encodeURI('http://api.openweathermap.org/data/2.5/weather?q=' + cities[a] + '&type=accurate');
this.load_json_async(encodeURI('http://api.openweathermap.org/data/2.5/weather?q=' + cities[a] + '&type=like'), function() { this.load_json_async(encodeURI('http://api.openweathermap.org/data/2.5/weather?q=' + cities[a] + '&type=like'), function() {
let city = arguments[0]; let city = arguments[0];
@ -631,7 +649,8 @@ const WeatherMenuButton = new Lang.Class({
} else } else
continue; continue;
} }
this.refreshWeather(); this.refreshWeatherCurrent(false);
this.refreshWeatherForecast(false);
return; return;
}, },
@ -1051,7 +1070,7 @@ weather-storm.png = weather-storm-symbolic.svg
return 0; return 0;
}, },
refreshWeather: function(recurse) { refreshWeatherCurrent: function(recurse) {
if (!this.extractId(this._city)) { if (!this.extractId(this._city)) {
this.updateCities(); this.updateCities();
return 0; return 0;
@ -1290,6 +1309,21 @@ weather-storm.png = weather-storm-symbolic.svg
return 0; return 0;
}); });
// Repeatedly refresh weather if recurse is set
if (recurse) {
this._timeoutCurrent = Mainloop.timeout_add_seconds(this._refresh_interval_current, Lang.bind(this, function() {
this.refreshWeatherCurrent(true);
}));
}
return 0;
},
refreshWeatherForecast: function(recurse) {
if (!this.extractId(this._city)) {
this.updateCities();
return 0;
}
this.load_json_async(this.get_weather_forecast_url(), function(json) { this.load_json_async(this.get_weather_forecast_url(), function(json) {
if (!json) if (!json)
return 0; return 0;
@ -1377,8 +1411,8 @@ weather-storm.png = weather-storm-symbolic.svg
// Repeatedly refresh weather if recurse is set // Repeatedly refresh weather if recurse is set
if (recurse) { if (recurse) {
this._timeoutS = Mainloop.timeout_add_seconds(this._refresh_interval, Lang.bind(this, function() { this._timeoutForecast = Mainloop.timeout_add_seconds(this._refresh_interval_forecast, Lang.bind(this, function() {
this.refreshWeather(true); this.refreshWeatherForecast(true);
})); }));
} }
return 0; return 0;

25
src/prefs.js
Unescape View File

@ -53,7 +53,8 @@ const WEATHER_USE_SYMBOLIC_ICONS_KEY = 'use-symbolic-icons';
const WEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel'; const WEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel';
const WEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel'; const WEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel';
const WEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel'; const WEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel';
const WEATHER_REFRESH_INTERVAL = 'refresh-interval'; const WEATHER_REFRESH_INTERVAL_CURRENT = 'refresh-interval-current';
const WEATHER_REFRESH_INTERVAL_FORECAST = 'refresh-interval-forecast';
const WEATHER_CENTER_FORECAST_KEY = 'center-forecast'; const WEATHER_CENTER_FORECAST_KEY = 'center-forecast';
const WEATHER_DAYS_FORECAST = 'days-forecast'; const WEATHER_DAYS_FORECAST = 'days-forecast';
@ -696,16 +697,30 @@ const WeatherPrefsWidget = new GObject.Class({
this.Settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v); this.Settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v);
}, },
get refresh_interval() { get refresh_interval_current() {
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_int(WEATHER_REFRESH_INTERVAL); let v = this.Settings.get_int(WEATHER_REFRESH_INTERVAL_CURRENT);
return ((v >= 600)?v:600);
}, },
set refresh_interval(v) { set refresh_interval_current(v) {
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_int(WEATHER_REFRESH_INTERVAL, v); this.Settings.set_int(WEATHER_REFRESH_INTERVAL_CURRENT, ((v >= 600)?v:600));
},
get refresh_interval_forecast() {
if (!this.Settings)
this.loadConfig();
let v = this.Settings.get_int(WEATHER_REFRESH_INTERVAL_FORECAST);
return ((v >= 600)?v:600);
},
set refresh_interval_forecast(v) {
if (!this.Settings)
this.loadConfig();
this.Settings.set_int(WEATHER_REFRESH_INTERVAL_FORECAST, ((v >= 600)?v:600));
}, },
get center_forecast() { get center_forecast() {

Write Preview
Loading…
Cancel
Save