amin/fzf-vjour
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:remove temporary files

Browse Source
This commit is contained in:
Ämin Baumeler
2025-05-22 13:30:46 +02:00
parent 3fa458cf85
commit 5bbde62142
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fzf-vjour
View File

@@ -250,7 +250,6 @@ __filepath_to_searchline() {
__lines() { __lines() {
# Collect all files # Collect all files
FILES_TMP=$(mktemp) FILES_TMP=$(mktemp)
trap 'rm -f "$FILES_TMP"' EXIT
find "$ROOT" -type f -name '*.ics' >"$FILES_TMP" find "$ROOT" -type f -name '*.ics' >"$FILES_TMP"
# Compute max length of basenames # Compute max length of basenames
@@ -270,6 +269,7 @@ __lines() {
# Sort and cut off irreleant part # Sort and cut off irreleant part
lines=$(echo "$lines" | sort -g -r | cut -d ':' -f 2-) lines=$(echo "$lines" | sort -g -r | cut -d ':' -f 2-)
rm "$FILES_TMP"
echo "$lines" echo "$lines"
} }
@@ -304,9 +304,8 @@ if [ "${1:-}" = "--new" ]; then
return 1 return 1
fi fi
# #
TMPFILE="$(mktemp).md" TMPFILE=$(mktemp --suffix='.md')
SHAFILE="$TMPFILE.sha" SHAFILE="$TMPFILE.sha"
trap 'rm -f "$TMPFILE" "$SHAFILE"' EXIT
{ {
echo "::: Keep this line if you want to add a **JOURNAL** entry (associated to today), else we will add a **NOTE**" echo "::: Keep this line if you want to add a **JOURNAL** entry (associated to today), else we will add a **NOTE**"
echo "# <write summary here>" echo "# <write summary here>"
@@ -321,9 +320,9 @@ if [ "${1:-}" = "--new" ]; then
# Update if changes are detected # Update if changes are detected
if ! sha1sum -c "$SHAFILE" >/dev/null 2>&1; then if ! sha1sum -c "$SHAFILE" >/dev/null 2>&1; then
vjfile_tmp="$TMPFILE.ics" vjfile_tmp="$TMPFILE.ics"
trap 'rm -f "$vjfile_tmp"' EXIT __vjournalnew "$uuid_new" <"$TMPFILE" >"$vjfile_tmp" && mv "$vjfile_tmp" "$vjfile_new" || rm "$vjfile_tmp"
__vjournalnew "$uuid_new" <"$TMPFILE" >"$vjfile_tmp" && mv "$vjfile_tmp" "$vjfile_new"
fi fi
rm "$TMPFILE" "$SHAFILE"
fi fi
if [ "${1:-}" = "--reload" ]; then if [ "${1:-}" = "--reload" ]; then
__lines __lines
@@ -350,14 +349,12 @@ if [ ! -f "$VJ_FILE" ]; then
fi fi
# Parse vjournal file and save as json # Parse vjournal file and save as json
TMPJSON="$(mktemp).json" TMPJSON=$(mktemp)
trap 'rm -f "$TMPJSON"' EXIT
__vjournal2json <"$VJ_FILE" >"$TMPJSON" __vjournal2json <"$VJ_FILE" >"$TMPJSON"
# Prepare file to be edited # Prepare file to be edited
TMPFILE="$(mktemp).md" TMPFILE=$(mktemp --suffix='.md')
SHAFILE="$TMPFILE.sha" SHAFILE="$TMPFILE.sha"
trap 'rm -f "$TMPFILE" "$SHAFILE"' EXIT
SUMMARY=$(jq -r '.summary' "$TMPJSON") SUMMARY=$(jq -r '.summary' "$TMPJSON")
CATEGORIES=$(jq -r '.categories | join(",")' "$TMPJSON") CATEGORIES=$(jq -r '.categories | join(",")' "$TMPJSON")
{ {
@@ -366,6 +363,7 @@ CATEGORIES=$(jq -r '.categories | join(",")' "$TMPJSON")
echo "" echo ""
jq -r '.description' "$TMPJSON" jq -r '.description' "$TMPJSON"
} >"$TMPFILE" } >"$TMPFILE"
rm "$TMPJSON"
sha1sum "$TMPFILE" >"$SHAFILE" sha1sum "$TMPFILE" >"$SHAFILE"
# Open in editor # Open in editor
@@ -375,8 +373,8 @@ $EDITOR "$TMPFILE"
if ! sha1sum -c "$SHAFILE" >/dev/null 2>&1; then if ! sha1sum -c "$SHAFILE" >/dev/null 2>&1; then
echo "Uh... chages detected!" echo "Uh... chages detected!"
vj_file_new="$TMPFILE.ics" vj_file_new="$TMPFILE.ics"
trap 'rm -f "$vj_file_new"' EXIT __vjournalupdate "$VJ_FILE" <"$TMPFILE" >"$vj_file_new" && mv "$vj_file_new" "$VJ_FILE" || rm "$vj_file_new"
__vjournalupdate "$VJ_FILE" <"$TMPFILE" >"$vj_file_new" && mv "$vj_file_new" "$VJ_FILE"
fi fi
rm "$TMPFILE" "$SHAFILE"
exec "$0" exec "$0"