The fetcher accepts image/svg+xml and internal/magic detects SVG. orig of an SVG at the orig size is the SVG unchanged, cached as a variant; at another size it is ErrSVGNotOriginalSize (400). Any other format renders it with libvips' thumbnail at the least size covering the output, at most 8192 on a side, so it stays sharp. An SVG's own size is not limited; one with a side over 8192 times the other is ErrSVGTooThin (415). The cache reads up to 1024 first bytes to find a file's format. Tests that pinned the SVG refusal now expect SVG to be read. Render time and memory are unbounded: P1 in TODO.md until the owner decides on #68. Model: opus-5-5
This commit is contained in:
1 parent
e34463acf8
commit
efbf05a6fa
20 files changed
+853
-83
No files matched your search
@@ -740,16 +740,18 @@ func (c *Cache) finishOpeningVariant(
|
||||
}, nil
|
||||
}
|
||||
|
||||
// readFormat reads the first bytes of a source or variant file, without
|
||||
// moving its offset, and returns the format they show. Sources and variants
|
||||
// are in the same six formats.
|
||||
// readFormat reads up to magic.MaxMagicBytes first bytes of a source or
|
||||
// variant file, without moving its offset, and returns the format they show.
|
||||
// Sources and variants are in the same seven formats; a variant is SVG only
|
||||
// as orig of an SVG source. A file shorter than magic.MinMagicBytes is
|
||||
// io.EOF.
|
||||
func readFormat(content io.ReaderAt) (imagerequest.Format, error) {
|
||||
firstBytes := make([]byte, magic.MinMagicBytes)
|
||||
firstBytes := make([]byte, magic.MaxMagicBytes)
|
||||
|
||||
_, err := content.ReadAt(firstBytes, 0)
|
||||
if err != nil {
|
||||
n, err := content.ReadAt(firstBytes, 0)
|
||||
if err != nil && (!errors.Is(err, io.EOF) || n < magic.MinMagicBytes) {
|
||||
return "", fmt.Errorf("failed to read the first bytes: %w", err)
|
||||
}
|
||||
|
||||
return magic.DetectFormat(firstBytes)
|
||||
return magic.DetectFormat(firstBytes[:n])
|
||||
}
|
||||
Reference in new issue
Block a user