From 6c32fc0594859e36433ea530528dcf74ee99900a Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Wed, 5 Apr 2023 10:42:40 -0400
Subject: [PATCH] Fixes, set pycache location

---
 innosetup.iss                         | 3 ++-
 opendm/ai.py                          | 2 +-
 win32env.bat                          | 1 +
 patchOpenCV.bat => winpostinstall.bat | 0
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename patchOpenCV.bat => winpostinstall.bat (100%)

diff --git a/innosetup.iss b/innosetup.iss
index 4b2c132f..3fd65132 100644
--- a/innosetup.iss
+++ b/innosetup.iss
@@ -59,6 +59,7 @@ Source: "settings.yaml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "win32env.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "winrun.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "SuperBuild\download\vc_redist.x64.exe"; DestDir: {tmp}; Flags: dontcopy
+Source: "winpostinstall.bat"; DestDir: "{app}"; Flags: ignoreversion
 
 [Dirs]
 Name: "{commonappdata}\ODM"; Permissions: users-modify
@@ -72,7 +73,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Run]
 Filename: "{tmp}\vc_redist.x64.exe"; StatusMsg: "Installing Visual C++ Redistributable Packages for Visual Studio 2019"; Parameters: "/quiet"; Check: VC2019RedistNeedsInstall ; Flags: waituntilterminated
-Filename: "{app}\patchOpenCV.bat"; StatusMsg: "Patching OpenCV"; Parameters: "/quiet"; Flags: waituntilterminated
+Filename: "{app}\winpostinstall.bat"; StatusMsg: "Post Install"; Flags: waituntilterminated runhidden
 Filename: "{app}\console.bat"; Description: {cm:LaunchProgram,ODM Console}; Flags: nowait postinstall skipifsilent
 
 [Code]
diff --git a/opendm/ai.py b/opendm/ai.py
index 31c31f81..eab76499 100644
--- a/opendm/ai.py
+++ b/opendm/ai.py
@@ -3,7 +3,7 @@ from opendm.net import download
 from opendm import log
 import zipfile
 import time
-import sys, platform
+import sys
 
 def get_model(namespace, url, version, name = "model.onnx"):
     version = version.replace(".", "_")
diff --git a/win32env.bat b/win32env.bat
index 2b9eb3b6..a73f63d5 100644
--- a/win32env.bat
+++ b/win32env.bat
@@ -15,6 +15,7 @@ set GDAL_DRIVER_PATH=%GDALBASE%\gdalplugins
 set OSFMBASE=%ODMBASE%SuperBuild\install\bin\opensfm\bin
 set SBBIN=%ODMBASE%SuperBuild\install\bin
 set PDAL_DRIVER_PATH=%ODMBASE%SuperBuild\install\bin
+set PYTHONPYCACHEPREFIX=%PROGRAMDATA%\ODM\pycache
 
 set PATH=%GDALBASE%;%SBBIN%;%OSFMBASE%
 set PROJ_LIB=%GDALBASE%\data\proj
diff --git a/patchOpenCV.bat b/winpostinstall.bat
similarity index 100%
rename from patchOpenCV.bat
rename to winpostinstall.bat