Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show worktree root names when sharing additional projects on a call

Browse source 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Nathan Sobo 2022-10-10 17:56:03 -06:00
parent 94c68d246e
commit b8c2acf0f2
9 changed files with 153 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/call/src/participant.rs
View file

@ -23,6 +23,6 @@ impl ParticipantLocation {
#[derive(Clone, Debug)]
pub struct RemoteParticipant {
pub user: Arc<User>,
pub project_ids: Vec<u64>,
pub projects: Vec<proto::ParticipantProject>,
pub location: ParticipantLocation,
}

41
crates/call/src/room.rs
View file

@ -13,7 +13,11 @@ use util::ResultExt;
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum Event {
RemoteProjectShared { owner: Arc<User>, project_id: u64 },
RemoteProjectShared {
owner: Arc<User>,
project_id: u64,
worktree_root_names: Vec<String>,
},
}
pub struct Room {
@ -219,16 +223,19 @@ impl Room {
let peer_id = PeerId(participant.peer_id);
this.participant_user_ids.insert(participant.user_id);
let existing_project_ids = this
let existing_projects = this
.remote_participants
.get(&peer_id)
.map(|existing| existing.project_ids.clone())
.unwrap_or_default();
for project_id in &participant.project_ids {
if !existing_project_ids.contains(project_id) {
.into_iter()
.flat_map(|existing| &existing.projects)
.map(|project| project.id)
.collect::<HashSet<_>>();
for project in &participant.projects {
if !existing_projects.contains(&project.id) {
cx.emit(Event::RemoteProjectShared {
owner: user.clone(),
project_id: *project_id,
project_id: project.id,
worktree_root_names: project.worktree_root_names.clone(),
});
}
}
@ -237,7 +244,7 @@ impl Room {
peer_id,
RemoteParticipant {
user: user.clone(),
project_ids: participant.project_ids,
projects: participant.projects,
location: ParticipantLocation::from_proto(participant.location)
.unwrap_or(ParticipantLocation::External),
},
@ -334,9 +341,21 @@ impl Room {
return Task::ready(Ok(project_id));
}
let request = self
.client
.request(proto::ShareProject { room_id: self.id() });
let request = self.client.request(proto::ShareProject {
room_id: self.id(),
worktrees: project
.read(cx)
.worktrees(cx)
.map(|worktree| {
let worktree = worktree.read(cx);
proto::WorktreeMetadata {
id: worktree.id().to_proto(),
root_name: worktree.root_name().into(),
visible: worktree.is_visible(),
}
})
.collect(),
});
cx.spawn_weak(|_, mut cx| async move {
let response = request.await?;
project