Port to GSettings #470

bgamari · 2019-11-02T17:08:08Z

This refactors the configuration infrastructure away from the deprecated
GConf library and towards GSettings.

This refactors the configuration infrastructure away from the deprecated GConf library and towards GSettings.

ederag

Thanks for tackling this migration.
Looks like you know what you are doing, good !

waf has a buit-in functionality to install schemas (#64 (comment)).
Let's use that standard if possible ?

About that, from https://developer.gnome.org/GSettings/

There are several examples in the wild of projects that use .gschema.xml.in files.
This is almost always wrong.
You should absolutely never use intltool or itstool-based XML "translation merging" functionality with schema files.

So that will need to be changed as well, to be standard,
but let's wait for @GeraldJansen to review and test this first.

Another link https://developer.gnome.org/gio/stable/GSettings.html

the default values in GSettings schemas can be localized

But maybe are you also already familiar with this internationalization stuff ?

ederag · 2019-11-02T21:24:42Z

src/hamster/idle.py

-                client = gconf.Client.get_default()
-                self.timeout_minutes = client.get_int(delay_key)
+                settings = gio.Settings()
+                self.timeout_minutes = client.get_value(delay_key)


A guess

Suggested change

self.timeout_minutes = client.get_value(delay_key)

self.timeout_minutes = settings.get_value(delay_key)

GeraldJansen · 2019-11-03T10:48:56Z

Not sure about the importance of this build message:

./waf configure build
...
[126/126] Compiling data/hamster-time-tracker.desktop.in.in
feature 'glib2' does not exist - bind at least one method to it?     <===
[127/254] Compiling data/apps.hamster-time-tracker.gschema.xml.in
...
'build' finished successfully (1.708s)

and also

sudo ./waf install
...
+ install /usr/share/hamster-time-tracker/stats.ui (from data/stats.ui)
feature 'glib2' does not exist - bind at least one method to it?      <===
+ install /usr/share/applications/hamster-time-tracker.desktop (from build/data/hamster-time-tracker.desktop)
...
'install' finished successfully (0.274s)

Then

 /usr/bin/hamster

(hamster:5992): GLib-GIO-ERROR **: 11:43:23.021: Settings schema 'apps.HamsterTimeTracker' is not installed
Trace/breakpoint trap (core dumped)

ederag · 2019-11-03T11:30:51Z

glib2 has to be loaded first.
Probably add

conf.load('glib2')  # for gsettings schemas installation`

in the wscript file, configure method,
maybe replacing those lines

hamster/wscript

Lines 26 to 27 in 2d58bf6

    
           # gsettings_schema_dir is defined in options 
        
           conf.env.schemas_destination = '${DATADIR}/glib-2.0/schemas'

GeraldJansen · 2019-11-03T17:52:03Z

Works for me.

bgamari · 2019-11-03T17:58:16Z

The one thing that I wonder is whether we should rename the schema. I realized only after I finished the patch that the schema name really ought to rename the DBus name.

ederag

Small changes found while looking for the schema name.

src/hamster/lib/configuration.py

ederag · 2019-11-03T19:49:57Z

@bgamari The DBus interface should remain stable (org.gnome.Hamster)

hamster/src/hamster-service

Line 52 in 3375db5

bus_name = dbus.service.BusName("org.gnome.Hamster", bus=self.bus)

So we should keep this name.
Maybe one day this application will get back under the gnome organization umbrella;
that's not planned, but who knows.

@GeraldJansen Does it mean that we should rename the database directory to hamster as well ?

GeraldJansen · 2019-11-03T22:19:54Z

Does it mean that we should rename the database directory to hamster as well ?

For me, .local/share/hamster-time-tracker is consistent with /usr/share/hamster-time-tracker and other installation directories and file names. Either rename everything to just hamster or use hamster-time-tracker consistently, I'd say.

ederag · 2019-11-04T10:15:36Z

Either rename everything to just hamster or use hamster-time-tracker consistently

Agreed.
There might be good reasons to keep the more expressive hamster-time-tracker directories.
I'll file an issue to discuss that.

ederag · 2019-11-23T15:47:21Z

@GeraldJansen would you have time to implement the directory names changes (#472) and
thoroughly review this PR ?
This is very important indeed, and will get into v3.0,
but the parser update currently takes all my focus.

GeraldJansen · 2019-11-23T16:11:05Z

@ederag I'm willing to try.

GeraldJansen · 2019-11-25T20:31:22Z

@bgamari In #485 hamster-time-tracker has been renamed to hamster everywhere. This has caused a few conflicts with your PR. Would you mind rebasing on current master?

ederag · 2019-11-26T13:28:25Z

@GeraldJansen If @bgamari is not available at this time
(really hoping we did not lose such a valuable contributor),
another workflow might suit you:
it is possible to branch from this PR,
merge (not rebase) upstream/master,
make additional changes,
and push them to your fork.
Then either
make a PR on the fork, taking care to
select the bgamari/hamster fork gsettings branch at the "compare across forks" step
(that would allow both of you to discuss and converge there)
or
tell me here to cherry-pick your branch and push it for you to this PR
(you would remain the author of your commits IIUC),
so that all the discussion stays there.

GeraldJansen · 2019-11-26T16:41:56Z

@ederag Well, I'm out of my depth here, both concerning advanced git techniques and gsettings. I've created a replacement PR (take 2) with a single additional commit (1e08ebe) which merges in current master and adds a couple minimal changes. If you prefer to add the last commit to this PR and close the other, that would be fine by me too.

ederag · 2019-11-26T17:52:56Z

That went well, thanks !
Next time you may just push, without creating any PR, and just give me your branch name
(or its last commit).

GeraldJansen · 2019-11-29T09:27:52Z

Tried to contact @bgamari also by private email but got no response.
From my side I'd say this is good to go.

ederag · 2019-12-15T23:01:32Z

external, desktop and idle have to be removed first (#493),
to start with a clean schema.

GeraldJansen · 2019-12-15T23:10:28Z

@ederag I am currently traveling and will not be able to work on this until January. Please feel free to proceed.

ederag · 2019-12-15T23:31:32Z

Sure, already started (that's why it was added to maintenance).
It was obvious you were unavailable, but it's good to know you are fine. Happy traveling !

https://developer.gnome.org/GSettings/ > You should absolutely never use intltool or itstool-based XML > "translation merging" functionality with schema files.

ederag · 2019-12-22T14:12:46Z

@bgamari Your PR was great, only slightly polished.
Sliced in small commits to allow easy reversal,
but the overall change with respect to your initial PR is very small.
You might want to try the parser-updates-with-gsettings branch that merges your PR into #482 .

Note: the schema localization seems to follow the recommendations, but has not been tested yet.

Is it OK to merge ?

ederag · 2019-12-24T11:35:50Z

The schema localization works on openSUSE Leap-15.1, after an update of the french po/fr.po
and installation of hamster.

> LANGUAGE=fr gsettings describe org.gnome.Hamster last-report-folder
Le dernier répertoire utilisé pour enregistrer un rapport

@bgamari
Merging so the snap package (created by @extraymond, initially in #418) can follow the master branch.
Please file an issue if anything is wrong.
Thanks again for the great contribution !

GeraldJansen mentioned this pull request Nov 2, 2019

Remove dependency on gconf #443

Closed

bgamari force-pushed the gsettings branch from d800c51 to afc18a2 Compare November 2, 2019 18:45

Move to GSettings

fd536fd

This refactors the configuration infrastructure away from the deprecated GConf library and towards GSettings.

bgamari force-pushed the gsettings branch from afc18a2 to fd536fd Compare November 2, 2019 21:10

bgamari changed the title ~~WIP: Port to GSettings~~ Port to GSettings Nov 2, 2019

ederag reviewed Nov 2, 2019

View reviewed changes

bgamari added 3 commits November 3, 2019 12:06

Use waf's GSettings support

13bb86f

Fix last-report-folder

804eddf

Fix idle-delay

69bea3d

bgamari force-pushed the gsettings branch from 2d58bf6 to 69bea3d Compare November 3, 2019 17:11

ederag reviewed Nov 3, 2019

View reviewed changes

src/hamster/lib/configuration.py Outdated Show resolved Hide resolved

src/hamster/lib/configuration.py Outdated Show resolved Hide resolved

ederag mentioned this pull request Nov 5, 2019

Changing installation directories and names? #472

Closed

ederag added this to the v3.0 milestone Nov 23, 2019

ederag mentioned this pull request Nov 23, 2019

Future of hamster v3.x? #433

Closed

Merge master into bgamari-gsettings and tweak schema path and id

1e08ebe

GeraldJansen mentioned this pull request Nov 26, 2019

Port to gsettings -- take 2 #486

Closed

CameronNemo mentioned this pull request Dec 9, 2019

GConf removal void-linux/void-packages#17254

Closed

8 tasks

ederag added 16 commits December 20, 2019 13:29

Merge remote-tracking branch 'upstream/master' into 470

9ce4e5b

remove gnome.hamster.gschema.xml localization

0c90f82

https://developer.gnome.org/GSettings/ > You should absolutely never use intltool or itstool-based XML > "translation merging" functionality with schema files.

remove unused enable-timeout key

af9f656

remove unused stop-on-shutdown key

d7c95ad

remove unused notify-interval key

724ac82

remove unused notify-on-idle key

61708a3

remove unused activities-source key

d197ab6

remove unused workspace-tracking key

1bbe680

remove unused workspace-mapping key

887fb49

remove unused active-hamster-window key

0dadc04

remove unused action key

a886a5f

remove unused name key

1f8351f

update day-start description

c08aa98

rename "Hamster Time Tracker" => "Hamster"

5a1f780

add gettext domain

8643726

add schema to POTFILES.in

406b68f

extraymond mentioned this pull request Dec 23, 2019

Snap package for hamster #418

Closed

ederag merged commit 32ead2e into projecthamster:master Dec 24, 2019

ederag mentioned this pull request Dec 27, 2019

Update i18n #497

Merged

ederag mentioned this pull request Jan 22, 2020

Migrate from GConf to GSettings #64

Closed

This was referenced Mar 4, 2020

Associate tasks to specific workspaces and follow changes automatically #259

Open

Lock the screen when no activity is set #118

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port to GSettings #470

Port to GSettings #470

bgamari commented Nov 2, 2019 •

edited

Loading

ederag left a comment

ederag Nov 2, 2019

GeraldJansen commented Nov 3, 2019

ederag commented Nov 3, 2019

GeraldJansen commented Nov 3, 2019

bgamari commented Nov 3, 2019 via email

ederag left a comment

ederag commented Nov 3, 2019

GeraldJansen commented Nov 3, 2019

ederag commented Nov 4, 2019 •

edited

Loading

ederag commented Nov 23, 2019

GeraldJansen commented Nov 23, 2019

GeraldJansen commented Nov 25, 2019

ederag commented Nov 26, 2019

GeraldJansen commented Nov 26, 2019

ederag commented Nov 26, 2019

GeraldJansen commented Nov 29, 2019

ederag commented Dec 15, 2019

GeraldJansen commented Dec 15, 2019

ederag commented Dec 15, 2019

ederag commented Dec 22, 2019 •

edited

Loading

ederag commented Dec 24, 2019

	self.timeout_minutes = client.get_value(delay_key)
	self.timeout_minutes = settings.get_value(delay_key)

Port to GSettings #470

Port to GSettings #470

Conversation

bgamari commented Nov 2, 2019 • edited Loading

ederag left a comment

Choose a reason for hiding this comment

ederag Nov 2, 2019

Choose a reason for hiding this comment

GeraldJansen commented Nov 3, 2019

ederag commented Nov 3, 2019

GeraldJansen commented Nov 3, 2019

bgamari commented Nov 3, 2019 via email

ederag left a comment

Choose a reason for hiding this comment

ederag commented Nov 3, 2019

GeraldJansen commented Nov 3, 2019

ederag commented Nov 4, 2019 • edited Loading

ederag commented Nov 23, 2019

GeraldJansen commented Nov 23, 2019

GeraldJansen commented Nov 25, 2019

ederag commented Nov 26, 2019

GeraldJansen commented Nov 26, 2019

ederag commented Nov 26, 2019

GeraldJansen commented Nov 29, 2019

ederag commented Dec 15, 2019

GeraldJansen commented Dec 15, 2019

ederag commented Dec 15, 2019

ederag commented Dec 22, 2019 • edited Loading

ederag commented Dec 24, 2019

bgamari commented Nov 2, 2019 •

edited

Loading

ederag commented Nov 4, 2019 •

edited

Loading

ederag commented Dec 22, 2019 •

edited

Loading