Zander671/cl-xdg-trash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix extra escape characters in certain format codes

Browse Source
This commit is contained in:
Alexander Rosenberg
2025-10-25 19:03:35 -07:00
parent ea0face5b6
commit fa9af1d225
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clash/clash.lisp
View File

@ -910,7 +910,8 @@ return a list of many indices instead."
(merge-pathnames uiop:*wild-file-for-directory* (merge-pathnames uiop:*wild-file-for-directory*
(uiop:ensure-directory-pathname (uiop:ensure-directory-pathname
(merge-pathnames "files" dir)))))) (merge-pathnames "files" dir))))))
(format t "~A~:[~%~;~A~]" missing null #\Nul))))) (format t "~A~:[~%~;~A~]"
(uiop:native-namestring missing) null #\Nul)))))
(defun missing-file/handler (cmd) (defun missing-file/handler (cmd)
"Handler for the \"missing file\" subcommand." "Handler for the \"missing file\" subcommand."

15
clash/format.lisp
View File

@ -276,12 +276,14 @@ The recognized printf-style sequences for ~A are:
(make-format-code (make-format-code
:name #\o :name #\o
:action (lambda (stream info) :action (lambda (stream info)
(format stream "~A" (trashinfo-original-path info :resolve t))) (format stream "~A" (uiop:native-namestring
(trashinfo-original-path info :resolve t))))
:doc "the (o)riginal path (always absolute)") :doc "the (o)riginal path (always absolute)")
(make-format-code (make-format-code
:name #\O :name #\O
:action (lambda (stream info) :action (lambda (stream info)
(format stream "~A" (trashinfo-original-path info :normalize t))) (format stream "~A" (uiop:native-namestring
(trashinfo-original-path info :normalize t))))
:doc "the (o)riginal path (possibly relative)") :doc "the (o)riginal path (possibly relative)")
(make-format-code (make-format-code
:name #\n :name #\n
@ -292,17 +294,20 @@ The recognized printf-style sequences for ~A are:
(make-format-code (make-format-code
:name #\d :name #\d
:action (lambda (stream info) :action (lambda (stream info)
(format stream "~A" (trashinfo-trash-directory info))) (format stream "~A" (uiop:native-namestring
(trashinfo-trash-directory info))))
:doc "the trash (d)irectory") :doc "the trash (d)irectory")
(make-format-code (make-format-code
:name #\i :name #\i
:action (lambda (stream info) :action (lambda (stream info)
(format stream "~A" (trashinfo-info-file info))) (format stream "~A" (uiop:native-namestring
(trashinfo-info-file info))))
:doc "the trash(i)nfo file path") :doc "the trash(i)nfo file path")
(make-format-code (make-format-code
:name #\c :name #\c
:action (lambda (stream info) :action (lambda (stream info)
(format stream "~A" (trashinfo-trashed-file info))) (format stream "~A" (uiop:native-namestring
(trashinfo-trashed-file info))))
:doc "the (c)urrent (trashed) path") :doc "the (c)urrent (trashed) path")
(make-format-code (make-format-code
:name #\u :name #\u