Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/splice-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
mod workspace;
mod workspace_lifecycle;
pub use workspace::*;
pub use workspace_lifecycle::*;

#[derive(Debug, Clone, PartialEq, Eq)]
pub enum PastePayload {
Expand Down
21 changes: 21 additions & 0 deletions crates/splice-core/src/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ impl WorkspaceId {
.then_some(Self(value))
.ok_or(WorkspaceError::InvalidWorkspaceId)
}

pub fn as_str(&self) -> &str {
&self.0
}
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct AgentDescriptor {
Expand Down Expand Up @@ -67,6 +71,10 @@ pub struct WorkspaceProfile {
pub environment: EnvironmentMetadata,
pub agent: AgentDescriptor,
pub session_ids: Vec<u64>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub lifecycle_tab_id: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub lifecycle_closing_session_id: Option<u64>,
}
impl WorkspaceProfile {
pub fn new(
Expand All @@ -93,6 +101,8 @@ impl WorkspaceProfile {
environment,
agent,
session_ids: session_ids.into_iter().collect(),
lifecycle_tab_id: None,
lifecycle_closing_session_id: None,
})
}
}
Expand Down Expand Up @@ -159,6 +169,13 @@ impl WorkspaceStore {
.and_then(|mut database| database.profiles.remove(id)))
}

pub fn list(&self) -> Result<Vec<WorkspaceProfile>, WorkspaceError> {
Ok(self
.read()?
.map(|database| database.profiles.into_values().collect())
.unwrap_or_default())
}

fn path(&self) -> PathBuf {
self.root.join(STORE_FILE)
}
Expand Down Expand Up @@ -266,6 +283,10 @@ fn valid_profile(profile: &WorkspaceProfile) -> bool {
&& valid_label(&profile.agent.id)
&& valid_command(&profile.agent.command)
&& profile.session_ids.iter().all(|id| *id != 0)
&& profile.lifecycle_tab_id.as_deref().is_none_or(valid_label)
&& profile
.lifecycle_closing_session_id
.is_none_or(|id| id != 0 && profile.session_ids.contains(&id))
&& profile.session_ids.iter().collect::<BTreeSet<_>>().len() == profile.session_ids.len()
}
fn valid_database(database: &Database) -> bool {
Expand Down
Loading
Loading