[refactor] - Mime Type Detection #3084
Open
+98
−69
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
ahrav
force-pushed
the
refactor-mimetype-detection
branch
from
3364dbe to
63229d5
Compare
rosecodym
reviewed
Jul 23, 2024
| @@ -89,7 +89,7 @@ func (h *archiveHandler) openArchive(ctx logContext.Context, depth int, reader f | |||
|
|
|||
| if reader.format == nil { | |||
| if depth > 0 { | |||
| mtr, err := newSizedMimetypeReaderFromFileReader(reader) | |||
| mtr, err := newSizedReaderFromFileReader(reader) | |||
| if err != nil { | |||
| return fmt.Errorf("error reading MIME type: %w", err) | |||
There was a problem hiding this comment.
should this error message be updated?
| @@ -44,7 +44,7 @@ func (h *defaultHandler) HandleFile(ctx logContext.Context, input fileReader) (c | |||
| h.metrics.incFilesProcessed() | |||
| }() | |||
|
|
|||
| mtr, err := newSizedMimetypeReaderFromFileReader(input) | |||
| mtr, err := newSizedReaderFromFileReader(input) | |||
| if err != nil { | |||
| ctx.Logger().Error(err, "error reading MIME type") | |||
There was a problem hiding this comment.
should this error message be updated?
| return sizedReader{}, errEmptyReader | ||
| } | ||
|
|
||
| bufReader, _, err := determineMIMEType(r) |
There was a problem hiding this comment.
Now you determine the MIME type but immediately throw it away? This seems to reverse all the optimizations you've been adding :/
| // This function is particularly useful for specialized archive handlers | ||
| // that need to pass extracted content to the default handler without modifying the original reader. | ||
| func newSizedMimeTypeReader(r io.Reader, size int64) (sizedMimeTypeReader, error) { | ||
| func newSizedReader(r io.Reader, size int64) (sizedReader, error) { |
There was a problem hiding this comment.
It would never occur to me that this function could fail because of an unsupported file type - that behavior isn't hinted at in the name or the doc comment.
Comment on lines
+329
to
+334
| if errors.Is(err, errEmptyReader) { | ||
| ctx.Logger().V(5).Info("empty reader, skipping file") | ||
| return nil | ||
| } else if errors.Is(err, errUnsupportedMIME) { | ||
| ctx.Logger().V(5).Info("skipping file") | ||
| return nil |
There was a problem hiding this comment.
Why not use handleReaderError here?
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.
Description:
This PR refactors the handling of MIME type detection during file processing. Instead of performing this check at the final stage of the file handling in
handleNonArchiveContent, it is moved to an earlier stage to avoid unnecessary operations.Checklist:
make test-community)?make lintthis requires golangci-lint)?