safer backup discovery

Author: Stefan Fleck

R/BackupQueue.R

@@ -876,7 +876,7 @@ get_backups <- function(
   if (!length(potential_backups))
     return(character())
 
-  sfx_patterns <- paste0("(", sfx_patterns, ")", collapse = "|")
+  sfx_patterns <- paste0("(\\.", sfx_patterns, ")", collapse = "|")
 
   file_dir  <- dirname(origin)
   file_name <- basename(tools::file_path_sans_ext(origin))
@@ -890,7 +890,7 @@ get_backups <- function(
   )
   back_names <- basename(potential_backups)
 
-  sel <- grepl(file_name, back_names, fixed = TRUE)
+  sel <- grepl(paste0(file_name, "."), back_names, fixed = TRUE)
   sel[regexpr(file_name, back_names, fixed = TRUE) != 1] <- FALSE
 
   backups    <- potential_backups[sel]

tests/testthat/test_rotate.R

@@ -179,3 +179,26 @@ test_that("rotate works with funky filenames", {
   prune_backups(tf, 0)
   expect_length(list_backups(tf), 0)
 })
+
+
+
+
+test_that("rotate works with funky filenames 2", {
+  td2 <- file.path(td, "test")
+  dir.create(td2)
+  on.exit(unlink(td2, recursive = TRUE))
+
+  tfs <- file.path(td2, c(
+    "2021.zip",
+    "2021.q1.zip",
+    "2021.q1.test.zip",
+    "2021.q1.test.1.zip"
+  ))
+
+  file.create(tfs)
+  on.exit(unlink(td2, recursive = TRUE))
+
+  expect_length(list_backups(tfs[[1]]), 0L)
+  expect_lengt(list_backups(tfs[[2]]), 0L)
+  epect_length(list_backups(tfs[[3]]), 1L)
+})