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.

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

[stable28] Support excalidraw file type #46712

Merged
merged 3 commits into from
Jul 27, 2024
Merged

Conversation

hweihwang
Copy link
Contributor

Backport of PR #45353 to stable28. Adds support for excalidraw file type, including mime type recognition and icon.

@hweihwang hweihwang requested review from blizzz and juliusknorr July 24, 2024 08:31
@solracsf solracsf changed the title Backport: Support excalidraw file type (#45353) [stable28 ] Support excalidraw file type Jul 24, 2024
@solracsf solracsf changed the title [stable28 ] Support excalidraw file type [stable28] Support excalidraw file type Jul 24, 2024
@solracsf solracsf added the 3. to review Waiting for reviews label Jul 24, 2024
@solracsf solracsf added this to the Nextcloud 28.0.9 milestone Jul 24, 2024
Comment on lines 421 to 427
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');
}
Copy link
Member

Choose a reason for hiding this comment

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

We can skip those in the backport.

Comment on lines 344 to 350
$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');
}
return $this->config->getSystemValueString('version', '0.0.0');

return $serverVersion;
Copy link
Member

Choose a reason for hiding this comment

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

We can keep the existing logic and just increase the patch version in apps/files/appinfo/info.xml by one.

hweihwang and others added 3 commits July 25, 2024 16:59
Signed-off-by: Hoang Pham <hoangmaths96@gmail.com>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Hoang Pham <hoangmaths96@gmail.com>
@skjnldsv skjnldsv merged commit f4b4485 into stable28 Jul 27, 2024
55 checks passed
@skjnldsv skjnldsv deleted the backport/45353/stable28 branch July 27, 2024 14:12
@Altahrim Altahrim mentioned this pull request Aug 8, 2024
3 tasks
@@ -330,6 +394,10 @@ public function run(IOutput $out) {
$out->info('Fixed eml and msg mime type');
}

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants