diff --git a/Cargo.lock b/Cargo.lock index e66d302..925ae63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -384,7 +384,7 @@ dependencies = [ [[package]] name = "time-track" -version = "2.1.4" +version = "2.1.3" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 74de412..e318688 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "time-track" -version = "2.1.4" +version = "2.1.3" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/README.md b/README.md deleted file mode 100644 index bbcf4bc..0000000 --- a/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# time-track - -A simple CLI tool for tracking how much time you have left to work. I find myself stressing about whether I'm hitting 8 real hours, so this little tool helps me avoid wasting -time calculating when my work day will end. - -Simply enter times, one per line and send an EOF character when you're done. The first lines opens a span of work and the next line closes it so that you can build up working -time be clocking in and out. Finally, you can send additional arguments to the program to configure how long you intend to work (the default is 8 hours). - -``` -❯ time-track -Working for 8 hours -Input times one per line. Send an EOF character to finish inputting... -8:30 -9:30 -11:15 -12:30 -13:16 -18:20 -19:30 -20:11 # Send an EOF -Exactly done -``` diff --git a/src/time.rs b/src/time.rs index 2b31d50..eb0e0cf 100644 --- a/src/time.rs +++ b/src/time.rs @@ -70,20 +70,17 @@ pub fn get_charaterized_time_remaining( } else { let diff = target_minutes - total_minutes; let (hours, minutes) = to_hrs_minutes(diff); - let now = Local::now(); - return if ended_at > now { - let end_at = (ended_at + Duration::minutes(diff)).time(); - let end_str = end_at.format("%-I:%M %p"); - format!( - "You have {} remaining (end at {} starting from {})", - show_time(hours, minutes), - end_str, - ended_at.format("%-I:%M %p"), - ) + let end_at = (ended_at + Duration::minutes(diff)).time(); + let end_str = end_at.format("%-I:%M %p"); + return if ended_at > Local::now() { + format!( + "You have {} remaining (end at {} starting from {})", + show_time(hours, minutes), + end_str, + ended_at.format("%-I:%M %p"), + ) } else { - let end_at = (now + Duration::minutes(diff)).time(); - let end_str = end_at.format("%-I:%M %p"); - format!("You have {} remaining (end at {} starting now)", show_time(hours, minutes), end_str) + format!("You have {} remaining (end at {} starting now)", show_time(hours, minutes), end_str) } } }