Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stream tokenizer #285

Closed
wants to merge 23 commits into from
Closed

Stream tokenizer #285

wants to merge 23 commits into from

Conversation

Borewit
Copy link
Collaborator

@Borewit Borewit commented Jan 2, 2020

Merge tokenizer API to master branch

This PR includes major changes to the file-type API.

Includes pull requests:

sindresorhus and others added 22 commits December 20, 2019 14:11
Improve sub-type parsing of PNG, matroska & ZIP file types
Remove ID3 header starting at offset 1 fixture.
Sorted function by signature length.
Co-Authored-By: Sindre Sorhus <sindresorhus@gmail.com>
@Borewit
Copy link
Collaborator Author

Borewit commented Jan 2, 2020

Merge conflicts should be solved after merging: #284

* Fix readme usage example

* Fix `extensions` and `mimeTypes` TypeScript types (#270)

Co-Authored-By: Sindre Sorhus <sindresorhus@gmail.com>

* 12.4.1

* Fix `.m4b` MPEG-4 audio-book detection (#256)

* 12.4.2

* Stop execution after `fileType.stream` error (#273)

* Update dependency strtok3 to v5.0

Co-authored-by: Sindre Sorhus <sindresorhus@gmail.com>
Co-authored-by: Armando Magalhães <armando.mag95@gmail.com>
@Borewit
Copy link
Collaborator Author

Borewit commented Jan 2, 2020

Sorry, I don't think I can resolve the conflicts without write permission to this branch.
I can resolve continuing on another branch: #286

Merging strategy is overwriting all with this branch, is all the changes of the master should be already incorporated in this branch.

@sindresorhus
Copy link
Owner

Closing in favor of #286

@Borewit Borewit deleted the stream-tokenizer branch January 19, 2020 11:04
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.

None yet

2 participants