Skip to content

Fixed timer issues which arose when premature exit happens #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abviv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed timer issues which arose when premature exit happens #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions tomatoshell
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,15 @@ YELLOW="\033[0;33m"
CYAN="\033[0;34m"
FIN="\033[0m"

COMPLETED_SESSIONS=0
ACTUAL_TIME=0


write_to_log() {
date_f=$(date +"%Y-%m-%d")
echo "$date_f,$SESSIONS,$TIME" >> "$LOG"
# Convert ACTUAL_TIME back to minutes for logging
actual_minutes=$((ACTUAL_TIME / 60))
echo "$date_f,$COMPLETED_SESSIONS,$actual_minutes" >> "$LOG"
}


Expand Down Expand Up @@ -153,11 +158,17 @@ countdown() {

# date in seconds when countdown will end
start=$(($(date +%s) + $1));
initial_time=$1 # Store initial time value

display_countdown $start
clear

[ $session_number -ne -1 ] && notify-send -t 10000 -u "normal" "Session number $session_number finished"
# If this was a work session (not a break), increment completed sessions and time
if [ $session_number -ne -1 ]; then
COMPLETED_SESSIONS=$((COMPLETED_SESSIONS + 1))
ACTUAL_TIME=$((ACTUAL_TIME + initial_time))
notify-send -t 10000 -u "normal" "Session number $session_number finished"
fi

# message when session is finished
if $FIGLET
Expand Down