Skip to content

Mediaarea fixes #467

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

Mediaarea fixes #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5026f4b
Update mediaarea repo to avaliable version in Dockerfile
camlyall Jun 5, 2025
d6de1aa
Fix incorrect use of rule and command uuid
camlyall Jun 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
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ RUN set -ex \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy multiverse" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy-security universe" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy-updates multiverse" \
&& curl -so /tmp/repo-mediaarea_1.0-21_all.deb -L https://mediaarea.net/repo/deb/repo-mediaarea_1.0-21_all.deb \
&& dpkg -i /tmp/repo-mediaarea_1.0-21_all.deb \
&& curl -so /tmp/repo-mediaarea_1.0-25_all.deb -L https://mediaarea.net/repo/deb/repo-mediaarea_1.0-25_all.deb \
&& dpkg -i /tmp/repo-mediaarea_1.0-25_all.deb \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
atool \
Expand All @@ -55,6 +55,7 @@ RUN set -ex \
libimage-exiftool-perl \
libevent-dev \
libjansson4 \
mediainfo \
openjdk-8-jre-headless \
p7zip-full \
pbzip2 \
Expand Down
4 changes: 2 additions & 2 deletions a3m/client/clientScripts/characterize_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ def main(job, file_path, file_uuid, sip_uuid):

# Save outputs if they are the same
for file_uuid, rule, stdout in state:
_insert_command_output(file_uuid, rule.uuid, stdout)
_insert_command_output(file_uuid, rule.id, stdout)
job.write_output(
'Saved XML output for command "{}" ({})'.format(
rule.command.description, rule.command.uuid
rule.command.description, rule.command.id
)
)

Expand Down
Loading