Compare commits
34 Commits
main
...
0ebd45ae15
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ebd45ae15 | |||
| 14e7514cc1 | |||
| b3bb13fa33 | |||
| ad95056376 | |||
| 384fa51b6e | |||
| fc2a44740f | |||
| f609aa02db | |||
| fdb4f0db0b | |||
| 2d5e721a79 | |||
| 2e55ba1a4b | |||
| 6b9e3b1b40 | |||
| bdb126cab5 | |||
| a4f6f199ec | |||
| 911a29937e | |||
| 579826d398 | |||
| 3b1f33f055 | |||
| 607dae32fe | |||
| bb032e9daf | |||
| 886a32a9e2 | |||
| 0c58b6c436 | |||
| df3547267b | |||
| a605c4929e | |||
| a40125416d | |||
| 6777a44b3b | |||
| 288298ac18 | |||
| d461a29ff9 | |||
| bc906cd7f3 | |||
| 8ddff3fe9e | |||
| 289f94300c | |||
| d95aa680ff | |||
| 1119b3db9b | |||
| 7ad25af13d | |||
| 7d4f23d82a | |||
| b4e14f7f27 |
50
.github/workflows/build.yaml
vendored
Normal file
50
.github/workflows/build.yaml
vendored
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
name: Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Build:
|
||||||
|
name: Build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
QT_VERSION: 6.7.3
|
||||||
|
QMAKE: ${{ github.workspace }}/${{ env.QT_VERSION }}/gcc_64/bin/qmake
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install apt packages
|
||||||
|
run: |
|
||||||
|
sudo apt update -y
|
||||||
|
sudo apt install -y \
|
||||||
|
build-essential \
|
||||||
|
cmake \
|
||||||
|
curl \
|
||||||
|
libgl1-mesa-dev \
|
||||||
|
python3 \
|
||||||
|
python3-pip
|
||||||
|
|
||||||
|
- name: Install aqtinstall
|
||||||
|
run: |
|
||||||
|
python3 -m pip install aqtinstall
|
||||||
|
|
||||||
|
- name: Install Qt
|
||||||
|
run: |
|
||||||
|
aqt install-qt linux desktop $QT_VERSION linux_gcc_64
|
||||||
|
|
||||||
|
- name: Build clide
|
||||||
|
run: |
|
||||||
|
cargo b --release
|
||||||
|
|
||||||
|
- name: Test libclide
|
||||||
|
run: |
|
||||||
|
cargo test -p libclide
|
||||||
|
|
||||||
|
- name: Test clide
|
||||||
|
run: |
|
||||||
|
cargo test
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
**/target/**
|
**/target/**
|
||||||
**/.qtcreator/**
|
**/.qtcreator/**
|
||||||
**/.idea/**
|
**/.idea/**
|
||||||
**/*.autosave/**
|
**/*.autosave/**
|
||||||
|
**/.qmlls.ini
|
||||||
|
|||||||
486
Cargo.lock
generated
486
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -17,8 +17,8 @@ tui-tree-widget = "0.24.0"
|
|||||||
tui-logger = "0.18.1"
|
tui-logger = "0.18.1"
|
||||||
edtui = "0.11.1"
|
edtui = "0.11.1"
|
||||||
strum = "0.27.2"
|
strum = "0.27.2"
|
||||||
uuid = { version = "1.19.0", features = ["v4"] }
|
|
||||||
devicons = "0.6.12"
|
devicons = "0.6.12"
|
||||||
|
libclide = { path = "./libclide" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
# The link_qt_object_files feature is required for statically linking Qt 6.
|
# The link_qt_object_files feature is required for statically linking Qt 6.
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
# CLIDE
|
# CLIDE
|
||||||
|
|
||||||
|
[](https://git.shaunreed.com/shaunrd0/clide/workflows/build.yml)
|
||||||
|
|
||||||
CLIDE is an extendable command-line driven development environment written in Rust using the Qt UI framework that supports both full and headless Linux environments.
|
CLIDE is an extendable command-line driven development environment written in Rust using the Qt UI framework that supports both full and headless Linux environments.
|
||||||
The GUI is written in QML compiled through Rust using the cxx-qt crate, while the TUI was implemented using the ratatui crate.
|
The GUI is written in QML compiled through Rust using the cxx-qt crate, while the TUI was implemented using the ratatui crate.
|
||||||
|
|
||||||
|
|||||||
16
libclide/Cargo.lock
generated
Normal file
16
libclide/Cargo.lock
generated
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
version = 4
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anyhow"
|
||||||
|
version = "1.0.102"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libclide"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
]
|
||||||
7
libclide/Cargo.toml
Normal file
7
libclide/Cargo.toml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
[package]
|
||||||
|
name = "libclide"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
anyhow = "1.0.102"
|
||||||
5
libclide/src/fs.rs
Normal file
5
libclide/src/fs.rs
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GNU General Public License v3.0 or later
|
||||||
|
|
||||||
|
pub mod entry_meta;
|
||||||
50
libclide/src/fs/entry_meta.rs
Normal file
50
libclide/src/fs/entry_meta.rs
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GNU General Public License v3.0 or later
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use anyhow::{Context, Result};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct EntryMeta {
|
||||||
|
pub abs_path: String,
|
||||||
|
pub file_name: String,
|
||||||
|
pub is_dir: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl EntryMeta {
|
||||||
|
/// Normalizes a path, returning an absolute from the root of the filesystem.
|
||||||
|
/// Does not resolve symlinks and extracts `./` or `../` segments.
|
||||||
|
fn normalize<P: AsRef<Path>>(p: P) -> PathBuf {
|
||||||
|
let path = p.as_ref();
|
||||||
|
let mut buf = PathBuf::new();
|
||||||
|
|
||||||
|
for comp in path.components() {
|
||||||
|
match comp {
|
||||||
|
std::path::Component::ParentDir => {
|
||||||
|
buf.pop();
|
||||||
|
}
|
||||||
|
std::path::Component::CurDir => {}
|
||||||
|
_ => buf.push(comp),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buf
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn new<P: AsRef<Path>>(p: P) -> Result<Self> {
|
||||||
|
let path = p.as_ref();
|
||||||
|
let is_dir = path.is_dir();
|
||||||
|
let abs_path = Self::normalize(&path).to_string_lossy().to_string();
|
||||||
|
let file_name = Path::new(&abs_path)
|
||||||
|
.file_name()
|
||||||
|
.context(format!("Failed to get file name for path: {abs_path:?}"))?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
Ok(EntryMeta {
|
||||||
|
abs_path,
|
||||||
|
file_name,
|
||||||
|
is_dir,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
5
libclide/src/lib.rs
Normal file
5
libclide/src/lib.rs
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GNU General Public License v3.0 or later
|
||||||
|
|
||||||
|
pub mod fs;
|
||||||
@@ -1,3 +1,7 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GNU General Public License v3.0 or later
|
||||||
|
|
||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.15
|
import QtQuick.Layouts 1.15
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GNU General Public License v3.0 or later
|
||||||
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Controls.Basic
|
import QtQuick.Controls.Basic
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GNU General Public License v3.0 or later
|
||||||
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Controls.Basic
|
import QtQuick.Controls.Basic
|
||||||
|
|
||||||
|
|||||||
@@ -4,21 +4,21 @@
|
|||||||
|
|
||||||
use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
|
use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
|
||||||
use anyhow::{Context, Result, bail};
|
use anyhow::{Context, Result, bail};
|
||||||
use log::trace;
|
use log::{trace};
|
||||||
use ratatui::buffer::Buffer;
|
use ratatui::buffer::Buffer;
|
||||||
use ratatui::crossterm::event::{Event, KeyCode, KeyEvent, MouseEvent, MouseEventKind};
|
use ratatui::crossterm::event::{Event, KeyCode, KeyEvent, MouseEvent, MouseEventKind};
|
||||||
use ratatui::layout::{Alignment, Position, Rect};
|
use ratatui::layout::{Alignment, Position, Rect};
|
||||||
use ratatui::prelude::Style;
|
use ratatui::prelude::Style;
|
||||||
use ratatui::style::{Color, Modifier};
|
use ratatui::style::{Color, Modifier};
|
||||||
use ratatui::widgets::{Block, Borders, StatefulWidget, Widget};
|
use ratatui::widgets::{Block, Borders, StatefulWidget, Widget};
|
||||||
use std::ffi::OsStr;
|
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use tui_tree_widget::{Tree, TreeItem, TreeState};
|
use tui_tree_widget::{Tree, TreeItem, TreeState};
|
||||||
|
use libclide::fs::entry_meta::EntryMeta;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Explorer<'a> {
|
pub struct Explorer<'a> {
|
||||||
pub(crate) root_path: PathBuf,
|
root_path: EntryMeta,
|
||||||
tree_items: TreeItem<'a, String>,
|
tree_items: TreeItem<'a, String>,
|
||||||
tree_state: TreeState<String>,
|
tree_state: TreeState<String>,
|
||||||
pub(crate) component_state: ComponentState,
|
pub(crate) component_state: ComponentState,
|
||||||
@@ -30,7 +30,7 @@ impl<'a> Explorer<'a> {
|
|||||||
pub fn new(path: &PathBuf) -> Result<Self> {
|
pub fn new(path: &PathBuf) -> Result<Self> {
|
||||||
trace!(target:Self::ID, "Building {}", Self::ID);
|
trace!(target:Self::ID, "Building {}", Self::ID);
|
||||||
let explorer = Explorer {
|
let explorer = Explorer {
|
||||||
root_path: path.to_owned(),
|
root_path: EntryMeta::new(&path)?,
|
||||||
tree_items: Self::build_tree_from_path(path.to_owned())?,
|
tree_items: Self::build_tree_from_path(path.to_owned())?,
|
||||||
tree_state: TreeState::default(),
|
tree_state: TreeState::default(),
|
||||||
component_state: ComponentState::default().with_help_text(concat!(
|
component_state: ComponentState::default().with_help_text(concat!(
|
||||||
@@ -41,46 +41,46 @@ impl<'a> Explorer<'a> {
|
|||||||
Ok(explorer)
|
Ok(explorer)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_tree_from_path(path: PathBuf) -> Result<TreeItem<'static, String>> {
|
/// Builds the file tree from a path using recursion.
|
||||||
|
/// The identifiers used for the TreeItems are normalized. Symlinks are not resolved.
|
||||||
|
/// Resolving symlinks would cause collisions on the TreeItem unique identifiers within the set.
|
||||||
|
fn build_tree_from_path<P: AsRef<Path>>(p: P) -> Result<TreeItem<'static, String>> {
|
||||||
|
let path = p.as_ref();
|
||||||
let mut children = vec![];
|
let mut children = vec![];
|
||||||
let clean_path = fs::canonicalize(path)?;
|
let path_meta = EntryMeta::new(path)?;
|
||||||
if let Ok(entries) = fs::read_dir(&clean_path) {
|
if let Ok(entries) = fs::read_dir(&path_meta.abs_path) {
|
||||||
let mut paths = entries
|
let mut paths = entries
|
||||||
.map(|res| res.map(|e| e.path()))
|
.map(|res| res.map(|e| e.path()))
|
||||||
.collect::<Result<Vec<_>, std::io::Error>>()
|
.collect::<Result<Vec<_>, std::io::Error>>()
|
||||||
.context(format!(
|
.context(format!(
|
||||||
"Failed to build vector of paths under directory: {:?}",
|
"Failed to build vector of paths under directory: {:?}",
|
||||||
clean_path
|
&path_meta.abs_path
|
||||||
))?;
|
))?;
|
||||||
paths.sort();
|
paths.sort();
|
||||||
for path in paths {
|
for entry_path in paths {
|
||||||
if path.is_dir() {
|
let entry_meta = EntryMeta::new(&entry_path)?;
|
||||||
children.push(Self::build_tree_from_path(path)?);
|
if entry_meta.is_dir {
|
||||||
|
children.push(Self::build_tree_from_path(&entry_meta.abs_path)?);
|
||||||
} else {
|
} else {
|
||||||
if let Ok(path) = fs::canonicalize(&path) {
|
children.push(TreeItem::new_leaf(
|
||||||
let path_str = path.to_string_lossy().to_string();
|
entry_meta.abs_path.clone(),
|
||||||
children.push(TreeItem::new_leaf(
|
entry_meta.file_name.clone(),
|
||||||
path_str + uuid::Uuid::new_v4().to_string().as_str(),
|
));
|
||||||
path.file_name()
|
|
||||||
.context("Failed to get file name from path.")?
|
|
||||||
.to_string_lossy()
|
|
||||||
.to_string(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Note: The first argument is a unique identifier, where no 2 TreeItems may share the same.
|
||||||
|
// For a file tree this is fine because we shouldn't list the same object twice.
|
||||||
TreeItem::new(
|
TreeItem::new(
|
||||||
clean_path.to_string_lossy().to_string() + uuid::Uuid::new_v4().to_string().as_str(),
|
path_meta.abs_path.clone(),
|
||||||
clean_path
|
path_meta.file_name.clone(),
|
||||||
.file_name()
|
|
||||||
.context(format!("Failed to get file name from path: {clean_path:?}"))?
|
|
||||||
.to_string_lossy()
|
|
||||||
.to_string(),
|
|
||||||
children,
|
children,
|
||||||
)
|
)
|
||||||
.context(format!("Failed to build tree from path: {clean_path:?}"))
|
.context(format!(
|
||||||
|
"Failed to build tree from path: {:?}",
|
||||||
|
path_meta.abs_path
|
||||||
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn selected(&self) -> Result<String> {
|
pub fn selected(&self) -> Result<String> {
|
||||||
@@ -97,15 +97,11 @@ impl<'a> Explorer<'a> {
|
|||||||
impl<'a> Widget for &mut Explorer<'a> {
|
impl<'a> Widget for &mut Explorer<'a> {
|
||||||
fn render(self, area: Rect, buf: &mut Buffer) {
|
fn render(self, area: Rect, buf: &mut Buffer) {
|
||||||
if let Ok(tree) = Tree::new(&self.tree_items.children()) {
|
if let Ok(tree) = Tree::new(&self.tree_items.children()) {
|
||||||
let file_name = self
|
|
||||||
.root_path
|
|
||||||
.file_name()
|
|
||||||
.unwrap_or_else(|| OsStr::new("Unknown"));
|
|
||||||
StatefulWidget::render(
|
StatefulWidget::render(
|
||||||
tree.block(
|
tree.block(
|
||||||
Block::default()
|
Block::default()
|
||||||
.borders(Borders::ALL)
|
.borders(Borders::ALL)
|
||||||
.title(file_name.to_string_lossy())
|
.title(self.root_path.file_name.clone())
|
||||||
.border_style(Style::default().fg(self.component_state.get_active_color()))
|
.border_style(Style::default().fg(self.component_state.get_active_color()))
|
||||||
.title_style(Style::default().fg(Color::Green))
|
.title_style(Style::default().fg(Color::Green))
|
||||||
.title_alignment(Alignment::Center),
|
.title_alignment(Alignment::Center),
|
||||||
|
|||||||
Reference in New Issue
Block a user