From 74f28747a23711ca0800e47f4bc892a1f0a98cde Mon Sep 17 00:00:00 2001 From: CodeforEvolution Date: Mon, 21 Jun 2021 18:43:59 -0500 Subject: [PATCH] mime_db: New text/markdown MIME type and other MIME type polishing - New text/markdown MIME type was added according to IANA registry. - MIME types gained new extensions that weren't previously included. - Resource definition files will now open up with Pe by default. - text/x-vcard was renamed to text/vcard, as it's now a registered IANA MIME type. - text/x-source-code had its sniffing rules increased in priority, so that it would get precedence over text/plain and its own sniffing rules. Change-Id: I28af24de8c0e96ef39dfc67703a0884e8d4c842e Reviewed-on: https://review.haiku-os.org/c/haiku/+/4109 Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- src/data/mime_db/text/calendar | 6 ++++-- src/data/mime_db/text/css | 1 - src/data/mime_db/text/markdown | 12 ++++++++++++ src/data/mime_db/text/{x-vcard => vcard} | 4 ++-- src/data/mime_db/text/x-jamfile | 5 +++++ src/data/mime_db/text/x-makefile | 6 ++++++ src/data/mime_db/text/x-source-code | 2 +- src/data/mime_db/text/x-vnd.be.resourcedef | 15 ++++++--------- 8 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 src/data/mime_db/text/markdown rename src/data/mime_db/text/{x-vcard => vcard} (81%) diff --git a/src/data/mime_db/text/calendar b/src/data/mime_db/text/calendar index b2e92bba45..90124b9261 100644 --- a/src/data/mime_db/text/calendar +++ b/src/data/mime_db/text/calendar @@ -5,11 +5,13 @@ resource(1, "META:TYPE") "text/calendar"; resource(2, "META:S:DESC") #'MSDC' "iCalendar"; -resource(2, "META:SNIFF_RULE") #'CSTR' array { +resource(3, "META:SNIFF_RULE") #'CSTR' array { "0.50 ([0]\"BEGIN:VCALENDAR\")" }; -resource(3, "META:EXTENS") message(234) { +resource(4, "META:EXTENS") message(234) { + "extensions" = "ical", + "extensions" = "icalendar", "extensions" = "ics", "extensions" = "ifb", "type" = "text/calendar" diff --git a/src/data/mime_db/text/css b/src/data/mime_db/text/css index 6082506168..c51ec71477 100644 --- a/src/data/mime_db/text/css +++ b/src/data/mime_db/text/css @@ -9,4 +9,3 @@ resource(3, "META:EXTENS") message(234) { "extensions" = "css", "type" = "text/css" }; - diff --git a/src/data/mime_db/text/markdown b/src/data/mime_db/text/markdown new file mode 100644 index 0000000000..daa74c3dfd --- /dev/null +++ b/src/data/mime_db/text/markdown @@ -0,0 +1,12 @@ + +resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime"; + +resource(1, "META:TYPE") "text/markdown"; + +resource(2, "META:S:DESC") #'MSDC' "Markdown file"; + +resource(3, "META:EXTENS") message(234) { + "extensions" = "md", + "extensions" = "markdown", + "type" = "text/markdown" +}; diff --git a/src/data/mime_db/text/x-vcard b/src/data/mime_db/text/vcard similarity index 81% rename from src/data/mime_db/text/x-vcard rename to src/data/mime_db/text/vcard index ecb52f439b..578557f1ee 100644 --- a/src/data/mime_db/text/x-vcard +++ b/src/data/mime_db/text/vcard @@ -1,7 +1,7 @@ resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime"; -resource(1, "META:TYPE") "text/x-vcard"; +resource(1, "META:TYPE") "text/vcard"; resource(2, "META:S:DESC") #'MSDC' "vCard"; @@ -12,5 +12,5 @@ resource(2, "META:SNIFF_RULE") #'CSTR' array { resource(3, "META:EXTENS") message(234) { "extensions" = "vcf", "extensions" = "vcard", - "type" = "text/x-vcard" + "type" = "text/vcard" }; diff --git a/src/data/mime_db/text/x-jamfile b/src/data/mime_db/text/x-jamfile index 3478ecaecd..253aefbda5 100644 --- a/src/data/mime_db/text/x-jamfile +++ b/src/data/mime_db/text/x-jamfile @@ -9,6 +9,11 @@ resource(2, "META:SNIFF_RULE") #'CSTR' array { resource(3, "META:S:DESC") #'MSDC' "Jamfile"; +resource(4, "META:EXTENS") message(234) { + "extensions" = "jam", + "type" = "text/x-jamfile" +}; + resource(5, "META:PREF_APP") #'MSIG' "application/x-vnd.beunited.pe"; resource(6, "META:ICON") #'VICN' array { diff --git a/src/data/mime_db/text/x-makefile b/src/data/mime_db/text/x-makefile index 58f9f4068a..ad14491863 100644 --- a/src/data/mime_db/text/x-makefile +++ b/src/data/mime_db/text/x-makefile @@ -9,6 +9,12 @@ resource(2, "META:SNIFF_RULE") #'CSTR' array { resource(3, "META:S:DESC") #'MSDC' "Makefile"; +resource(4, "META:EXTENS") message(234) { + "extensions" = "mk", + "extensions" = "mak", + "type" = "text/x-makefile" +}; + resource(5, "META:PREF_APP") #'MSIG' "application/x-vnd.beunited.pe"; resource(6, "META:ICON") #'VICN' array { diff --git a/src/data/mime_db/text/x-source-code b/src/data/mime_db/text/x-source-code index 46d82f18f9..7906b4d4ab 100644 --- a/src/data/mime_db/text/x-source-code +++ b/src/data/mime_db/text/x-source-code @@ -4,7 +4,7 @@ resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime"; resource(1, "META:TYPE") "text/x-source-code"; resource(2, "META:SNIFF_RULE") #'CSTR' array { - "0.20 ([0]\"//\" | [0]\"/*\" | [0:32]\"#include\" | [0:3" + "0.30 ([0]\"//\" | [0]\"/*\" | [0:32]\"#include\" | [0:3" "2]\"#ifndef\" | [0:32]\"#ifdef\" | [0]\"SUMMARY=\")" }; diff --git a/src/data/mime_db/text/x-vnd.be.resourcedef b/src/data/mime_db/text/x-vnd.be.resourcedef index f75cd9391d..afcb4d0986 100644 --- a/src/data/mime_db/text/x-vnd.be.resourcedef +++ b/src/data/mime_db/text/x-vnd.be.resourcedef @@ -3,21 +3,18 @@ resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime"; resource(1, "META:TYPE") "x-vnd.be.resourcedef"; -//resource(2, "META:SNIFF_RULE") #'CSTR' array { -// "0.20 ([0]\"//\" | [0]\"/*\" | [0:32]\"#include\" | [0:3" -// "2]\"#ifndef\" | [0:32]\"#ifdef\")" -//}; +resource(2, "META:PREF_APP") #'MSIG' "application/x-vnd.beunited.pe"; -resource(2, "META:S:DESC") #'MSDC' "Source for generating a resource file."; +resource(3, "META:S:DESC") #'MSDC' "Resource definition file"; -resource(3, "META:EXTENS") message(234) { +resource(4, "META:L:DESC") #'MLDC' "Source for generating a resource file"; + +resource(5, "META:EXTENS") message(234) { "extensions" = "rdef", "type" = "text/x-vnd.be.resourcedef" }; -//resource(5, "META:PREF_APP") #'MSIG' "application/x-vnd.beunited.pe"; - -resource(4, "META:ICON") #'VICN' array { +resource(6, "META:ICON") #'VICN' array { $"6E63696607050102000603399E0F3D9C0ABF82B23B84A94B88504870C900A5B1" $"FFBCEAF1FFFFB3B8FF020106023E49240000000000003CAAAA4940004A3000FF" $"C0D5FF7C896EFF040192020006023A4BAE3411A9B629883C6629495368484715"