Skip to content

Commit

Permalink
Handle when we try to move a file to a directory.
Browse files Browse the repository at this point in the history
  • Loading branch information
@svenslaggare
svenslaggare committed Aug 14, 2023
1 parent 33c9318 commit ad85785
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 24 deletions.
19 changes: 17 additions & 2 deletions src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,9 @@ impl App {
source: PathBuf, destination: PathBuf,
force: bool) -> QueryingResult<Vec<Command>> {
let note_file_tree = NoteFileTree::from_iter(self.note_metadata_storage_ref()?.notes());
let note_file_tree = note_file_tree.as_ref().map(|note_file_tree| note_file_tree.find(&source)).flatten();

if let Some(note_file_tree) = note_file_tree {
let source_file_tree = note_file_tree.as_ref().map(|note_file_tree| note_file_tree.find(&source)).flatten();
if let Some(note_file_tree) = source_file_tree {
if note_file_tree.is_tree() {
let mut moves = Vec::new();
note_file_tree.walk(|_, parent, name, tree, _| {
Expand All @@ -359,6 +359,21 @@ impl App {
}
}

let destination_file_tree = note_file_tree.as_ref().map(|note_file_tree| note_file_tree.find(&destination)).flatten();
if let (Some(destination_tree), Some(filename)) = (destination_file_tree, source.file_name()) {
if destination_tree.is_tree() {
return Ok(
vec![
Command::MoveNote {
source: source.clone(),
destination: destination.join(filename),
force
}
]
);
}
}

Ok(
vec![
Command::MoveNote { source, destination, force }
Expand Down
85 changes: 63 additions & 22 deletions src/app_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn test_add() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -44,7 +44,7 @@ fn test_add_with_editor() {
config.allow_stdin = false;
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -81,7 +81,7 @@ fn test_add_and_run_snippet() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -166,8 +166,8 @@ fn test_add_and_move() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path2 = Path::new("2023/07/01/sample.py");
let note_path = Path::new("2023/07/sample");
let note_path2 = Path::new("2023/07/01/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -202,8 +202,8 @@ fn test_add_and_move_to_existing1() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path2 = Path::new("2023/07/01/sample.py");
let note_path = Path::new("2023/07/sample");
let note_path2 = Path::new("2023/07/01/sample");
let note_content = "Hello, World #1".to_owned();
let note_content2 = "Hello, World #2".to_owned();

Expand Down Expand Up @@ -245,8 +245,8 @@ fn test_add_and_move_to_existing2() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path2 = Path::new("2023/07/01/sample.py");
let note_path = Path::new("2023/07/sample");
let note_path2 = Path::new("2023/07/01/sample");
let note_content = "Hello, World #1".to_owned();
let note_content2 = "Hello, World #2".to_owned();

Expand Down Expand Up @@ -284,8 +284,8 @@ fn test_add_and_move_dir1() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note1_path = Path::new("2023/07/sample.py");
let note1_path2 = Path::new("2024/07/sample.py");
let note1_path = Path::new("2023/07/sample");
let note1_path2 = Path::new("2024/07/sample");
let note1_content = r#"Hello, World!
``` python
Expand All @@ -294,8 +294,8 @@ print(np.square(np.arange(0, 10)))
```
"#.to_string();

let note2_path = Path::new("2023/07/sample2.py");
let note2_path2 = Path::new("2024/07/sample2.py");
let note2_path = Path::new("2023/07/sample2");
let note2_path2 = Path::new("2024/07/sample2");
let note2_content = r#"Hello, My World!
``` python
Expand Down Expand Up @@ -338,8 +338,8 @@ fn test_add_and_move_dir2() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note1_path = Path::new("2023/07/sample.py");
let note1_path2 = Path::new("2023/07/07/sample.py");
let note1_path = Path::new("2023/07/sample");
let note1_path2 = Path::new("2023/07/07/sample");
let note1_content = r#"Hello, World!
``` python
Expand All @@ -348,8 +348,8 @@ print(np.square(np.arange(0, 10)))
```
"#.to_string();

let note2_path = Path::new("2023/07/sample2.py");
let note2_path2 = Path::new("2023/07/07/sample2.py");
let note2_path = Path::new("2023/07/sample2");
let note2_path2 = Path::new("2023/07/07/sample2");
let note2_content = r#"Hello, My World!
``` python
Expand Down Expand Up @@ -447,6 +447,47 @@ fn test_add_and_move_dir_to_existing1() {
}
}

#[test]
fn test_add_and_move_file_to_dir() {
use tempfile::TempDir;

let temp_repository_dir = TempDir::new().unwrap();
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample");
let note_path2 = Path::new("2023/07/01/sample");
let note_content = r#"Hello, World!
``` python
import numpy as np
print(np.square(np.arange(0, 10)))
```
"#.to_string();

let mut app = App::new(config).unwrap();

app.create_and_execute_commands(vec![
Command::AddNoteWithContent {
path: note_path.to_path_buf(),
tags: vec!["python".to_owned()],
content: note_content.clone()
},
Command::AddNoteWithContent {
path: Path::new("2023/07/01/sample2").to_owned(),
tags: vec!["python".to_owned()],
content: note_content.clone()
}
]).unwrap();
assert_eq!(note_content, app.note_metadata_storage().unwrap().get_content(note_path).unwrap());
assert_eq!(1, repository.reflog("HEAD").unwrap().len());

app.run(InputCommand::Move { source: note_path.to_owned(), destination: Path::new("2023/07/01").to_owned(), force: false }).unwrap();
assert_eq!(false, app.note_metadata_storage().unwrap().get_content(note_path).is_ok());
assert_eq!(note_content, app.note_metadata_storage().unwrap().get_content(note_path2).unwrap());
assert_eq!(2, repository.reflog("HEAD").unwrap().len());
}

#[test]
fn test_add_and_remove() {
use tempfile::TempDir;
Expand All @@ -455,7 +496,7 @@ fn test_add_and_remove() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -490,7 +531,7 @@ fn test_add_and_change_tags() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -532,7 +573,7 @@ fn test_edit() {
let config = Config::from_env(FileConfig::new(&temp_repository_dir.path().to_path_buf()));
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -582,7 +623,7 @@ fn test_edit_with_editor() {
config.allow_stdin = false;
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down Expand Up @@ -639,7 +680,7 @@ fn test_edit_with_editor_and_history() {
config.allow_stdin = false;
let repository = git2::Repository::init(&config.repository).unwrap();

let note_path = Path::new("2023/07/sample.py");
let note_path = Path::new("2023/07/sample");
let note_content = r#"Hello, World!
``` python
Expand Down

0 comments on commit ad85785

Please sign in to comment.