Add multiple files uploading

[arvados-workbench2.git] / src / services / collection-service / collection-service.ts

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index 88f3daef37a6bba795a35f2c8e386767f9ee9f6b..cf2d53e805fbe41e190ab13895d90348ccf894ce 100644 (file)
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -7,36 +7,86 @@ import { CollectionResource } from "../../models/collection";
 import axios, { AxiosInstance } from "axios";
 import { KeepService } from "../keep-service/keep-service";
 import { FilterBuilder } from "../../common/api/filter-builder";
+import { CollectionFile, CollectionFileType, createCollectionFile } from "../../models/collection-file";
+import { parseKeepManifestText, stringifyKeepManifest } from "../collection-files-service/collection-manifest-parser";
+import * as _ from "lodash";
+import { KeepManifestStream } from "../../models/keep-manifest";
 
 export class CollectionService extends CommonResourceService<CollectionResource> {
     constructor(serverApi: AxiosInstance, private keepService: KeepService) {
         super(serverApi, "collections");
     }
 
-    uploadFiles(files: File[]) {
-        console.log("Uploading files", files);
-
+    uploadFile(keepServiceHost: string, file: File, fileIdx = 0): Promise<CollectionFile> {
         const fd = new FormData();
-        fd.append("filters", `[["service_type","=","proxy"]]`);
-        fd.append("_method", "GET");
+        fd.append(`file_${fileIdx}`, file);
 
-        const filters = new FilterBuilder();
-        filters.addEqual("service_type", "proxy");
+        return axios.post<string>(keepServiceHost, fd, {
+            onUploadProgress: (e: ProgressEvent) => {
+                console.log(`${e.loaded} / ${e.total}`);
+            }
+        }).then(data => createCollectionFile({
+            id: data.data,
+            name: file.name,
+            size: file.size
+        }));
+    }
 
-        return this.keepService.list({ filters }).then(data => {
-            console.log(data);
+    private async updateManifest(collectionUuid: string, files: CollectionFile[]): Promise<CollectionResource> {
+        const collection = await this.get(collectionUuid);
+        const manifest: KeepManifestStream[] = parseKeepManifestText(collection.manifestText);
 
-            const serviceHost = (data.items[0].serviceSslFlag ? "https://" : "http://") + data.items[0].serviceHost + ":" + data.items[0].servicePort;
-            console.log("Servicehost", serviceHost);
+        files.forEach(f => {
+            let kms = manifest.find(stream => stream.name === f.path);
+            if (!kms) {
+                kms = {
+                    files: [],
+                    locators: [],
+                    name: f.path
+                };
+                manifest.push(kms);
+            }
+            kms.locators.push(f.id);
+            const len = kms.files.length;
+            const nextPos = len > 0
+                ? parseInt(kms.files[len - 1].position, 10) + kms.files[len - 1].size
+                : 0;
+            kms.files.push({
+                name: f.name,
+                position: nextPos.toString(),
+                size: f.size
+            });
+        });
 
-            const fd = new FormData();
-            files.forEach((f, idx) => fd.append(`file_${idx}`, f));
+        console.log(manifest);
 
-            axios.post(serviceHost, fd, {
-                onUploadProgress: (e: ProgressEvent) => {
-                    console.log(`${e.loaded} / ${e.total}`);
-                }
-            });
+        const manifestText = stringifyKeepManifest(manifest);
+        const data = { ...collection, manifestText };
+        return this.update(collectionUuid, CommonResourceService.mapKeys(_.snakeCase)(data));
+    }
+
+    uploadFiles(collectionUuid: string, files: File[]) {
+        console.log("Uploading files", files);
+
+        const filters = FilterBuilder.create()
+            .addEqual("service_type", "proxy");
+
+        return this.keepService.list({ filters }).then(data => {
+            if (data.items && data.items.length > 0) {
+                const serviceHost =
+                    (data.items[0].serviceSslFlag ? "https://" : "http://") +
+                    data.items[0].serviceHost +
+                    ":" + data.items[0].servicePort;
+
+                console.log("Servicehost", serviceHost);
+
+                const files$ = files.map((f, idx) => this.uploadFile(serviceHost, f, idx));
+                Promise.all(files$).then(values => {
+                    this.updateManifest(collectionUuid, values).then(() => {
+                        console.log("Upload done!");
+                    });
+                });
+            }
         });
     }
 }