zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 02:17:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove old extension dir when upgrading (#9800)

Browse Source 
Fixes #9799

Release Notes:

- Fixed a bug where upgrading an extension did not work correctly if the
extension had switched from using an old extension schema with
`extension.json` to the new schema with `extension.toml`.
This commit is contained in:
Max Brunsfeld 2024-03-25 21:27:30 -07:00 committed by GitHub
parent 5adc51f113
commit 5e7fcc02fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/extension/src/extension_store.rs
View File

@ -437,8 +437,9 @@ impl ExtensionStore {
operation: ExtensionOperation,
cx: &mut ModelContext<Self>,
) {
let extensions_dir = self.extensions_dir();
let extension_dir = self.installed_dir.join(extension_id.as_ref());
let http_client = self.http_client.clone();
let fs = self.fs.clone();
match self.outstanding_operations.entry(extension_id.clone()) {
hash_map::Entry::Occupied(_) => return,
@ -463,11 +464,19 @@ impl ExtensionStore {
.get(&url.as_ref(), Default::default(), true)
.await
.map_err(|err| anyhow!("error downloading extension: {}", err))?;
fs.remove_dir(
&extension_dir,
RemoveOptions {
recursive: true,
ignore_if_not_exists: true,
},
)
.await?;
let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
let archive = Archive::new(decompressed_bytes);
archive
.unpack(extensions_dir.join(extension_id.as_ref()))
.await?;
archive.unpack(extension_dir).await?;
this.update(&mut cx, |this, cx| {
this.reload(Some(extension_id.clone()), cx)
})?
@ -543,7 +552,7 @@ impl ExtensionStore {
}
pub fn uninstall_extension(&mut self, extension_id: Arc<str>, cx: &mut ModelContext<Self>) {
let extensions_dir = self.extensions_dir();
let extension_dir = self.installed_dir.join(extension_id.as_ref());
let fs = self.fs.clone();
match self.outstanding_operations.entry(extension_id.clone()) {
@ -566,7 +575,7 @@ impl ExtensionStore {
});
fs.remove_dir(
&extensions_dir.join(extension_id.as_ref()),
&extension_dir,
RemoveOptions {
recursive: true,
ignore_if_not_exists: true,