refactor: cleanup

gitnote-core/src/handlers.rs

@@ -2,7 +2,7 @@ use anyhow::anyhow;
 use colored::Colorize;
 use unicode_width::UnicodeWidthStr;
 
-use crate::io::NoteRepository;
+use crate::repository::NoteRepository;
 use crate::libgit::Libgit;
 use crate::note::NoteLedger;
 use crate::path::Paths;
@@ -23,7 +23,7 @@ where
     }
 
     pub fn add_note(&self, paths: &Paths, line: usize, message: String) -> anyhow::Result<()> {
-        let mut ledger = self.note_repository.read_note(paths)?;
+        let ledger = self.note_repository.read_note(paths)?;
         if ledger.opaque_exists(line) {
             return Err(anyhow!("comment already exists for line {} in {}. consider to use `edit` instead.", line + 1, paths));
         }
@@ -38,7 +38,7 @@ where
     }
 
     pub fn edit_note(&self, paths: &Paths, line: usize, message: String) -> anyhow::Result<()> {
-        let mut ledger = self.note_repository.read_note(paths)?;
+        let ledger = self.note_repository.read_note(paths)?;
         return if let Some(uuid) = ledger.opaque_uuid(line) {
             println!("editing message found uuid {}", uuid);
             ledger.edit(uuid, message);
@@ -50,7 +50,7 @@ where
     }
 
     pub fn delete_note(&self, paths: &Paths, line: usize) -> anyhow::Result<()> {
-        let mut ledger = self.note_repository.read_note(paths)?;
+        let ledger = self.note_repository.read_note(paths)?;
 
         return if let Some(uuid) = ledger.opaque_uuid(line) {
             ledger.delete(uuid);
@@ -66,7 +66,7 @@ where
 mod tests {
     use crate::diff::SimilarGitDiffer;
     use crate::handlers::NoteHandler;
-    use crate::io::NoteRepository;
+    use crate::repository::NoteRepository;
     use crate::libgit::{Libgit, ProcessLibgit};
     use crate::note::Note;
     use crate::path::{PathResolver, Paths};

gitnote-core/src/libgit.rs

@@ -1,10 +1,11 @@
+use std::fs::File;
+use std::io::{BufReader, Read};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use anyhow::{anyhow, Context};
 
 use crate::diff::{DiffModel, GitDiffer};
-use crate::io::read_file_content;
 use crate::path::Paths;
 use crate::utils::PathBufExt;
 
@@ -47,6 +48,14 @@ where
     pub fn new(differ: T) -> Self {
         Self { differ }
     }
+
+    fn read_file_content(&self, paths: &Paths) -> anyhow::Result<String> {
+        let file = File::open(paths.canonical())?;
+        let mut reader = BufReader::new(file);
+        let mut content = String::new();
+        reader.read_to_string(&mut content)?;
+        return Ok(content);
+    }
 }
 
 impl<T> Libgit for ProcessLibgit<T>
@@ -58,7 +67,7 @@ where
             paths.root(),
             vec!["hash-object", "-w", paths.relative().try_to_str()?],
         )?;
-        let content = read_file_content(paths)?;
+        let content = self.read_file_content(paths)?;
         Ok(GitBlob {
             id,
             file_path: paths.relative().clone(),

gitnote-core/src/main.rs

@@ -4,14 +4,14 @@ use std::process::ExitCode;
 use crate::cli::Cli;
 use crate::diff::SimilarGitDiffer;
 use crate::handlers::NoteHandler;
-use crate::io::NoteRepository;
+use crate::repository::NoteRepository;
 use crate::libgit::ProcessLibgit;
 use crate::path::PathResolver;
 
 mod argument;
 mod handlers;
 mod libgit;
-mod io;
+mod repository;
 mod stdio;
 mod note;
 mod utils;

gitnote-core/src/note.rs

@@ -87,14 +87,14 @@ where
             .map(|m| m.uuid.clone());
     }
 
-    pub fn append(&mut self, line: usize, message: String) -> anyhow::Result<()> {
+    pub fn append(&self, line: usize, message: String) -> anyhow::Result<()> {
         let blob = self.git_blob()?;
         let message = Message::new(&blob, line, message)?;
         self.note.borrow_mut().append(message)?;
         return Ok(());
     }
 
-    pub fn delete(&mut self, uuid: String) {
+    pub fn delete(&self, uuid: String) {
         let mut note_ref = self.note.borrow_mut();
         note_ref.messages.retain(|m| m.uuid != uuid);
     }

gitnote-core/src/io.rs → gitnote-core/src/repository.rs

@@ -1,5 +1,5 @@
 use std::fs::File;
-use std::io::{BufReader, Read};
+use std::io::BufReader;
 
 use crate::diff::GitDiffer;
 use crate::libgit::Libgit;
@@ -42,11 +42,3 @@ impl<T> NoteRepository<T> where T: Libgit {
         return Ok(NoteLedger::new(paths, &self.libgit, note));
     }
 }
-
-pub fn read_file_content(paths: &Paths) -> anyhow::Result<String> {
-    let file = File::open(paths.canonical())?;
-    let mut reader = BufReader::new(file);
-    let mut content = String::new();
-    reader.read_to_string(&mut content)?;
-    return Ok(content);
-}

gitnote-core/src/testlib.rs

@@ -7,8 +7,8 @@ use std::string::ToString;
 
 use anyhow::{anyhow, Error};
 use tempfile::tempdir_in;
+
 use crate::note::Note;
-use crate::path::Paths;
 
 pub struct TestRepo {
     _dir: tempfile::TempDir, // holds tempdir ref to delay cleanup