feat(export) : add a folder in the zip when exporting one exercise

Author: leunam217

src/editor/editor_lib.ml

@@ -477,32 +477,31 @@ module Editor_io = struct
     ignore (Js.Unsafe.meth_call input_files_load "click" [||]) ;
     result_t
 
-  let upload_new_exercise id text =
-    let save_file =
-      Json_repr_browser.Json_encoding.destruct 
-        editor_state_enc
-        (Js._JSON##(parse text))
-      |> put_exercise_id id
+  let upload_new_exercise id to_save =
+    let to_save = put_exercise_id id to_save
     in
     let open Exercise.Meta in
-    let result= idUnique id && titleUnique save_file.metadata.title in
+    let result= idUnique id && titleUnique to_save.metadata.title in
     if result then
-      update_index save_file;
+      update_index to_save;
    result        
 
   let upload () =
     run_async_with_log
       (fun () ->
         upload_file () >>=
           fun file ->
-          let id = Filename.chop_extension (Js.to_string file##.name) in 
           let f = Js.Unsafe.eval_string "editor_import" in 
           let callback =
             (fun text ->
-              if upload_new_exercise id text  then
-                Dom_html.window##.location##reload 
-              else
-                Learnocaml_common.alert [%i"Identifier and/or title not unique\n"]);
+              SMap.iter
+                (fun id editor_state ->
+                  if not (upload_new_exercise id editor_state)  then
+                    Learnocaml_common.alert [%i"Identifier and/or title not unique\n"])
+                (Json_repr_browser.Json_encoding.destruct 
+                   (SMap.enc editor_state_enc)
+                   (Js._JSON##(parse text)));
+              Dom_html.window##.location##reload)
           in
           Js.Unsafe.fun_call f [| Js.Unsafe.inject file ;
                             Js.Unsafe.inject callback|])          

static/js/jszip/learnocaml_jszip_wrapper.js

@@ -12,7 +12,9 @@ function editor_create_exercise(zip, data, prefix) {
 function editor_download(brut_data, callback) {
     var zip = new JSZip();
     var data = JSON.parse(brut_data);
-    editor_create_exercise(zip, data, "")
+    var dirname = data.exercise.id
+    zip.folder(dirname);
+    editor_create_exercise(zip, data, dirname + "/");
     zip.generateAsync({
         type: "blob",
         compression: "DEFLATE",
@@ -41,35 +43,53 @@ function editor_download_all(brut_exercises, brut_index, callback) {
     }).then(function(blob) { callback(blob) });
 }
 
+function editor_read_exercise(loaded_zip, path) {
+    return new Promise(function(resolve, reject) {
+        var descr = loaded_zip.file(path + "descr.md").async("string");
+        var meta = loaded_zip.file(path + "meta.json").async("string");
+        var prelude = loaded_zip.file(path + "prelude.ml").async("string");
+        var prepare = loaded_zip.file(path + "prepare.ml").async("string");
+        var template = loaded_zip.file(path + "template.ml").async("string");
+        var test = loaded_zip.file(path + "test.ml").async("string");
+        var solution = loaded_zip.file(path + "solution.ml").async("string");
+        Promise.all([descr, meta, prelude, prepare, template, test, solution])
+            .then(function(values) {
+                result.exercise.max_score = 0;
+                result.exercise.id = "";
+                result.exercise.descr = values[0];
+                var brut_meta = values[1];
+                var meta = brut_meta.replace(/\r?\n|\r/g, " ");
+                result.metadata = JSON.parse(meta);
+                result.exercise.prelude = values[2];
+                result.exercise.prepare = values[3];
+                result.exercise.template = values[4];
+                result.exercise.test = values[5];
+                result.exercise.solution = values[6];
+                resolve(result);
+            })
+    })
+}
+/*
 //also to keep in sync
 function editor_import(brut_data, callback) {
     var zip = new JSZip();
     zip.loadAsync(brut_data)
         .then(function(loaded_zip) {
-            var result = { exercise: {}, metadata: {} };
+                if (loaded_zip.file("index.json")) {
+                    loaded_zip.forEach(function(relative_path, file) {
+                            if (file.dir) {
+                                new Promise(function(resolve, reject) {
+                                    editor_read_exercise(loaded_zip, relative_path)
+                                        .then(function(result) {
+
+                                        })
+                                })
+                            }
+                        }
+                    }
+                    var result = { exercise: {}, metadata: {} };
 
-            var descr = loaded_zip.file("descr.md").async("string");
-            var meta = loaded_zip.file("meta.json").async("string");
-            var prelude = loaded_zip.file("prelude.ml").async("string");
-            var prepare = loaded_zip.file("prepare.ml").async("string");
-            var template = loaded_zip.file("template.ml").async("string");
-            var test = loaded_zip.file("test.ml").async("string");
-            var solution = loaded_zip.file("solution.ml").async("string");
-            Promise.all([descr, meta, prelude, prepare, template, test, solution])
-                .then(function(values) {
-                    result.exercise.max_score = 0;
-                    result.exercise.id = "";
-                    result.exercise.descr = values[0];
-                    var brut_meta = values[1];
-                    var meta = brut_meta.replace(/\r?\n|\r/g, " ");
-                    result.metadata = JSON.parse(meta);
-                    result.exercise.prelude = values[2];
-                    result.exercise.prepare = values[3];
-                    result.exercise.template = values[4];
-                    result.exercise.test = values[5];
-                    result.exercise.solution = values[6];
-                    console.log(brut_data);
                     callback(JSON.stringify(result));
                 });
         });
-}
+}*/