fix Hexa editor display of binary files #11747
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mstv
reviewed
May 22, 2024
gerhardol
approved these changes
May 22, 2024
pmiossec
force-pushed
the
fix_binaries_display
branch
from
561d355
to
ea49c0d
Compare
|
I have added a little refactoring. |
pmiossec
force-pushed
the
fix_binaries_display
branch
from
ea49c0d
to
de1c508
Compare
mstv
reviewed
May 23, 2024
GitUI/Editor/FileViewer.cs
Outdated
| .AppendLine(); | ||
|
|
||
| double mb = text.Length / (1024d * 1024); | ||
| if (mb > 1) |
There was a problem hiding this comment.
Suggested change
| if (mb > 1) | |
| if (mb >= 0.1) |
There was a problem hiding this comment.
Suggested change
| if (mb > 1) | |
| if (text.Length > (1024 * 1024) / 10) |
pmiossec
force-pushed
the
fix_binaries_display
branch
2 times, most recently
from
9f53da7
to
5a3e1fd
Compare
by: * reading file and blob with a better encoding * not touching/altering *blob* content (i.e not breaking content by reencoding) * not converting in ASCII before doing the Hexa editor display (it breaks char > 0x80) As a result, display is **exactly** the same obtained by using an external Hexa Editor: * Hexa value are accurate * string display is the same (except some cheating done by hexa editor for example with char 0x99 displayed as ™)
* DRY * add display in MB (more human friendly) & translated
pmiossec
force-pushed
the
fix_binaries_display
branch
from
5a3e1fd
to
c15e105
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
by:
As a result, display is exactly the same obtained by using an external Hexa Editor:
for example with char 0x99 displayed as ™)
Kind of followup to #11727 as it was not always working well because beginning of some files (ex: jpegs) were badly altered when reading blob content.
Screenshots
Before
In commit window
Goal (Hex editor):
Recover jpeg blob:
before:
after (because content is not corrupted, type of file is well recognized):
Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.