update(html_all_figs_tables.R) minor improvements to reduce redundancy in code

Author: Schiano-NOAA

R/html_all_figs_tables.R

@@ -17,19 +17,36 @@
 html_all_figs_tables <- function(rda_dir = getwd()) {
   if (!dir.exists(fs::path(rda_dir, "rda_files"))) {
     stop("'rda_files' folder not found. Did you enter the correct argument for rda_dir?")
+  }
+  # check if dir exists and present warning message/option message
+  if (dir.exists(fs::path(getwd(), "all_tables_figures"))) {
+    question1 <- readline(
+      "The 'all_tables_figures' folder already exists within your working directory. Would you like to overwrite the files within this folder? (Y/N)"
+    )
   } else {
-    if (!dir.exists(fs::path(getwd(), "all_tables_figures"))) {
-      asar::create_tables_doc(subdir = tempdir() ,
-                              include_all = TRUE,
-                              rda_dir = rda_dir)
+    # indicate to proceed with function
+    question1 <- "y"
+    # create new folder for the html and qmd files
+    dir.create(fs::path(rda_dir, "all_tables_figures"))
+    doc_path <- fs::path(rda_dir, "all_tables_figures")
+  }
 
-      asar::create_figures_doc(subdir = tempdir(),
-                               include_all = TRUE,
-                               rda_dir = rda_dir)
+  if (regexpr(question1, "y", ignore.case = TRUE) == 1) {
+    asar::create_tables_doc(
+      subdir = tempdir() ,
+      include_all = TRUE,
+      rda_dir = rda_dir
+    )
 
-      tabs_figs_text <- c(readLines(fs::path(tempdir(), "08_tables.qmd")), readLines(fs::path(tempdir(), "09_figures.qmd")))
+    asar::create_figures_doc(
+      subdir = tempdir(),
+      include_all = TRUE,
+      rda_dir = rda_dir
+    )
 
-      yaml_text <-
+    tabs_figs_text <- c(readLines(fs::path(tempdir(), "08_tables.qmd")), readLines(fs::path(tempdir(), "09_figures.qmd")))
+
+    yaml_text <-
 "---
 title: 'All Tables & Figures'
 format:
@@ -39,99 +56,36 @@ format:
 ---
 "
 
-      new_html_qmd <- c(yaml_text, tabs_figs_text)
+    new_html_qmd <- c(yaml_text, tabs_figs_text)
 
-      writeLines(new_html_qmd,
-                 fs::path(getwd(), "all_tables_figures.qmd"))
-      quarto::quarto_render(
-        input = fs::path(getwd(), "all_tables_figures.qmd"),
-        output_file = "all_tables_figures.html"
-      )
+    writeLines(new_html_qmd,
+                fs::path(rda_dir, "all_tables_figures.qmd"))
+    quarto::quarto_render(
+      input = fs::path(rda_dir, "all_tables_figures.qmd"),
+      output_file = "all_tables_figures.html"
+    )
 
-      # create new folder for the html and qmd files because these can't
-      # be saved there before or while rendering
-      dir.create(fs::path(getwd(), "all_tables_figures"))
-
-      file.rename(
-        from = fs::path("all_tables_figures.html"),
-        to = fs::path(
-          getwd(),
-          "all_tables_figures",
-          "all_tables_figures.html"
-        )
+    file.rename(
+      from = fs::path("all_tables_figures.html"),
+      to = fs::path(
+        doc_path,
+        "all_tables_figures.html"
       )
+    )
 
-      file.rename(
-        from = fs::path("all_tables_figures.qmd"),
-        to = fs::path(getwd(), "all_tables_figures", "all_tables_figures.qmd")
+    file.rename(
+      from = fs::path("all_tables_figures.qmd"),
+      to = fs::path(
+        doc_path,
+        "all_tables_figures.qmd"
       )
+    )
 
-      message("The html and qmd with all tables and figures were newly created.")
-
-    } else {
-      question1 <- readline(
-          "The 'all_tables_figures' folder already exists within your working directory. Would you like to overwrite the files within this folder? (Y/N)"
-      )
+    message(
+      "The html and qmd with all tables and figures were generated and overwrote the previous versions."
+    )
 
-      if (regexpr(question1, "y", ignore.case = TRUE) == 1) {
-        asar::create_tables_doc(
-          subdir = tempdir() ,
-          include_all = TRUE,
-          rda_dir = rda_dir
-        )
-
-        asar::create_figures_doc(
-          subdir = tempdir(),
-          include_all = TRUE,
-          rda_dir = rda_dir
-        )
-
-        tabs_figs_text <- c(readLines(fs::path(tempdir(), "08_tables.qmd")), readLines(fs::path(tempdir(), "09_figures.qmd")))
-
-        yaml_text <-
-"---
-title: 'All Tables & Figures'
-format:
-  html:
-    toc: true
-    embed-resources: true
----
-"
-
-        new_html_qmd <- c(yaml_text, tabs_figs_text)
-
-        writeLines(new_html_qmd,
-                   fs::path(getwd(), "all_tables_figures.qmd"))
-        quarto::quarto_render(
-          input = fs::path(getwd(), "all_tables_figures.qmd"),
-          output_file = "all_tables_figures.html"
-        )
-
-        file.rename(
-          from = fs::path("all_tables_figures.html"),
-          to = fs::path(
-            getwd(),
-            "all_tables_figures",
-            "all_tables_figures.html"
-          )
-        )
-
-        file.rename(
-          from = fs::path("all_tables_figures.qmd"),
-          to = fs::path(
-            getwd(),
-            "all_tables_figures",
-            "all_tables_figures.qmd"
-          )
-        )
-
-        message(
-          "The html and qmd with all tables and figures were regenerated and overwrote the previous versions."
-        )
-
-      } else {
-        warning("The html and qmd with all tables and figures were not regenerated.")
-      }
-    }
+  } else {
+    warning("The html and qmd with all tables and figures were not generated.")
   }
 }