perf(fuzzyhelp): use memoise to improve response

atusy · May 7, 2024 · fae1d97 · fae1d97
1 parent a4ed5a5
commit fae1d97
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/R/fuzzyhelp.R b/R/fuzzyhelp.R
@@ -189,15 +189,15 @@ adist2 <- function(x, y, case_sensitive) {
 }
 
 score_toc_filtered <- list(
-  fzf = function(toc, queries) {
+  fzf = function(toc, queries, ..., score_matrix = score_matrix) {
     query_chars_list <- split_chars(queries)
     score <- score_matrix(toc$Package, query_chars_list, extra_bonus = FALSE)
     topic <- score_matrix(toc$Topic, query_chars_list, extra_bonus = FALSE)
     right <- score < topic
     score[right] <- topic[right]
     return(-colSums(score))
   },
-  lv = function(toc, queries) {
+  lv = function(toc, queries, ...) {
     res <- adist2(toc$Package, queries)
     topic <- adist2(toc$Topic, queries)
     right <- res > topic
@@ -217,7 +217,7 @@ detect <- function(package, topic, query, case_sensitive) {
   return(d)
 }
 
-score_toc <- function(toc, queries, method = c("fzf", "lv")) {
+score_toc <- function(toc, queries, method = c("fzf", "lv"), ...) {
   n <- nrow(toc)
   score <- rep(NA_integer_, n)
   method <- match.arg(method)
@@ -247,7 +247,7 @@ score_toc <- function(toc, queries, method = c("fzf", "lv")) {
 
   # Calculate and return score for filtered items
   score[prefilter] <- score_toc_filtered[[method]](
-    toc[prefilter, ], unique_queries
+    toc[prefilter, ], unique_queries, ...
   )
   return(score)
 }
@@ -304,10 +304,17 @@ create_server <- function(
     helpPort = NULL,
     rstudioServer = FALSE) {
   method <- match.arg(method)
+  toc <- create_toc()
+  score_matrix2 <- memoise::memoise(score_matrix)
+  search_toc2 <- search_toc
   function(input, output) {
-    toc <- create_toc()
     reactiveQueries <- shiny::reactive(parse_query(input$query))
-    reactiveToc <- shiny::reactive(search_toc(toc, reactiveQueries(), method = method))
+    reactiveToc <- shiny::reactive(search_toc2(
+      toc,
+      reactiveQueries(),
+      method = method,
+      score_matrix = score_matrix2
+    ))
     reactiveTocViewer <- shiny::reactive(local({
       toc_matched <- dplyr::mutate(
         reactiveToc(),