Compare commits
42 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f15d53c32 | |||
| ded6a686fd | |||
| 7545a4229c | |||
| 93cb0852ea | |||
| 75acdc87f3 | |||
| 56030912d7 | |||
| b2c8d94854 | |||
| c916f46c64 | |||
| cffd89eefd | |||
| 29214c6fe5 | |||
| e0a3905a72 | |||
| 82377a4d5c | |||
| 4027366a63 | |||
| 5f05bc2e0f | |||
| f663c200d2 | |||
| 78d0983464 | |||
| e80d9deb79 | |||
| e1d6b2b08e | |||
| 58680a130d | |||
| 458755b020 | |||
| 31c1357fbb | |||
| c8642343e7 | |||
| e954569d5d | |||
| aeff8a3679 | |||
| e948a18a05 | |||
| bc0233962a | |||
| c8f88b2410 | |||
| a9bdca55b5 | |||
| 0dd0a81a64 | |||
| 53149ea9db | |||
| c63b3c4ee2 | |||
| d228f551ab | |||
| 3fe908738f | |||
| 8f04082d65 | |||
| 7f04d84b30 | |||
| 3150e877c7 | |||
| 26a6900555 | |||
| 76fa32da39 | |||
| 609d9712a6 | |||
| de4650d1ac | |||
| 7656da2a71 | |||
| 6c78213587 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
fzf-vjour
|
||||
demo/
|
||||
|
||||
77
README.md
77
README.md
@@ -11,16 +11,30 @@ These entries are stored as [iCalendar](https://datatracker.ietf.org/doc/html/rf
|
||||
For instance, you could use this application as a terminal-based counterpart of [jtx Board](https://jtx.techbee.at/) in a setup
|
||||
with a CalDav server, such as [Radicale](https://radicale.org/), and a synchronization tool like [vdirsyncer](http://vdirsyncer.pimutils.org/).
|
||||
|
||||
Demo
|
||||
----
|
||||
Run the script `./scripts/generate_demo.sh` to generate a demo.
|
||||
|
||||

|
||||
|
||||
Installation
|
||||
------------
|
||||
Download the file `fzf-vjour` from the [latest release](https://github.com/baumea/fzf-vjour/releases/latest), or run `./scripts/build.sh`, then
|
||||
copy `fzf-vjour` to your preferred location, e.g., `~/.local/bin`, and make it executable.
|
||||
|
||||
### Manual
|
||||
|
||||
Run `./scripts/build.sh`, then copy `fzf-vjour` to your preferred location, e.g., `~/.local/bin`, and make it executable.
|
||||
|
||||
### Requirements
|
||||
This is a POSIX script with inline `awk` elements.
|
||||
Make sure you have [fzf](https://github.com/junegunn/fzf) installed.
|
||||
I also suggest to install [batcat](https://github.com/sharkdp/bat) for colorful previews.
|
||||
|
||||
### Arch Linux
|
||||
|
||||
```bash
|
||||
yay -S fzf-vjour-git
|
||||
```
|
||||
|
||||
Configuration
|
||||
--------------
|
||||
This application is configured with a file located at `$HOME/.config/fzf-vjour/config`.
|
||||
@@ -62,6 +76,11 @@ item_types = ["VJOURNAL", "VTODO"]
|
||||
...
|
||||
```
|
||||
|
||||
You may also specify the location of the configuration file with the environment `CONFIGFILE`.
|
||||
|
||||
By default, `fzf-vjour` sets a descriptive terminal title.
|
||||
This can be bypassed by specyfing `SET_TERMINAL_TITLE="no"` in the configuration file.
|
||||
|
||||
Usage
|
||||
-----
|
||||
Use the default `fzf` keys to navigate your notes, e.g., `ctrl-j` and `ctrl-k` for going down/up in the list.
|
||||
@@ -76,13 +95,61 @@ In addition, there are the following keybindings:
|
||||
| `ctrl-x` | Toggle task completion |
|
||||
| `alt-up` | Increase task priority |
|
||||
| `alt-down` | Decrease task priority |
|
||||
| `ctrl-a` | Open attachments view |
|
||||
| `ctrl-t` | Filter by category |
|
||||
| `alt-v` | View bare iCalendar file |
|
||||
| `alt-0` | Default view: Journal, notes, and _open_ tasks |
|
||||
| `alt-1` | Display journal entries |
|
||||
| `alt-2` | Display notes |
|
||||
| `alt-3` | Display all tasks |
|
||||
| `alt-j` | Display journal entries |
|
||||
| `alt-n` | Display notes |
|
||||
| `alt-t` | Display all tasks |
|
||||
| `alt-[1-9]` | Display first, second, ... collection |
|
||||
| `alt-w` | Toggle line-wrap in preview |
|
||||
| `ctrl-d` | Scroll down in preview |
|
||||
| `ctrl-u` | Scroll up in preview |
|
||||
|
||||
You may also invoke the script with `--help` to see further command-line options.
|
||||
|
||||
In the attachment view, you may use the following keys:
|
||||
| Key | Action |
|
||||
| --- | ------ |
|
||||
| `enter` | Open attachment |
|
||||
| `w` | Toggle line wrap |
|
||||
| `ctrl-a` | Add attachment |
|
||||
| `ctrl-alt-d` | Delete attachment |
|
||||
|
||||
Git support
|
||||
-----------
|
||||
You can track your entries with `git` by simply running `fzf-vjour --git-init`.
|
||||
|
||||
Extended configuration / Theming
|
||||
--------------------------------
|
||||
You may override any of the following parameters (shown with default values) in
|
||||
the configuration file:
|
||||
```sh
|
||||
FLAG_OPEN=🔲
|
||||
FLAG_COMPLETED=✅
|
||||
FLAG_JOURNAL=📘
|
||||
FLAG_NOTE=🗒️
|
||||
FLAG_PRIORITY=❗
|
||||
FLAG_ATTACHMENT=🔗
|
||||
|
||||
STYLE_COLLECTION="$FAINT$WHITE"
|
||||
STYLE_DATE="$CYAN"
|
||||
STYLE_SUMMARY="$GREEN"
|
||||
STYLE_EXPIRED="$RED"
|
||||
STYLE_CATEGORY="$WHITE"
|
||||
```
|
||||
|
||||
Limitations
|
||||
-----------
|
||||
Here is a list of some currently present limitations.
|
||||
|
||||
- Timezone agnostic: Timezone specifications are ignored.
|
||||
- Time agnostic: We use the date portion only of date-time specifications.
|
||||
- No alarms or notifications
|
||||
- Inline attachments only
|
||||
- No recurrences
|
||||
|
||||
License
|
||||
-------
|
||||
This project is licensed under the [MIT License](./LICENSE).
|
||||
|
||||
BIN
demo/screenshot.png
Normal file
BIN
demo/screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 78 KiB |
@@ -5,7 +5,15 @@ GREEN="\033[0;32m"
|
||||
OFF="\033[m"
|
||||
NAME="fzf-vjour"
|
||||
SRC="./src/main.sh"
|
||||
echo "🐔 ${GREEN}Building${OFF} ${BOLD}$NAME${OFF}"
|
||||
sed -E 's|@@include (.+)$|cat \1|e' "$SRC" >"$NAME"
|
||||
|
||||
tmpdir=$(mktemp -d)
|
||||
echo "🐔 ${GREEN}Internalize sourced files${OFF}"
|
||||
sed -E 's|\. "([^$].+)"$|cat src/\1|e' "$SRC" >"$tmpdir/1.sh"
|
||||
echo "🥚 ${GREEN}Internalize awk scripts${OFF}"
|
||||
sed -E 's|@@include (.+)$|cat src/\1|e' "$tmpdir/1.sh" >"$tmpdir/2.sh"
|
||||
echo "🐔 ${GREEN}Internalize awk libraries${OFF}"
|
||||
sed -E 's|@include "(.+)"$|cat src/\1|e' "$tmpdir/2.sh" >"$NAME"
|
||||
echo "🥚 ${GREEN}Make executable and cleanup${OFF}"
|
||||
chmod +x "$NAME"
|
||||
echo "🥚 ${GREEN}Done${OFF}"
|
||||
rm -rf "$tmpdir"
|
||||
echo "🍳 ${GREEN}Done:${OFF} Sucessfully built ${BOLD}${GREEN}$NAME${OFF}"
|
||||
|
||||
58
scripts/generate_demo.sh
Executable file
58
scripts/generate_demo.sh
Executable file
@@ -0,0 +1,58 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
BOLD="\033[1m"
|
||||
GREEN="\033[0;32m"
|
||||
OFF="\033[m"
|
||||
DEMO="demo"
|
||||
FVJ="./fzf-vjour"
|
||||
ROOT="$DEMO/journal/"
|
||||
COLLECTION_LABELS="745ae7a0-d723-4cd8-80c4-75f52f5b7d90=shared 👫🏼;12cacb18-d3e1-4ad4-a1d0-e5b209012e85=work 💼;"
|
||||
|
||||
export CONFIGFILE="$DEMO/config"
|
||||
rm -rf "$ROOT"
|
||||
collection1="$(printf "%s" "$COLLECTION_LABELS" | cut -d ";" -f 1 | cut -d "=" -f 1)"
|
||||
collection2="$(printf "%s" "$COLLECTION_LABELS" | cut -d ";" -f 2 | cut -d "=" -f 1)"
|
||||
mkdir -p "$ROOT/$collection1"
|
||||
mkdir -p "$ROOT/$collection2"
|
||||
cat <<EOF >"$CONFIGFILE"
|
||||
ROOT="$ROOT"
|
||||
COLLECTION_LABELS="$COLLECTION_LABELS"
|
||||
EOF
|
||||
echo "⚙️ ${BOLD}${GREEN}Building demo$OFF"
|
||||
## Fill in data
|
||||
cal 2028 | $FVJ --add-note "2028 will be a leap year"
|
||||
$FVJ --add-task "Finish proof of admissibility theorem" "tomorrow" --collection 2
|
||||
cat <<EOF | $FVJ --add-task "Respond to referee report" "yesterday" --collection 2
|
||||
- [x] Report 1: Answer prepared
|
||||
- [ ] Report 2: Write response, revise manuscript
|
||||
EOF
|
||||
echo "Chinese" | $FVJ --add-task "Reserve dinner table" "next Sunday"
|
||||
cat <<EOF | $FVJ --add-jour "Demo Coding"
|
||||
### Demo code
|
||||
Our demo now contains a script that self-generets the demo.
|
||||
It's located in \`./scripts/\`
|
||||
There are some upcoming steps:
|
||||
|
||||
1. Generate screenshot
|
||||
2. Demonstrate attachment window
|
||||
3. Extend code to handle timezones and alarms
|
||||
EOF
|
||||
cat <<EOF | $FVJ --add-note "Shopping list"
|
||||
- [ ] Banana
|
||||
- [ ] Bread
|
||||
- [ ] Yoghurt
|
||||
EOF
|
||||
cat <<EOF | $FVJ --add-jour "Today's code" --collection 2
|
||||
# Source code of current program
|
||||
|
||||
\`\`\`sh
|
||||
$(cat "$0")
|
||||
\`\`\`
|
||||
EOF
|
||||
$FVJ --add-task "Look for typos in readme" --collection 2 <"README.md"
|
||||
## End of data
|
||||
echo "🚀 ${BOLD}${GREEN}DONE.$OFF"
|
||||
echo ""
|
||||
echo "${GREEN}Run '${OFF}CONFIGFILE=$CONFIGFILE $FVJ$GREEN' to start demo$OFF"
|
||||
35
src/awk/attach.awk
Normal file
35
src/awk/attach.awk
Normal file
@@ -0,0 +1,35 @@
|
||||
## src/awk/attach.awk
|
||||
## Prepend attachment to iCalendar file.
|
||||
##
|
||||
## @assign file: Path to base64-encoded content
|
||||
## @assign mime: Mime
|
||||
## @assign filename: Original filename
|
||||
|
||||
# Functions
|
||||
|
||||
# Write attachment
|
||||
#
|
||||
# @local variables: line, aline
|
||||
function write_attachment( line, aline, fl) {
|
||||
line = "ATTACH;ENCODING=BASE64;VALUE=BINARY;FMTTYPE="mime";FILENAME="filename":"
|
||||
fl = 1
|
||||
while (getline aline <file) {
|
||||
line = line aline
|
||||
if (fl && length(line) >= 73) {
|
||||
print substr(line, 1, 73)
|
||||
line = substr(line, 74)
|
||||
fl = 0
|
||||
}
|
||||
while (length(line) >= 72) {
|
||||
print " "substr(line, 1, 72)
|
||||
line = substr(line, 73)
|
||||
}
|
||||
}
|
||||
if (line)
|
||||
print " "line
|
||||
}
|
||||
|
||||
# AWK program
|
||||
|
||||
/^END:(VTODO|VJOURNAL)$/ { write_attachment() }
|
||||
{ print }
|
||||
8
src/awk/attachdd.awk
Normal file
8
src/awk/attachdd.awk
Normal file
@@ -0,0 +1,8 @@
|
||||
BEGIN { FS="[:;]" }
|
||||
/^END:(VTODO|VJOURNAL)$/ { ins = 0; exit }
|
||||
/^[^ ]/ && a { a = 0 }
|
||||
/^ / && a && p { print substr($0, 2); }
|
||||
/^ / && a && !p { if (index($0, ":")) { p = 1; print substr($0, index($0, ":")+1) } }
|
||||
/^ATTACH/ && ins { i++; }
|
||||
/^ATTACH/ && ins && i == id { a = 1; if (index($0, ":")) { p = 1; print substr($0, index($0, ":")+1) } }
|
||||
/^BEGIN:(VTODO|VJOURNAL)$/ { ins = 1 }
|
||||
41
src/awk/attachls.awk
Normal file
41
src/awk/attachls.awk
Normal file
@@ -0,0 +1,41 @@
|
||||
# Decide if we need to read more to get all properties
|
||||
#
|
||||
# @input str: strin read so far
|
||||
# @return: 1 if we need more data, 0 otherwise
|
||||
function cont_reading(str) {
|
||||
return index(str, ":") ? 0 : 1
|
||||
}
|
||||
|
||||
# Get information about attachment
|
||||
#
|
||||
# @input i: Attachment index
|
||||
# @input str: Attachment string (at least up to content separator `:`)
|
||||
# @return: informative string
|
||||
function att_info(i, str, cnt, k, info) {
|
||||
str = substr(str, 1, index(str, ":") - 1)
|
||||
cnt = split(str, props)
|
||||
if (cnt > 1) {
|
||||
for (k=2; k<=cnt; k++) {
|
||||
pname = substr(props[k], 1, index(props[k], "=") - 1)
|
||||
pvalu = substr(props[k], index(props[k], "=") + 1)
|
||||
if (pname == "ENCODING" && pvalu = "BASE64")
|
||||
enc = "base64"
|
||||
if (pname == "FILENAME")
|
||||
fin = pvalu
|
||||
if (pname == "VALUE")
|
||||
val = pvalu
|
||||
if (pname == "FMTTYPE")
|
||||
type = pvalu
|
||||
}
|
||||
if (enc)
|
||||
info = "inline"
|
||||
}
|
||||
print i, fin, type, enc, info
|
||||
}
|
||||
|
||||
BEGIN { FS="[:;]"; OFS="\t" }
|
||||
/^END:(VTODO|VJOURNAL)$/ { ins = 0; exit }
|
||||
l && !r { att_info(i, l); l = "" }
|
||||
/^ / && r { l = l substr($0, 2); r = cont_reading($0) }
|
||||
/^ATTACH/ && ins { i++; l = $0; r = cont_reading($0) }
|
||||
/^BEGIN:(VTODO|VJOURNAL)$/ { ins = 1 }
|
||||
13
src/awk/attachrm.awk
Normal file
13
src/awk/attachrm.awk
Normal file
@@ -0,0 +1,13 @@
|
||||
## src/awk/attachrm.awk
|
||||
## Remove attachment from iCalendar file.
|
||||
##
|
||||
## @assign id: Attachment number to remove
|
||||
|
||||
BEGIN { FS="[:;]" }
|
||||
/^END:(VTODO|VJOURNAL)$/ { ins = 0 }
|
||||
/^[^ ]/ && a { a = 0 }
|
||||
/^ / && a { next }
|
||||
/^ATTACH/ && ins { i++; }
|
||||
/^ATTACH/ && ins && i == id { a = 1; next }
|
||||
/^BEGIN:(VTODO|VJOURNAL)$/ { ins = 1 }
|
||||
{ print }
|
||||
@@ -1,39 +0,0 @@
|
||||
function getcontent(content_line, prop)
|
||||
{
|
||||
return substr(content_line[prop], index(content_line[prop], ":") + 1);
|
||||
}
|
||||
|
||||
function storetext_line(content_line, c, prop)
|
||||
{
|
||||
c[prop] = getcontent(content_line, prop);
|
||||
gsub("\\\\n", "\n", c[prop]);
|
||||
gsub("\\\\N", "\n", c[prop]);
|
||||
gsub("\\\\,", ",", c[prop]);
|
||||
gsub("\\\\;", ";", c[prop]);
|
||||
gsub("\\\\\\\\", "\\", c[prop]);
|
||||
}
|
||||
|
||||
BEGIN { FS = "[:;]"; }
|
||||
/^BEGIN:(VJOURNAL|VTODO)/ { type = $2 }
|
||||
/^END:/ && $2 == type { exit }
|
||||
/^(CATEGORIES|DESCRIPTION|SUMMARY|DUE)/ { prop = $1; content_line[prop] = $0; next; }
|
||||
/^[^ ]/ && prop { prop = ""; next; }
|
||||
/^ / && prop { content_line[prop] = content_line[prop] substr($0, 2); next; }
|
||||
|
||||
END {
|
||||
if (!type) {
|
||||
exit
|
||||
}
|
||||
# Process content lines
|
||||
storetext_line(content_line, c, "CATEGORIES" );
|
||||
storetext_line(content_line, c, "DESCRIPTION");
|
||||
storetext_line(content_line, c, "SUMMARY" );
|
||||
storetext_line(content_line, c, "DUE" );
|
||||
# Print
|
||||
if (c["DUE"])
|
||||
print "::: <| " substr(c["DUE"], 1, 4) "-" substr(c["DUE"], 5, 2) "-" substr(c["DUE"], 7, 2);
|
||||
print "# " c["SUMMARY"];
|
||||
print "> " c["CATEGORIES"];
|
||||
print "";
|
||||
print c["DESCRIPTION"];
|
||||
}
|
||||
@@ -1,18 +1,49 @@
|
||||
# Retrieve content from iCalendar files
|
||||
#
|
||||
# Mandatory variable: `field`.
|
||||
# Name of field to retrieve.
|
||||
#
|
||||
# Optional variable: `format`.
|
||||
# If `format` is set to "csv", then the content is interpreted as
|
||||
# comma-separated values, and empty values are dropped.
|
||||
# If `format` is set to "date", then the content is interpreted as
|
||||
# a date the output is in the form YYYY-MM-DD.
|
||||
#
|
||||
# Optional variable: `oneline`.
|
||||
# If `oneline` is set, then the all newlines will be replaced by white spaces
|
||||
@include "lib/awk/icalendar.awk"
|
||||
|
||||
# print content of field `field`
|
||||
BEGIN { FS = ":"; regex = "^" field; }
|
||||
BEGINFILE { type = ""; line = ""; }
|
||||
/^BEGIN:(VJOURNAL|VTODO)/ { type = $2 }
|
||||
/^END:/ && $2 == type { exit }
|
||||
$0 ~ field { content = $0; next; }
|
||||
/^ / && content { content = content substr($0, 2); next; }
|
||||
/^[^ ]/ && content { exit }
|
||||
END {
|
||||
if (!type) { exit }
|
||||
# Process content line
|
||||
content = substr(content, index(content, ":") + 1);
|
||||
gsub("\\\\n", "\n", content);
|
||||
gsub("\\\\N", "\n", content);
|
||||
gsub("\\\\,", ",", content);
|
||||
gsub("\\\\;", ";", content);
|
||||
gsub("\\\\\\\\", "\\", content);
|
||||
print content;
|
||||
/^END:/ && $2 == type { nextfile }
|
||||
$0 ~ regex { line = $0; next; }
|
||||
/^ / && line { line = line substr($0, 2); next; }
|
||||
/^[^ ]/ && line { nextfile }
|
||||
ENDFILE {
|
||||
if (type) {
|
||||
# Process line
|
||||
content = getcontent(line)
|
||||
if (oneline)
|
||||
content = singleline(content)
|
||||
switch (format) {
|
||||
case "csv" :
|
||||
split(content, a, ",")
|
||||
res = ""
|
||||
for (i in a) {
|
||||
if (a[i])
|
||||
res = res "," a[i]
|
||||
}
|
||||
print substr(res, 2)
|
||||
break
|
||||
case "date" :
|
||||
if (content)
|
||||
print substr(parse_dt("", content), 1, 10)
|
||||
break
|
||||
default :
|
||||
print content
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
153
src/awk/list.awk
153
src/awk/list.awk
@@ -3,39 +3,15 @@
|
||||
# See https://datatracker.ietf.org/doc/html/rfc5545 for the RFC 5545 that
|
||||
# describes iCalendar, and its syntax
|
||||
|
||||
function getcontent(content_line, prop)
|
||||
{
|
||||
return substr(content_line[prop], index(content_line[prop], ":") + 1);
|
||||
}
|
||||
@include "lib/awk/icalendar.awk"
|
||||
|
||||
function storetext_line(content_line, c, prop)
|
||||
{
|
||||
c[prop] = getcontent(content_line, prop);
|
||||
gsub("\\\\n", " ", c[prop]);
|
||||
gsub("\\\\N", " ", c[prop]);
|
||||
gsub("\\\\,", ",", c[prop]);
|
||||
gsub("\\\\;", ";", c[prop]);
|
||||
gsub("\\\\\\\\", "\\", c[prop]);
|
||||
#gsub(" ", "_", c[prop]);
|
||||
}
|
||||
|
||||
function storeinteger(content_line, c, prop)
|
||||
{
|
||||
c[prop] = getcontent(content_line, prop);
|
||||
c[prop] = c[prop] ? c[prop] : 0;
|
||||
}
|
||||
|
||||
function storedatetime(content_line, c, prop)
|
||||
{
|
||||
c[prop] = getcontent(content_line, prop);
|
||||
}
|
||||
|
||||
function storedate(content_line, c, prop)
|
||||
{
|
||||
c[prop] = substr(getcontent(content_line, prop), 1, 8);
|
||||
}
|
||||
|
||||
function formatdate(date, today, todaystamp, ts, ts_y, ts_m, ts_d, delta)
|
||||
# Generate kind-of-pretty date strings.
|
||||
#
|
||||
# @local variables: ts, ts_y, ts_m, ts_d, delta
|
||||
# @input date: Date in the format YYYYMMDD
|
||||
# @input todaystamp: Today, seconds since epoch
|
||||
# @return: string
|
||||
function formatdate(date, todaystamp, ts, ts_y, ts_m, ts_d, delta)
|
||||
{
|
||||
ts_y = substr(date, 1, 4);
|
||||
ts_m = substr(date, 5, 2);
|
||||
@@ -73,6 +49,13 @@ BEGIN {
|
||||
# flag_completed: symbol for completed to-dos
|
||||
# flag_journal: symbol for journal entries
|
||||
# flag_note: symbol for note entries
|
||||
# flag_priority symbol for prior. task
|
||||
# flag_attachment symbol for attachment
|
||||
# style_collection
|
||||
# style_date
|
||||
# style_summary
|
||||
# style_expired
|
||||
# style_category
|
||||
|
||||
FS = "[:;]";
|
||||
# Collections
|
||||
@@ -83,11 +66,6 @@ BEGIN {
|
||||
collection2label[m[1]] = m[2];
|
||||
}
|
||||
# Colors
|
||||
GREEN = "\033[1;32m";
|
||||
RED = "\033[1;31m";
|
||||
WHITE = "\033[1;97m";
|
||||
CYAN = "\033[1;36m";
|
||||
FAINT = "\033[2m";
|
||||
OFF = "\033[m";
|
||||
|
||||
# For date comparision
|
||||
@@ -99,9 +77,8 @@ BEGIN {
|
||||
BEGINFILE {
|
||||
type = "";
|
||||
prop = "";
|
||||
delete content_line;
|
||||
att = "";
|
||||
delete c;
|
||||
|
||||
}
|
||||
|
||||
/^BEGIN:(VJOURNAL|VTODO)/ {
|
||||
@@ -112,9 +89,14 @@ BEGINFILE {
|
||||
nextfile
|
||||
}
|
||||
|
||||
/^(CATEGORIES|DESCRIPTION|PRIORITY|STATUS|SUMMARY|COMPLETED|DUE|DTSTART|DURATION|CREATED|DTSTAMP|LAST-MODIFIED)/ {
|
||||
/^(CATEGORIES|PRIORITY|STATUS|SUMMARY|COMPLETED|DUE|DTSTART|DURATION|CREATED|DTSTAMP|LAST-MODIFIED)/ {
|
||||
prop = $1;
|
||||
content_line[prop] = $0;
|
||||
c[prop] = $0;
|
||||
next;
|
||||
}
|
||||
/^ATTACH/ {
|
||||
prop = ""
|
||||
att = 1;
|
||||
next;
|
||||
}
|
||||
/^[^ ]/ && prop {
|
||||
@@ -122,7 +104,7 @@ BEGINFILE {
|
||||
next;
|
||||
}
|
||||
/^ / && prop {
|
||||
content_line[prop] = content_line[prop] substr($0, 2);
|
||||
c[prop] = c[prop] substr($0, 2);
|
||||
next;
|
||||
}
|
||||
|
||||
@@ -137,8 +119,9 @@ ENDFILE {
|
||||
{
|
||||
print 10,
|
||||
"-",
|
||||
type,
|
||||
"-",
|
||||
RED "ERROR: file '" fpath "' contains whitespaces!" OFF
|
||||
style_expired "ERROR: file '" fpath "' contains whitespaces!" OFF
|
||||
exit
|
||||
}
|
||||
# Collection name
|
||||
@@ -146,26 +129,39 @@ ENDFILE {
|
||||
collection = collection in collection2label ? collection2label[collection] : collection;
|
||||
|
||||
# Process content lines
|
||||
storetext_line(content_line, c, "CATEGORIES" );
|
||||
storetext_line(content_line, c, "DESCRIPTION" );
|
||||
storeinteger( content_line, c, "PRIORITY" );
|
||||
storetext_line(content_line, c, "STATUS" );
|
||||
storetext_line(content_line, c, "SUMMARY" );
|
||||
storedatetime( content_line, c, "COMPLETED" );
|
||||
storedate( content_line, c, "DUE" );
|
||||
storedate( content_line, c, "DTSTART" );
|
||||
storedatetime( content_line, c, "DURATION" );
|
||||
storedatetime( content_line, c, "CREATED" );
|
||||
storedatetime( content_line, c, "DTSTAMP" );
|
||||
storedatetime( content_line, c, "LAST-MODIFIED");
|
||||
# strings
|
||||
cat = singleline(unescape(getcontent(c["CATEGORIES"])))
|
||||
split(cat, a, ",")
|
||||
cat = ""
|
||||
for (i in a)
|
||||
if (a[i])
|
||||
cat = cat "," a[i]
|
||||
cat = substr(cat, 2)
|
||||
sta = singleline(unescape(getcontent(c["STATUS"])))
|
||||
sum = singleline(unescape(getcontent(c["SUMMARY"])))
|
||||
|
||||
# integers
|
||||
pri = unescape(getcontent(c["PRIORITY"]))
|
||||
pri = pri ? pri + 0 : 0
|
||||
|
||||
# dates
|
||||
due = substr(unescape(getcontent(c["DUE"])), 1, 8)
|
||||
dts = substr(unescape(getcontent(c["DTSTART"])), 1, 8)
|
||||
|
||||
# date-times
|
||||
com = unescape(getcontent(c["COMPLETED"]))
|
||||
dur = unescape(getcontent(c["DURATION"]))
|
||||
cre = unescape(getcontent(c["CREATED"]))
|
||||
stp = unescape(getcontent(c["DTSTAMP"]))
|
||||
lmd = unescape(getcontent(c["LAST-MODIFIED"]))
|
||||
|
||||
# Priority field, primarly used for sorting
|
||||
priotext = "";
|
||||
prio = 0;
|
||||
if (c["PRIORITY"] > 0)
|
||||
psort = 0;
|
||||
priotext = ""
|
||||
if (pri > 0)
|
||||
{
|
||||
priotext = "❗(" c["PRIORITY"] ") ";
|
||||
prio = 10 - c["PRIORITY"];
|
||||
priotext = flag_priority "(" pri ") "
|
||||
psort = 10 - pri
|
||||
}
|
||||
|
||||
# Last modification/creation time stamp, used for sorting
|
||||
@@ -173,53 +169,56 @@ ENDFILE {
|
||||
# UTC time format
|
||||
# DTSTAMP: mandatory field in VTODO and VJOURNAL, date-time in UTC time
|
||||
# format
|
||||
mod = c["LAST-MODIFIED"] ? c["LAST-MODIFIED"] : c["DTSTAMP"];
|
||||
mod = lmd ? lmd : stp
|
||||
|
||||
# Date field. For VTODO entries, we show the due date, for journal entries,
|
||||
# the associated date.
|
||||
datecolor = CYAN;
|
||||
summarycolor = GREEN;
|
||||
datecolor = style_date
|
||||
summarycolor = style_summary
|
||||
|
||||
if (type == "VTODO")
|
||||
{
|
||||
# Either DUE or DURATION may appear. If DURATION appears, then also DTSTART
|
||||
d = c["DUE"] ? c["DUE"] :
|
||||
(c["DURATION"] ? c["DTSTART"] " for " c["DURATION"] : "");
|
||||
if (d && d <= today && c["STATUS"] != "COMPLETED")
|
||||
d = due ? due : (dur ? dts " for " dur : "");
|
||||
if (d && d <= today && sta != "COMPLETED")
|
||||
{
|
||||
datecolor = RED;
|
||||
summarycolor = RED;
|
||||
datecolor = style_expired;
|
||||
summarycolor = style_expired;
|
||||
}
|
||||
} else {
|
||||
d = c["DTSTART"];
|
||||
d = dts
|
||||
}
|
||||
d = d ? formatdate(d, today, todaystamp ts, ts_y, ts_m, ts_d, delta) : " ";
|
||||
d = d ? formatdate(d, todaystamp) : " ";
|
||||
|
||||
# flag: - "journal" for VJOURNAL with DTSTART
|
||||
# - "note" for VJOURNAL without DTSTART
|
||||
# - "completed" for VTODO with c["STATUS"] == COMPLETED
|
||||
# - "open" for VTODO with c["STATUS"] != COMPLETED
|
||||
if (type == "VTODO")
|
||||
flag = c["STATUS"] == "COMPLETED" ? flag_completed : flag_open;
|
||||
flag = sta == "COMPLETED" ? flag_completed : flag_open;
|
||||
else
|
||||
flag = c["DTSTART"] ? flag_journal : flag_note;
|
||||
flag = dts ? flag_journal : flag_note;
|
||||
|
||||
# summary
|
||||
# c["SUMMARY"]
|
||||
summary = c["SUMMARY"] ? c["SUMMARY"] : " "
|
||||
summary = sum ? sum : " "
|
||||
|
||||
# categories
|
||||
categories = c["CATEGORIES"] ? c["CATEGORIES"] : " "
|
||||
categories = cat ? cat : " "
|
||||
|
||||
# attachments
|
||||
att = att ? flag_attachment " " : ""
|
||||
|
||||
# filename
|
||||
# FILENAME
|
||||
|
||||
print prio,
|
||||
print psort,
|
||||
mod,
|
||||
type,
|
||||
fpath,
|
||||
collection,
|
||||
datecolor d OFF,
|
||||
flag,
|
||||
priotext summarycolor summary OFF,
|
||||
WHITE categories OFF;
|
||||
priotext att summarycolor summary OFF,
|
||||
style_category categories OFF;
|
||||
}
|
||||
|
||||
@@ -1,73 +1,46 @@
|
||||
function escape_categories(str)
|
||||
{
|
||||
gsub("\\\\", "\\\\", str);
|
||||
gsub(";", "\\\\;", str);
|
||||
}
|
||||
|
||||
function escape(str)
|
||||
{
|
||||
escape_categories(str)
|
||||
gsub(",", "\\\\,", str);
|
||||
}
|
||||
|
||||
function print_fold(nameparam, content, i, s)
|
||||
{
|
||||
i = 74 - length(nameparam);
|
||||
s = substr(content, 1, i);
|
||||
print nameparam s;
|
||||
s = substr(content, i+1, 73);
|
||||
i = i + 73;
|
||||
while (s)
|
||||
{
|
||||
print " " s;
|
||||
s = substr(content, i+1, 73);
|
||||
i = i + 73;
|
||||
}
|
||||
}
|
||||
@include "lib/awk/icalendar.awk"
|
||||
|
||||
BEGIN {
|
||||
FS=":";
|
||||
type = "VJOURNAL";
|
||||
zulu = strftime("%Y%m%dT%H%M%SZ", systime(), 1);
|
||||
}
|
||||
desc { desc = desc "\\n" $0; next; }
|
||||
{
|
||||
if (substr($0, 1, 6) == "::: |>")
|
||||
{
|
||||
start = substr(zulu, 1, 8);
|
||||
getline;
|
||||
}
|
||||
if (substr($0, 1, 6) == "::: <|")
|
||||
{
|
||||
type = "VTODO"
|
||||
due = substr($0, 8);
|
||||
getline;
|
||||
}
|
||||
summary = substr($0, 1, 2) != "# " ? "" : substr($0, 3);
|
||||
getline;
|
||||
categories = substr($0, 1, 1) != ">" ? "" : substr($0, 3);
|
||||
getline; # This line should be empty
|
||||
getline; # First line of description
|
||||
desc = $0;
|
||||
next;
|
||||
}
|
||||
desc { desc = desc "\\n" escape($0); next; }
|
||||
/^::: \|>/ && !start { gsub("\"", ""); start = substr(zulu, 1, 8); next; }
|
||||
/^::: <\|/ && !due { gsub("\"", ""); due = "D" substr($0, 8); next; }
|
||||
/^# / && !summary { summary = "S" escape(substr($0, 3)); next; }
|
||||
/^> / && !categories { categories = "C" escape_but_commas(substr($0, 3)); next; }
|
||||
!$0 && !el { el = 1; next; }
|
||||
!el { print "Unrecognized header on line "NR": " $0 > "/dev/stderr"; exit 1; }
|
||||
{ desc = "D" escape($0); next; }
|
||||
END {
|
||||
# Sanitize input
|
||||
type = due ? "VTODO" : "VJOURNAL"
|
||||
due = substr(due, 2)
|
||||
summary = substr(summary, 2)
|
||||
categories = substr(categories, 2)
|
||||
desc = substr(desc, 2)
|
||||
if (categories) {
|
||||
split(categories, a, ",")
|
||||
categories = ""
|
||||
for (i in a)
|
||||
if (a[i])
|
||||
categories = categories "," a[i]
|
||||
categories = substr(categories, 2)
|
||||
}
|
||||
if (due) {
|
||||
# Use command line `date` for parsing
|
||||
cmd = "date -d \"" due "\" +\"%Y%m%d\"";
|
||||
cmd | getline res
|
||||
due = res ? res : ""
|
||||
suc = cmd | getline due
|
||||
close(cmd)
|
||||
if (suc != 1)
|
||||
exit 1
|
||||
}
|
||||
escape(summary);
|
||||
escape(desc);
|
||||
escape_categories(categories);
|
||||
|
||||
# print ical
|
||||
print "BEGIN:VCALENDAR";
|
||||
print "VERSION:2.0";
|
||||
print "CALSCALE:GREGORIAN";
|
||||
print "PRODID:-//fab//awk//EN";
|
||||
print "PRODID:-//fzf-vjour//awk//EN";
|
||||
print "BEGIN:" type;
|
||||
print "DTSTAMP:" zulu;
|
||||
print "UID:" uid;
|
||||
@@ -88,9 +61,9 @@ END {
|
||||
if (start)
|
||||
print "DTSTART;VALUE=DATE:" start;
|
||||
}
|
||||
if (summary) print_fold("SUMMARY:", summary, i, s);
|
||||
if (categories) print_fold("CATEGORIES:", categories, i, s);
|
||||
if (desc) print_fold("DESCRIPTION:", desc, i, s);
|
||||
if (summary) print_fold("SUMMARY:", summary);
|
||||
if (categories) print_fold("CATEGORIES:", categories);
|
||||
if (desc) print_fold("DESCRIPTION:", desc);
|
||||
print "END:" type;
|
||||
print "END:VCALENDAR"
|
||||
}
|
||||
|
||||
@@ -1,34 +1,4 @@
|
||||
function getcontent(content_line, prop)
|
||||
{
|
||||
return substr(content_line[prop], index(content_line[prop], ":") + 1);
|
||||
}
|
||||
|
||||
function escape_categories(str)
|
||||
{
|
||||
gsub("\\\\", "\\\\", str);
|
||||
gsub(";", "\\\\;", str);
|
||||
}
|
||||
|
||||
function escape(str)
|
||||
{
|
||||
escape_categories(str)
|
||||
gsub(",", "\\\\,", str);
|
||||
}
|
||||
|
||||
function print_fold(nameparam, content, i, s)
|
||||
{
|
||||
i = 74 - length(nameparam);
|
||||
s = substr(content, 1, i);
|
||||
print nameparam s;
|
||||
s = substr(content, i+1, 73);
|
||||
i = i + 73;
|
||||
while (s)
|
||||
{
|
||||
print " " s;
|
||||
s = substr(content, i+1, 73);
|
||||
i = i + 73;
|
||||
}
|
||||
}
|
||||
@include "lib/awk/icalendar.awk"
|
||||
|
||||
BEGIN {
|
||||
FS=":";
|
||||
@@ -36,50 +6,52 @@ BEGIN {
|
||||
}
|
||||
|
||||
ENDFILE {
|
||||
if (NR == FNR)
|
||||
{
|
||||
# Sanitize input
|
||||
if (NR == FNR) {
|
||||
due = substr(due, 2)
|
||||
summary = substr(summary, 2)
|
||||
categories = substr(categories, 2)
|
||||
desc = substr(desc, 2)
|
||||
if (categories) {
|
||||
split(categories, a, ",")
|
||||
categories = ""
|
||||
for (i in a)
|
||||
if (a[i])
|
||||
categories = categories "," a[i]
|
||||
categories = substr(categories, 2)
|
||||
}
|
||||
if (due) {
|
||||
# Use command line `date` for parsing
|
||||
cmd = "date -d \"" due "\" +\"%Y%m%d\"";
|
||||
cmd | getline res
|
||||
due = res ? res : ""
|
||||
suc = cmd | getline due
|
||||
close(cmd)
|
||||
if (suc != 1)
|
||||
exit 1
|
||||
}
|
||||
escape(summary);
|
||||
escape(desc);
|
||||
escape_categories(categories);
|
||||
}
|
||||
}
|
||||
|
||||
NR == FNR && desc { desc = desc "\\n" $0; next; }
|
||||
NR == FNR {
|
||||
if (substr($0, 1, 6) == "::: <|")
|
||||
{
|
||||
due = substr($0, 8);
|
||||
getline;
|
||||
}
|
||||
summary = substr($0, 1, 2) != "# " ? "" : substr($0, 3);
|
||||
getline;
|
||||
categories = substr($0, 1, 1) != ">" ? "" : substr($0, 3);
|
||||
getline; # This line should be empty
|
||||
getline; # First line of description
|
||||
desc = $0;
|
||||
next;
|
||||
}
|
||||
|
||||
/^BEGIN:(VJOURNAL|VTODO)/ { type = $2; print; next }
|
||||
/^X-ALT-DESC/ && type { next } # drop this alternative description
|
||||
/^ / && type { next } # drop this folded line (the only content with folded lines will be updated)
|
||||
/^(DUE|SUMMARY|CATEGORIES|DESCRIPTION|LAST-MODIFIED)/ && type { next } # skip for now, we will write updated fields at the end
|
||||
/^SEQUENCE/ && type { seq = $2; next } # store sequence number and skip
|
||||
NR == FNR && desc { desc = desc "\\n" escape($0); next; }
|
||||
NR == FNR && /^::: <\|/ && !due { gsub("\"",""); due = "D" substr($0, 8); next; }
|
||||
NR == FNR && /^# / && !summary { summary = "S" escape(substr($0, 3)); next; }
|
||||
NR == FNR && /^> / && !categories { categories = "C" escape_but_commas(substr($0, 3)); next; }
|
||||
NR == FNR && !$0 && !el { el = 1; next; }
|
||||
NR == FNR && !el { print "Unrecognized header on line "NR": " $0 > "/dev/stderr"; exit 1; }
|
||||
NR == FNR { desc = "D" escape($0); next; }
|
||||
due && type == "VJOURNAL" { print "Notes and journal entries do not have due dates." > "/dev/stderr"; exit 1; }
|
||||
/^BEGIN:(VJOURNAL|VTODO)/ { type = $2; print; next; }
|
||||
/^ / && drop { next; } # drop this folded line
|
||||
/^X-ALT-DESC/ && type { drop = 1; next; } # drop this alternative description
|
||||
/^(DUE|SUMMARY|CATEGORIES|DESCRIPTION|LAST-MODIFIED)/ && type { drop = 1; next; } # skip for now, we will write updated fields at the end
|
||||
{ drop = 0 } # keep everything else
|
||||
/^SEQUENCE/ && type { seq = $2; next; } # store sequence number and skip
|
||||
/^END:/ && type == $2 {
|
||||
seq = seq ? seq + 1 : 1;
|
||||
print "SEQUENCE:" seq;
|
||||
print "LAST-MODIFIED:" zulu;
|
||||
if (due) print "DUE;VALUE=DATE:" due;
|
||||
print_fold("SUMMARY:", summary, i, s);
|
||||
print_fold("CATEGORIES:", categories, i, s);
|
||||
print_fold("DESCRIPTION:", desc, i, s);
|
||||
print_fold("SUMMARY:", summary);
|
||||
print_fold("CATEGORIES:", categories);
|
||||
print_fold("DESCRIPTION:", desc);
|
||||
type = "";
|
||||
}
|
||||
{ print }
|
||||
|
||||
146
src/lib/awk/icalendar.awk
Normal file
146
src/lib/awk/icalendar.awk
Normal file
@@ -0,0 +1,146 @@
|
||||
# Make string single-line
|
||||
#
|
||||
# @input str: String
|
||||
# @return: String without newlines
|
||||
function singleline(str) {
|
||||
gsub("\\n", " ", str)
|
||||
return str
|
||||
}
|
||||
|
||||
# Escape string to be used as content in iCalendar files.
|
||||
#
|
||||
# @input str: String to escape
|
||||
# @return: Escaped string
|
||||
function escape(str)
|
||||
{
|
||||
gsub("\\\\", "\\\\", str)
|
||||
gsub("\\n", "\\n", str)
|
||||
gsub(";", "\\;", str)
|
||||
gsub(",", "\\,", str)
|
||||
return str
|
||||
}
|
||||
|
||||
# Escape string to be used as content in iCalendar files, but don't escape
|
||||
# commas.
|
||||
#
|
||||
# @input str: String to escape
|
||||
# @return: Escaped string
|
||||
function escape_but_commas(str)
|
||||
{
|
||||
gsub("\\\\", "\\\\", str)
|
||||
gsub("\\n", "\\n", str)
|
||||
gsub(";", "\\;", str)
|
||||
return str
|
||||
}
|
||||
|
||||
# Print property with its content and fold according to the iCalendar
|
||||
# specification.
|
||||
#
|
||||
# @local variables: i, s
|
||||
# @input nameparam: Property name with optional parameters
|
||||
# @input content: Escaped content
|
||||
function print_fold(nameparam, content, i, s)
|
||||
{
|
||||
i = 74 - length(nameparam)
|
||||
s = substr(content, 1, i)
|
||||
print nameparam s
|
||||
s = substr(content, i+1, 73)
|
||||
i = i + 73
|
||||
while (s)
|
||||
{
|
||||
print " " s
|
||||
s = substr(content, i+1, 73)
|
||||
i = i + 73
|
||||
}
|
||||
}
|
||||
|
||||
# Unescape string
|
||||
#
|
||||
# @local variables: i, c, c2, res
|
||||
# @input str: String
|
||||
# @return: Unescaped string
|
||||
function unescape(str, i, c, c2, res) {
|
||||
for(i = 1; i <= length(str); i++) {
|
||||
c = substr(str, i, 1)
|
||||
if (c != "\\") {
|
||||
res = res c
|
||||
continue
|
||||
}
|
||||
i++
|
||||
c2 = substr(str, i, 1)
|
||||
if (c2 == "n" || c2 == "N") {
|
||||
res = res "\n"
|
||||
continue
|
||||
}
|
||||
# Alternatively, c2 is "\\" or "," or ";". In each case, append res with
|
||||
# c2. If the strings has been escaped correctly, then the character c2
|
||||
# cannot be anything else. To be fail-safe, simply append res with c2.
|
||||
res = res c2
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
# Isolate parameter part of an iCalendar line.
|
||||
#
|
||||
# @input str: String
|
||||
# @return: Parameter part
|
||||
function getparam(str, i) {
|
||||
i = index(str, ";")
|
||||
if (!i)
|
||||
return ""
|
||||
return substr(str, i + 1, index(str, ":") - i)
|
||||
}
|
||||
|
||||
# Isolate content part of an iCalendar line, and unescape.
|
||||
#
|
||||
# @input str: String
|
||||
# @return: Unescaped content part
|
||||
function getcontent(str) {
|
||||
return unescape(substr(str, index(str, ":") + 1))
|
||||
}
|
||||
|
||||
# Time-zone aware parsing of DTSTART or DTEND entries.
|
||||
#
|
||||
# @local variables: tz
|
||||
# @input dt_param: iCalendar DTSTART or DTEND parameter string
|
||||
# @input dt_content: iCalendar DTSTART or DTEND content string
|
||||
# @return: date or date-time string that can be used in date (1). In
|
||||
# particular, date strings are of the form YYYY-MM-DD and datetime
|
||||
# strings are of the form YYYY-MM-DD HH:MM:SS[Z]. If the field
|
||||
# containts timezone information, then this is prepended.
|
||||
function parse_dt(dt_param, dt_content, tz, a, i, k, date, time) {
|
||||
if (dt_param) {
|
||||
split(dt_param, a, ";")
|
||||
for (i in a) {
|
||||
k = index(a[i], "=")
|
||||
if (substr(a[i], 1, k-1) == "TZID") {
|
||||
tz = "TZ=\"" substr(a[i], k + 1) "\" "
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
# Get date/date-time
|
||||
date = substr(dt_content, 1, 4) "-" substr(dt_content, 5, 2) "-" substr(dt_content, 7, 2)
|
||||
time = length(dt_content) == 8 ? "" : " " substr(dt_content, 10, 2) ":" substr(dt_content, 12, 2) ":" substr(dt_content, 14)
|
||||
return tz date time
|
||||
}
|
||||
|
||||
# Map iCalendar duration specification into the format to be used in date (1).
|
||||
#
|
||||
# @local variables: dt, dta, i, n, a, seps
|
||||
# @input duration: iCalendar duration string
|
||||
# @return: relative-date/date-time specification to be used in date (1)
|
||||
function parse_duration(duration, dt, dta, i, n, a, seps) {
|
||||
n = split(duration, a, /[PTWHMSD]/, seps)
|
||||
for (i=2; i<=n; i++) {
|
||||
if(seps[i] == "W") dta["weeks"] = a[i]
|
||||
if(seps[i] == "H") dta["hours"] = a[i]
|
||||
if(seps[i] == "M") dta["minutes"] = a[i]
|
||||
if(seps[i] == "S") dta["seconds"] = a[i]
|
||||
if(seps[i] == "D") dta["days"] = a[i]
|
||||
}
|
||||
dt = a[1] ? a[1] : "+"
|
||||
for (i in dta)
|
||||
dt = dt " " dta[i] " " i
|
||||
return dt
|
||||
}
|
||||
452
src/main.sh
452
src/main.sh
@@ -2,301 +2,197 @@
|
||||
|
||||
set -eu
|
||||
|
||||
err() {
|
||||
echo "❌ $1" >/dev/tty
|
||||
}
|
||||
# Always load functions
|
||||
# Helper functions
|
||||
. "sh/helper.sh"
|
||||
# iCalendar routines
|
||||
. "sh/icalendar.sh"
|
||||
# Attachment handling
|
||||
. "sh/attachment.sh"
|
||||
# Categories handling
|
||||
. "sh/categories.sh"
|
||||
|
||||
if [ -z "${FZF_VJOUR_USE_EXPORTED:-}" ]; then
|
||||
# Load environment variables only when not yet loaded
|
||||
if [ ! "${SCRIPT_LOADED:-}" ]; then
|
||||
# Read configuration
|
||||
CONFIGFILE="$HOME/.config/fzf-vjour/config"
|
||||
if [ ! -f "$CONFIGFILE" ]; then
|
||||
err "Configuration '$CONFIGFILE' not found."
|
||||
exit 1
|
||||
fi
|
||||
# shellcheck source=/dev/null
|
||||
. "$CONFIGFILE"
|
||||
if [ -z "${ROOT:-}" ] || [ -z "${SYNC_CMD:-}" ] || [ -z "${COLLECTION_LABELS:-}" ]; then
|
||||
err "Configuration is incomplete."
|
||||
exit 1
|
||||
fi
|
||||
export ROOT
|
||||
export SYNC_CMD
|
||||
export COLLECTION_LABELS
|
||||
|
||||
# Tools
|
||||
if command -v "fzf" >/dev/null; then
|
||||
FZF="fzf"
|
||||
else
|
||||
err "Did not find the command-line fuzzy finder fzf."
|
||||
exit 1
|
||||
fi
|
||||
export FZF
|
||||
|
||||
if command -v "uuidgen" >/dev/null; then
|
||||
UUIDGEN="uuidgen"
|
||||
else
|
||||
err "Did not find the uuidgen command."
|
||||
exit 1
|
||||
fi
|
||||
export UUIDGEN
|
||||
|
||||
if command -v "bat" >/dev/null; then
|
||||
CAT="bat"
|
||||
elif command -v "batcat" >/dev/null; then
|
||||
CAT="batcat"
|
||||
fi
|
||||
CAT=${CAT:+$CAT --color=always --style=numbers --language=md}
|
||||
CAT=${CAT:-cat}
|
||||
export CAT
|
||||
|
||||
### AWK SCRIPTS
|
||||
AWK_ALTERTODO=$(
|
||||
cat <<'EOF'
|
||||
@@include src/awk/altertodo.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_ALTERTODO
|
||||
|
||||
AWK_EXPORT=$(
|
||||
cat <<'EOF'
|
||||
@@include src/awk/export.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_EXPORT
|
||||
|
||||
AWK_GET=$(
|
||||
cat <<'EOF'
|
||||
@@include src/awk/get.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_GET
|
||||
|
||||
AWK_LIST=$(
|
||||
cat <<'EOF'
|
||||
@@include src/awk/list.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_LIST
|
||||
|
||||
AWK_NEW=$(
|
||||
cat <<'EOF'
|
||||
@@include src/awk/new.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_NEW
|
||||
|
||||
AWK_UPDATE=$(
|
||||
cat <<'EOF'
|
||||
@@include src/awk/update.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_UPDATE
|
||||
### END OF AWK SCRIPTS
|
||||
FZF_VJOUR_USE_EXPORTED="yes"
|
||||
export FZF_VJOUR_USE_EXPORTED
|
||||
. "sh/config.sh"
|
||||
# Read theme
|
||||
. "sh/theme.sh"
|
||||
# Load awk scripts
|
||||
. "sh/awkscripts.sh"
|
||||
# Mark as loaded
|
||||
export SCRIPT_LOADED=1
|
||||
fi
|
||||
|
||||
__lines() {
|
||||
find "$ROOT" -type f -name '*.ics' -print0 | xargs -0 -P 0 \
|
||||
find "$ROOT" -mindepth 2 -maxdepth 2 -type f -name '*.ics' -print0 | xargs -0 -P 0 \
|
||||
awk \
|
||||
-v collection_labels="$COLLECTION_LABELS" \
|
||||
-v flag_open="🔲" \
|
||||
-v flag_completed="✅" \
|
||||
-v flag_journal="📘" \
|
||||
-v flag_note="🗒️" \
|
||||
-v flag_open="$FLAG_OPEN" \
|
||||
-v flag_completed="$FLAG_COMPLETED" \
|
||||
-v flag_journal="$FLAG_JOURNAL" \
|
||||
-v flag_note="$FLAG_NOTE" \
|
||||
-v flag_priority="$FLAG_PRIORITY" \
|
||||
-v flag_attachment="$FLAG_ATTACHMENT" \
|
||||
-v style_collection="$STYLE_COLLECTION" \
|
||||
-v style_date="$STYLE_DATE" \
|
||||
-v style_summary="$STYLE_SUMMARY" \
|
||||
-v style_expired="$STYLE_EXPIRED" \
|
||||
-v style_category="$STYLE_CATEGORY" \
|
||||
"$AWK_LIST" |
|
||||
sort -g -r
|
||||
}
|
||||
|
||||
# Program starts here
|
||||
if [ "${1:-}" = "--help" ]; then
|
||||
echo "Usage: $0 [OPTION]"
|
||||
echo ""
|
||||
echo "You may specify at most one option."
|
||||
echo " --help Show this help and exit"
|
||||
echo " --tasks Show tasks only"
|
||||
echo " --no-tasks Ignore tasks"
|
||||
echo " --notes Show notes only"
|
||||
echo " --no-notes Ignore notes"
|
||||
echo " --journal Show journal only"
|
||||
echo " --no-journal Ignore journal"
|
||||
echo " --completed Show completed tasks only"
|
||||
echo " --no-completed Ignore completed tasks"
|
||||
echo " --new Create new entry"
|
||||
echo ""
|
||||
echo "The following options are for internal use."
|
||||
echo " --reload Reload list"
|
||||
echo " --preview <selection> Generate preview"
|
||||
echo " --delete <selection> Delete selected entry"
|
||||
echo " --decrease-priority <selection> Decrease priority of selected task"
|
||||
echo " --increase-priority <selection> Increase priority of selected task"
|
||||
echo " --toggle-completed <selection> Toggle completion flag of task"
|
||||
bn="$(basename "$0")"
|
||||
shift
|
||||
echo "Usage: $bn [OPTION] [FILTER]...
|
||||
|
||||
[OPTION]
|
||||
--help Show this help and exit
|
||||
|
||||
Git Integration:
|
||||
--git-init Activate git usage and exit
|
||||
--git <cmd> Run git command and exit
|
||||
|
||||
Interactive Mode:
|
||||
--new [FILTER..] Create new entry interactively and start
|
||||
[FILTER..] Start with the specified filter
|
||||
|
||||
Non-Interactive Mode:
|
||||
--list [FILTER..] List entries and exit
|
||||
--add-note <summary> Read note from stdin and add it with the
|
||||
specified summary
|
||||
--add-task <summary> [<due>] Read task from stdin and add it with the
|
||||
specified summary and optional due date
|
||||
--add-jour <summary> Read journal from stdin and add it with the
|
||||
specified summary
|
||||
--collection <nr> Select collection to which the note, task, or
|
||||
journal entry is added non-interactively. The
|
||||
argument <nr> is the ordinal describing the
|
||||
collection. It defaults to the starting value
|
||||
of 1.
|
||||
|
||||
[FILTER]
|
||||
You may specify any of these filters. Filters can be negated using the
|
||||
--no-... versions, e.g., --no-tasks. Multiple filters are applied in
|
||||
conjuction. By default, the filter --no-completed is used. Note that
|
||||
--no-completed is not the same as --open, and similarly, --no-open is not the
|
||||
same as --completed.
|
||||
|
||||
--tasks Show tasks only
|
||||
--notes Show notes only
|
||||
--journal Show journal only
|
||||
--completed Show completed tasks only
|
||||
--open Show open tasks only
|
||||
--filter <query> Specify custom query
|
||||
|
||||
Examples:
|
||||
$bn --git log
|
||||
$bn --new
|
||||
$bn --journal
|
||||
$bn --no-tasks --filter \"Beauregard\"
|
||||
$bn --list --open
|
||||
$bn --add-task \"Improve code to respect timezone information\" \"next month\"
|
||||
cat proof.tex | $bn --add-journal \"Proof of Fixed-point Theorem\" --collection 2
|
||||
"
|
||||
exit
|
||||
fi
|
||||
|
||||
# Command line arguments to be self-contained
|
||||
# Generate preview of file from selection
|
||||
if [ "${1:-}" = "--preview" ]; then
|
||||
name=$(echo "$2" | cut -d ' ' -f 3)
|
||||
file="$ROOT/$name"
|
||||
awk -v field="DESCRIPTION" "$AWK_GET" "$file" |
|
||||
$CAT
|
||||
exit
|
||||
fi
|
||||
# Delete file from selection
|
||||
if [ "${1:-}" = "--delete" ]; then
|
||||
name=$(echo "$2" | cut -d ' ' -f 3)
|
||||
file="$ROOT/$name"
|
||||
summary=$(awk -v field="SUMMARY" "$AWK_GET" "$file")
|
||||
while true; do
|
||||
printf "Do you want to delete the entry with the title \"%s\"? (yes/no): " "$summary" >/dev/tty
|
||||
read -r yn
|
||||
case $yn in
|
||||
"yes")
|
||||
rm -v "$file"
|
||||
break
|
||||
;;
|
||||
"no")
|
||||
break
|
||||
;;
|
||||
*)
|
||||
echo "Please answer \"yes\" or \"no\"." >/dev/tty
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
# Generate new entry
|
||||
if [ "${1:-}" = "--new" ]; then
|
||||
collection=$(echo "$COLLECTION_LABELS" | tr ';' '\n' | $FZF --delimiter='=' --with-nth=2 --accept-nth=1)
|
||||
file=""
|
||||
while [ -f "$file" ] || [ -z "$file" ]; do
|
||||
uuid=$($UUIDGEN)
|
||||
file="$ROOT/$collection/$uuid.ics"
|
||||
done
|
||||
tmpmd=$(mktemp --suffix='.md')
|
||||
{
|
||||
echo "::: |> <!-- keep this line to associate the entry to _today_ -->"
|
||||
echo "::: <| <!-- specify the due date for to-dos, can be empty, a date string, or even \"next Sunday\" -->"
|
||||
echo "# <!-- write summary here -->"
|
||||
echo "> <!-- comma-separated list of categories -->"
|
||||
echo ""
|
||||
} >"$tmpmd"
|
||||
checksum=$(cksum "$tmpmd")
|
||||
# Command line arguments: Interal use
|
||||
. "sh/cliinternal.sh"
|
||||
|
||||
# Open in editor
|
||||
$EDITOR "$tmpmd" >/dev/tty
|
||||
# Command line arguments
|
||||
. "sh/cli.sh"
|
||||
|
||||
# Update if changes are detected
|
||||
if [ "$checksum" != "$(cksum "$tmpmd")" ]; then
|
||||
tmpfile="$tmpmd.ics"
|
||||
awk -v uid="$uuid" "$AWK_NEW" "$tmpmd" >"$tmpfile"
|
||||
mv "$tmpfile" "$file"
|
||||
# Parse command-line filter (if any)
|
||||
. "sh/filter.sh"
|
||||
|
||||
if [ -n "${list_option:-}" ]; then
|
||||
__lines |
|
||||
$FZF \
|
||||
--filter="$query" \
|
||||
--no-sort \
|
||||
--with-nth=5.. |
|
||||
tac
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Set terminal title
|
||||
if [ "$SET_TERMINAL_TITLE" = "yes" ]; then
|
||||
printf '\033]0;%s\007' "$TERMINAL_TITLE"
|
||||
fi
|
||||
|
||||
while true; do
|
||||
query=$(stripws "$query")
|
||||
selection=$(
|
||||
__lines | $FZF \
|
||||
--ansi \
|
||||
--query="$query " \
|
||||
--no-sort \
|
||||
--no-hscroll \
|
||||
--with-nth=5.. \
|
||||
--print-query \
|
||||
--accept-nth=4 \
|
||||
--preview="$0 --preview {4}" \
|
||||
--expect="ctrl-n,ctrl-alt-d,alt-v,ctrl-a,ctrl-t" \
|
||||
--bind="ctrl-r:reload($0 --reload)" \
|
||||
--bind="ctrl-x:reload($0 --reload --toggle-completed {4})" \
|
||||
--bind="alt-up:reload($0 --reload --change-priority '+1' {4})" \
|
||||
--bind="alt-down:reload($0 --reload --change-priority '-1' {4})" \
|
||||
--bind="alt-0:change-query(!$FLAG_COMPLETED )" \
|
||||
--bind="alt-1:change-query(${COLLECTION1:-} )" \
|
||||
--bind="alt-2:change-query(${COLLECTION2:-} )" \
|
||||
--bind="alt-3:change-query(${COLLECTION3:-} )" \
|
||||
--bind="alt-4:change-query(${COLLECTION4:-} )" \
|
||||
--bind="alt-5:change-query(${COLLECTION5:-} )" \
|
||||
--bind="alt-6:change-query(${COLLECTION6:-} )" \
|
||||
--bind="alt-7:change-query(${COLLECTION7:-} )" \
|
||||
--bind="alt-8:change-query(${COLLECTION8:-} )" \
|
||||
--bind="alt-9:change-query(${COLLECTION9:-} )" \
|
||||
--bind="alt-j:change-query($FLAG_JOURNAL )" \
|
||||
--bind="alt-n:change-query($FLAG_NOTE )" \
|
||||
--bind="alt-t:change-query($FLAG_COMPLETED | $FLAG_OPEN )" \
|
||||
--bind='focus:transform:[ {3} = "VTODO" ] && echo "rebind(ctrl-x)+rebind(alt-up)+rebind(alt-down)" || echo "unbind(ctrl-x)+unbind(alt-up)+unbind(alt-down)"' \
|
||||
--bind="alt-w:toggle-preview-wrap" \
|
||||
--bind="ctrl-d:preview-half-page-down" \
|
||||
--bind="ctrl-u:preview-half-page-up" \
|
||||
--bind="ctrl-s:execute($SYNC_CMD; [ -n \"${GIT:-}\" ] && ${GIT:-echo} add -A && ${GIT:-echo} commit -am 'Synchronized'; printf 'Press <enter> to continue.'; read -r tmp)" ||
|
||||
true
|
||||
)
|
||||
|
||||
# Line 1: query
|
||||
# Line 2: key ("" for enter)
|
||||
# Line 3: relative file path
|
||||
lines=$(echo "$selection" | wc -l)
|
||||
if [ "$lines" -eq 1 ]; then
|
||||
exit 0
|
||||
fi
|
||||
rm "$tmpmd"
|
||||
fi
|
||||
# Toggle completed flag
|
||||
if [ "${1:-}" = "--toggle-completed" ]; then
|
||||
name=$(echo "$2" | cut -d ' ' -f 3)
|
||||
file="$ROOT/$name"
|
||||
tmpfile=$(mktemp)
|
||||
awk "$AWK_ALTERTODO" "$file" >"$tmpfile"
|
||||
mv "$tmpfile" "$file"
|
||||
fi
|
||||
# Increase priority
|
||||
if [ "${1:-}" = "--increase-priority" ]; then
|
||||
name=$(echo "$2" | cut -d ' ' -f 3)
|
||||
file="$ROOT/$name"
|
||||
tmpfile=$(mktemp)
|
||||
awk -v delta="1" "$AWK_ALTERTODO" "$file" >"$tmpfile"
|
||||
mv "$tmpfile" "$file"
|
||||
fi
|
||||
# Decrease priority
|
||||
if [ "${1:-}" = "--decrease-priority" ]; then
|
||||
name=$(echo "$2" | cut -d ' ' -f 3)
|
||||
file="$ROOT/$name"
|
||||
tmpfile=$(mktemp)
|
||||
awk -v delta="-1" "$AWK_ALTERTODO" "$file" >"$tmpfile"
|
||||
mv "$tmpfile" "$file"
|
||||
fi
|
||||
if [ "${1:-}" = "--reload" ]; then
|
||||
__lines
|
||||
exit
|
||||
fi
|
||||
query=$(echo "$selection" | head -n 1)
|
||||
key=$(echo "$selection" | head -n 2 | tail -n 1)
|
||||
fname=$(echo "$selection" | head -n 3 | tail -n 1)
|
||||
file="$ROOT/$fname"
|
||||
|
||||
query="${FZF_QUERY:-}"
|
||||
if [ "${1:-}" = "--no-completed" ]; then
|
||||
query="!✅"
|
||||
fi
|
||||
if [ "${1:-}" = "--completed" ]; then
|
||||
query="✅"
|
||||
fi
|
||||
if [ "${1:-}" = "--tasks" ]; then
|
||||
query="✅ | 🔲"
|
||||
fi
|
||||
if [ "${1:-}" = "--no-tasks" ]; then
|
||||
query="!✅ !🔲"
|
||||
fi
|
||||
if [ "${1:-}" = "--notes" ]; then
|
||||
query="🗒️"
|
||||
fi
|
||||
if [ "${1:-}" = "--no-notes" ]; then
|
||||
query="!🗒️"
|
||||
fi
|
||||
if [ "${1:-}" = "--journal" ]; then
|
||||
query="📘"
|
||||
fi
|
||||
if [ "${1:-}" = "--no-journal" ]; then
|
||||
query="!📘"
|
||||
fi
|
||||
query=${query:-!✅}
|
||||
query=$(echo "$query" | xargs)
|
||||
|
||||
selection=$(
|
||||
__lines | $FZF --ansi \
|
||||
--query="$query " \
|
||||
--no-sort \
|
||||
--no-hscroll \
|
||||
--ellipsis='' \
|
||||
--with-nth=4.. \
|
||||
--accept-nth=3 \
|
||||
--preview="$0 --preview {}" \
|
||||
--bind="ctrl-r:reload-sync($0 --reload)" \
|
||||
--bind="ctrl-alt-d:become($0 --delete {})" \
|
||||
--bind="ctrl-x:become($0 --toggle-completed {})" \
|
||||
--bind="alt-up:become($0 --increase-priority {})" \
|
||||
--bind="alt-down:become($0 --decrease-priority {})" \
|
||||
--bind="ctrl-n:become($0 --new)" \
|
||||
--bind="alt-0:change-query(!✅)" \
|
||||
--bind="alt-1:change-query(📘)" \
|
||||
--bind="alt-2:change-query(🗒️)" \
|
||||
--bind="alt-3:change-query(✅ | 🔲)" \
|
||||
--bind="ctrl-s:execute($SYNC_CMD ; printf 'Press <enter> to continue.'; read -r tmp)"
|
||||
)
|
||||
if [ -z "$selection" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
file="$ROOT/$selection"
|
||||
|
||||
if [ ! -f "$file" ]; then
|
||||
echo "ERROR: File '$file' does not exist!" >/dev/tty
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Prepare file to be edited
|
||||
filetmp=$(mktemp --suffix='.md')
|
||||
awk "$AWK_EXPORT" "$file" >"$filetmp"
|
||||
checksum=$(cksum "$filetmp")
|
||||
|
||||
# Open in editor
|
||||
$EDITOR "$filetmp" >/dev/tty
|
||||
|
||||
# Update only if changes are detected
|
||||
if [ "$checksum" != "$(cksum "$filetmp")" ]; then
|
||||
file_new="$filetmp.ics"
|
||||
awk "$AWK_UPDATE" "$filetmp" "$file" >"$file_new"
|
||||
mv "$file_new" "$file"
|
||||
fi
|
||||
rm "$filetmp"
|
||||
|
||||
exec "$0"
|
||||
case "$key" in
|
||||
"ctrl-n")
|
||||
__new
|
||||
;;
|
||||
"ctrl-alt-d")
|
||||
__delete "$file"
|
||||
;;
|
||||
"alt-v")
|
||||
$EDITOR "$file"
|
||||
;;
|
||||
"ctrl-a")
|
||||
__attachment_view "$file"
|
||||
;;
|
||||
"ctrl-t")
|
||||
cat="$(__select_category)"
|
||||
[ -n "$cat" ] && query="'$cat'"
|
||||
;;
|
||||
"")
|
||||
__edit "$file"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
181
src/sh/attachment.sh
Normal file
181
src/sh/attachment.sh
Normal file
@@ -0,0 +1,181 @@
|
||||
# Add attachment to iCalendar file
|
||||
#
|
||||
# @input $1: Path to iCalendar file
|
||||
__add_attachment() {
|
||||
file="$1"
|
||||
shift
|
||||
sel=$(
|
||||
$FZF \
|
||||
--ansi \
|
||||
--prompt="Select attachment> " \
|
||||
--walker="file,hidden" \
|
||||
--walker-root="$HOME" \
|
||||
--expect="ctrl-c,ctrl-g,ctrl-q,esc"
|
||||
)
|
||||
key=$(echo "$sel" | head -1)
|
||||
f=$(echo "$sel" | tail -1)
|
||||
if [ -n "$key" ]; then
|
||||
f=""
|
||||
fi
|
||||
if [ -z "$f" ] || [ ! -f "$f" ]; then
|
||||
return
|
||||
fi
|
||||
filename=$(basename "$f")
|
||||
mime=$(file -b -i "$f" | cut -d ';' -f 1)
|
||||
if [ -z "$mime" ]; then
|
||||
mime="application/octet-stream"
|
||||
fi
|
||||
fenc=$(mktemp)
|
||||
base64 "$f" >"$fenc"
|
||||
filetmp=$(mktemp)
|
||||
awk -v file="$fenc" -v mime="$mime" -v filename="$filename" "$AWK_ATTACH" "$file" >"$filetmp"
|
||||
mv "$filetmp" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "Added attachment" -- "$file"
|
||||
fi
|
||||
rm "$fenc"
|
||||
}
|
||||
|
||||
# Open attachment from iCalendar file
|
||||
#
|
||||
# @input $1: Attachment id
|
||||
# @input $2: Attachment name
|
||||
# @input $3: Attachment format
|
||||
# @input $4: Attachment encoding
|
||||
# @input $5: Path to iCalendar file
|
||||
__open_attachment() {
|
||||
attid="$1"
|
||||
shift
|
||||
attname="$1"
|
||||
shift
|
||||
attfmt="$1"
|
||||
shift
|
||||
attenc="$1"
|
||||
shift
|
||||
file="$1"
|
||||
shift
|
||||
if [ "$attenc" != "base64" ]; then
|
||||
err "Unsupported attachment encoding: $attenc. Press <enter> to continue."
|
||||
read -r tmp
|
||||
return
|
||||
fi
|
||||
if [ -n "$attname" ]; then
|
||||
tmpdir=$(mktemp -d)
|
||||
attpath="$tmpdir/$attname"
|
||||
elif [ -n "$attfmt" ]; then
|
||||
attext=$(echo "$attfmt" | cut -d "/" -f 2)
|
||||
attpath=$(mktemp --suffix="$attext")
|
||||
else
|
||||
attpath=$(mktemp)
|
||||
fi
|
||||
# Get file and decode
|
||||
awk -v id="$attid" "$AWK_ATTACHDD" "$file" | base64 -d >"$attpath"
|
||||
fn=$(file "$attpath")
|
||||
while true; do
|
||||
printf "Are you sure you want to open \"%s\"? (yes/no): " "$fn" >/dev/tty
|
||||
read -r yn
|
||||
case $yn in
|
||||
"yes")
|
||||
$OPEN "$attpath"
|
||||
printf "Press <enter> to continue." >/dev/tty
|
||||
read -r tmp
|
||||
break
|
||||
;;
|
||||
"no")
|
||||
break
|
||||
;;
|
||||
*)
|
||||
echo "Please answer \"yes\" or \"no\"." >/dev/tty
|
||||
;;
|
||||
esac
|
||||
done
|
||||
# Clean up
|
||||
rm -f "$attpath"
|
||||
if [ -n "${tmpdir:-}" ] && [ -d "${tmpdir:-}" ]; then
|
||||
rm -rf "$tmpdir"
|
||||
fi
|
||||
}
|
||||
|
||||
# Delete attachment from iCalendar file
|
||||
#
|
||||
# @input $1: Attachment id
|
||||
# @input $2: Path to iCalendar File
|
||||
__del_attachment() {
|
||||
attid="$1"
|
||||
shift
|
||||
file="$1"
|
||||
shift
|
||||
while true; do
|
||||
printf "Are you sure you want to delete attachment \"%s\"? (yes/no): " "$attid" >/dev/tty
|
||||
read -r yn
|
||||
case $yn in
|
||||
"yes")
|
||||
filetmp=$(mktemp)
|
||||
awk -v id="$attid" "$AWK_ATTACHRM" "$file" >"$filetmp"
|
||||
mv "$filetmp" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "Deleted attachment" -- "$file"
|
||||
fi
|
||||
break
|
||||
;;
|
||||
"no")
|
||||
break
|
||||
;;
|
||||
*)
|
||||
echo "Please answer \"yes\" or \"no\"." >/dev/tty
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Show attachment window
|
||||
#
|
||||
# @input $1: Path to iCalendar file
|
||||
__attachment_view() {
|
||||
file="$1"
|
||||
shift
|
||||
att=$(
|
||||
awk "$AWK_ATTACHLS" "$file" |
|
||||
$FZF \
|
||||
--ansi \
|
||||
--delimiter="\t" \
|
||||
--accept-nth=1,2,3,4 \
|
||||
--with-nth="Attachment {1}: \"{2}\" {3} ({5})" \
|
||||
--no-sort \
|
||||
--tac \
|
||||
--margin="30%,30%" \
|
||||
--border=bold \
|
||||
--border-label="Attachment View Keys: <enter> open, <ctrl-alt-d> delete, <ctrl-a> add" \
|
||||
--expect="ctrl-a" \
|
||||
--expect="ctrl-c,ctrl-g,ctrl-q,ctrl-d,esc,q,backspace" \
|
||||
--print-query \
|
||||
--bind="start:hide-input" \
|
||||
--bind="ctrl-alt-d:show-input+change-query(ctrl-alt-d)+accept" \
|
||||
--bind='load:transform:[ "$FZF_TOTAL_COUNT" -eq 0 ] && echo "unbind(enter)+unbind(ctrl-alt-d)"' \
|
||||
--bind="w:toggle-wrap" \
|
||||
--bind="j:down" \
|
||||
--bind="k:up" ||
|
||||
true
|
||||
)
|
||||
key=$(echo "$att" | head -2 | xargs)
|
||||
sel=$(echo "$att" | tail -1)
|
||||
attid=$(echo "$sel" | cut -f 1)
|
||||
attname=$(echo "$sel" | cut -f 2)
|
||||
attfmt=$(echo "$sel" | cut -f 3)
|
||||
attenc=$(echo "$sel" | cut -f 4)
|
||||
case "$key" in
|
||||
"ctrl-c" | "ctrl-g" | "ctrl-q" | "ctrl-d" | "esc" | "q" | "backspace") ;;
|
||||
"ctrl-alt-d")
|
||||
__del_attachment "$attid" "$file"
|
||||
;;
|
||||
"ctrl-a")
|
||||
__add_attachment "$file"
|
||||
;;
|
||||
*)
|
||||
__open_attachment "$attid" "$attname" "$attfmt" "$attenc" "$file"
|
||||
;;
|
||||
esac
|
||||
#
|
||||
}
|
||||
62
src/sh/awkscripts.sh
Normal file
62
src/sh/awkscripts.sh
Normal file
@@ -0,0 +1,62 @@
|
||||
AWK_ALTERTODO=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/altertodo.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_ALTERTODO
|
||||
|
||||
AWK_GET=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/get.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_GET
|
||||
|
||||
AWK_LIST=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/list.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_LIST
|
||||
|
||||
AWK_NEW=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/new.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_NEW
|
||||
|
||||
AWK_UPDATE=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/update.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_UPDATE
|
||||
|
||||
AWK_ATTACH=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/attach.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_ATTACH
|
||||
|
||||
AWK_ATTACHDD=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/attachdd.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_ATTACHDD
|
||||
|
||||
AWK_ATTACHLS=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/attachls.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_ATTACHLS
|
||||
|
||||
AWK_ATTACHRM=$(
|
||||
cat <<'EOF'
|
||||
@@include awk/attachrm.awk
|
||||
EOF
|
||||
)
|
||||
export AWK_ATTACHRM
|
||||
19
src/sh/categories.sh
Normal file
19
src/sh/categories.sh
Normal file
@@ -0,0 +1,19 @@
|
||||
# List all categories and lest user select
|
||||
__select_category() {
|
||||
find "$ROOT" -type f -name "*.ics" -print0 |
|
||||
xargs -0 -P 0 \
|
||||
awk -v field="CATEGORIES" -v format="csv" "$AWK_GET" |
|
||||
tr ',' '\n' |
|
||||
sort |
|
||||
uniq |
|
||||
grep '.' |
|
||||
$FZF \
|
||||
--ansi \
|
||||
--prompt="Select category> " \
|
||||
--no-sort \
|
||||
--tac \
|
||||
--margin="30%,30%" \
|
||||
--border=bold \
|
||||
--border-label="Categories" ||
|
||||
true
|
||||
}
|
||||
122
src/sh/cli.sh
Normal file
122
src/sh/cli.sh
Normal file
@@ -0,0 +1,122 @@
|
||||
case "${1:-}" in
|
||||
"--git-init")
|
||||
shift
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
err "Git already enabled"
|
||||
return 1
|
||||
fi
|
||||
if ! command -v "git" >/dev/null; then
|
||||
err "Git not installed"
|
||||
return 1
|
||||
fi
|
||||
git -C "$ROOT" init
|
||||
git -C "$ROOT" add -A
|
||||
git -C "$ROOT" commit -m 'Initial commit: Start git tracking'
|
||||
exit
|
||||
;;
|
||||
"--git")
|
||||
shift
|
||||
if [ -z "${GIT:-}" ]; then
|
||||
err "Git not supported, run \`$0 --git-init\` first"
|
||||
return 1
|
||||
fi
|
||||
$GIT "$@"
|
||||
exit
|
||||
;;
|
||||
"--new")
|
||||
shift
|
||||
__new
|
||||
export next_filter=1
|
||||
;;
|
||||
"--list")
|
||||
shift
|
||||
export next_filter=1
|
||||
export list_option=1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z "${next_filter:-}" ]; then
|
||||
# else [FILTER] are the next options
|
||||
# Here, we have --add-xyz with --collection or nothign
|
||||
case "${1:-}" in
|
||||
"--add-note" | "--add-task" | "--add-jour" | "--collection")
|
||||
noninteractive=1
|
||||
;;
|
||||
esac
|
||||
if [ -n "${noninteractive:-}" ]; then
|
||||
while [ -n "${1:-}" ]; do
|
||||
case "$1" in
|
||||
"--add-note" | "--add-task" | "--add-jour")
|
||||
if [ -n "${add_option:-}" ]; then
|
||||
err "What do you want to add?"
|
||||
exit 1
|
||||
fi
|
||||
add_option="$1"
|
||||
shift
|
||||
summary=${1-}
|
||||
if [ -z "$summary" ]; then
|
||||
err "You did not give a summary"
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
if [ "$add_option" = "--add-task" ] && [ -n "${1:-}" ]; then
|
||||
case "$1" in
|
||||
"--"*)
|
||||
continue
|
||||
;;
|
||||
*)
|
||||
due=$(printf "%s" "$1" | tr -dc "[:alnum:][:blank:]")
|
||||
shift
|
||||
if [ -z "$due" ] || ! date -d "$due" >/dev/null 2>&1; then
|
||||
err "Invalid due date"
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
"--collection")
|
||||
shift
|
||||
collection="$(printf "%s" "$COLLECTION_LABELS" |
|
||||
cut -d ";" -f "${1:-}" 2>/dev/null |
|
||||
cut -d "=" -f 1 2>/dev/null)"
|
||||
if [ -z "$collection" ]; then
|
||||
err "Invalid collection"
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
err "Unknown non-interactive option: $1"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "${noninteractive:-}" ]; then
|
||||
if [ -z "${add_option:-}" ]; then
|
||||
err "Specified collection, but nothing to add"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${collection:-}" ]; then
|
||||
collection="$(
|
||||
printf "%s" "$COLLECTION_LABELS" |
|
||||
cut -d ";" -f 1 |
|
||||
cut -d "=" -f 1
|
||||
)"
|
||||
fi
|
||||
case "$add_option" in
|
||||
"--add-note")
|
||||
__add_note "$collection" "$summary"
|
||||
;;
|
||||
"--add-task")
|
||||
__add_task "$collection" "$summary" "${due:-}"
|
||||
;;
|
||||
"--add-jour")
|
||||
__add_jour "$collection" "$summary"
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
fi
|
||||
35
src/sh/cliinternal.sh
Normal file
35
src/sh/cliinternal.sh
Normal file
@@ -0,0 +1,35 @@
|
||||
# Command-line interface for internal use only
|
||||
|
||||
# Generate preview of file from selection
|
||||
if [ "${1:-}" = "--preview" ]; then
|
||||
shift
|
||||
name="$1"
|
||||
shift
|
||||
file="$ROOT/$name"
|
||||
awk -v field="DESCRIPTION" "$AWK_GET" "$file" |
|
||||
$CAT
|
||||
exit
|
||||
fi
|
||||
|
||||
# Reload view
|
||||
if [ "${1:-}" = "--reload" ]; then
|
||||
shift
|
||||
case "${1:-}" in
|
||||
"--toggle-completed")
|
||||
shift
|
||||
fname="$1"
|
||||
shift
|
||||
__toggle_completed "$fname" >/dev/null
|
||||
;;
|
||||
"--change-priority")
|
||||
shift
|
||||
delta=$1
|
||||
shift
|
||||
fname="$1"
|
||||
shift
|
||||
__change_priority "$delta" "$fname" >/dev/null
|
||||
;;
|
||||
esac
|
||||
__lines
|
||||
exit
|
||||
fi
|
||||
68
src/sh/config.sh
Normal file
68
src/sh/config.sh
Normal file
@@ -0,0 +1,68 @@
|
||||
CONFIGFILE="${CONFIGFILE:-$HOME/.config/fzf-vjour/config}"
|
||||
export TERMINAL_TITLE="🗃️ fzf-vjour | Journal, notes, and tasks"
|
||||
if [ ! -f "$CONFIGFILE" ]; then
|
||||
err "Configuration '$CONFIGFILE' not found."
|
||||
exit 1
|
||||
fi
|
||||
# shellcheck source=/dev/null
|
||||
. "$CONFIGFILE"
|
||||
if [ -z "${ROOT:-}" ] || [ -z "${COLLECTION_LABELS:-}" ]; then
|
||||
err "Configuration '$CONFIGFILE' is incomplete."
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -d "$ROOT" ]; then
|
||||
err "Directory '$ROOT' does not exist."
|
||||
exit 1
|
||||
fi
|
||||
SYNC_CMD="${SYNC_CMD:-}"
|
||||
SET_TERMINAL_TITLE="${SET_TERMINAL_TITLE:-yes}"
|
||||
export ROOT
|
||||
export SYNC_CMD
|
||||
export COLLECTION_LABELS
|
||||
export SET_TERMINAL_TITLE
|
||||
for i in $(seq 9); do
|
||||
collection=$(printf "%s" "$COLLECTION_LABELS" | cut -d ';' -f "$i" | cut -d '=' -f 1)
|
||||
label=$(printf "%s" "$COLLECTION_LABELS" | cut -d ';' -f "$i" | cut -d '=' -f 2)
|
||||
if [ -n "$label" ] && [ ! -d "$ROOT/$collection" ]; then
|
||||
err "Collection directory for '$label' does not exist."
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$label" ]; then
|
||||
export COLLECTION_COUNT=$((i - 1))
|
||||
break
|
||||
fi
|
||||
export "COLLECTION$i=$label"
|
||||
done
|
||||
|
||||
# Tools
|
||||
if command -v "fzf" >/dev/null; then
|
||||
FZF="fzf --black"
|
||||
else
|
||||
err "Did not find the command-line fuzzy finder fzf."
|
||||
exit 1
|
||||
fi
|
||||
export FZF
|
||||
|
||||
if command -v "uuidgen" >/dev/null; then
|
||||
UUIDGEN="uuidgen"
|
||||
else
|
||||
err "Did not find the uuidgen command."
|
||||
exit 1
|
||||
fi
|
||||
export UUIDGEN
|
||||
|
||||
if command -v "bat" >/dev/null; then
|
||||
CAT="bat"
|
||||
elif command -v "batcat" >/dev/null; then
|
||||
CAT="batcat"
|
||||
fi
|
||||
CAT=${CAT:+$CAT --color=always --style=numbers --language=md}
|
||||
CAT=${CAT:-cat}
|
||||
export CAT
|
||||
|
||||
if command -v "git" >/dev/null && [ -d "$ROOT/.git" ]; then
|
||||
GIT="git -C $ROOT"
|
||||
export GIT
|
||||
fi
|
||||
|
||||
export OPEN=${OPEN:-open}
|
||||
61
src/sh/filter.sh
Normal file
61
src/sh/filter.sh
Normal file
@@ -0,0 +1,61 @@
|
||||
# Build query
|
||||
while [ -n "${1:-}" ]; do
|
||||
case "${1:-}" in
|
||||
"--completed")
|
||||
shift
|
||||
cliquery="${cliquery:-} $FLAG_COMPLETED"
|
||||
;;
|
||||
"--no-completed")
|
||||
shift
|
||||
cliquery="${cliquery:-} !$FLAG_COMPLETED"
|
||||
;;
|
||||
"--open")
|
||||
shift
|
||||
cliquery="${cliquery:-} $FLAG_OPEN"
|
||||
;;
|
||||
"--no-open")
|
||||
shift
|
||||
cliquery="${cliquery:-} !$FLAG_OPEN"
|
||||
;;
|
||||
"--tasks")
|
||||
shift
|
||||
cliquery="${cliquery:-} $FLAG_OPEN | $FLAG_COMPLETED"
|
||||
;;
|
||||
"--no-tasks")
|
||||
shift
|
||||
cliquery="${cliquery:-} !$FLAG_COMPLETED !$FLAG_OPEN"
|
||||
;;
|
||||
"--notes")
|
||||
shift
|
||||
cliquery="${cliquery:-} $FLAG_NOTE"
|
||||
;;
|
||||
"--no-notes")
|
||||
shift
|
||||
cliquery="${cliquery:-} !$FLAG_NOTE"
|
||||
;;
|
||||
"--journal")
|
||||
shift
|
||||
cliquery="${cliquery:-} $FLAG_JOURNAL"
|
||||
;;
|
||||
"--no-journal")
|
||||
shift
|
||||
cliquery="${cliquery:-} !$FLAG_JOURNAL"
|
||||
;;
|
||||
"--filter")
|
||||
shift
|
||||
cliquery="${cliquery:-} $1"
|
||||
shift
|
||||
;;
|
||||
"--no-filter")
|
||||
shift
|
||||
cliquery="${cliquery:-} !$1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
err "Unknown option \"$1\""
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
query=${cliquery:-!$FLAG_COMPLETED}
|
||||
export query
|
||||
9
src/sh/helper.sh
Normal file
9
src/sh/helper.sh
Normal file
@@ -0,0 +1,9 @@
|
||||
# Print error message
|
||||
err() {
|
||||
echo "❌ $1" >/dev/tty
|
||||
}
|
||||
|
||||
# Strip whitespaces from argument
|
||||
stripws() {
|
||||
echo "$@" | sed "s/^ *//" | sed "s/ *$//"
|
||||
}
|
||||
264
src/sh/icalendar.sh
Normal file
264
src/sh/icalendar.sh
Normal file
@@ -0,0 +1,264 @@
|
||||
# Interface to modify iCalendar files
|
||||
|
||||
# Wrapper to add entry from markdown file
|
||||
#
|
||||
# @input $1: path to markdown file
|
||||
# @input $2: collection to add to
|
||||
__add_from_md() {
|
||||
tmpmd="$1"
|
||||
shift
|
||||
collection="$1"
|
||||
shift
|
||||
file=""
|
||||
while [ -f "$file" ] || [ -z "$file" ]; do
|
||||
uuid=$($UUIDGEN)
|
||||
file="$ROOT/$collection/$uuid.ics"
|
||||
done
|
||||
tmpfile="$tmpmd.ics"
|
||||
if awk -v uid="$uuid" "$AWK_NEW" "$tmpmd" >"$tmpfile"; then
|
||||
if [ ! -d "$ROOT/$collection" ]; then
|
||||
mkdir -p "$ROOT/$collection"
|
||||
fi
|
||||
mv "$tmpfile" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "File added" -- "$file"
|
||||
fi
|
||||
else
|
||||
rm -f "$tmpfile"
|
||||
err "Failed to create new entry."
|
||||
fi
|
||||
rm "$tmpmd"
|
||||
}
|
||||
|
||||
# Noninteractively add note, and fill description from stdin
|
||||
#
|
||||
# @input $1: Collection
|
||||
# @input $2: Summary
|
||||
__add_note() {
|
||||
collection="$1"
|
||||
shift
|
||||
summary="$1"
|
||||
shift
|
||||
tmpmd=$(mktemp --suffix='.md')
|
||||
{
|
||||
echo "# $summary"
|
||||
echo ""
|
||||
} >"$tmpmd"
|
||||
if [ ! -t 0 ]; then
|
||||
cat /dev/stdin >>"$tmpmd"
|
||||
fi
|
||||
__add_from_md "$tmpmd" "$collection"
|
||||
}
|
||||
|
||||
# Noninteractively add task, and fill description from stdin
|
||||
#
|
||||
# @input $1: Collection
|
||||
# @input $2: Summary
|
||||
# @input $3: Due date (optional)
|
||||
__add_task() {
|
||||
collection="$1"
|
||||
shift
|
||||
summary="$1"
|
||||
shift
|
||||
due="${1:-}"
|
||||
tmpmd=$(mktemp --suffix='.md')
|
||||
{
|
||||
echo "::: <| $due"
|
||||
echo "# $summary"
|
||||
echo ""
|
||||
} >"$tmpmd"
|
||||
if [ ! -t 0 ]; then
|
||||
cat /dev/stdin >>"$tmpmd"
|
||||
fi
|
||||
__add_from_md "$tmpmd" "$collection"
|
||||
}
|
||||
|
||||
# Noninteractively add jounral, and fill description from stdin
|
||||
#
|
||||
# @input $1: Collection
|
||||
# @input $2: Summary
|
||||
__add_jour() {
|
||||
collection="$1"
|
||||
shift
|
||||
summary="$1"
|
||||
shift
|
||||
tmpmd=$(mktemp --suffix='.md')
|
||||
{
|
||||
echo "::: |> <!-- keep this line to associate the entry to _today_ -->"
|
||||
echo "# $summary"
|
||||
echo ""
|
||||
} >"$tmpmd"
|
||||
if [ ! -t 0 ]; then
|
||||
cat /dev/stdin >>"$tmpmd"
|
||||
fi
|
||||
__add_from_md "$tmpmd" "$collection"
|
||||
}
|
||||
|
||||
# Toggle completed status of VTODO
|
||||
#
|
||||
# @input $1: Relative path to iCalendar file
|
||||
__toggle_completed() {
|
||||
fname="$1"
|
||||
shift
|
||||
file="$ROOT/$fname"
|
||||
tmpfile=$(mktemp)
|
||||
awk "$AWK_ALTERTODO" "$file" >"$tmpfile"
|
||||
mv "$tmpfile" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "Completed toggle" -- "$file"
|
||||
fi
|
||||
}
|
||||
|
||||
# Change priority of VTODO entry
|
||||
#
|
||||
# @input $1: Delta, can be any integer
|
||||
# @input $2: Relative path to iCalendar file
|
||||
__change_priority() {
|
||||
delta=$1
|
||||
shift
|
||||
fname="$1"
|
||||
shift
|
||||
file="$ROOT/$fname"
|
||||
tmpfile=$(mktemp)
|
||||
awk -v delta="$delta" "$AWK_ALTERTODO" "$file" >"$tmpfile"
|
||||
mv "$tmpfile" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "Priority changed by $delta" -- "$file"
|
||||
fi
|
||||
}
|
||||
|
||||
# Edit file
|
||||
#
|
||||
# @input $1: File path
|
||||
__edit() {
|
||||
file="$1"
|
||||
shift
|
||||
tmpmd=$(mktemp --suffix='.md')
|
||||
due=$(awk -v field="DUE" -v format="date" "$AWK_GET" "$file")
|
||||
if [ -n "$due" ]; then
|
||||
echo "::: <| $due" >"$tmpmd"
|
||||
fi
|
||||
{
|
||||
echo "# $(awk -v field="SUMMARY" -v oneline=1 "$AWK_GET" "$file")"
|
||||
echo "> $(awk -v field="CATEGORIES" -v format="csv" -v oneline=1 "$AWK_GET" "$file")"
|
||||
echo ""
|
||||
awk -v field="DESCRIPTION" "$AWK_GET" "$file"
|
||||
} >>"$tmpmd"
|
||||
checksum=$(cksum "$tmpmd")
|
||||
|
||||
# Open in editor
|
||||
$EDITOR "$tmpmd" >/dev/tty
|
||||
|
||||
# Update only if changes are detected
|
||||
while [ "$checksum" != "$(cksum "$tmpmd")" ]; do
|
||||
tmpfile="$tmpmd.ics"
|
||||
if awk "$AWK_UPDATE" "$tmpmd" "$file" >"$tmpfile"; then
|
||||
mv "$tmpfile" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "File modified" -- "$file"
|
||||
fi
|
||||
break
|
||||
else
|
||||
rm -f "$tmpfile"
|
||||
err "Failed to update entry. Press <enter> to continue."
|
||||
read -r tmp
|
||||
# Re-open in editor
|
||||
$EDITOR "$tmpmd" >/dev/tty
|
||||
fi
|
||||
done
|
||||
rm "$tmpmd"
|
||||
}
|
||||
|
||||
# Delete file
|
||||
#
|
||||
# @input $1: File path
|
||||
__delete() {
|
||||
file="$1"
|
||||
shift
|
||||
summary=$(awk -v field="SUMMARY" "$AWK_GET" "$file")
|
||||
while true; do
|
||||
printf "Do you want to delete the entry with the title \"%s\"? (yes/no): " "$summary" >/dev/tty
|
||||
read -r yn
|
||||
case $yn in
|
||||
"yes")
|
||||
rm -v "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "File deleted" -- "$file"
|
||||
fi
|
||||
break
|
||||
;;
|
||||
"no")
|
||||
break
|
||||
;;
|
||||
*)
|
||||
echo "Please answer \"yes\" or \"no\"." >/dev/tty
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Add file
|
||||
__new() {
|
||||
collection=$(printf "%s" "$COLLECTION_LABELS" |
|
||||
tr ';' '\n' |
|
||||
$FZF \
|
||||
--ansi \
|
||||
--prompt="Choose collection> " \
|
||||
--select-1 \
|
||||
--no-sort \
|
||||
--tac \
|
||||
--margin="30%,30%" \
|
||||
--delimiter='=' \
|
||||
--border=bold \
|
||||
--border-label="Collections" \
|
||||
--with-nth=2 \
|
||||
--accept-nth=1 || true)
|
||||
if [ -z "$collection" ]; then
|
||||
return
|
||||
fi
|
||||
file=""
|
||||
while [ -f "$file" ] || [ -z "$file" ]; do
|
||||
uuid=$($UUIDGEN)
|
||||
file="$ROOT/$collection/$uuid.ics"
|
||||
done
|
||||
tmpmd=$(mktemp --suffix='.md')
|
||||
{
|
||||
echo "::: |> <!-- keep this line to associate the entry to _today_ -->"
|
||||
echo "::: <| <!-- specify the due date for to-dos, can be empty, a date string, or even \"next Sunday\" -->"
|
||||
echo "# <!-- write summary here -->"
|
||||
echo "> <!-- comma-separated list of categories -->"
|
||||
echo ""
|
||||
} >"$tmpmd"
|
||||
checksum=$(cksum "$tmpmd")
|
||||
|
||||
# Open in editor
|
||||
$EDITOR "$tmpmd" >/dev/tty
|
||||
|
||||
# Update if changes are detected
|
||||
while [ "$checksum" != "$(cksum "$tmpmd")" ]; do
|
||||
tmpfile="$tmpmd.ics"
|
||||
if awk -v uid="$uuid" "$AWK_NEW" "$tmpmd" >"$tmpfile"; then
|
||||
if [ ! -d "$ROOT/$collection" ]; then
|
||||
mkdir -p "$ROOT/$collection"
|
||||
fi
|
||||
mv "$tmpfile" "$file"
|
||||
if [ -n "${GIT:-}" ]; then
|
||||
$GIT add "$file"
|
||||
$GIT commit -q -m "File added" -- "$file"
|
||||
fi
|
||||
break
|
||||
else
|
||||
rm -f "$tmpfile"
|
||||
err "Failed to create new entry. Press <enter> to continue."
|
||||
read -r tmp
|
||||
# Re-open in editor
|
||||
$EDITOR "$tmpmd" >/dev/tty
|
||||
fi
|
||||
done
|
||||
rm "$tmpmd"
|
||||
}
|
||||
21
src/sh/theme.sh
Normal file
21
src/sh/theme.sh
Normal file
@@ -0,0 +1,21 @@
|
||||
# Colors
|
||||
GREEN="\033[1;32m"
|
||||
RED="\033[1;31m"
|
||||
WHITE="\033[1;97m"
|
||||
CYAN="\033[1;36m"
|
||||
FAINT="\033[2m"
|
||||
|
||||
# Flags
|
||||
export FLAG_OPEN="${FLAG_OPEN:-🔲}"
|
||||
export FLAG_COMPLETED="${FLAG_COMPLETED:-✅}"
|
||||
export FLAG_JOURNAL="${FLAG_JOURNAL:-📘}"
|
||||
export FLAG_NOTE="${FLAG_NOTE:-🗒️}"
|
||||
export FLAG_PRIORITY="${FLAG_PRIORITY:-❗}"
|
||||
export FLAG_ATTACHMENT="${FLAG_ATTACHMENT:-🔗}"
|
||||
|
||||
# Style
|
||||
export STYLE_COLLECTION="${STYLE_COLLECTION:-$FAINT$WHITE}"
|
||||
export STYLE_DATE="${STYLE_DATE:-$CYAN}"
|
||||
export STYLE_SUMMARY="${STYLE_SUMMARY:-$GREEN}"
|
||||
export STYLE_EXPIRED="${STYLE_EXPIRED:-$RED}"
|
||||
export STYLE_CATEGORY="${STYLE_CATEGORY:-$WHITE}"
|
||||
Reference in New Issue
Block a user