Skip to content

Remove redundant and overly broad client-side guard for delete #729

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
jjjake merged 2 commits into from
Dec 5, 2025
Merged

Remove redundant and overly broad client-side guard for delete #729

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12e7296
Remove redundant and overly broad client-side guard for delete
parkan Dec 5, 2025
2c29625
report better error messages for failed deletes
parkan Dec 5, 2025
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
18 changes: 8 additions & 10 deletions internetarchive/cli/ia_delete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import sys

import requests.exceptions
from requests.exceptions import HTTPError

from internetarchive.cli.cli_utils import (
FlattenListAction,
Expand Down Expand Up @@ -122,22 +123,12 @@ def delete_files(files, args, item, verbose):
"""
errors = False

# Files that cannot be deleted via S3.
no_delete = [
"_meta.xml",
"_files.xml",
"_meta.sqlite"
"_reviews.xml",
]

for f in files:
if not f:
if verbose:
print(f" error: '{f.name}' does not exist", file=sys.stderr)
errors = True
continue
if any(f.name.endswith(s) for s in no_delete):
continue
if args.dry_run:
if args.cascade:
print(f" will delete: {item.identifier}/{f.name} and all derivatives",
Expand All @@ -154,6 +145,13 @@ def delete_files(files, args, item, verbose):
print(f" error: max retries exceeded for {f.name}", file=sys.stderr)
errors = True
continue
except HTTPError as exc:
errors = True
msg = get_s3_xml_text(exc.response.content)
if not msg or msg == str(exc.response.content):
msg = str(exc)
print(f" error: {msg} ({exc.response.status_code})", file=sys.stderr)
continue

if resp.status_code != 204:
errors = True
Expand Down