verteilen-core 1.3.39 → 1.3.41

package/dist/server/io.js

@@ -68,30 +68,31 @@ const ObsoleteSupport = async (loader, type, folder) => {
         const allRecordText = await Promise.all(ps);
         const allRecord = allRecordText.map(x => JSON.parse(x));
         const execute = allRecord.map(async (x) => {
+            const tasks = x.task;
             x.tasks = [];
             x.databaser_uuid = x.parameter_uuid;
-            x.tasks_uuid = x.task.map(y => y.uuid);
-            const tasks = x.task;
+            x.tasks_uuid = tasks.map(y => y.uuid);
             delete x.parameter_uuid;
             delete x.task;
             const execute_task = tasks.map(async (y) => {
                 const jobs = y.jobs;
                 y.jobs = [];
-                y.jobs_uuid = y.jobs.map(z => z.uuid);
+                y.jobs_uuid = jobs.map(z => z.uuid);
                 const execute_jobs = jobs.map(async (z) => {
                     z.id_args = [];
                     const d3 = loader.join(loader.root, "job", `${z.uuid}.json`);
-                    return loader.write_string(d3, z);
+                    return loader.write_string(d3, JSON.stringify(z, null, 4));
                 });
                 await Promise.all(execute_jobs);
                 const d2 = loader.join(loader.root, "task", `${y.uuid}.json`);
-                return loader.write_string(d2, y);
+                return loader.write_string(d2, JSON.stringify(y, null, 4));
             });
             await Promise.all(execute_task);
             const d1 = loader.join(loader.root, "project", `${x.uuid}.json`);
-            return loader.write_string(d1, x);
+            return loader.write_string(d1, JSON.stringify(x, null, 4));
         });
         await Promise.all(execute);
+        await loader.rm(path);
     }
     else if (type == interface_1.RecordType.DATABASE) {
         const path = loader.join(loader.root, "parameter");
@@ -104,7 +105,7 @@ const ObsoleteSupport = async (loader, type, folder) => {
             return loader.cp(path2, path3);
         });
         await Promise.all(ps);
-        loader.mkdir(path);
+        loader.rm(path);
     }
 };
 exports.ObsoleteSupport = ObsoleteSupport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verteilen-core",
-  "version": "1.3.39",
+  "version": "1.3.41",
   "license": "MIT",
   "homepage": "https://verteilen.github.io/wiki/",
   "author": "Elly",

package/src/server/io.ts

@@ -148,32 +148,33 @@ export const ObsoleteSupport = async (loader:RecordIOBase, type:RecordType, fold
         const allRecordText:Array<string> = await Promise.all(ps)
         const allRecord:Array<any> = allRecordText.map(x => JSON.parse(x))
         const execute = allRecord.map(async x => {
+            const tasks:Array<any> = x.task
             x.tasks = []
             x.databaser_uuid = x.parameter_uuid
-            x.tasks_uuid = x.task.map(y => y.uuid)
-            const tasks:Array<any> = x.task
+            x.tasks_uuid = tasks.map(y => y.uuid)
             delete x.parameter_uuid
             delete x.task
 
             const execute_task = tasks.map(async y => {
                 const jobs = y.jobs
                 y.jobs = []
-                y.jobs_uuid = y.jobs.map(z => z.uuid)
+                y.jobs_uuid = jobs.map(z => z.uuid)
 
                 const execute_jobs = jobs.map(async z => {
                     z.id_args = []
                     const d3 = loader.join(loader.root, "job", `${z.uuid}.json`)
-                    return loader.write_string(d3, z)
+                    return loader.write_string(d3, JSON.stringify(z, null, 4))
                 })
                 await Promise.all(execute_jobs)
                 const d2 = loader.join(loader.root, "task", `${y.uuid}.json`)
-                return loader.write_string(d2, y)
+                return loader.write_string(d2, JSON.stringify(y, null, 4))
             })
             await Promise.all(execute_task)
             const d1 = loader.join(loader.root, "project", `${x.uuid}.json`)
-            return loader.write_string(d1, x)
+            return loader.write_string(d1, JSON.stringify(x, null, 4))
         })
         await Promise.all(execute)
+        await loader.rm(path)
     }
     else if(type == RecordType.DATABASE){
         const path = loader.join(loader.root, "parameter")
@@ -185,7 +186,7 @@ export const ObsoleteSupport = async (loader:RecordIOBase, type:RecordType, fold
             return loader.cp(path2, path3)
         })
         await Promise.all(ps)
-        loader.mkdir(path)
+        loader.rm(path)
     }
 }
 /**