Compare commits
21 Commits
b7ae8880e7
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 95a19dceb3 | |||
| e8f66cd06f | |||
| c5a2463b91 | |||
|
1c86fa0c68 | ||
|
|
b67c2e7779 | ||
|
|
e1086312dd | ||
|
|
ba46dce3a3 | ||
| 2238021885 | |||
|
|
c101fbb381 | ||
|
|
68330de0fb | ||
|
|
0cff26cb0d | ||
| 75c2c1ed02 | |||
| 584f5135dd | |||
|
|
bffbff528e | ||
| 756e8168fb | |||
|
|
fbc0f833dc | ||
|
|
06e8177f0b | ||
| 81ada88dc1 | |||
|
|
2fd5023816 | ||
|
|
6c20b2de52 | ||
| e1c1aacd0d |
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
<!-- Generated by SpecStory -->
|
||||
<!-- Generated by SpecStory, Markdown v2.1.0 -->
|
||||
|
||||
<!-- cursor Session 22ad1b66-1412-4dc8-962e-ef2f925bebf4 (2025-10-30 00:40Z) -->
|
||||
|
||||
@@ -10,7 +10,7 @@ _**User (2025-10-30 00:28Z)**_
|
||||
|
||||
---
|
||||
|
||||
_**Assistant (gpt-5-codex)**_
|
||||
_**Agent (model default, mode Plan)**_
|
||||
|
||||
|
||||
|
||||
@@ -22,19 +22,21 @@ Reviewing `components/gitignore` and scanning `R:\Creative\artsy\maya\` for YYYY
|
||||
|
||||
---
|
||||
|
||||
Tool use: **read_file**
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: components/gitignore</summary>
|
||||
|
||||
Read file: components/gitignore
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **list_dir**
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="list_dir">
|
||||
<details>
|
||||
<summary>Listed directory undefined • **0** results</summary>
|
||||
<summary>Tool use: **list_directory** • Listed directory undefined • **0** results</summary>
|
||||
|
||||
No results found
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
@@ -47,16 +49,17 @@ Checking a project directory to understand the structure:
|
||||
|
||||
---
|
||||
|
||||
Tool use: **read_file**
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt\.gitignore</summary>
|
||||
|
||||
Read file: R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt\.gitignore
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **codebase_search**
|
||||
|
||||
<tool-use data-tool-type="search" data-tool-name="codebase_search">
|
||||
<details>
|
||||
<summary>Searched codebase "How does UpgradeToGitProj merge gitignore files?" • **14** results</summary>
|
||||
<summary>Tool use: **codebase_search** • Searched codebase "How does UpgradeToGitProj merge gitignore files?" • **14** results</summary>
|
||||
|
||||
| File | Lines |
|
||||
|------|-------|
|
||||
@@ -76,6 +79,7 @@ Tool use: **codebase_search**
|
||||
| `UpdateSequences.ps1` | L257-288 |
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
@@ -88,10 +92,9 @@ Clarifying a few details before creating the plan:
|
||||
|
||||
---
|
||||
|
||||
Tool use: **grep**
|
||||
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Grep for "^renders/|^Renders/" in "components/gitignore" • 1 match</summary>
|
||||
<summary>Tool use: **grep** • Grep for "^renders/|^Renders/" in "components/gitignore" • 1 match</summary>
|
||||
|
||||
Output mode: content
|
||||
|
||||
@@ -102,6 +105,7 @@ Output mode: content
|
||||
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
@@ -114,7 +118,44 @@ Creating the plan:
|
||||
|
||||
---
|
||||
|
||||
Tool use: **create_plan**
|
||||
<tool-use data-tool-type="unknown" data-tool-name="create_plan">
|
||||
<details>
|
||||
<summary>Tool use: **create_plan**</summary>
|
||||
|
||||
|
||||
Parameters:
|
||||
|
||||
```json
|
||||
{
|
||||
"plan": "# Sync gitignore across project repositories\n\n## Overview\nUpdate `.gitignore` files in all project repositories matching the YYYY-MM-DD pattern in `R:\\Creative\\artsy\\maya\\` by merging missing lines from `components/gitignore`, then commit each change.\n\n## Steps\n\n### 1. Discover project directories\n- Scan `R:\\Creative\\artsy\\maya\\` for directories matching pattern `YYYY-MM-DD*` (e.g., `2025-08-02 Springtrap Prince of Egypt`)\n- Filter to only directories that are git repositories (contain `.git` folder)\n\n### 2. For each project repository:\n - **Verify git repo**: Check if `.git` exists\n - **Merge .gitignore**: \n - Use the merge logic from `UpgradeToGitProj.bat` (`:MergeTemplate` function)\n - If `.gitignore` doesn Jones exist, copy from template\n - If it exists, fastr `/x /c:\"%%L\" \"%dst%\" || (>>\"%dst白白\" echo %%L)` to append only missing lines\n - Source: `R:\\Creative\\artsy\\maya\\0 ProjectStructure\\components\\gitignore`\n - Destination: `{projectDir}\\.gitignore`\n - **Stage changes**: Run `git add .gitignore` in each repo\n - **Commit**: Run `git commit -m \"prproj gzip to LFS\"` in each repo\n\n### 3. Report results\n- List which repos were updated\n- List which repos had no changes (already up to date)\n- List any repos that failed (not git repos, permission errors, etc.)\n\n## Implementation notes\n- Use the same merge logic as `UpgradeToGitProj.bat` lines 248-250\n- Only process directories that are git repositories\n- Handle cases where `.gitignore` doesn't exist (copy entire template)\n- Commit only if there are actual changes to `.gitignore`\n",
|
||||
"name": "Sync gitignore across project repos",
|
||||
"overview": "Find all YYYY-MM-DD project directories in R:\\Creative\\artsy\\maya\\, merge changes from components/gitignore into each repo's .gitignore (using append-missing-lines logic), and commit with the specified message."
|
||||
}
|
||||
```
|
||||
Additional data:
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "pending",
|
||||
"reviewData": {
|
||||
"status": "Requested",
|
||||
"selectedOption": "none",
|
||||
"isShowingInput": false
|
||||
}
|
||||
}
|
||||
```
|
||||
Result:
|
||||
|
||||
```json
|
||||
{
|
||||
"rejected": {}
|
||||
}
|
||||
```
|
||||
Status: **completed**
|
||||
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
@@ -124,13 +165,51 @@ Proofread the markdown, there seems to be some hallucinatory content in there.
|
||||
|
||||
---
|
||||
|
||||
_**Assistant (gpt-5-codex)**_
|
||||
_**Agent (model gpt-5-codex, mode Plan)**_
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Correcting hallucinations and typos in plan**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Correcting hallucinations and typos in plan**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **create_plan**
|
||||
<tool-use data-tool-type="unknown" data-tool-name="create_plan">
|
||||
<details>
|
||||
<summary>Tool use: **create_plan**</summary>
|
||||
|
||||
|
||||
Parameters:
|
||||
|
||||
```json
|
||||
{
|
||||
"plan": "# Sync gitignore across project repositories\n\n## Overview\n\nUpdate `.gitignore` files in all project repositories matching the YYYY-MM-DD pattern in `R:\\Creative\\artsy\\maya\\` by merging missing lines from `components/gitignore`, then commit each change.\n\n## Steps\n\n### 1. Discover project directories\n\n- Scan `R:\\Creative\\artsy\\maya\\` for directories matching pattern `YYYY-MM-DD*` (e.g., `2025-08-02 Springtrap Prince of Egypt`)\n- Filter to only directories that are git repositories (contain `.git` folder)\n\n### 2. For each project repository:\n\n- **Verify git repo**: Check if `.git` exists\n- **Merge .gitignore**: \n - Use the merge logic from `UpgradeToGitProj.bat` (`:MergeTemplate` function)\n - If `.gitignore` doesn't exist, copy the template file in full\n - If it already exists, iterate each template line and append only those lines not present (e.g., `findstr /x /c:\"%%L\" \"%dst%\" || (>>\"%dst%\" echo %%L)`)\n - Source: `R:\\Creative\\artsy\\maya\\0 ProjectStructure\\components\\gitignore`\n - Destination: `{projectDir}\\.gitignore`\n- **Stage changes**: Run `git add .gitignore` in each repo\n- **Commit**: Run `git commit -m \"prproj gzip to LFS\"` in each repo\n\n### 3. Report results\n\n- List which repos were updated\n- List which repos had no changes (already up to date)\n- List any repos that failed (not git repos, permission errors, etc.)\n\n## Implementation notes\n\n- Use the same merge logic as `UpgradeToGitProj.bat` lines 248-250\n- Only process directories that are git repositories\n- Handle cases where `.gitignore` doesn't exist (copy entire template)\n- Commit only if there are actual changes to `.gitignore`",
|
||||
"name": "Sync gitignore across project repos",
|
||||
"overview": "Find all YYYY-MM-DD project directories in R:\\Creative\\artsy\\maya\\, merge changes from components/gitignore into each repo's .gitignore (using append-missing-lines logic), and commit with the specified message."
|
||||
}
|
||||
```
|
||||
Additional data:
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "accepted",
|
||||
"reviewData": {
|
||||
"status": "Done",
|
||||
"selectedOption": "approve",
|
||||
"isShowingInput": false
|
||||
}
|
||||
}
|
||||
```
|
||||
Result:
|
||||
|
||||
```json
|
||||
{
|
||||
"accepted": {}
|
||||
}
|
||||
```
|
||||
Status: **completed**
|
||||
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
@@ -140,57 +219,66 @@ Implement the plan as specified. To-do's from the plan have already been created
|
||||
|
||||
---
|
||||
|
||||
_**Assistant (gpt-5-codex)**_
|
||||
_**Agent (model gpt-5-codex, mode Agent)**_
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Preparing to update gitignore files**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Preparing to update gitignore files**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **list_dir**
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="list_dir">
|
||||
<details>
|
||||
<summary>Listed directory undefined • **0** results</summary>
|
||||
<summary>Tool use: **list_directory** • Listed directory undefined • **0** results</summary>
|
||||
|
||||
No results found
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Identifying git repositories from dated directories**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Identifying git repositories from dated directories**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **list_dir**
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="list_dir">
|
||||
<details>
|
||||
<summary>Listed directory undefined • **0** results</summary>
|
||||
<summary>Tool use: **list_directory** • Listed directory undefined • **0** results</summary>
|
||||
|
||||
No results found
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Verifying Git repository presence**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Verifying Git repository presence**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **read_file**
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: R:\Creative\artsy\maya\2025-02 BondingArtifact\.git\config</summary>
|
||||
|
||||
Read file: R:\Creative\artsy\maya\2025-02 BondingArtifact\.git\config
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Checking and planning .gitignore update**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Checking and planning .gitignore update**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **read_file**
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: R:\Creative\artsy\maya\2025-02 BondingArtifact\.gitignore</summary>
|
||||
|
||||
Read file: R:\Creative\artsy\maya\2025-02 BondingArtifact\.gitignore
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Comparing and planning .gitignore updates**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Comparing and planning .gitignore updates**</details></think>
|
||||
|
||||
---
|
||||
|
||||
@@ -208,13 +296,16 @@ sorry, you got stuck.
|
||||
|
||||
---
|
||||
|
||||
_**Assistant (gpt-5-codex)**_
|
||||
_**Agent (model gpt-5-codex, mode Agent)**_
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Planning directory processing with PowerShell**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Planning directory processing with PowerShell**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **run_terminal_cmd**
|
||||
<tool-use data-tool-type="shell" data-tool-name="run_terminal_cmd">
|
||||
<details><summary>Tool use: **command** • Run command: cd R:\Creative\artsy\maya
|
||||
Get-ChildItem -Directory | Where-Object { $_.Name -match '^[0-9]{4}-[0-9]{2}-[0-9]{2}' -and (Test-Path (Join-Path $_.FullName '.git')) } | Select-Object -ExpandProperty FullName</summary>
|
||||
|
||||
```bash
|
||||
cd R:\Creative\artsy\maya
|
||||
@@ -229,16 +320,72 @@ R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt
|
||||
R:\Creative\artsy\maya\2025-08-17 DIE
|
||||
|
||||
```
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Automating .gitignore updates across repos**
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Automating .gitignore updates across repos**
|
||||
|
||||
I'm drafting a PowerShell script to sync a template `.gitignore` to multiple git repos, carefully adding missing lines without duplicates and preserving newlines. The script will stage and commit changes only when needed, handling edge cases like missing files, trailing spaces, and git errors. I'll also ensure repo paths with spaces are correctly quoted for smooth execution.</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **run_terminal_cmd**
|
||||
<tool-use data-tool-type="shell" data-tool-name="run_terminal_cmd">
|
||||
<details><summary>Tool use: **command** • Run command: cd R:\Creative\artsy\maya
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$tplPath = 'R:\Creative\artsy\maya\0 ProjectStructure\components\gitignore'
|
||||
$repos = @(
|
||||
'R:\Creative\artsy\maya\2025-07-09 LolbitNSFW',
|
||||
'R:\Creative\artsy\maya\2025-07-11 GothFexa',
|
||||
'R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie',
|
||||
'R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt',
|
||||
'R:\Creative\artsy\maya\2025-08-17 DIE'
|
||||
)
|
||||
$summary = @()
|
||||
foreach ($repo in $repos) {
|
||||
if (-not (Test-Path (Join-Path $repo '.git'))) {
|
||||
$summary += [pscustomobject]@{Repo=$repo; Status='not-a-git-repo'}
|
||||
continue
|
||||
}
|
||||
$dstPath = Join-Path $repo '.gitignore'
|
||||
$changed = $false
|
||||
if (-not (Test-Path $dstPath)) {
|
||||
Copy-Item -LiteralPath $tplPath -Destination $dstPath -Force
|
||||
$changed = $true
|
||||
} else {
|
||||
$tplLines = Get-Content -LiteralPath $tplPath
|
||||
$dstLines = Get-Content -LiteralPath $dstPath
|
||||
$missing = @()
|
||||
foreach ($line in $tplLines) {
|
||||
if ($dstLines -notcontains $line) { $missing += $line }
|
||||
}
|
||||
if ($missing.Count -gt 0) {
|
||||
if ($dstLines.Count -gt 0 -and $dstLines[-1] -ne '') {
|
||||
Add-Content -LiteralPath $dstPath -Value ''
|
||||
}
|
||||
Add-Content -LiteralPath $dstPath -Value $missing
|
||||
$changed = $true
|
||||
}
|
||||
}
|
||||
if ($changed) {
|
||||
Push-Location $repo
|
||||
git add .gitignore | Out-Null
|
||||
$commitSucceeded = $true
|
||||
try {
|
||||
$commitOutput = git commit -m 'prproj gzip to LFS'
|
||||
} catch {
|
||||
$commitSucceeded = $false
|
||||
$commitOutput = $_.Exception.Message
|
||||
}
|
||||
Pop-Location
|
||||
$summary += [pscustomobject]@{Repo=$repo; Status=($(if ($commitSucceeded) {'updated'} else {'commit-failed'})); Output=$commitOutput}
|
||||
} else {
|
||||
$summary += [pscustomobject]@{Repo=$repo; Status='up-to-date'}
|
||||
}
|
||||
}
|
||||
$summary</summary>
|
||||
|
||||
```bash
|
||||
cd R:\Creative\artsy\maya
|
||||
@@ -300,14 +447,33 @@ $summary
|
||||
|
||||
|
||||
```
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Analyzing missing command output**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Analyzing missing command output**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **run_terminal_cmd**
|
||||
<tool-use data-tool-type="shell" data-tool-name="run_terminal_cmd">
|
||||
<details><summary>Tool use: **command** • Run command: cd R:\Creative\artsy\maya
|
||||
$repos = @(
|
||||
'R:\Creative\artsy\maya\2025-07-09 LolbitNSFW',
|
||||
'R:\Creative\artsy\maya\2025-07-11 GothFexa',
|
||||
'R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie',
|
||||
'R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt',
|
||||
'R:\Creative\artsy\maya\2025-08-17 DIE'
|
||||
)
|
||||
foreach ($repo in $repos) {
|
||||
Write-Host "--- $repo ---"
|
||||
if (-not (Test-Path (Join-Path $repo '.git'))) {
|
||||
Write-Host 'not a git repo'
|
||||
continue
|
||||
}
|
||||
git -C $repo status --short .gitignore
|
||||
}</summary>
|
||||
|
||||
```bash
|
||||
cd R:\Creative\artsy\maya
|
||||
@@ -336,24 +502,32 @@ foreach ($repo in $repos) {
|
||||
--- R:\Creative\artsy\maya\2025-08-17 DIE ---
|
||||
|
||||
```
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Verifying commits and changes**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Verifying commits and changes**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **read_file**
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie\.gitignore</summary>
|
||||
|
||||
Read file: R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie\.gitignore
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Analyzing duplicate lines from template merge**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Analyzing duplicate lines from template merge**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **run_terminal_cmd**
|
||||
<tool-use data-tool-type="shell" data-tool-name="run_terminal_cmd">
|
||||
<details><summary>Tool use: **command** • Run command: cd "R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie"
|
||||
git log -1 --pretty=%s</summary>
|
||||
|
||||
```bash
|
||||
cd "R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie"
|
||||
@@ -364,16 +538,32 @@ git log -1 --pretty=%s
|
||||
prproj gzip to LFS
|
||||
|
||||
```
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Summarizing repo commit statuses**
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Summarizing repo commit statuses**
|
||||
|
||||
I’m figuring out how to identify which repos actually got updated by checking their latest commit messages and logs, aiming to differentiate repos with real changes from those without commits. I want to produce a concise table listing each repo alongside its HEAD commit message to clearly show which ones were modified.</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **run_terminal_cmd**
|
||||
<tool-use data-tool-type="shell" data-tool-name="run_terminal_cmd">
|
||||
<details><summary>Tool use: **command** • Run command: $repos = @(
|
||||
'R:\Creative\artsy\maya\2025-07-09 LolbitNSFW',
|
||||
'R:\Creative\artsy\maya\2025-07-11 GothFexa',
|
||||
'R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie',
|
||||
'R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt',
|
||||
'R:\Creative\artsy\maya\2025-08-17 DIE'
|
||||
)
|
||||
foreach ($repo in $repos) {
|
||||
if (-not (Test-Path (Join-Path $repo '.git'))) { continue }
|
||||
$subject = git -C $repo log -1 --pretty=%s
|
||||
Write-Host "${repo}`n HEAD: $subject"
|
||||
}
|
||||
</summary>
|
||||
|
||||
```bash
|
||||
$repos = @(
|
||||
@@ -404,20 +594,26 @@ R:\Creative\artsy\maya\2025-08-17 DIE
|
||||
HEAD: prproj gzip to LFS
|
||||
|
||||
```
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Verifying .gitignore entries**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Verifying .gitignore entries**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **read_file**
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt\.gitignore</summary>
|
||||
|
||||
Read file: R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt\.gitignore
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Investigating case sensitivity in appended lines**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Investigating case sensitivity in appended lines**</details></think>
|
||||
|
||||
---
|
||||
|
||||
@@ -425,11 +621,25 @@ spawn c:\Users\Nathan\AppData\Local\Programs\cursor\resources\app\node_modules\@
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Analyzing case sensitivity in line sync**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Analyzing case sensitivity in line sync**</details></think>
|
||||
|
||||
---
|
||||
|
||||
Tool use: **run_terminal_cmd**
|
||||
<tool-use data-tool-type="shell" data-tool-name="run_terminal_cmd">
|
||||
<details><summary>Tool use: **command** • Run command: $repos = @(
|
||||
'R:\Creative\artsy\maya\2025-07-09 LolbitNSFW',
|
||||
'R:\Creative\artsy\maya\2025-07-11 GothFexa',
|
||||
'R:\Creative\artsy\maya\2025-07-29 Springtrap_Goopie',
|
||||
'R:\Creative\artsy\maya\2025-08-02 Springtrap Prince of Egypt',
|
||||
'R:\Creative\artsy\maya\2025-08-17 DIE'
|
||||
)
|
||||
foreach ($repo in $repos) {
|
||||
if (-not (Test-Path (Join-Path $repo '.git'))) { continue }
|
||||
$hash = git -C $repo rev-parse --short HEAD
|
||||
Write-Host "${repo}`n Commit: $hash"
|
||||
}
|
||||
</summary>
|
||||
|
||||
```bash
|
||||
$repos = @(
|
||||
@@ -460,10 +670,13 @@ R:\Creative\artsy\maya\2025-08-17 DIE
|
||||
Commit: a403b76
|
||||
|
||||
```
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<think><details><summary>Thought Process</summary>**Preparing final summary message**</details></think>
|
||||
<think><details><summary>Thought Process</summary>
|
||||
**Preparing final summary message**</details></think>
|
||||
|
||||
---
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
<!-- Generated by SpecStory, Markdown v2.0.0 -->
|
||||
<!-- Generated by SpecStory, Markdown v2.1.0 -->
|
||||
|
||||
<!-- cursor Session 1aae6d70-0daa-49a8-b8f1-7e9d36a76a3b (2025-11-11 01:50Z) -->
|
||||
|
||||
@@ -988,7 +988,7 @@ Reviewing the current code structure, then implementing the plan step by step.
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [-] Add get_available_ram() function with psutil support and Windows fallback
|
||||
@@ -1207,7 +1207,7 @@ Lines added: 38, lines removed: undefined
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] Add get_available_ram() function with psutil support and Windows fallback
|
||||
@@ -1411,7 +1411,7 @@ Lines added: 73, lines removed: 4
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] Add get_available_ram() function with psutil support and Windows fallback
|
||||
@@ -1472,7 +1472,7 @@ Lines added: 3, lines removed: undefined
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] Add get_available_ram() function with psutil support and Windows fallback
|
||||
@@ -1528,7 +1528,7 @@ Lines added: 4, lines removed: 2
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] Add get_available_ram() function with psutil support and Windows fallback
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<!-- Generated by SpecStory, Markdown v2.0.0 -->
|
||||
<!-- Generated by SpecStory, Markdown v2.1.0 -->
|
||||
|
||||
<!-- cursor Session 1f1a4c0e-6148-440d-a766-594e3a597307 (2025-11-12 01:02Z) -->
|
||||
|
||||
@@ -396,7 +396,7 @@ Implementing the changes step by step:
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [-] undefined
|
||||
@@ -471,7 +471,7 @@ Implementing the bin-packing algorithm in `max_workers()`:
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] undefined
|
||||
@@ -702,7 +702,7 @@ Lines added: 1, lines removed: 1
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] undefined
|
||||
@@ -770,7 +770,7 @@ Updating `zip_sequence()` to keep the dictionary at 1GB fixed, regardless of the
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] undefined
|
||||
@@ -815,7 +815,7 @@ Lines added: 5, lines removed: 5
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="todo_write">
|
||||
<tool-use data-tool-type="task" data-tool-name="todo_write">
|
||||
<details><summary>Tool use: **todo_write** • Todo List</summary>
|
||||
|
||||
- [x] undefined
|
||||
@@ -1035,7 +1035,7 @@ Checking the expand mode path in `main()`:
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "max_workers.*expand" in "zip_sequences.py" • 0 matches</summary>
|
||||
|
||||
@@ -1049,7 +1049,7 @@ _No matches found_
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "if args.mode == "expand"" in "zip_sequences.py" • 1 match</summary>
|
||||
|
||||
@@ -1102,7 +1102,7 @@ The expand mode already handles the dict return. Verifying the implementation is
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "max_workers\(" in "zip_sequences.py" • 3 matches</summary>
|
||||
|
||||
@@ -1156,7 +1156,7 @@ Fixing a syntax error:
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "worker_count, ram_limits_dict" in "zip_sequences.py" • 2 matches</summary>
|
||||
|
||||
@@ -1287,7 +1287,7 @@ I’m thinking about adding startup and progress logs to track config loading, a
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "CONFIG =" in "zip_sequences.py" • 2 matches</summary>
|
||||
|
||||
@@ -1323,7 +1323,7 @@ Output mode: content
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "def log" in "zip_sequences.py" • 1 match</summary>
|
||||
|
||||
@@ -1576,7 +1576,7 @@ Status: **completed**
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "def compute_state" in "zip_sequences.py" • 1 match</summary>
|
||||
|
||||
@@ -1694,7 +1694,7 @@ Status: **completed**
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="grep" data-tool-name="grep">
|
||||
<tool-use data-tool-type="search" data-tool-name="grep">
|
||||
<details>
|
||||
<summary>Tool use: **grep** • Grep for "Updated \{updated_count\} sequence archive" in "zip_sequences.py" • 1 match</summary>
|
||||
|
||||
@@ -1971,7 +1971,6 @@ _**Agent (model default, mode Agent)**_
|
||||
|
||||
---
|
||||
|
||||
|
||||
Logging looks good. RAM estimation is too low for very large sequences (e.g., 668GB). Updating the formula to account for large sequences:
|
||||
|
||||
|
||||
@@ -2047,7 +2046,6 @@ Lint results
|
||||
|
||||
---
|
||||
|
||||
|
||||
Logging is working. RAM estimation is too low for very large sequences (e.g., 668GB). Updating the formula to better handle large sequences:
|
||||
|
||||
|
||||
@@ -2065,7 +2063,6 @@ Logging is working. RAM estimation is too low for very large sequences (e.g., 66
|
||||
|
||||
---
|
||||
|
||||
|
||||
The bin-packing is creating bins that exceed available RAM. For a 668GB sequence, the estimate is ~47GB (11GB dict + 32GB buffer + 4GB overhead), but the bins show 70GB, suggesting the estimate is higher or the packing is incorrect. Checking the bin-packing logic:
|
||||
|
||||
|
||||
@@ -2083,7 +2080,6 @@ The bin-packing is creating bins that exceed available RAM. For a 668GB sequence
|
||||
|
||||
---
|
||||
|
||||
|
||||
For a 668GB sequence with 14,402 files, 7z needs more RAM for metadata and directory structures. Increasing the estimate for very large sequences:
|
||||
|
||||
|
||||
@@ -2151,7 +2147,6 @@ Lint results
|
||||
|
||||
---
|
||||
|
||||
|
||||
Updated RAM estimation for very large sequences (>500GB). For a 668GB sequence, the estimate is now:
|
||||
- 11GB (dictionary) + 53.4GB (8% buffer, capped at 64GB) + 8GB (overhead) = **~72.4GB**
|
||||
|
||||
@@ -2179,7 +2174,6 @@ _**Agent (model default, mode Agent)**_
|
||||
|
||||
---
|
||||
|
||||
|
||||
The script already skips `_archive` and `_CURRENT` folders. Those large sequences (668GB, 527GB) were in regular directories, so they were processed.
|
||||
|
||||
The skip logic is in `find_sequence_dirs()` and `iter_sequence_files()`:
|
||||
@@ -2200,3 +2194,380 @@ If you move those sequences into `_archive` folders, they'll be skipped automati
|
||||
|
||||
---
|
||||
|
||||
_**User (2025-11-12 18:23Z)**_
|
||||
|
||||
what happened this time?
|
||||
|
||||
PS R:\Creative\artsy\maya\2025-02 BondingArtifact\Renders> & "R:\Creative\artsy\maya\2025-02 BondingArtifact\Renders\ZipSeqArchv.bat"
|
||||
[init] Loading configuration sources...
|
||||
[init] Reading project config at R:\Creative\artsy\maya\2025-02 BondingArtifact\.config\config.json
|
||||
[init] Configuration loaded from project
|
||||
[init] zip_sequences starting up...
|
||||
[init] Working directory: R:\Creative\artsy\maya\2025-02 BondingArtifact
|
||||
[init] Mode: zip, zipper: 7z, jobs arg: auto
|
||||
[init] 7z executable: C:\ProgramData\chocolatey\bin\7z.EXE, Max7zInst: auto
|
||||
[init] Scanning sequences under \\Hydra\Hydra\Creative\artsy\maya\2025-02 BondingArtifact\Renders
|
||||
[scan] [1] Inspecting 0_GaslightRender\2024-11-23\GaslightRender_smol
|
||||
[scan] Queued 0_GaslightRender\2024-11-23\GaslightRender_smol for compression (~0.19GB) [1 total]
|
||||
[scan] [2] Inspecting 1_PonderingOrb\2021-01-10\rendertest
|
||||
[scan] Queued 1_PonderingOrb\2021-01-10\rendertest for compression (~2.33GB) [2 total]
|
||||
[scan] [3] Inspecting 1_PonderingOrb\2024-11-23\PonderingOrb
|
||||
[scan] Queued 1_PonderingOrb\2024-11-23\PonderingOrb for compression (~19.76GB) [3 total]
|
||||
[scan] [4] Inspecting 3_background\2025-01-13\background
|
||||
[scan] Queued 3_background\2025-01-13\background for compression (~16.73GB) [4 total]
|
||||
[scan] [5] Inspecting 3_background\2025-10-30\3_background_dark_4k
|
||||
[scan] Queued 3_background\2025-10-30\3_background_dark_4k for compression (~27.57GB) [5 total]
|
||||
[scan] [10] Inspecting 4_StartupScreen\2025-02-08\Shot3Redo_128
|
||||
[scan] Queued 4_StartupScreen\2025-02-08\Shot3Redo_128 for compression (~8.44GB) [10 total]
|
||||
[scan] Queued 4_StartupScreen\2025-02-14\Shot8 for compression (~0.65GB) [15 total]
|
||||
[scan] [20] Inspecting 4_StartupScreen\2025-10-24\Shot2_dark
|
||||
[scan] Queued 4_StartupScreen\2025-10-24\Shot2_dark for compression (~2.36GB) [20 total]
|
||||
[scan] Queued 4_StartupScreen\2025-11-03\Shot1_dark for compression (~0.78GB) [25 total]
|
||||
[scan] [30] Inspecting 4_StartupScreen\2025-11-07\Shot2_dark
|
||||
[scan] Queued 4_StartupScreen\2025-11-07\Shot2_dark for compression (~2.37GB) [30 total]
|
||||
[scan] Queued 5_goodbye\2025-02-23\219_goodbye_RR2_evensrenamed for compression (~0.16GB) [35 total]
|
||||
[zip] RAM: 76.7GB available (80% of total), 72.9GB for compression (95%)
|
||||
[zip] Estimated RAM per sequence: 486.6GB total across 38 sequences
|
||||
[zip] Bin-packing: 8 workers, bin sizes: ['70.0GB', '69.4GB', '65.0GB', '62.6GB', '61.9GB']...
|
||||
[zip] Final worker count: 8 (requested: None)
|
||||
[init] Preparing to compress 38 sequence(s) with 8 worker(s)
|
||||
[zip] Renders\0_GaslightRender\2024-11-23\GaslightRender_smol -> Renders\_zipped\0_GaslightRender\2024-11-23\GaslightRender_smol.7z
|
||||
[zip] Renders\1_PonderingOrb\2021-01-10\rendertest -> Renders\_zipped\1_PonderingOrb\2021-01-10\rendertest.7z
|
||||
[zip] Renders\1_PonderingOrb\2024-11-23\PonderingOrb -> Renders\_zipped\1_PonderingOrb\2024-11-23\PonderingOrb.7z
|
||||
[zip] Renders\3_background\2025-01-13\background -> Renders\_zipped\3_background\2025-01-13\background.7z
|
||||
[zip] Renders\3_background\2025-10-30\3_background_dark_4k -> Renders\_zipped\3_background\2025-10-30\3_background_dark_4k.7z
|
||||
[zip] Renders\3_background\2025-11-02\3_background_dark -> Renders\_zipped\3_background\2025-11-02\3_background_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-05\4_StartupScreen_evensrenumbered -> Renders\_zipped\4_StartupScreen\2025-02-05\4_StartupScreen_evensrenumbered.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-08\Shot1Redo_1024 -> Renders\_zipped\4_StartupScreen\2025-02-08\Shot1Redo_1024.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-08\Shot2Redo_1024 -> Renders\_zipped\4_StartupScreen\2025-02-08\Shot2Redo_1024.7z
|
||||
[zip] 1/38 0_GaslightRender\2024-11-23\GaslightRender_smol
|
||||
[zip] Renders\4_StartupScreen\2025-02-08\Shot3Redo_128 -> Renders\_zipped\4_StartupScreen\2025-02-08\Shot3Redo_128.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-09\Shot1 -> Renders\_zipped\4_StartupScreen\2025-02-09\Shot1.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-10\Shot2 -> Renders\_zipped\4_StartupScreen\2025-02-10\Shot2.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-12\Shot3 -> Renders\_zipped\4_StartupScreen\2025-02-12\Shot3.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-13\Shot6 -> Renders\_zipped\4_StartupScreen\2025-02-13\Shot6.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-14\Shot8 -> Renders\_zipped\4_StartupScreen\2025-02-14\Shot8.7z
|
||||
[zip] Renders\4_StartupScreen\2025-02-19\StartupScreen_finalfix -> Renders\_zipped\4_StartupScreen\2025-02-19\StartupScreen_finalfix.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-21\Shot4 -> Renders\_zipped\4_StartupScreen\2025-10-21\Shot4.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\4_StartupScreen_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\4_StartupScreen_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\Shot1_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\Shot2_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\Shot2_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\Shot3_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-25\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-10-25\Shot1_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-10-25\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-10-25\Shot3_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-02\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-11-02\Shot1_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-03\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-11-03\Shot1_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-04\4_StartupScreen_dark -> Renders\_zipped\4_StartupScreen\2025-11-04\4_StartupScreen_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-04\Shot2_dark -> Renders\_zipped\4_StartupScreen\2025-11-04\Shot2_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-04\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-11-04\Shot3_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-07\4_StartupScreen_dark -> Renders\_zipped\4_StartupScreen\2025-11-07\4_StartupScreen_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-07\Shot2_dark -> Renders\_zipped\4_StartupScreen\2025-11-07\Shot2_dark.7z
|
||||
[zip] Renders\4_StartupScreen\2025-11-07\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-11-07\Shot3_dark.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR1 -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR1.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR1_evensrenamed -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR1_evensrenamed.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR2 -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR2.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR2_evensrenamed -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR2_evensrenamed.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR3 -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR3.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\goodbye -> Renders\_zipped\5_goodbye\2025-02-23\goodbye.7z
|
||||
[zip] Renders\5_goodbye\2025-02-23\goodbye_test -> Renders\_zipped\5_goodbye\2025-02-23\goodbye_test.7z
|
||||
Sequence sync failed: 7z compression failed: ERROR: Can't allocate required memory!
|
||||
stdout: 7-Zip 25.01 (x64) : Copyright (c) 1999-2025 Igor Pavlov : 2025-08-03
|
||||
|
||||
Scanning the drive:
|
||||
901 files, 29607407902 bytes (28 GiB)
|
||||
|
||||
Creating archive: \\Hydra\Hydra\Creative\artsy\maya\2025-02 BondingArtifact\Renders\_zipped\3_background\2025-10-30\tmp0dcysds4.7z
|
||||
|
||||
Add new data to archive: 901 files, 29607407902 bytes (28 GiB)
|
||||
Traceback (most recent call last):
|
||||
File "R:\Creative\artsy\maya\0 ProjectStructure\zip_sequences.py", line 1000, in <module>
|
||||
raise SystemExit(main())
|
||||
~~~~^^
|
||||
File "R:\Creative\artsy\maya\0 ProjectStructure\zip_sequences.py", line 994, in main
|
||||
updated = run_zip(args.jobs, verbose=args.verbose)
|
||||
File "R:\Creative\artsy\maya\0 ProjectStructure\zip_sequences.py", line 866, in run_zip
|
||||
updated_paths.extend(future.result())
|
||||
~~~~~~~~~~~~~^^
|
||||
File "C:\Python313\Lib\concurrent\futures\_base.py", line 449, in result
|
||||
return self.__get_result()
|
||||
~~~~~~~~~~~~~~~~~^^
|
||||
File "C:\Python313\Lib\concurrent\futures\_base.py", line 401, in __get_result
|
||||
raise self._exception
|
||||
File "C:\Python313\Lib\concurrent\futures\thread.py", line 59, in run
|
||||
result = self.fn(*self.args, **self.kwargs)
|
||||
File "R:\Creative\artsy\maya\0 ProjectStructure\zip_sequences.py", line 732, in process_zip
|
||||
zip_sequence(seq_dir, zip_path, per_job_memory_limit)
|
||||
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
File "R:\Creative\artsy\maya\0 ProjectStructure\zip_sequences.py", line 627, in zip_sequence
|
||||
raise RuntimeError(f"7z compression failed: {error_msg}")
|
||||
RuntimeError: 7z compression failed: ERROR: Can't allocate required memory!
|
||||
stdout: 7-Zip 25.01 (x64) : Copyright (c) 1999-2025 Igor Pavlov : 2025-08-03
|
||||
|
||||
Scanning the drive:
|
||||
901 files, 29607407902 bytes (28 GiB)
|
||||
|
||||
Creating archive: \\Hydra\Hydra\Creative\artsy\maya\2025-02 BondingArtifact\Renders\_zipped\3_background\2025-10-30\tmp0dcysds4.7z
|
||||
|
||||
Add new data to archive: 901 files, 29607407902 bytes (28 GiB)
|
||||
. was unexpected at this time.
|
||||
|
||||
---
|
||||
|
||||
_**Agent (model default, mode Ask)**_
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
The bin-packing is creating bins that sum to ~70GB each, but with 8 workers running concurrently, total RAM usage exceeds the 72.9GB available.
|
||||
|
||||
The algorithm packs sequences into bins but doesn't account for all bins running at once. If 8 bins each use ~70GB, that's ~560GB total, far above the limit.
|
||||
|
||||
Checking the bin-packing logic:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: zip_sequences.py</summary>
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
_**User (2025-11-12 18:23Z)**_
|
||||
|
||||
did it work?
|
||||
|
||||
PS R:\Creative\artsy\maya\2025-02 BondingArtifact\Renders> & "R:\Creative\artsy\maya\2025-02 BondingArtifact\Renders\ZipSeqArchv.bat"
|
||||
|
||||
[init] Loading configuration sources...
|
||||
|
||||
[init] Reading project config at R:\Creative\artsy\maya\2025-02 BondingArtifact\.config\config.json
|
||||
|
||||
[init] Configuration loaded from project
|
||||
|
||||
[init] zip_sequences starting up...
|
||||
|
||||
[init] Working directory: R:\Creative\artsy\maya\2025-02 BondingArtifact
|
||||
|
||||
[init] Mode: zip, zipper: 7z, jobs arg: auto
|
||||
|
||||
[init] 7z executable: C:\ProgramData\chocolatey\bin\7z.EXE, Max7zInst: auto
|
||||
|
||||
[init] Scanning sequences under \\Hydra\Hydra\Creative\artsy\maya\2025-02 BondingArtifact\Renders
|
||||
|
||||
[scan] [1] Inspecting 0_GaslightRender\2024-11-23\GaslightRender_smol
|
||||
|
||||
[scan] Skipping 0_GaslightRender\2024-11-23\GaslightRender_smol (unchanged since archive)
|
||||
|
||||
[scan] [2] Inspecting 1_PonderingOrb\2021-01-10\rendertest
|
||||
|
||||
[scan] Skipping 1_PonderingOrb\2021-01-10\rendertest (unchanged since archive)
|
||||
|
||||
[scan] [3] Inspecting 1_PonderingOrb\2024-11-23\PonderingOrb
|
||||
|
||||
[scan] Queued 1_PonderingOrb\2024-11-23\PonderingOrb for compression (~19.76GB) [1 total]
|
||||
|
||||
[scan] [4] Inspecting 3_background\2025-01-13\background
|
||||
|
||||
[scan] Skipping 3_background\2025-01-13\background (unchanged since archive)
|
||||
|
||||
[scan] [5] Inspecting 3_background\2025-10-30\3_background_dark_4k
|
||||
|
||||
[scan] Queued 3_background\2025-10-30\3_background_dark_4k for compression (~27.57GB) [2 total]
|
||||
|
||||
[scan] Queued 3_background\2025-11-02\3_background_dark for compression (~7.40GB) [3 total]
|
||||
|
||||
[scan] Queued 4_StartupScreen\2025-02-05\4_StartupScreen_evensrenumbered for compression (~20.66GB) [4 total]
|
||||
|
||||
[scan] Queued 4_StartupScreen\2025-02-08\Shot1Redo_1024 for compression (~9.26GB) [5 total]
|
||||
|
||||
[scan] [10] Inspecting 4_StartupScreen\2025-02-08\Shot3Redo_128
|
||||
|
||||
[scan] Queued 4_StartupScreen\2025-02-12\Shot3 for compression (~4.04GB) [10 total]
|
||||
|
||||
[scan] Skipping 4_StartupScreen\2025-02-14\Shot8 (unchanged since archive)
|
||||
|
||||
[scan] Skipping 4_StartupScreen\2025-10-21\Shot4 (unchanged since archive)
|
||||
|
||||
[scan] [20] Inspecting 4_StartupScreen\2025-10-24\Shot2_dark
|
||||
|
||||
[scan] Queued 4_StartupScreen\2025-10-24\Shot2_dark for compression (~2.36GB) [15 total]
|
||||
|
||||
[scan] Queued 4_StartupScreen\2025-11-03\Shot1_dark for compression (~0.78GB) [20 total]
|
||||
|
||||
[scan] [30] Inspecting 4_StartupScreen\2025-11-07\Shot2_dark
|
||||
|
||||
[scan] Queued 4_StartupScreen\2025-11-07\Shot2_dark for compression (~2.37GB) [25 total]
|
||||
|
||||
[scan] Queued 5_goodbye\2025-02-23\goodbye for compression (~49.80GB) [30 total]
|
||||
|
||||
[zip] RAM: 76.7GB available (80% of total), 72.9GB for compression (95%)
|
||||
|
||||
[zip] Estimated RAM per sequence: 93.0GB total across 31 sequences
|
||||
|
||||
[zip] Using bin-packing: 2 workers needed
|
||||
|
||||
[zip] Final worker count: 2 (requested: None)
|
||||
|
||||
[init] Preparing to compress 31 sequence(s) with 2 worker(s)
|
||||
|
||||
[zip] Renders\1_PonderingOrb\2024-11-23\PonderingOrb -> Renders\_zipped\1_PonderingOrb\2024-11-23\PonderingOrb.7z
|
||||
|
||||
[zip] Renders\3_background\2025-10-30\3_background_dark_4k -> Renders\_zipped\3_background\2025-10-30\3_background_dark_4k.7z
|
||||
|
||||
[zip] Renders\3_background\2025-11-02\3_background_dark -> Renders\_zipped\3_background\2025-11-02\3_background_dark.7z
|
||||
|
||||
[zip] 1/31 1_PonderingOrb\2024-11-23\PonderingOrb
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-05\4_StartupScreen_evensrenumbered -> Renders\_zipped\4_StartupScreen\2025-02-05\4_StartupScreen_evensrenumbered.7z
|
||||
|
||||
[zip] 2/31 3_background\2025-11-02\3_background_dark
|
||||
|
||||
[zip] 3/31 3_background\2025-10-30\3_background_dark_4k
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-08\Shot1Redo_1024 -> Renders\_zipped\4_StartupScreen\2025-02-08\Shot1Redo_1024.7z
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-08\Shot2Redo_1024 -> Renders\_zipped\4_StartupScreen\2025-02-08\Shot2Redo_1024.7z
|
||||
|
||||
[zip] 4/31 4_StartupScreen\2025-02-08\Shot1Redo_1024
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-08\Shot3Redo_128 -> Renders\_zipped\4_StartupScreen\2025-02-08\Shot3Redo_128.7z
|
||||
|
||||
[zip] 5/31 4_StartupScreen\2025-02-05\4_StartupScreen_evensrenumbered
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-09\Shot1 -> Renders\_zipped\4_StartupScreen\2025-02-09\Shot1.7z
|
||||
|
||||
[zip] 6/31 4_StartupScreen\2025-02-08\Shot2Redo_1024
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-10\Shot2 -> Renders\_zipped\4_StartupScreen\2025-02-10\Shot2.7z
|
||||
|
||||
[zip] 7/31 4_StartupScreen\2025-02-09\Shot1
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-12\Shot3 -> Renders\_zipped\4_StartupScreen\2025-02-12\Shot3.7z
|
||||
|
||||
[zip] 8/31 4_StartupScreen\2025-02-08\Shot3Redo_128
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-13\Shot6 -> Renders\_zipped\4_StartupScreen\2025-02-13\Shot6.7z
|
||||
|
||||
[zip] 9/31 4_StartupScreen\2025-02-10\Shot2
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-02-19\StartupScreen_finalfix -> Renders\_zipped\4_StartupScreen\2025-02-19\StartupScreen_finalfix.7z
|
||||
|
||||
[zip] 10/31 4_StartupScreen\2025-02-12\Shot3
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\4_StartupScreen_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\4_StartupScreen_dark.7z
|
||||
|
||||
[zip] 11/31 4_StartupScreen\2025-02-13\Shot6
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\Shot1_dark.7z
|
||||
|
||||
[zip] 12/31 4_StartupScreen\2025-10-24\4_StartupScreen_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\Shot2_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\Shot2_dark.7z
|
||||
|
||||
[zip] 13/31 4_StartupScreen\2025-10-24\Shot1_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-10-24\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-10-24\Shot3_dark.7z
|
||||
|
||||
[zip] 14/31 4_StartupScreen\2025-02-19\StartupScreen_finalfix
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-10-25\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-10-25\Shot1_dark.7z
|
||||
|
||||
[zip] 15/31 4_StartupScreen\2025-10-24\Shot2_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-10-25\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-10-25\Shot3_dark.7z
|
||||
|
||||
[zip] 16/31 4_StartupScreen\2025-10-24\Shot3_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-02\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-11-02\Shot1_dark.7z
|
||||
|
||||
[zip] 17/31 4_StartupScreen\2025-10-25\Shot1_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-03\Shot1_dark -> Renders\_zipped\4_StartupScreen\2025-11-03\Shot1_dark.7z
|
||||
|
||||
[zip] 18/31 4_StartupScreen\2025-10-25\Shot3_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-04\4_StartupScreen_dark -> Renders\_zipped\4_StartupScreen\2025-11-04\4_StartupScreen_dark.7z
|
||||
|
||||
[zip] 19/31 4_StartupScreen\2025-11-03\Shot1_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-04\Shot2_dark -> Renders\_zipped\4_StartupScreen\2025-11-04\Shot2_dark.7z
|
||||
|
||||
[zip] 20/31 4_StartupScreen\2025-11-02\Shot1_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-04\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-11-04\Shot3_dark.7z
|
||||
|
||||
[zip] 21/31 4_StartupScreen\2025-11-04\Shot2_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-07\4_StartupScreen_dark -> Renders\_zipped\4_StartupScreen\2025-11-07\4_StartupScreen_dark.7z
|
||||
|
||||
[zip] 22/31 4_StartupScreen\2025-11-04\Shot3_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-07\Shot2_dark -> Renders\_zipped\4_StartupScreen\2025-11-07\Shot2_dark.7z
|
||||
|
||||
[zip] 23/31 4_StartupScreen\2025-11-04\4_StartupScreen_dark
|
||||
|
||||
[zip] Renders\4_StartupScreen\2025-11-07\Shot3_dark -> Renders\_zipped\4_StartupScreen\2025-11-07\Shot3_dark.7z
|
||||
|
||||
[zip] 24/31 4_StartupScreen\2025-11-07\Shot2_dark
|
||||
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR1 -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR1.7z
|
||||
|
||||
[zip] 25/31 4_StartupScreen\2025-11-07\Shot3_dark
|
||||
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR1_evensrenamed -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR1_evensrenamed.7z
|
||||
|
||||
[zip] 26/31 5_goodbye\2025-02-23\219_goodbye_RR1
|
||||
|
||||
[zip] Renders\5_goodbye\2025-02-23\219_goodbye_RR2_evensrenamed -> Renders\_zipped\5_goodbye\2025-02-23\219_goodbye_RR2_evensrenamed.7z
|
||||
|
||||
[zip] 27/31 4_StartupScreen\2025-11-07\4_StartupScreen_dark
|
||||
|
||||
[zip] Renders\5_goodbye\2025-02-23\goodbye -> Renders\_zipped\5_goodbye\2025-02-23\goodbye.7z
|
||||
|
||||
[zip] 28/31 5_goodbye\2025-02-23\219_goodbye_RR2_evensrenamed
|
||||
|
||||
[zip] Renders\5_goodbye\2025-02-23\goodbye_test -> Renders\_zipped\5_goodbye\2025-02-23\goodbye_test.7z
|
||||
|
||||
[zip] 29/31 5_goodbye\2025-02-23\219_goodbye_RR1_evensrenamed
|
||||
|
||||
[zip] 30/31 5_goodbye\2025-02-23\goodbye_test
|
||||
|
||||
[zip] 31/31 5_goodbye\2025-02-23\goodbye
|
||||
|
||||
[zip] Updated 31 sequence archive(s).
|
||||
|
||||
[zip] Archives updated. Stage manually with `git add Renders/_zipped`, if desired.
|
||||
|
||||
[scan] Summary: scanned 38, quick-skipped 7, state-skipped 0, empty 0, queued 31
|
||||
|
||||
. was unexpected at this time.
|
||||
|
||||
---
|
||||
|
||||
_**Agent (model default, mode Ask)**_
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
Yes, it worked.
|
||||
|
||||
The script completed successfully:
|
||||
- All 31 sequences compressed (1/31 through 31/31)
|
||||
- Bin-packing calculated 2 workers (down from 8)
|
||||
- No memory allocation errors
|
||||
- Final message: "Updated 31 sequence archive(s)."
|
||||
|
||||
The bin-packing correctly limited workers to 2 based on RAM estimates, preventing the previous memory overflow.
|
||||
|
||||
The only remaining issue is the batch file error at the end: `. was unexpected at this time.` This is a Windows batch file syntax error in `ZipSeqArchv.bat`, not a Python error. The Python script finished successfully; the batch file likely has a syntax issue in its error handling or cleanup code.
|
||||
|
||||
The compression is working correctly with the new size-aware RAM estimation and bin-packing algorithm.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,235 @@
|
||||
<!-- Generated by SpecStory, Markdown v2.1.0 -->
|
||||
|
||||
<!-- cursor Session ebd5381e-09fc-4db2-a2c9-6daab402cc8a (2025-11-17 19:23Z) -->
|
||||
|
||||
# Sort and comment gitattributes file (2025-11-17 19:23Z)
|
||||
|
||||
_**User (2025-11-17 19:20Z)**_
|
||||
|
||||
@gitattributes (1-59) let's sort this with some comments and sort each with a section. can we do that without presenting errors?
|
||||
|
||||
---
|
||||
|
||||
_**Agent (model default, mode Agent)**_
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Organizing the gitattributes file into sections with comments and removing duplicates. Checking for duplicates first:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: components/gitattributes</summary>
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Organizing into sections with comments, removing duplicates, and sorting each section alphabetically:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="write" data-tool-name="write">
|
||||
|
||||
<details><summary>Tool use: **code_edit** • Edit file: components/gitattributes</summary>
|
||||
|
||||
**Chunk 1**
|
||||
Lines added: 63, lines removed: 42
|
||||
|
||||
```diff
|
||||
@@ -1,59 +1,80 @@
|
||||
+ # Git LFS attributes configuration
|
||||
+ # All listed file types will be tracked by Git LFS
|
||||
+
|
||||
+ # Video files
|
||||
+ *.avi filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.mkv filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.mov filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.MOV filter=lfs diff=lfs merge=lfs -text
|
||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.png filter=lfs diff=lfs merge=lfs -text
|
||||
- *.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Image files
|
||||
+ *.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
*.exr filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.gif filter=lfs diff=lfs merge=lfs -text
|
||||
*.hdr filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.jpeg filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.png filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.psd filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.tga filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.tif filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.tiff filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # 3D/CG files
|
||||
+ *.3ds filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.abc filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
- *.7z filter=lfs diff=lfs merge=lfs -text
|
||||
- *.abc filter=lfs diff=lfs merge=lfs -text
|
||||
- *.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
- *.mkv filter=lfs diff=lfs merge=lfs -text
|
||||
- *.obj filter=lfs diff=lfs merge=lfs -text
|
||||
- *.max filter=lfs diff=lfs merge=lfs -text
|
||||
- *.ma filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.blend1 filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.blend2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.bvh filter=lfs diff=lfs merge=lfs -text
|
||||
- *.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.tar filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.bvh.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.c4d filter=lfs diff=lfs merge=lfs -text
|
||||
- *.mov filter=lfs diff=lfs merge=lfs -text
|
||||
- *.blend1 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.3ds filter=lfs diff=lfs merge=lfs -text
|
||||
- *.hdf5 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.psd filter=lfs diff=lfs merge=lfs -text
|
||||
- *.zip filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.dae filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbxkey filter=lfs diff=lfs merge=lfs -text
|
||||
- *.blend2 filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.ma filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.max filter=lfs diff=lfs merge=lfs -text
|
||||
*.mb filter=lfs diff=lfs merge=lfs -text
|
||||
- *.ma filter=lfs diff=lfs merge=lfs -text
|
||||
- *.tiff filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.obj filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.usd filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.vdb filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Audio files
|
||||
+ *.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.wav filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Archive/Compression files
|
||||
+ *.7z filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.gz filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.rar filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.tar filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.zip filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Documents
|
||||
*.ai filter=lfs diff=lfs merge=lfs -text
|
||||
- *.gz filter=lfs diff=lfs merge=lfs -text
|
||||
- *.tga filter=lfs diff=lfs merge=lfs -text
|
||||
- *.tif filter=lfs diff=lfs merge=lfs -text
|
||||
- *.jpeg filter=lfs diff=lfs merge=lfs -text
|
||||
- *.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.docx filter=lfs diff=lfs merge=lfs -text
|
||||
*.eps filter=lfs diff=lfs merge=lfs -text
|
||||
- *.rar filter=lfs diff=lfs merge=lfs -text
|
||||
- *.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.avi filter=lfs diff=lfs merge=lfs -text
|
||||
- *.bvh.gz filter=lfs diff=lfs merge=lfs -text
|
||||
- *.dae filter=lfs diff=lfs merge=lfs -text
|
||||
- *.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
- *.vdb filter=lfs diff=lfs merge=lfs -text
|
||||
- *.aep filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Adobe files
|
||||
*.aegraphic filter=lfs diff=lfs merge=lfs -text
|
||||
- *.prproj filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.aep filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.prel filter=lfs diff=lfs merge=lfs -text
|
||||
*.prin filter=lfs diff=lfs merge=lfs -text
|
||||
- *.prel filter=lfs diff=lfs merge=lfs -text
|
||||
*.prmf filter=lfs diff=lfs merge=lfs -text
|
||||
- *.wav filter=lfs diff=lfs merge=lfs -text
|
||||
- *.docx filter=lfs diff=lfs merge=lfs -text
|
||||
- *.MOV filter=lfs diff=lfs merge=lfs -text
|
||||
- *.gif filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.prproj filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Substance files
|
||||
*.sbs filter=lfs diff=lfs merge=lfs -text
|
||||
*.sbsar filter=lfs diff=lfs merge=lfs -text
|
||||
*.spp filter=lfs diff=lfs merge=lfs -text
|
||||
- *.usd filter=lfs diff=lfs merge=lfs -text
|
||||
- *.uni filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Data files
|
||||
+ *.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
+ *.hdf5 filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
+ # Other
|
||||
+ *.uni filter=lfs diff=lfs merge=lfs -text
|
||||
+
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Checking for linting errors:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="read_lints">
|
||||
<details>
|
||||
<summary>Tool use: **read_lints** • Read lints for 1 file</summary>
|
||||
|
||||
Lint paths:
|
||||
|
||||
- `components/gitattributes`
|
||||
|
||||
Lint results
|
||||
|
||||
|
||||
**No lint errors found**
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Reorganized the gitattributes file:
|
||||
|
||||
- **Organized into sections** with comments:
|
||||
- Video files
|
||||
- Image files
|
||||
- 3D/CG files
|
||||
- Audio files
|
||||
- Archive/Compression files
|
||||
- Documents
|
||||
- Adobe files
|
||||
- Substance files
|
||||
- Data files
|
||||
- Other
|
||||
|
||||
- **Sorted each section** alphabetically
|
||||
- **Removed duplicates**: `*.ma` (was on lines 13 and 28) and `*.mp3` (was on lines 42 and 43)
|
||||
- **No errors**: syntax is valid and linting passes
|
||||
|
||||
The file is now organized and easier to maintain.
|
||||
|
||||
---
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,197 @@
|
||||
<!-- Generated by SpecStory, Markdown v2.1.0 -->
|
||||
|
||||
<!-- cursor Session 92e6d22f-d2e8-4786-8d47-b22f9893e990 (2025-11-26 20:08Z) -->
|
||||
|
||||
# Configure ConfigLoader for zipseq and unzipseq (2025-11-26 20:08Z)
|
||||
|
||||
_**User (2025-11-26 19:57Z)**_
|
||||
|
||||
@ConfigLoader.ps1 ConfigLoader should push zipseq and unzipseq to \Renders.
|
||||
|
||||
---
|
||||
|
||||
_**Agent (model default, mode Agent)**_
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Checking for `zipseq` and `unzipseq` files and the `\Renders` directory structure.
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="glob_file_search">
|
||||
<details>
|
||||
<summary>Tool use: **glob_file_search** • Searched codebase "*zipseq*" • **2** results in **1** directory</summary>
|
||||
|
||||
Directory: **a:\1 Amazon_Active_Projects\3 ProjectStructure** (2 files)
|
||||
|
||||
| File |
|
||||
|------|
|
||||
| `ZipSeqArchv.bat` |
|
||||
| `UnzipSeqArchv.bat` |
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="glob_file_search">
|
||||
<details>
|
||||
<summary>Tool use: **glob_file_search** • Searched codebase "*unzipseq*" • **1** result in **1** directory</summary>
|
||||
|
||||
Directory: **a:\1 Amazon_Active_Projects\3 ProjectStructure** (1 file)
|
||||
|
||||
| File |
|
||||
|------|
|
||||
| `UnzipSeqArchv.bat` |
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="search" data-tool-name="codebase_search">
|
||||
<details>
|
||||
<summary>Tool use: **codebase_search** • Searched codebase "Renders directory structure or path" • **14** results</summary>
|
||||
|
||||
| File | Lines |
|
||||
|------|-------|
|
||||
| `NewProject.bat` | L58-83 |
|
||||
| `NewProject.bat` | L63 |
|
||||
| `UpgradeToGitProj.bat` | L59 |
|
||||
| `UpgradeToGitProj.bat` | L53-126 |
|
||||
| `components/gitignore` | L123 |
|
||||
| `zip_sequences.py` | L565-585 |
|
||||
| `UpgradeToGitProj.bat` | L121-166 |
|
||||
| `zip_sequences.py` | L102 |
|
||||
| `UpgradeToGitProj.bat` | L160-218 |
|
||||
| `ConfigLoader.ps1` | L59 |
|
||||
| `GetStructDir.ps1` | L27-68 |
|
||||
| `UpgradeToGitProj.bat` | L215-295 |
|
||||
| `ZipSeqArchv.bat` | L44 |
|
||||
| `UnzipSeqArchv.bat` | L42 |
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Adding logic to deploy `ZipSeqArchv.bat` and `UnzipSeqArchv.bat` to the project root's `\Renders` directory. Checking the current deployment logic:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="read" data-tool-name="read_file">
|
||||
<details><summary>Tool use: **read_file** • Read file: ConfigLoader.ps1</summary>
|
||||
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Adding logic to deploy `ZipSeqArchv.bat` and `UnzipSeqArchv.bat` to the project root's `\Renders` directory:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="write" data-tool-name="search_replace">
|
||||
|
||||
<details><summary>Tool use: **code_edit** • Edit file: ConfigLoader.ps1</summary>
|
||||
|
||||
**Chunk 1**
|
||||
Lines added: 24, lines removed: undefined
|
||||
|
||||
```diff
|
||||
@@ -317,4 +317,28 @@
|
||||
|
||||
Write-Host "All batch files refreshed successfully." -ForegroundColor Green
|
||||
+
|
||||
+ # Deploy ZipSeqArchv.bat and UnzipSeqArchv.bat to \Renders
|
||||
+ Write-Host "`n=== Deploying ZipSeqArchv.bat and UnzipSeqArchv.bat to \Renders ===" -ForegroundColor Magenta
|
||||
+ $rendersDir = Join-Path -Path $resolvedProject -ChildPath 'Renders'
|
||||
+ if (-not (Test-Path -LiteralPath $rendersDir -PathType Container)) {
|
||||
+ New-Item -Path $rendersDir -ItemType Directory -Force | Out-Null
|
||||
+ Write-Host "Created Renders directory: $rendersDir" -ForegroundColor Cyan
|
||||
+ }
|
||||
+ $zipFiles = @(
|
||||
+ @{ Name = 'ZipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'ZipSeqArchv.bat' },
|
||||
+ @{ Name = 'UnzipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'UnzipSeqArchv.bat' }
|
||||
+ )
|
||||
+ foreach ($zipFile in $zipFiles) {
|
||||
+ $targetPath = Join-Path -Path $rendersDir -ChildPath $zipFile.Name
|
||||
+ try {
|
||||
+ Copy-Item -Path $zipFile.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
|
||||
+ }
|
||||
+ }
|
||||
|
||||
# Deploy .gitattributes and .gitignore to project root if they don't exist
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Checking for linting errors:
|
||||
|
||||
|
||||
---
|
||||
|
||||
<tool-use data-tool-type="generic" data-tool-name="read_lints">
|
||||
<details>
|
||||
<summary>Tool use: **read_lints** • Read lints for 1 file</summary>
|
||||
|
||||
Lint paths:
|
||||
|
||||
- `ConfigLoader.ps1`
|
||||
|
||||
Lint results
|
||||
|
||||
|
||||
**No lint errors found**
|
||||
</details>
|
||||
</tool-use>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
Updated `ConfigLoader.ps1` to deploy `ZipSeqArchv.bat` and `UnzipSeqArchv.bat` to the project root's `\Renders` directory.
|
||||
|
||||
The changes:
|
||||
1. **Creates the `Renders` directory** if it doesn't exist
|
||||
2. **Deploys both batch files** to `\Renders` in the project root
|
||||
3. **Provides status messages** for each deployment
|
||||
|
||||
This follows the same pattern as the git files deployment and runs after the recursive batch file updates and before the git files deployment. The files are copied to `\Renders` even if they already exist elsewhere in the project.
|
||||
|
||||
---
|
||||
|
||||
@@ -317,6 +317,30 @@ if ($MyInvocation.InvocationName -ne '.') {
|
||||
|
||||
Write-Host "All batch files refreshed successfully." -ForegroundColor Green
|
||||
|
||||
# Deploy ZipSeqArchv.bat and UnzipSeqArchv.bat to \Renders
|
||||
Write-Host "`n=== Deploying ZipSeqArchv.bat and UnzipSeqArchv.bat to \Renders ===" -ForegroundColor Magenta
|
||||
$rendersDir = Join-Path -Path $resolvedProject -ChildPath 'Renders'
|
||||
if (-not (Test-Path -LiteralPath $rendersDir -PathType Container)) {
|
||||
New-Item -Path $rendersDir -ItemType Directory -Force | Out-Null
|
||||
Write-Host "Created Renders directory: $rendersDir" -ForegroundColor Cyan
|
||||
}
|
||||
$zipFiles = @(
|
||||
@{ Name = 'ZipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'ZipSeqArchv.bat' },
|
||||
@{ Name = 'UnzipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'UnzipSeqArchv.bat' }
|
||||
)
|
||||
foreach ($zipFile in $zipFiles) {
|
||||
$targetPath = Join-Path -Path $rendersDir -ChildPath $zipFile.Name
|
||||
try {
|
||||
Copy-Item -Path $zipFile.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
|
||||
}
|
||||
}
|
||||
|
||||
# Deploy .gitattributes and .gitignore to project root if they don't exist
|
||||
Write-Host "`n=== Deploying .gitattributes and .gitignore to project root ===" -ForegroundColor Magenta
|
||||
$gitFiles = @(
|
||||
|
||||
@@ -21,7 +21,7 @@ if not exist "%GET_STRUCT_DIR%" (
|
||||
)
|
||||
|
||||
for /f "usebackq delims=" %%I in (`powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
||||
"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"
|
||||
"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.
|
||||
@@ -33,10 +33,12 @@ pushd "%PROJ_ROOT%" >nul 2>&1
|
||||
python "%PY_SCRIPT%" --verbose %*
|
||||
set "ERR=!ERRORLEVEL!"
|
||||
|
||||
if not "!ERR!"=="0" (
|
||||
echo Failed to update render sequence archives (exit code !ERR!).
|
||||
popd >nul 2>&1
|
||||
|
||||
if !ERR! NEQ 0 (
|
||||
echo Failed to update render sequence archives ^(exit code !ERR!^).
|
||||
exit /b !ERR!
|
||||
)
|
||||
|
||||
popd >nul 2>&1
|
||||
exit /b !ERR!
|
||||
exit /b 0
|
||||
|
||||
|
||||
@@ -1,56 +1,96 @@
|
||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.exr filter=lfs diff=lfs merge=lfs -text
|
||||
*.hdr filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.abc filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
# Git LFS attributes configuration
|
||||
# All listed file types will be tracked by Git LFS
|
||||
|
||||
# Video files
|
||||
*.avi filter=lfs diff=lfs merge=lfs -text
|
||||
*.mkv filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.max filter=lfs diff=lfs merge=lfs -text
|
||||
*.ma filter=lfs diff=lfs merge=lfs -text
|
||||
*.bvh filter=lfs diff=lfs merge=lfs -text
|
||||
*.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||
*.c4d filter=lfs diff=lfs merge=lfs -text
|
||||
*.mov filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend1 filter=lfs diff=lfs merge=lfs -text
|
||||
*.3ds filter=lfs diff=lfs merge=lfs -text
|
||||
*.hdf5 filter=lfs diff=lfs merge=lfs -text
|
||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbxkey filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.mb filter=lfs diff=lfs merge=lfs -text
|
||||
*.ma filter=lfs diff=lfs merge=lfs -text
|
||||
*.tiff filter=lfs diff=lfs merge=lfs -text
|
||||
*.ai filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.MOV filter=lfs diff=lfs merge=lfs -text
|
||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||
*.webm filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Image files
|
||||
*.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
*.exr filter=lfs diff=lfs merge=lfs -text
|
||||
*.gif filter=lfs diff=lfs merge=lfs -text
|
||||
*.hdr filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpeg filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.tga filter=lfs diff=lfs merge=lfs -text
|
||||
*.tif filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpeg filter=lfs diff=lfs merge=lfs -text
|
||||
*.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
*.eps filter=lfs diff=lfs merge=lfs -text
|
||||
*.rar filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.avi filter=lfs diff=lfs merge=lfs -text
|
||||
*.tiff filter=lfs diff=lfs merge=lfs -text
|
||||
*.webp filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# 3D/CG files
|
||||
*.3ds filter=lfs diff=lfs merge=lfs -text
|
||||
*.abc filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend1 filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.bvh filter=lfs diff=lfs merge=lfs -text
|
||||
*.bvh.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.c4d filter=lfs diff=lfs merge=lfs -text
|
||||
*.dae filter=lfs diff=lfs merge=lfs -text
|
||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbxkey filter=lfs diff=lfs merge=lfs -text
|
||||
*.ma filter=lfs diff=lfs merge=lfs -text
|
||||
*.max filter=lfs diff=lfs merge=lfs -text
|
||||
*.mb filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.usd filter=lfs diff=lfs merge=lfs -text
|
||||
*.vdb filter=lfs diff=lfs merge=lfs -text
|
||||
*.aep filter=lfs diff=lfs merge=lfs -text
|
||||
*.aegraphic filter=lfs diff=lfs merge=lfs -text
|
||||
*.prproj filter=lfs diff=lfs merge=lfs -text
|
||||
*.prin filter=lfs diff=lfs merge=lfs -text
|
||||
*.prel filter=lfs diff=lfs merge=lfs -text
|
||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
||||
*.docx filter=lfs diff=lfs merge=lfs -text
|
||||
*.MOV filter=lfs diff=lfs merge=lfs -text
|
||||
*.gif filter=lfs diff=lfs merge=lfs -text
|
||||
*.bphys filter=lfs diff=lfs merge=lfs -text
|
||||
*.bobj filter=lfs diff=lfs merge=lfs -text
|
||||
*.bvel filter=lfs diff=lfs merge=lfs -text
|
||||
*.bpointcache filter=lfs diff=lfs merge=lfs -text
|
||||
*.blob filter=lfs diff=lfs merge=lfs -text
|
||||
*.unitypackage filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Flip Fluids cache files
|
||||
*.data filter=lfs diff=lfs merge=lfs -text
|
||||
*.sqlite3 filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Substance files
|
||||
*.sbs filter=lfs diff=lfs merge=lfs -text
|
||||
*.sbsar filter=lfs diff=lfs merge=lfs -text
|
||||
*.spp filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Audio files
|
||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Archive/Compression files
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.rar filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Documents
|
||||
*.docx filter=lfs diff=lfs merge=lfs -text
|
||||
*.xlsx filter=lfs diff=lfs merge=lfs -text
|
||||
*.eps filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Adobe files
|
||||
*.aegraphic filter=lfs diff=lfs merge=lfs -text
|
||||
*.aep filter=lfs diff=lfs merge=lfs -text
|
||||
*.prel filter=lfs diff=lfs merge=lfs -text
|
||||
*.prin filter=lfs diff=lfs merge=lfs -text
|
||||
*.prmf filter=lfs diff=lfs merge=lfs -text
|
||||
*.prproj filter=lfs diff=lfs merge=lfs -text
|
||||
*.ai filter=lfs diff=lfs merge=lfs -text
|
||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Data files
|
||||
*.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
*.hdf5 filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Other
|
||||
*.uni filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdn filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Python files
|
||||
*.npz filter=lfs diff=lfs merge=lfs -text
|
||||
@@ -41,13 +41,6 @@
|
||||
*.tmp
|
||||
*.temp
|
||||
|
||||
# Blender internal cache files
|
||||
*.bpy
|
||||
*.bmesh
|
||||
*.bvh
|
||||
*.bobj
|
||||
*.bphys
|
||||
|
||||
# OS generated files
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
@@ -119,6 +112,7 @@ Renders/**
|
||||
!Renders/**/
|
||||
!Renders/**/*.bat
|
||||
!Renders/**/*.log
|
||||
seq/
|
||||
|
||||
# Premiere
|
||||
*.prlock
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"dailyFormat": "YYYY-MM-DD",
|
||||
"structDir": "R:\\Creative\\artsy\\maya\\0 ProjectStructure",
|
||||
"dailyFormat": "daily_YYMMDD",
|
||||
"structDir": "A:\\1 Amazon_Active_Projects\\3 ProjectStructure",
|
||||
"zipper": "7z",
|
||||
"compression": 9,
|
||||
"compression": 0,
|
||||
"Max7zInst": 0
|
||||
}
|
||||
|
||||
|
||||
303
zip_sequences.py
303
zip_sequences.py
@@ -18,6 +18,7 @@ import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import traceback
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
from pathlib import Path
|
||||
from typing import Iterator, Sequence
|
||||
@@ -53,6 +54,7 @@ STATE_SUFFIX = ".meta.json"
|
||||
DEFAULT_CONFIG = {
|
||||
"zipper": "7z",
|
||||
"compression": 9,
|
||||
"compressionMethod": "LZMA2", # Compression method: LZMA2 (multi-threaded), PPMd (single-threaded), BZip2, Deflate
|
||||
"dailyFormat": "daily_YYMMDD",
|
||||
"Max7zInst": 0, # Maximum concurrent 7z instances (0 = auto-calculate)
|
||||
}
|
||||
@@ -119,6 +121,12 @@ if not isinstance(COMPRESSION_LEVEL, int):
|
||||
COMPRESSION_LEVEL = 9
|
||||
COMPRESSION_LEVEL = max(0, min(9, COMPRESSION_LEVEL))
|
||||
|
||||
COMPRESSION_METHOD = CONFIG.get("compressionMethod", "LZMA2")
|
||||
# Validate compression method
|
||||
valid_methods = {"LZMA2", "PPMd", "BZip2", "Deflate"}
|
||||
if COMPRESSION_METHOD not in valid_methods:
|
||||
COMPRESSION_METHOD = "LZMA2" # Default to LZMA2 for multi-threading support
|
||||
|
||||
MAX_7Z_INSTANCES = CONFIG.get("Max7zInst", 0)
|
||||
if MAX_7Z_INSTANCES is not None:
|
||||
if isinstance(MAX_7Z_INSTANCES, str):
|
||||
@@ -210,31 +218,17 @@ def estimate_ram_per_job(seq_dir: Path, seq_state: dict) -> int:
|
||||
|
||||
if ZIPPER_TYPE == "7z":
|
||||
# Fixed dictionary size: 1GB (1024MB)
|
||||
FIXED_DICT_SIZE_MB = 1024
|
||||
FIXED_DICT_SIZE_BYTES = FIXED_DICT_SIZE_MB * 1024 * 1024
|
||||
# Actual observed usage: ~2GB per process regardless of sequence size
|
||||
# Use a tight estimate to allow maximum concurrency
|
||||
# Estimate 3GB per job (50% safety margin over observed ~2GB)
|
||||
base_ram = 3 * 1024 * 1024 * 1024 # 3GB base estimate
|
||||
|
||||
# Dictionary RAM: ~11x dictionary size (1GB dict = 11GB RAM for dictionary operations)
|
||||
# This is the main memory consumer for 7z LZMA compression
|
||||
dict_ram = FIXED_DICT_SIZE_BYTES * 11 # 11GB for 1GB dictionary
|
||||
|
||||
# Input buffer: 7z processes in chunks, but for very large sequences needs more RAM
|
||||
# For sequences >100GB, use a larger buffer factor to handle file metadata and processing
|
||||
if total_bytes > 500 * 1024 * 1024 * 1024: # >500GB (extremely large)
|
||||
# Extremely large sequences: use 8% of size, capped at 64GB
|
||||
# This accounts for file metadata, directory structures, and processing overhead
|
||||
input_buffer = min(int(total_bytes * 0.08), 64 * 1024 * 1024 * 1024)
|
||||
overhead = 8 * 1024 * 1024 * 1024 # 8GB overhead for extremely large sequences
|
||||
elif total_bytes > 100 * 1024 * 1024 * 1024: # >100GB
|
||||
# Very large sequences: use 5% of size, capped at 32GB
|
||||
input_buffer = min(int(total_bytes * 0.05), 32 * 1024 * 1024 * 1024)
|
||||
overhead = 4 * 1024 * 1024 * 1024 # 4GB for large sequences
|
||||
# For very large sequences (>50GB), add small buffer
|
||||
if total_bytes > 50 * 1024 * 1024 * 1024: # >50GB
|
||||
# Add 1GB for very large sequences
|
||||
estimated_ram = base_ram + (1 * 1024 * 1024 * 1024)
|
||||
else:
|
||||
# Smaller sequences: use 15% of size, capped at 2GB
|
||||
input_buffer = min(int(total_bytes * 0.15), 2 * 1024 * 1024 * 1024)
|
||||
overhead = 1 * 1024 * 1024 * 1024 # 1GB for smaller sequences
|
||||
|
||||
# Total RAM estimate
|
||||
estimated_ram = dict_ram + input_buffer + overhead
|
||||
estimated_ram = base_ram
|
||||
|
||||
return estimated_ram
|
||||
else:
|
||||
@@ -312,13 +306,13 @@ def max_workers(
|
||||
return (final_limit, ram_limits_dict)
|
||||
|
||||
# Auto-calculate based on RAM if Max7zInst not configured
|
||||
# Use bin-packing algorithm with size-aware RAM estimation
|
||||
# Prioritize maximum concurrency: one worker per sequence when possible
|
||||
if available_ram is not None:
|
||||
# available_ram is already 80% of total (20% reserved for system)
|
||||
# Use 95% of available RAM for compression jobs
|
||||
compression_ram = int(available_ram * 0.95)
|
||||
|
||||
# Estimate RAM for each work item and create list with (seq_dir, estimated_ram, work_item)
|
||||
# Estimate RAM for each work item
|
||||
work_items_with_ram: list[tuple[Path, int, tuple[Path, Path, Path, dict]]] = []
|
||||
ram_limits_dict: dict[Path, int] = {}
|
||||
|
||||
@@ -328,38 +322,47 @@ def max_workers(
|
||||
work_items_with_ram.append((seq_dir, estimated_ram, (seq_dir, zip_path, state_path, seq_state)))
|
||||
ram_limits_dict[seq_dir] = estimated_ram
|
||||
except Exception:
|
||||
# If estimation fails, use a safe default (12GB minimum for 1GB dict)
|
||||
default_ram = 12 * 1024 * 1024 * 1024 # 12GB
|
||||
# If estimation fails, use a safe default (3GB)
|
||||
default_ram = 3 * 1024 * 1024 * 1024 # 3GB
|
||||
work_items_with_ram.append((seq_dir, default_ram, (seq_dir, zip_path, state_path, seq_state)))
|
||||
ram_limits_dict[seq_dir] = default_ram
|
||||
|
||||
# Sort by estimated RAM (largest first) for bin-packing
|
||||
work_items_with_ram.sort(key=lambda x: x[1], reverse=True)
|
||||
num_work_items = len(work_items) if work_items else 0
|
||||
|
||||
# Bin-packing algorithm: pack largest items first
|
||||
bins: list[list[tuple[Path, int, tuple[Path, Path, Path, dict]]]] = []
|
||||
bin_remaining: list[int] = []
|
||||
# Calculate total estimated RAM
|
||||
total_estimated_ram = sum(ram for _, ram, _ in work_items_with_ram)
|
||||
|
||||
for seq_dir, estimated_ram, work_item in work_items_with_ram:
|
||||
# Try to fit in existing bin
|
||||
placed = False
|
||||
for i, remaining in enumerate(bin_remaining):
|
||||
if remaining >= estimated_ram:
|
||||
bins[i].append((seq_dir, estimated_ram, work_item))
|
||||
bin_remaining[i] -= estimated_ram
|
||||
placed = True
|
||||
break
|
||||
# If all sequences fit in available RAM, use one worker per sequence (maximum concurrency)
|
||||
if total_estimated_ram <= compression_ram:
|
||||
worker_count = num_work_items
|
||||
else:
|
||||
# Not all fit - use bin-packing to minimize workers
|
||||
# Sort by estimated RAM (largest first) for bin-packing
|
||||
work_items_with_ram.sort(key=lambda x: x[1], reverse=True)
|
||||
|
||||
# If doesn't fit, create new bin
|
||||
if not placed:
|
||||
bins.append([(seq_dir, estimated_ram, work_item)])
|
||||
bin_remaining.append(compression_ram - estimated_ram)
|
||||
# Bin-packing algorithm: pack largest items first
|
||||
bins: list[list[tuple[Path, int, tuple[Path, Path, Path, dict]]]] = []
|
||||
bin_remaining: list[int] = []
|
||||
|
||||
# Worker count is number of bins
|
||||
worker_count = len(bins)
|
||||
for seq_dir, estimated_ram, work_item in work_items_with_ram:
|
||||
# Try to fit in existing bin
|
||||
placed = False
|
||||
for i, remaining in enumerate(bin_remaining):
|
||||
if remaining >= estimated_ram:
|
||||
bins[i].append((seq_dir, estimated_ram, work_item))
|
||||
bin_remaining[i] -= estimated_ram
|
||||
placed = True
|
||||
break
|
||||
|
||||
# If doesn't fit, create new bin
|
||||
if not placed:
|
||||
bins.append([(seq_dir, estimated_ram, work_item)])
|
||||
bin_remaining.append(compression_ram - estimated_ram)
|
||||
|
||||
# Worker count is number of bins
|
||||
worker_count = len(bins)
|
||||
|
||||
# Cap at number of actual work items (can't have more workers than jobs)
|
||||
num_work_items = len(work_items) if work_items else 0
|
||||
if num_work_items > 0:
|
||||
worker_count = min(worker_count, num_work_items)
|
||||
|
||||
@@ -370,7 +373,7 @@ def max_workers(
|
||||
if verbose:
|
||||
ram_gb = available_ram / (1024 ** 3)
|
||||
compression_ram_gb = compression_ram / (1024 ** 3)
|
||||
total_estimated_gb = sum(ram for _, ram, _ in work_items_with_ram) / (1024 ** 3)
|
||||
total_estimated_gb = total_estimated_ram / (1024 ** 3)
|
||||
log(
|
||||
"zip",
|
||||
f"RAM: {ram_gb:.1f}GB available (80% of total), {compression_ram_gb:.1f}GB for compression (95%)",
|
||||
@@ -383,11 +386,17 @@ def max_workers(
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
if len(bins) > 0:
|
||||
bin_sizes = [sum(ram for _, ram, _ in bin_items) / (1024 ** 3) for bin_items in bins]
|
||||
if total_estimated_ram <= compression_ram:
|
||||
log(
|
||||
"zip",
|
||||
f"Bin-packing: {worker_count} workers, bin sizes: {[f'{s:.1f}GB' for s in bin_sizes[:5]]}{'...' if len(bin_sizes) > 5 else ''}",
|
||||
f"All sequences fit in RAM → using {worker_count} workers (one per sequence)",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
else:
|
||||
log(
|
||||
"zip",
|
||||
f"Using bin-packing: {worker_count} workers needed",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
@@ -467,15 +476,42 @@ def is_archive_path(path: Path) -> bool:
|
||||
return any(part in ("_archive", "_CURRENT") for part in path.parts)
|
||||
|
||||
|
||||
def find_sequence_dirs(root: Path) -> Iterator[Path]:
|
||||
def find_sequence_dirs(root: Path, *, verbose: bool = False) -> Iterator[Path]:
|
||||
seen_dirs = set() # Track directories we've already yielded to avoid duplicates
|
||||
for dirpath, dirnames, filenames in os.walk(root):
|
||||
path = Path(dirpath)
|
||||
dirnames[:] = [d for d in dirnames if d not in ("_archive", "_CURRENT")]
|
||||
if is_archive_path(path):
|
||||
if verbose:
|
||||
rel = path.relative_to(root) if path.is_relative_to(root) else path
|
||||
log("scan", f"Skipping archive path: {rel}", verbose_only=True, verbose=verbose)
|
||||
continue
|
||||
|
||||
# Check if this directory has sequence files directly
|
||||
has_frames = any(Path(dirpath, f).suffix.lower() in SEQUENCE_EXTENSIONS for f in filenames)
|
||||
if has_frames:
|
||||
yield path
|
||||
path_resolved = path.resolve()
|
||||
if path_resolved not in seen_dirs:
|
||||
seen_dirs.add(path_resolved)
|
||||
yield path
|
||||
elif verbose:
|
||||
# Log directories that don't have sequence files for debugging
|
||||
rel = path.relative_to(root) if path.is_relative_to(root) else path
|
||||
if "scab" in path.name.lower():
|
||||
# Special logging for directories that might be sequences
|
||||
frame_extensions = [f for f in filenames if Path(f).suffix.lower() in SEQUENCE_EXTENSIONS]
|
||||
all_files = list(path.iterdir()) if path.exists() else []
|
||||
log("scan", f"Directory {rel}: {len(filenames)} files in dir, {len(frame_extensions)} with sequence extensions, {len(all_files)} total items", verbose_only=True, verbose=verbose)
|
||||
# Check subdirectories
|
||||
for subdir in dirnames[:5]: # Check first 5 subdirs
|
||||
subdir_path = path / subdir
|
||||
try:
|
||||
subdir_files = list(subdir_path.iterdir()) if subdir_path.exists() else []
|
||||
subdir_frame_files = [f for f in subdir_files if f.is_file() and f.suffix.lower() in SEQUENCE_EXTENSIONS]
|
||||
if subdir_frame_files:
|
||||
log("scan", f" Subdirectory {subdir} has {len(subdir_frame_files)} sequence files", verbose_only=True, verbose=verbose)
|
||||
except (OSError, PermissionError):
|
||||
pass
|
||||
|
||||
|
||||
def iter_sequence_files(seq_dir: Path) -> Iterator[Path]:
|
||||
@@ -530,19 +566,27 @@ def state_changed(seq_state: dict, stored_state: dict | None) -> bool:
|
||||
def archive_path_for(seq_dir: Path) -> Path:
|
||||
rel = seq_dir.relative_to(RENDER_ROOT)
|
||||
suffix = ".7z" if ZIPPER_TYPE == "7z" else ".zip"
|
||||
return (ARCHIVE_ROOT / rel).with_suffix(suffix)
|
||||
# Append suffix instead of replacing, since directory names might have dots (e.g., "scab_v2.1")
|
||||
return ARCHIVE_ROOT / f"{rel}{suffix}"
|
||||
|
||||
|
||||
def sequence_dir_for(zip_path: Path) -> Path:
|
||||
rel = zip_path.relative_to(ARCHIVE_ROOT)
|
||||
return (RENDER_ROOT / rel).with_suffix("")
|
||||
# Remove the archive suffix (.7z or .zip) from the end
|
||||
# Handle both .7z and .zip extensions
|
||||
rel_str = str(rel)
|
||||
if rel_str.endswith(".7z"):
|
||||
rel_str = rel_str[:-3]
|
||||
elif rel_str.endswith(".zip"):
|
||||
rel_str = rel_str[:-4]
|
||||
return RENDER_ROOT / rel_str
|
||||
|
||||
|
||||
def state_path_for(zip_path: Path) -> Path:
|
||||
return zip_path.with_suffix(zip_path.suffix + STATE_SUFFIX)
|
||||
|
||||
|
||||
def zip_sequence(seq_dir: Path, zip_path: Path, per_job_memory_limit: int | None = None) -> None:
|
||||
def zip_sequence(seq_dir: Path, zip_path: Path, per_job_memory_limit: int | None = None, worker_count: int = 1, *, verbose: bool = False) -> None:
|
||||
if ZIPPER_TYPE == "7z":
|
||||
if SEVEN_Z_EXE is None:
|
||||
raise RuntimeError(
|
||||
@@ -602,16 +646,61 @@ def zip_sequence(seq_dir: Path, zip_path: Path, per_job_memory_limit: int | None
|
||||
"-t7z", # Use 7z format, not zip
|
||||
]
|
||||
|
||||
# Always use fixed dictionary size: 1GB (1024MB)
|
||||
# The per_job_memory_limit parameter is the estimated RAM usage (for logging/info only)
|
||||
# We keep dictionary at 1GB for best compression regardless of RAM estimate
|
||||
# Set compression method and memory/dictionary size based on method
|
||||
# At compression level 0, use Copy (store) method for maximum speed
|
||||
FIXED_DICT_SIZE_MB = 1024
|
||||
cmd.append(f"-md={FIXED_DICT_SIZE_MB}m")
|
||||
if COMPRESSION_LEVEL == 0:
|
||||
# Level 0 = no compression, just store files (fastest)
|
||||
cmd.append("-m0=Copy")
|
||||
# Copy method doesn't need threading, but enable it anyway for consistency
|
||||
cmd.append("-mmt=on")
|
||||
else:
|
||||
# Compression levels 1-9: use configured compression method
|
||||
if COMPRESSION_METHOD == "PPMd":
|
||||
# PPMd: specify memory as part of method string
|
||||
cmd.append(f"-m0=PPMd:mem={FIXED_DICT_SIZE_MB}m")
|
||||
elif COMPRESSION_METHOD == "LZMA2":
|
||||
# LZMA2: use -md for dictionary size
|
||||
cmd.append("-m0=LZMA2")
|
||||
cmd.append(f"-md={FIXED_DICT_SIZE_MB}m")
|
||||
elif COMPRESSION_METHOD == "BZip2":
|
||||
# BZip2: use -md for dictionary size (smaller max: 900KB)
|
||||
max_bzip2_dict = min(FIXED_DICT_SIZE_MB, 900) # BZip2 max is 900KB
|
||||
cmd.append("-m0=BZip2")
|
||||
cmd.append(f"-md={max_bzip2_dict}k")
|
||||
elif COMPRESSION_METHOD == "Deflate":
|
||||
# Deflate: doesn't use dictionary size parameter
|
||||
cmd.append("-m0=Deflate")
|
||||
else:
|
||||
# Fallback: use LZMA2
|
||||
cmd.append("-m0=LZMA2")
|
||||
cmd.append(f"-md={FIXED_DICT_SIZE_MB}m")
|
||||
|
||||
# CPU thread allocation: when there's only 1 worker, use all CPU cores
|
||||
# When there are multiple workers, use auto mode to let 7z decide
|
||||
# Note: PPMd is single-threaded and won't benefit from -mmt
|
||||
cpu_cores = os.cpu_count() or 1
|
||||
if COMPRESSION_METHOD == "PPMd":
|
||||
# PPMd is single-threaded, so -mmt won't help
|
||||
# But we can still set it for consistency
|
||||
cmd.append("-mmt=on")
|
||||
elif worker_count == 1:
|
||||
# Single worker: use all CPU cores for maximum speed (LZMA2, BZip2, Deflate support this)
|
||||
cmd.append(f"-mmt={cpu_cores}")
|
||||
else:
|
||||
# Multiple workers: use auto mode (7z will manage threads)
|
||||
cmd.append("-mmt=on")
|
||||
|
||||
cmd.extend([
|
||||
str(temp_zip_abs),
|
||||
f"@{list_file_abs}",
|
||||
])
|
||||
|
||||
# Log the command in verbose mode for debugging
|
||||
if verbose:
|
||||
cmd_str = " ".join(cmd)
|
||||
log("zip", f"7z command: {cmd_str}", verbose_only=True, verbose=verbose)
|
||||
|
||||
result = subprocess.run(
|
||||
cmd,
|
||||
cwd=seq_dir,
|
||||
@@ -727,9 +816,9 @@ def expand_sequence(zip_path: Path, seq_state: dict) -> None:
|
||||
os.utime(file_path, ns=(entry["mtime_ns"], entry["mtime_ns"]))
|
||||
|
||||
|
||||
def process_zip(seq_dir: Path, zip_path: Path, state_path: Path, seq_state: dict, per_job_memory_limit: int | None, *, verbose: bool) -> Sequence[Path]:
|
||||
def process_zip(seq_dir: Path, zip_path: Path, state_path: Path, seq_state: dict, per_job_memory_limit: int | None, worker_count: int, *, verbose: bool) -> Sequence[Path]:
|
||||
log("zip", f"{seq_dir} -> {zip_path}", verbose_only=True, verbose=verbose)
|
||||
zip_sequence(seq_dir, zip_path, per_job_memory_limit)
|
||||
zip_sequence(seq_dir, zip_path, per_job_memory_limit, worker_count, verbose=verbose)
|
||||
state_path.write_text(json.dumps(seq_state, indent=2))
|
||||
return (zip_path, state_path)
|
||||
|
||||
@@ -749,7 +838,7 @@ def run_zip(requested_workers: int | None, *, verbose: bool) -> int:
|
||||
queued = 0
|
||||
|
||||
if RENDER_ROOT.exists():
|
||||
for seq_dir in find_sequence_dirs(RENDER_ROOT):
|
||||
for seq_dir in find_sequence_dirs(RENDER_ROOT, verbose=verbose):
|
||||
total_scanned += 1
|
||||
rel = seq_dir.relative_to(RENDER_ROOT)
|
||||
if total_scanned <= 5 or total_scanned % 10 == 0:
|
||||
@@ -842,6 +931,9 @@ def run_zip(requested_workers: int | None, *, verbose: bool) -> int:
|
||||
f"Summary: scanned {total_scanned}, quick-skipped {quick_skipped}, "
|
||||
f"state-skipped {state_skipped}, empty {empty_dirs}, queued {queued}",
|
||||
)
|
||||
removed = cleanup_orphan_archives(verbose=verbose)
|
||||
if removed:
|
||||
log("zip", f"Removed {removed} orphan archive(s).", verbose=verbose)
|
||||
return 0
|
||||
|
||||
# Calculate RAM-aware worker count based on work items
|
||||
@@ -858,7 +950,7 @@ def run_zip(requested_workers: int | None, *, verbose: bool) -> int:
|
||||
|
||||
with ThreadPoolExecutor(max_workers=worker_count) as executor:
|
||||
future_map = {
|
||||
executor.submit(process_zip, seq_dir, zip_path, state_path, seq_state, ram_limits_dict.get(seq_dir), verbose=verbose): seq_dir
|
||||
executor.submit(process_zip, seq_dir, zip_path, state_path, seq_state, ram_limits_dict.get(seq_dir), worker_count, verbose=verbose): seq_dir
|
||||
for seq_dir, zip_path, state_path, seq_state in work_items
|
||||
}
|
||||
|
||||
@@ -940,36 +1032,83 @@ def run_expand(worker_count: int, *, verbose: bool) -> int:
|
||||
|
||||
def cleanup_orphan_archives(*, verbose: bool) -> int:
|
||||
if not ARCHIVE_ROOT.exists():
|
||||
log("zip", "Archive root does not exist; nothing to clean up.", verbose_only=True, verbose=verbose)
|
||||
return 0
|
||||
|
||||
removed: list[Path] = []
|
||||
|
||||
log("zip", f"Scanning for orphan archives in {ARCHIVE_ROOT.resolve()}", verbose_only=True, verbose=verbose)
|
||||
|
||||
# Look for both .zip and .7z archives
|
||||
archive_patterns = ["*.zip", "*.7z"]
|
||||
for pattern in archive_patterns:
|
||||
for zip_path in ARCHIVE_ROOT.rglob(pattern):
|
||||
seq_dir = sequence_dir_for(zip_path)
|
||||
if seq_dir.exists():
|
||||
continue
|
||||
try:
|
||||
for zip_path in ARCHIVE_ROOT.rglob(pattern):
|
||||
try:
|
||||
# Resolve to absolute paths for consistent checking
|
||||
zip_path_abs = zip_path.resolve()
|
||||
|
||||
rel = zip_path.relative_to(ARCHIVE_ROOT)
|
||||
log("zip", f"Removing orphan archive {rel}", verbose_only=True, verbose=verbose)
|
||||
# Calculate state path BEFORE checking/removing archive
|
||||
state_path = state_path_for(zip_path)
|
||||
state_path_abs = state_path.resolve()
|
||||
|
||||
zip_path.unlink(missing_ok=True)
|
||||
state_path = state_path_for(zip_path)
|
||||
if state_path.exists():
|
||||
state_path.unlink()
|
||||
removed.append(zip_path)
|
||||
# Calculate sequence directory using sequence_dir_for
|
||||
# This function works with paths relative to ARCHIVE_ROOT
|
||||
seq_dir = sequence_dir_for(zip_path)
|
||||
seq_dir_abs = seq_dir.resolve()
|
||||
|
||||
# Check if sequence directory exists and is actually a directory
|
||||
if seq_dir_abs.exists() and seq_dir_abs.is_dir():
|
||||
log("zip", f"Archive {zip_path.relative_to(ARCHIVE_ROOT)} has matching sequence directory; keeping", verbose_only=True, verbose=verbose)
|
||||
continue
|
||||
|
||||
# Sequence directory doesn't exist - this is an orphan archive
|
||||
rel = zip_path.relative_to(ARCHIVE_ROOT)
|
||||
log("zip", f"Removing orphan archive {rel}", verbose_only=False, verbose=verbose)
|
||||
|
||||
# Remove archive file
|
||||
if zip_path_abs.exists():
|
||||
zip_path_abs.unlink()
|
||||
log("zip", f"Deleted archive: {rel}", verbose_only=True, verbose=verbose)
|
||||
|
||||
# Remove state file if it exists
|
||||
if state_path_abs.exists():
|
||||
state_path_abs.unlink()
|
||||
state_rel = state_path.relative_to(ARCHIVE_ROOT)
|
||||
log("zip", f"Removed orphan metadata {state_rel}", verbose_only=False, verbose=verbose)
|
||||
|
||||
removed.append(zip_path_abs)
|
||||
except Exception as e:
|
||||
# Log error but continue processing other archives
|
||||
try:
|
||||
rel = zip_path.relative_to(ARCHIVE_ROOT)
|
||||
except:
|
||||
rel = zip_path
|
||||
log("zip", f"Error processing archive {rel}: {e}", verbose_only=True, verbose=verbose)
|
||||
log("zip", f"Traceback: {traceback.format_exc()}", verbose_only=True, verbose=verbose)
|
||||
continue
|
||||
except Exception as e:
|
||||
log("zip", f"Error scanning for {pattern} archives: {e}", verbose_only=True, verbose=verbose)
|
||||
log("zip", f"Traceback: {traceback.format_exc()}", verbose_only=True, verbose=verbose)
|
||||
continue
|
||||
|
||||
if not removed:
|
||||
log("zip", "No orphan archives found.", verbose_only=True, verbose=verbose)
|
||||
return 0
|
||||
|
||||
for parent in sorted({p.parent for p in removed}, key=lambda p: len(p.parts), reverse=True):
|
||||
if not parent.exists():
|
||||
# Clean up empty parent directories
|
||||
archive_root_abs = ARCHIVE_ROOT.resolve()
|
||||
for parent in sorted({p.resolve().parent for p in removed}, key=lambda p: len(p.parts), reverse=True):
|
||||
parent_resolved = parent.resolve()
|
||||
if not parent_resolved.exists():
|
||||
continue
|
||||
while parent != ARCHIVE_ROOT and not any(parent.iterdir()):
|
||||
parent.rmdir()
|
||||
parent = parent.parent
|
||||
try:
|
||||
while parent_resolved != archive_root_abs and not any(parent_resolved.iterdir()):
|
||||
parent_resolved.rmdir()
|
||||
parent_resolved = parent_resolved.parent.resolve()
|
||||
except OSError:
|
||||
# Ignore errors when removing directories (might be in use)
|
||||
pass
|
||||
|
||||
return len(removed)
|
||||
|
||||
@@ -982,7 +1121,7 @@ def main() -> int:
|
||||
if ZIPPER_TYPE == "7z":
|
||||
exe = SEVEN_Z_EXE or "not found"
|
||||
max_inst = MAX_7Z_INSTANCES if MAX_7Z_INSTANCES is not None else "auto"
|
||||
log("init", f"7z executable: {exe}, Max7zInst: {max_inst}")
|
||||
log("init", f"7z executable: {exe}, Max7zInst: {max_inst}, method: {COMPRESSION_METHOD}, level: {COMPRESSION_LEVEL}")
|
||||
|
||||
if args.mode == "expand":
|
||||
# For expand mode, use simple CPU-based worker calculation
|
||||
|
||||
Reference in New Issue
Block a user