fix: use vid number as clip number in scan export filenames
clip_001_a1_0 now matches vid_001 instead of using an independent counter that created confusing double numbering. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -4609,23 +4609,19 @@ class MainWindow(QMainWindow):
|
|||||||
vid_folder = os.path.join(folder, vid_name)
|
vid_folder = os.path.join(folder, vid_name)
|
||||||
os.makedirs(vid_folder, exist_ok=True)
|
os.makedirs(vid_folder, exist_ok=True)
|
||||||
|
|
||||||
# Find next counter within the vid folder
|
# Extract vid number to use as clip number (vid_003 → 3)
|
||||||
db_max = self._db.get_max_counter(vid_folder, name) if self._db else 0
|
vid_num = int(vid_name.split("_")[-1])
|
||||||
counter = max(1, db_max + 1)
|
|
||||||
while os.path.exists(build_export_path(vid_folder, name, counter, sub=0)):
|
|
||||||
counter += 1
|
|
||||||
|
|
||||||
# Clips go flat inside vid folder, numbered sequentially
|
# Clips go flat inside vid folder, numbered by video
|
||||||
jobs = []
|
jobs = []
|
||||||
self._auto_export_positions = []
|
self._auto_export_positions = []
|
||||||
for area_idx, group in enumerate(groups):
|
for area_idx, group in enumerate(groups):
|
||||||
group_name = f"{name}_{counter:03d}"
|
group_name = f"{name}_{vid_num:03d}_a{area_idx + 1}"
|
||||||
for sub, start_t in enumerate(group):
|
for sub, start_t in enumerate(group):
|
||||||
fname = f"{group_name}_a{area_idx + 1}_{sub}{ext}"
|
fname = f"{group_name}_{sub}{ext}"
|
||||||
out = os.path.join(vid_folder, fname)
|
out = os.path.join(vid_folder, fname)
|
||||||
jobs.append((start_t, out, None, 0.5))
|
jobs.append((start_t, out, None, 0.5))
|
||||||
self._auto_export_positions.append((start_t, out))
|
self._auto_export_positions.append((start_t, out))
|
||||||
counter += 1
|
|
||||||
|
|
||||||
self._show_status(f"Auto: exporting {len(jobs)} clips...")
|
self._show_status(f"Auto: exporting {len(jobs)} clips...")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user