fix zipseq store not storing
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -2,7 +2,7 @@
|
||||
"dailyFormat": "daily_YYMMDD",
|
||||
"structDir": "A:\\1 Amazon_Active_Projects\\3 ProjectStructure",
|
||||
"zipper": "7z",
|
||||
"compression": 5,
|
||||
"compression": 0,
|
||||
"Max7zInst": 0
|
||||
}
|
||||
|
||||
|
||||
@@ -476,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:
|
||||
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]:
|
||||
@@ -539,12 +566,20 @@ 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:
|
||||
@@ -612,8 +647,15 @@ def zip_sequence(seq_dir: Path, zip_path: Path, per_job_memory_limit: int | None
|
||||
]
|
||||
|
||||
# Set compression method and memory/dictionary size based on method
|
||||
# PPMd uses memory parameter in method string, LZMA2 uses -md flag
|
||||
# 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")
|
||||
@@ -796,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:
|
||||
|
||||
Reference in New Issue
Block a user