Archives
/
xplr
mirror of https://github.com/sayanarijit/xplr
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shell escape file paths in logs

Browse Source
pull/522/head
Arijit Basu 2 years ago committed by Arijit Basu
parent 1e820030a0
commit 111a648818
3 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
docs/en/src/environment-variables-and-pipes.md
Unescape Escape View File

@ -44,7 +44,7 @@ called ["pipe"s][18].
The other variables are single-line variables containing simple information:
- [XPLR][30]
- [XPLR][38]
- [XPLR_APP_VERSION][30]
- [XPLR_FOCUS_INDEX][31]
- [XPLR_FOCUS_PATH][32]

2
src/cli.rs
Unescape Escape View File

@ -193,7 +193,7 @@ pub fn pipe_msg_in(args: Vec<String>) -> Result<()> {
File::options()
.append(true)
.open(&path)?
.write(msg.as_bytes())?;
.write_all(msg.as_bytes())?;
Ok(())
}

61
src/init.lua
Unescape Escape View File

@ -1364,12 +1364,13 @@ xplr.config.modes.builtin.go_to_path = {
{
BashExecSilently0 = [===[
PTH=${XPLR_INPUT_BUFFER}
PTH_ESC=$(printf %q "$PTH")
if [ -d "$PTH" ]; then
"$XPLR" -m 'ChangeDirectory: %q' "$PTH"
"$XPLR" -m 'ChangeDirectory: %q' "$PTH_ESC"
elif [ -e "$PTH" ]; then
"$XPLR" -m 'FocusPath: %q' "$PTH"
"$XPLR" -m 'FocusPath: %q' "$PTH_ESC"
else
"$XPLR" -m 'LogError: %q' "could not find $PTH"
"$XPLR" -m 'LogError: %q' "could not find $PTH_ESC"
fi
]===],
},
@ -1403,11 +1404,12 @@ xplr.config.modes.builtin.selection_ops = {
messages = {
{
BashExec0 = [===[
(while IFS= read -r -d '' LINE; do
if cp -vr -- "${LINE:?}" ./; then
"$XPLR" -m 'LogSuccess: %q' "$LINE copied to ."
(while IFS= read -r -d '' PTH; do
PTH_ESC=$(printf %q "$PTH")
if cp -vr -- "${PTH:?}" ./; then
"$XPLR" -m 'LogSuccess: %q' "$PTH_ESC copied to ."
else
"$XPLR" -m 'LogError: %q' "Failed to copy $LINE to ."
"$XPLR" -m 'LogError: %q' "Failed to copy $PTH_ESC to ."
fi
done < "${XPLR_PIPE_SELECTION_OUT:?}")
"$XPLR" -m ExplorePwdAsync
@ -1423,11 +1425,12 @@ xplr.config.modes.builtin.selection_ops = {
messages = {
{
BashExec0 = [===[
(while IFS= read -r -d '' LINE; do
if mv -v -- "${LINE:?}" ./; then
"$XPLR" -m 'LogSuccess: %q' "$LINE moved to ."
(while IFS= read -r -d '' PTH; do
PTH_ESC=$(printf %q "$PTH")
if mv -v -- "${PTH:?}" ./; then
"$XPLR" -m 'LogSuccess: %q' "$PTH_ESC moved to ."
else
"$XPLR" -m 'LogError: %q' "Failed to move $LINE to ."
"$XPLR" -m 'LogError: %q' "Failed to move $PTH_ESC to ."
fi
done < "${XPLR_PIPE_SELECTION_OUT:?}")
"$XPLR" -m ExplorePwdAsync
@ -1495,11 +1498,12 @@ xplr.config.modes.builtin.create_directory = {
{
BashExecSilently0 = [===[
PTH="$XPLR_INPUT_BUFFER"
PTH_ESC=$(printf %q "$PTH")
if [ "$PTH" ]; then
mkdir -p -- "$PTH" \
&& "$XPLR" -m 'SetInputBuffer: ""' \
&& "$XPLR" -m ExplorePwd \
&& "$XPLR" -m 'LogSuccess: %q' "$PTH created" \
&& "$XPLR" -m 'LogSuccess: %q' "$PTH_ESC created" \
&& "$XPLR" -m 'FocusPath: %q' "$PTH"
else
"$XPLR" -m PopMode
@ -1537,11 +1541,12 @@ xplr.config.modes.builtin.create_file = {
{
BashExecSilently0 = [===[
PTH="$XPLR_INPUT_BUFFER"
PTH_ESC=$(printf %q "$PTH")
if [ "$PTH" ]; then
mkdir -p -- "$(dirname $PTH)" \
&& touch -- "$PTH" \
&& "$XPLR" -m 'SetInputBuffer: ""' \
&& "$XPLR" -m 'LogSuccess: %q' "$PTH created" \
&& "$XPLR" -m 'LogSuccess: %q' "$PTH_ESC created" \
&& "$XPLR" -m 'ExplorePwd' \
&& "$XPLR" -m 'FocusPath: %q' "$PTH"
else
@ -1652,8 +1657,8 @@ xplr.config.modes.builtin.go_to = {
exit 1
fi
fi
(while IFS= read -r -d '' LINE; do
$OPENER "${LINE:?}" > /dev/null 2>&1
(while IFS= read -r -d '' PTH; do
$OPENER "${PTH:?}" > /dev/null 2>&1
done < "${XPLR_PIPE_RESULT_OUT:?}")
]===],
},
@ -1761,11 +1766,12 @@ xplr.config.modes.builtin.delete = {
messages = {
{
BashExec0 = [===[
(while IFS= read -r -d '' LINE; do
if rm -rfv -- "${LINE:?}"; then
"$XPLR" -m 'LogSuccess: %q' "$LINE deleted"
(while IFS= read -r -d '' PTH; do
PTH_ESC=$(printf %q "$PTH")
if rm -rfv -- "${PTH:?}"; then
"$XPLR" -m 'LogSuccess: %q' "$PTH_ESC deleted"
else
"$XPLR" -m 'LogError: %q' "Failed to delete $LINE"
"$XPLR" -m 'LogError: %q' "Failed to delete $PTH_ESC"
fi
done < "${XPLR_PIPE_RESULT_OUT:?}")
"$XPLR" -m ExplorePwdAsync
@ -1780,18 +1786,19 @@ xplr.config.modes.builtin.delete = {
messages = {
{
BashExec0 = [===[
(while IFS= read -r -d '' LINE; do
if [ -d "$LINE" ] && [ ! -L "$LINE" ]; then
if rmdir -v -- "${LINE:?}"; then
"$XPLR" -m 'LogSuccess: %q' "$LINE deleted"
(while IFS= read -r -d '' PTH; do
PTH_ESC=$(printf %q "$PTH")
if [ -d "$PTH" ] && [ ! -L "$PTH" ]; then
if rmdir -v -- "${PTH:?}"; then
"$XPLR" -m 'LogSuccess: %q' "$PTH_ESC deleted"
else
"$XPLR" -m 'LogError: %q' "Failed to delete $LINE"
"$XPLR" -m 'LogError: %q' "Failed to delete $PTH_ESC"
fi
else
if rm -v -- "${LINE:?}"; then
"$XPLR" -m 'LogSuccess: %q' "$LINE deleted"
if rm -v -- "${PTH:?}"; then
"$XPLR" -m 'LogSuccess: %q' "$PTH_ESC deleted"
else
"$XPLR" -m 'LogError: %q' "Failed to delete $LINE"
"$XPLR" -m 'LogError: %q' "Failed to delete $PTH_ESC"
fi
fi
done < "${XPLR_PIPE_RESULT_OUT:?}")

Write Preview
Loading…
Cancel
Save