Merge pull request #113 from ChuckPa/chuckpa/missing-ignore-errors-check

Fix unable to repair DB when UNIQUE constraint errors occur
This commit is contained in:
Chuck 2023-11-25 16:27:44 -08:00 committed by GitHub
commit 00bb897a92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions

View File

@ -2,12 +2,12 @@
######################################################################### #########################################################################
# Plex Media Server database check and repair utility script. # # Plex Media Server database check and repair utility script. #
# Maintainer: ChuckPa # # Maintainer: ChuckPa #
# Version: v1.01.02 # # Version: v1.01.03 #
# Date: 10-Nov-2023 # # Date: 25-Nov-2023 #
######################################################################### #########################################################################
# Version for display purposes # Version for display purposes
Version="v1.01.02" Version="v1.01.03"
# Flag when temp files are to be retained # Flag when temp files are to be retained
Retain=0 Retain=0
@ -882,7 +882,8 @@ DoRepair() {
Output "Importing Main DB." Output "Importing Main DB."
"$PLEX_SQLITE" "$TMPDIR/$CPPL.db-REPAIR-$TimeStamp" < "$TMPDIR/library.plexapp.sql-$TimeStamp" "$PLEX_SQLITE" "$TMPDIR/$CPPL.db-REPAIR-$TimeStamp" < "$TMPDIR/library.plexapp.sql-$TimeStamp"
Result=$? Result=$?
if ! SQLiteOK $Result; then [ $IgnoreErrors -eq 1 ] && Result=0
Output "Error $Result from Plex SQLite while importing from '$TMPDIR/library.plexapp.sql-$TimeStamp'" Output "Error $Result from Plex SQLite while importing from '$TMPDIR/library.plexapp.sql-$TimeStamp'"
WriteLog "Repair - Cannot import main database from '$TMPDIR/library.plexapp.sql-$TimeStamp' - FAIL ($Result)" WriteLog "Repair - Cannot import main database from '$TMPDIR/library.plexapp.sql-$TimeStamp' - FAIL ($Result)"
Output "Cannot continue." Output "Cannot continue."

View File

@ -8,6 +8,11 @@
![Maintenance](https://img.shields.io/badge/Maintained-Yes-green.svg) ![Maintenance](https://img.shields.io/badge/Maintained-Yes-green.svg)
# Release Info: # Release Info:
v1.01.03
- Missing IgnoreErrors (-i / -f) test when reimporting damaged DB with certain errors prevented repair
in all cases.
v1.01.02 v1.01.02
- Correct updating when scripted versus interactive. - Correct updating when scripted versus interactive.