From 922d5294ecd6cd8d986b6bbd5ca6ad1a5c0683ef Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 23 Nov 2023 16:51:58 +0530 Subject: [PATCH] Add mimetype for ReStructuredText Signed-off-by: Anupam Kumar --- lib/private/Repair/RepairMimeTypes.php | 12 ++++++++++++ resources/config/mimetypealiases.dist.json | 1 + resources/config/mimetypemapping.dist.json | 1 + version.php | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 4d15dda45dd37..8db8b9c933c3f 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -246,6 +246,14 @@ private function introduceEmlAndMsgFormatType() { return $this->updateMimetypes($updatedMimetypes); } + private function introduceReStructuredTextFormatType() { + $updatedMimetypes = [ + 'rst' => 'text/x-rst', + ]; + + return $this->updateMimetypes($updatedMimetypes); + } + /** * Fix mime types */ @@ -310,5 +318,9 @@ public function run(IOutput $out) { if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) { $out->info('Fixed eml and msg mime type'); } + + if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.3', '<') && $this->introduceReStructuredTextFormatType()) { + $out->info('Fixed ReStructured Text mime type'); + } } } diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json index 6b0bcf3e59aba..40144878465dc 100644 --- a/resources/config/mimetypealiases.dist.json +++ b/resources/config/mimetypealiases.dist.json @@ -106,6 +106,7 @@ "text/x-java-source": "text/code", "text/x-ldif": "text/code", "text/x-python": "text/code", + "text/x-rst": "text", "text/x-shellscript": "text/code", "web": "text/code", "application/internet-shortcut": "link", diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index c98e33756b667..2386a4b050767 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -173,6 +173,7 @@ "rar": ["application/x-rar-compressed"], "reveal": ["text/reveal"], "rss": ["application/rss+xml"], + "rst": ["text/x-rst"], "rtf": ["text/rtf"], "rw2": ["image/x-dcraw"], "schema": ["text/plain"], diff --git a/version.php b/version.php index df6eb7ba39087..b4b6ff2845ee6 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level // when updating major/minor version number. -$OC_Version = [29, 0, 0, 2]; +$OC_Version = [29, 0, 0, 3]; // The human-readable string $OC_VersionString = '29.0.0 dev';