Robot/fd
1
0
Fork 0
mirror of https://github.com/sharkdp/fd.git synced 2024-11-18 09:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle OS-specific path separators when manipulating paths

Browse source
This commit is contained in:
Michael Aaron Murphy 2017-10-15 11:20:55 -04:00
parent 2a23905af5
commit 16eed82ca1
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/exec/paths.rs
View file

@ -1,7 +1,9 @@
use std::path::MAIN_SEPARATOR;
pub fn basename(input: &str) -> &str { pub fn basename(input: &str) -> &str {
let mut index = 0; let mut index = 0;
for (id, character) in input.bytes().enumerate() { for (id, character) in input.char_indices() {
if character == b'/' { if character == MAIN_SEPARATOR {
index = id; index = id;
} }
} }
@ -17,11 +19,11 @@ pub fn remove_extension(input: &str) -> &str {
let mut dir_index = 0; let mut dir_index = 0;
let mut ext_index = 0; let mut ext_index = 0;
for (id, character) in input.bytes().enumerate() { for (id, character) in input.char_indices() {
if character == b'/' { if character == MAIN_SEPARATOR {
dir_index = id; dir_index = id;
} }
if character == b'.' { if character == '.' {
ext_index = id; ext_index = id;
} }
} }
@ -36,8 +38,8 @@ pub fn remove_extension(input: &str) -> &str {
pub fn dirname(input: &str) -> &str { pub fn dirname(input: &str) -> &str {
let mut index = 0; let mut index = 0;
for (id, character) in input.bytes().enumerate() { for (id, character) in input.char_indices() {
if character == b'/' { if character == MAIN_SEPARATOR {
index = id; index = id;
} }
} }
@ -48,6 +50,12 @@ pub fn dirname(input: &str) -> &str {
mod tests { mod tests {
use super::*; use super::*;
fn correct(input: &str) -> String {
let mut sep = String::new();
sep.push(MAIN_SEPARATOR);
input.replace('/', &sep)
}
#[test] #[test]
fn path_remove_ext_simple() { fn path_remove_ext_simple() {
assert_eq!(remove_extension("foo.txt"), "foo"); assert_eq!(remove_extension("foo.txt"), "foo");
@ -55,7 +63,10 @@ mod tests {
#[test] #[test]
fn path_remove_ext_dir() { fn path_remove_ext_dir() {
assert_eq!(remove_extension("dir/foo.txt"), "dir/foo"); assert_eq!(
remove_extension(&correct("dir/foo.txt")),
&correct("dir/foo")
);
} }
#[test] #[test]
@ -80,7 +91,7 @@ mod tests {
#[test] #[test]
fn path_basename_dir() { fn path_basename_dir() {
assert_eq!(basename("dir/foo.txt"), "foo.txt"); assert_eq!(basename(&correct("dir/foo.txt")), "foo.txt");
} }
#[test] #[test]
@ -90,8 +101,8 @@ mod tests {
#[test] #[test]
fn path_basename_utf8() { fn path_basename_utf8() {
assert_eq!(basename("💖/foo.txt"), "foo.txt"); assert_eq!(basename(&correct("💖/foo.txt")), "foo.txt");
assert_eq!(basename("dir/💖.txt"), "💖.txt"); assert_eq!(basename(&correct("dir/💖.txt")), "💖.txt");
} }
#[test] #[test]
@ -101,13 +112,13 @@ mod tests {
#[test] #[test]
fn path_dirname_dir() { fn path_dirname_dir() {
assert_eq!(dirname("dir/foo.txt"), "dir"); assert_eq!(dirname(&correct("dir/foo.txt")), "dir");
} }
#[test] #[test]
fn path_dirname_utf8() { fn path_dirname_utf8() {
assert_eq!(dirname("💖/foo.txt"), "💖"); assert_eq!(dirname(&correct("💖/foo.txt")), "💖");
assert_eq!(dirname("dir/💖.txt"), "dir"); assert_eq!(dirname(&correct("dir/💖.txt")), "dir");
} }
#[test] #[test]