Detailed changes
@@ -553,6 +553,25 @@ dependencies = [
"winapi 0.3.9",
]
+[[package]]
+name = "auto_update"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "client",
+ "gpui",
+ "lazy_static",
+ "log",
+ "serde",
+ "serde_json",
+ "settings",
+ "smol",
+ "surf",
+ "tempdir",
+ "theme",
+ "workspace",
+]
+
[[package]]
name = "autocfg"
version = "0.1.7"
@@ -6382,13 +6401,14 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]]
name = "zed"
-version = "0.28.1"
+version = "0.29.0"
dependencies = [
"anyhow",
"assets",
"async-compression",
"async-recursion",
"async-trait",
+ "auto_update",
"breadcrumbs",
"chat_panel",
"cli",
@@ -239,6 +239,16 @@
"family": "Zed Sans",
"color": "#808080",
"size": 14
+ },
+ "auto_update_progress_message": {
+ "family": "Zed Sans",
+ "color": "#808080",
+ "size": 14
+ },
+ "auto_update_done_message": {
+ "family": "Zed Sans",
+ "color": "#808080",
+ "size": 14
}
},
"titlebar": {
@@ -239,6 +239,16 @@
"family": "Zed Sans",
"color": "#636363",
"size": 14
+ },
+ "auto_update_progress_message": {
+ "family": "Zed Sans",
+ "color": "#636363",
+ "size": 14
+ },
+ "auto_update_done_message": {
+ "family": "Zed Sans",
+ "color": "#636363",
+ "size": 14
}
},
"titlebar": {
@@ -0,0 +1,23 @@
+[package]
+name = "auto_update"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+path = "src/auto_update.rs"
+doctest = false
+
+[dependencies]
+client = { path = "../client" }
+gpui = { path = "../gpui" }
+settings = { path = "../settings" }
+theme = { path = "../theme" }
+workspace = { path = "../workspace" }
+anyhow = "1.0.38"
+lazy_static = "1.4"
+log = "0.4"
+serde = { version = "1", features = ["derive"] }
+serde_json = { version = "1.0.64", features = ["preserve_order"] }
+smol = "1.2.5"
+surf = "2.2"
+tempdir = "0.3.7"
@@ -0,0 +1,304 @@
+use anyhow::{anyhow, Result};
+use client::http::{self, HttpClient};
+use gpui::{
+ actions,
+ elements::{Empty, MouseEventHandler, Text},
+ platform::AppVersion,
+ AsyncAppContext, Element, Entity, ModelContext, ModelHandle, MutableAppContext, Task, View,
+ ViewContext,
+};
+use lazy_static::lazy_static;
+use serde::Deserialize;
+use settings::Settings;
+use smol::{fs::File, io::AsyncReadExt, process::Command};
+use std::{env, ffi::OsString, path::PathBuf, sync::Arc, time::Duration};
+use surf::Request;
+use workspace::{ItemHandle, StatusItemView};
+
+const POLL_INTERVAL: Duration = Duration::from_secs(60 * 60);
+const ACCESS_TOKEN: &'static str = "618033988749894";
+
+lazy_static! {
+ pub static ref ZED_APP_VERSION: Option<AppVersion> = env::var("ZED_APP_VERSION")
+ .ok()
+ .and_then(|v| v.parse().ok());
+ pub static ref ZED_APP_PATH: Option<PathBuf> = env::var("ZED_APP_PATH").ok().map(PathBuf::from);
+}
+
+actions!(auto_update, [Check, DismissErrorMessage]);
+
+#[derive(Clone, PartialEq, Eq)]
+pub enum AutoUpdateStatus {
+ Idle,
+ Checking,
+ Downloading,
+ Installing,
+ Updated,
+ Errored,
+}
+
+pub struct AutoUpdater {
+ status: AutoUpdateStatus,
+ current_version: AppVersion,
+ http_client: Arc<dyn HttpClient>,
+ pending_poll: Option<Task<()>>,
+ server_url: String,
+}
+
+pub struct AutoUpdateIndicator {
+ updater: Option<ModelHandle<AutoUpdater>>,
+}
+
+#[derive(Deserialize)]
+struct JsonRelease {
+ version: String,
+ url: http::Url,
+}
+
+impl Entity for AutoUpdater {
+ type Event = ();
+}
+
+pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut MutableAppContext) {
+ if let Some(version) = ZED_APP_VERSION.clone().or(cx.platform().app_version().ok()) {
+ let auto_updater = cx.add_model(|cx| {
+ let updater = AutoUpdater::new(version, http_client, server_url);
+ updater.start_polling(cx).detach();
+ updater
+ });
+ cx.set_global(Some(auto_updater));
+ cx.add_global_action(|_: &Check, cx| {
+ if let Some(updater) = AutoUpdater::get(cx) {
+ updater.update(cx, |updater, cx| updater.poll(cx));
+ }
+ });
+ cx.add_action(AutoUpdateIndicator::dismiss_error_message);
+ }
+}
+
+impl AutoUpdater {
+ fn get(cx: &mut MutableAppContext) -> Option<ModelHandle<Self>> {
+ cx.default_global::<Option<ModelHandle<Self>>>().clone()
+ }
+
+ fn new(
+ current_version: AppVersion,
+ http_client: Arc<dyn HttpClient>,
+ server_url: String,
+ ) -> Self {
+ Self {
+ status: AutoUpdateStatus::Idle,
+ current_version,
+ http_client,
+ server_url,
+ pending_poll: None,
+ }
+ }
+
+ pub fn start_polling(&self, cx: &mut ModelContext<Self>) -> Task<()> {
+ cx.spawn(|this, mut cx| async move {
+ loop {
+ this.update(&mut cx, |this, cx| this.poll(cx));
+ cx.background().timer(POLL_INTERVAL).await;
+ }
+ })
+ }
+
+ pub fn poll(&mut self, cx: &mut ModelContext<Self>) {
+ if self.pending_poll.is_some() || self.status == AutoUpdateStatus::Updated {
+ return;
+ }
+
+ self.status = AutoUpdateStatus::Checking;
+ cx.notify();
+
+ self.pending_poll = Some(cx.spawn(|this, mut cx| async move {
+ let result = Self::update(this.clone(), cx.clone()).await;
+ this.update(&mut cx, |this, cx| {
+ this.pending_poll = None;
+ if let Err(error) = result {
+ log::error!("auto-update failed: error:{:?}", error);
+ this.status = AutoUpdateStatus::Errored;
+ cx.notify();
+ }
+ });
+ }));
+ }
+
+ async fn update(this: ModelHandle<Self>, mut cx: AsyncAppContext) -> Result<()> {
+ let (client, server_url, current_version) = this.read_with(&cx, |this, _| {
+ (
+ this.http_client.clone(),
+ this.server_url.clone(),
+ this.current_version,
+ )
+ });
+ let mut response = client
+ .send(Request::new(
+ http::Method::Get,
+ http::Url::parse(&format!(
+ "{server_url}/api/releases/latest?token={ACCESS_TOKEN}&asset=Zed.dmg"
+ ))?,
+ ))
+ .await?;
+ let release = response
+ .body_json::<JsonRelease>()
+ .await
+ .map_err(|err| anyhow!("error deserializing release {:?}", err))?;
+ let latest_version = release.version.parse::<AppVersion>()?;
+ if latest_version <= current_version {
+ this.update(&mut cx, |this, cx| {
+ this.status = AutoUpdateStatus::Idle;
+ cx.notify();
+ });
+ return Ok(());
+ }
+
+ this.update(&mut cx, |this, cx| {
+ this.status = AutoUpdateStatus::Downloading;
+ cx.notify();
+ });
+
+ let temp_dir = tempdir::TempDir::new("zed-auto-update")?;
+ let dmg_path = temp_dir.path().join("Zed.dmg");
+ let mount_path = temp_dir.path().join("Zed");
+ let mut mounted_app_path: OsString = mount_path.join("Zed.app").into();
+ mounted_app_path.push("/");
+ let running_app_path = ZED_APP_PATH
+ .clone()
+ .map_or_else(|| cx.platform().app_path(), Ok)?;
+
+ let mut dmg_file = File::create(&dmg_path).await?;
+ let response = client
+ .send(Request::new(http::Method::Get, release.url))
+ .await?;
+ smol::io::copy(response.bytes(), &mut dmg_file).await?;
+ log::info!("downloaded update. path:{:?}", dmg_path);
+
+ this.update(&mut cx, |this, cx| {
+ this.status = AutoUpdateStatus::Installing;
+ cx.notify();
+ });
+
+ let output = Command::new("hdiutil")
+ .args(&["attach", "-nobrowse"])
+ .arg(&dmg_path)
+ .arg("-mountroot")
+ .arg(&temp_dir.path())
+ .output()
+ .await?;
+ if !output.status.success() {
+ Err(anyhow!(
+ "failed to mount: {:?}",
+ String::from_utf8_lossy(&output.stderr)
+ ))?;
+ }
+
+ let output = Command::new("rsync")
+ .args(&["-av", "--delete"])
+ .arg(&mounted_app_path)
+ .arg(&running_app_path)
+ .output()
+ .await?;
+ if !output.status.success() {
+ Err(anyhow!(
+ "failed to copy app: {:?}",
+ String::from_utf8_lossy(&output.stderr)
+ ))?;
+ }
+
+ let output = Command::new("hdiutil")
+ .args(&["detach"])
+ .arg(&mount_path)
+ .output()
+ .await?;
+ if !output.status.success() {
+ Err(anyhow!(
+ "failed to unmount: {:?}",
+ String::from_utf8_lossy(&output.stderr)
+ ))?;
+ }
+
+ this.update(&mut cx, |this, cx| {
+ this.status = AutoUpdateStatus::Updated;
+ cx.notify();
+ });
+ Ok(())
+ }
+}
+
+impl Entity for AutoUpdateIndicator {
+ type Event = ();
+}
+
+impl View for AutoUpdateIndicator {
+ fn ui_name() -> &'static str {
+ "AutoUpdateIndicator"
+ }
+
+ fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> gpui::ElementBox {
+ if let Some(updater) = &self.updater {
+ let theme = &cx.global::<Settings>().theme.workspace.status_bar;
+ match &updater.read(cx).status {
+ AutoUpdateStatus::Checking => Text::new(
+ "Checking for updates…".to_string(),
+ theme.auto_update_progress_message.clone(),
+ )
+ .boxed(),
+ AutoUpdateStatus::Downloading => Text::new(
+ "Downloading update…".to_string(),
+ theme.auto_update_progress_message.clone(),
+ )
+ .boxed(),
+ AutoUpdateStatus::Installing => Text::new(
+ "Installing update…".to_string(),
+ theme.auto_update_progress_message.clone(),
+ )
+ .boxed(),
+ AutoUpdateStatus::Updated => Text::new(
+ "Restart to update Zed".to_string(),
+ theme.auto_update_done_message.clone(),
+ )
+ .boxed(),
+ AutoUpdateStatus::Errored => {
+ MouseEventHandler::new::<Self, _, _>(0, cx, |_, cx| {
+ let theme = &cx.global::<Settings>().theme.workspace.status_bar;
+ Text::new(
+ "Auto update failed".to_string(),
+ theme.auto_update_done_message.clone(),
+ )
+ .boxed()
+ })
+ .on_click(|cx| cx.dispatch_action(DismissErrorMessage))
+ .boxed()
+ }
+ AutoUpdateStatus::Idle => Empty::new().boxed(),
+ }
+ } else {
+ Empty::new().boxed()
+ }
+ }
+}
+
+impl StatusItemView for AutoUpdateIndicator {
+ fn set_active_pane_item(&mut self, _: Option<&dyn ItemHandle>, _: &mut ViewContext<Self>) {}
+}
+
+impl AutoUpdateIndicator {
+ pub fn new(cx: &mut ViewContext<Self>) -> Self {
+ let updater = AutoUpdater::get(cx);
+ if let Some(updater) = &updater {
+ cx.observe(updater, |_, _, cx| cx.notify()).detach();
+ }
+ Self { updater }
+ }
+
+ fn dismiss_error_message(&mut self, _: &DismissErrorMessage, cx: &mut ViewContext<Self>) {
+ if let Some(updater) = &self.updater {
+ updater.update(cx, |updater, cx| {
+ updater.status = AutoUpdateStatus::Idle;
+ cx.notify();
+ });
+ }
+ }
+}
@@ -43,7 +43,7 @@ pub use rpc::*;
pub use user::*;
lazy_static! {
- static ref ZED_SERVER_URL: String =
+ pub static ref ZED_SERVER_URL: String =
std::env::var("ZED_SERVER_URL").unwrap_or("https://zed.dev".to_string());
pub static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE")
.ok()
@@ -17,7 +17,7 @@ use crate::{
text_layout::{LineLayout, RunStyle},
Action, ClipboardItem, Menu, Scene,
};
-use anyhow::Result;
+use anyhow::{anyhow, Result};
use async_task::Runnable;
pub use event::{Event, NavigationDirection};
use postage::oneshot;
@@ -25,6 +25,7 @@ use std::{
any::Any,
path::{Path, PathBuf},
rc::Rc,
+ str::FromStr,
sync::Arc,
};
use time::UtcOffset;
@@ -54,7 +55,10 @@ pub trait Platform: Send + Sync {
fn set_cursor_style(&self, style: CursorStyle);
fn local_timezone(&self) -> UtcOffset;
+
fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf>;
+ fn app_path(&self) -> Result<PathBuf>;
+ fn app_version(&self) -> Result<AppVersion>;
}
pub(crate) trait ForegroundPlatform {
@@ -128,6 +132,38 @@ pub enum CursorStyle {
PointingHand,
}
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AppVersion {
+ major: usize,
+ minor: usize,
+ patch: usize,
+}
+
+impl FromStr for AppVersion {
+ type Err = anyhow::Error;
+
+ fn from_str(s: &str) -> Result<Self> {
+ let mut components = s.trim().split('.');
+ let major = components
+ .next()
+ .ok_or_else(|| anyhow!("missing major version number"))?
+ .parse()?;
+ let minor = components
+ .next()
+ .ok_or_else(|| anyhow!("missing minor version number"))?
+ .parse()?;
+ let patch = components
+ .next()
+ .ok_or_else(|| anyhow!("missing patch version number"))?
+ .parse()?;
+ Ok(Self {
+ major,
+ minor,
+ patch,
+ })
+ }
+}
+
#[derive(Copy, Clone, Debug)]
pub enum RasterizationOptions {
Alpha,
@@ -14,7 +14,9 @@ use cocoa::{
NSPasteboardTypeString, NSSavePanel, NSWindow,
},
base::{id, nil, selector, YES},
- foundation::{NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSString, NSURL},
+ foundation::{
+ NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSString, NSUInteger, NSURL,
+ },
};
use core_foundation::{
base::{CFType, CFTypeRef, OSStatus, TCFType as _},
@@ -46,6 +48,9 @@ use std::{
};
use time::UtcOffset;
+#[allow(non_upper_case_globals)]
+const NSUTF8StringEncoding: NSUInteger = 4;
+
const MAC_PLATFORM_IVAR: &'static str = "platform";
static mut APP_CLASS: *const Class = ptr::null();
static mut APP_DELEGATE_CLASS: *const Class = ptr::null();
@@ -607,6 +612,39 @@ impl platform::Platform for MacPlatform {
}
}
}
+
+ fn app_path(&self) -> Result<PathBuf> {
+ unsafe {
+ let bundle: id = NSBundle::mainBundle();
+ if bundle.is_null() {
+ Err(anyhow!("app is not running inside a bundle"))
+ } else {
+ Ok(path_from_objc(msg_send![bundle, bundlePath]))
+ }
+ }
+ }
+
+ fn app_version(&self) -> Result<platform::AppVersion> {
+ unsafe {
+ let bundle: id = NSBundle::mainBundle();
+ if bundle.is_null() {
+ Err(anyhow!("app is not running inside a bundle"))
+ } else {
+ let version: id = msg_send![bundle, objectForInfoDictionaryKey: ns_string("CFBundleShortVersionString")];
+ let len = msg_send![version, lengthOfBytesUsingEncoding: NSUTF8StringEncoding];
+ let bytes = version.UTF8String() as *const u8;
+ let version = str::from_utf8(slice::from_raw_parts(bytes, len)).unwrap();
+ version.parse()
+ }
+ }
+ }
+}
+
+unsafe fn path_from_objc(path: id) -> PathBuf {
+ let len = msg_send![path, lengthOfBytesUsingEncoding: NSUTF8StringEncoding];
+ let bytes = path.UTF8String() as *const u8;
+ let path = str::from_utf8(slice::from_raw_parts(bytes, len)).unwrap();
+ PathBuf::from(path)
}
unsafe fn get_foreground_platform(object: &mut Object) -> &MacForegroundPlatform {
@@ -1,4 +1,4 @@
-use super::{CursorStyle, WindowBounds};
+use super::{AppVersion, CursorStyle, WindowBounds};
use crate::{
geometry::vector::{vec2f, Vector2F},
Action, ClipboardItem,
@@ -164,6 +164,18 @@ impl super::Platform for Platform {
fn path_for_auxiliary_executable(&self, _name: &str) -> Result<PathBuf> {
Err(anyhow!("app not running inside a bundle"))
}
+
+ fn app_path(&self) -> Result<PathBuf> {
+ Err(anyhow!("app not running inside a bundle"))
+ }
+
+ fn app_version(&self) -> Result<AppVersion> {
+ Ok(AppVersion {
+ major: 1,
+ minor: 0,
+ patch: 0,
+ })
+ }
}
impl Window {
@@ -153,6 +153,8 @@ pub struct StatusBar {
pub cursor_position: TextStyle,
pub diagnostic_message: TextStyle,
pub lsp_message: TextStyle,
+ pub auto_update_progress_message: TextStyle,
+ pub auto_update_done_message: TextStyle,
}
#[derive(Deserialize, Default)]
@@ -182,12 +182,9 @@ pub struct AppState {
pub user_store: ModelHandle<client::UserStore>,
pub fs: Arc<dyn fs::Fs>,
pub channel_list: ModelHandle<client::ChannelList>,
- pub build_window_options: &'static dyn Fn() -> WindowOptions<'static>,
- pub build_workspace: &'static dyn Fn(
- ModelHandle<Project>,
- &Arc<AppState>,
- &mut ViewContext<Workspace>,
- ) -> Workspace,
+ pub build_window_options: fn() -> WindowOptions<'static>,
+ pub build_workspace:
+ fn(ModelHandle<Project>, &Arc<AppState>, &mut ViewContext<Workspace>) -> Workspace,
}
pub trait Item: View {
@@ -14,22 +14,9 @@ doctest = false
name = "Zed"
path = "src/main.rs"
-[features]
-test-support = [
- "text/test-support",
- "client/test-support",
- "editor/test-support",
- "gpui/test-support",
- "language/test-support",
- "lsp/test-support",
- "project/test-support",
- "rpc/test-support",
- "tempdir",
- "workspace/test-support",
-]
-
[dependencies]
assets = { path = "../assets" }
+auto_update = { path = "../auto_update" }
breadcrumbs = { path = "../breadcrumbs" }
chat_panel = { path = "../chat_panel" }
cli = { path = "../cli" }
@@ -93,7 +80,7 @@ simplelog = "0.9"
smallvec = { version = "1.6", features = ["union"] }
smol = "1.2.5"
surf = "2.2"
-tempdir = { version = "0.3.7", optional = true }
+tempdir = { version = "0.3.7" }
thiserror = "1.0.29"
tiny_http = "0.8"
toml = "0.5"
@@ -119,7 +106,6 @@ util = { path = "../util", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] }
env_logger = "0.8"
serde_json = { version = "1.0.64", features = ["preserve_order"] }
-tempdir = { version = "0.3.7" }
unindent = "0.1.7"
[package.metadata.bundle]
@@ -114,6 +114,7 @@ fn main() {
let channel_list =
cx.add_model(|cx| ChannelList::new(user_store.clone(), client.clone(), cx));
+ auto_update::init(http, client::ZED_SERVER_URL.clone(), cx);
project::Project::init(&client);
client::Channel::init(&client);
client::init(client.clone(), cx);
@@ -178,8 +179,8 @@ fn main() {
client,
user_store,
fs,
- build_window_options: &build_window_options,
- build_workspace: &build_workspace,
+ build_window_options,
+ build_workspace,
});
journal::init(app_state.clone(), cx);
theme_selector::init(cx);
@@ -13,6 +13,11 @@ pub fn menus(state: &Arc<AppState>) -> Vec<Menu<'static>> {
keystroke: None,
action: Box::new(super::About),
},
+ MenuItem::Action {
+ name: "Check for Updates",
+ keystroke: None,
+ action: Box::new(auto_update::Check),
+ },
MenuItem::Separator,
MenuItem::Action {
name: "Install CLI",
@@ -40,7 +40,7 @@ pub fn test_app_state(cx: &mut MutableAppContext) -> Arc<AppState> {
client,
user_store,
fs: FakeFs::new(cx.background().clone()),
- build_window_options: &build_window_options,
- build_workspace: &build_workspace,
+ build_window_options,
+ build_workspace,
})
}
@@ -216,10 +216,12 @@ pub fn build_workspace(
workspace::lsp_status::LspStatus::new(workspace.project(), app_state.languages.clone(), cx)
});
let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
+ let auto_update = cx.add_view(|cx| auto_update::AutoUpdateIndicator::new(cx));
workspace.status_bar().update(cx, |status_bar, cx| {
status_bar.add_left_item(diagnostic_summary, cx);
status_bar.add_left_item(diagnostic_message, cx);
status_bar.add_left_item(lsp_status, cx);
+ status_bar.add_right_item(auto_update, cx);
status_bar.add_right_item(cursor_position, cx);
});
@@ -98,6 +98,8 @@ export default function workspace(theme: Theme) {
cursorPosition: text(theme, "sans", "muted"),
diagnosticMessage: text(theme, "sans", "muted"),
lspMessage: text(theme, "sans", "muted"),
+ autoUpdateProgressMessage: text(theme, "sans", "muted"),
+ autoUpdateDoneMessage: text(theme, "sans", "muted"),
},
titlebar: {
avatarWidth: 18,