Viewstate import - Improve error checking and recovery

This commit is contained in:
ChuckPa 2022-11-12 01:17:53 -05:00
parent aa296cf52d
commit b645e0f205
No known key found for this signature in database
GPG Key ID: 3CE28A0F6BC31B5B

View File

@ -1112,17 +1112,16 @@ do
# Import viewstates into working copy # Import viewstates into working copy
Output "Importing Viewstate data" Output "Importing Viewstate data"
"$PLEX_SQLITE" $CPPL.db < "$TMPDIR/Viewstate.sql-$TimeStamp" "$PLEX_SQLITE" $CPPL.db < "$TMPDIR/Viewstate.sql-$TimeStamp 2> /dev/null"
Result=$?
# Make certain the resultant DB is OK # Make certain the resultant DB is OK
Output "Checking database following import" Output "Checking database following import"
if ! CheckDB $CPPL.db ; then
if ! CheckDB $CPPL.db ; then
Output "Error $Result during import. Import corrupted database." Output "Error $Result during import. Import corrupted database."
Output " Undoing viewstate import." Output " Undoing viewstate import."
RestoreSaved "$LastTimestamp" cp -p "$TMPDIR/Viewstate.db-$TimeStamp" $CPPL.db
WriteLog "Import - Import: $Input - FAIL" WriteLog "Import - Import: $Input - FAIL"
continue continue
fi fi