felixfoertsch/gnome-night-theme-switcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Location source: Store calculated times in settings

Browse Source
This commit is contained in:
Romain Vigier
2022-08-21 21:15:27 +02:00
parent 0742fea554
commit 2d33307208
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml
+6
View File
@@ -77,5 +77,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
<key name="schedule-sunset" type="d"> <key name="schedule-sunset" type="d">
<default>20</default> <default>20</default>
</key> </key>
<key name="location-sunrise" type="d">
<default>6</default>
</key>
<key name="location-sunset" type="d">
<default>20</default>
</key>
</schema> </schema>
</schemalist> </schemalist>
src/modules/SourceLocation.js
+11 -11
View File
@@ -29,7 +29,7 @@ const { Time } = Me.imports.enums.Time;
* case. * case.
*/ */
var SourceLocation = class extends Source { var SourceLocation = class extends Source {
#suntimes; #settings;
#cancellable = null; #cancellable = null;
#previouslyDaytime = null; #previouslyDaytime = null;
@@ -40,13 +40,7 @@ var SourceLocation = class extends Source {
constructor() { constructor() {
super(); super();
// Before we have the location suntimes, we'll use the manual schedule this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
// times
const timeSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`);
this.#suntimes = new Map([
[SunTime.SUNRISE, timeSettings.get_double('schedule-sunrise')],
[SunTime.SUNSET, timeSettings.get_double('schedule-sunset')],
]);
} }
enable() { enable() {
@@ -98,6 +92,11 @@ var SourceLocation = class extends Source {
#onGeoclueReady(_, result) { #onGeoclueReady(_, result) {
this.#geoclue = Geoclue.Simple.new_finish(result); this.#geoclue = Geoclue.Simple.new_finish(result);
if (!this.#geoclue) {
console.error(`[${Me.metadata.name}] Unable to retrieve the location, using the manual schedule times instead.`);
this.#settings.set_double('location-sunrise', this.#settings.get_double('schedule-sunrise'));
this.#settings.set_double('location-sunset', this.#settings.get_double('schedule-sunset'));
}
this.#geoclueConnection = this.#geoclue.connect('notify::location', this.#onLocationUpdated.bind(this)); this.#geoclueConnection = this.#geoclue.connect('notify::location', this.#onLocationUpdated.bind(this));
debug.message('Connected to GeoClue.'); debug.message('Connected to GeoClue.');
this.#onLocationUpdated(); this.#onLocationUpdated();
@@ -168,8 +167,9 @@ var SourceLocation = class extends Source {
const sunrise = timeSunrise * 24 + offset; const sunrise = timeSunrise * 24 + offset;
const sunset = timeSunset * 24 - offset; const sunset = timeSunset * 24 - offset;
this.#suntimes.set(SunTime.SUNRISE, sunrise); this.#settings.set_double('location-sunrise', sunrise);
this.#suntimes.set(SunTime.SUNSET, sunset); this.#settings.set_double('location-sunset', sunset);
debug.message(`New sun times: (sunrise: ${sunrise}; sunset: ${sunset})`); debug.message(`New sun times: (sunrise: ${sunrise}; sunset: ${sunset})`);
} }
@@ -190,7 +190,7 @@ var SourceLocation = class extends Source {
#isDaytime() { #isDaytime() {
const time = GLib.DateTime.new_now_local(); const time = GLib.DateTime.new_now_local();
const hour = time.get_hour() + time.get_minute() / 60 + time.get_second() / 3600; const hour = time.get_hour() + time.get_minute() / 60 + time.get_second() / 3600;
return hour >= this.#suntimes.get(SunTime.SUNRISE) && hour <= this.#suntimes.get(SunTime.SUNSET); return hour >= this.#settings.get_double('location-sunrise') && hour <= this.#settings.get_double('location-sunset');
} }
#watchForTimeChange() { #watchForTimeChange() {