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.

Sign up for GitHub

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

More matroska support and .TS mpeg support #69

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

More matroska support and .TS mpeg support #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b894bb1
add some matroska files to magic.gz
gandji Apr 3, 2020
203d366
add support for TS mpeg
gandji Apr 5, 2020
78be80c
add test files for mkv and ts
gandji Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/.classpath
/.project
/.settings/
/.idea
Binary file modified src/main/resources/magic.gz
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions src/test/java/com/j256/simplemagic/ContentInfoUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public class ContentInfoUtilTest {
*/
private FileType[] fileTypes = new FileType[] { //
//
new FileType("/files/x.mkv", ContentType.MATROSKA, "matroska", "video/x-matroska",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this to the end of the list? I'd like to keep these in time order.

"Matroska data", false),
new FileType("/files/x.fits", ContentType.FITS, "fits", "application/fits", "FITS data", false),
new FileType("/files/x.gif", ContentType.GIF, "gif", "image/gif", "GIF image data, version 89a, 32 x 32",
false),
Expand Down Expand Up @@ -122,6 +124,8 @@ public class ContentInfoUtilTest {
"Adobe Illustrator, version 1.5", false),
new FileType("/files/x.amr", ContentType.AMR, "amr", "audio/amr",
"Adaptive Multi-Rate Codec (GSM telephony)", false),
new FileType("/files/dvd.ts", ContentType.VIDEO_MPEG, "mpeg", "video/mpeg",
"MPEG transport stream data", false)
// end
};

Expand Down
Binary file added src/test/resources/files/dvd.ts
View file
Open in desktop
Binary file not shown.
Binary file added src/test/resources/files/x.mkv
View file
Open in desktop
Binary file not shown.