Use common escape_path

Author: l4l

src/crates/git.rs

@@ -4,21 +4,8 @@ use crate::prepare::PrepareError;
 use crate::Workspace;
 use failure::{Error, ResultExt};
 use log::{info, warn};
-use percent_encoding::{percent_encode, AsciiSet, CONTROLS};
 use std::path::{Path, PathBuf};
 
-const ENCODE_SET: AsciiSet = CONTROLS
-    .add(b'/')
-    .add(b'\\')
-    .add(b'<')
-    .add(b'>')
-    .add(b':')
-    .add(b'"')
-    .add(b'|')
-    .add(b'?')
-    .add(b'*')
-    .add(b' ');
-
 pub(super) struct GitRepo {
     url: String,
 }
@@ -54,7 +41,7 @@ impl GitRepo {
         workspace
             .cache_dir()
             .join("git-repos")
-            .join(percent_encode(self.url.as_bytes(), &ENCODE_SET).to_string())
+            .join(crate::utils::escape_path(self.url.as_bytes()))
     }
 
     fn suppress_password_prompt_args(&self, workspace: &Workspace) -> Vec<String> {

src/crates/registry.rs

@@ -90,11 +90,7 @@ impl AlternativeRegistry {
     }
 
     fn index_folder(&self) -> String {
-        // https://en.wikipedia.org/wiki/Comparison_of_file_systems#Limits
-        self.registry_index.as_str().replace(
-            &['/', '\\', '<', '>', '|', '?', '*', '"', ':', '.'][..],
-            &"-",
-        )
+        crate::utils::escape_path(self.registry_index.as_bytes())
     }
 }
 

src/utils.rs

@@ -1,9 +1,26 @@
 use failure::Error;
 use fs2::FileExt;
 use log::warn;
+use percent_encoding::{AsciiSet, CONTROLS};
 use std::fs::OpenOptions;
 use std::path::{Component, Path, PathBuf, Prefix, PrefixComponent};
 
+const ENCODE_SET: AsciiSet = CONTROLS
+    .add(b'/')
+    .add(b'\\')
+    .add(b'<')
+    .add(b'>')
+    .add(b':')
+    .add(b'"')
+    .add(b'|')
+    .add(b'?')
+    .add(b'*')
+    .add(b' ');
+
+pub(crate) fn escape_path(unescaped: &[u8]) -> String {
+    percent_encoding::percent_encode(unescaped, &ENCODE_SET).to_string()
+}
+
 pub(crate) fn file_lock<T>(
     path: &Path,
     msg: &str,