cli: extract list subcommand

src/cli.rs

@@ -15,6 +15,7 @@
 //!
 
 pub mod finish;
+pub mod list;
 pub mod pause;
 pub mod priority;
 pub mod start;

src/cli/list.rs

@@ -0,0 +1,23 @@
+use crate::{CurrentTaskInfo, Task};
+
+pub struct Request {
+    pub tasks: Vec<Task>,
+    pub current_task_info: Option<CurrentTaskInfo>,
+}
+
+pub fn execute(req: Request) {
+    for (i, task) in req.tasks.iter().enumerate() {
+        let idx = i + 1;
+
+        match req.current_task_info {
+            Some(CurrentTaskInfo { task_idx, .. }) if task_idx == idx => print!("> "),
+            _ => print!("  "),
+        }
+
+        print!("{}. ", idx);
+        if task.link.is_some() {
+            print!("(link) ");
+        }
+        println!("{}", task.name);
+    }
+}

src/cli/pause.rs

@@ -1,3 +1,4 @@
+use std::io::Write;
 use std::path::PathBuf;
 
 use crate::CurrentTaskInfo;

src/cli/priority.rs

@@ -24,7 +24,7 @@ pub struct Request {
     pub tasks_file_path: PathBuf,
 }
 
-pub fn execute(req: Request) {
+pub fn execute(mut req: Request) {
     if req.current_task_info.is_some() {
         panic!("You can change priority only when you don't have an active task, yet");
     }

src/cli/start.rs

@@ -10,10 +10,10 @@ pub struct Args {
 }
 
 pub struct Request {
-    args: Args,
+    pub args: Args,
-    tasks: Vec<Task>,
+    pub tasks: Vec<Task>,
-    current_task_info: Option<CurrentTaskInfo>,
+    pub current_task_info: Option<CurrentTaskInfo>,
-    current_task_info_file_path: PathBuf,
+    pub current_task_info_file_path: PathBuf,
 }
 
 pub fn execute(mut req: Request) {

src/main.rs

@@ -28,10 +28,7 @@
 
 use clap::Parser;
 use serde::{Deserialize, Serialize};
-use std::{
+use std::io::{BufRead, Write};
-    cmp::Ordering,
-    io::{BufRead, Write},
-};
 use xdg::BaseDirectories;
 
 mod cli;
@@ -49,7 +46,7 @@ fn main() {
         .unwrap_or_default();
 
     let current_task_info_file_path = xdg_dirs.place_data_file("current.json").unwrap();
-    let mut current_task_info: Option<CurrentTaskInfo> =
+    let current_task_info: Option<CurrentTaskInfo> =
         std::fs::File::open(&current_task_info_file_path)
             .map(|file| serde_json::from_reader(file).unwrap())
             .unwrap_or_default();
@@ -133,20 +130,10 @@ fn main() {
             println!("removed");
         }
         cli::SubCommand::List => {
-            for (i, task) in tasks.iter().enumerate() {
+            cli::list::execute(cli::list::Request {
-                let idx = i + 1;
+                tasks,
-
+                current_task_info,
-                match current_task_info {
+            });
-                    Some(CurrentTaskInfo { task_idx, .. }) if task_idx == idx => print!("> "),
-                    _ => print!("  "),
-                }
-
-                print!("{}. ", idx);
-                if task.link.is_some() {
-                    print!("(link) ");
-                }
-                println!("{}", task.name);
-            }
         }
         cli::SubCommand::Priority(args) => {
             cli::priority::execute(cli::priority::Request {