Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UpdateManager: clean up update_cache #2196

Merged
merged 2 commits into from
Jul 2, 2024
Merged

UpdateManager: clean up update_cache #2196

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f356435
UpdateManager: clean up update_cache
danirabbit Jun 29, 2024
15488e1
Merge branch 'main' into danirabbit/updatemanager-cachecleanups
zeebok Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 36 additions & 37 deletions src/Core/UpdateManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,38 +219,39 @@ public class AppCenterCore.UpdateManager : Object {
}
}

var nm = NetworkMonitor.get_default ();

/* One cache update a day, keeps the doctor away! */
var seconds_since_last_refresh = new DateTime.now_utc ().difference (last_cache_update) / GLib.TimeSpan.SECOND;
bool last_cache_update_is_old = seconds_since_last_refresh >= SECONDS_BETWEEN_REFRESHES;
if (force || last_cache_update_is_old) {
if (nm.get_network_available ()) {
debug ("New refresh task");

refresh_in_progress = true;
try {
success = yield FlatpakBackend.get_default ().refresh_cache (cancellable);
if (!force && !last_cache_update_is_old) {
debug ("Too soon to refresh and not forced");
return;
}

if (success) {
last_cache_update = new DateTime.now_utc ();
AppCenter.App.settings.set_int64 ("last-refresh-time", last_cache_update.to_unix ());
}
var nm = NetworkMonitor.get_default ();
if (!nm.get_network_available ()) {
return;
}

seconds_since_last_refresh = 0;
} catch (Error e) {
if (!(e is GLib.IOError.CANCELLED)) {
critical ("Update_cache: Refesh cache async failed - %s", e.message);
cache_update_failed (e);
}
} finally {
refresh_in_progress = false;
}
debug ("New refresh task");
refresh_in_progress = true;
try {
success = yield FlatpakBackend.get_default ().refresh_cache (cancellable);

if (success) {
last_cache_update = new DateTime.now_utc ();
AppCenter.App.settings.set_int64 ("last-refresh-time", last_cache_update.to_unix ());
}
} else {
debug ("Too soon to refresh and not forced");
}

seconds_since_last_refresh = 0;
} catch (Error e) {
if (!(e is GLib.IOError.CANCELLED)) {
critical ("Update_cache: Refesh cache async failed - %s", e.message);
cache_update_failed (e);
}
} finally {
refresh_in_progress = false;
}

var next_refresh = SECONDS_BETWEEN_REFRESHES - (uint)seconds_since_last_refresh;
debug ("Setting a timeout for a refresh in %f minutes", next_refresh / 60.0f);
Expand All @@ -261,19 +262,17 @@ public class AppCenterCore.UpdateManager : Object {
return GLib.Source.REMOVE;
});

if (nm.get_network_available ()) {
if ((force || last_cache_update_is_old) && AppCenter.App.settings.get_boolean ("automatic-updates")) {
yield get_updates ();
debug ("Update Flatpaks");
var installed_apps = yield FlatpakBackend.get_default ().get_installed_applications (cancellable);
foreach (var app in installed_apps) {
if (app.update_available && !app.should_pay) {
debug ("Update: %s", app.get_name ());
try {
yield app.update (false);
} catch (Error e) {
warning ("Updating %s failed: %s", app.get_name (), e.message);
}
if (AppCenter.App.settings.get_boolean ("automatic-updates")) {
yield get_updates ();
debug ("Update Flatpaks");
for (int i = 0; i < updates_liststore.n_items; i++) {
var package = (Package) updates_liststore.get_item (i);
if (!package.should_pay) {
debug ("Update: %s", package.get_name ());
try {
yield package.update (false);
} catch (Error e) {
warning ("Updating %s failed: %s", package.get_name (), e.message);
}
}
}
Expand Down
Loading