- |
+ |
|
@@ -27,8 +37,17 @@
v-else
:key="object.key"
class="cursor-pointer border-b border-border/60 transition-colors hover:bg-surface-raised/35"
+ :class="{ 'bg-accent-dim/30': selectedKeys.has(object.key) }"
@click="$emit('select', object)"
>
+
+
+ |
@@ -96,8 +115,45 @@ const props = defineProps<{
hasSearch: boolean
searchTerm: string
error?: string | null
+ selectedKeys: Set
}>()
-defineEmits<{ select: [object: S3Object]; upload: []; retry: [] }>()
+const emit = defineEmits<{
+ select: [object: S3Object]
+ upload: []
+ retry: []
+ 'update:selectedKeys': [keys: Set]
+}>()
+
+function toggleSelect(key: string) {
+ const next = new Set(props.selectedKeys)
+ if (next.has(key)) {
+ next.delete(key)
+ }
+ else {
+ next.add(key)
+ }
+ emit('update:selectedKeys', next)
+}
+
+const allSelected = computed(() => props.objects.length > 0 && props.objects.every((object) => props.selectedKeys.has(object.key)))
+const someSelected = computed(() => props.objects.some((object) => props.selectedKeys.has(object.key)))
+
+function toggleSelectAll() {
+ if (allSelected.value) {
+ const next = new Set(props.selectedKeys)
+ for (const object of props.objects) {
+ next.delete(object.key)
+ }
+ emit('update:selectedKeys', next)
+ }
+ else {
+ const next = new Set(props.selectedKeys)
+ for (const object of props.objects) {
+ next.add(object.key)
+ }
+ emit('update:selectedKeys', next)
+ }
+}
type SortKey = 'key' | 'size' | 'lastModified'
diff --git a/app/components/popup/BulkDeletePopup.vue b/app/components/popup/BulkDeletePopup.vue
new file mode 100644
index 0000000..86a1f62
--- /dev/null
+++ b/app/components/popup/BulkDeletePopup.vue
@@ -0,0 +1,152 @@
+
+
+
+
+ {{ hasErrors ? 'close' : 'check' }}
+
+
+ {{ hasErrors
+ ? `${errorCount} von ${queue.length} Objekt${queue.length === 1 ? '' : 'en'} fehlgeschlagen`
+ : `${successCount} Objekt${successCount === 1 ? '' : 'e'} gelöscht` }}
+
+
+
+ {{ successCount }} erfolgreich, {{ errorCount }} fehlgeschlagen. Nochmal versuchen?
+
+
+
+
+
+
+
+
+
+ {{ queue.length }} Objekt{{ queue.length === 1 ? '' : 'e' }} werden unwiderruflich aus "{{ bucket }}" gelöscht.
+
+
+
+
+
+ {{ statusIcon(item.status) }}
+
+ {{ item.key }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/components/popup/BulkMovePopup.vue b/app/components/popup/BulkMovePopup.vue
new file mode 100644
index 0000000..72911dd
--- /dev/null
+++ b/app/components/popup/BulkMovePopup.vue
@@ -0,0 +1,206 @@
+
+
+
+
+ {{ hasErrors ? 'close' : 'check' }}
+
+
+ {{ hasErrors
+ ? `${errorCount} von ${queue.length} Objekt${queue.length === 1 ? '' : 'en'} fehlgeschlagen`
+ : `${successCount} Objekt${successCount === 1 ? '' : 'e'} verschoben` }}
+
+
+
+ {{ successCount }} erfolgreich, {{ errorCount }} fehlgeschlagen. Nochmal versuchen?
+
+
+
+
+
+
+
+
+
+ Zielbucket
+
+
+
+
+ Zielpfad (optional)
+
+ folder
+
+ {{ destBucket || '–' }}/
+
+
+
+
+ Objekte behalten ihren Dateinamen, werden aber unter diesem Pfad im Zielbucket abgelegt.
+
+
+
+
+
+
+ {{ statusIcon(item.status) }}
+
+ {{ item.key }}
+
+
+
+
+ Ziel entspricht dem aktuellen Ort — das würde nichts verschieben.
+
+
+
+
+
+
+
+
+
+
diff --git a/app/composables/useS3Client.ts b/app/composables/useS3Client.ts
index f693d23..d58e1d7 100644
--- a/app/composables/useS3Client.ts
+++ b/app/composables/useS3Client.ts
@@ -1,4 +1,4 @@
-import { signS3Get, signS3Put, signS3Delete, encodeCanonicalPath } from '~/utils/sigv4'
+import { signS3Get, signS3Put, signS3Delete, signS3Copy, encodeCanonicalPath } from '~/utils/sigv4'
import { parseBucketsXml, parseObjectsXml, type S3Bucket, type S3Object } from '~/utils/s3xml'
export function useS3Client() {
@@ -43,5 +43,17 @@ export function useS3Client() {
await $fetch(`/api${encodeCanonicalPath(path)}`, { method: 'DELETE', headers })
}
- return { listBuckets, listObjects, downloadObject, getObjectText, uploadObject, deleteObject }
+ async function copyObject(sourceBucket: string, sourceKey: string, destBucket: string, destKey: string): Promise {
+ const destPath = `/${destBucket}/${destKey}`
+ const copySource = `/${sourceBucket}/${sourceKey}`
+ const headers = await signS3Copy(destPath, copySource, config.public.s3AccessKey, config.public.s3SecretKey)
+ await $fetch(`/api${encodeCanonicalPath(destPath)}`, { method: 'PUT', headers })
+ }
+
+ async function moveObject(sourceBucket: string, sourceKey: string, destBucket: string, destKey: string): Promise {
+ await copyObject(sourceBucket, sourceKey, destBucket, destKey)
+ await deleteObject(sourceBucket, sourceKey)
+ }
+
+ return { listBuckets, listObjects, downloadObject, getObjectText, uploadObject, deleteObject, copyObject, moveObject }
}
diff --git a/app/utils/sigv4.ts b/app/utils/sigv4.ts
index 0de4ad5..78295f4 100644
--- a/app/utils/sigv4.ts
+++ b/app/utils/sigv4.ts
@@ -19,17 +19,31 @@ export async function signS3Delete(path: string, accessKey: string, secretKey: s
return signS3('DELETE', path, await sha256Hex(''), accessKey, secretKey)
}
-async function signS3(method: string, path: string, payloadHash: string, accessKey: string, secretKey: string): Promise {
+export async function signS3Copy(path: string, copySource: string, accessKey: string, secretKey: string): Promise {
+ const headers = await signS3('PUT', path, await sha256Hex(''), accessKey, secretKey, { 'x-amz-copy-source': encodeCanonicalPath(copySource) })
+ return { ...headers, 'x-amz-copy-source': encodeCanonicalPath(copySource) }
+}
+
+async function signS3(
+ method: string,
+ path: string,
+ payloadHash: string,
+ accessKey: string,
+ secretKey: string,
+ extraHeaders: Record = {},
+): Promise {
const amzDate = toAmzDate(new Date())
const dateStamp = amzDate.slice(0, 8)
const signedHeaderValues: Record = {
+ ...extraHeaders,
'x-amz-content-sha256': payloadHash,
'x-amz-date': amzDate,
}
- const signedHeaders = Object.keys(signedHeaderValues).join(';')
- const canonicalHeaders = Object.entries(signedHeaderValues)
- .map(([name, value]) => `${name}:${value}\n`)
+ const sortedHeaderNames = Object.keys(signedHeaderValues).sort()
+ const signedHeaders = sortedHeaderNames.join(';')
+ const canonicalHeaders = sortedHeaderNames
+ .map((name) => `${name}:${signedHeaderValues[name]}\n`)
.join('')
const canonicalRequest = [method, encodeCanonicalPath(path), '', canonicalHeaders, signedHeaders, payloadHash].join('\n')
|