From d73bbc0559e5f983515f1410c9583be0188b8662 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:34:29 +0000
Subject: [PATCH 01/11] .

---
 rapids/templates/rapids/rapid_form.html | 103 ++++++++++++++++++++----
 1 file changed, 87 insertions(+), 16 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index af6a25d9..0a5e350c 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -5,16 +5,42 @@
 <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
 
 <script type="text/javascript">
-
     let normal = false;
+    let monitor_directory_handler = false;
 
+    // set to hold the files that are still being processed
     let active_file_inputs = new Set()
 
+    async function listAllFilesAndDirs(dirHandle) {
+        const files = [];
+        for await (let [name, handle] of dirHandle) {
+            const {
+                kind
+            } = handle;
+            if (handle.kind === 'directory') {
+                files.push({
+                    name,
+                    handle,
+                    kind
+                });
+                files.push(...await listAllFilesAndDirs(handle));
+            } else {
+                files.push({
+                    name,
+                    handle,
+                    kind
+                });
+            }
+        }
+        return files;
+    }
+
     function showEditPopup(url) {
         var win = window.open(url, "Edit",
             'height=500,width=800,resizable=yes,scrollbars=yes');
         return false;
     }
+
     function showAddPopup(triggeringLink) {
         var name = triggeringLink.id.replace(/^add_/, '');
         href = triggeringLink.href;
@@ -22,13 +48,16 @@
         win.focus();
         return false;
     }
+
     function closePopup(win, newID, newRepr, id) {
         console.log(id)
         $(id + "_to").append('<option value=' + newID + ' title=' + newRepr + ' >' + newRepr + '</option>')
         win.close();
     }
 
-    document.addEventListener('drop', function (e) { e.preventDefault(); }, false);
+    document.addEventListener('drop', function (e) {
+        e.preventDefault();
+    }, false);
 
     function getUnusedInputs(inputs) {
         new_inputs = [];
@@ -69,7 +98,8 @@
 
     function add_input_form() {
         var form_idx = $('#id_images-TOTAL_FORMS').val();
-        $('#image_form_set').append($($('#empty_form').html().replace(/__prefix__/g, form_idx)).on("change", input_change));
+        $('#image_form_set').append($($('#empty_form').html().replace(/__prefix__/g, form_idx)).on("change",
+            input_change));
         $('#id_images-TOTAL_FORMS').val(parseInt(form_idx) + 1);
     }
 
@@ -215,8 +245,33 @@
         };
 
 
-        $('#add_more_images').click(() => { add_input_form() });
-        $('#add_more_answers').click(() => { add_answers_input_form() });
+        $('#directory-picker-button').click(() => {
+            monitor_directory_handler = await window.showDirectoryPicker();
+            $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter($(
+                "<span>clear</span>").click(() => {
+                $(evt.target).remove();
+                $("#directory-picker-display").text("");
+                monitor_directory_handler = false;
+            }));
+        });
+
+        async function onClickHandler(e) {
+            try {
+                const directoryHandle =
+                    const files = await listAllFilesAndDirs(directoryHandle);
+                console.log('files', files);
+            } catch (e) {
+                console.log(e);
+            }
+        }
+
+
+        $('#add_more_images').click(() => {
+            add_input_form()
+        });
+        $('#add_more_answers').click(() => {
+            add_answers_input_form()
+        });
 
         $("input[type=file]").on('change', input_change);
 
@@ -282,6 +337,7 @@
 
 
     });
+
     function ocr(input) {
         // Tesseract.recognize(f, "eng",{ logger: m => console.log(m) }
         // ).then(({ data: { text } }) => {
@@ -319,12 +375,17 @@
                 await worker.loadLanguage('eng');
                 await worker.initialize('eng');
                 // const { data: { text } } = await worker.recognize(input.files[0], { rectangle });
-                const { data: { text } } = await worker.recognize(input.files[0]);
+                const {
+                    data: {
+                        text
+                    }
+                } = await worker.recognize(input.files[0]);
                 //console.log(text);
                 l = text.toLowerCase();
                 $(`img[data-input-id='${input.id}'`).removeClass("image-ident-loading");
                 console.log(l);
-                if (l.includes("accesion") || l.includes("number") || l.search(/(ref|rk9|rh8|ra9|rbz)\d+/g) > -1) {
+                if (l.includes("accesion") || l.includes("number") || l.search(
+                        /(ref|rk9|rh8|ra9|rbz)\d+/g) > -1) {
                     console.log("SHIT", input);
                     $(input).addClass("image-ident-warning");
                     $(`img[data-input-id='${input.id}'`).addClass("image-ident-warning");
@@ -350,6 +411,7 @@
             });
         }
 
+        // Add file to the process list
         active_file_inputs.add(el)
         const readFile = (file, el) => {
             reader(file).then(reader => {
@@ -364,6 +426,7 @@
                 //images.push(reader.result);
 
                 active_file_inputs.delete(el)
+                // Only load once all queued files have been processed
                 if (active_file_inputs.size < 1) {
                     loadViewer();
                 }
@@ -380,6 +443,7 @@
             console.log(el);
             if (el.files.length > 0) {
                 filename = el.files[0].name;
+                // Probably no need to await here anymore
                 await readFile(el.files[0], el);
             }
         })
@@ -403,7 +467,9 @@
 
         image_set = $("#image_form_set img");
         if (n == image_set.length) {
-            const event = new CustomEvent('loadDicomViewer', { "detail": image_set });
+            const event = new CustomEvent('loadDicomViewer', {
+                "detail": image_set
+            });
 
             window.dispatchEvent(event);
             sortable('.sortable');
@@ -465,17 +531,16 @@
                     option.appendTo($("#id_examination_to"));
                     toastr.success(`Examination set to ${option.attr('title')} from dicom data`);
                 } else {
-                    toastr.warning(`Unable to set examination ${study_description} from dicom data (it needs creating)`);
+                    toastr.warning(
+                        `Unable to set examination ${study_description} from dicom data (it needs creating)`);
 
                 }
             }
 
-        }
-        catch (err) {
+        } catch (err) {
             console.log(err);
         }
     }
-
 </script>
 
 {{ form.media }}
@@ -484,11 +549,17 @@
 <h2>Submit Rapid</h2>
 <a href="{% url 'rapids:rapid_create_defaults' %}">Edit defaults</a>
 <p>
-<h3>Instructions</h3>
-Abnormality, Region and Laterality are used to categorise within the system (they are not used for marking). String
-answers that match those added below will be used for automatic marking. Multiple images can be added to a question. If
-the feedback image box is checked they will not be displayed when taking the question.
+    <h3>Instructions</h3>
+    Abnormality, Region and Laterality are used to categorise within the system (they are not used for marking). String
+    answers that match those added below will be used for automatic marking. Multiple images can be added to a question.
+    If
+    the feedback image box is checked they will not be displayed when taking the question.
 </p>
+<div>
+    To monitor a directory select it here.<br />
+    <button id="directory-picker-button">Pick a directory</button>
+    <span id="directory-picker-display">No directory monitored</span>
+</div>
 <form action="" method="post" enctype="multipart/form-data" id="rapid-form">
     {% csrf_token %}
     <a href="/rapids/abnormality/create" id="add_abnormality" class="add-popup"

From 974801c20b028819f325cc1056959261a6a98a91 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:35:36 +0000
Subject: [PATCH 02/11] .

---
 rapids/templates/rapids/rapid_form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 0a5e350c..404dd489 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -245,10 +245,10 @@
         };
 
 
-        $('#directory-picker-button').click(() => {
+        $('#directory-picker-button').click(() => async {
             monitor_directory_handler = await window.showDirectoryPicker();
             $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter($(
-                "<span>clear</span>").click(() => {
+                "<span>clear</span>").click((evt) => {
                 $(evt.target).remove();
                 $("#directory-picker-display").text("");
                 monitor_directory_handler = false;

From e8ddab6c13b81481afd70fc9c07fbd0cb2a61e40 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:36:37 +0000
Subject: [PATCH 03/11] .

---
 rapids/templates/rapids/rapid_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 404dd489..746191a9 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -245,7 +245,7 @@
         };
 
 
-        $('#directory-picker-button').click(() => async {
+        $('#directory-picker-button').click(async () => {
             monitor_directory_handler = await window.showDirectoryPicker();
             $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter($(
                 "<span>clear</span>").click((evt) => {

From 601000948b3b75411a9b830c6fde4ab721252cc9 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:37:49 +0000
Subject: [PATCH 04/11] .

---
 rapids/templates/rapids/rapid_form.html | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 746191a9..1ee48adb 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -252,18 +252,10 @@
                 $(evt.target).remove();
                 $("#directory-picker-display").text("");
                 monitor_directory_handler = false;
+                const files = await listAllFilesAndDirs(directoryHandle);
             }));
         });
 
-        async function onClickHandler(e) {
-            try {
-                const directoryHandle =
-                    const files = await listAllFilesAndDirs(directoryHandle);
-                console.log('files', files);
-            } catch (e) {
-                console.log(e);
-            }
-        }
 
 
         $('#add_more_images').click(() => {

From 3f33882462d508d3b48ef4c19d7e780ef2ca9077 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:39:42 +0000
Subject: [PATCH 05/11] .

---
 rapids/templates/rapids/rapid_form.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 1ee48adb..e6761d4a 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -245,8 +245,9 @@
         };
 
 
-        $('#directory-picker-button').click(async () => {
-            monitor_directory_handler = await window.showDirectoryPicker();
+        $('#directory-picker-button').click(() => {
+            window.showDirectoryPicker().then((handler) => {
+            monitor_directory_handler = handler;
             $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter($(
                 "<span>clear</span>").click((evt) => {
                 $(evt.target).remove();
@@ -254,6 +255,7 @@
                 monitor_directory_handler = false;
                 const files = await listAllFilesAndDirs(directoryHandle);
             }));
+            });
         });
 
 

From ed8c75d8598492dcf86a2804ab5cb2cf1b32bff6 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:39:53 +0000
Subject: [PATCH 06/11] .

---
 rapids/templates/rapids/rapid_form.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index e6761d4a..8aa6a877 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -247,14 +247,15 @@
 
         $('#directory-picker-button').click(() => {
             window.showDirectoryPicker().then((handler) => {
-            monitor_directory_handler = handler;
-            $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter($(
-                "<span>clear</span>").click((evt) => {
-                $(evt.target).remove();
-                $("#directory-picker-display").text("");
-                monitor_directory_handler = false;
-                const files = await listAllFilesAndDirs(directoryHandle);
-            }));
+                monitor_directory_handler = handler;
+                $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter(
+                    $(
+                        "<span>clear</span>").click((evt) => {
+                        $(evt.target).remove();
+                        $("#directory-picker-display").text("");
+                        monitor_directory_handler = false;
+                        const files = await listAllFilesAndDirs(directoryHandle);
+                    }));
             });
         });
 

From 3076b747cfe32ce11ebccddc4bb13df26db675f0 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:40:17 +0000
Subject: [PATCH 07/11] .

---
 rapids/templates/rapids/rapid_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 8aa6a877..ad8da676 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -254,7 +254,7 @@
                         $(evt.target).remove();
                         $("#directory-picker-display").text("");
                         monitor_directory_handler = false;
-                        const files = await listAllFilesAndDirs(directoryHandle);
+                        //const files = await listAllFilesAndDirs(directoryHandle);
                     }));
             });
         });

From 203d65e9e92804b0a99310592ca281c6d5159baf Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:41:19 +0000
Subject: [PATCH 08/11] .

---
 rapids/templates/rapids/rapid_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index ad8da676..d97b7f65 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -248,7 +248,7 @@
         $('#directory-picker-button').click(() => {
             window.showDirectoryPicker().then((handler) => {
                 monitor_directory_handler = handler;
-                $("#directory-picker-display").text(monitor_directory_handler.name).appendAfter(
+                $("#directory-picker-display").text(monitor_directory_handler.name).after(
                     $(
                         "<span>clear</span>").click((evt) => {
                         $(evt.target).remove();

From 32fd30549a1e73d15c0f4a7097e3489e33ed54cf Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 13:49:43 +0000
Subject: [PATCH 09/11] .

---
 rapids/templates/rapids/rapid_form.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index d97b7f65..a1faf995 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -7,6 +7,7 @@
 <script type="text/javascript">
     let normal = false;
     let monitor_directory_handler = false;
+    let monitor_interval_id = false;
 
     // set to hold the files that are still being processed
     let active_file_inputs = new Set()
@@ -248,12 +249,18 @@
         $('#directory-picker-button').click(() => {
             window.showDirectoryPicker().then((handler) => {
                 monitor_directory_handler = handler;
+                monitor_interval_id = setInterval(function () {
+                    listAllFilesAndDirs(monitor_directory_handler).then((items) => {
+                        console.log(items);
+                    });
+                }, 5000);
                 $("#directory-picker-display").text(monitor_directory_handler.name).after(
                     $(
-                        "<span>clear</span>").click((evt) => {
+                        " <span>[clear]</span>").click((evt) => {
                         $(evt.target).remove();
                         $("#directory-picker-display").text("");
                         monitor_directory_handler = false;
+                        clearInterval(monitor_interval_id);
                         //const files = await listAllFilesAndDirs(directoryHandle);
                     }));
             });

From 0987a3f4ca379927e9a04bd3e72d51e766b2a45c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 14:04:40 +0000
Subject: [PATCH 10/11] .

---
 rapids/templates/rapids/rapid_form.html | 57 ++++++++++++++-----------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index a1faf995..8e9f492d 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -162,6 +162,24 @@
 
     }
 
+    function addFile(f, feedback) {
+        let dT = new DataTransfer();
+        dT.clearData();
+        dT.items.add(f);
+        for (let i = 0; i < inputs.length; i++) {
+            el = inputs.get(i);
+
+            if (el.files.length == 0) {
+                el.files = dT.files;
+                //ocr(el)
+                $(el).change();
+
+                return false;
+            }
+        }
+
+    }
+
 
     $(document).ready(function () {
         $("#add_abnormality").appendTo($("label[for='id_abnormality']"));
@@ -196,10 +214,6 @@
             $(evt.target).removeClass("drop-target-active");
 
             file_drop_number = evt.dataTransfer.files.length;
-            // Get all input elements
-            inputs = extendInputs(file_drop_number);
-
-            console.log("drop inputs", inputs, evt);
 
             if (file_drop_number < 1) {
                 toastr.warning(`Drop failed (no files), try again.`);
@@ -207,32 +221,25 @@
                 toastr.info(`Loading ${file_drop_number} dropped image(s).`);
             }
 
+            // Get all input elements
+            inputs = extendInputs(file_drop_number);
+
+            console.log("drop inputs", inputs, evt);
+
+
             // Loop through each dropped file and try to assign to an
             // input element
             [...evt.dataTransfer.files].forEach((f) => {
-                let dT = new DataTransfer();
-                dT.clearData();
-                dT.items.add(f);
-                for (let i = 0; i < inputs.length; i++) {
-                    el = inputs.get(i);
-                    console.log("drop el", el);
+                feedback = false;
+                if (evt.target.id == "feedback-drop-target") {
+                    feedback = true;
+                    arr = el.name.split("-");
+                    arr.splice(2, 1, "feedback_image");
+                    feedback_el_name = arr.join("-");
 
-                    if (el.files.length == 0) {
-                        el.files = dT.files;
-                        //ocr(el)
-                        $(el).change();
-                        console.log("drop change")
-
-                        if (evt.target.id == "feedback-drop-target") {
-                            arr = el.name.split("-");
-                            arr.splice(2, 1, "feedback_image");
-                            feedback_el_name = arr.join("-");
-
-                            $(`[name=${feedback_el_name}]`).prop("checked", true);
-                        }
-                        return false;
-                    }
+                    $(`[name=${feedback_el_name}]`).prop("checked", true);
                 }
+                addFile(f, feedback)
             })
 
             // // If you want to use some of the dropped files

From b285a7aaa2aefb23054227362c0256eba674e402 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Nov 2021 14:07:58 +0000
Subject: [PATCH 11/11] .

---
 rapids/templates/rapids/rapid_form.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 8e9f492d..e666fd21 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -174,6 +174,14 @@
                 //ocr(el)
                 $(el).change();
 
+                if(feedback) {
+                    arr = el.name.split("-");
+                    arr.splice(2, 1, "feedback_image");
+                    feedback_el_name = arr.join("-");
+
+                    $(`[name=${feedback_el_name}]`).prop("checked", true);
+                }
+
                 return false;
             }
         }
@@ -233,11 +241,6 @@
                 feedback = false;
                 if (evt.target.id == "feedback-drop-target") {
                     feedback = true;
-                    arr = el.name.split("-");
-                    arr.splice(2, 1, "feedback_image");
-                    feedback_el_name = arr.join("-");
-
-                    $(`[name=${feedback_el_name}]`).prop("checked", true);
                 }
                 addFile(f, feedback)
             })