diff options
| author | Aram Drevekenin <aram@poor.dev> | 2025-12-11 14:25:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-11 14:25:42 +0100 |
| commit | 693fa082def5ef0fe030cd7fdc3b1df051b35dc6 (patch) | |
| tree | b3f651462bbc1cd2fa5b2d79207343413ef6b83c /default-plugins/sequence/src/path_formatting.rs | |
| parent | fix(zellij-server): unblock building on 32bit targets (#4484) (diff) | |
| download | sl0ppij-693fa082def5ef0fe030cd7fdc3b1df051b35dc6.tar.gz sl0ppij-693fa082def5ef0fe030cd7fdc3b1df051b35dc6.tar.xz sl0ppij-693fa082def5ef0fe030cd7fdc3b1df051b35dc6.zip | |
Command Sequences, Blocking CLI Commands, New Plugin APIs (#4546)
* fix deadlocks
* initial logging to plugin implementation
* only log actions, include keys as Action::Write
* send actions to plugins as a new Event::UserAction
* add Action::Write metadata to plugin API
* run_action plugin command and permission
* block-until-exit/success/failure in the cli
* fix tests
* add NewBlockingPane to the plugin API
* run actions in a different thread so as not to block plugin execution
* add custom context to run_action flow
* fixes for floating pane z_index sorting and unknown protobuf events not crashing plugins
* always render the frame of pinned panes
* macros module
* add macros to config
* KDL macro parsing
* thread macros to the plugin thread
* get/update/delete macros from plugins
* add macros updated event
* add ability to rename macros
* fix deadlock
* fix z_indices with pinned unselectable panes bug
* allow plugins to opt-in to show_cursor
* change show_cursor(bool) to show_cursor(Option<coordinates>)
* test
* upgrade strum to allow proper enum iteration and case insensitive fromstr implementation for Actions
* better cwd tracking for exited command panes
* add initial panes to NewTab Action (no-op for now)
* add initial panes to cli newtab action
* make initial panes work
* add close_on_exit and start_suspended to the cli
* properly convert newtab action (potentially breaking for plugins)
* allow first pane in tab to block
* make distinction between opening panes with the last active client and the current pane in the cli
* improve some apis
* fix fixed size closing pane bug
* fix plugin cursor coordinates
* fix issues with launch-or-focus-plugin having to do with in-place and suppressed panes
* fix: set affected pane in replace pane
* allow setting a pane in place when it is suppressed and being focused (tests failing)
* fix tests
* some fixes for unsuppression of panes
* some fixes for completion_tx in new tab action
* allow replace/suppressed rather than replace/close only
* fixes for inserting suppressed panes without conflicts
* pane focus history and explicit unsuppress plugin api
* fix: prefer explicitly provided pane id in placement in actions that provide it
* fix floating pane coordinate change and z_index
* fix plugin cache dir to persist between sessions
* fix some stack focusing issues when adding panes without a client id
* make sure pinned panes are always above non-pinned floating panes
* allow plugins to copy to clipboard
* initial text styling additions implementations - buggy
* fix dimming issues
* remove extras, stay with just dim and unbold
* unbold and dim as indices
* allow ui components to render success/error colors
* allow plugins to send sigint/sigkill to processes, as well as receive their pid
* ui component fixes and send originating plugin context with run_action
* originating plugin for new tab too
* make plugn show pane command also expand stacked panes
* add sequence plugin
* remove macros
* remove snapshots
* add shortcut for sequence plugin
* fix plugin tests
* plugin tests for new apis
* update snapshots for sequence shortcut
* cleanups and formatting
* Event::CwdChanged
* moar cleanups
* remove some warnings
* remove mroe warnings
* remove dead code
* remove more dead code
* fix minor bugs in sequence plugin
* update sequence help and format codebase
* fix conditional blocking cli commands
* fix initial-command new-tab cli flag
* add client_ids to CwdChanged Event
* last fixes
* add pr
Diffstat (limited to 'default-plugins/sequence/src/path_formatting.rs')
| -rw-r--r-- | default-plugins/sequence/src/path_formatting.rs | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/default-plugins/sequence/src/path_formatting.rs b/default-plugins/sequence/src/path_formatting.rs new file mode 100644 index 00000000..01bf50e6 --- /dev/null +++ b/default-plugins/sequence/src/path_formatting.rs @@ -0,0 +1,71 @@ +use std::path::PathBuf; + +/// Expand a path string to an absolute PathBuf +/// Handles ~, ./, .., relative and absolute paths +pub fn expand_path(path_str: &str, current_cwd: Option<&PathBuf>) -> Option<PathBuf> { + let expanded = if path_str.starts_with("~/") || path_str == "~" { + let home_dir = std::env::var("HOME").ok()?; + if path_str == "~" { + PathBuf::from(home_dir) + } else { + PathBuf::from(home_dir).join(&path_str[2..]) + } + } else if path_str.starts_with('/') { + PathBuf::from(path_str) + } else { + let base = current_cwd?; + base.join(path_str) + }; + + let mut normalized = PathBuf::new(); + for component in expanded.components() { + match component { + std::path::Component::ParentDir => { + normalized.pop(); + }, + std::path::Component::CurDir => {}, + _ => { + normalized.push(component); + }, + } + } + + Some(normalized) +} + +/// Format a path for display in the prompt +/// Example: /home/user/some/long/path -> ~/s/l/path +pub fn format_cwd(cwd: &PathBuf) -> String { + let path_str = cwd.to_string_lossy().to_string(); + + let home_dir = std::env::var("HOME").unwrap_or_default(); + let path_str = if !home_dir.is_empty() && path_str.starts_with(&home_dir) { + path_str.replacen(&home_dir, "~", 1) + } else { + path_str + }; + + let parts: Vec<&str> = path_str.split('/').collect(); + + if parts.len() <= 1 { + return path_str; + } + + let mut formatted_parts = Vec::new(); + for (i, part) in parts.iter().enumerate() { + if i == parts.len() - 1 { + formatted_parts.push(part.to_string()); + } else if part.is_empty() { + formatted_parts.push(String::new()); + } else { + formatted_parts.push(part.chars().next().unwrap_or_default().to_string()); + } + } + + formatted_parts.join("/") +} + +/// Alias for expand_path for backwards compatibility +pub fn resolve_path(current_cwd: Option<&PathBuf>, path_str: &str) -> Option<PathBuf> { + expand_path(path_str, current_cwd) +} |
