Skip to content

Add Update Progress Indicator #173

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

Merged
alainm23 merged 3 commits into from
Dec 17, 2024
Merged

Add Update Progress Indicator #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecf640f
add progress indicator
alainm23 Dec 16, 2024
e5ad2a4
add download_size_remaining
alainm23 Dec 16, 2024
87f440e
update
alainm23 Dec 16, 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
22 changes: 18 additions & 4 deletions src/Backends/SystemUpdate.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public class SettingsDaemon.Backends.SystemUpdate : Object {
construct {
current_state = {
UP_TO_DATE,
""
"",
0,
0
};

update_details = {
Expand Down Expand Up @@ -189,7 +191,12 @@ public class SettingsDaemon.Backends.SystemUpdate : Object {
}

private void progress_callback (Pk.Progress progress, Pk.ProgressType progress_type) {
update_state (current_state.state, PkUtils.status_to_title (progress.status));
update_state (
current_state.state,
PkUtils.status_to_title (progress.status),
progress.percentage,
progress.download_size_remaining
);
}

private void send_error (string message) {
Expand All @@ -203,10 +210,17 @@ public class SettingsDaemon.Backends.SystemUpdate : Object {
update_state (ERROR, message);
}

private void update_state (PkUtils.State state, string message = "") {
private void update_state (
PkUtils.State state,
string message = "",
uint percentage = 0,
uint64 download_size_remaining = 0
) {
current_state = {
state,
message
message,
percentage,
download_size_remaining
};

state_changed ();
Expand Down
22 changes: 18 additions & 4 deletions src/Backends/UbuntuDrivers.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public class SettingsDaemon.Backends.UbuntuDrivers : Object {
construct {
current_state = {
UP_TO_DATE,
""
"",
0,
0
};

available_drivers = new HashTable<string, GenericArray<string>> (str_hash, str_equal);
Expand Down Expand Up @@ -260,7 +262,12 @@ public class SettingsDaemon.Backends.UbuntuDrivers : Object {
}

private void progress_callback (Pk.Progress progress, Pk.ProgressType progress_type) {
update_state (current_state.state, PkUtils.status_to_title (progress.status));
update_state (
current_state.state,
PkUtils.status_to_title (progress.status),
progress.percentage,
progress.download_size_remaining
);
}

private void send_error (string message) {
Expand All @@ -274,10 +281,17 @@ public class SettingsDaemon.Backends.UbuntuDrivers : Object {
update_state (ERROR, message);
}

private void update_state (PkUtils.State state, string message = "") {
private void update_state (
PkUtils.State state,
string message = "",
uint percentage = 0,
uint64 download_size_remaining = 0
) {
current_state = {
state,
message
message,
percentage,
download_size_remaining
};

state_changed ();
Expand Down
2 changes: 2 additions & 0 deletions src/Utils/PkUtils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ namespace SettingsDaemon.PkUtils {
public struct CurrentState {
State state;
string status;
uint percentage;
uint64 download_size_remaining;
}

public static unowned string status_to_title (Pk.Status status) {
Expand Down
Loading