Update app.R

app.R

@@ -17,7 +17,8 @@ library(recipes)
 library(arrow)
 library(base64enc)
 
-
+# Maximum rows allowed for upload
+MAX_UPLOAD_ROWS <- 5000
 
 PASSWORD <- Sys.getenv("password")
 
@@ -59,59 +60,47 @@ pitch_colors <- c(
 )
 
 # Function to convert date formats
-# input_string: the date string to convert
-# output_format: "yyyy" for YYYY-MM-DD or "mdyy" for M/D/YY
 convert_date_format <- function(date_string, output_format = "yyyy") {
   if (is.na(date_string) || date_string == "") {
     return(NA)
   }
   
-  # Convert to character if not already
   date_string <- as.character(date_string)
   
   parsed_date <- NULL
   
-  # Try to parse YYYY-MM-DD format
   if (grepl("^\\d{4}-\\d{2}-\\d{2}$", date_string)) {
     parsed_date <- tryCatch({
       as.Date(date_string, format = "%Y-%m-%d")
     }, error = function(e) NULL)
   }
   
-  # Try to parse MM/DD/YYYY or M/D/YYYY format
   if (is.null(parsed_date) && grepl("^\\d{1,2}/\\d{1,2}/\\d{4}$", date_string)) {
     parsed_date <- tryCatch({
       as.Date(date_string, format = "%m/%d/%Y")
     }, error = function(e) NULL)
   }
   
-  # Try to parse MM/DD/YY or M/D/YY format
   if (is.null(parsed_date) && grepl("^\\d{1,2}/\\d{1,2}/\\d{2}$", date_string)) {
     parsed_date <- tryCatch({
       as.Date(date_string, format = "%m/%d/%y")
     }, error = function(e) NULL)
   }
   
-  # If we successfully parsed a date, format it according to output_format
   if (!is.null(parsed_date) && !is.na(parsed_date)) {
     if (output_format == "mdyy") {
-      # M/D/YY format (no leading zeros, 2-digit year)
       return(format(parsed_date, "%m/%d/%y") %>% 
-               gsub("^0", "", .) %>%  # Remove leading zero from month
-               gsub("/0", "/", .))     # Remove leading zero from day
+               gsub("^0", "", .) %>%
+               gsub("/0", "/", .))
     } else {
-      # YYYY-MM-DD format
       return(format(parsed_date, "%Y-%m-%d"))
     }
   }
   
-  # Return original if no conversion possible
   return(date_string)
 }
 
-# Function to convert date columns in a dataframe
 convert_date_columns <- function(df, output_format = "yyyy") {
-  # Common date column names in TrackMan data
   date_columns <- c("Date", "GameDate", "UTCDate", "LocalDateTime")
   
   for (col in date_columns) {
@@ -123,16 +112,36 @@ convert_date_columns <- function(df, output_format = "yyyy") {
   return(df)
 }
 
+# ── Read uploaded file: CSV or Parquet, with row-limit enforcement ──
+read_uploaded_file <- function(filepath, filename, header = TRUE, sep = ",", quote = '"') {
+  ext <- tolower(tools::file_ext(filename))
+  
+  if (ext == "parquet") {
+    df <- as.data.frame(arrow::read_parquet(filepath))
+  } else {
+    df <- read.csv(filepath,
+                   header = header,
+                   sep = sep,
+                   quote = quote,
+                   stringsAsFactors = FALSE)
+  }
+  
+  if (nrow(df) > MAX_UPLOAD_ROWS) {
+    stop(paste0("File contains ", format(nrow(df), big.mark = ","), " rows which exceeds the ",
+                format(MAX_UPLOAD_ROWS, big.mark = ","), " row limit. Please upload a smaller file."))
+  }
+  
+  return(df)
+}
+
 # Function to parse bat tracking JSON
 parse_bat_tracking_json <- function(json_path) {
   tryCatch({
     json_data <- fromJSON(json_path, simplifyVector = FALSE)
     
-    # Extract metadata
     game_reference <- json_data$GameReference
     session_id <- json_data$SessionId
     
-    # Extract plays
     plays <- json_data$Plays
     
     if (length(plays) == 0) {
@@ -144,7 +153,6 @@ parse_bat_tracking_json <- function(json_path) {
       ))
     }
     
-    # Build data frame from plays
     bat_tracking_df <- data.frame(
       PitchUID = sapply(plays, function(p) p$PitchUID),
       BatSpeed_Sensor = sapply(plays, function(p) p$BatSpeed),
@@ -173,7 +181,6 @@ parse_bat_tracking_json <- function(json_path) {
   })
 }
 
-# Function to merge CSV with bat tracking
 merge_with_bat_tracking <- function(csv_data, bat_tracking_data) {
   if (is.null(bat_tracking_data) || nrow(bat_tracking_data) == 0) {
     return(list(
@@ -184,7 +191,6 @@ merge_with_bat_tracking <- function(csv_data, bat_tracking_data) {
     ))
   }
   
-  # Check if PitchUID exists in CSV
   if (!"PitchUID" %in% names(csv_data)) {
     return(list(
       data = csv_data,
@@ -194,14 +200,11 @@ merge_with_bat_tracking <- function(csv_data, bat_tracking_data) {
     ))
   }
   
-  # Perform left join
   merged_data <- csv_data %>%
     left_join(bat_tracking_data, by = "PitchUID")
   
-  # Count matches
   matched_count <- sum(!is.na(merged_data$BatSpeed_Sensor))
   
-  # If original BatSpeed column exists and is empty, fill with sensor data
   if ("BatSpeed" %in% names(merged_data)) {
     merged_data <- merged_data %>%
       mutate(BatSpeed = ifelse(is.na(BatSpeed) & !is.na(BatSpeed_Sensor), 
@@ -411,11 +414,7 @@ clean_college_data <- function(data, teams = NA){
       -PositionAt110X, -PositionAt110Y, -PositionAt110Z
     )
 
-           
-  
   return(data)
-  
-  
 }
 
 
@@ -759,6 +758,15 @@ app_ui <- fluidPage(
       border-left-color: #dc3545;
       background: #f8d7da;
     }
+    
+    /* Download section styling */
+    .download-option-box {
+      background: linear-gradient(135deg, #e8f4f8 0%, #f0e6d3 100%);
+      border: 1px solid rgba(0,139,139,.2);
+      border-radius: 12px;
+      padding: 20px;
+      margin-bottom: 15px;
+    }
   "))
   ),
   
@@ -776,8 +784,9 @@ app_ui <- fluidPage(
                 "Upload & Process",
                 fluidRow(
                   column(6,
-                         h3("1. Upload TrackMan CSV"),
-                         fileInput("file", "Choose CSV File", accept = c(".csv")),
+                         h3("1. Upload TrackMan CSV or Parquet"),
+                         fileInput("file", "Choose CSV or Parquet File (max 5,000 rows)", 
+                                   accept = c(".csv", ".parquet")),
                          fluidRow(
                            column(3,
                                   checkboxInput("header", "Header", TRUE)
@@ -798,6 +807,8 @@ app_ui <- fluidPage(
                                                selected = "yyyy")
                            )
                          ),
+                         p(style = "color: #666; font-size: 12px;", 
+                           "CSV options (Header, Separator, Quote) are ignored for Parquet files."),
                          verbatimTextOutput("csv_status")
                   ),
                   column(6,
@@ -931,10 +942,26 @@ app_ui <- fluidPage(
                 fluidRow(
                   column(12,
                          h3("Download Processed Data"),
-                         h4("Your processed data is ready for download!"),
+                         
+                         div(class = "download-option-box",
+                           fluidRow(
+                             column(5,
+                                    textInput("download_filename", "File Name (without extension):",
+                                              value = paste0("app_ready_COA_", Sys.Date()))
+                             ),
+                             column(3,
+                                    radioButtons("download_format", "Export Format:",
+                                                 choices = c("CSV" = "csv", "Parquet" = "parquet"),
+                                                 selected = "csv", inline = TRUE)
+                             ),
+                             column(4,
+                                    br(),
+                                    downloadButton("downloadData", "Download", class = "btn-success btn-lg")
+                             )
+                           )
+                         ),
+                         
                          br(),
-                         downloadButton("downloadData", "Download CSV", class = "btn-success btn-lg"),
-                         br(), br(),
                          h4("Data Summary:"),
                          verbatimTextOutput("data_summary")
                   )
@@ -999,11 +1026,12 @@ app_ui <- fluidPage(
 ui <- fluidPage(
   uiOutput("page")
 )
+
 # Server
 server <- function(input, output, session) {
 
-
   logged_in <- reactiveVal(FALSE)
+  uploaded_file_type <- reactiveVal("csv")
   
   output$page <- renderUI({
     if (logged_in()) {
@@ -1051,45 +1079,44 @@ server <- function(input, output, session) {
     updateCheckboxGroupInput(session, "columns_to_remove", selected = spinaxis_cols)
   })
   
+  # ── Shared helper: process raw data into processed_data / plot_data ──
+  run_processing <- function(df) {
+    # Merge bat tracking if available
+    if (!is.null(bat_tracking_parsed()) && !is.null(bat_tracking_parsed()$data)) {
+      result <- merge_with_bat_tracking(df, bat_tracking_parsed()$data)
+      merge_result(result)
+      df <- result$data
+    }
+    
+    selected_cols_to_remove <- input$columns_to_remove %||% character(0)
+    processed_df <- df
+    
+    if (length(selected_cols_to_remove) > 0) {
+      columns_to_drop <- intersect(names(df), selected_cols_to_remove)
+      if (length(columns_to_drop) > 0) {
+        processed_df <- processed_df %>% select(-all_of(columns_to_drop))
+      }
+    }
+    
+    processed_df <- processed_df %>% distinct()
+    
+    processed_data(processed_df)
+    plot_data(processed_df)
+    
+    return(processed_df)
+  }
+  
   # Re-process data when date format changes
   observeEvent(input$date_format, {
-    req(input$file)  # Only run if a file has been uploaded
+    req(input$file)
     
-    # Re-read and process the CSV with new date format
     tryCatch({
-      df <- read.csv(input$file$datapath,
-                     header = input$header,
-                     sep = input$sep,
-                     quote = input$quote,
-                     stringsAsFactors = FALSE)
+      df <- read_uploaded_file(input$file$datapath, input$file$name,
+                               input$header, input$sep, input$quote)
       
-      # Auto-convert date formats based on user selection
       df <- convert_date_columns(df, input$date_format)
-      
       csv_data_raw(df)
-      
-      # If we already have bat tracking data, try to merge
-      if (!is.null(bat_tracking_parsed()) && !is.null(bat_tracking_parsed()$data)) {
-        result <- merge_with_bat_tracking(df, bat_tracking_parsed()$data)
-        merge_result(result)
-        df <- result$data
-      }
-      
-      # Process the data (remove columns)
-      selected_cols_to_remove <- input$columns_to_remove %||% character(0)
-      processed_df <- df
-      
-      if (length(selected_cols_to_remove) > 0) {
-        columns_to_drop <- intersect(names(df), selected_cols_to_remove)
-        if (length(columns_to_drop) > 0) {
-          processed_df <- processed_df %>% select(-all_of(columns_to_drop))
-        }
-      }
-      
-      processed_df <- processed_df %>% distinct()
-      
-      processed_data(processed_df)
-      plot_data(processed_df)
+      run_processing(df)
       
       showNotification(
         paste("Date format updated to:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
@@ -1101,44 +1128,21 @@ server <- function(input, output, session) {
     })
   }, ignoreInit = TRUE)
   
-  # Process uploaded CSV file
+  # ── Process uploaded file (CSV or Parquet) ──
   observeEvent(input$file, {
     req(input$file)
     
     tryCatch({
-      df <- read.csv(input$file$datapath,
-                     header = input$header,
-                     sep = input$sep,
-                     quote = input$quote,
-                     stringsAsFactors = FALSE)
+      ext <- tolower(tools::file_ext(input$file$name))
+      uploaded_file_type(ext)
       
-      # Auto-convert date formats based on user selection
-      df <- convert_date_columns(df, input$date_format)
+      df <- read_uploaded_file(input$file$datapath, input$file$name,
+                               input$header, input$sep, input$quote)
       
+      df <- convert_date_columns(df, input$date_format)
       csv_data_raw(df)
       
-      # If we already have bat tracking data, try to merge
-      if (!is.null(bat_tracking_parsed()) && !is.null(bat_tracking_parsed()$data)) {
-        result <- merge_with_bat_tracking(df, bat_tracking_parsed()$data)
-        merge_result(result)
-        df <- result$data
-      }
-      
-      # Process the data (remove columns)
-      selected_cols_to_remove <- input$columns_to_remove %||% character(0)
-      processed_df <- df
-      
-      if (length(selected_cols_to_remove) > 0) {
-        columns_to_drop <- intersect(names(df), selected_cols_to_remove)
-        if (length(columns_to_drop) > 0) {
-          processed_df <- processed_df %>% select(-all_of(columns_to_drop))
-        }
-      }
-      
-      processed_df <- processed_df %>% distinct()
-      
-      processed_data(processed_df)
-      plot_data(processed_df)
+      processed_df <- run_processing(df)
       
       # Update pitcher choices
       if ("Pitcher" %in% names(processed_df)) {
@@ -1146,8 +1150,18 @@ server <- function(input, output, session) {
         updateSelectInput(session, "pitcher_select", choices = pitcher_choices, selected = pitcher_choices[1])
       }
       
+      # Auto-populate download filename from uploaded file
+      base_name <- tools::file_path_sans_ext(input$file$name)
+      updateTextInput(session, "download_filename", value = paste0(base_name, "_processed"))
+      
+      format_label <- if (ext == "parquet") "Parquet" else "CSV"
+      showNotification(
+        paste0(format_label, " loaded: ", nrow(df), " rows x ", ncol(df), " columns"),
+        type = "message", duration = 3
+      )
+      
     }, error = function(e) {
-      showNotification(paste("Error processing CSV:", e$message), type = "error")
+      showNotification(paste("Error processing file:", e$message), type = "error")
     })
   })
   
@@ -1159,12 +1173,10 @@ server <- function(input, output, session) {
       parsed <- parse_bat_tracking_json(input$json_file$datapath)
       bat_tracking_parsed(parsed)
       
-      # If we already have CSV data, merge
       if (!is.null(csv_data_raw()) && parsed$success && !is.null(parsed$data)) {
         result <- merge_with_bat_tracking(csv_data_raw(), parsed$data)
         merge_result(result)
         
-        # Re-process with merged data
         df <- result$data
         selected_cols_to_remove <- input$columns_to_remove %||% character(0)
         
@@ -1188,26 +1200,28 @@ server <- function(input, output, session) {
     })
   })
   
-  # CSV status output
+  # CSV/Parquet status output
   output$csv_status <- renderText({
     if (is.null(input$file)) {
-      return("No CSV file uploaded yet.")
+      return("No file uploaded yet. Accepts CSV or Parquet (max 5,000 rows).")
     }
     
     if (is.null(csv_data_raw())) {
-      return("Processing CSV...")
+      return("Processing file...")
     }
     
     df <- csv_data_raw()
+    ext <- uploaded_file_type()
+    format_label <- if (ext == "parquet") "Parquet" else "CSV"
     game_id <- if ("GameID" %in% names(df)) unique(df$GameID)[1] else "Unknown"
     date_fmt <- if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"
     
     paste(
-      "✓ CSV loaded successfully!",
+      paste0("\u2713 ", format_label, " loaded successfully!"),
       paste("  Game ID:", game_id),
       paste("  Rows:", nrow(df)),
       paste("  Columns:", ncol(df)),
-      paste("✓ Date format:", date_fmt),
+      paste("\u2713 Date format:", date_fmt),
       sep = "\n"
     )
   })
@@ -1224,11 +1238,11 @@ server <- function(input, output, session) {
     }
     
     if (!parsed$success) {
-      return(paste("✗", parsed$message))
+      return(paste("\u2717", parsed$message))
     }
     
     paste(
-      "✓ JSON parsed successfully!",
+      "\u2713 JSON parsed successfully!",
       paste("  Game Reference:", parsed$game_reference),
       paste("  Plays found:", parsed$plays_count %||% 0),
       sep = "\n"
@@ -1253,13 +1267,12 @@ server <- function(input, output, session) {
     }
     
     if (is.null(parsed$data) || is.null(result)) {
-      # Check game ID match
       csv_game <- if ("GameID" %in% names(csv)) unique(csv$GameID)[1] else NULL
       json_game <- parsed$game_reference
       
       if (!is.null(csv_game) && !is.null(json_game) && csv_game != json_game) {
         return(div(class = "merge-status-box merge-warning",
-                   h4("⚠ Game ID Mismatch", style = "margin-top: 0; color: #856404;"),
+                   h4("\u26A0 Game ID Mismatch", style = "margin-top: 0; color: #856404;"),
                    p(paste("CSV Game:", csv_game)),
                    p(paste("JSON Game:", json_game)),
                    p("Files may be from different games!")
@@ -1272,20 +1285,19 @@ server <- function(input, output, session) {
       ))
     }
     
-    # Check game ID match
     csv_game <- if ("GameID" %in% names(csv)) unique(csv$GameID)[1] else NULL
     json_game <- parsed$game_reference
     game_match <- is.null(csv_game) || is.null(json_game) || csv_game == json_game
     
     if (result$matched > 0) {
       div(class = "merge-status-box merge-success",
-          h4("✓ Merge Successful!", style = "margin-top: 0; color: #155724;"),
+          h4("\u2713 Merge Successful!", style = "margin-top: 0; color: #155724;"),
           p(paste("Matched:", result$matched, "of", result$total_bat, "bat tracking records")),
-          if (!game_match) p(style = "color: #856404;", "⚠ Note: Game IDs differ but PitchUIDs matched")
+          if (!game_match) p(style = "color: #856404;", "\u26A0 Note: Game IDs differ but PitchUIDs matched")
       )
     } else {
       div(class = "merge-status-box merge-warning",
-          h4("⚠ No Matches Found", style = "margin-top: 0; color: #856404;"),
+          h4("\u26A0 No Matches Found", style = "margin-top: 0; color: #856404;"),
           p(paste("0 of", result$total_bat, "bat tracking records matched")),
           if (!game_match) p(paste("Game ID mismatch: CSV =", csv_game, ", JSON =", json_game))
       )
@@ -1316,7 +1328,6 @@ server <- function(input, output, session) {
       ))
     }
     
-    # Show summary
     div(
       div(class = "row",
           div(class = "col-md-4",
@@ -1350,7 +1361,6 @@ server <- function(input, output, session) {
       return(NULL)
     }
     
-    # Filter to rows with bat tracking data
     if ("BatSpeed_Sensor" %in% names(df)) {
       bat_rows <- df %>%
         filter(!is.na(BatSpeed_Sensor)) %>%
@@ -1394,35 +1404,32 @@ server <- function(input, output, session) {
     selected_cols_to_remove <- input$columns_to_remove %||% character(0)
     removed_cols <- intersect(selected_cols_to_remove, names(original_df))
     result <- merge_result()
+    ext <- uploaded_file_type()
+    format_label <- if (ext == "parquet") "Parquet" else "CSV"
     
     removed_cols_text <- if (length(removed_cols) > 0) {
-      cols_display <- if (length(removed_cols) > 5) {
-        paste(paste(head(removed_cols, 5), collapse = ", "), "...")
-      } else {
-        paste(removed_cols, collapse = ", ")
-      }
-      paste("✓ Removed columns:", length(removed_cols))
+      paste("\u2713 Removed columns:", length(removed_cols))
     } else {
-      "✓ Removed columns: 0"
+      "\u2713 Removed columns: 0"
     }
     
     bat_tracking_text <- if (!is.null(result) && result$matched > 0) {
-      paste("✓ Bat tracking merged:", result$matched, "pitches")
+      paste("\u2713 Bat tracking merged:", result$matched, "pitches")
     } else if (!is.null(bat_tracking_parsed())) {
-      "⚠ Bat tracking: No matches"
+      "\u26A0 Bat tracking: No matches"
     } else {
-      "○ Bat tracking: Not uploaded"
+      "\u25CB Bat tracking: Not uploaded"
     }
     
     summary_text <- paste(
-      "✓ File processed successfully!",
-      paste("✓ Original columns:", ncol(original_df)),
-      paste("✓ Final columns:", ncol(df)),
-      paste("✓ Rows processed:", nrow(df)),
+      paste0("\u2713 ", format_label, " file processed successfully!"),
+      paste("\u2713 Original columns:", ncol(original_df)),
+      paste("\u2713 Final columns:", ncol(df)),
+      paste("\u2713 Rows processed:", nrow(df)),
       removed_cols_text,
       bat_tracking_text,
-      "✓ Duplicates removed",
-      paste("✓ Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
+      "\u2713 Duplicates removed",
+      paste("\u2713 Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
       sep = "\n"
     )
     
@@ -1533,23 +1540,23 @@ server <- function(input, output, session) {
                         selected = clicked_pitch$TaggedPitchType)
       
       showModal(modalDialog(
-  title = "Edit Pitch Type",
-  div(style = "padding: 20px;",
-      h4("Selected Pitch Details:", style = "color: darkcyan;"),
-      verbatimTextOutput("selected_pitch_info"),
-      br(),
-      selectInput("modal_new_pitch_type", "Change Pitch Type To:",
-                  choices = c("Fastball", "Sinker", "Cutter", "Slider", 
-                              "Curveball", "ChangeUp", "Splitter", "Knuckleball", "Sweeper","Other"),
-                  selected = clicked_pitch$TaggedPitchType),
-      br(),
-      actionButton("update_pitch", "Update Pitch Type", class = "btn-primary btn-lg"),
-      actionButton("cancel_edit", "Cancel", class = "btn-default")
-  ),
-  footer = NULL,
-  size = "m",
-  easyClose = TRUE
-))
+        title = "Edit Pitch Type",
+        div(style = "padding: 20px;",
+            h4("Selected Pitch Details:", style = "color: darkcyan;"),
+            verbatimTextOutput("selected_pitch_info"),
+            br(),
+            selectInput("modal_new_pitch_type", "Change Pitch Type To:",
+                        choices = c("Fastball", "Sinker", "Cutter", "Slider", 
+                                    "Curveball", "ChangeUp", "Splitter", "Knuckleball", "Sweeper","Other"),
+                        selected = clicked_pitch$TaggedPitchType),
+            br(),
+            actionButton("update_pitch", "Update Pitch Type", class = "btn-primary btn-lg"),
+            actionButton("cancel_edit", "Cancel", class = "btn-default")
+        ),
+        footer = NULL,
+        size = "m",
+        easyClose = TRUE
+      ))
     }
   })
   
@@ -1649,7 +1656,6 @@ server <- function(input, output, session) {
       closest_idx <- which.min(distances)
       hover_pitch <- pitcher_data[closest_idx, ]
       
-      # Include bat tracking info if available
       bat_info <- ""
       if ("BatSpeed_Sensor" %in% names(hover_pitch) && !is.na(hover_pitch$BatSpeed_Sensor)) {
         bat_info <- paste(" | Bat Speed:", round(hover_pitch$BatSpeed_Sensor, 1), "mph")
@@ -1697,7 +1703,6 @@ server <- function(input, output, session) {
     
     total_pitches <- nrow(movement_stats)
     
-    # Check if bat tracking columns exist
     has_bat_speed <- "BatSpeed_Sensor" %in% names(movement_stats)
     
     summary_stats <- movement_stats %>%
@@ -1711,11 +1716,11 @@ server <- function(input, output, session) {
         `Avg HB` = sprintf("%.1f", mean(HorzBreak, na.rm = TRUE)),
         `Avg Spin` = ifelse("SpinRate" %in% names(movement_stats),
                            sprintf("%.0f", mean(SpinRate, na.rm = TRUE)),
-                           "—"),
+                           "\u2014"),
         `Avg Bat Speed` = if (has_bat_speed) {
           bat_vals <- BatSpeed_Sensor[!is.na(BatSpeed_Sensor)]
-          if (length(bat_vals) > 0) sprintf("%.1f", mean(bat_vals)) else "—"
-        } else "—",
+          if (length(bat_vals) > 0) sprintf("%.1f", mean(bat_vals)) else "\u2014"
+        } else "\u2014",
         `Zone%` = sprintf("%.1f%%", round(mean(in_zone, na.rm = TRUE) * 100, 1)),
         `Whiff%` = sprintf("%.1f%%", round(mean(is_whiff, na.rm = TRUE) * 100, 1)),
         .groups = "drop"
@@ -1748,12 +1753,11 @@ server <- function(input, output, session) {
         info_lines <- c(info_lines, paste("Spin Rate:", round(pitch_data$SpinRate, 0), "rpm"))
       }
       
-      # Add bat tracking info if available
       if ("BatSpeed_Sensor" %in% names(pitch_data) && !is.na(pitch_data$BatSpeed_Sensor)) {
         info_lines <- c(info_lines, 
                         paste("Bat Speed:", round(pitch_data$BatSpeed_Sensor, 1), "mph"),
-                        paste("Vertical Attack Angle:", round(pitch_data$VerticalAttackAngle_Sensor, 1), "°"),
-                        paste("Horizontal Attack Angle:", round(pitch_data$HorizontalAttackAngle_Sensor, 1), "°"))
+                        paste("Vertical Attack Angle:", round(pitch_data$VerticalAttackAngle_Sensor, 1), "\u00B0"),
+                        paste("Horizontal Attack Angle:", round(pitch_data$HorizontalAttackAngle_Sensor, 1), "\u00B0"))
       }
       
       if ("Date" %in% names(pitch_data) && !is.na(pitch_data$Date)) {
@@ -1791,7 +1795,7 @@ server <- function(input, output, session) {
       plot_data(current_data)
       processed_data(current_data)
       
-removeModal()
+      removeModal()
       
       showNotification(
         paste("Updated pitch from", pitch_info$original_type, "to", input$modal_new_pitch_type), 
@@ -1804,7 +1808,7 @@ removeModal()
   
   # Cancel edit
   observeEvent(input$cancel_edit, {
-   removeModal()
+    removeModal()
     selected_pitch(NULL)
   })
   
@@ -1854,6 +1858,7 @@ removeModal()
               "TaggedPitchType column not available"
             }),
       bat_tracking_summary,
+      paste("Source format:", toupper(uploaded_file_type())),
       paste("Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
       sep = "\n"
     )
@@ -1861,13 +1866,21 @@ removeModal()
     return(summary_text)
   })
   
-  # Download handler
+  # ── Download handler: CSV or Parquet with custom filename ──
   output$downloadData <- downloadHandler(
     filename = function() {
-      paste("app_ready_COA_", Sys.Date(), ".csv", sep = "")
+      base_name <- gsub("[^A-Za-z0-9_\\-]", "_", input$download_filename)
+      if (nchar(trimws(base_name)) == 0) base_name <- paste0("app_ready_COA_", Sys.Date())
+      
+      ext <- input$download_format
+      paste0(base_name, ".", ext)
     },
     content = function(file) {
-      write.csv(processed_data(), file, row.names = FALSE)
+      if (input$download_format == "parquet") {
+        arrow::write_parquet(processed_data(), file)
+      } else {
+        write.csv(processed_data(), file, row.names = FALSE)
+      }
     }
   )
 
@@ -1875,7 +1888,6 @@ removeModal()
 
   #SCRAPER STUFF
 
-  #Handles the middle column where it is dynamically based off the left column
   output$scrape_options <- renderUI({
     switch(input$scrape_source,
       "pbp" = tagList(
@@ -1965,7 +1977,6 @@ observe({
     if (conclusion == "success") {
       scrape_status_msg("GitHub finished! Fetching data...")
       
-      # Auto-fetch the CSV
       filename <- paste0(input$scrape_source, "_", input$start_date, "_to_", input$end_date, ".csv.gz")
       url <- paste0("https://api.github.com/repos/", gh_repo, "/contents/data/", filename)
       
@@ -1986,7 +1997,8 @@ observe({
           NULL
         }
       }, error = function(e) { NULL })
-            if (!is.null(data) && nrow(data) > 0) {
+      
+      if (!is.null(data) && nrow(data) > 0) {
         
         if (input$scrape_source == "pbp") {
           scrape_status_msg("Processing data...")
@@ -2002,7 +2014,7 @@ observe({
         }
         
         scraped_data(data)
-        scrape_status_msg(paste0("Done! ", nrow(data), " rows × ", ncol(data), " columns."))
+        scrape_status_msg(paste0("Done! ", nrow(data), " rows \u00D7 ", ncol(data), " columns."))
       } else {
         scrape_status_msg("Scrape finished but couldn't fetch the file. Try 'Fetch Results' manually.")
       }