Skip to content

Conversation

@dfjxs
Copy link
Contributor

@dfjxs dfjxs commented Nov 5, 2020

Issue #78

@aarontp
Copy link
Member

aarontp commented Nov 5, 2020

As you mentioned elsewhere, the previous changes are showing up here, so it's a bit hard to review. I'm guessing you created this branch from the previous feature branch and not directly from master? Maybe you could try syncing your master branch, then creating a new branch from there and then cherry-picking the actual new commits? Maybe github is calculating the diffs based on the commits rather than the actual code diff here, and since those commits were squashed when merged into upstream master, it still thinks they are "new"?

@dfjxs
Copy link
Contributor Author

dfjxs commented Nov 6, 2020

Sorry about that, rebased the branch. Should be good now.

# Add the output path to the evidence so we can automatically save it
# later.
output_evidence.local_path = output_file_path
output_evidence.local_path = ''.join((output_file_path, '.1'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the .1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Photorec appends .1 to whatever output folder specified.
I guess this is to support multiple runs with an incrementing number on the output folder.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird. Should we do a quick check to make sure this exists after the run then?

@dfjxs
Copy link
Contributor Author

dfjxs commented Nov 12, 2020

@aarontp I've moved the extraction of volume extents into the partition enumeration task and stored the values in the evidence item.

I also changed the logic a little to support images that are taken at the volume level (i.e. no partition table).

Copy link
Member

@aarontp aarontp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few small comments.

# Add the output path to the evidence so we can automatically save it
# later.
output_evidence.local_path = output_file_path
output_evidence.local_path = ''.join((output_file_path, '.1'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird. Should we do a quick check to make sure this exists after the run then?

Copy link
Member

@aarontp aarontp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple minor things.

@dfjxs
Copy link
Contributor Author

dfjxs commented Nov 26, 2020

Fixed

Copy link
Member

@aarontp aarontp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@aarontp aarontp merged commit ef98b08 into google:master Nov 26, 2020
@dfjxs dfjxs deleted the partition-photorec branch November 26, 2020 02:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants