aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2024-09-19 00:22:16 +0200
committerGitHub <noreply@github.com>2024-09-19 00:22:16 +0200
commitdf2711d23ebe9e37052ce16717d96e903970bbbf (patch)
tree0ef2ea6b8256c71dcd5f4878f506b1755d566d34
parent063d4df47899dc626e025ec1760bccf356f16d9d (diff)
parent397910cd1d6d8c5e89ec05573db9db0e54cf784a (diff)
downloadnextcloud-server-df2711d23ebe9e37052ce16717d96e903970bbbf.tar.gz
nextcloud-server-df2711d23ebe9e37052ce16717d96e903970bbbf.zip
Merge pull request #48163 from nextcloud/feat/nfo
feat: add nfo file support
-rw-r--r--lib/private/Repair/RepairMimeTypes.php1
-rw-r--r--resources/config/mimetypealiases.dist.json1
-rw-r--r--resources/config/mimetypemapping.dist.json1
-rw-r--r--tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js1
-rw-r--r--tests/data/integritycheck/mimetypeListModified/core/signature.json4
5 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index 30ef11ab190..6ff6d1ddd94 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -331,6 +331,7 @@ class RepairMimeTypes implements IRepairStep {
private function introduceZstType(): IResult|int|null {
$updatedMimetypes = [
'zst' => 'application/zstd',
+ 'nfo' => 'text/x-nfo',
];
return $this->updateMimetypes($updatedMimetypes);
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 05af6382e30..1837c242ded 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -115,6 +115,7 @@
"text/x-h": "text/code",
"text/x-java-source": "text/code",
"text/x-ldif": "text/code",
+ "text/x-nfo": "text/code",
"text/x-python": "text/code",
"text/x-rst": "text",
"text/x-shellscript": "text/code",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 6f1f25f2718..705fed26f92 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -130,6 +130,7 @@
"mt2s": ["video/MP2T"],
"mts": ["video/MP2T"],
"nef": ["image/x-dcraw"],
+ "nfo": ["text/x-nfo"],
"numbers": ["application/x-iwork-numbers-sffnumbers"],
"odf": ["application/vnd.oasis.opendocument.formula"],
"odg": ["application/vnd.oasis.opendocument.graphics"],
diff --git a/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js b/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js
index 8abdedbe667..6a1155bca9f 100644
--- a/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js
+++ b/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js
@@ -115,6 +115,7 @@ OC.MimeTypeList={
"text/x-h": "text/code",
"text/x-java-source": "text/code",
"text/x-ldif": "text/code",
+ "text/x-nfo": "text/code",
"text/x-python": "text/code",
"text/x-rst": "text",
"text/x-shellscript": "text/code",
diff --git a/tests/data/integritycheck/mimetypeListModified/core/signature.json b/tests/data/integritycheck/mimetypeListModified/core/signature.json
index 92f8fceb817..ef438cfce87 100644
--- a/tests/data/integritycheck/mimetypeListModified/core/signature.json
+++ b/tests/data/integritycheck/mimetypeListModified/core/signature.json
@@ -1,7 +1,7 @@
{
"hashes": {
- "core\/js\/mimetypelist.js": "00127c5b224ade81dbea7909013ba4aad1752206d9e47011250d2c2e488993e9ae6da590d8520fbaad0627959986d5cdfefcd74bd01d422f10e2e63ec5355c8f"
+ "core\/js\/mimetypelist.js": "7e97ad21611677afe305b004f15558df5d5e6c72d52c84ec47473b877336c9c06d6fa3f1a8825a3783230b5d1b24d3f92e5ec30513b20ad9e45b928f8e309be4"
},
- "signature": "jZ9+ptmgPdxYfvbp2qkafRn3cGwiCBVjUeYReiewhnnLS\/fp8ojCnCoFxjq+lf2f7xhqVTCodNwpr9\/BViZtcrCC\/GblRdVSP3Zqw9SaIxJiNHJJt5m8HdN3v3DVmN3AS\/A37fomGn2eZ+r7nkOLO\/w\/U8bhduHhpjQUmFwHDTrCzu5o6Im3huIzEPISnzVp59FATpyOjqOw5RXekJnBNfYu\/5ZP+C8ceYDvZ93ocP3uO+X6Mi8g+kyHSNXoACB6X03d80NWVoEsaK0Jw7imvN7Ir4SwvuxLcqeJDPKWGAgCXm\/7pDA4WcRoX1M2b7Rj2A2zegL49FNrtc+97ch3+9UrzXPLt1spf4ohcRSPSsq7\/TM4v81Jlo4FLPV3uGQx\/j4tti2uwVcwEr4vLwdopqHjFPOHBkhVLdgcePQBJAnt\/gVIANxM+yruGOTMB2KG9zyl343OixdNHVXeGtz69WCUypcDuSWlM+qi0gG9OTlyDu+lElarFviLviz57oTpX13xeHCJC5cApjurWMRUGgW5ehBeyd6Wc5vKKRuoZir570p3nbiKzYPNNBByDgpG4mWVegn\/u6zPbiwnr7YHQHKJCyij0OR2OqtR\/6xMeIvGAGyCeGj4m1DttafSoPXdaQqDAaiLbRO9vsb46TgWbH9vu+p9w7Hk+Y5gufvH22A=",
+ "signature": "tYuXQC0kOyhhjjPI0yGKrfsgEp\/6SzD1FlrgGXDefuCRemnvYeyO0jBLeKmj\/XPMiUb3DX4GilL5poaMZxNcmkRyQ8ELpouIbdjOdWmu7snBTxBrMpcQfrCvClXD5FJXPjoOdE3Nu7BchKLEn4ryJNA61\/M2etFXTxBx0HrfM1BcXC7u2yliHhhJa7i3UBcd6aX+X\/1SQU445kKGb7M3RojADE8jdmu8cZnJw1HxLIibyZnnyEmtpo9r8Ajj3bZetLj77nYQAJSnIR+R0b0Z48QN4Ys+aVyHNOVtd6hKr9atAUA0qGcCDrQZi16xg1KNpHSExOrP0v8SJL3MIBcnlPOXYKeZFy52Um3xiHeMlofGLBNnvg7gla7vutG8MzcMo10ytJRx\/4QwVYEsco8V9pr31TyS29UVszEsj9ZEbwfXb4EcOJn7t4Vv\/9aRXxIvmGj465eM5CrxqPWdgM0cAjwoKzC1LU64vAilhAXwT8wr4Ts+s4fQuZMcZ+SrD03ujRLGVNYGwNNzKlVIHCwuLRoLX+cBdVa3Y+mYf8LdaBCst\/W0MCKDBVAeylf7y9gX3P122J3bIA0PgsAkc66cYRCjcM1+mj0Tr7xlewRR86YQ\/51\/k1bzKPuwoElL3kNNY1TNSDeTvkWoOw4cUgkaAiKp2zeFrLKrmEpN9QY6Mqk=",
"certificate": "-----BEGIN CERTIFICATE-----\r\nMIIEvjCCAqagAwIBAgIUc\/0FxYrsgSs9rDxp03EJmbjN0NwwDQYJKoZIhvcNAQEF\r\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTEw\r\nMzIxMDMzM1oXDTE2MTEwMzIxMDMzM1owDzENMAsGA1UEAwwEY29yZTCCAiIwDQYJ\r\nKoZIhvcNAQEBBQADggIPADCCAgoCggIBALb6EgHpkAqZbO5vRO8XSh7G7XGWHw5s\r\niOf4RwPXR6SE9bWZEm\/b72SfWk\/\/J6AbrD8WiOzBuT\/ODy6k5T1arEdHO+Pux0W1\r\nMxYJJI4kH74KKgMpC0SB0Rt+8WrMqV1r3hhJ46df6Xr\/xolP3oD+eLbShPcblhdS\r\nVtkZEkoev8Sh6L2wDCeHDyPxzvj1w2dTdGVO9Kztn0xIlyfEBakqvBWtcxyi3Ln0\r\nklnxlMx3tPDUE4kqvpia9qNiB1AN2PV93eNr5\/2riAzIssMFSCarWCx0AKYb54+d\r\nxLpcYFyqPJ0ydBCkF78DD45RCZet6PNYkdzgbqlUWEGGomkuDoJbBg4wzgzO0D77\r\nH87KFhYW8tKFFvF1V3AHl\/sFQ9tDHaxM9Y0pZ2jPp\/ccdiqnmdkBxBDqsiRvHvVB\r\nCn6qpb4vWGFC7vHOBfYspmEL1zLlKXZv3ezMZEZw7O9ZvUP3VO\/wAtd2vUW8UFiq\r\ns2v1QnNLN6jNh51obcwmrBvWhJy9vQIdtIjQbDxqWTHh1zUSrw9wrlklCBZ\/zrM0\r\ni8nfCFwTxWRxp3H9KoECzO\/zS5R5KIS7s3\/wq\/w9T2Ie4rcecgXwDizwnn0C\/aKc\r\nbDIjujpL1s9HO05pcD\/V3wKcPZ1izymBkmMyIbL52iRVN5FTVHeZdXPpFuq+CTQJ\r\nQ238lC+A\/KOVAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAGoKTnh8RfJV4sQItVC2\r\nAvfJagkrIqZ3iiQTUBQGTKBsTnAqE1H7QgUSV9vSd+8rgvHkyZsRjmtyR1e3A6Ji\r\noNCXUbExC\/0iCPUqdHZIVb+Lc\/vWuv4ByFMybGPydgtLoEUX2ZrKFWmcgZFDUSRd\r\n9Uj26vtUhCC4bU4jgu6hIrR9IuxOBLQUxGTRZyAcXvj7obqRAEZwFAKQgFpfpqTb\r\nH+kjcbZSaAlLVSF7vBc1syyI8RGYbqpwvtREqJtl5IEIwe6huEqJ3zPnlP2th\/55\r\ncf3Fovj6JJgbb9XFxrdnsOsDOu\/tpnaRWlvv5ib4+SzG5wWFT5UUEo4Wg2STQiiX\r\nuVSRQxK1LE1yg84bs3NZk9FSQh4B8vZVuRr5FaJsZZkwlFlhRO\/\/+TJtXRbyNgsf\r\noMRZGi8DLGU2SGEAHcRH\/QZHq\/XDUWVzdxrSBYcy7GSpT7UDVzGv1rEJUrn5veP1\r\n0KmauAqtiIaYRm4f6YBsn0INcZxzIPZ0p8qFtVZBPeHhvQtvOt0iXI\/XUxEWOa2F\r\nK2EqhErgMK\/N07U1JJJay5tYZRtvkGq46oP\/5kQG8hYST0MDK6VihJoPpvCmAm4E\r\npEYKQ96x6A4EH9Y9mZlYozH\/eqmxPbTK8n89\/p7Ydun4rI+B2iiLnY8REWWy6+UQ\r\nV204fGUkJqW5CrKy3P3XvY9X\r\n-----END CERTIFICATE-----"
} \ No newline at end of file