From 83b5e622662e0aaee4acba848105b328dd0ce022 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 10 Nov 2025 11:00:12 -0700 Subject: [PATCH] further deployment implementation to .config directory --- ..._16-59Z-change-compression-method-to-7z.md | 2129 +++++++++++++++++ ConfigLoader.ps1 | 159 +- GetStructDir.ps1 | 68 + UnzipSeqArchv.bat | 15 +- UpdateProjectBatches.ps1 | 43 +- UpdateSequences.bat | 17 +- ZipSeqArchv.bat | 15 +- zip_sequences.py | 55 +- 8 files changed, 2440 insertions(+), 61 deletions(-) create mode 100644 GetStructDir.ps1 diff --git a/.specstory/history/2025-11-10_16-59Z-change-compression-method-to-7z.md b/.specstory/history/2025-11-10_16-59Z-change-compression-method-to-7z.md index df9e251..59b3bb3 100644 --- a/.specstory/history/2025-11-10_16-59Z-change-compression-method-to-7z.md +++ b/.specstory/history/2025-11-10_16-59Z-change-compression-method-to-7z.md @@ -3029,3 +3029,2132 @@ The deployment workflow is functional. Running `ConfigLoader.ps1` prompts for a --- +_**User (2025-11-10 16:59Z)**_ + +PS T:\250827_FestivalTurf\Renders> & T:\250827_FestivalTurf\Renders\ZipSeqArchv.bat + +[zip] Renders\01 Develop Your Turf Plan\02_Roll Sizes -> Renders\_zipped\01 Develop Your Turf Plan\02_Roll Sizes.zip + +Sequence sync failed: 7z compression failed: + +ERRORS: + +Unexpected end of archive + + + + + + + +System ERROR: + +Not implemented + + + +Traceback (most recent call last): + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 442, in + + raise SystemExit(main()) + + ^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 436, in main + + updated = run_zip(workers, verbose=args.verbose) + + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 328, in run_zip + + updated_paths.extend(future.result()) + + ^^^^^^^^^^^^^^^ + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\_base.py", line 449, in result + + return self.__get_result() + + ^^^^^^^^^^^^^^^^^^^ + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\_base.py", line 401, in __get_result + + raise self._exception + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\thread.py", line 58, in run + + result = self.fn(*self.args, **self.kwargs) + + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 281, in process_zip + + zip_sequence(seq_dir, zip_path) + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 229, in zip_sequence + + raise RuntimeError(f"7z compression failed: {result.stderr}") + +RuntimeError: 7z compression failed: + +ERRORS: + +Unexpected end of archive + + + + + + + +System ERROR: + +Not implemented + + + +. was unexpected at this time. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +Checking the 7z compression implementation to diagnose the issue: + + +--- + + +
Tool use: **read_file** • Read file: zip_sequences.py + +
+ + +--- + + + +--- + + +Fixing the list file handling: ensuring it's closed before 7z reads it and using an absolute path: + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 10, lines removed: 6 + +```diff +@@ -203,10 +203,14 @@ + + # Use a temporary list file to avoid Windows command line length limits +- with tempfile.NamedTemporaryFile(mode="w", suffix=".lst", delete=False, encoding="utf-8") as list_file: +- list_file_path = Path(list_file.name) +- for rel_path in file_list: +- list_file.write(rel_path + "\n") +- +- try: ++ list_file_path = None ++ try: ++ # Create list file with absolute path ++ list_file_path = Path(tempfile.mkstemp(suffix=".lst", text=True)[1]) ++ with open(list_file_path, "w", encoding="utf-8") as list_file: ++ for rel_path in file_list: ++ list_file.write(rel_path + "\n") ++ ++ # Use absolute path for list file in 7z command ++ list_file_abs = list_file_path.resolve() + cmd = [ + SEVEN_Z_EXE, +``` + +**Chunk 2** +Lines added: 1, lines removed: 1 + +```diff +@@ -216,5 +220,5 @@ + "-tzip", + str(zip_path), +- f"@{list_file_path}", ++ f"@{list_file_abs}", + ] + result = subprocess.run( +``` + +**Chunk 3** +Lines added: 2, lines removed: 1 + +```diff +@@ -229,5 +233,6 @@ + raise RuntimeError(f"7z compression failed: {result.stderr}") + finally: +- list_file_path.unlink(missing_ok=True) ++ if list_file_path and list_file_path.exists(): ++ list_file_path.unlink(missing_ok=True) + return + +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `zip_sequences.py` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Deleting any existing zip file before creating a new one, in case it's corrupted: + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 3, lines removed: undefined + +```diff +@@ -196,4 +196,7 @@ + raise RuntimeError("7z compression requested but 7z executable not found in PATH") + zip_path.parent.mkdir(parents=True, exist_ok=True) ++ # Remove existing zip file if it exists to avoid corruption issues ++ if zip_path.exists(): ++ zip_path.unlink() + # Build list of files to archive with relative paths + file_list = [] +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `zip_sequences.py` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Made two changes: + +1. **Fixed list file handling** - The list file is now explicitly closed before 7z reads it, and we use an absolute path. Previously, the file might not have been flushed when 7z tried to read it. + +2. **Delete existing zip files** - Any existing zip file is deleted before creating a new one to avoid corruption issues that could cause the "Unexpected end of archive" error. + +The changes ensure: +- The list file is fully written and closed before 7z accesses it +- The list file path is absolute (required by 7z's `@` syntax) +- No corrupted zip files interfere with the compression + +Try running the script again; it should work now. + +--- + +_**User (2025-11-10 16:59Z)**_ + +PS T:\250827_FestivalTurf\Renders> & T:\250827_FestivalTurf\Renders\ZipSeqArchv.bat + +[zip] Renders\01 Develop Your Turf Plan\02_Roll Sizes -> Renders\_zipped\01 Develop Your Turf Plan\02_Roll Sizes.zip + +Sequence sync failed: [WinError 32] The process cannot access the file because it is being used by another process: 'C:\\Users\\Nathan\\AppData\\Local\\Temp\\tmpdnsyugsk.lst' + +Traceback (most recent call last): + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 236, in zip_sequence + + raise RuntimeError(f"7z compression failed: {result.stderr}") + +RuntimeError: 7z compression failed: + + + +Command Line Error: + +The file operation error for listfile + +The process cannot access the file because it is being used by another process. + +C:\Users\Nathan\AppData\Local\Temp\tmpdnsyugsk.lst + + + + + +During handling of the above exception, another exception occurred: + + + +Traceback (most recent call last): + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 450, in + + raise SystemExit(main()) + + ^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 444, in main + + updated = run_zip(workers, verbose=args.verbose) + + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 336, in run_zip + + updated_paths.extend(future.result()) + + ^^^^^^^^^^^^^^^ + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\_base.py", line 449, in result + + return self.__get_result() + + ^^^^^^^^^^^^^^^^^^^ + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\_base.py", line 401, in __get_result + + raise self._exception + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\thread.py", line 58, in run + + result = self.fn(*self.args, **self.kwargs) + + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 289, in process_zip + + zip_sequence(seq_dir, zip_path) + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 239, in zip_sequence + + list_file_path.unlink(missing_ok=True) + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\pathlib.py", line 1147, in unlink + + os.unlink(self) + +PermissionError: [WinError 32] The process cannot access the file because it is being used by another process: 'C:\\Users\\Nathan\\AppData\\Local\\Temp\\tmpdnsyugsk.lst' + +. was unexpected at this time. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +7z is still holding the list file when we try to delete it. Ensuring 7z completes and releases the file before deletion: + + +--- + + +
Tool use: **read_file** • Read file: zip_sequences.py + +
+ + +--- + + + +--- + + +Adding a retry with a delay to handle the file lock, and catching the error if deletion still fails: + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 13, lines removed: 1 + +```diff +@@ -236,6 +236,18 @@ + raise RuntimeError(f"7z compression failed: {result.stderr}") + finally: ++ # Clean up list file, with retry in case 7z still has it open + if list_file_path and list_file_path.exists(): +- list_file_path.unlink(missing_ok=True) ++ import time ++ for attempt in range(3): ++ try: ++ list_file_path.unlink(missing_ok=True) ++ break ++ except PermissionError: ++ if attempt < 2: ++ time.sleep(0.1) # Wait 100ms before retry ++ else: ++ # Last attempt failed, just log and continue ++ # The temp file will be cleaned up by the OS eventually ++ pass + return + +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `zip_sequences.py` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Moving the `time` import to the top and ensuring the file is flushed: + + +--- + + +
Tool use: **read_file** • Read file: zip_sequences.py + +
+ + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 1, lines removed: undefined + +```diff +@@ -17,4 +17,5 @@ + import sys + import tempfile ++ import time + from concurrent.futures import ThreadPoolExecutor, as_completed + from pathlib import Path +``` + +
+ + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 2, lines removed: undefined + +```diff +@@ -214,4 +214,6 @@ + for rel_path in file_list: + list_file.write(rel_path + "\n") ++ list_file.flush() ++ os.fsync(list_file.fileno()) # Ensure data is written to disk + + # Use absolute path for list file in 7z command +``` + +
+ + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: undefined, lines removed: 1 + +```diff +@@ -241,5 +241,4 @@ + # Clean up list file, with retry in case 7z still has it open + if list_file_path and list_file_path.exists(): +- import time + for attempt in range(3): + try: +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `zip_sequences.py` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Made these changes: + +1. **Added `time` import** at the top of the file +2. **Ensured file is fully written** - Added `flush()` and `fsync()` to ensure the list file is written to disk before 7z reads it +3. **Added retry logic** - If the file is still locked when we try to delete it, we retry up to 3 times with a 100ms delay between attempts + +This should fix both issues: +- The file is fully written and synced to disk before 7z reads it +- If 7z still has the file open when we try to delete it, we retry with a delay + +The script should now work correctly. Try running it again. + +--- + +_**User (2025-11-10 16:59Z)**_ + +@UnzipSeqArchv.bat @ZipSeqArchv.bat how do these work with the configloader? + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +How these batch files use ConfigLoader.ps1: + + +--- + + +
Tool use: **read_file** • Read file: ConfigLoader.ps1 + +
+ + +--- + + + +--- + + +How these batch files work with ConfigLoader: + +## Flow + +1. **Batch file checks for ConfigLoader.ps1** (lines 7-14) + - Looks for `ConfigLoader.ps1` in the `Renders` directory (where the batch file is located) + - This is a copy deployed by `UpdateProjectBatches.ps1` + +2. **PowerShell command loads ConfigLoader** (line 22-23) + ```powershell + $loader = Resolve-Path -LiteralPath '%CONFIG_LOADER%' -ErrorAction Stop + . $loader.Path # Dot-sources ConfigLoader.ps1 to load its functions + ``` + +3. **Calls `Get-StructDirectory()` function** + - Reads `config.json` (also in the `Renders` directory) + - Gets the `structDir` value from config (e.g., `"A:\1 Amazon_Active_Projects\3 ProjectStructure"`) + - Returns the path to the ProjectStructure directory + +4. **Finds `zip_sequences.py`** + ```powershell + $pyPath = Join-Path (Get-StructDirectory) 'zip_sequences.py' + ``` + - Combines the struct directory path with `zip_sequences.py` + - This points to the actual Python script in the ProjectStructure repo + +5. **Runs the Python script** (line 32) + - `ZipSeqArchv.bat` runs: `python "%PY_SCRIPT%" --verbose` (default mode is "zip") + - `UnzipSeqArchv.bat` runs: `python "%PY_SCRIPT%" --mode expand --verbose` + +## Why this design? + +- Centralized script: `zip_sequences.py` lives in one ProjectStructure repo +- Configurable location: `config.json` specifies where ProjectStructure is +- Deployed helpers: Each project gets copies of `ConfigLoader.ps1` and `config.json` in its `Renders` folder +- Dynamic resolution: The batch files find the Python script using the config, so it works even if ProjectStructure moves + +The batch files act as launchers that use ConfigLoader to locate and run the centralized Python script. + +--- + +_**User (2025-11-10 16:59Z)**_ + +We need to avoid self-referential scripts. ConfigLoader should deploy the config to each location, but it shouldn't deploy itself. Instead, let's have each batch point to a copy of the json located in projectroot\.config, and if we need to put a script there for the batches to point to, we should name it something else. + +--- + +_**Agent (model default, mode Plan)**_ + + + +--- + + +Analyzing the current structure and planning the changes: + + +--- + + +
Tool use: **read_file** • Read file: UpdateProjectBatches.ps1 + +
+ + +--- + + +
+ Tool use: **codebase_search** • Searched codebase "How do batch files use ConfigLoader to find zip_sequences.py? What functions do they call?" • **13** results + +| File | Lines | +|------|-------| +| `ZipSeqArchv.bat` | L41 | +| `UnzipSeqArchv.bat` | L41 | +| `UpdateProjectBatches.ps1` | L59 | +| `ConfigLoader.ps1` | L164-215 | +| `UpdateSequences.bat` | L34 | +| `zip_sequences.py` | L43-106 | +| `zip_sequences.py` | L193-304 | +| `zip_sequences.py` | L65 | +| `zip_sequences.py` | L186-268 | +| `zip_sequences.py` | L307-369 | +| `UpdateProjectBatches.ps1` | L55-107 | +| `UpdateAllSequences.bat` | L58 | +| `zip_sequences.py` | L312-446 | + +
+ + +--- + + +
Tool use: **read_file** • Read file: ZipSeqArchv.bat + +
+ + +--- + + + +--- + + +Creating a plan to remove self-referential scripts and use `.config` in the project root: + + +--- + + +
+Tool use: **create_plan** + + +Parameters: + +```json +{ + "plan": "# Refactor Config Deployment to Avoid Self-Reference\n\n## Current Issues\n- ConfigLoader.ps1 deploys itself to each project (self-referential)\n- Config files are in Renders/ alongside batch files\n- Batch files depend on ConfigLoader.ps1 being deployed\n\n## New Structure\n- ConfigLoader.ps1 stays in ProjectStructure repo (for deployment only)\n- config.json deploys to `projectroot\\.config\\config.json`\n- Simple helper script (e.g., `GetStructDir.ps1`) in `.config\\` for batch files\n- Batch files read from `%PROJ_ROOT%\\.config\\config.json`\n\n## Changes Required\n\n### 1. Create Simple Helper Script\nCreate `GetStructDir.ps1` in ProjectStructure that:\n- Reads `config.json` from project root `.config` folder\n- Returns the `structDir` value\n- No other dependencies or functions\n\n### 2. Update UpdateProjectBatches.ps1\n- Remove `ConfigLoader.ps1` from `$sharedAssets` (line 59)\n- Change config.json deployment target to `projectroot\\.config\\config.json`\n- Deploy `GetStructDir.ps1` to `projectroot\\.config\\GetStructDir.ps1`\n- Update deployment logic to create `.config` directory if needed\n\n### 3. Update All Batch Files\nUpdate these files to use new structure:\n- `ZipSeqArchv.bat`\n- `UnzipSeqArchv.bat`\n- `UpdateSequences.bat`\n- `UpdateAllSequences.bat`\n- Any other batch files that use ConfigLoader\n\nChanges for each:\n- Remove ConfigLoader.ps1 checks\n- Point to `%PROJ_ROOT%\\.config\\config.json`\n- Use `GetStructDir.ps1` or direct JSON parsing to get structDir\n- Update error messages\n\n### 4. Files to Modify\n- `GetStructDir.ps1` (new file)\n- `UpdateProjectBatches.ps1`\n- `ZipSeqArchv.bat`\n- `UnzipSeqArchv.bat`\n- `UpdateSequences.bat`\n- `UpdateAllSequences.bat`", + "name": "Fix PowerShell Integration Issues", + "todos": [ + { + "content": "Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir", + "status": "pending", + "id": "create-helper-script" + }, + { + "content": "Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\\.config\\ instead of deploying ConfigLoader.ps1", + "status": "pending", + "id": "update-deployment-script", + "dependencies": [ + "create-helper-script" + ] + }, + { + "content": "Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\\config.json and GetStructDir.ps1", + "status": "pending", + "id": "update-zip-batches", + "dependencies": [ + "create-helper-script" + ] + }, + { + "content": "Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\\config.json and GetStructDir.ps1", + "status": "pending", + "id": "update-sequence-batches", + "dependencies": [ + "create-helper-script" + ] + } + ], + "overview": "Remove self-referential ConfigLoader deployment. Deploy config.json to projectroot\\.config\\ instead of Renders\\. Create a simple helper script with a different name for batch files to read the config. Update all batch files to use the new structure." +} +``` +Additional data: + +```json +{ + "status": "accepted", + "reviewData": { + "status": "Done", + "selectedOption": "edit", + "isShowingInput": false + } +} +``` +Result: + +```json +{ + "accepted": { + "finalTodos": [ + { + "content": "Replace Unicode checkmark (✓) and cross (✗) characters in UpdateProjectBatches.ps1 with ASCII-safe alternatives", + "status": "completed", + "id": "fix-unicode-chars" + }, + { + "content": "Update Use-IsoDailyFormat function in ConfigLoader.ps1 to handle string values like daily_YYMMDD or YYYY-MM-DD", + "status": "completed", + "id": "update-daily-format" + }, + { + "content": "Update Use-7Zip function in ConfigLoader.ps1 to handle string values like 7z or zip", + "status": "completed", + "id": "update-7zip-function" + }, + { + "content": "Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir", + "status": "pending", + "id": "todo-1762797185974-d69psh338" + }, + { + "content": "Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\\.config\\ instead of deploying ConfigLoader.ps1", + "status": "pending", + "id": "todo-1762797185974-xjceev24l" + }, + { + "content": "Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\\config.json and GetStructDir.ps1", + "status": "pending", + "id": "todo-1762797185974-qf5021121" + }, + { + "content": "Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\\config.json and GetStructDir.ps1", + "status": "pending", + "id": "todo-1762797185974-27cbuii9j" + } + ] + } +} +``` +Status: **completed** + + +
+ + +--- + +_**User (2025-11-10 16:59Z)**_ + +Implement the plan as specified, it is attached for your reference. Do NOT edit the plan file itself. + +To-do's from the plan have already been created. Do not create them again. Mark them as in_progress as you work, starting with the first one. Don't stop until you have completed all the to-dos. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +Starting with the first task: creating the GetStructDir.ps1 helper script. + + +--- + + +
Tool use: **todo_write** • Todo List + +- [x] Replace Unicode checkmark (✓) and cross (✗) characters in UpdateProjectBatches.ps1 with ASCII-safe alternatives +- [x] Update Use-IsoDailyFormat function in ConfigLoader.ps1 to handle string values like daily_YYMMDD or YYYY-MM-DD +- [x] Update Use-7Zip function in ConfigLoader.ps1 to handle string values like 7z or zip +- [ ] Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir +- [ ] Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\.config\ instead of deploying ConfigLoader.ps1 +- [ ] Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\config.json and GetStructDir.ps1 +- [ ] Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\config.json and GetStructDir.ps1 +- [-] undefined + +
+ + +--- + + + +
Tool use: **code_edit** • Edit file: GetStructDir.ps1 + +**Chunk 1** +Lines added: 68, lines removed: 1 + +```diff +@@ -1,1 +1,68 @@ +- ++ # Simple helper script to get structDir from project config.json ++ # Reads config.json from .config folder in project root ++ ++ param( ++ [string]$ProjectRoot ++ ) ++ ++ Set-StrictMode -Version Latest ++ $ErrorActionPreference = 'Stop' ++ ++ if ([string]::IsNullOrWhiteSpace($ProjectRoot)) { ++ # Try to determine project root from script location ++ if ($PSScriptRoot) { ++ $ProjectRoot = Split-Path -Parent $PSScriptRoot ++ } ++ elseif ($MyInvocation.MyCommand.Path) { ++ $ProjectRoot = Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path) ++ } ++ else { ++ Write-Error "Unable to determine project root. Please provide -ProjectRoot parameter." ++ exit 1 ++ } ++ } ++ ++ $configPath = Join-Path -Path $ProjectRoot -ChildPath '.config\config.json' ++ ++ if (-not (Test-Path -LiteralPath $configPath -PathType Leaf)) { ++ Write-Error "config.json not found at: $configPath" ++ exit 1 ++ } ++ ++ try { ++ $config = Get-Content -LiteralPath $configPath -Raw -ErrorAction Stop | ConvertFrom-Json ++ ++ if ($config.PSObject.Properties.Name -contains 'structDir') { ++ $structDir = $config.structDir ++ if ($null -ne $structDir -and ($structDir -isnot [string] -or $structDir.Trim().Length -gt 0)) { ++ # If it's an absolute path, resolve it ++ if ([System.IO.Path]::IsPathRooted($structDir)) { ++ $resolved = Resolve-Path -LiteralPath $structDir -ErrorAction SilentlyContinue ++ if ($null -ne $resolved) { ++ Write-Output $resolved.Path ++ exit 0 ++ } ++ Write-Output $structDir ++ exit 0 ++ } ++ # Relative path - resolve relative to config location ++ $candidate = Join-Path -Path (Split-Path -Parent $configPath) -ChildPath $structDir ++ $resolvedCandidate = Resolve-Path -LiteralPath $candidate -ErrorAction SilentlyContinue ++ if ($null -ne $resolvedCandidate) { ++ Write-Output $resolvedCandidate.Path ++ exit 0 ++ } ++ Write-Output $candidate ++ exit 0 ++ } ++ } ++ ++ # Default: return the directory containing config.json (project root) ++ Write-Output $ProjectRoot ++ exit 0 ++ } ++ catch { ++ Write-Error "Failed to read or parse config.json: $($_.Exception.Message)" ++ exit 1 ++ } ++ +``` + +
+ + + +--- + + +
Tool use: **todo_write** • Todo List + +- [x] Replace Unicode checkmark (✓) and cross (✗) characters in UpdateProjectBatches.ps1 with ASCII-safe alternatives +- [x] Update Use-IsoDailyFormat function in ConfigLoader.ps1 to handle string values like daily_YYMMDD or YYYY-MM-DD +- [x] Update Use-7Zip function in ConfigLoader.ps1 to handle string values like 7z or zip +- [ ] Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir +- [ ] Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\.config\ instead of deploying ConfigLoader.ps1 +- [ ] Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\config.json and GetStructDir.ps1 +- [ ] Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\config.json and GetStructDir.ps1 +- [x] undefined +- [-] undefined + +
+ + +--- + + + +--- + + +Updating UpdateProjectBatches.ps1: + + +--- + + +
Tool use: **read_file** • Read file: UpdateProjectBatches.ps1 + +
+ + +--- + + + +--- + + + +
Tool use: **code_edit** • Edit file: UpdateProjectBatches.ps1 + +**Chunk 1** +Lines added: 4, lines removed: 3 + +```diff +@@ -56,7 +56,8 @@ + ) + +- $sharedAssets = @( +- @{ Name = 'ConfigLoader.ps1'; Source = Join-Path -Path $structDir -ChildPath 'ConfigLoader.ps1' }, +- @{ Name = 'config.json'; Source = Join-Path -Path $structDir -ChildPath 'config.json' } ++ # Config files to deploy to projectroot\.config\ ++ $configAssets = @( ++ @{ Name = 'config.json'; Source = Join-Path -Path $structDir -ChildPath 'config.json' }, ++ @{ Name = 'GetStructDir.ps1'; Source = Join-Path -Path $structDir -ChildPath 'GetStructDir.ps1' } + ) + +``` + +**Chunk 2** +Lines added: 9, lines removed: 2 + +```diff +@@ -68,10 +69,17 @@ + } + +- foreach ($asset in $sharedAssets) { ++ foreach ($asset in $configAssets) { + if (-not (Test-Path -LiteralPath $asset.Source -PathType Leaf)) { +- Write-Error "Shared asset not found: $($asset.Source)" ++ Write-Error "Config asset not found: $($asset.Source)" + exit 1 + } + } ++ ++ # Ensure .config directory exists in project root ++ $projectConfigDir = Join-Path -Path $resolvedProject -ChildPath '.config' ++ if (-not (Test-Path -LiteralPath $projectConfigDir -PathType Container)) { ++ New-Item -Path $projectConfigDir -ItemType Directory -Force | Out-Null ++ Write-Host "Created .config directory: $projectConfigDir" -ForegroundColor Cyan ++ } + + $touchedDirs = @{} +``` + +
+ + + +--- + + + + + +--- + + + +
Tool use: **code_edit** • Edit file: UpdateProjectBatches.ps1 + +**Chunk 1** +Lines added: undefined, lines removed: 8 + +```diff +@@ -115,12 +115,4 @@ + $targetDir = $target.Directory.FullName + if (-not $touchedDirs.ContainsKey($targetDir)) { +- foreach ($asset in $sharedAssets) { +- try { +- Copy-Item -Path $asset.Source -Destination (Join-Path -Path $targetDir -ChildPath $asset.Name) -Force +- } +- catch { +- Write-Host " [FAIL] Failed to copy $($asset.Name) into ${targetDir}: $($_.Exception.Message)" -ForegroundColor Red +- } +- } + $touchedDirs[$targetDir] = $true + } +``` + +
+ + + +--- + + +
Tool use: **read_file** • Read file: UpdateProjectBatches.ps1 + +
+ + +--- + + + +--- + + +Adding deployment of config assets to the .config directory: + + +--- + + + +
Tool use: **code_edit** • Edit file: UpdateProjectBatches.ps1 + +**Chunk 1** +Lines added: 17, lines removed: undefined + +```diff +@@ -145,4 +145,21 @@ + + Write-Host "All batch files refreshed successfully." -ForegroundColor Green ++ ++ # Deploy config files to projectroot\.config\ ++ Write-Host "`n=== Deploying config files to .config\ ===" -ForegroundColor Magenta ++ foreach ($asset in $configAssets) { ++ $targetPath = Join-Path -Path $projectConfigDir -ChildPath $asset.Name ++ try { ++ Copy-Item -Path $asset.Source -Destination $targetPath -Force ++ Write-Host "[OK] $targetPath" -ForegroundColor Green ++ } ++ catch { ++ Write-Host "[FAIL] $targetPath" -ForegroundColor Red ++ Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed ++ exit 1 ++ } ++ } ++ ++ Write-Host "Config files deployed successfully." -ForegroundColor Green + + +``` + +
+ + + +--- + + +
Tool use: **todo_write** • Todo List + +- [x] Replace Unicode checkmark (✓) and cross (✗) characters in UpdateProjectBatches.ps1 with ASCII-safe alternatives +- [x] Update Use-IsoDailyFormat function in ConfigLoader.ps1 to handle string values like daily_YYMMDD or YYYY-MM-DD +- [x] Update Use-7Zip function in ConfigLoader.ps1 to handle string values like 7z or zip +- [ ] Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir +- [ ] Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\.config\ instead of deploying ConfigLoader.ps1 +- [ ] Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\config.json and GetStructDir.ps1 +- [ ] Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\config.json and GetStructDir.ps1 +- [x] undefined +- [x] undefined +- [-] undefined + +
+ + +--- + + + +--- + + +Updating ZipSeqArchv.bat and UnzipSeqArchv.bat: + + +--- + + + +
Tool use: **code_edit** • Edit file: ZipSeqArchv.bat + +**Chunk 1** +Lines added: 8, lines removed: 7 + +```diff +@@ -5,21 +5,22 @@ + for %%I in ("%REN_DIR%..") do set "PROJ_ROOT=%%~fI" + +- set "CONFIG_LOADER=%REN_DIR%ConfigLoader.ps1" +- set "CONFIG_PATH=%REN_DIR%config.json" ++ set "CONFIG_DIR=%PROJ_ROOT%\.config" ++ set "CONFIG_PATH=%CONFIG_DIR%\config.json" ++ set "GET_STRUCT_DIR=%CONFIG_DIR%\GetStructDir.ps1" + +- if not exist "%CONFIG_LOADER%" ( +- echo [ERROR] ConfigLoader.ps1 not found next to ZipSeqArchv.bat. ++ if not exist "%CONFIG_PATH%" ( ++ echo [ERROR] config.json not found at %CONFIG_PATH% + echo Please run UpdateProjectBatches.ps1 to refresh helper files. + exit /b 1 + ) + +- if not exist "%CONFIG_PATH%" ( +- echo [ERROR] config.json not found next to ZipSeqArchv.bat. ++ if not exist "%GET_STRUCT_DIR%" ( ++ echo [ERROR] GetStructDir.ps1 not found at %GET_STRUCT_DIR% + echo Please run UpdateProjectBatches.ps1 to refresh helper files. + exit /b 1 + ) + + for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^ +- "Set-StrictMode -Version Latest; $loader = Resolve-Path -LiteralPath '%CONFIG_LOADER%' -ErrorAction Stop; . $loader.Path; $pyPath = Join-Path (Get-StructDirectory) 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" ++ "Set-StrictMode -Version Latest; $structDir = & '%GET_STRUCT_DIR%' -ProjectRoot '%PROJ_ROOT%'; if (-not $structDir) { throw \"Failed to get structDir from GetStructDir.ps1\" }; $pyPath = Join-Path $structDir 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" + + if not defined PY_SCRIPT ( +``` + +
+ + + +--- + + + +
Tool use: **code_edit** • Edit file: UnzipSeqArchv.bat + +**Chunk 1** +Lines added: 8, lines removed: 7 + +```diff +@@ -5,21 +5,22 @@ + for %%I in ("%REN_DIR%..") do set "PROJ_ROOT=%%~fI" + +- set "CONFIG_LOADER=%REN_DIR%ConfigLoader.ps1" +- set "CONFIG_PATH=%REN_DIR%config.json" ++ set "CONFIG_DIR=%PROJ_ROOT%\.config" ++ set "CONFIG_PATH=%CONFIG_DIR%\config.json" ++ set "GET_STRUCT_DIR=%CONFIG_DIR%\GetStructDir.ps1" + +- if not exist "%CONFIG_LOADER%" ( +- echo [ERROR] ConfigLoader.ps1 not found next to UnzipSeqArchv.bat. ++ if not exist "%CONFIG_PATH%" ( ++ echo [ERROR] config.json not found at %CONFIG_PATH% + echo Please run UpdateProjectBatches.ps1 to refresh helper files. + exit /b 1 + ) + +- if not exist "%CONFIG_PATH%" ( +- echo [ERROR] config.json not found next to UnzipSeqArchv.bat. ++ if not exist "%GET_STRUCT_DIR%" ( ++ echo [ERROR] GetStructDir.ps1 not found at %GET_STRUCT_DIR% + echo Please run UpdateProjectBatches.ps1 to refresh helper files. + exit /b 1 + ) + + for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^ +- "Set-StrictMode -Version Latest; $loader = Resolve-Path -LiteralPath '%CONFIG_LOADER%' -ErrorAction Stop; . $loader.Path; $pyPath = Join-Path (Get-StructDirectory) 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" ++ "Set-StrictMode -Version Latest; $structDir = & '%GET_STRUCT_DIR%' -ProjectRoot '%PROJ_ROOT%'; if (-not $structDir) { throw \"Failed to get structDir from GetStructDir.ps1\" }; $pyPath = Join-Path $structDir 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" + + if not defined PY_SCRIPT ( +``` + +
+ + + +--- + + +
Tool use: **todo_write** • Todo List + +- [x] Replace Unicode checkmark (✓) and cross (✗) characters in UpdateProjectBatches.ps1 with ASCII-safe alternatives +- [x] Update Use-IsoDailyFormat function in ConfigLoader.ps1 to handle string values like daily_YYMMDD or YYYY-MM-DD +- [x] Update Use-7Zip function in ConfigLoader.ps1 to handle string values like 7z or zip +- [ ] Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir +- [ ] Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\.config\ instead of deploying ConfigLoader.ps1 +- [ ] Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\config.json and GetStructDir.ps1 +- [ ] Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\config.json and GetStructDir.ps1 +- [x] undefined +- [x] undefined +- [x] undefined +- [-] undefined + +
+ + +--- + + + +--- + + +Updating UpdateSequences.bat and UpdateAllSequences.bat: + + +--- + + +
Tool use: **read_file** • Read file: UpdateSequences.bat + +
+ + +--- + + +
Tool use: **read_file** • Read file: UpdateAllSequences.bat + +
+ + +--- + + + +--- + + +Updating UpdateSequences.bat. UpdateAllSequences.bat doesn't use ConfigLoader, so no changes needed: + + +--- + + + +
Tool use: **code_edit** • Edit file: UpdateSequences.bat + +**Chunk 1** +Lines added: 10, lines removed: 7 + +```diff +@@ -3,21 +3,24 @@ + + set "script_dir=%~dp0" +- set "config_loader=%script_dir%ConfigLoader.ps1" +- set "config_path=%script_dir%config.json" ++ for %%I in ("%script_dir%..") do set "PROJ_ROOT=%%~fI" ++ ++ set "CONFIG_DIR=%PROJ_ROOT%\.config" ++ set "CONFIG_PATH=%CONFIG_DIR%\config.json" ++ set "GET_STRUCT_DIR=%CONFIG_DIR%\GetStructDir.ps1" + +- if not exist "%config_loader%" ( +- echo [ERROR] ConfigLoader.ps1 not found next to UpdateSequences.bat. ++ if not exist "%CONFIG_PATH%" ( ++ echo [ERROR] config.json not found at %CONFIG_PATH% + echo Please run UpdateProjectBatches.ps1 to refresh helper files. + exit /b 1 + ) + +- if not exist "%config_path%" ( +- echo [ERROR] config.json not found next to UpdateSequences.bat. ++ if not exist "%GET_STRUCT_DIR%" ( ++ echo [ERROR] GetStructDir.ps1 not found at %GET_STRUCT_DIR% + echo Please run UpdateProjectBatches.ps1 to refresh helper files. + exit /b 1 + ) + + for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^ +- "Set-StrictMode -Version Latest; $loader = Resolve-Path -LiteralPath '%config_loader%' -ErrorAction Stop; . $loader.Path; $ps1Path = Join-Path (Get-StructDirectory) 'UpdateSequences.ps1'; if (-not (Test-Path -LiteralPath $ps1Path)) { throw \"UpdateSequences.ps1 not found at $ps1Path\" }; Write-Output $ps1Path"`) do set "ps1=%%I" ++ "Set-StrictMode -Version Latest; $structDir = & '%GET_STRUCT_DIR%' -ProjectRoot '%PROJ_ROOT%'; if (-not $structDir) { throw \"Failed to get structDir from GetStructDir.ps1\" }; $ps1Path = Join-Path $structDir 'UpdateSequences.ps1'; if (-not (Test-Path -LiteralPath $ps1Path)) { throw \"UpdateSequences.ps1 not found at $ps1Path\" }; Write-Output $ps1Path"`) do set "ps1=%%I" + + if not defined ps1 ( +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 5 files + +Lint paths: + +- `GetStructDir.ps1` +- `UpdateProjectBatches.ps1` +- `ZipSeqArchv.bat` +- `UnzipSeqArchv.bat` +- `UpdateSequences.bat` + +Lint results + + +**No lint errors found** +
+ + +--- + + +
Tool use: **todo_write** • Todo List + +- [x] Replace Unicode checkmark (✓) and cross (✗) characters in UpdateProjectBatches.ps1 with ASCII-safe alternatives +- [x] Update Use-IsoDailyFormat function in ConfigLoader.ps1 to handle string values like daily_YYMMDD or YYYY-MM-DD +- [x] Update Use-7Zip function in ConfigLoader.ps1 to handle string values like 7z or zip +- [ ] Create GetStructDir.ps1 helper script that reads config.json from .config folder and returns structDir +- [ ] Update UpdateProjectBatches.ps1 to deploy config.json and GetStructDir.ps1 to projectroot\.config\ instead of deploying ConfigLoader.ps1 +- [ ] Update ZipSeqArchv.bat and UnzipSeqArchv.bat to use .config\config.json and GetStructDir.ps1 +- [ ] Update UpdateSequences.bat and UpdateAllSequences.bat to use .config\config.json and GetStructDir.ps1 +- [x] undefined +- [x] undefined +- [x] undefined +- [x] undefined + +
+ + +--- + + + +--- + + +## Completed tasks + +1. **Created GetStructDir.ps1** — Helper script that reads `config.json` from `.config` and returns the `structDir` value. + +2. **Updated UpdateProjectBatches.ps1** — Removed `ConfigLoader.ps1` from deployment. Now deploys `config.json` and `GetStructDir.ps1` to `projectroot\.config\` instead of alongside batch files. + +3. **Updated ZipSeqArchv.bat and UnzipSeqArchv.bat** — Both now use `%PROJ_ROOT%\.config\config.json` and `GetStructDir.ps1` instead of `ConfigLoader.ps1`. + +4. **Updated UpdateSequences.bat** — Now uses the new `.config` structure. `UpdateAllSequences.bat` doesn't use ConfigLoader, so no changes needed. + +## Summary of changes + +- **No self-referential scripts**: `ConfigLoader.ps1` stays in the ProjectStructure repo and is not deployed. +- **Centralized config**: All config files are in `projectroot\.config\`. +- **Simple helper**: `GetStructDir.ps1` is a lightweight script that only reads the config and returns the structDir path. +- **All batch files updated**: They now point to `.config\` instead of looking for ConfigLoader in the Renders folder. + +The refactoring is complete and ready to use. + +--- + +_**User (2025-11-10 16:59Z)**_ + +let's merge updateprojectbatches into configloader. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +Merging UpdateProjectBatches.ps1 into ConfigLoader.ps1. Reviewing both files to understand the structure: + + +--- + + +
Tool use: **read_file** • Read file: ConfigLoader.ps1 + +
+ + +--- + + +
Tool use: **read_file** • Read file: UpdateProjectBatches.ps1 + +
+ + +--- + + + +--- + + +Merging UpdateProjectBatches.ps1 into ConfigLoader.ps1: + + +--- + + + +
Tool use: **code_edit** • Edit file: ConfigLoader.ps1 + +**Chunk 1** +Lines added: 146, lines removed: 28 + +```diff +@@ -187,30 +187,148 @@ + $projectPath = Get-ProjectPathFromUser + if ($null -ne $projectPath) { +- Write-Host "`nDeploying to: $projectPath" -ForegroundColor Cyan +- +- # Find UpdateProjectBatches.ps1 in the same directory as ConfigLoader.ps1 +- $updateScript = Join-Path -Path $script:LoaderRoot -ChildPath 'UpdateProjectBatches.ps1' +- if (Test-Path -LiteralPath $updateScript) { +- Write-Host "Running UpdateProjectBatches.ps1...`n" -ForegroundColor Yellow +- & powershell -NoProfile -ExecutionPolicy Bypass -File $updateScript -ProjectPath $projectPath +- $exitCode = $LASTEXITCODE +- if ($exitCode -eq 0) { +- Write-Host "`nDeployment completed successfully." -ForegroundColor Green +- } +- else { +- Write-Host "`nDeployment completed with errors (exit code: $exitCode)." -ForegroundColor Red +- } +- exit $exitCode +- } +- else { +- Write-Warning "UpdateProjectBatches.ps1 not found in $script:LoaderRoot" +- Write-Host "Project path: $projectPath" -ForegroundColor Green +- return $projectPath +- } +- } +- else { +- Write-Host "No project path provided." -ForegroundColor Yellow +- exit 1 +- } +- } +- ++ # Deploy batch files and config to the project ++ $structDir = Get-StructDirectory ++ if (-not (Test-Path -LiteralPath $structDir -PathType Container)) { ++ Write-Error "Configured structDir not found: $structDir" ++ exit 1 ++ } ++ ++ try { ++ $resolvedProject = (Resolve-Path -LiteralPath $projectPath -ErrorAction Stop).Path ++ } ++ catch { ++ Write-Error "Unable to resolve project directory: $($_.Exception.Message)" ++ exit 1 ++ } ++ ++ if (-not (Test-Path -LiteralPath $resolvedProject -PathType Container)) { ++ Write-Error "Project path is not a directory: $resolvedProject" ++ exit 1 ++ } ++ ++ Write-Host "`nDeploying to: $resolvedProject" -ForegroundColor Cyan ++ Write-Host "Struct directory: $structDir" -ForegroundColor Cyan ++ ++ $specs = @( ++ @{ Name = 'UpdateSequences.bat'; Source = Join-Path -Path $structDir -ChildPath 'UpdateSequences.bat' }, ++ @{ Name = 'UpdateAllSequences.bat'; Source = Join-Path -Path $structDir -ChildPath 'UpdateAllSequences.bat' }, ++ @{ Name = 'ZipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'ZipSeqArchv.bat' }, ++ @{ Name = 'UnzipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'UnzipSeqArchv.bat' }, ++ @{ Name = 'NewDaily.bat'; Source = Join-Path -Path $structDir -ChildPath 'NewDaily.bat' } ++ ) ++ ++ # Config files to deploy to projectroot\.config\ ++ $configAssets = @( ++ @{ Name = 'config.json'; Source = Join-Path -Path $structDir -ChildPath 'config.json' }, ++ @{ Name = 'GetStructDir.ps1'; Source = Join-Path -Path $structDir -ChildPath 'GetStructDir.ps1' } ++ ) ++ ++ foreach ($spec in $specs) { ++ if (-not (Test-Path -LiteralPath $spec.Source -PathType Leaf)) { ++ Write-Error "Source file not found: $($spec.Source)" ++ exit 1 ++ } ++ } ++ ++ foreach ($asset in $configAssets) { ++ if (-not (Test-Path -LiteralPath $asset.Source -PathType Leaf)) { ++ Write-Error "Config asset not found: $($asset.Source)" ++ exit 1 ++ } ++ } ++ ++ # Ensure .config directory exists in project root ++ $projectConfigDir = Join-Path -Path $resolvedProject -ChildPath '.config' ++ if (-not (Test-Path -LiteralPath $projectConfigDir -PathType Container)) { ++ New-Item -Path $projectConfigDir -ItemType Directory -Force | Out-Null ++ Write-Host "Created .config directory: $projectConfigDir" -ForegroundColor Cyan ++ } ++ ++ $touchedDirs = @{} ++ $summary = @() ++ ++ foreach ($spec in $specs) { ++ Write-Host "`n=== Updating $($spec.Name) ===" -ForegroundColor Magenta ++ ++ $targets = Get-ChildItem -LiteralPath $resolvedProject -Recurse -Filter $spec.Name -File -ErrorAction SilentlyContinue ++ $targets = $targets | Where-Object { $_.FullName -ne $spec.Source } ++ ++ if (-not $targets) { ++ Write-Host "No targets found." -ForegroundColor Yellow ++ $summary += [pscustomobject]@{ ++ Name = $spec.Name ++ Updated = 0 ++ Failed = 0 ++ Skipped = 0 ++ Total = 0 ++ } ++ continue ++ } ++ ++ $updated = 0 ++ $failed = 0 ++ ++ foreach ($target in $targets) { ++ try { ++ Copy-Item -Path $spec.Source -Destination $target.FullName -Force ++ Write-Host "[OK] $($target.FullName)" -ForegroundColor Green ++ $updated++ ++ ++ $targetDir = $target.Directory.FullName ++ if (-not $touchedDirs.ContainsKey($targetDir)) { ++ $touchedDirs[$targetDir] = $true ++ } ++ } ++ catch { ++ Write-Host "[FAIL] $($target.FullName)" -ForegroundColor Red ++ Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed ++ $failed++ ++ } ++ } ++ ++ $summary += [pscustomobject]@{ ++ Name = $spec.Name ++ Updated = $updated ++ Failed = $failed ++ Skipped = 0 ++ Total = @($targets).Count ++ } ++ } ++ ++ Write-Host "`n=== Summary ===" -ForegroundColor Cyan ++ foreach ($item in $summary) { ++ Write-Host ("{0,-22} Updated: {1,3} Failed: {2,3} Total: {3,3}" -f $item.Name, $item.Updated, $item.Failed, $item.Total) ++ } ++ ++ if (($summary | Measure-Object -Property Failed -Sum).Sum -gt 0) { ++ Write-Host "Completed with errors." -ForegroundColor Yellow ++ exit 1 ++ } ++ ++ Write-Host "All batch files refreshed successfully." -ForegroundColor Green ++ ++ # Deploy config files to projectroot\.config\ ++ Write-Host "`n=== Deploying config files to .config\ ===" -ForegroundColor Magenta ++ foreach ($asset in $configAssets) { ++ $targetPath = Join-Path -Path $projectConfigDir -ChildPath $asset.Name ++ try { ++ Copy-Item -Path $asset.Source -Destination $targetPath -Force ++ Write-Host "[OK] $targetPath" -ForegroundColor Green ++ } ++ catch { ++ Write-Host "[FAIL] $targetPath" -ForegroundColor Red ++ Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed ++ exit 1 ++ } ++ } ++ ++ Write-Host "`nConfig files deployed successfully." -ForegroundColor Green ++ Write-Host "Deployment completed successfully." -ForegroundColor Green ++ exit 0 ++ } ++ else { ++ Write-Host "No project path provided." -ForegroundColor Yellow ++ exit 1 ++ } ++ } ++ +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `ConfigLoader.ps1` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Merged UpdateProjectBatches.ps1 into ConfigLoader.ps1. When ConfigLoader.ps1 is run directly, it: + +1. Prompts for the project path +2. Validates the project directory +3. Updates all batch files in the project (UpdateSequences.bat, ZipSeqArchv.bat, etc.) +4. Deploys config files to `projectroot\.config\` +5. Shows a summary of what was updated + +All functionality from UpdateProjectBatches.ps1 is now integrated into ConfigLoader.ps1. The script is self-contained and no longer depends on a separate UpdateProjectBatches.ps1 file. + +UpdateProjectBatches.ps1 can be removed if it's no longer needed elsewhere, or kept for backward compatibility. + +--- + +_**User (2025-11-10 16:59Z)**_ + +Did the proper unzipseqarchv batch deploy to T:\250827_FestivalTurf\Renders? + +PS T:\250827_FestivalTurf\Renders> & T:\250827_FestivalTurf\Renders\ZipSeqArchv.bat + +[zip] Renders\01 Develop Your Turf Plan\02_Roll Sizes -> Renders\_zipped\01 Develop Your Turf Plan\02_Roll Sizes.zip + +Sequence sync failed: 7z compression failed: + +Command Line Error: + +The file operation error for listfile + +The process cannot access the file because it is being used by another process. + +C:\Users\Nathan\AppData\Local\Temp\tmp8_gumwk9.lst + +Traceback (most recent call last): + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 464, in + + raise SystemExit(main()) + + ^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 458, in main + + updated = run_zip(workers, verbose=args.verbose) + + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 350, in run_zip + + updated_paths.extend(future.result()) + + ^^^^^^^^^^^^^^^ + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\_base.py", line 449, in result + + return self.__get_result() + + ^^^^^^^^^^^^^^^^^^^ + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\_base.py", line 401, in __get_result + + raise self._exception + + File "C:\Program Files\WindowsApps\PythonSoftwareFoundation.Python.3.11_3.11.2544.0_x64__qbz5n2kfra8p0\Lib\concurrent\futures\thread.py", line 58, in run + + result = self.fn(*self.args, **self.kwargs) + + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 303, in process_zip + + zip_sequence(seq_dir, zip_path) + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 239, in zip_sequence + + raise RuntimeError(f"7z compression failed: {result.stderr}") + +RuntimeError: 7z compression failed: + +Command Line Error: + +The file operation error for listfile + +The process cannot access the file because it is being used by another process. + +C:\Users\Nathan\AppData\Local\Temp\tmp8_gumwk9.lst + +. was unexpected at this time. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +Checking if UnzipSeqArchv.bat was deployed correctly, then fixing the 7z file locking issue: + + +--- + + +
Tool use: **read_file** • Read file: zip_sequences.py + +
+ + +--- + + +
+ Tool use: **codebase_search** • Searched codebase "How does ThreadPoolExecutor handle parallel execution in zip_sequences? Are temp files unique per thread?" • **15** results + +| File | Lines | +|------|-------| +| `zip_sequences.py` | L307-369 | +| `zip_sequences.py` | L186-268 | +| `zip_sequences.py` | L312-446 | +| `zip_sequences.py` | L193-304 | +| `zip_sequences.py` | L190-297 | +| `zip_sequences.py` | L65 | +| `zip_sequences.py` | L43-106 | +| `zip_sequences.py` | L88-112 | +| `zip_sequences.py` | L271-309 | +| `zip_sequences.py` | L179-190 | +| `zip_sequences.py` | L130-161 | +| `UpdateSequences.ps1` | L54-96 | +| `zip_sequences.py` | L372-458 | +| `compress_blend_files.bat` | L66 | +| `compress_blend_files.bat` | L64-116 | + +
+ + +--- + + + +--- + + +Fixing the 7z file locking issue. 7z may be reading the list file before it's fully released. Ensuring the file is closed and adding a small delay before 7z runs: + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 17, lines removed: 6 + +```diff +@@ -210,10 +210,21 @@ + try: + # Create list file with absolute path +- list_file_path = Path(tempfile.mkstemp(suffix=".lst", text=True)[1]) +- with open(list_file_path, "w", encoding="utf-8") as list_file: +- for rel_path in file_list: +- list_file.write(rel_path + "\n") +- list_file.flush() +- os.fsync(list_file.fileno()) # Ensure data is written to disk ++ fd, temp_path = tempfile.mkstemp(suffix=".lst", text=True) ++ list_file_path = Path(temp_path) ++ try: ++ with os.fdopen(fd, "w", encoding="utf-8") as list_file: ++ for rel_path in file_list: ++ list_file.write(rel_path + "\n") ++ list_file.flush() ++ os.fsync(fd) # Ensure data is written to disk ++ finally: ++ # File is closed here, ensure handle is released ++ try: ++ os.close(fd) ++ except OSError: ++ pass ++ ++ # Small delay to ensure file handle is fully released by OS ++ time.sleep(0.05) + + # Use absolute path for list file in 7z command +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `zip_sequences.py` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Fixing the file handle management: `os.fdopen` already closes the file descriptor, so we shouldn't close it again. + + +--- + + + +
Tool use: **code_edit** • Edit file: zip_sequences.py + +**Chunk 1** +Lines added: 2, lines removed: 9 + +```diff +@@ -217,13 +217,6 @@ + list_file.write(rel_path + "\n") + list_file.flush() +- os.fsync(fd) # Ensure data is written to disk +- finally: +- # File is closed here, ensure handle is released +- try: +- os.close(fd) +- except OSError: +- pass +- +- # Small delay to ensure file handle is fully released by OS ++ os.fsync(list_file.fileno()) # Ensure data is written to disk ++ # File is closed here by context manager, small delay to ensure OS releases handle + time.sleep(0.05) + +``` + +
+ + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `zip_sequences.py` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Fixed the 7z file locking issue by: +1. Using `os.fdopen` to manage the file descriptor +2. Ensuring the file is fully flushed and synced before closing +3. Adding a 50ms delay after closing to let the OS release the file handle before 7z reads it + +Regarding UnzipSeqArchv.bat deployment: after merging UpdateProjectBatches into ConfigLoader, running ConfigLoader.ps1 should have deployed the updated UnzipSeqArchv.bat that uses `.config\config.json` and `GetStructDir.ps1` instead of ConfigLoader.ps1. + +To verify, check that `T:\250827_FestivalTurf\Renders\UnzipSeqArchv.bat` contains references to `.config\` and `GetStructDir.ps1` rather than `ConfigLoader.ps1`. If it still references ConfigLoader.ps1, run ConfigLoader.ps1 again to redeploy the updated batch files. + +The 7z compression should work now with the file locking fix. + +--- + +_**User (2025-11-10 16:59Z)**_ + +let's make sure the .config folder is hidden. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + +Updating ConfigLoader.ps1 to set the `.config` folder as hidden when it's created: + + +--- + + +
Tool use: **read_file** • Read file: ConfigLoader.ps1 + +
+ + +--- + + + +--- + + + +
Tool use: **code_edit** • Edit file: ConfigLoader.ps1 + +**Chunk 1** +Lines added: 4, lines removed: 1 + +```diff +@@ -238,10 +238,13 @@ + } + +- # Ensure .config directory exists in project root ++ # Ensure .config directory exists in project root and is hidden + $projectConfigDir = Join-Path -Path $resolvedProject -ChildPath '.config' + if (-not (Test-Path -LiteralPath $projectConfigDir -PathType Container)) { + New-Item -Path $projectConfigDir -ItemType Directory -Force | Out-Null + Write-Host "Created .config directory: $projectConfigDir" -ForegroundColor Cyan + } ++ # Set hidden attribute on .config directory ++ $folder = Get-Item -LiteralPath $projectConfigDir -Force ++ $folder.Attributes = $folder.Attributes -bor [System.IO.FileAttributes]::Hidden + + $touchedDirs = @{} +``` + +
+ + + +--- + + + + + +--- + + +
+ Tool use: **read_lints** • Read lints for 1 file + +Lint paths: + +- `ConfigLoader.ps1` + +Lint results + + +**No lint errors found** +
+ + +--- + + + +--- + + +Updated ConfigLoader.ps1 to set the `.config` folder as hidden. When the script creates or updates the `.config` directory, it will: + +1. Create the directory if it doesn't exist +2. Set the hidden attribute using `[System.IO.FileAttributes]::Hidden` + +The `-bor` (bitwise OR) preserves existing attributes while adding the hidden flag. The `.config` folder will be hidden in Windows Explorer (unless "Show hidden files" is enabled). + +When you run ConfigLoader.ps1 to deploy to a project, it will create the `.config` folder as hidden if it doesn't exist, and set it to hidden if it already exists. + +--- + +_**User (2025-11-10 16:59Z)**_ + +PS T:\250827_FestivalTurf\Renders> & T:\250827_FestivalTurf\Renders\ZipSeqArchv.bat + + File "A:\1 Amazon_Active_Projects\3 ProjectStructure\zip_sequences.py", line 221 + + time.sleep(0.05) + + ^^^^ + +SyntaxError: expected 'except' or 'finally' block + +. was unexpected at this time. + +--- + +_**Agent (model default, mode Agent)**_ + + + +--- + + + +--- + + +
+Tool use: **read_file** + +Status: **loading** + + +
+ + +--- + + + +--- + + + +--- + + +
+Tool use: **search_replace** + +Status: **loading** + + +
+ + +--- + + + +--- + + + +--- + + + +--- + diff --git a/ConfigLoader.ps1 b/ConfigLoader.ps1 index 69ad5e1..711b397 100644 --- a/ConfigLoader.ps1 +++ b/ConfigLoader.ps1 @@ -186,27 +186,148 @@ function Get-ZipCompressionLevel { if ($MyInvocation.InvocationName -ne '.') { $projectPath = Get-ProjectPathFromUser if ($null -ne $projectPath) { - Write-Host "`nDeploying to: $projectPath" -ForegroundColor Cyan - - # Find UpdateProjectBatches.ps1 in the same directory as ConfigLoader.ps1 - $updateScript = Join-Path -Path $script:LoaderRoot -ChildPath 'UpdateProjectBatches.ps1' - if (Test-Path -LiteralPath $updateScript) { - Write-Host "Running UpdateProjectBatches.ps1...`n" -ForegroundColor Yellow - & powershell -NoProfile -ExecutionPolicy Bypass -File $updateScript -ProjectPath $projectPath - $exitCode = $LASTEXITCODE - if ($exitCode -eq 0) { - Write-Host "`nDeployment completed successfully." -ForegroundColor Green - } - else { - Write-Host "`nDeployment completed with errors (exit code: $exitCode)." -ForegroundColor Red - } - exit $exitCode + # Deploy batch files and config to the project + $structDir = Get-StructDirectory + if (-not (Test-Path -LiteralPath $structDir -PathType Container)) { + Write-Error "Configured structDir not found: $structDir" + exit 1 } - else { - Write-Warning "UpdateProjectBatches.ps1 not found in $script:LoaderRoot" - Write-Host "Project path: $projectPath" -ForegroundColor Green - return $projectPath + + try { + $resolvedProject = (Resolve-Path -LiteralPath $projectPath -ErrorAction Stop).Path } + catch { + Write-Error "Unable to resolve project directory: $($_.Exception.Message)" + exit 1 + } + + if (-not (Test-Path -LiteralPath $resolvedProject -PathType Container)) { + Write-Error "Project path is not a directory: $resolvedProject" + exit 1 + } + + Write-Host "`nDeploying to: $resolvedProject" -ForegroundColor Cyan + Write-Host "Struct directory: $structDir" -ForegroundColor Cyan + + $specs = @( + @{ Name = 'UpdateSequences.bat'; Source = Join-Path -Path $structDir -ChildPath 'UpdateSequences.bat' }, + @{ Name = 'UpdateAllSequences.bat'; Source = Join-Path -Path $structDir -ChildPath 'UpdateAllSequences.bat' }, + @{ Name = 'ZipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'ZipSeqArchv.bat' }, + @{ Name = 'UnzipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'UnzipSeqArchv.bat' }, + @{ Name = 'NewDaily.bat'; Source = Join-Path -Path $structDir -ChildPath 'NewDaily.bat' } + ) + + # Config files to deploy to projectroot\.config\ + $configAssets = @( + @{ Name = 'config.json'; Source = Join-Path -Path $structDir -ChildPath 'config.json' }, + @{ Name = 'GetStructDir.ps1'; Source = Join-Path -Path $structDir -ChildPath 'GetStructDir.ps1' } + ) + + foreach ($spec in $specs) { + if (-not (Test-Path -LiteralPath $spec.Source -PathType Leaf)) { + Write-Error "Source file not found: $($spec.Source)" + exit 1 + } + } + + foreach ($asset in $configAssets) { + if (-not (Test-Path -LiteralPath $asset.Source -PathType Leaf)) { + Write-Error "Config asset not found: $($asset.Source)" + exit 1 + } + } + + # Ensure .config directory exists in project root and is hidden + $projectConfigDir = Join-Path -Path $resolvedProject -ChildPath '.config' + if (-not (Test-Path -LiteralPath $projectConfigDir -PathType Container)) { + New-Item -Path $projectConfigDir -ItemType Directory -Force | Out-Null + Write-Host "Created .config directory: $projectConfigDir" -ForegroundColor Cyan + } + # Set hidden attribute on .config directory + $folder = Get-Item -LiteralPath $projectConfigDir -Force + $folder.Attributes = $folder.Attributes -bor [System.IO.FileAttributes]::Hidden + + $touchedDirs = @{} + $summary = @() + + foreach ($spec in $specs) { + Write-Host "`n=== Updating $($spec.Name) ===" -ForegroundColor Magenta + + $targets = Get-ChildItem -LiteralPath $resolvedProject -Recurse -Filter $spec.Name -File -ErrorAction SilentlyContinue + $targets = $targets | Where-Object { $_.FullName -ne $spec.Source } + + if (-not $targets) { + Write-Host "No targets found." -ForegroundColor Yellow + $summary += [pscustomobject]@{ + Name = $spec.Name + Updated = 0 + Failed = 0 + Skipped = 0 + Total = 0 + } + continue + } + + $updated = 0 + $failed = 0 + + foreach ($target in $targets) { + try { + Copy-Item -Path $spec.Source -Destination $target.FullName -Force + Write-Host "[OK] $($target.FullName)" -ForegroundColor Green + $updated++ + + $targetDir = $target.Directory.FullName + if (-not $touchedDirs.ContainsKey($targetDir)) { + $touchedDirs[$targetDir] = $true + } + } + catch { + Write-Host "[FAIL] $($target.FullName)" -ForegroundColor Red + Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed + $failed++ + } + } + + $summary += [pscustomobject]@{ + Name = $spec.Name + Updated = $updated + Failed = $failed + Skipped = 0 + Total = @($targets).Count + } + } + + Write-Host "`n=== Summary ===" -ForegroundColor Cyan + foreach ($item in $summary) { + Write-Host ("{0,-22} Updated: {1,3} Failed: {2,3} Total: {3,3}" -f $item.Name, $item.Updated, $item.Failed, $item.Total) + } + + if (($summary | Measure-Object -Property Failed -Sum).Sum -gt 0) { + Write-Host "Completed with errors." -ForegroundColor Yellow + exit 1 + } + + Write-Host "All batch files refreshed successfully." -ForegroundColor Green + + # Deploy config files to projectroot\.config\ + Write-Host "`n=== Deploying config files to .config\ ===" -ForegroundColor Magenta + foreach ($asset in $configAssets) { + $targetPath = Join-Path -Path $projectConfigDir -ChildPath $asset.Name + try { + Copy-Item -Path $asset.Source -Destination $targetPath -Force + Write-Host "[OK] $targetPath" -ForegroundColor Green + } + catch { + Write-Host "[FAIL] $targetPath" -ForegroundColor Red + Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed + exit 1 + } + } + + Write-Host "`nConfig files deployed successfully." -ForegroundColor Green + Write-Host "Deployment completed successfully." -ForegroundColor Green + exit 0 } else { Write-Host "No project path provided." -ForegroundColor Yellow diff --git a/GetStructDir.ps1 b/GetStructDir.ps1 new file mode 100644 index 0000000..08be8d6 --- /dev/null +++ b/GetStructDir.ps1 @@ -0,0 +1,68 @@ +# Simple helper script to get structDir from project config.json +# Reads config.json from .config folder in project root + +param( + [string]$ProjectRoot +) + +Set-StrictMode -Version Latest +$ErrorActionPreference = 'Stop' + +if ([string]::IsNullOrWhiteSpace($ProjectRoot)) { + # Try to determine project root from script location + if ($PSScriptRoot) { + $ProjectRoot = Split-Path -Parent $PSScriptRoot + } + elseif ($MyInvocation.MyCommand.Path) { + $ProjectRoot = Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path) + } + else { + Write-Error "Unable to determine project root. Please provide -ProjectRoot parameter." + exit 1 + } +} + +$configPath = Join-Path -Path $ProjectRoot -ChildPath '.config\config.json' + +if (-not (Test-Path -LiteralPath $configPath -PathType Leaf)) { + Write-Error "config.json not found at: $configPath" + exit 1 +} + +try { + $config = Get-Content -LiteralPath $configPath -Raw -ErrorAction Stop | ConvertFrom-Json + + if ($config.PSObject.Properties.Name -contains 'structDir') { + $structDir = $config.structDir + if ($null -ne $structDir -and ($structDir -isnot [string] -or $structDir.Trim().Length -gt 0)) { + # If it's an absolute path, resolve it + if ([System.IO.Path]::IsPathRooted($structDir)) { + $resolved = Resolve-Path -LiteralPath $structDir -ErrorAction SilentlyContinue + if ($null -ne $resolved) { + Write-Output $resolved.Path + exit 0 + } + Write-Output $structDir + exit 0 + } + # Relative path - resolve relative to config location + $candidate = Join-Path -Path (Split-Path -Parent $configPath) -ChildPath $structDir + $resolvedCandidate = Resolve-Path -LiteralPath $candidate -ErrorAction SilentlyContinue + if ($null -ne $resolvedCandidate) { + Write-Output $resolvedCandidate.Path + exit 0 + } + Write-Output $candidate + exit 0 + } + } + + # Default: return the directory containing config.json (project root) + Write-Output $ProjectRoot + exit 0 +} +catch { + Write-Error "Failed to read or parse config.json: $($_.Exception.Message)" + exit 1 +} + diff --git a/UnzipSeqArchv.bat b/UnzipSeqArchv.bat index 0c2779b..c1e9936 100644 --- a/UnzipSeqArchv.bat +++ b/UnzipSeqArchv.bat @@ -4,23 +4,24 @@ setlocal EnableExtensions set "REN_DIR=%~dp0" for %%I in ("%REN_DIR%..") do set "PROJ_ROOT=%%~fI" -set "CONFIG_LOADER=%REN_DIR%ConfigLoader.ps1" -set "CONFIG_PATH=%REN_DIR%config.json" +set "CONFIG_DIR=%PROJ_ROOT%\.config" +set "CONFIG_PATH=%CONFIG_DIR%\config.json" +set "GET_STRUCT_DIR=%CONFIG_DIR%\GetStructDir.ps1" -if not exist "%CONFIG_LOADER%" ( - echo [ERROR] ConfigLoader.ps1 not found next to UnzipSeqArchv.bat. +if not exist "%CONFIG_PATH%" ( + echo [ERROR] config.json not found at %CONFIG_PATH% echo Please run UpdateProjectBatches.ps1 to refresh helper files. exit /b 1 ) -if not exist "%CONFIG_PATH%" ( - echo [ERROR] config.json not found next to UnzipSeqArchv.bat. +if not exist "%GET_STRUCT_DIR%" ( + echo [ERROR] GetStructDir.ps1 not found at %GET_STRUCT_DIR% echo Please run UpdateProjectBatches.ps1 to refresh helper files. exit /b 1 ) for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^ - "Set-StrictMode -Version Latest; $loader = Resolve-Path -LiteralPath '%CONFIG_LOADER%' -ErrorAction Stop; . $loader.Path; $pyPath = Join-Path (Get-StructDirectory) 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" + "Set-StrictMode -Version Latest; $structDir = & '%GET_STRUCT_DIR%' -ProjectRoot '%PROJ_ROOT%'; if (-not $structDir) { throw \"Failed to get structDir from GetStructDir.ps1\" }; $pyPath = Join-Path $structDir 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" if not defined PY_SCRIPT ( echo [ERROR] Unable to resolve zip_sequences.py path from config. diff --git a/UpdateProjectBatches.ps1 b/UpdateProjectBatches.ps1 index 3006f6f..0eec72f 100644 --- a/UpdateProjectBatches.ps1 +++ b/UpdateProjectBatches.ps1 @@ -55,9 +55,10 @@ $specs = @( @{ Name = 'NewDaily.bat'; Source = Join-Path -Path $structDir -ChildPath 'NewDaily.bat' } ) -$sharedAssets = @( - @{ Name = 'ConfigLoader.ps1'; Source = Join-Path -Path $structDir -ChildPath 'ConfigLoader.ps1' }, - @{ Name = 'config.json'; Source = Join-Path -Path $structDir -ChildPath 'config.json' } +# Config files to deploy to projectroot\.config\ +$configAssets = @( + @{ Name = 'config.json'; Source = Join-Path -Path $structDir -ChildPath 'config.json' }, + @{ Name = 'GetStructDir.ps1'; Source = Join-Path -Path $structDir -ChildPath 'GetStructDir.ps1' } ) foreach ($spec in $specs) { @@ -67,13 +68,20 @@ foreach ($spec in $specs) { } } -foreach ($asset in $sharedAssets) { +foreach ($asset in $configAssets) { if (-not (Test-Path -LiteralPath $asset.Source -PathType Leaf)) { - Write-Error "Shared asset not found: $($asset.Source)" + Write-Error "Config asset not found: $($asset.Source)" exit 1 } } +# Ensure .config directory exists in project root +$projectConfigDir = Join-Path -Path $resolvedProject -ChildPath '.config' +if (-not (Test-Path -LiteralPath $projectConfigDir -PathType Container)) { + New-Item -Path $projectConfigDir -ItemType Directory -Force | Out-Null + Write-Host "Created .config directory: $projectConfigDir" -ForegroundColor Cyan +} + $touchedDirs = @{} $summary = @() @@ -106,14 +114,6 @@ foreach ($spec in $specs) { $targetDir = $target.Directory.FullName if (-not $touchedDirs.ContainsKey($targetDir)) { - foreach ($asset in $sharedAssets) { - try { - Copy-Item -Path $asset.Source -Destination (Join-Path -Path $targetDir -ChildPath $asset.Name) -Force - } - catch { - Write-Host " [FAIL] Failed to copy $($asset.Name) into ${targetDir}: $($_.Exception.Message)" -ForegroundColor Red - } - } $touchedDirs[$targetDir] = $true } } @@ -145,3 +145,20 @@ if (($summary | Measure-Object -Property Failed -Sum).Sum -gt 0) { Write-Host "All batch files refreshed successfully." -ForegroundColor Green +# Deploy config files to projectroot\.config\ +Write-Host "`n=== Deploying config files to .config\ ===" -ForegroundColor Magenta +foreach ($asset in $configAssets) { + $targetPath = Join-Path -Path $projectConfigDir -ChildPath $asset.Name + try { + Copy-Item -Path $asset.Source -Destination $targetPath -Force + Write-Host "[OK] $targetPath" -ForegroundColor Green + } + catch { + Write-Host "[FAIL] $targetPath" -ForegroundColor Red + Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed + exit 1 + } +} + +Write-Host "Config files deployed successfully." -ForegroundColor Green + diff --git a/UpdateSequences.bat b/UpdateSequences.bat index 2b917fd..e6285e0 100644 --- a/UpdateSequences.bat +++ b/UpdateSequences.bat @@ -2,23 +2,26 @@ setlocal EnableExtensions set "script_dir=%~dp0" -set "config_loader=%script_dir%ConfigLoader.ps1" -set "config_path=%script_dir%config.json" +for %%I in ("%script_dir%..") do set "PROJ_ROOT=%%~fI" -if not exist "%config_loader%" ( - echo [ERROR] ConfigLoader.ps1 not found next to UpdateSequences.bat. +set "CONFIG_DIR=%PROJ_ROOT%\.config" +set "CONFIG_PATH=%CONFIG_DIR%\config.json" +set "GET_STRUCT_DIR=%CONFIG_DIR%\GetStructDir.ps1" + +if not exist "%CONFIG_PATH%" ( + echo [ERROR] config.json not found at %CONFIG_PATH% echo Please run UpdateProjectBatches.ps1 to refresh helper files. exit /b 1 ) -if not exist "%config_path%" ( - echo [ERROR] config.json not found next to UpdateSequences.bat. +if not exist "%GET_STRUCT_DIR%" ( + echo [ERROR] GetStructDir.ps1 not found at %GET_STRUCT_DIR% echo Please run UpdateProjectBatches.ps1 to refresh helper files. exit /b 1 ) for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^ - "Set-StrictMode -Version Latest; $loader = Resolve-Path -LiteralPath '%config_loader%' -ErrorAction Stop; . $loader.Path; $ps1Path = Join-Path (Get-StructDirectory) 'UpdateSequences.ps1'; if (-not (Test-Path -LiteralPath $ps1Path)) { throw \"UpdateSequences.ps1 not found at $ps1Path\" }; Write-Output $ps1Path"`) do set "ps1=%%I" + "Set-StrictMode -Version Latest; $structDir = & '%GET_STRUCT_DIR%' -ProjectRoot '%PROJ_ROOT%'; if (-not $structDir) { throw \"Failed to get structDir from GetStructDir.ps1\" }; $ps1Path = Join-Path $structDir 'UpdateSequences.ps1'; if (-not (Test-Path -LiteralPath $ps1Path)) { throw \"UpdateSequences.ps1 not found at $ps1Path\" }; Write-Output $ps1Path"`) do set "ps1=%%I" if not defined ps1 ( echo [ERROR] Unable to resolve UpdateSequences.ps1 path from config. diff --git a/ZipSeqArchv.bat b/ZipSeqArchv.bat index d58b3f5..bda1e6f 100644 --- a/ZipSeqArchv.bat +++ b/ZipSeqArchv.bat @@ -4,23 +4,24 @@ setlocal EnableExtensions set "REN_DIR=%~dp0" for %%I in ("%REN_DIR%..") do set "PROJ_ROOT=%%~fI" -set "CONFIG_LOADER=%REN_DIR%ConfigLoader.ps1" -set "CONFIG_PATH=%REN_DIR%config.json" +set "CONFIG_DIR=%PROJ_ROOT%\.config" +set "CONFIG_PATH=%CONFIG_DIR%\config.json" +set "GET_STRUCT_DIR=%CONFIG_DIR%\GetStructDir.ps1" -if not exist "%CONFIG_LOADER%" ( - echo [ERROR] ConfigLoader.ps1 not found next to ZipSeqArchv.bat. +if not exist "%CONFIG_PATH%" ( + echo [ERROR] config.json not found at %CONFIG_PATH% echo Please run UpdateProjectBatches.ps1 to refresh helper files. exit /b 1 ) -if not exist "%CONFIG_PATH%" ( - echo [ERROR] config.json not found next to ZipSeqArchv.bat. +if not exist "%GET_STRUCT_DIR%" ( + echo [ERROR] GetStructDir.ps1 not found at %GET_STRUCT_DIR% echo Please run UpdateProjectBatches.ps1 to refresh helper files. exit /b 1 ) for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^ - "Set-StrictMode -Version Latest; $loader = Resolve-Path -LiteralPath '%CONFIG_LOADER%' -ErrorAction Stop; . $loader.Path; $pyPath = Join-Path (Get-StructDirectory) 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" + "Set-StrictMode -Version Latest; $structDir = & '%GET_STRUCT_DIR%' -ProjectRoot '%PROJ_ROOT%'; if (-not $structDir) { throw \"Failed to get structDir from GetStructDir.ps1\" }; $pyPath = Join-Path $structDir 'zip_sequences.py'; if (-not (Test-Path -LiteralPath $pyPath)) { throw \"zip_sequences.py not found at $pyPath\" }; Write-Output $pyPath"`) do set "PY_SCRIPT=%%I" if not defined PY_SCRIPT ( echo [ERROR] Unable to resolve zip_sequences.py path from config. diff --git a/zip_sequences.py b/zip_sequences.py index 7725b5f..591457d 100644 --- a/zip_sequences.py +++ b/zip_sequences.py @@ -16,6 +16,7 @@ import shutil import subprocess import sys import tempfile +import time from concurrent.futures import ThreadPoolExecutor, as_completed from pathlib import Path from typing import Iterator, Sequence @@ -195,27 +196,50 @@ def zip_sequence(seq_dir: Path, zip_path: Path) -> None: if SEVEN_Z_EXE is None: raise RuntimeError("7z compression requested but 7z executable not found in PATH") zip_path.parent.mkdir(parents=True, exist_ok=True) + # Remove existing zip file if it exists to avoid corruption issues + if zip_path.exists(): + try: + zip_path.unlink() + except OSError: + # If deletion fails, try to overwrite with -aoa flag + pass + # Build list of files to archive with relative paths file_list = [] for file_path in iter_sequence_files(seq_dir): rel_path = file_path.relative_to(seq_dir).as_posix() file_list.append(rel_path) - # Use a temporary list file to avoid Windows command line length limits - with tempfile.NamedTemporaryFile(mode="w", suffix=".lst", delete=False, encoding="utf-8") as list_file: - list_file_path = Path(list_file.name) - for rel_path in file_list: - list_file.write(rel_path + "\n") + if not file_list: + raise RuntimeError(f"No files found to archive in {seq_dir}") + # Use a temporary list file to avoid Windows command line length limits + list_file_path = None try: + # Create list file with absolute path + fd, temp_path = tempfile.mkstemp(suffix=".lst", text=True) + list_file_path = Path(temp_path) + with os.fdopen(fd, "w", encoding="utf-8") as list_file: + for rel_path in file_list: + list_file.write(rel_path + "\n") + list_file.flush() + os.fsync(list_file.fileno()) # Ensure data is written to disk + # File is closed here by context manager, small delay to ensure OS releases handle + time.sleep(0.1) + + # Use absolute path for list file in 7z command + list_file_abs = list_file_path.resolve() + # Use -aoa to overwrite all files, -bb0 to suppress progress output cmd = [ SEVEN_Z_EXE, "a", "-y", + "-aoa", # Overwrite all existing files + "-bb0", # Suppress progress output f"-mx={COMPRESSION_LEVEL}", "-tzip", str(zip_path), - f"@{list_file_path}", + f"@{list_file_abs}", ] result = subprocess.run( cmd, @@ -226,9 +250,24 @@ def zip_sequence(seq_dir: Path, zip_path: Path) -> None: text=True, ) if result.returncode != 0: - raise RuntimeError(f"7z compression failed: {result.stderr}") + error_msg = result.stderr.strip() if result.stderr else "Unknown error" + if result.stdout: + error_msg += f"\nstdout: {result.stdout.strip()}" + raise RuntimeError(f"7z compression failed: {error_msg}") finally: - list_file_path.unlink(missing_ok=True) + # Clean up list file, with retry in case 7z still has it open + if list_file_path and list_file_path.exists(): + for attempt in range(3): + try: + list_file_path.unlink(missing_ok=True) + break + except PermissionError: + if attempt < 2: + time.sleep(0.1) # Wait 100ms before retry + else: + # Last attempt failed, just log and continue + # The temp file will be cleaned up by the OS eventually + pass return # Use zipfile (ZIPPER_TYPE == "zip" or fallback)