Skip to content

5 sub folders issue #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdgregg merged 3 commits into from
Jul 29, 2026
+6 −9
Merged

5 sub folders issue #13

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bac8ffe
Updates to handle compound objects correctly.
bdgregg Jul 17, 2026
7b9c263
Clean up of the fix for issue #5 sub-folders issue.
bdgregg Jul 21, 2026
4e50503
Merge branch 'master' into 5-sub-folders-issue
bdgregg Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions scan-batch-dir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,10 +555,7 @@ def process_tiff(file_path:str, level):
# Create the JP2 derivative if it does not already exist.
# if the JP2 does not exist:
jp2_path = f"{dir}/{pid}.jp2"
if level == 1:
out_pid = f"{pid}"
else:
out_pid = f"{parent}-{pid}"
out_pid = f"{pid}"

logger.info(f"Tiff: Creating JP2: {jp2_path}")
if not os.path.exists(jp2_path):
Expand Down Expand Up @@ -954,11 +951,11 @@ def process_file(df: pd.DataFrame, file_path: str, level):
imodel, field_model, resource_type = get_model_details(level)

# Handle top level files by adjusting the PID and parent_folder.
if not level == 1:
# Not in top level folder.
pid = f"{parent_folder}-{file_name}"
else:
pid = f"{file_name}"
# The file's own name is always the PID; the parent object's PID
# is tracked separately via parent_id — it should never be
# concatenated onto the file's PID.
pid = f"{file_name}"
if level == 1:
parent_folder = ''

# Default row_data
Expand Down