updated project 2
This commit is contained in:
Hugh Ratsch
@@ -9,6 +9,8 @@ GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
RED='\033[0;31m'
|
||||
CYAN='\033[0;36m'
|
||||
BOLD='\033[1m'
|
||||
NC='\033[0m'
|
||||
|
||||
# Error handling
|
||||
@@ -19,6 +21,35 @@ set -o pipefail # Exit on pipe failure
|
||||
# Trap errors and provide error message
|
||||
trap 'echo -e "${RED}Error: Command failed at line $LINENO${NC}" >&2' ERR
|
||||
|
||||
# Function to show spinner while executing command
|
||||
show_spinner() {
|
||||
local pid=$1
|
||||
local delay=0.1
|
||||
local spinstr='|/-\'
|
||||
while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do
|
||||
local temp=${spinstr#?}
|
||||
printf " [%c] " "$spinstr"
|
||||
local spinstr=$temp${spinstr%"$temp"}
|
||||
sleep $delay
|
||||
printf "\b\b\b\b\b\b"
|
||||
done
|
||||
printf " \b\b\b\b"
|
||||
}
|
||||
|
||||
# Function to print banner
|
||||
print_banner() {
|
||||
clear
|
||||
cat << "EOF"
|
||||
_____ _
|
||||
| |___ _____ _____ ___ ___ _____ ___ | |
|
||||
| --| . | | | .'| | | . ||_|
|
||||
|_____|___|_|_|_|_|_|_|__,|_|_|_|_|_| |
|
||||
|___|
|
||||
EOF
|
||||
echo -e "${BOLD}Command Line Mastery Challenge${NC}"
|
||||
echo "=============================="
|
||||
}
|
||||
|
||||
# Function to check if command exists
|
||||
check_command() {
|
||||
if ! command -v "$1" &>/dev/null; then
|
||||
@@ -134,9 +165,93 @@ validate_challenge_id() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Function to handle commands with improved feedback
|
||||
handle_command() {
|
||||
local cmd="$1"
|
||||
shift # Remove first argument, leaving remaining args
|
||||
|
||||
case "$cmd" in
|
||||
"verify"|"verify-challenge"|"v")
|
||||
echo -e "${CYAN}Verifying your solution...${NC}"
|
||||
"$CHALLENGE_DIR/.tracking/verify-challenge.sh" "$@"
|
||||
;;
|
||||
"hint"|"show-hint"|"h")
|
||||
echo -e "${CYAN}Getting hint...${NC}"
|
||||
"$CHALLENGE_DIR/.tracking/show-hint.sh" "$@"
|
||||
;;
|
||||
"status"|"show-status"|"s")
|
||||
echo -e "${CYAN}Showing status...${NC}"
|
||||
"$CHALLENGE_DIR/.tracking/show-status.sh" "$@"
|
||||
;;
|
||||
"progress"|"check-progress"|"p")
|
||||
echo -e "${CYAN}Checking progress...${NC}"
|
||||
"$CHALLENGE_DIR/.tracking/check-progress.sh" "$@"
|
||||
;;
|
||||
"clear"|"cls"|"c")
|
||||
clear
|
||||
print_challenge_header "$CURRENT_CHALLENGE_ID"
|
||||
;;
|
||||
"reset"|"r")
|
||||
echo -e "${YELLOW}Resetting current challenge...${NC}"
|
||||
setup_challenge_env "$CURRENT_CHALLENGE_ID"
|
||||
;;
|
||||
"exit"|"quit"|"q")
|
||||
return 1
|
||||
;;
|
||||
"help"|"?")
|
||||
print_help_menu
|
||||
;;
|
||||
"")
|
||||
# Empty command, just continue
|
||||
;;
|
||||
*)
|
||||
echo -e "${RED}Unknown command: $cmd${NC}"
|
||||
echo -e "Type ${YELLOW}help${NC} or ${YELLOW}?${NC} for available commands"
|
||||
;;
|
||||
esac
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to print help menu
|
||||
print_help_menu() {
|
||||
echo -e "\n${BOLD}Available Commands:${NC}"
|
||||
echo -e " ${YELLOW}verify, v${NC} - Check your solution"
|
||||
echo -e " ${YELLOW}hint, h${NC} - Get a hint"
|
||||
echo -e " ${YELLOW}status, s${NC} - Show challenge status"
|
||||
echo -e " ${YELLOW}progress, p${NC} - Check overall progress"
|
||||
echo -e " ${YELLOW}clear, c${NC} - Clear screen"
|
||||
echo -e " ${YELLOW}reset, r${NC} - Reset current challenge"
|
||||
echo -e " ${YELLOW}help, ?${NC} - Show this help message"
|
||||
echo -e " ${YELLOW}exit, q${NC} - Exit the challenge"
|
||||
echo -e "\n${BOLD}Tips:${NC}"
|
||||
echo -e "- Commands can be abbreviated (e.g., 'v' for verify)"
|
||||
echo -e "- Use TAB for command completion"
|
||||
echo -e "- Use arrow keys for command history"
|
||||
}
|
||||
|
||||
# Function to print challenge header
|
||||
print_challenge_header() {
|
||||
local challenge_id=$1
|
||||
echo -e "${GREEN}🎮 Challenge $challenge_id${NC}"
|
||||
echo -e "${BLUE}$(get_challenge_description "$challenge_id")${NC}"
|
||||
echo -e "${YELLOW}Type 'help' or '?' for available commands${NC}"
|
||||
}
|
||||
|
||||
# Function to setup challenge environment
|
||||
setup_challenge_env() {
|
||||
local challenge_id=$1
|
||||
if ! bash "$CHALLENGE_DIR/.tracking/level1-setup.sh" > /dev/null 2>&1; then
|
||||
echo -e "${RED}Error: Failed to setup challenge environment${NC}"
|
||||
echo -e "${YELLOW}Try running: $0 clean && $0 setup${NC}"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to start a challenge
|
||||
start_challenge() {
|
||||
local challenge_id=$1
|
||||
export CURRENT_CHALLENGE_ID=$challenge_id
|
||||
|
||||
# Validate challenge ID
|
||||
if ! validate_challenge_id "$challenge_id"; then
|
||||
@@ -144,24 +259,17 @@ start_challenge() {
|
||||
fi
|
||||
|
||||
# Source required scripts with error checking
|
||||
local required_scripts=(common.sh challenges.sh)
|
||||
for script in "${required_scripts[@]}"; do
|
||||
if ! source "$CHALLENGE_DIR/.tracking/$script" 2>/dev/null; then
|
||||
echo -e "${RED}Error: Required script not found: $script${NC}"
|
||||
echo -e "${YELLOW}Running setup first...${NC}"
|
||||
setup_environment
|
||||
if ! source "$CHALLENGE_DIR/.tracking/$script" 2>/dev/null; then
|
||||
echo -e "${RED}Error: Failed to source $script even after setup${NC}"
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
if ! source_required_scripts; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
clear
|
||||
echo -e "${GREEN}🎮 Command Line Mastery Challenge${NC}"
|
||||
echo "=============================="
|
||||
print_banner
|
||||
|
||||
# Setup challenge environment
|
||||
echo -e "${BLUE}Setting up challenge environment...${NC}"
|
||||
setup_challenge_env "$challenge_id" &
|
||||
show_spinner $!
|
||||
|
||||
# Setup challenge environment with error checking
|
||||
if ! get_challenge_details "$challenge_id" 2>/dev/null; then
|
||||
echo -e "${RED}Error: Challenge $challenge_id not found${NC}"
|
||||
echo -e "${YELLOW}Available challenges:${NC}"
|
||||
@@ -169,29 +277,36 @@ start_challenge() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! bash "$CHALLENGE_DIR/.tracking/level1-setup.sh" 2>/dev/null; then
|
||||
echo -e "${RED}Error: Failed to setup challenge environment${NC}"
|
||||
echo -e "${YELLOW}Try running: $0 clean && $0 setup${NC}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Record challenge start with error checking
|
||||
# Record challenge start
|
||||
local start_time=$(date +%s)
|
||||
if ! echo "$challenge_id,$start_time" > "$CHALLENGE_DIR/.tracking/current_challenge" 2>/dev/null; then
|
||||
echo -e "${RED}Error: Failed to record challenge start${NC}"
|
||||
return 1
|
||||
fi
|
||||
echo "$challenge_id,$start_time" > "$CHALLENGE_DIR/.tracking/current_challenge"
|
||||
|
||||
# Create command aliases
|
||||
alias verify="$CHALLENGE_DIR/.tracking/verify-challenge.sh"
|
||||
alias hint="$CHALLENGE_DIR/.tracking/show-hint.sh"
|
||||
alias status="$CHALLENGE_DIR/.tracking/track-progress.sh"
|
||||
print_challenge_header "$challenge_id"
|
||||
|
||||
echo -e "\n${GREEN}Challenge ready!${NC}"
|
||||
echo -e "Commands available:"
|
||||
echo -e " ${YELLOW}verify${NC} - Check your solution"
|
||||
echo -e " ${YELLOW}hint${NC} - Get a hint"
|
||||
echo -e " ${YELLOW}status${NC} - Show progress"
|
||||
# Enable command history and tab completion
|
||||
bind 'set completion-ignore-case on' 2>/dev/null || true
|
||||
bind 'set show-all-if-ambiguous on' 2>/dev/null || true
|
||||
|
||||
# Start command loop with improved prompt
|
||||
local cmd_count=0
|
||||
while true; do
|
||||
cmd_count=$((cmd_count + 1))
|
||||
echo -ne "\n${GREEN}challenge${BLUE}[$challenge_id]${GREEN}>${NC} "
|
||||
read -e -r cmd args # -e enables readline for command history
|
||||
history -s "$cmd $args" # Add command to history
|
||||
if ! handle_command "$cmd" $args; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Record challenge end
|
||||
local end_time=$(date +%s)
|
||||
local duration=$((end_time - start_time))
|
||||
echo "$challenge_id,$duration" >> "$CHALLENGE_DIR/.tracking/data/time.csv"
|
||||
|
||||
echo -e "\n${GREEN}Challenge session ended!${NC}"
|
||||
echo -e "Time spent: $(printf '%dm %ds' $((duration/60)) $((duration%60)))"
|
||||
echo -e "Commands used: $cmd_count"
|
||||
}
|
||||
|
||||
# Function to show help
|
||||
|
||||
Reference in New Issue
Block a user