From fd9040388677146f63a9a589be537dbe5c9dbdf3 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Thu, 2 Dec 2021 08:16:52 -0600 Subject: [PATCH] Use new marquee style of progress bar for unpacking/patching since we don't have progress feedback --- lib/application_manager/task.rb | 6 ++++-- lib/states/interface.rb | 10 +++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/application_manager/task.rb b/lib/application_manager/task.rb index 0e20d7a..becb838 100644 --- a/lib/application_manager/task.rb +++ b/lib/application_manager/task.rb @@ -260,7 +260,7 @@ class W3DHub operation = @status.operations[:"#{pkg.checksum}"] if verify_package(pkg) - operation.value = "Verified." + operation.value = "Verified" operation.progress = 1.0 else @packages_to_download << pkg @@ -333,12 +333,14 @@ class W3DHub status = if package.custom_is_patch @status.operations[:"#{package.checksum}"].value = "Patching..." + @status.operations[:"#{package.checksum}"].progress = Float::INFINITY @status.progress = i.to_f / packages.count update_interface_task_status apply_patch(package, path) else @status.operations[:"#{package.checksum}"].value = "Unpacking..." + @status.operations[:"#{package.checksum}"].progress = Float::INFINITY @status.progress = i.to_f / packages.count update_interface_task_status @@ -348,7 +350,7 @@ class W3DHub repair_windows_case_insensitive(package, path) if status - @status.operations[:"#{package.checksum}"].value = "Unpacked" + @status.operations[:"#{package.checksum}"].value = package.custom_is_patch ? "Patched" : "Unpacked" @status.operations[:"#{package.checksum}"].progress = 1.0 update_interface_task_status diff --git a/lib/states/interface.rb b/lib/states/interface.rb index 07e2937..0d91b1b 100644 --- a/lib/states/interface.rb +++ b/lib/states/interface.rb @@ -217,7 +217,15 @@ class W3DHub name_.value = operation.label if operation.label status_.value = operation.value if operation.value - progress_.value = operation.progress.clamp(0.0, 1.0) if operation.progress + + if operation.progress + if operation.progress == Float::INFINITY + progress_.type = :marquee unless progress_.type == :marquee + else + progress_.type = :linear unless progress_.type == :linear + progress_.value = operation.progress.clamp(0.0, 1.0) + end + end end end end