callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: make gimp_versions.json parsing easier to test.

Browse Source 
First, let's make the check happen at each startup on unstable (still
once a week on stable).
Second, make it parse gimp.org's gimp_versions.json on stable, but
testing's one on unstable and also check environment variable
GIMP_DEV_VERSIONS_JSON (unstable only) to allow setting a local path
(allowing to tweak the file and test various cases).

Unrelated to testing, some improvements:
- save a timestamp in seconds (really no need to keep microseconds
  precision here).
- just in case, check that the saved timestamp is not in the future.

(cherry picked from commit b874cadfad)
This commit is contained in:
Jehan
2019-12-28 20:28:13 +01:00
parent af91989eff
commit 07807203b5
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/gimp-update.c
View File

@ -145,7 +145,7 @@ gimp_check_updates_callback (GObject *source,
if (gimp_version_break (last_version, &major, &minor, &micro)) if (gimp_version_break (last_version, &major, &minor, &micro))
{ {
g_object_set (config, g_object_set (config,
"check-update-timestamp", g_get_real_time(), "check-update-timestamp", g_get_real_time() / G_USEC_PER_SEC,
"last-known-release", "last-known-release",
(major > GIMP_MAJOR_VERSION || (major > GIMP_MAJOR_VERSION ||
(major == GIMP_MAJOR_VERSION && minor > GIMP_MINOR_VERSION) || (major == GIMP_MAJOR_VERSION && minor > GIMP_MINOR_VERSION) ||
@ -175,13 +175,26 @@ gimp_update_check (GimpCoreConfig *config)
g_object_get (config, g_object_get (config,
"check-update-timestamp", &prev_update_timestamp, "check-update-timestamp", &prev_update_timestamp,
NULL); NULL);
current_timestamp = g_get_real_time(); current_timestamp = g_get_real_time() / G_USEC_PER_SEC;
/* Get rid of invalid saved timestamps. */
if (prev_update_timestamp > current_timestamp)
prev_update_timestamp = -1;
#ifndef GIMP_UNSTABLE
/* Do not check more than once a week. */ /* Do not check more than once a week. */
if (current_timestamp - prev_update_timestamp < (gint64) G_USEC_PER_SEC * 3600L * 24L * 7L) if (current_timestamp - prev_update_timestamp < 3600L * 24L * 7L)
return FALSE; return FALSE;
#endif
#ifdef GIMP_UNSTABLE
if (g_getenv ("GIMP_DEV_VERSIONS_JSON"))
gimp_versions = g_file_new_for_path (g_getenv ("GIMP_DEV_VERSIONS_JSON"));
else
gimp_versions = g_file_new_for_uri ("https://testing.gimp.org/gimp_versions.json"); gimp_versions = g_file_new_for_uri ("https://testing.gimp.org/gimp_versions.json");
#else
gimp_versions = g_file_new_for_uri ("https://gimp.org/gimp_versions.json");
#endif
g_file_read_async (gimp_versions, 0, NULL, gimp_check_updates_callback, config); g_file_read_async (gimp_versions, 0, NULL, gimp_check_updates_callback, config);
g_object_unref (gimp_versions); g_object_unref (gimp_versions);