v1.82

run.bat

@@ -1,52 +1,118 @@
 @echo off
 setlocal enabledelayedexpansion
+cd /d "%~dp0"
 set NAME=HotspotAutoLogin
-set RUN=HotspotAutoLogin.pyw
-set "requirementsFile=requirements.txt"
+set PROJECTFOLDER=main
+set RUN=%PROJECTFOLDER%\HotspotAutoLogin.pyw
+set requirementsFile=%PROJECTFOLDER%\requirements.txt
 set VENV_PATH=.venv
 set ACTIVATE_PATH=%VENV_PATH%\Scripts\activate
+set CURRENT_DIR=%CD%
+set LAST_DIR_FILE=%PROJECTFOLDER%\last_known_directory.txt
+set refrenv=%PROJECTFOLDER%\refrenv.bat
+set PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/3.12.2/python-3.12.2-amd64.exe
+
+:: Display provided argument if any
+if not "%~1"=="" (
+    echo Open with: "%~1"
+)
 
 :: Check if Python is installed
-pip --version >nul 2>&1
-if errorlevel 1 (
-	echo Python is not installed.
-	set /p "userinp=Do you want to install Python (y/n)? "
-	if /i "!userinp!"=="y" (
-		echo Opening download link...
-		start https://www.python.org/downloads/
-		exit /b
+pip --version >nul 2>&1 && (set python_installed=true) || (set python_installed=false)
+if not "%python_installed%"=="true" (
+    echo Python is required to run this program.
+    set /p "userinp=Do you want to install Python (y/n)?: "
+    if /i "!userinp!"=="y" (
+        echo Downloading Python...
+        winget install python --accept-package-agreements
+        if errorlevel 1 (
+            echo Download failed using winget method. Trying to download manually...
+            :bothwingetfailed
+            if not exist "%PROJECTFOLDER%\python_installer.exe" (
+                echo Downloading Python from %PYTHON_DOWNLOAD_URL%
+                curl %PYTHON_DOWNLOAD_URL% -o %PROJECTFOLDER%\python_installer.exe
+                if not exist "%PROJECTFOLDER%\python_installer.exe" (
+                    echo Download failed using curl. Trying with the powershell method
+                    powershell -Command "& {Invoke-WebRequest -Uri '%PYTHON_DOWNLOAD_URL%' -OutFile '%PROJECTFOLDER%\python_installer.exe'}"
+                    if errorlevel 1 (
+                        echo Failed to install Python. Please install Python manually and try again.
+                        pause
+                        exit /b
+                    )
+                )
+            )
+            echo Installing Python. Please wait...
+            start /wait %PROJECTFOLDER%\python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
+            if errorlevel 1 (
+                echo Failed to install Python. Please install Python manually and try again.
+                pause
+                exit /b
+            )
+            del %PROJECTFOLDER%\python_installer.exe
+            goto python_ok
+        )
     ) else (
-		echo Please install Python and try again.
-		pause
-		exit /b
+        echo Python is required to run this program. Please install Python and try again.
+        pause
+        exit /b
     )
+    :python_ok
+    echo Python installed successfully.
+    :: Refresh the environment variables
+    call %refrenv%
+    set python_installed=true
 )
 
 :: Check if virtual environment exists
 IF NOT EXIST %VENV_PATH% (
-	echo Creating virtual environment...
-	python -m venv %VENV_PATH%
+    echo Creating virtual environment...
+	echo %CURRENT_DIR% > "%LAST_DIR_FILE%"
+    python -m venv %VENV_PATH%
 ) ELSE (
-	goto check_python
+    goto check_python
 )
 
 :: Check if Python exists at the path stored in the virtual environment
-set counut_python=0
+set count_python=0
 :check_python
 %VENV_PATH%\Scripts\python.exe --version >nul 2>&1
 if %errorlevel% neq 0 (
-	set /a count_python+=1
-	echo Python not found at the path stored in the virtual environment.
-	echo Recreating virtual environment...
-	rmdir /s /q %VENV_PATH%
-	python -m venv %VENV_PATH%
-	if !count_python! lss 3 (
-		goto check_python
-	) else (
-		echo Something went wrong. Please try again.
-		pause
-		exit /b
-	)
+    set /a count_python+=1
+    echo Python not found at the path stored in the virtual environment.
+    echo Recreating virtual environment...
+    rmdir /s /q %VENV_PATH%
+    python -m venv %VENV_PATH%
+    if !count_python! lss 3 (
+        goto check_python
+    ) else (
+        echo Something went wrong. Please try again.
+        pause
+        exit /b
+    )
+)
+
+:: Check if the current directory has changed since the last run
+if exist "%LAST_DIR_FILE%" (
+    set /p last_dir=<"%LAST_DIR_FILE%"
+    cd "%CURRENT_DIR%" && (
+        if not exist "!last_dir!" (
+            echo Current directory: %CURRENT_DIR%
+            echo Last known directory: !last_dir!
+            echo Looks like the directory of the program has been changed. 
+            echo It is hihgly recommended to recreate the virtual environment.
+            set /p "recreate_venv=Recreate the virtual environment (y/n)?: "
+            if /i "!recreate_venv!"=="y" (
+                echo Recreating virtual environment...
+                rmdir /s /q %VENV_PATH%
+                python -m venv %VENV_PATH%
+				:: Update the last directory file
+				echo %CURRENT_DIR% > "%LAST_DIR_FILE%"
+            )
+        )
+    )
+) else (
+    :: Create the last directory file if it doesn't exist
+    echo %CURRENT_DIR% > "%LAST_DIR_FILE%"
 )
 
 :: Activate the virtual environment
@@ -55,45 +121,46 @@ set count_activate=0
 echo Activating virtual environment...
 call %ACTIVATE_PATH%
 if errorlevel 1 (
-	set /a count_activate+=1
-	echo Failed to activate virtual environment.
-	echo Recreating virtual environment...
-	rmdir /s /q %VENV_PATH%
-	python -m venv %VENV_PATH%
-	if !count_activate! lss 3 (
-		goto activate
-	) else (
-		echo Failed to activate virtual environment. Please try again.
-		pause
-		exit /b
-	)
+    set /a count_activate+=1
+    echo Failed to activate virtual environment.
+    echo Recreating virtual environment...
+    rmdir /s /q %VENV_PATH%
+    python -m venv %VENV_PATH%
+    if !count_activate! lss 3 (
+        goto activate
+    ) else (
+        echo Failed to activate virtual environment. Please try again.
+        pause
+        exit /b
+    )
 )
 
 :: Get the list of installed packages using pip freeze
 echo Checking the requirements...
-for /f "tokens=1,* delims==" %%i in ('pip freeze') do (
-	set installed[%%i]=%%j
+for /f "tokens=1,* delims==" %%i in ('pip freeze --all') do (
+    set installed[%%i]=%%j
 )
 
 :: Compare with the requirements from the requirements.txt file
 for /f "tokens=1,* delims==" %%i in (%requirementsFile%) do (
-	if not "!installed[%%i]!"=="%%j" (
-		echo Installing package: %%i==%%j
-		pip install %%i==%%j --upgrade --quiet
-		if errorlevel 1 (
-			echo Failed to install %%i==%%j. Please check your internet connection and try again.
-			pause
-			exit /b
-		)
-	)
+    if not "!installed[%%i]!"=="%%j" (
+        echo Installing package: %%i==%%j
+        pip install %%i==%%j --upgrade --quiet
+        if errorlevel 1 (
+            echo Failed to install %%i==%%j. Please check your internet connection and try again.
+            pause
+            exit /b
+        )
+    )
 )
 
 :: Run the program
 echo Starting %NAME%...
-start /B "" "%VENV_PATH%/Scripts/pythonw.exe" %RUN%
+start /B "" "%VENV_PATH%\Scripts\pythonw.exe" %RUN% %* > nul 2>&1
 if errorlevel 1 (
-	echo Failed to start %NAME%. Please try again.
-	pause
-	exit /b
+    echo Failed to start %NAME%. Please try again.
+    pause
+    exit /b
 )
+
 exit /b