diff --git a/platform/cervantes/koreader.sh b/platform/cervantes/koreader.sh index 3bdb84424..6f975f88d 100755 --- a/platform/cervantes/koreader.sh +++ b/platform/cervantes/koreader.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash export LC_ALL="en_US.UTF-8" @@ -83,6 +83,9 @@ if [ "${STANDALONE}" != "true" ]; then [ -x /etc/init.d/connman ] && /etc/init.d/connman stop fi +CRASH_COUNT=0 +CRASH_TS=0 +CRASH_PREV_TS=0 # **magic** values to request shell stuff. It starts at 85, # any number lower than that will exit this script. RESTART_KOREADER=85 @@ -91,18 +94,101 @@ ENTER_QBOOKAPP=87 RETURN_VALUE="${RESTART_KOREADER}" # Loop forever until KOReader requests a normal exit. -while [ "${RETURN_VALUE}" -ge "${RESTART_KOREADER}" ]; do +while [ "${RETURN_VALUE}" -ne 0 ]; do # move dictionaries from external storage to koreader private partition. find /mnt/public/dict -type f -exec mv -v \{\} /mnt/private/koreader/data/dict \; 2>/dev/null - # Do an update check now, so we can actually update KOReader via the "Restart KOReader" menu entry ;). - ko_update_check + if [ ${RETURN_VALUE} -eq ${RESTART_KOREADER} ]; then + # Do an update check now, so we can actually update KOReader via the "Restart KOReader" menu entry ;). + ko_update_check + fi # run KOReader ./reader.lua "$@" >>crash.log 2>&1 RETURN_VALUE=$? + if [ ${RETURN_VALUE} -ne 0 ] && [ "${RETURN_VALUE}" -ne "${ENTER_USBMS}" ] && [ "${RETURN_VALUE}" -ne "${ENTER_QBOOKAPP}" ] && [ "${RETURN_VALUE}" -ne "${RESTART_KOREADER}" ]; then + # Increment the crash counter + CRASH_COUNT=$((CRASH_COUNT + 1)) + CRASH_TS=$(date +'%s') + # Reset it to a first crash if it's been a while since our last crash... + if [ $((CRASH_TS - CRASH_PREV_TS)) -ge 20 ]; then + CRASH_COUNT=1 + fi + + # Check if the user requested to always abort on crash + if grep -q '\["dev_abort_on_crash"\] = true' 'settings.reader.lua' 2>/dev/null; then + ALWAYS_ABORT="true" + # In which case, make sure we pause on *every* crash + CRASH_COUNT=1 + else + ALWAYS_ABORT="false" + fi + + # Show a fancy bomb on screen + viewWidth=600 + viewHeight=800 + FONTH=16 + eval "$(./fbink -e | tr ';' '\n' | grep -e viewWidth -e viewHeight -e FONTH | tr '\n' ';')" + # Compute margins & sizes relative to the screen's resolution, so we end up with a similar layout, no matter the device. + # Height @ ~56.7%, w/ a margin worth 1.5 lines + bombHeight=$((viewHeight / 2 + viewHeight / 15)) + bombMargin=$((FONTH + FONTH / 2)) + # With a little notice at the top of the screen, on a big gray screen of death ;). + ./fbink -q -b -c -B GRAY9 -m -y 1 "Don't Panic! (Crash n°${CRASH_COUNT} -> ${RETURN_VALUE})" + if [ ${CRASH_COUNT} -eq 1 ]; then + # Warn that we're waiting on a tap to continue... + ./fbink -q -b -O -m -y 2 "Tap the screen to continue." + fi + # U+1F4A3, the hard way, because we can't use \u or \U escape sequences... + ./fbink -q -b -O -m -t regular=./fonts/freefont/FreeSerif.ttf,px=${bombHeight},top=${bombMargin} -- $'\xf0\x9f\x92\xa3' + # And then print the tail end of the log on the bottom of the screen... + crashLog="$(tail -n 25 crash.log | sed -e 's/\t/ /g')" + # The idea for the margins being to leave enough room for an fbink -Z bar, small horizontal margins, and a font size based on what 6pt looked like @ 265dpi + ./fbink -q -b -O -t regular=./fonts/droid/DroidSansMono.ttf,top=$((viewHeight / 2 + FONTH * 2 + FONTH / 2)),left=$((viewWidth / 60)),right=$((viewWidth / 60)),px=$((viewHeight / 64)) -- "${crashLog}" + # So far, we hadn't triggered an actual screen refresh, do that now, to make sure everything is bundled in a single flashing refresh. + ./fbink -q -f -s + # Cue a lemming's faceplant sound effect! + + { + echo "!!!!" + echo "Uh oh, something went awry... (Crash n°${CRASH_COUNT}: $(date +'%x @ %X'))" + echo "Running on Linux $(uname -r) ($(uname -v))" + } >>crash.log 2>&1 + if [ ${CRASH_COUNT} -lt 5 ] && [ "${ALWAYS_ABORT}" = "false" ]; then + echo "Attempting to restart KOReader . . ." >>crash.log 2>&1 + echo "!!!!" >>crash.log 2>&1 + fi + + # Pause a bit if it's the first crash in a while, so that it actually has a chance of getting noticed ;). + if [ ${CRASH_COUNT} -eq 1 ]; then + # NOTE: We don't actually care about what head reads, we're just using it as a fancy sleep ;). + # i.e., we pause either until the 15s timeout, or until the user touches the screen. + timeout 15 head -c 24 /dev/input/event1 >/dev/null + fi + # Cycle the last crash timestamp + CRASH_PREV_TS=${CRASH_TS} + + # But if we've crashed more than 5 consecutive times, exit, because we wouldn't want to be stuck in a loop... + # NOTE: No need to check for ALWAYS_ABORT, CRASH_COUNT will always be 1 when it's true ;). + if [ ${CRASH_COUNT} -ge 5 ]; then + echo "Too many consecutive crashes, aborting . . ." >>crash.log 2>&1 + echo "!!!! ! !!!!" >>crash.log 2>&1 + break + fi + + # If the user requested to always abort on crash, do so. + if [ "${ALWAYS_ABORT}" = "true" ]; then + echo "Aborting . . ." >>crash.log 2>&1 + echo "!!!! ! !!!!" >>crash.log 2>&1 + break + fi + else + # Reset the crash counter if that was a sane exit/restart + CRASH_COUNT=0 + fi + # check if KOReader requested to enter in mass storage mode. if [ "${RETURN_VALUE}" -eq "${ENTER_USBMS}" ]; then # NOTE: at this point we're sure that the safemode tool