From a9d828d837b800c12bc8ae763728e757b3c7ed58 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Fri, 11 Dec 2020 12:19:58 +0000
Subject: [PATCH] recover incase json is stuffed and has no latest time
---
reddit-wallpaper-fetcher | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/reddit-wallpaper-fetcher b/reddit-wallpaper-fetcher
index d47b4b8..310c97e 100755
--- a/reddit-wallpaper-fetcher
+++ b/reddit-wallpaper-fetcher
@@ -17,48 +17,51 @@
CONFDIR="$HOME/.config"
WALLDIR="$HOME/.wallpaper"
else
- CONFDIR="$(dirname $(realpath $0))"
- WALLDIR="$(dirname $(realpath $0))"
+ CONFDIR="$(dirname $(realpath "$0"))"
+ WALLDIR="$(dirname $(realpath "$0"))"
fi
-source $CONFDIR/reddit-wallpaper-fetcher.conf &>/dev/null
+source "$CONFDIR"/reddit-wallpaper-fetcher.conf &>/dev/null
#Loud output for testing a changed config
[ -z "$1" ] && LOUD="-s"
#Initialise time from last fetch
LATEST_TIME=0
-if [ -f $WALLDIR/json ]; then
- LATEST=$(cat $WALLDIR/json)
- LATEST_TIME=$(echo $LATEST | jq ".data.children[-1].data.created_utc")
+if [ -f "$WALLDIR"/json ]; then
+ LATEST=$(cat "$WALLDIR"/json)
+ LATEST_TIME=$(echo "$LATEST" | jq ".data.children[-1].data.created_utc")
+fi
+if [ "$LATEST_TIME" == "null" ]; then
+ LATEST_TIME=0
fi
#Try subreddits for new images
for i in "${SUBREDDITS[@]}"; do
- temp=$(curl $LOUD --user-agent $USER "https://www.reddit.com/r/$i.json?sort=$SORT&limit=1")
- time=$(echo $temp | jq ".data.children[-1].data.created_utc")
+ temp=$(curl "$LOUD" --user-agent "$USER" "https://www.reddit.com/r/$i.json?sort=$SORT&limit=1")
+ time=$(echo "$temp" | jq ".data.children[-1].data.created_utc")
if [ $(awk -v n1="$time" -v n2="$LATEST_TIME" 'BEGIN {printf (n1>n2?"1":"")}') ]; then
- LATEST=$temp
- LATEST_TIME=$time
+ LATEST="$temp"
+ LATEST_TIME="$time"
fi
done
#No Update to do
-if [ -f $WALLDIR/json ] && [ "$(cat $WALLDIR/json)" == "$LATEST" ]; then
+if [ -f "$WALLDIR"/json ] && [ "$(cat "$WALLDIR"/json)" == "$LATEST" ]; then
exit
fi
#Download image
-url=$(echo $LATEST | jq ".data.children[-1].data.url" | sed 's/"//g')
-ext="$(echo $url | rev | cut -d'.' -f1 | rev)"
-curl $LOUD -o "$WALLDIR/temp.$ext" "$url"
+url=$(echo "$LATEST" | jq ".data.children[-1].data.url" | sed 's/"//g')
+ext="$(echo "$url" | rev | cut -d'.' -f1 | rev)"
+curl "$LOUD" -o "$WALLDIR/temp.$ext" "$url"
#Save image information
-echo $LATEST > $WALLDIR/json
-title=$(echo $LATEST | jq ".data.children[-1].data.title")
-echo "$title" > $WALLDIR/data.txt
-echo $url >> $WALLDIR/data.txt
-echo https://reddit.com$(echo $LATEST | jq ".data.children[-1].data.permalink" | sed 's/"//g') >> $WALLDIR/data.txt
+echo "$LATEST" > "$WALLDIR"/json
+title=$(echo "$LATEST" | jq ".data.children[-1].data.title")
+echo "$title" > "$WALLDIR"/data.txt
+echo "$url" >> "$WALLDIR"/data.txt
+echo https://reddit.com$(echo "$LATEST" | jq ".data.children[-1].data.permalink" | sed 's/"//g') >> "$WALLDIR"/data.txt
#Add image title
convert "$WALLDIR/temp.$ext" -resize "$SIZE^" -gravity center -crop "$SIZE+0+0" -resize "$SIZE!" "$WALLDIR/wallpaper.jpg"
--
Gitblit v1.10.0