[stable35] fix(editor): save a JPEG with an uppercase extension as a JPEG

css/viewer-init.css

@@ -1,5 +1,5 @@
 /* extracted by css-entry-points-plugin */
-@import './init-Bw8QmU3q.chunk.css';
+@import './init-DcwdQ_Lh.chunk.css';
 @import './previewUtils-CU5qdRbf.chunk.css';
 @import './NcIconSvgWrapper-Bui9PhAS-3xIBDiQU.chunk.css';
 @import './NcActionButton-BjaRp7qa.chunk.css';

playwright/e2e/actions/edit.spec.ts

@@ -3,17 +3,25 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { User } from '@nextcloud/e2e-test-server'
 import type { Page } from '@playwright/test'
 
 import { expect, setupFilesPage, test } from '../../support/fixtures.ts'
 import { getRowForFile, openFile } from '../../support/filesUtils.ts'
 import { getCloseButton, getEditButton, getViewer, getViewerName } from '../../support/viewerUtils.ts'
+import { getFileContents } from '../../support/webdav.ts'
 
 test.describe.serial('Open the new saved as image', () => {
 	let page: Page
+	let user: User
 
 	test.beforeAll(async ({ browser }) => {
-		({ page } = await setupFilesPage(browser, [{ fixture: 'image1.jpg', mimeType: 'image/jpeg' }]))
+		({ page, user } = await setupFilesPage(browser, [
+			{ fixture: 'image1.jpg', mimeType: 'image/jpeg' },
+			// Cameras name their files in uppercase
+			{ fixture: 'image1.jpg', mimeType: 'image/jpeg', target: '/ABC1234.JPG' },
+			{ fixture: 'image1.jpg', mimeType: 'image/jpeg', target: '/ABC1234.JPEG' },
+		]))
 	})
 
 	test.afterAll(async () => {
@@ -51,4 +59,34 @@ test.describe.serial('Open the new saved as image', () => {
 	test('See the new saved image in the list', async () => {
 		await expect(getRowForFile(page, 'imageSave.jpg')).toContainText('imageSave .jpg')
 	})
+
+	for (const [sourceName, savedName] of [
+		['ABC1234.JPG', 'imageSaveUppercase.JPG'],
+		['ABC1234.JPEG', 'imageSaveUppercase.JPEG'],
+	] as const) {
+		test(`Save ${sourceName} as a JPEG`, async () => {
+			await openFile(page, sourceName)
+			await getEditButton(page).click()
+			await page.locator('.FIE_topbar-save-button').click()
+
+			const nameInput = page.locator('input[type="text"].SfxInput-Base')
+			await nameInput.clear()
+			await nameInput.fill(savedName.slice(0, savedName.lastIndexOf('.')))
+
+			const upload = page.waitForResponse((response) => response.request().method() === 'PUT'
+				&& decodeURIComponent(new URL(response.url()).pathname).endsWith(`/${savedName}`))
+			await page.locator('.SfxModal-Container button[color="primary"].SfxButton-root')
+				.filter({ hasText: 'Save' })
+				.click()
+
+			expect((await upload).ok()).toBe(true)
+
+			// JPEG magic bytes, not PNG's
+			const saved = await getFileContents(user, `/${savedName}`)
+			expect(saved.subarray(0, 2)).toEqual(Buffer.from([0xFF, 0xD8]))
+
+			await page.locator('.FIE_topbar-close-button').click()
+			await getCloseButton(page).click()
+		})
+	}
 })

playwright/support/webdav.ts

@@ -90,6 +90,23 @@ export async function uploadFile(
 	}
 }
 
+/**
+ * Download a file from the user's DAV root.
+ *
+ * @param user the file owner
+ * @param target the DAV path relative to the user root
+ */
+export async function getFileContents(user: User, target: string): Promise<Buffer> {
+	const api = await getUserApi(user)
+	try {
+		const response = await api.get(davPath(user, target))
+		expect(response.ok(), `download of ${target} expected 2xx, got ${response.status()}`).toBeTruthy()
+		return await response.body()
+	} finally {
+		await api.dispose()
+	}
+}
+
 /**
  * Create a folder in the user's DAV root (MKCOL).
  *

src/components/ImageEditor.vue

@@ -277,8 +277,9 @@ export default {
 				}
 			}
 
-			// toBlob is not very smart...
-			mimeType = mimeType.replace('jpg', 'jpeg')
+			// toBlob is not very smart: it takes neither image/jpg nor an
+			// uppercase type like image/JPG, and silently falls back to PNG
+			mimeType = mimeType.toLowerCase().replace('jpg', 'jpeg')
 
 			// Sanity check, 0 < quality < 1
 			quality = Math.max(Math.min(quality, 1), 0) || 1