Compare commits
31 Commits
169b4f656d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 95a19dceb3 | |||
| e8f66cd06f | |||
| c5a2463b91 | |||
|
|
1c86fa0c68 | ||
|
|
b67c2e7779 | ||
|
|
e1086312dd | ||
|
|
ba46dce3a3 | ||
| 2238021885 | |||
|
|
c101fbb381 | ||
|
|
68330de0fb | ||
|
|
0cff26cb0d | ||
| 75c2c1ed02 | |||
| 584f5135dd | |||
|
|
bffbff528e | ||
| 756e8168fb | |||
|
|
fbc0f833dc | ||
|
|
06e8177f0b | ||
| 81ada88dc1 | |||
|
|
2fd5023816 | ||
|
|
6c20b2de52 | ||
| b7ae8880e7 | |||
| 0da1dbd09a | |||
| e1c1aacd0d | |||
|
|
6d4cdb0549 | ||
|
|
55a2074c62 | ||
|
|
a152d17136 | ||
| ff6d3f584f | |||
| f795ea3848 | |||
| f2e3a96bf2 | |||
| 23562de9cf | |||
| 5b409d771b |
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
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -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.
|
||||
|
||||
---
|
||||
|
||||
@@ -214,7 +214,9 @@ if ($MyInvocation.InvocationName -ne '.') {
|
||||
@{ Name = 'UpdateAllSequences.bat'; Source = Join-Path -Path $structDir -ChildPath 'UpdateAllSequences.bat' },
|
||||
@{ Name = 'ZipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'ZipSeqArchv.bat' },
|
||||
@{ Name = 'UnzipSeqArchv.bat'; Source = Join-Path -Path $structDir -ChildPath 'UnzipSeqArchv.bat' },
|
||||
@{ Name = 'NewDaily.bat'; Source = Join-Path -Path $structDir -ChildPath 'NewDaily.bat' }
|
||||
@{ Name = 'NewDaily.bat'; Source = Join-Path -Path $structDir -ChildPath 'NewDaily.bat' },
|
||||
@{ Name = '.gitattributes'; Source = Join-Path -Path $structDir -ChildPath 'components\gitattributes' },
|
||||
@{ Name = '.gitignore'; Source = Join-Path -Path $structDir -ChildPath 'components\gitignore' }
|
||||
)
|
||||
|
||||
# Config files to deploy to projectroot\.config\
|
||||
@@ -253,7 +255,7 @@ if ($MyInvocation.InvocationName -ne '.') {
|
||||
foreach ($spec in $specs) {
|
||||
Write-Host "`n=== Updating $($spec.Name) ===" -ForegroundColor Magenta
|
||||
|
||||
$targets = Get-ChildItem -LiteralPath $resolvedProject -Recurse -Filter $spec.Name -File -ErrorAction SilentlyContinue
|
||||
$targets = Get-ChildItem -LiteralPath $resolvedProject -Recurse -Filter $spec.Name -File -Force -ErrorAction SilentlyContinue
|
||||
$targets = $targets | Where-Object { $_.FullName -ne $spec.Source }
|
||||
|
||||
if (-not $targets) {
|
||||
@@ -274,6 +276,11 @@ if ($MyInvocation.InvocationName -ne '.') {
|
||||
foreach ($target in $targets) {
|
||||
try {
|
||||
Copy-Item -Path $spec.Source -Destination $target.FullName -Force
|
||||
# Set hidden attribute for .gitattributes and .gitignore files
|
||||
if ($spec.Name -eq '.gitattributes' -or $spec.Name -eq '.gitignore') {
|
||||
$file = Get-Item -LiteralPath $target.FullName -Force
|
||||
$file.Attributes = $file.Attributes -bor [System.IO.FileAttributes]::Hidden
|
||||
}
|
||||
Write-Host "[OK] $($target.FullName)" -ForegroundColor Green
|
||||
$updated++
|
||||
|
||||
@@ -310,6 +317,52 @@ 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 = @(
|
||||
@{ Name = '.gitattributes'; Source = Join-Path -Path $structDir -ChildPath 'components\gitattributes' },
|
||||
@{ Name = '.gitignore'; Source = Join-Path -Path $structDir -ChildPath 'components\gitignore' }
|
||||
)
|
||||
foreach ($gitFile in $gitFiles) {
|
||||
$targetPath = Join-Path -Path $resolvedProject -ChildPath $gitFile.Name
|
||||
try {
|
||||
Copy-Item -Path $gitFile.Source -Destination $targetPath -Force
|
||||
# Set hidden attribute on the file
|
||||
$file = Get-Item -LiteralPath $targetPath -Force
|
||||
$file.Attributes = $file.Attributes -bor [System.IO.FileAttributes]::Hidden
|
||||
Write-Host "[OK] $targetPath" -ForegroundColor Green
|
||||
}
|
||||
catch {
|
||||
Write-Host "[FAIL] $targetPath" -ForegroundColor Red
|
||||
Write-Host " $($_.Exception.Message)" -ForegroundColor DarkRed
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
|
||||
# Deploy config files to projectroot\.config\
|
||||
Write-Host "`n=== Deploying config files to .config\ ===" -ForegroundColor Magenta
|
||||
foreach ($asset in $configAssets) {
|
||||
|
||||
@@ -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,53 +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
|
||||
*.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
|
||||
*.MOV filter=lfs diff=lfs merge=lfs -text
|
||||
*.gif 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
|
||||
@@ -127,4 +121,4 @@ Adobe Premiere Pro Audio Previews/
|
||||
Adobe Premiere Pro (Beta) Video Previews/
|
||||
Adobe Premiere Pro (Beta) Audio Previews/
|
||||
|
||||
Pr/RnR/
|
||||
Pr/RnR/
|
||||
@@ -2,6 +2,7 @@
|
||||
"dailyFormat": "daily_YYMMDD",
|
||||
"structDir": "A:\\1 Amazon_Active_Projects\\3 ProjectStructure",
|
||||
"zipper": "7z",
|
||||
"compression": 9
|
||||
"compression": 0,
|
||||
"Max7zInst": 0
|
||||
}
|
||||
|
||||
|
||||
690
zip_sequences.py
690
zip_sequences.py
@@ -12,15 +12,33 @@ from __future__ import annotations
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import platform
|
||||
import shutil
|
||||
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
|
||||
|
||||
# Try to import psutil for cross-platform RAM detection
|
||||
try:
|
||||
import psutil
|
||||
HAS_PSUTIL = True
|
||||
except ImportError:
|
||||
HAS_PSUTIL = False
|
||||
# For Windows fallback
|
||||
if platform.system() == "Windows":
|
||||
try:
|
||||
import ctypes
|
||||
HAS_CTYPES = True
|
||||
except ImportError:
|
||||
HAS_CTYPES = False
|
||||
else:
|
||||
HAS_CTYPES = False
|
||||
|
||||
|
||||
RENDER_ROOT = Path("Renders")
|
||||
ARCHIVE_ROOT = RENDER_ROOT / "_zipped"
|
||||
@@ -36,10 +54,18 @@ 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)
|
||||
}
|
||||
|
||||
|
||||
def log(mode: str, message: str, *, verbose_only: bool = False, verbose: bool = False) -> None:
|
||||
if verbose_only and not verbose:
|
||||
return
|
||||
print(f"[{mode}] {message}", flush=True)
|
||||
|
||||
|
||||
def load_config() -> dict:
|
||||
# First try to load from project's .config folder (current working directory)
|
||||
# Then fall back to ProjectStructure repo config (next to zip_sequences.py)
|
||||
@@ -52,22 +78,28 @@ def load_config() -> dict:
|
||||
("repo", repo_config),
|
||||
]
|
||||
|
||||
log("init", "Loading configuration sources...")
|
||||
for source, config_path in config_paths:
|
||||
try:
|
||||
if config_path.exists():
|
||||
log("init", f"Reading {source} config at {config_path}")
|
||||
text = config_path.read_text(encoding="utf-8")
|
||||
try:
|
||||
data = json.loads(text)
|
||||
if isinstance(data, dict):
|
||||
merged = DEFAULT_CONFIG.copy()
|
||||
merged.update(data)
|
||||
log("init", f"Configuration loaded from {source}")
|
||||
return merged
|
||||
except json.JSONDecodeError:
|
||||
log("init", f"Config file at {config_path} is invalid JSON; skipping")
|
||||
continue
|
||||
except OSError:
|
||||
log("init", f"Unable to read config at {config_path}; skipping")
|
||||
continue
|
||||
|
||||
# If no config found, return defaults
|
||||
log("init", "No config files found; using default settings")
|
||||
return DEFAULT_CONFIG.copy()
|
||||
|
||||
|
||||
@@ -89,6 +121,25 @@ 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):
|
||||
try:
|
||||
MAX_7Z_INSTANCES = int(MAX_7Z_INSTANCES)
|
||||
except ValueError:
|
||||
MAX_7Z_INSTANCES = 0
|
||||
if not isinstance(MAX_7Z_INSTANCES, int) or MAX_7Z_INSTANCES < 1:
|
||||
MAX_7Z_INSTANCES = 0
|
||||
# Treat 0 as None (auto-calculate)
|
||||
if MAX_7Z_INSTANCES == 0:
|
||||
MAX_7Z_INSTANCES = None
|
||||
|
||||
SEVEN_Z_EXE: str | None = None
|
||||
if ZIPPER_TYPE == "7z":
|
||||
SEVEN_Z_EXE = shutil.which("7z") or shutil.which("7za")
|
||||
@@ -107,39 +158,366 @@ def parse_args() -> argparse.Namespace:
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def max_workers(requested: int | None) -> int:
|
||||
def get_available_ram() -> int | None:
|
||||
"""Get available RAM in bytes, reserving 20% for system.
|
||||
|
||||
Returns:
|
||||
Available RAM in bytes, or None if detection fails.
|
||||
"""
|
||||
try:
|
||||
if HAS_PSUTIL:
|
||||
# Use psutil for cross-platform RAM detection
|
||||
mem = psutil.virtual_memory()
|
||||
# Reserve 20% for system, use 80% for compression jobs
|
||||
available = int(mem.total * 0.8)
|
||||
return available
|
||||
elif HAS_CTYPES and platform.system() == "Windows":
|
||||
# Windows fallback using ctypes
|
||||
class MEMORYSTATUSEX(ctypes.Structure):
|
||||
_fields_ = [
|
||||
("dwLength", ctypes.c_ulong),
|
||||
("dwMemoryLoad", ctypes.c_ulong),
|
||||
("ullTotalPhys", ctypes.c_ulonglong),
|
||||
("ullAvailPhys", ctypes.c_ulonglong),
|
||||
("ullTotalPageFile", ctypes.c_ulonglong),
|
||||
("ullAvailPageFile", ctypes.c_ulonglong),
|
||||
("ullTotalVirtual", ctypes.c_ulonglong),
|
||||
("ullAvailVirtual", ctypes.c_ulonglong),
|
||||
("ullAvailExtendedVirtual", ctypes.c_ulonglong),
|
||||
]
|
||||
|
||||
kernel32 = ctypes.windll.kernel32
|
||||
kernel32.GlobalMemoryStatusEx.argtypes = [ctypes.POINTER(MEMORYSTATUSEX)]
|
||||
kernel32.GlobalMemoryStatusEx.restype = ctypes.c_bool
|
||||
|
||||
mem_status = MEMORYSTATUSEX()
|
||||
mem_status.dwLength = ctypes.sizeof(MEMORYSTATUSEX)
|
||||
|
||||
if kernel32.GlobalMemoryStatusEx(ctypes.byref(mem_status)):
|
||||
# Reserve 20% for system, use 80% for compression jobs
|
||||
available = int(mem_status.ullTotalPhys * 0.8)
|
||||
return available
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def estimate_ram_per_job(seq_dir: Path, seq_state: dict) -> int:
|
||||
"""Estimate RAM usage per compression job based on folder size.
|
||||
|
||||
Args:
|
||||
seq_dir: Path to the sequence directory
|
||||
seq_state: State dictionary containing file information
|
||||
|
||||
Returns:
|
||||
Estimated RAM usage in bytes
|
||||
"""
|
||||
# Calculate total folder size from seq_state
|
||||
total_bytes = sum(entry.get("size", 0) for entry in seq_state.get("files", []))
|
||||
|
||||
if ZIPPER_TYPE == "7z":
|
||||
# Fixed dictionary size: 1GB (1024MB)
|
||||
# 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
|
||||
|
||||
# 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:
|
||||
estimated_ram = base_ram
|
||||
|
||||
return estimated_ram
|
||||
else:
|
||||
# zip compression is more memory-efficient
|
||||
# Conservative estimate: 1GB per job
|
||||
return 1024 * 1024 * 1024 # 1 GB
|
||||
|
||||
|
||||
def max_workers(
|
||||
requested: int | None,
|
||||
work_items: list[tuple[Path, Path, Path, dict]] | None = None,
|
||||
*,
|
||||
verbose: bool = False
|
||||
) -> tuple[int, int | None]:
|
||||
"""Calculate maximum worker count based on CPU and RAM constraints.
|
||||
|
||||
Args:
|
||||
requested: User-requested worker count (from --jobs)
|
||||
work_items: List of work items (seq_dir, zip_path, state_path, seq_state)
|
||||
verbose: Whether to log RAM-based calculations
|
||||
|
||||
Returns:
|
||||
Tuple of (worker_count, per_job_memory_limit_bytes)
|
||||
per_job_memory_limit_bytes is None if not using 7z or RAM detection failed
|
||||
"""
|
||||
cpu = os.cpu_count() or 1
|
||||
limit = max(1, min(8, cpu))
|
||||
cpu_limit = max(1, min(8, cpu))
|
||||
if requested and requested > 0:
|
||||
return min(requested, max(1, cpu))
|
||||
return limit
|
||||
|
||||
|
||||
def log(mode: str, message: str, *, verbose_only: bool = False, verbose: bool = False) -> None:
|
||||
if verbose_only and not verbose:
|
||||
return
|
||||
print(f"[{mode}] {message}")
|
||||
cpu_limit = min(requested, max(1, cpu))
|
||||
|
||||
# If no work items provided, return CPU-based limit
|
||||
if work_items is None or len(work_items) == 0:
|
||||
return (cpu_limit, {})
|
||||
|
||||
# Try to calculate RAM-based limit
|
||||
available_ram = get_available_ram()
|
||||
|
||||
if available_ram is None:
|
||||
# RAM detection failed, fall back to CPU limit
|
||||
if verbose:
|
||||
log("zip", "RAM detection failed, using CPU-based worker limit", verbose_only=True, verbose=verbose)
|
||||
return (cpu_limit, {})
|
||||
|
||||
# For 7z: use fixed dictionary size and calculate workers
|
||||
if ZIPPER_TYPE == "7z":
|
||||
# Fixed dictionary size: 1GB (1024MB)
|
||||
FIXED_DICT_SIZE_MB = 1024
|
||||
fixed_dict_size_bytes = FIXED_DICT_SIZE_MB * 1024 * 1024
|
||||
|
||||
# Check if Max7zInst is configured
|
||||
if MAX_7Z_INSTANCES is not None:
|
||||
# Use configured maximum instances, but still respect user's --jobs and work items
|
||||
final_limit = MAX_7Z_INSTANCES
|
||||
num_work_items = len(work_items) if work_items else 0
|
||||
if num_work_items > 0:
|
||||
final_limit = min(final_limit, num_work_items)
|
||||
if requested and requested > 0:
|
||||
final_limit = min(final_limit, requested)
|
||||
|
||||
# Create RAM limits dict (all use fixed dict size, but return as dict for consistency)
|
||||
ram_limits_dict: dict[Path, int] = {}
|
||||
if work_items:
|
||||
for seq_dir, _, _, _ in work_items:
|
||||
ram_limits_dict[seq_dir] = fixed_dict_size_bytes
|
||||
|
||||
if verbose:
|
||||
log(
|
||||
"zip",
|
||||
f"Using Max7zInst={MAX_7Z_INSTANCES} from config → "
|
||||
f"work items: {num_work_items}, requested: {requested}, final: {final_limit}",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
|
||||
return (final_limit, ram_limits_dict)
|
||||
|
||||
# Auto-calculate based on RAM if Max7zInst not configured
|
||||
# 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
|
||||
work_items_with_ram: list[tuple[Path, int, tuple[Path, Path, Path, dict]]] = []
|
||||
ram_limits_dict: dict[Path, int] = {}
|
||||
|
||||
for seq_dir, zip_path, state_path, seq_state in work_items:
|
||||
try:
|
||||
estimated_ram = estimate_ram_per_job(seq_dir, seq_state)
|
||||
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 (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
|
||||
|
||||
num_work_items = len(work_items) if work_items else 0
|
||||
|
||||
# Calculate total estimated RAM
|
||||
total_estimated_ram = sum(ram for _, ram, _ in work_items_with_ram)
|
||||
|
||||
# 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)
|
||||
|
||||
# Bin-packing algorithm: pack largest items first
|
||||
bins: list[list[tuple[Path, int, tuple[Path, Path, Path, dict]]]] = []
|
||||
bin_remaining: list[int] = []
|
||||
|
||||
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)
|
||||
if num_work_items > 0:
|
||||
worker_count = min(worker_count, num_work_items)
|
||||
|
||||
# Respect user's --jobs if provided
|
||||
if requested and requested > 0:
|
||||
worker_count = min(worker_count, requested)
|
||||
|
||||
if verbose:
|
||||
ram_gb = available_ram / (1024 ** 3)
|
||||
compression_ram_gb = compression_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%)",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
log(
|
||||
"zip",
|
||||
f"Estimated RAM per sequence: {total_estimated_gb:.1f}GB total across {num_work_items} sequences",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
if total_estimated_ram <= compression_ram:
|
||||
log(
|
||||
"zip",
|
||||
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
|
||||
)
|
||||
log(
|
||||
"zip",
|
||||
f"Final worker count: {worker_count} (requested: {requested})",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
|
||||
# Return worker count and RAM limits dict
|
||||
return (worker_count, ram_limits_dict)
|
||||
|
||||
# RAM detection failed, use a safe default (no CPU limit)
|
||||
default_limit = 4
|
||||
num_work_items = len(work_items) if work_items else 0
|
||||
if num_work_items > 0:
|
||||
default_limit = min(default_limit, num_work_items)
|
||||
if requested and requested > 0:
|
||||
default_limit = min(default_limit, requested)
|
||||
|
||||
# Create RAM limits dict with safe defaults (12GB per job for 1GB dict)
|
||||
ram_limits_dict: dict[Path, int] = {}
|
||||
if work_items:
|
||||
default_ram = 12 * 1024 * 1024 * 1024 # 12GB default
|
||||
for seq_dir, _, _, _ in work_items:
|
||||
ram_limits_dict[seq_dir] = default_ram
|
||||
|
||||
if verbose:
|
||||
log(
|
||||
"zip",
|
||||
f"RAM detection failed and Max7zInst not set, using default worker limit → "
|
||||
f"work items: {num_work_items}, requested: {requested}, final: {default_limit}",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
return (default_limit, ram_limits_dict)
|
||||
|
||||
# For zip compression, use existing estimation-based approach
|
||||
# Estimate RAM per job for each work item
|
||||
ram_estimates = []
|
||||
ram_limits_dict: dict[Path, int] = {}
|
||||
for seq_dir, zip_path, state_path, seq_state in work_items:
|
||||
try:
|
||||
estimated_ram = estimate_ram_per_job(seq_dir, seq_state)
|
||||
ram_estimates.append(estimated_ram)
|
||||
ram_limits_dict[seq_dir] = estimated_ram
|
||||
except Exception:
|
||||
# If estimation fails, use fallback estimate
|
||||
fallback_ram = 1024 * 1024 * 1024 # 1GB fallback for zip
|
||||
ram_estimates.append(fallback_ram)
|
||||
ram_limits_dict[seq_dir] = fallback_ram
|
||||
|
||||
if not ram_estimates:
|
||||
return (cpu_limit, {})
|
||||
|
||||
max_ram_per_job = max(ram_estimates)
|
||||
ram_limit = max(1, available_ram // max_ram_per_job)
|
||||
ram_limit = min(ram_limit, 6) # Conservative limit for zip
|
||||
final_limit = min(cpu_limit, ram_limit)
|
||||
|
||||
if verbose:
|
||||
ram_gb = available_ram / (1024 ** 3)
|
||||
max_ram_gb = max_ram_per_job / (1024 ** 3)
|
||||
log(
|
||||
"zip",
|
||||
f"RAM: {ram_gb:.1f}GB available, ~{max_ram_gb:.1f}GB per job → "
|
||||
f"RAM limit: {ram_limit}, CPU limit: {cpu_limit}, final: {final_limit}",
|
||||
verbose_only=True,
|
||||
verbose=verbose
|
||||
)
|
||||
|
||||
return (final_limit, ram_limits_dict)
|
||||
|
||||
|
||||
def is_archive_path(path: Path) -> bool:
|
||||
return any(part == "_archive" for part in path.parts)
|
||||
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 != "_archive"]
|
||||
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]:
|
||||
for dirpath, dirnames, filenames in os.walk(seq_dir):
|
||||
path = Path(dirpath)
|
||||
dirnames[:] = [d for d in dirnames if d != "_archive"]
|
||||
dirnames[:] = [d for d in dirnames if d not in ("_archive", "_CURRENT")]
|
||||
if is_archive_path(path):
|
||||
continue
|
||||
for filename in filenames:
|
||||
@@ -188,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) -> 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(
|
||||
@@ -258,9 +644,63 @@ def zip_sequence(seq_dir: Path, zip_path: Path) -> None:
|
||||
"-bb0", # Suppress progress output
|
||||
f"-mx={COMPRESSION_LEVEL}",
|
||||
"-t7z", # Use 7z format, not zip
|
||||
]
|
||||
|
||||
# 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
|
||||
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,
|
||||
@@ -376,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, *, 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)
|
||||
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)
|
||||
|
||||
@@ -388,54 +828,121 @@ def process_expand(zip_path: Path, state: dict, *, verbose: bool) -> None:
|
||||
expand_sequence(zip_path, state)
|
||||
|
||||
|
||||
def run_zip(worker_count: int, *, verbose: bool) -> int:
|
||||
def run_zip(requested_workers: int | None, *, verbose: bool) -> int:
|
||||
work_items: list[tuple[Path, Path, Path, dict]] = []
|
||||
log("init", f"Scanning sequences under {RENDER_ROOT.resolve()}")
|
||||
total_scanned = 0
|
||||
quick_skipped = 0
|
||||
state_skipped = 0
|
||||
empty_dirs = 0
|
||||
queued = 0
|
||||
|
||||
if RENDER_ROOT.exists():
|
||||
for seq_dir in find_sequence_dirs(RENDER_ROOT):
|
||||
seq_state = compute_state(seq_dir)
|
||||
if not seq_state["files"]:
|
||||
continue
|
||||
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:
|
||||
log("scan", f"[{total_scanned}] Inspecting {rel}")
|
||||
|
||||
# Get the target archive path (will be .7z if ZIPPER_TYPE is "7z")
|
||||
zip_path = archive_path_for(seq_dir)
|
||||
state_path = state_path_for(zip_path)
|
||||
|
||||
# Quick check: if archive exists, load stored state first (fast)
|
||||
stored_state = load_state(state_path)
|
||||
|
||||
# Check if we need to upgrade from .zip to .7z
|
||||
old_zip_path = None
|
||||
old_stored_state = None
|
||||
if ZIPPER_TYPE == "7z":
|
||||
# Check if an old .zip file exists
|
||||
old_zip_path = zip_path.with_suffix(".zip")
|
||||
if old_zip_path.exists():
|
||||
# Check if the old .zip's metadata matches current state
|
||||
old_state_path = state_path_for(old_zip_path)
|
||||
old_stored_state = load_state(old_state_path)
|
||||
if not state_changed(seq_state, old_stored_state):
|
||||
# Old .zip is up to date, skip conversion
|
||||
continue
|
||||
# Old .zip is out of date, will be replaced with .7z
|
||||
# If old .zip exists and .7z doesn't, use old .zip's state for comparison
|
||||
if not zip_path.exists() and old_stored_state is not None:
|
||||
stored_state = old_stored_state
|
||||
|
||||
# Check if the target archive (e.g., .7z) already exists and is up to date
|
||||
stored_state = load_state(state_path)
|
||||
if not state_changed(seq_state, stored_state):
|
||||
# Target archive is up to date, but we might still need to clean up old .zip
|
||||
if old_zip_path and old_zip_path.exists():
|
||||
# Old .zip exists but we have a newer .7z, remove the old one
|
||||
old_zip_path.unlink(missing_ok=True)
|
||||
old_state_path = state_path_for(old_zip_path)
|
||||
if old_state_path.exists():
|
||||
old_state_path.unlink(missing_ok=True)
|
||||
# If .7z archive exists and we have stored state, do quick check before computing full state
|
||||
if zip_path.exists() and stored_state is not None:
|
||||
# Quick check: if directory mtime is older than archive, likely unchanged
|
||||
try:
|
||||
dir_mtime = seq_dir.stat().st_mtime_ns
|
||||
archive_mtime = zip_path.stat().st_mtime_ns
|
||||
# If directory wasn't modified since archive was created, skip state computation
|
||||
if dir_mtime <= archive_mtime:
|
||||
quick_skipped += 1
|
||||
if quick_skipped <= 5:
|
||||
log("scan", f"Skipping {rel} (unchanged since archive)")
|
||||
# Still need to check for old .zip cleanup (we have .7z, so .zip is obsolete)
|
||||
if old_zip_path and old_zip_path.exists():
|
||||
old_zip_path.unlink(missing_ok=True)
|
||||
old_state_path = state_path_for(old_zip_path)
|
||||
if old_state_path.exists():
|
||||
old_state_path.unlink(missing_ok=True)
|
||||
continue
|
||||
except OSError:
|
||||
# If stat fails, fall through to full state computation
|
||||
pass
|
||||
|
||||
# Compute current state only if we need to
|
||||
seq_state = compute_state(seq_dir)
|
||||
if not seq_state["files"]:
|
||||
empty_dirs += 1
|
||||
if empty_dirs <= 5:
|
||||
log("scan", f"{rel} has no files; skipping")
|
||||
continue
|
||||
|
||||
# Check if state changed
|
||||
if stored_state is not None and not state_changed(seq_state, stored_state):
|
||||
# Metadata matches stored state
|
||||
state_skipped += 1
|
||||
if state_skipped <= 5:
|
||||
log("scan", f"{rel} metadata unchanged; archive up to date")
|
||||
if zip_path.exists():
|
||||
# .7z exists and is up to date, clean up old .zip if it exists
|
||||
if old_zip_path and old_zip_path.exists():
|
||||
old_zip_path.unlink(missing_ok=True)
|
||||
old_state_path = state_path_for(old_zip_path)
|
||||
if old_state_path.exists():
|
||||
old_state_path.unlink(missing_ok=True)
|
||||
elif old_zip_path and old_zip_path.exists() and old_stored_state is not None:
|
||||
# .7z doesn't exist, but .zip exists and metadata matches
|
||||
# Keep the .zip file, don't create .7z
|
||||
continue
|
||||
else:
|
||||
# No archive exists, but state matches (shouldn't happen, but be safe)
|
||||
continue
|
||||
|
||||
work_items.append((seq_dir, zip_path, state_path, seq_state))
|
||||
queued += 1
|
||||
if queued <= 5 or queued % 5 == 0:
|
||||
total_bytes = sum(entry.get("size", 0) for entry in seq_state.get("files", []))
|
||||
size_gb = total_bytes / (1024 ** 3)
|
||||
log("scan", f"Queued {rel} for compression (~{size_gb:.2f}GB) [{queued} total]")
|
||||
|
||||
if not work_items:
|
||||
if not RENDER_ROOT.exists():
|
||||
log("zip", "Render root 'Renders' not found; nothing to zip.")
|
||||
else:
|
||||
log("zip", "Archives already up to date; no sequences needed zipping.")
|
||||
log(
|
||||
"scan",
|
||||
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
|
||||
worker_count, ram_limits_dict = max_workers(requested_workers, work_items, verbose=verbose)
|
||||
log(
|
||||
"init",
|
||||
f"Preparing to compress {len(work_items)} sequence(s) with {worker_count} worker(s)",
|
||||
)
|
||||
|
||||
updated_paths: list[Path] = []
|
||||
|
||||
total = len(work_items)
|
||||
@@ -443,7 +950,7 @@ def run_zip(worker_count: int, *, 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, 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
|
||||
}
|
||||
|
||||
@@ -463,6 +970,11 @@ def run_zip(worker_count: int, *, verbose: bool) -> int:
|
||||
verbose_only=True,
|
||||
verbose=verbose,
|
||||
)
|
||||
log(
|
||||
"scan",
|
||||
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:
|
||||
@@ -520,49 +1032,105 @@ 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()
|
||||
|
||||
# Calculate state path BEFORE checking/removing archive
|
||||
state_path = state_path_for(zip_path)
|
||||
state_path_abs = state_path.resolve()
|
||||
|
||||
# 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
|
||||
|
||||
rel = zip_path.relative_to(ARCHIVE_ROOT)
|
||||
log("zip", f"Removing orphan archive {rel}", verbose_only=True, verbose=verbose)
|
||||
# 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)
|
||||
|
||||
zip_path.unlink(missing_ok=True)
|
||||
state_path = state_path_for(zip_path)
|
||||
if state_path.exists():
|
||||
state_path.unlink()
|
||||
removed.append(zip_path)
|
||||
# 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)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
args = parse_args()
|
||||
workers = max_workers(args.jobs)
|
||||
log("init", "zip_sequences starting up...")
|
||||
log("init", f"Working directory: {Path.cwd()}")
|
||||
log("init", f"Mode: {args.mode}, zipper: {ZIPPER_TYPE}, jobs arg: {args.jobs or 'auto'}")
|
||||
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}, method: {COMPRESSION_METHOD}, level: {COMPRESSION_LEVEL}")
|
||||
|
||||
if args.mode == "expand":
|
||||
# For expand mode, use simple CPU-based worker calculation
|
||||
workers, _ = max_workers(args.jobs, work_items=None, verbose=args.verbose)
|
||||
run_expand(workers, verbose=args.verbose)
|
||||
return 0
|
||||
|
||||
updated = run_zip(workers, verbose=args.verbose)
|
||||
# For zip mode, work items will be calculated in run_zip
|
||||
updated = run_zip(args.jobs, verbose=args.verbose)
|
||||
return 0 if updated >= 0 else 1
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user