mxmehl/mail-config
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve log output and comments

Browse Source
This commit is contained in:
mxmehl
2017-07-24 15:29:34 +02:00
parent 399fa3343b
commit 13f17c4844
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
astroid/hooks/unspam
View File

@@ -1,26 +1,28 @@
#!/bin/bash #!/bin/bash
# #
# $1 = message id # Removes the spam tag from a mail, and moves it back to the INBOX if necessary
# #
# $1 = message id
TAG="spam"
DIR_JUNK="INBOX.Junk" DIR_JUNK="INBOX.Junk"
DIR_INBOX="INBOX" DIR_INBOX="INBOX"
LOG="/home/$USER/.config/astroid/hooks/hook.log" LOG="/home/$USER/.config/astroid/hooks/hook.log"
ID=$1 ID=$1
FILE=$(notmuch search --exclude=false --output=files "id:$ID") # get actual file path of MID FILE=$(notmuch search --exclude=false --output=files id:"${ID}") # get actual file path of MID
if [[ $(notmuch search "id:$ID" and tag:spam) ]]; then # only do something if mail is tagged "spam" if [[ $(notmuch search id:"${ID}" and tag:${TAG}) ]]; then # only do something if mail is tagged "spam"
notmuch tag -spam -- "id:$ID" # unspam mail notmuch tag -${TAG} -- id:"${ID}" # unspam mail
echo "[unspam] spam removed from $ID" >> $LOG echo "[unspam] [SUCCESS] \"${TAG}\" removed from ${ID}" >> $LOG
else else
echo "[unspam] [ERROR] no spam: $ID" >> $LOG echo "[unspam] [ERROR] not tagged as \"${TAG}\": ${ID}" >> $LOG
fi fi
if $(echo $FILE | grep -q $DIR_JUNK); then # if mail is in spam dir if $(echo ${FILE} | grep -q ${DIR_JUNK}); then # if mail is in spam dir
FILE_NEW=$(echo $FILE | sed "s|$DIR_JUNK/|$DIR_INBOX/|") FILE_NEW=$(echo ${FILE} | sed "s|${DIR_JUNK}/|${DIR_INBOX}/|")
mv "$FILE" "$FILE_NEW" # move from spamdir to inbox mv "${FILE}" "${FILE_NEW}" # move from spamdir to inbox
echo "[unspam] moved $FILE to $FILE_NEW" >> $LOG echo "[unspam] [SUCCESS] moved ${FILE} to ${FILE_NEW}" >> $LOG
else else
echo "[unspam] [ERROR] not in junk folder: $FILE" >> $LOG echo "[unspam] [ERROR] not in \"${TAG}\"\'s folder: ${FILE}" >> $LOG
fi fi