self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-06-17 03:47:45 +02:00
Code Issues Releases Activity

fix(web): remove dependency on rxjs (#3301)

Browse Source 
The dependency on rxjs has been removed in favour of iterators as it's clearer
and the nature of the workload is inherently non-reactive. The uncaught error
when the list of files is empty has also been implicitly fixed by this change.

Fixes: #3300
This commit is contained in:
Thomas
2023-07-17 17:22:29 +01:00
committed by GitHub
parent a2568f711f
commit 8045fd3f14
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
web/src/lib/utils/file-uploader.ts
View File

@ -1,8 +1,7 @@
import { uploadAssetsStore } from '$lib/stores/upload';
import { addAssetsToAlbum, getFilenameExtension } from '$lib/utils/asset-utils';
import { addAssetsToAlbum } from '$lib/utils/asset-utils';
import type { AssetFileUploadResponseDto } from '@api';
import axios from 'axios';
import { combineLatestAll, filter, firstValueFrom, from, mergeMap, of } from 'rxjs';
import { notificationController, NotificationType } from './../components/shared-components/notification/notification';
const extensions = [
@ -70,9 +69,9 @@ export const openFileUploadDialog = async (
if (!target.files) {
return;
}
const files = Array.from<File>(target.files);
const files = Array.from(target.files);
resolve(await fileUploadHandler(files, albumId, sharedKey));
resolve(fileUploadHandler(files, albumId, sharedKey));
};
fileSelector.click();
@ -88,16 +87,33 @@ export const fileUploadHandler = async (
albumId: string | undefined = undefined,
sharedKey: string | undefined = undefined,
) => {
return firstValueFrom(
from(files).pipe(
filter((file) => extensions.includes('.' + getFilenameExtension(file.name))),
mergeMap(async (file) => of(await fileUploader(file, albumId, sharedKey)), 2),
combineLatestAll(),
),
);
const iterable = {
files: files.filter((file) => extensions.some((ext) => file.name.endsWith(ext)))[Symbol.iterator](),
async *[Symbol.asyncIterator]() {
for (const file of this.files) {
yield fileUploader(file, albumId, sharedKey);
}
},
};
const concurrency = 2;
// TODO: use Array.fromAsync instead when it's available universally.
return Promise.all([...Array(concurrency)].map(() => fromAsync(iterable))).then((res) => res.flat());
};
//TODO: should probably use the @api SDK
// polyfill for Array.fromAsync.
//
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fromAsync
const fromAsync = async function <T>(iterable: AsyncIterable<T>) {
const result = [];
for await (const value of iterable) {
result.push(value);
}
return result;
};
// TODO: should probably use the @api SDK
async function fileUploader(
asset: File,
albumId: string | undefined = undefined,
@ -122,7 +138,7 @@ async function fileUploader(
progress: 0,
});
const response = await axios.post(`/api/asset/upload`, formData, {
const response = await axios.post('/api/asset/upload', formData, {
params: {
key: sharedKey,
},