Harden run paths

- Normalized paths instead of using a relative path.
- Added `app.py` or first detected `py` file to end of `shiny ...` command

Author: coatless

R/shinylive-quarto-apps-commands.R

@@ -26,38 +26,61 @@ create_quarto_shinylive_apps <- function(apps, output_format, output_path) {
 #'
 #' @export
 print.quarto_shinylive_apps <- function(x, ...) {
+
     # Style definitions
     path_style <- list(color = "cyan")
     cmd_style <- list(color = "yellow")
 
+
     if (x$output_format == "app-dir") {
         # Group apps by engine
         r_apps <- which(sapply(x$apps, function(x) x$engine == "r"))
         py_apps <- which(sapply(x$apps, function(x) x$engine == "python"))
 
+        # Get full normalized path for base directory
+        full_base_path <- normalizePath(x$output_path, winslash = "/", mustWork = TRUE)
+
         cli::cli_h1("Shinylive Applications")
 
         # Print R apps
         if (length(r_apps) > 0) {
-            cli::cli_h2("R Applications")
+            cli::cli_h2("Shiny for {.emph R} Applications")
             cli::cli_text("Run in {.emph R}:")
             for (app_num in r_apps) {
-                dir_path <- sprintf("%s/app_%d", x$output_path, app_num)
-                cli::cli_code(sprintf('shiny::runApp("%s")', dir_path))
+                dir_path <- file.path(full_base_path, sprintf("app_%d", app_num))
+                cli::cli_code(
+                    sprintf('shiny::runApp("%s")', dir_path),
+                    language = "r"
+                )
             }
         }
 
         # Print Python apps
         if (length(py_apps) > 0) {
             if (length(r_apps) > 0) cli::cli_text() # Add spacing
-            cli::cli_h2("Python Applications")
+            cli::cli_h2("Shiny for {.emph Python} Applications")
             cli::cli_text("Run in {.emph Terminal}:")
             for (app_num in py_apps) {
-                dir_path <- sprintf("%s/app_%d", x$output_path, app_num)
-                cli::cli_code(sprintf('shiny run --reload --launch-browser "%s"', dir_path))
+                app <- x$apps[[app_num]]
+                dir_path <- file.path(full_base_path, sprintf("app_%d", app_num))
+
+                # Find main Python file
+                file_names <- names(app$files)
+                main_py_file <- if ("app.py" %in% file_names) {
+                    "app.py"
+                } else {
+                    # Take first .py file if app.py not found
+                    py_files <- file_names[grepl("\\.py$", file_names)]
+                    if (length(py_files) > 0) py_files[1] else ""
+                }
+
+                app_path <- file.path(dir_path, main_py_file)
+                cli::cli_code(
+                    sprintf('shiny run --reload --launch-browser "%s"', app_path),
+                    language = "bash"
+                )
             }
         }
-
     } else {
         # Quarto format
         cli::cli_h1("Quarto Document with Shinylive Applications")
@@ -76,20 +99,20 @@ print.quarto_shinylive_apps <- function(x, ...) {
         if (needs_cd) {
             cli::cli_text()
             cli::cli_text("{.strong Step {current_step}:} Change to the document directory:")
-            cli::cli_code(sprintf('cd "%s"', doc_dir))
+            cli::cli_code('cd "{doc_dir}"', language = "bash")
             current_step <- current_step + 1
         }
 
         # Step: Install extension
         cli::cli_text()
         cli::cli_text("{.strong Step {current_step}:} Install the Shinylive extension:")
-        cli::cli_code("quarto add quarto-ext/shinylive")
+        cli::cli_code("quarto add quarto-ext/shinylive", language = "bash")
         current_step <- current_step + 1
 
         # Step: Preview document
         cli::cli_text()
         cli::cli_text("{.strong Step {current_step}:} Preview the document:")
-        cli::cli_code(sprintf('quarto preview "%s"', doc_name))
+        cli::cli_code('quarto preview "{doc_name}"', language = "bash")
 
         # Add summary of contained apps
         cli::cli_text()
@@ -103,6 +126,5 @@ print.quarto_shinylive_apps <- function(x, ...) {
         ))
     }
 
-    # Add invisible return
     invisible(x)
 }

R/shinylive-standalone-app-commands.R

@@ -26,24 +26,50 @@ create_standalone_shinylive_app <- function(app_data, output_dir, url) {
 #'
 #' @export
 print.standalone_shinylive_app <- function(x, ...) {
+
+
     # First detect if it's an R or Python app by looking at file extensions
     files_list <- if(is.list(x$files[[1]])) x$files else list(x$files)
     file_names <- sapply(files_list, function(f) f$name)
 
+    # Check if there are R or Python files
     is_r_app <- any(grepl("\\.R$", file_names))
     is_python_app <- any(grepl("\\.py$", file_names))
 
+    # Find main Python file (prefer app.py, but take first .py if not found)
+    main_py_file <- if (is_python_app) {
+        app_py <- file_names[file_names == "app.py"]
+        if (length(app_py) > 0) {
+            app_py[1]
+        } else {
+            py_files <- file_names[grepl("\\.py$", file_names)]
+            if (length(py_files) > 0) py_files[1] else NULL
+        }
+    } else {
+        NULL
+    }
+
+    # Normalized the output path
+    full_path <- normalizePath(x$output_dir, winslash = "/", mustWork = TRUE)
+
     cli::cli_h1("Standalone Shinylive Application")
 
-    # Show app type and run command
+    # Show app type and run command with appropriate syntax highlighting
     if (is_r_app) {
-        cli::cli_text("Type: {.emph R Shiny}")
+        cli::cli_text("Type: {.emph R} Shiny")
         cli::cli_text("Run in {.emph R}:")
-        cli::cli_code(sprintf('shiny::runApp("%s")', x$output_dir))
+        cli::cli_code(
+            sprintf('shiny::runApp("%s")', full_path),
+            language = "r"
+        )
     } else if (is_python_app) {
-        cli::cli_text("Type: {.emph Python Shiny}")
+        dir_path <- file.path(full_path, main_py_file)
+        cli::cli_text("Type: {.emph Python} Shiny")
         cli::cli_text("Run in {.emph Terminal}:")
-        cli::cli_code(sprintf('shiny run --reload --launch-browser "%s"', x$output_dir))
+        cli::cli_code(
+            sprintf('shiny run --reload --launch-browser "%s"', dir_path),
+            language = "bash"
+        )
     }
 
     # Add contents section
@@ -72,7 +98,7 @@ print.standalone_shinylive_app <- function(x, ...) {
 
     # Add location information
     cli::cli_text()
-    cli::cli_text("Location: {.file {x$output_dir}}")
+    cli::cli_text("Location: {.path {full_path}}")
 
     invisible(x)
 }