- |
+ |
|
@@ -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/40': selectedKeys.has(object.key) }"
@click="$emit('select', object)"
>
+
+
+ |
@@ -96,8 +115,18 @@ const props = defineProps<{
hasSearch: boolean
searchTerm: string
error?: string | null
+ selectedKeys: Set
}>()
-defineEmits<{ select: [object: S3Object]; upload: []; retry: [] }>()
+defineEmits<{
+ select: [object: S3Object]
+ upload: []
+ retry: []
+ toggle: [key: string]
+ 'toggle-all': []
+}>()
+
+const allSelected = computed(() => props.objects.length > 0 && props.objects.every((object) => props.selectedKeys.has(object.key)))
+const someSelected = computed(() => !allSelected.value && props.objects.some((object) => props.selectedKeys.has(object.key)))
type SortKey = 'key' | 'size' | 'lastModified'
diff --git a/app/components/popup/MoveObjectsPopup.vue b/app/components/popup/MoveObjectsPopup.vue
new file mode 100644
index 0000000..3b6b1c6
--- /dev/null
+++ b/app/components/popup/MoveObjectsPopup.vue
@@ -0,0 +1,103 @@
+
+
+
+ Objekte
+
+ {{ payload.keys.length }} Objekt{{ payload.keys.length === 1 ? '' : 'e' }} aus
+ {{ payload.sourceBucket }}
+
+
+
+
+
+ Zielbucket
+
+
+ Kein anderer Bucket verfügbar.
+
+
+
+ {{ error }}
+
+
+
+
+
+
+
+
+
diff --git a/app/composables/useS3Client.ts b/app/composables/useS3Client.ts
index f693d23..f99f4d5 100644
--- a/app/composables/useS3Client.ts
+++ b/app/composables/useS3Client.ts
@@ -43,5 +43,49 @@ 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 = encodeCanonicalPath(`/${sourceBucket}/${sourceKey}`)
+ const headers = await signS3Put(destPath, config.public.s3AccessKey, config.public.s3SecretKey, {
+ 'x-amz-copy-source': copySource,
+ })
+ await $fetch(`/api${encodeCanonicalPath(destPath)}`, {
+ method: 'PUT',
+ headers: { ...headers, 'x-amz-copy-source': copySource },
+ })
+ }
+
+ async function moveObject(sourceBucket: string, key: string, destBucket: string): Promise {
+ await copyObject(sourceBucket, key, destBucket, key)
+ await deleteObject(sourceBucket, key)
+ }
+
+ async function moveObjects(
+ sourceBucket: string,
+ keys: string[],
+ destBucket: string,
+ ): Promise<{ key: string; error: unknown }[]> {
+ const failures: { key: string; error: unknown }[] = []
+ for (const key of keys) {
+ try {
+ await moveObject(sourceBucket, key, destBucket)
+ }
+ catch (error) {
+ failures.push({ key, error })
+ }
+ }
+ return failures
+ }
+
+ return {
+ listBuckets,
+ listObjects,
+ downloadObject,
+ getObjectText,
+ uploadObject,
+ deleteObject,
+ copyObject,
+ moveObject,
+ moveObjects,
+ }
}
diff --git a/app/utils/sigv4.ts b/app/utils/sigv4.ts
index 0de4ad5..7afb9c4 100644
--- a/app/utils/sigv4.ts
+++ b/app/utils/sigv4.ts
@@ -11,22 +11,38 @@ export async function signS3Get(path: string, accessKey: string, secretKey: stri
return signS3('GET', path, await sha256Hex(''), accessKey, secretKey)
}
-export async function signS3Put(path: string, accessKey: string, secretKey: string): Promise {
- return signS3('PUT', path, 'UNSIGNED-PAYLOAD', accessKey, secretKey)
+export async function signS3Put(
+ path: string,
+ accessKey: string,
+ secretKey: string,
+ extraHeaders?: Record,
+): Promise {
+ return signS3('PUT', path, 'UNSIGNED-PAYLOAD', accessKey, secretKey, extraHeaders)
}
export async function signS3Delete(path: string, accessKey: string, secretKey: string): Promise {
return signS3('DELETE', path, await sha256Hex(''), accessKey, secretKey)
}
-async function signS3(method: string, path: string, payloadHash: string, accessKey: string, secretKey: string): Promise {
+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 = {
+ const unsortedHeaderValues: Record = {
'x-amz-content-sha256': payloadHash,
'x-amz-date': amzDate,
+ ...extraHeaders,
}
+ const signedHeaderValues = Object.fromEntries(
+ Object.entries(unsortedHeaderValues).sort(([a], [b]) => a.localeCompare(b)),
+ )
const signedHeaders = Object.keys(signedHeaderValues).join(';')
const canonicalHeaders = Object.entries(signedHeaderValues)
.map(([name, value]) => `${name}:${value}\n`)
|