Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Fix unit test for media type sniffer, supports WEBP file type
| Author | DaveJarvis <email> |
|---|---|
| Date | 2023-02-20 17:18:32 GMT-0800 |
| Commit | 19f70bfe008853001c84ddf27a9463f0ea29c40e |
| Parent | daeb06f |
| Delta | 12 lines added, 16 lines removed, 4-line decrease |
src/main/java/com/keenwrite/io/MediaTypeSniffer.java
| import static com.keenwrite.io.MediaType.*; | ||
| import static java.lang.System.arraycopy; | ||
| +import static java.util.Arrays.fill; | ||
| /** | ||
 | ||
| * The maximum buffer size of magic bytes to analyze. | ||
| */ | ||
| - private static final int BUFFER = 11; | ||
| + private static final int BUFFER = 12; | ||
| /** | ||
| ||
| public static MediaType getMediaType( final byte[] data ) { | ||
| assert data != null; | ||
| + assert data.length > 0; | ||
| final var source = new int[]{ | ||
| - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF | ||
| + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, | ||
| + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, | ||
| + 0xFF, 0XFF, EOS | ||
| }; | ||
| - for( int i = 0; i < source.length; i++ ) { | ||
| + for( int i = 0; i < Math.min( data.length, source.length ); i++ ) { | ||
| source[ i ] = data[ i ] & 0xFF; | ||
| } | ||
| ||
| * Convenience method to return the probed media type for the given | ||
| * {@link BufferedInputStream} instance. <strong>This resets the stream | ||
| - * pointer</strong> making the call idempotent. Users of this class should | ||
| - * prefer to call this method when operating on streams to avoid advancing | ||
| - * the stream. | ||
| + * pointer</strong> making the call idempotent. Prefer calling this | ||
| + * method when operating on streams to avoid advancing the stream. | ||
| * | ||
| * @param bis Data source to ascertain the {@link MediaType}. | ||
| ||
| private static int[] ints( final int... data ) { | ||
| assert data != null; | ||
| - assert data.length <= BUFFER; | ||
| - | ||
| - final var magic = new int[ BUFFER + 1 ]; | ||
| - int i = -1; | ||
| - while( ++i < data.length ) { | ||
| - magic[ i ] = data[ i ]; | ||
| - } | ||
| + final var magic = new int[ data.length + 1 ]; | ||
| - while( i < BUFFER ) { | ||
| - magic[ i++ ] = EOS; | ||
| - } | ||
| + fill( magic, EOS ); | ||
| + arraycopy( data, 0, magic, 0, data.length ); | ||
| return magic; | ||