add Option to command, to tackle no arguments, modularize whole app

Author: Webrowse

data/tasks.json

@@ -12,11 +12,11 @@
     "completed": false
   },
   {
-    "desc": "abcd",
+    "desc": "abcdef",
     "completed": false
   },
   {
-    "desc": "abcdef",
+    "desc": "mod testing",
     "completed": false
   }
 ]

src/commands/add.rs

@@ -0,0 +1,13 @@
+use crate::models::Task;
+use crate::storage::{load_tasks, save_tasks, show_tasks};
+
+pub fn add(desc: String) {
+    let mut tasks = load_tasks();
+    tasks.push(Task {
+        desc,
+        completed: false,
+    });
+    save_tasks(&tasks);
+    println!("Task added");
+    show_tasks();
+}

src/commands/complete.rs

@@ -0,0 +1,14 @@
+use crate::storage::{load_tasks, save_tasks, show_tasks};
+
+pub fn complete(id: usize) {
+    let mut tasks = load_tasks();
+    if id == 0 || id > tasks.len() {
+        println!("Invalid task ID");
+        show_tasks();
+        return;
+    }
+    let index = id - 1;
+    tasks[index].completed = true;
+    save_tasks(&tasks);
+    show_tasks();
+}

src/commands/delete.rs

@@ -0,0 +1,21 @@
+use crate::storage::{load_tasks, save_tasks, show_tasks};
+
+pub fn delete(id: usize) {
+    let mut tasks = load_tasks();
+    if id == 0 || id > tasks.len() {
+        println!("Invalid input, nothing was deleted, \nTry Again");
+        show_tasks();
+        return;
+    }
+    let index = id - 1;
+    tasks = tasks
+        .into_iter()
+        .enumerate()
+        .filter(|(i, _)| *i != index)
+        .map(|(_, task)| task)
+        .collect();
+    save_tasks(&tasks);
+    let deleted = &tasks[index].desc;
+    println!("Deleted {:?} successfully", deleted);
+    show_tasks();
+}

src/commands/list.rs

@@ -0,0 +1,5 @@
+use crate::storage::show_tasks;
+
+pub fn list() {
+    show_tasks();
+}

src/commands/mod.rs

@@ -0,0 +1,9 @@
+pub mod add;
+pub mod complete;
+pub mod delete;
+pub mod list;
+
+pub use add::add;
+pub use complete::complete;
+pub use delete::delete;
+pub use list::list;

src/main.rs

@@ -1,108 +1,39 @@
+mod commands;
+mod models;
+mod storage;
 
-use clap::{Parser, Subcommand};
-use serde::{Serialize, Deserialize};
-use std::fs::{File, OpenOptions};
-use std::io::{BufReader, BufWriter};
-use std::path::Path;
+use commands::{add, complete, delete, list};
 
-const DATA_FILE: &str = "data/tasks.json";
+use clap::{Parser, Subcommand};
 
-#[derive(Parser)]
+#[derive(Parser, Debug)]
 #[command(name = "Smart Tasker")]
 #[command(about = "CLI to manage tasks")]
 #[command(version)]
 #[command(author = "Adarsh")]
-struct Cli{
+struct Cli {
     #[command(subcommand)]
-    command: Commands
+    command: Option<Commands>,
 }
 
-#[derive(Subcommand)]
-enum Commands{
+#[derive(Subcommand, Debug)]
+enum Commands {
     Add { desc: String },
     List,
-    Completed { id: usize },
-    Delete { id: usize }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-struct Task{
-    desc: String,
-    completed: bool
+    Complete { id: usize },
+    Delete { id: usize },
 }
 
-fn main(){
+fn main() {
     let cli = Cli::parse();
 
-    match cli.command{
-        Commands::Add { desc } => {
-            let mut tasks = load_tasks();
-            tasks.push(Task {
-                desc,
-                completed: false
-            });
-            save_tasks(&tasks);
-            println!("Task added");
-            show_tasks();
-        },
-        Commands::List => {
-            show_tasks();
-        },
-        Commands::Completed { id } => {
-            let mut tasks = load_tasks();
-            if id == 0 || id > tasks.len(){
-                println!("Invalid task ID");
-                show_tasks();
-                return;
-            }
-            let index = id - 1;
-            tasks[index].completed = true;
-            save_tasks(&tasks);
-            show_tasks();
-        },
-        Commands::Delete { id } => {
-            let mut tasks = load_tasks();
-            if id == 0 || id > tasks.len(){
-                println!("Invalid input, nothing was deleted, \nTry Again");
-                show_tasks();
-                return;
-            }
-            let index = id - 1;
-            tasks = tasks.into_iter().enumerate().filter(|(i,_)| *i != index).map(|(_,task)|task).collect();
-            save_tasks(&tasks);
-            let deleted = &tasks[index].desc;
-            println!("Deleted {:?} successfully", deleted);
-            show_tasks();
+    match cli.command {
+        Some(Commands::Add { desc }) => add(desc),
+        Some(Commands::List) => list(),
+        Some(Commands::Complete { id }) => complete(id),
+        Some(Commands::Delete { id }) => delete(id),
+        None => {
+            eprintln!("No command given. Use `--help` to see help");
         }
     }
 }
-
-fn load_tasks() -> Vec<Task>{
-    if !Path::new(DATA_FILE).exists(){
-        return Vec::new()
-    }
-
-    let file = File::open(DATA_FILE).expect("failed to open DATA_FILE");
-    let reader = BufReader::new(file);
-    serde_json::from_reader(reader).unwrap_or_else(|_| Vec::new())
-}
-
-fn save_tasks(tasks: &Vec<Task>) {
-    let file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(DATA_FILE)
-        .expect("failed to write file");
-
-    let writer = BufWriter::new(file);
-    serde_json::to_writer_pretty(writer, tasks).expect("Failed to serialise task");
-}
-
-fn show_tasks(){
-    let tasks = load_tasks();
-            for (i, task) in tasks.iter().enumerate(){
-                let status = if task.completed { "[x]" } else { "[ ]"};
-                println!("{} {} {} ", i+1, status, task.desc);
-            }
-}

src/models/mod.rs

@@ -0,0 +1,2 @@
+pub mod task;
+pub use task::Task;

src/models/task.rs

@@ -0,0 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Task {
+    pub desc: String,
+    pub completed: bool,
+}

src/storage/file.rs

@@ -0,0 +1,37 @@
+use crate::models::Task;
+
+use std::fs::{File, OpenOptions};
+use std::io::{BufReader, BufWriter};
+use std::path::Path;
+
+const DATA_FILE: &str = "data/tasks.json";
+
+pub fn load_tasks() -> Vec<Task> {
+    if !Path::new(DATA_FILE).exists() {
+        return Vec::new();
+    }
+
+    let file = File::open(DATA_FILE).expect("failed to open DATA_FILE");
+    let reader = BufReader::new(file);
+    serde_json::from_reader(reader).unwrap_or_else(|_| Vec::new())
+}
+
+pub fn save_tasks(tasks: &Vec<Task>) {
+    let file = OpenOptions::new()
+        .create(true)
+        .write(true)
+        .truncate(true)
+        .open(DATA_FILE)
+        .expect("failed to write file");
+
+    let writer = BufWriter::new(file);
+    serde_json::to_writer_pretty(writer, tasks).expect("Failed to serialise task");
+}
+
+pub fn show_tasks() {
+    let tasks = load_tasks();
+    for (i, task) in tasks.iter().enumerate() {
+        let status = if task.completed { "[x]" } else { "[ ]" };
+        println!("{} {} {} ", i + 1, status, task.desc);
+    }
+}