Merge e63b7552bb into 47bd6e7c56

Plex path discovery on Windows

DBRepair-Windows.bat

@@ -6,8 +6,7 @@ REM  - everything is done without need to interact.
 REM
 REM -- WARNNING -- WARNING -- WARNING
 REM
-REM 1. This is stable working software but not "Released" software.  Development will continue.
-REM 2. You must ensure variable PlexData points to your databases. (there is no automatic detection at this time)
+REM This is stable working software but not "Released" software.  Development will continue.
 REM
 REM ### Create Timestamp
 set Hour=%time:~0,2%
@@ -20,9 +19,33 @@ set Hour=%Hour: =%
 REM ## Set TimeStamp ##
 set TimeStamp=%Hour%-%Min%-%Sec%
 
-REM These assume PMS is in the default location
-set "PlexData=%LOCALAPPDATA%\Plex Media Server\Plug-in Support\Databases"
-set "PlexSQL=%PROGRAMFILES%\Plex\Plex Media Server\Plex SQLite"
+REM Find PMS database location
+for /F "tokens=2* skip=2" %%a in ('REG.EXE QUERY "HKCU\Software\Plex, Inc.\Plex Media Server" /v "LocalAppDataPath" 2^> nul') do set "PlexData=%%b\Plex Media Server\Plug-in Support\Databases"
+if not exist "%PlexData%" (
+	if exist "%LOCALAPPDATA%\Plex Media Server\Plug-in Support\Databases" (
+		set "PlexData=%LOCALAPPDATA%\Plex Media Server\Plug-in Support\Databases"
+	) else (
+		echo Could not determine Plex database path.
+		echo Normally %LOCALAPPDATA%\Plex Media Server\Plug-in Support\Databases
+		echo.
+		goto :EOF
+	)
+)
+
+REM Find PMS installation location.
+for /F "tokens=2* skip=2" %%a in ('REG.EXE QUERY "HKCU\Software\Plex, Inc.\Plex Media Server" /v "InstallFolder" 2^> nul') do set "PlexSQL=%%b\Plex SQLite.exe"
+if not exist "%PlexSQL%" (
+	if exist "%PROGRAMFILES%\Plex\Plex Media Server\Plex SQLite.exe" (
+		set "PlexSQL=%PROGRAMFILES%\Plex\Plex Media Server\Plex SQLite.exe"
+	) else (
+		echo Could not determine SQLite path.
+		echo Normally %PROGRAMFILES%\Plex\Plex Media Server\Plex SQLite.exe
+		echo.
+		goto :EOF
+	)
+)
+
+REM Set temporary file locations
 set "DBtmp=%PlexData%\dbtmp"
 set "TmpFile=%DBtmp%\results.tmp"
 
@@ -42,7 +65,7 @@ if %ERRORLEVEL%==0 (
 
 cd "%PlexData%"
 
-mkdir "%PlexData%\dbtmp" 2>NUL
+md "%PlexData%\dbtmp" 2>NUL
 del "%TmpFile%"  2>NUL
 
 echo %time% --  Exporting Main DB

DBRepair.sh

@@ -1451,12 +1451,6 @@ DownloadAndUpdate() {
     url="$1"
     filename="$2"
 
-    # Check if script path is writable
-    if [ ! -w "$ScriptWorkingDirectory" ]; then
-      Output "Script path is not writable."
-      exit 2
-    fi
-
     # Download the file and check if the download was successful
     if curl -s "$url" --output "$filename"; then
         Output "Update downloaded successfully"
@@ -1922,13 +1916,18 @@ do
           DoUpdate=1
           Output "Version update available"
         else
-          Output "No update available"
+          Output "No update available or user declined update"
         fi
         
+        # Check if script path is writable
         if [ $DoUpdate -eq 1 ]; then
+          if [ -w "$ScriptWorkingDirectory" ]; then
             Output "Performing update"
             DownloadAndUpdate "https://raw.githubusercontent.com/ChuckPa/PlexDBRepair/master/DBRepair.sh" "$ScriptWorkingDirectory/$ScriptName"
             exit 0
+          else
+            Output "Script path is not writable."
+          fi
         fi
 
         if [ $Scripted -eq 1 ]; then