Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

auto_update: Add title bar feedback when Zed is already up to date (#64106)

Taha395fbd11b851
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 0d86651c00e..38324d53481 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -3,8 +3,8 @@ use client::Client;
use db::kvp::KeyValueStore;
use futures_lite::StreamExt;
use gpui::{
- App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, Global, Task, TaskExt,
- Window, actions,
+ App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, EventEmitter, Global,
+ Task, TaskExt, Window, actions,
};
use http_client::{HttpClient, HttpClientWithUrl};
use paths::remote_servers_dir;
@@ -173,6 +173,11 @@ impl AutoUpdateStatus {
}
}
+pub enum AutoUpdateEvent {
+ /// A manual check received a release response and found no newer version.
+ UpToDate,
+}
+
pub struct AutoUpdater {
status: AutoUpdateStatus,
current_version: Version,
@@ -419,6 +424,8 @@ impl UpdateCheckType {
}
}
+impl EventEmitter<AutoUpdateEvent> for AutoUpdater {}
+
impl AutoUpdater {
pub fn get(cx: &mut App) -> Option<Entity<Self>> {
cx.default_global::<GlobalAutoUpdate>().0.clone()
@@ -763,11 +770,15 @@ impl AutoUpdater {
let Some(newer_version) = newer_version else {
this.update(cx, |this, cx| {
- let status = match previous_status {
+ this.status = match previous_status {
AutoUpdateStatus::Updated { .. } => previous_status,
- _ => AutoUpdateStatus::Idle,
+ _ => {
+ if this.update_check_type.is_manual() {
+ cx.emit(AutoUpdateEvent::UpToDate);
+ }
+ AutoUpdateStatus::Idle
+ }
};
- this.status = status;
cx.notify();
});
return Ok(());
diff --git a/crates/title_bar/src/update_version.rs b/crates/title_bar/src/update_version.rs
index e90764ab81e..b5164b23ea1 100644
--- a/crates/title_bar/src/update_version.rs
+++ b/crates/title_bar/src/update_version.rs
@@ -1,15 +1,20 @@
use std::sync::Arc;
+use std::time::Duration;
use anyhow::anyhow;
-use auto_update::{AutoUpdateStatus, AutoUpdater, UpdateCheckType};
-use gpui::{Empty, Render};
+use auto_update::{AutoUpdateEvent, AutoUpdateStatus, AutoUpdater, UpdateCheckType};
+use gpui::{Empty, Render, Task};
use semver::Version;
use ui::{Tooltip, UpdateButton, prelude::*};
+const UP_TO_DATE_DISPLAY_DURATION: Duration = Duration::from_secs(4);
+
pub struct UpdateVersion {
status: AutoUpdateStatus,
update_check_type: UpdateCheckType,
dismissed_status: Option<AutoUpdateStatus>,
+ showing_up_to_date: bool,
+ _up_to_date_timer: Option<Task<()>>,
}
impl UpdateVersion {
@@ -20,23 +25,53 @@ impl UpdateVersion {
this.status = auto_update.status();
this.update_check_type = auto_update.update_check_type();
this.dismissed_status = auto_update.dismissed_status();
+ if !matches!(this.status, AutoUpdateStatus::Idle) {
+ this.hide_up_to_date();
+ }
cx.notify();
})
.detach();
+ cx.subscribe(&auto_updater, |this, _, event, cx| match event {
+ AutoUpdateEvent::UpToDate => this.show_up_to_date(cx),
+ })
+ .detach();
Self {
status: auto_updater.read(cx).status(),
update_check_type: UpdateCheckType::Automatic,
dismissed_status: auto_updater.read(cx).dismissed_status(),
+ showing_up_to_date: false,
+ _up_to_date_timer: None,
}
} else {
Self {
status: AutoUpdateStatus::Idle,
update_check_type: UpdateCheckType::Automatic,
dismissed_status: None,
+ showing_up_to_date: false,
+ _up_to_date_timer: None,
}
}
}
+ fn show_up_to_date(&mut self, cx: &mut Context<Self>) {
+ self.showing_up_to_date = true;
+ self._up_to_date_timer = Some(cx.spawn(async move |this, cx| {
+ cx.background_executor()
+ .timer(UP_TO_DATE_DISPLAY_DURATION)
+ .await;
+ this.update(cx, |this, cx| {
+ this.hide_up_to_date();
+ cx.notify();
+ })
+ .ok();
+ }));
+ }
+
+ fn hide_up_to_date(&mut self) {
+ self.showing_up_to_date = false;
+ self._up_to_date_timer = None;
+ }
+
pub fn update_simulation(&mut self, cx: &mut Context<Self>) {
let next_state = match self.status {
AutoUpdateStatus::Idle => AutoUpdateStatus::Checking,
@@ -59,6 +94,7 @@ impl UpdateVersion {
self.status = next_state;
self.update_check_type = UpdateCheckType::Manual;
self.dismissed_status = None;
+ self.hide_up_to_date();
cx.notify()
}
@@ -91,6 +127,9 @@ impl Render for UpdateVersion {
if self.is_dismissed() {
return Empty.into_any_element();
}
+ if self.showing_up_to_date {
+ return UpdateButton::up_to_date().into_any_element();
+ }
match &self.status {
AutoUpdateStatus::Checking if self.update_check_type.is_manual() => {
UpdateButton::checking().into_any_element()
diff --git a/crates/ui/src/components/collab/update_button.rs b/crates/ui/src/components/collab/update_button.rs
index 0b94072e901..9c17f498f82 100644
--- a/crates/ui/src/components/collab/update_button.rs
+++ b/crates/ui/src/components/collab/update_button.rs
@@ -118,6 +118,10 @@ impl UpdateButton {
.disabled(true)
}
+ pub fn up_to_date() -> Self {
+ Self::new(IconName::Check, "Up to Date").disabled(true)
+ }
+
pub fn updated(version: impl Into<SharedString>) -> Self {
Self::new(IconName::Download, "Restart to Update")
.tooltip(version)
@@ -254,6 +258,7 @@ impl Component for UpdateButton {
"Installing",
UpdateButton::installing(version).into_any_element(),
),
+ single_example("Up to Date", UpdateButton::up_to_date().into_any_element()),
],
),
example_group_with_title(