fixed merge conflicts

src/routes/(angemeldet)/upload/+page.server.ts

@@ -0,0 +1,110 @@
+import { Buffer } from 'buffer';
+/** import Minio from 'minio'; */
+import { Readable } from 'stream';
+import { client } from '$lib/minio';
+import { fail } from '@sveltejs/kit';
+
+const isRequiredFieldValid = (value: unknown) => {
+	if (value == null) return false;
+
+	if (typeof value === 'string' || value instanceof String) return value.trim() !== '';
+
+	return true;
+}
+
+export const actions = {
+	url: async ({ request }: {request: Request}) => {
+		const data = await request.formData();
+		const vorgang = data.get('vorgang');
+		const name = data.get('name');
+		const type = data.get('type');
+		const code = data.get('zugangscode');
+		const fileName = data.get('fileName');
+
+		let objectName = `${vorgang}/${name}`;
+		switch (type) {
+			case 'image/png':
+				if (!objectName.endsWith('.png')) objectName += '.png';
+				break;
+			case '':
+				if (fileName?.toString().endsWith('.glb') && !objectName.endsWith('.glb')) objectName += '.glb';
+		}
+
+		const url = await client.presignedPutObject('tatort', objectName);
+
+		// store code in S3
+		// tatort/<vorgang>/__perm__
+		const code_filename = '__perm__';
+		const buf = Buffer.from(code, 'utf-8');
+		const code_stream = Readable.from(buf);
+		const code_path = `${vorgang}/${code_filename}`;
+		await client.putObject('tatort', code_path, code_stream);
+
+		return { url };
+	},
+	validate: async ({ request }: {request: Request}) => {
+		const requestData = await request.formData();
+		const data = Object.fromEntries(requestData);
+		const vorgang = data.vorgang;
+		const name = data.name;
+		const zugangscode = data.zugangscode;
+		let success = true;
+		const err = {};
+
+		if (isRequiredFieldValid(vorgang)) err.vorgang = null;
+		else {
+			err.vorgang = 'Das Feld Vorgang darf nicht leer bleiben.';
+			success = false;
+		}
+
+		if (isRequiredFieldValid(name)) err.name = null;
+		else {
+			err.name = 'Das Feld Name darf nicht leer bleiben.';
+			success = false;
+		}
+
+		if (isRequiredFieldValid(zugangscode)) err.zugangscode = null;
+		else {
+			err.zugangscode = 'Das Feld Zugangscode darf nicht leer bleiben.';
+			success = false;
+		}
+
+		if (success) return { success };
+
+		return fail(400, err);
+	},
+
+	upload: async ({ request }: {request: Request}) => {
+		const requestData = await request.formData();
+		const data = Object.fromEntries(requestData);
+		const vorgang = data.vorgang;
+		const name = data.name;
+
+		const url = await client.presignedPutObject('tatort', `${vorgang}/${name}`, 60);
+
+		return { url };
+	},
+	upload3: async ({ request }: {request: Request}) => {
+		const requestData = await request.formData();
+		const data = Object.fromEntries(requestData);
+		const name = data.name;
+		const stream = data.file.stream();
+		const metaData = { 'Content-Type': 'model-gtlf-binary', 'X-VorgangsNr': '4711' };
+		const result = new Promise((resolve, reject) => {
+			client.putObject('tatort', name, Readable.from(stream), metaData, function (err, etag) {
+				if (err) return reject(err);
+				resolve(etag);
+			});
+		});
+		let etag = null;
+		let error = null;
+		try {
+			etag = await result;
+		} catch (err) {
+			error = err;
+			console.log('Error:', err);
+		}
+
+		return { etag, error };
+	}
+};