Skip to content

[stable28] Support excalidraw file type - #46712

Merged
skjnldsv merged 3 commits into
stable28from
backport/45353/stable28
Jul 27, 2024
Merged

[stable28] Support excalidraw file type#46712
skjnldsv merged 3 commits into
stable28from
backport/45353/stable28

Conversation

@hweihwang

Copy link
Copy Markdown
Contributor

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

@solracsfsolracsf changed the title Backport: Support excalidraw file type (#45353)[stable28 ] Support excalidraw file typeJul 24, 2024
@solracsfsolracsf changed the title [stable28 ] Support excalidraw file type[stable28] Support excalidraw file typeJul 24, 2024
@solracsfsolracsf added the 3. to review Waiting for reviews label Jul 24, 2024
@solracsfsolracsf 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
Copy Markdown
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
Copy Markdown
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.

hweihwangand 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 stable28Jul 27, 2024
@skjnldsv
skjnldsv deleted the backport/45353/stable28 branch July 27, 2024 14:12
@AltahrimAltahrim mentioned this pull request Aug 8, 2024
3 tasks
$out->info('Fixed eml and msg mime type');
}

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

Copy link
Copy Markdown
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@hweihwang@nickvergessen@blizzz@juliusknorr@skjnldsv@solracsf