simpler munging

mgree · Jul 8, 2021 · cfb8790 · cfb8790
1 parent 4d6c094
commit cfb8790
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 47 deletions.
diff --git a/run_tests.sh b/run_tests.sh
@@ -3,7 +3,11 @@
 if ! which ffs >/dev/null 2>&1
 then
     DEBUG="$(pwd)/target/debug"
-    [ -x "$DEBUG/ffs" ] || { echo Couldn\'t find ffs on "$PATH" or in "$DEBUG". ; exit 1 ; }
+    [ -x "$DEBUG/ffs" ] || {
+        echo Couldn\'t find ffs on "$PATH" or in "$DEBUG". >&2
+        echo Are you in the root directory of the repo? >&2
+        exit 1
+    }
     PATH="$DEBUG:$PATH"
 fi
 

diff --git a/src/config.rs b/src/config.rs
@@ -69,7 +69,6 @@ impl Config {
         let args = cli::app().get_matches();
 
         let mut config = Config::default();
-
         // generate completions?
         //
         // TODO 2021-07-06 good candidate for a subcommand
@@ -467,20 +466,13 @@ impl Config {
     }
 
     pub fn normalize_name(&self, s: String) -> String {
-        // inspired by https://en.wikipedia.org/wiki/Filename
-        s.replace(".", "dot")
-            .replace("/", "slash")
-            .replace("\\", "backslash")
-            .replace("?", "question")
-            .replace("*", "star")
-            .replace(":", "colon")
-            .replace("\"", "dquote")
-            .replace("<", "lt")
-            .replace(">", "gt")
-            .replace(",", "comma")
-            .replace(";", "semi")
-            .replace("=", "equal")
-            .replace(" ", "space")
+        if s == "." {
+            "_.".into()
+        } else if s == ".." {
+            "_..".into()
+        } else {
+            s.replace("\0", "_NUL_").replace("/", "_SLASH_")
+        }
     }
 
     #[cfg(target_os = "macos")]

diff --git a/tests/rename_fancy_restore.sh b/tests/rename_fancy_restore.sh
@@ -22,28 +22,28 @@ ffs -m "$MNT" -o "$OUT" --target json ../json/obj_rename.json &
 PID=$!
 sleep 2
 case $(ls "$MNT") in
-    (dot*dot_*dotdot*dotdot_) ;;
+    (_.*_..*dot*dotdot) ;;
     (*) fail ls;;
 esac
-[ "$(cat $MNT/dot)" = "first" ] || fail dot
-[ "$(cat $MNT/dotdot)" = "second" ] || fail dotdot
-[ "$(cat $MNT/dot_)" = "third" ] || fail dot_
-[ "$(cat $MNT/dotdot_)" = "fourth" ] || fail dotdot_
+[ "$(cat $MNT/_.)" = "first" ] || fail .
+[ "$(cat $MNT/_..)" = "second" ] || fail ..
+[ "$(cat $MNT/dot)" = "third" ] || fail dot
+[ "$(cat $MNT/dotdot)" = "fourth" ] || fail dotdot
 
-echo primo >"$MNT"/dot
-echo secondo >"$MNT"/dotdot
-echo shlishi >"$MNT"/dot_
-echo derp >"$MNT"/dotdot_
+echo primo >"$MNT"/_.
+echo secondo >"$MNT"/_..
+echo shlishi >"$MNT"/dot
+echo derp >"$MNT"/dotdot
 
 mkdir "$MNT"/it
 mkdir "$MNT"/he
 
-mv "$MNT"/dot    "$MNT"/it
-mv "$MNT"/dotdot "$MNT"/it
+mv "$MNT"/_.    "$MNT"/it
+mv "$MNT"/_.. "$MNT"/it
 
-mv "$MNT"/dot_    "$MNT"/he
+mv "$MNT"/dot    "$MNT"/he
 
-mv "$MNT"/dotdot_ "$MNT"/imnewhere
+mv "$MNT"/dotdot "$MNT"/imnewhere
 
 umount "$MNT" || fail unmount
 sleep 1

diff --git a/tests/rename_object.sh b/tests/rename_object.sh
@@ -16,16 +16,14 @@ MNT=$(mktemp -d)
 ffs -m "$MNT" ../json/obj_rename.json &
 PID=$!
 sleep 2
-cd "$MNT"
-case $(ls) in
-    (dot*dot_*dotdot*dotdot_) ;;
+case $(ls "$MNT") in
+    (_.*_..*dot*dotdot) ;;
     (*) fail ls;;
 esac
-[ "$(cat dot)" = "first" ] || fail dot
-[ "$(cat dotdot)" = "second" ] || fail dotdot
-[ "$(cat dot_)" = "third" ] || fail dot_
-[ "$(cat dotdot_)" = "fourth" ] || fail dotdot_
-cd - >/dev/null 2>&1
+[ "$(cat $MNT/_.)" = "first" ] || fail .
+[ "$(cat $MNT/_..)" = "second" ] || fail ..
+[ "$(cat $MNT/dot)" = "third" ] || fail dot
+[ "$(cat $MNT/dotdot)" = "fourth" ] || fail dotdot
 umount "$MNT" || fail unmount
 sleep 1
 

diff --git a/tests/rename_restore.sh b/tests/rename_restore.sh
@@ -22,18 +22,18 @@ ffs -m "$MNT" -o "$OUT" --target json ../json/obj_rename.json &
 PID=$!
 sleep 2
 case $(ls "$MNT") in
-    (dot*dot_*dotdot*dotdot_) ;;
+    (_.*_..*dot*dotdot) ;;
     (*) fail ls;;
 esac
-[ "$(cat $MNT/dot)" = "first" ] || fail dot
-[ "$(cat $MNT/dotdot)" = "second" ] || fail dotdot
-[ "$(cat $MNT/dot_)" = "third" ] || fail dot_
-[ "$(cat $MNT/dotdot_)" = "fourth" ] || fail dotdot_
-
-echo primo >"$MNT"/dot
-echo secondo >"$MNT"/dotdot
-echo terzo >"$MNT"/dot_
-echo quarto >"$MNT"/dotdot_
+[ "$(cat $MNT/_.)" = "first" ] || fail .
+[ "$(cat $MNT/_..)" = "second" ] || fail ..
+[ "$(cat $MNT/dot)" = "third" ] || fail dot
+[ "$(cat $MNT/dotdot)" = "fourth" ] || fail dotdot
+
+echo primo >"$MNT"/_.
+echo secondo >"$MNT"/_..
+echo terzo >"$MNT"/dot
+echo quarto >"$MNT"/dotdot
 
 umount "$MNT" || fail unmount
 sleep 1