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
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 24 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,30 @@
[workspace]
resolver = "2"
resolver = "3"

members = [
"apps/frilvault-cli",
"crates/frilvault-core",
]

[workspace.package]
edition = "2024"
license = "MIT"
repository = "https://github.com/FrilLab/frilvault"

[workspace.dependencies]
chrono = "0.4.45"
serde = "1"
uuid = "1.23.3"
thiserror = "2"

[workspace.lints.rust]
unsafe_code = "forbid"

[workspace.lints.clippy]
all = "warn"

[profile.release]
lto = true
codegen-units = 1
strip = true
panic = "abort"
13 changes: 10 additions & 3 deletions apps/frilvault-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
[package]
name = "frilvault-cli"
version = "0.1.0"
edition = "2024"
publish = false

edition.workspace = true
license.workspace = true
repository.workspace = true

[lints]
workspace = true

[[bin]]
name = "flvt"
path = "src/main.rs"

[dependencies]
clap = { version = "4", features = ["derive"] }
anyhow = "1"
uuid = { version = "1", features = ["v4", "serde"] }
clap = { version = "4", features = ["derive"] }
serde_json = "1"

uuid = { workspace = true, features = ["v4", "serde"] }

frilvault-core = { path = "../../crates/frilvault-core" }
19 changes: 13 additions & 6 deletions crates/frilvault-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[package]
name = "frilvault-core"
version = "0.1.0"
edition = "2024"

edition.workspace = true
license.workspace = true
repository.workspace = true

[lints]
workspace = true

[dependencies]
chrono = { version = "0.4", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
serde_yml = "0.0.13"
thiserror = "2"
uuid = { version = "1", features = ["v4", "serde"] }
chrono = { workspace = true, features = ["serde"] }
serde = { workspace = true, features = ["derive"] }
uuid = { workspace = true, features = ["v4", "serde"] }
thiserror.workspace = true

serde_yml = "0.0.13"
66 changes: 34 additions & 32 deletions crates/frilvault-core/src/tests/repair_engin_test.rs
Original file line number Diff line number Diff line change
@@ -1,47 +1,49 @@
use std::path::Path;

use crate::{
AddNoteRequest, LineAnchor, NoteAnchor,
note::NoteService,
tests::helper::{create_test_vault_context, create_test_workspace},
workspace::FileMove,
workspace::{FileMove, PathResolver, RepairEngine},
};

// #[test]
// fn repair_engine_moves_note_files() {
// let workspace = create_test_workspace();
// let workspace_root = workspace.root();
// let resolver = PathResolver::new(workspace_root);
// let vault_context = create_test_vault_context(workspace_root);
// let mut service = NoteService::new(vault_context.clone());

// // 1. create note for original file
// service
// .add_note(AddNoteRequest {
// source_file: "src/main.rs".into(),
// anchor: NoteAnchor::Line(LineAnchor { line: 1, column: 1 }),
// content: "test note".to_string(),
// })
// .unwrap();

// // 2. simulate repair move
// let moves = vec![FileMove {
// from: "src/main.rs".to_string(),
// to: "src/main_renamed.rs".to_string(),
// confidence: 1.0,
// }];
#[test]
fn repair_engine_moves_note_files() {
let workspace = create_test_workspace();
let workspace_root = workspace.root();
let resolver = PathResolver::new(workspace_root);
let vault_context = create_test_vault_context(workspace_root);
let mut service = NoteService::new(vault_context.clone());

// 1. create note for original file
service
.add_note(AddNoteRequest {
source_file: "src/main.rs".into(),
anchor: NoteAnchor::Line(LineAnchor { line: 1, column: 1 }),
content: "test note".to_string(),
})
.unwrap();

// 2. simulate repair move
let moves = vec![FileMove {
from: "src/main.rs".to_string(),
to: "src/main_renamed.rs".to_string(),
confidence: 1.0,
}];

// let mut engine = RepairEngine { vault_context };
let mut engine = RepairEngine { vault_context };

// let repaired = engine.apply_moves(moves).unwrap();
let repaired = engine.apply_moves(moves).unwrap();

// assert_eq!(repaired, 1);
assert_eq!(repaired, 1);

// let old_path = resolver.note_path_for_source_file("src/main.rs");
let old_path = resolver.note_path_for_source_file("src/main.rs");

// let new_path = resolver.note_path_for_source_file("src/main_renamed.rs");
let new_path = resolver.note_path_for_source_file("src/main_renamed.rs");

// assert!(!old_path.exists());
// assert!(new_path.exists());
// }
assert!(!old_path.exists());
assert!(new_path.exists());
}

#[test]
fn repair_engine_invalidates_cache_correctly() {
Expand Down