opex-manifest-generator 1.3.6__tar.gz → 1.3.7__tar.gz

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/.gitignore

@@ -5,3 +5,5 @@ dist/
 opex_manifest_generator/opex_manifest_reference.py
 opex_manifest_generator.egg-info/
 opex_manifest_generator.code-workspace
+build/
+*.pyc

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opex_manifest_generator
-Version: 1.3.6
+Version: 1.3.7
 Summary: An Opex Manifest Generator tool for use with OPEX Files, as designed by Preservica
 Author-email: Christopher Prince <c.pj.prince@gmail.com>
 License-Expression: Apache-2.0

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/installer/install.cmd

@@ -10,21 +10,12 @@ echo Opex Manifest Generator Installation
 echo ===============================================
 echo.
 
-REM Check if running as administrator
-net session >nul 2>&1
-if %errorLevel% neq 0 (
-    echo ERROR: This installer must be run as Administrator.
-    echo Please right-click and select "Run as Administrator"
-    pause
-    exit /b 1
-)
-
 REM Get the directory where this script is located
 set SCRIPT_DIR=%~dp0
 set SCRIPT_DIR=%SCRIPT_DIR:~0,-1%
 
 REM Define installation paths
-set INSTALL_DIR=%ProgramFiles%\Opex Manifest Generator
+set INSTALL_DIR=%LOCALAPPDATA%\Opex Manifest Generator
 set BIN_DIR=!INSTALL_DIR!\bin
 
 echo Installing to: !INSTALL_DIR!
@@ -73,21 +64,7 @@ if exist "%SCRIPT_DIR%\LICENSE.md" (
 
 REM Add to PATH
 echo Adding to PATH...
-for /f "tokens=2*" %%A in ('reg query "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" /v PATH 2^>nul') do (
-    set "OLD_PATH=%%B"
-)
-
-if not "!OLD_PATH!"=="" (
-    echo !OLD_PATH! | find /I "!BIN_DIR!" >nul
-    if errorlevel 1 (
-        setx /M PATH "!OLD_PATH!;!BIN_DIR!"
-        echo Added !BIN_DIR! to PATH
-    ) else (
-        echo Already in PATH
-    )
-) else (
-    setx /M PATH "!BIN_DIR!"
-)
+%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$path = [Environment]::GetEnvironmentVariable('Path', 'User'); if ($path -notlike '*%LOCALAPPDATA%\Opex Manifest Generator\bin*') { [Environment]::SetEnvironmentVariable('Path', $path + ';%LOCALAPPDATA%\Opex Manifest Generator\bin', 'User'); Write-Host 'Added to PATH' } else { Write-Host 'Already in PATH' }"
 
 echo.
 echo ===============================================
@@ -95,6 +72,7 @@ echo Installation Complete!
 echo ===============================================
 echo.
 echo You can now use 'opex_generate' from the command line.
+echo Note: You may need to restart your command prompt for PATH changes to take effect.
 echo.
 echo To get started, type: opex_generate --help
 echo.

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/installer/uninstall.cmd

@@ -10,17 +10,8 @@ echo Opex Manifest Generator Uninstallation
 echo ===============================================
 echo.
 
-REM Check if running as administrator
-net session >nul 2>&1
-if %errorLevel% neq 0 (
-    echo ERROR: This uninstaller must be run as Administrator.
-    echo Please right-click and select "Run as Administrator"
-    pause
-    exit /b 1
-)
-
 REM Define installation directory
-set INSTALL_DIR=%ProgramFiles%\Opex Manifest Generator
+set INSTALL_DIR=%LOCALAPPDATA%\Opex Manifest Generator
 set BIN_DIR=!INSTALL_DIR!\bin
 
 REM Confirm uninstallation
@@ -36,21 +27,7 @@ if /i not "!CONFIRM!"=="Y" (
 
 REM Remove from PATH
 echo Removing from PATH...
-for /f "tokens=2*" %%A in ('reg query "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" /v PATH 2^>nul') do (
-    set "OLD_PATH=%%B"
-)
-
-if not "!OLD_PATH!"=="" (
-    REM Remove the bin directory from PATH
-    setlocal enabledelayedexpansion
-    set "NEW_PATH=!OLD_PATH:!BIN_DIR!=!"
-    set "NEW_PATH=!NEW_PATH:;;=;!"
-
-    if not "!NEW_PATH!"=="!OLD_PATH!" (
-        setx /M PATH "!NEW_PATH!"
-        echo Removed from PATH
-    )
-)
+%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$path = [Environment]::GetEnvironmentVariable('Path', 'User'); $newPath = ($path -split ';' | Where-Object { $_ -ne '%LOCALAPPDATA%\Opex Manifest Generator\bin' -and $_ -ne $env:LOCALAPPDATA + '\Opex Manifest Generator\bin' }) -join ';'; if ($path -ne $newPath) { [Environment]::SetEnvironmentVariable('Path', $newPath, 'User'); Write-Host 'Removed from PATH' } else { Write-Host 'Not found in PATH' }"
 
 REM Remove installation directory
 if exist "!INSTALL_DIR!" (

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/opex_manifest_generator/opex_manifest.py

@@ -864,7 +864,7 @@ class OpexDir(OpexManifestGenerator):
             #If removal is True for Folder, then it will be removed - Does not need to descend.
             pass
         else:
-            for f_path in current.filter_directories(path):
+            for f_path in current.filter_directories(current.folder_path):
                 if f_path.endswith('.opex'):
                     #Ignores OPEX files / directories...
                     pass
@@ -876,7 +876,7 @@ class OpexDir(OpexManifestGenerator):
                         pass
                     else:
                         #Add Folder to OPEX Manifest (doesn't get written yet...)
-                        current.folder = ET.SubElement(self.folders, f"{{{self.opexns}}}Folder")
+                        current.folder = ET.SubElement(current.folders, f"{{{self.opexns}}}Folder")
                         current.folder.text = str(os.path.basename(f_path))
                     if current.OMG.algorithm and current.OMG.pax_fixity_flag is True and current.folder_path.endswith(".pax"):
                         #If using fixity, but the current folder is a PAX & using PAX Fixity: End descent.
@@ -1001,4 +1001,4 @@ class OpexFile(OpexManifestGenerator):
                         logger.debug(f'Removed file: {opex_path}')
                     logger.debug(f'Removed file: {self.file_path}')
         else:
-            logger.info(f"Avoiding override, Opex exists at: {self.file_path}: ")
+            logger.info(f"Avoiding override, Opex exists at: {self.file_path}: ")

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/opex_manifest_generator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opex_manifest_generator
-Version: 1.3.6
+Version: 1.3.7
 Summary: An Opex Manifest Generator tool for use with OPEX Files, as designed by Preservica
 Author-email: Christopher Prince <c.pj.prince@gmail.com>
 License-Expression: Apache-2.0

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/opex_manifest_generator.egg-info/SOURCES.txt

@@ -2,8 +2,10 @@
 .pre-commit-config.yaml
 LICENSE.md
 README.md
+optional-requirements.txt
 pyproject.toml
 pytest.ini
+requirements.txt
 .github/workflows/build-portable.yml
 .github/workflows/codeql.yml
 .github/workflows/pypi-publish.yml

opex_manifest_generator-1.3.7/optional-requirements.txt

@@ -0,0 +1 @@
+odfpy==1.4.1

{opex_manifest_generator-1.3.6 → opex_manifest_generator-1.3.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opex_manifest_generator"
-version = "1.3.6"
+version = "1.3.7"
 authors = [
     {name="Christopher Prince", email="c.pj.prince@gmail.com"}
     ]

opex_manifest_generator-1.3.7/requirements.txt

@@ -0,0 +1,10 @@
+auto_reference_generator==1.3.7
+et_xmlfile==2.0.0
+lxml==6.0.2
+numpy==2.4.2
+openpyxl==3.1.5
+-e git+https://github.com/CPJPRINCE/opex_manifest_generator.git@ac5b814442bb94c288b5fb9b71c4b93d00761fa4#egg=opex_manifest_generator
+pandas==3.0.0
+python-dateutil==2.9.0.post0
+six==1.17.0
+tqdm==4.67.3