tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-07-09 03:06:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into chore/backup-wakelock

Browse Source
This commit is contained in:
Saschl 2024-08-20 23:17:26 +02:00 committed by GitHub
commit d2ebcd6248
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/Dockerfile
View File

@ -1,5 +1,5 @@
# dev build
FROM ghcr.io/immich-app/base-server-dev:20240813@sha256:2e204a2256c088c9e4a0cf34cc9f70f9196c05e8744004000e7d2889466fc735 AS dev
FROM ghcr.io/immich-app/base-server-dev:20240820@sha256:a28296b40c1247e539894ac4013e6a3e20588d5aefe697fe2ada15f1bd23f6e5 AS dev
RUN apt-get install --no-install-recommends -yqq tini
WORKDIR /usr/src/app

22
web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
View File

@ -40,11 +40,23 @@
return handleFiles(dataTransfer.files);
}
const transferEntries = Array.from(dataTransfer.items)
.map((i: DataTransferItem) => i.webkitGetAsEntry())
.filter((i) => i !== null);
const files = await getAllFilesFromTransferEntries(transferEntries);
return handleFiles(files);
const entries: FileSystemEntry[] = [];
const files: File[] = [];
for (const item of dataTransfer.items) {
const entry = item.webkitGetAsEntry();
if (entry) {
entries.push(entry);
continue;
}
const file = item.getAsFile();
if (file) {
files.push(file);
}
}
const directoryFiles = await getAllFilesFromTransferEntries(entries);
return handleFiles([...files, ...directoryFiles]);
};
const browserSupportsDirectoryUpload = () => typeof DataTransferItem.prototype.webkitGetAsEntry === 'function';