From bc95ce269e75ac67ebd17ed0e8d033b80131ac7c Mon Sep 17 00:00:00 2001 From: lijunsong Date: Sun, 10 Apr 2016 23:49:11 -0700 Subject: [PATCH] fix #16 remove-ext doesn't work. The problem was remove-ext (and remove-ext*) function checked the given path for hidden files. This fix lets remove-ext check file name of the given path. --- sugar/file.rkt | 20 ++++++++++++-------- sugar/test/main.rkt | 8 ++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sugar/file.rkt b/sugar/file.rkt index 9a37eae..e3e1e5d 100644 --- a/sugar/file.rkt +++ b/sugar/file.rkt @@ -45,8 +45,9 @@ (define+provide+safe (remove-ext x) (pathish? . -> . path?) ;; pass through hidden files (those starting with a dot) - (let ([x (->path x)]) - (if ((->string x) . starts-with? . ".") + (let* ([x (->path x)] + [x-name (file-name-from-path x)]) + (if ((->string x-name) . starts-with? . ".") x (path-replace-suffix x "")))) @@ -54,11 +55,14 @@ ;; take all extensions off path (define+provide+safe (remove-ext* x) (pathish? . -> . path?) + (define (remove* p) + (let ([path-with-removed-ext (path-replace-suffix p "")]) + (if (equal? p path-with-removed-ext) + p + (remove* path-with-removed-ext)))) ;; pass through hidden files (those starting with a dot) - (let ([x (->path x)]) - (if ((->string x) . starts-with? . ".") + (let ([x (->path x)] + [x-name (file-name-from-path x)]) + (if ((->string x-name) . starts-with? . ".") x - (let ([path-with-removed-ext (remove-ext x)]) - (if (equal? x path-with-removed-ext) - x - (remove-ext* path-with-removed-ext)))))) \ No newline at end of file + (remove* x)))) \ No newline at end of file diff --git a/sugar/test/main.rkt b/sugar/test/main.rkt index e779373..0833e9d 100644 --- a/sugar/test/main.rkt +++ b/sugar/test/main.rkt @@ -154,12 +154,20 @@ (check-equal? (remove-ext foo.txt-path) foo-path) (check-equal? (remove-ext foo.bar.txt-path) foo.bar-path) (check-not-equal? (remove-ext foo.bar.txt-path) foo-path) ; does not remove all extensions + ;; test remove-ext on paths that have "." prefix + (check-equal? (remove-ext (->path "./foo.txt.bar")) (->path "./foo.txt")) + (check-equal? (remove-ext (->path "../foo.txt.bar")) (->path "../foo.txt")) + (check-equal? (remove-ext (->path "/hidden/file/.foo.txt.bar")) (->path "/hidden/file/.foo.txt.bar")) ; hidden file won't change (check-equal? (remove-ext* foo-path) foo-path) (check-equal? (remove-ext* foo.txt-path) foo-path) (check-equal? (remove-ext* (->path ".foo.txt")) (->path ".foo.txt")) (check-not-equal? (remove-ext* foo.bar.txt-path) foo.bar-path) ; removes more than one ext (check-equal? (remove-ext* foo.bar.txt-path) foo-path) + ;; test remove-ext* on paths that have "." prefix + (check-equal? (remove-ext* (->path "./foo.txt.bar")) (->path "./foo")) + (check-equal? (remove-ext* (->path "../foo.txt.bar")) (->path "../foo")) + (check-equal? (remove-ext* (->path "/hidden/file/.foo.txt.bar")) (->path "/hidden/file/.foo.txt.bar")) ; hidden file won't change (check-true (has-binary-ext? "foo.MP3")) (check-false (has-binary-ext? "foo.py")) -- 2.25.1