Skip to content

[stable28] Support excalidraw file type #46712

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

Merged
skjnldsv merged 3 commits into from
Jul 27, 2024
Merged

[stable28] Support excalidraw file type #46712

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3143bf
feat: support excalidraw file
hweihwang Jun 27, 2024
facb17b
fix: Adapt icon color to new default for mime icons
juliusknorr Jun 13, 2024
da0353d
feat: support excalidraw file
hweihwang Jul 25, 2024
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
Prev Previous commit
feat: support excalidraw file 
Signed-off-by: Hoang Pham <[email protected]>
  • Loading branch information
@hweihwang
hweihwang committed Jul 25, 2024
commit da0353dc6a95159581cd7c65f4e0fab8ccfe09ea
40 changes: 4 additions & 36 deletions lib/private/Repair/RepairMimeTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,28 +308,6 @@ private function introduceEmlAndMsgFormatType(): IResult|int|null {
return $this->updateMimetypes($updatedMimetypes);
}

/**
* @throws Exception
*/
private function introduceAacAudioType(): IResult|int|null {
$updatedMimetypes = [
'aac' => 'audio/aac',
];

return $this->updateMimetypes($updatedMimetypes);
}

/**
* @throws Exception
*/
private function introduceReStructuredTextFormatType(): IResult|int|null {
$updatedMimetypes = [
'rst' => 'text/x-rst',
];

return $this->updateMimetypes($updatedMimetypes);
}

/**
* @throws Exception
*/
Expand All @@ -341,13 +319,11 @@ public function migrationsAvailable(): bool {
}

private function getMimeTypeVersion(): string {
$serverVersion = $this->config->getSystemValueString('version', '0.0.0');
// 29.0.0.10 is the last version with a mimetype migration before it was moved to a separate version number
if (version_compare($serverVersion, '29.0.0.10', '>')) {
return $this->config->getAppValue('files', 'mimetype_version', '29.0.0.10');
$mimeVersion = $this->config->getAppValue('files', 'mimetype_version', '');
if ($mimeVersion) {
return $mimeVersion;
}

return $serverVersion;
return $this->config->getSystemValueString('version', '0.0.0');
}

/**
Expand Down Expand Up @@ -418,14 +394,6 @@ public function run(IOutput $out): void {
$out->info('Fixed eml and msg mime type');
}

if (version_compare($mimeTypeVersion, '29.0.0.6', '<') && $this->introduceAacAudioType()) {
$out->info('Fixed aac mime type');
}

if (version_compare($mimeTypeVersion, '29.0.0.10', '<') && $this->introduceReStructuredTextFormatType()) {
$out->info('Fixed ReStructured Text mime type');
}

if (version_compare($mimeTypeVersion, '30.0.0.0', '<') && $this->introduceExcalidrawType()) {
Copy link
Member

@nickvergessen nickvergessen Aug 21, 2024

Choose a reason for hiding this comment

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

Should have been adjusted to 28.0.9

$out->info('Fixed Excalidraw mime type');
}
Expand Down
6 changes: 3 additions & 3 deletions tests/data/integritycheck/mimetypeListModified/core/signature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"hashes": {
"core\/js\/mimetypelist.js": "507bb72181a0213598eaa03dbb6f7290b367e06b706aa15873a921c491980a13165c9858924d9b4b478b8444e92bb5e4169f5f971d184b77a63c3fcc5b3acf59"
"core\/js\/mimetypelist.js": "abe5724362ef2a9f1ee549ff3e9a37e6a9438b5ebaafaa945e10eeb7fdad26f93b814ece0db43343a434fcc6bf26b59930b2c914f90611bcb29f746acf0c0aa4"
},
"signature": "qGQx9Sy0ynziPeir6H7dIsTdSjjOrLEEbB+sf00sWpmQ\/izXW9Zd7jeTKgMHfrew+d+NyyR3O5V1m\/FkMtmp61LM1l22VpyuiRctFOs1qSxXmDRu27LLIP3d2yayLqpROOEdJSMgDoQU1yGV05bnK0u2yy3srxZa2XUjTaDRT5M+xRBPuc1CtEQ1azp07Xk7N2FnoGjc3\/TusodpHovlKwUg5uSX5nC5da7KJWJ9luM4B\/etl717Hrauw5xIgi+AryuIjhahaYvnIJcM0yZYkZ7KIqOa6Y\/SZFRC0+kB+KJdu3+ZJ4RTTnxmVVcQ4DN2fEozjr6ZDZGaRY+TnF8UaPopba5xDipHq8A4Qm0DWewOG9G4CFdJViGHYFTmIMWealugQLY6ucDcaYaw+kqa66Es7VX0Use0WJFymlleDchqaRWd1n18rEBjEBmDc8s4pQeXZRu8nCxngYUyKrImKWdLpTnxgThqFTukT\/zkaP6klXWydfISK07aKlil7ha84Ud83g71SwIsq3x4y7BSeXyZGRdkzImqlSwgz60u1ndG6m\/cG3Es01v6ao26H4Rs28deLQfBMR6xdKZn272Dsm\/shyXlj4ElZ4jtxqJk5EfBC0Jv6xOsfEIxgdJ7igU52CYrQVhdKQf+4O8XnRth0qvFBTv7btiRCPZflsQ+mRs=",
"signature": "JAEwvDOH764Q4LJJJpG77annu7EqnTUtSSWf2yL87S1BHaq5M9S7jQhJaowtoqiM4awH4uu\/KrKhqG\/YvpkKlL5I7Uluyrq7qJnYv3NDlnkc0oNlBdMLvgFbZHo8+MBFCoYo8BFuzNkgMQI7HTEg\/XYZErB9joCg40Ht502efHf5glUgDA0RU3fMKL0WJFaTeN\/oemKyqNKT5adtPjDzCd7Yk5dg32+oWnwHd5Cjt0lzzKUsvDVCIcbySnA7OJqo1WumlgvgKlCpGelELXmEDlN+WZrq3DRExOS24FGQremzCqS3Yu6VaWLk9rDbXKvxosNgIynLfcB48kAuh6Ynnc+li2ocVCpkBz+BVWOC\/QGBnjmYm4qX6OAkrTanDt4V7Uj2NLl\/HdgjzD9jT5j49xPqFlC6gPLn+4J1TRzuADKFATIQJHL19puGkH5TRvUPEEEur2f+2mDRP76YD5nm+gjpR36jUbLCFtRXEtAndaoc1J+gC12bhnhLuSjLtJtQYpqlG78uXlUp1QzMZvnt\/ZFLDCb0Hfadajj6ZxwC7\/CCAdaq75ManJvpXwCBf3j47WiIQIkoqGgCf+90sN8UUrnCJP8cPU0tZ0vt10+ahG3FCbPa5q+Gsh6g6\/+A43qXAj0x0wKRX77DWMMFSUrfffeaufcvGSotm1ix3+zRI5U=",
"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-----"
}
}