Fix handling of Windows paths with backslash

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: webshot
 Title: Take Screenshots of Web Pages
-Version: 0.5.3
+Version: 0.5.3.9000
 Authors@R: c(
     person("Winston", "Chang", email = "[email protected]", role = c("aut", "cre")),
     person("Yihui", "Xie", role = "ctb"),
@@ -20,11 +20,13 @@ Suggests:
     httpuv,
     knitr,
     rmarkdown,
-    shiny
+    shiny,
+    testthat (>= 3.0.0)
 License: GPL-2
 SystemRequirements: PhantomJS for taking screenshots, ImageMagick or
     GraphicsMagick and OptiPNG for manipulating images.
 RoxygenNote: 7.1.2
 Encoding: UTF-8
 URL: http://wch.github.io/webshot/, https://github.com/wch/webshot/
 BugReports: https://github.com/wch/webshot/issues
+Config/testthat/edition: 3

NEWS.md

@@ -1,3 +1,8 @@
+webshot 0.5.3.9000
+=============
+
+* Fixed #112: handling of Windows paths of the form "c:\file\path.html" did not work correctly. ([#114](https://github.com/wch/webshot/pull/114))
+
 webshot 0.5.3
 =============
 

R/utils.R

@@ -353,7 +353,7 @@ fix_windows_url <- function(url) {
     # If it's a "c:/path/file.html" path, or contains any backslashs, like
     # "c:\path", "\\path\\file.html", or "/path\\file.html", we need to fix it
     # up. However, we need to leave paths that are already URLs alone.
-    if (grepl("^[a-zA-Z]:/", x) ||
+    if (grepl("^[a-zA-Z]:[/\\]", x) ||
         (!grepl(":", x, fixed = TRUE) && grepl("\\", x, fixed = TRUE)))
     {
       paste0("file:///", normalizePath(x, winslash = "/"))

tests/testthat.R

@@ -0,0 +1,4 @@
+library(testthat)
+library(webshot)
+
+test_check("webshot")

tests/testthat/test-url.R

@@ -0,0 +1,23 @@
+test_that("fix_windows_url works properly", {
+  testthat::skip_if_not(is_windows())
+
+  # Should add file:/// to file paths
+  expect_equal(
+    suppressWarnings(fix_windows_url("c:/path/file.html")),
+    "file:///c:/path/file.html"
+  )
+  expect_equal(
+    suppressWarnings(fix_windows_url("c:\\path\\file.html")),
+    "file:///c:/path/file.html"
+  )
+
+  # Currently disabled because I'm not sure exactly should happen when there's
+  # not a leading drive letter like "c:"
+  # expect_equal(fix_windows_url("/path/file.html"), "file:///c:/path/file.html")
+  # expect_equal(fix_windows_url("\\path\\file.html"), "file:///c:/path/file.html")
+  # expect_equal(fix_windows_url("/path\\file.html"), "file:///c:/path/file.html")
+
+  # Shouldn't affect proper URLs
+  expect_equal(fix_windows_url("file:///c:/path/file.html"), "file:///c:/path/file.html")
+  expect_equal(fix_windows_url("http://x.org/file.html"), "http://x.org/file.html")
+})