Обновить getMany. Убрать import

api/2019-09-10.js

@@ -9,15 +9,15 @@ Reporter.prototype.subscribeMany = function(funcs)
     }
 }
 
-murom.getMany = function(urls, completionCallback)
+murom.getMany = function(items, completionCallback)
 {
     var self = this;
-    var results = new Array(urls.length).fill(null);
+    var results = {};
 
     var count = 0;
     function reportCompletion()
     {
-        if (++count == urls.length)
+        if (++count == items.length)
         {
             if (completionCallback)
             {
@@ -26,18 +26,19 @@ murom.getMany = function(urls, completionCallback)
         }
     }
     
-    for (var id in urls)
+    for (var id in items)
     {
-        const url = urls[id];
+        const item = items[id];
-        const urlId = id;
+        const url = item[0];
-        murom.get(
+        const name = item[1];
-            url,
+        var isBinary = (item[2] == "b");
-            function(contents)
+        
+        function success(contents)
         {
-                results[urlId] = contents;
+            results[name] = contents;
             reportCompletion()
-            },
+        }
-            function(status)
+        function failure(status)
         {
             LOG(
                 formatString(
@@ -48,21 +49,14 @@ murom.getMany = function(urls, completionCallback)
             );
             reportCompletion()
         }
-        );
-    }
-};
         
-murom.import = function(urls, completionCallback)
+        if (isBinary)
         {
-    murom.getMany(
+            murom.getb(url, success, failure);
-        urls,
+        }
-        function(contents)
+        else
-        {
+        {
-            for (var id in contents)
+            murom.get(url, success, failure);
-            {
-                eval(contents[id]);
         }
-            completionCallback();
     }
-    );
 };