Update app.R

app.R

@@ -20,7 +20,7 @@ library(gridExtra)
 library(png)
 library(xgboost)
 library(httr)
-#library(magick)
+library(jpeg)
 
 pdf(file = NULL)
 Sys.setenv(TZ='EST')
@@ -28,12 +28,24 @@ Sys.setenv(TZ='EST')
 # Helper functions
 download_and_process_image <- function(url) {
   tryCatch({
-    temp_file <- tempfile(fileext = ".jpg")
-    download.file(url, temp_file, mode = "wb")
-    img <- image_read(temp_file)
-    png_file <- tempfile(fileext = ".png")
-    image_write(img, path = png_file, format = "png")
-    return(png_file)
+    response <- GET(url)
+    content_type <- http_type(response)
+    
+    if (content_type %in% c("image/png", "image/jpeg")) {
+      temp_file <- tempfile(fileext = ifelse(content_type == "image/png", ".png", ".jpg"))
+      writeBin(content(response, "raw"), temp_file)
+      
+      if (content_type == "image/png") {
+        img <- readPNG(temp_file)
+      } else {
+        img <- readJPEG(temp_file)
+      }
+      
+      return(list(img = img, type = content_type))
+    } else {
+      warning(paste("Unsupported image type:", content_type))
+      return(NULL)
+    }
   }, error = function(e) {
     warning(paste("Error processing image:", e$message))
     return(NULL)
@@ -453,23 +465,13 @@ server <- function(input, output, session) {
       mlb_url <- paste0("https://midfield.mlbstatic.com/v1/people/", id, "/mlb/300?circle=false")
       milb_url <- paste0("https://midfield.mlbstatic.com/v1/people/", id, "/milb/300?circle=false")
       
-      img_file <- tryCatch({
-        download_and_process_image(mlb_url)
-      }, error = function(e) {
-        NULL
-      })
-      
-      if (is.null(img_file)) {
-        img_file <- tryCatch({
-          download_and_process_image(milb_url)
-        }, error = function(e) {
-          NULL
-        })
+      img_result <- download_and_process_image(mlb_url)
+      if (is.null(img_result)) {
+        img_result <- download_and_process_image(milb_url)
       }
       
-      if (!is.null(img_file)) {
-        img <- readPNG(img_file)
-        img_grob <- rasterGrob(img, interpolate = TRUE)
+      if (!is.null(img_result)) {
+        img_grob <- rasterGrob(img_result$img, interpolate = TRUE)
       } else {
         img_grob <- textGrob("Image not available", gp = gpar(col = "red", fontsize = 20))
       }