Normalize windows paths

Author: Zexbe

Cargo.lock

@@ -48,6 +48,9 @@ handlebars-iron = "0.22"
 params = "0.6"
 staticfile = { version = "0.4", features = [ "cache" ] }
 
+[target.'cfg(windows)'.dependencies]
+path-slash = "0.1.1"
+
 [dependencies.postgres]
 version = "0.15"
 features = [ "with-time", "with-rustc-serialize" ]

Cargo.toml

@@ -163,7 +163,6 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
 
     use std::collections::HashMap;
     let mut file_paths_and_mimes: HashMap<PathBuf, String> = HashMap::new();
-
     use futures::future::Future;
 
     let mut rt = ::tokio::runtime::Runtime::new().unwrap();
@@ -188,8 +187,13 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
             };
             let mut content: Vec<u8> = Vec::new();
             file.read_to_end(&mut content)?;
-            let bucket_path = Path::new(prefix).join(&file_path)
-                .into_os_string().into_string().unwrap();
+            
+            let bucket_path = Path::new(prefix).join(&file_path);
+
+            #[cfg(windows)] // On windows, we need to normalize \\ to / so the route logic works
+            let bucket_path = path_slash::PathBufExt::to_slash(&bucket_path).unwrap();
+            #[cfg(not(windows))]
+            let bucket_path = bucket_path.into_os_string().into_string().unwrap();
 
             let mime = {
                 let mime = cookie.buffer(&content)?;

src/db/file.rs

@@ -41,6 +41,10 @@ extern crate tokio;
 extern crate systemstat;
 extern crate rustwide;
 extern crate tempdir;
+
+#[cfg(windows)]
+extern crate path_slash;
+
 #[cfg(test)]
 extern crate once_cell;