Changeset 35253 for main/trunk/model-interfaces-dev/atea

Timestamp:

2021-08-05T12:59:41+12:00 (3 years ago)

Author:

davidb

Message:

Disable upload button while transcription is in progress

Location:

main/trunk/model-interfaces-dev/atea

Files:

• js/asr/TranscribeService.js (modified) (3 diffs)
• js/asr/asr-controller.js (modified) (3 diffs)
• transform/pages/asr.xsl (modified) (1 diff)

main/trunk/model-interfaces-dev/atea/js/asr/TranscribeService.js

@@ -33 +33 @@
     {
         /** @type {String} The URL to which query POST requests should be made */
-        this.queryUrl = "/gs3-koreromaori/transcribe";
+        this.queryUrl = "/gs3-koreromaori/transcribe/test";
+        this.MAX_BATCH_COUNT = 3;
+        this.MAX_BATCH_SIZE = 5242880; // 5 MiB
     }
 
@@ -40 +42 @@
      * Data is chunked according to which ever occurs first:
      * A maximum of three files per request, or;
-     * A maximum of 5 MiB per request.
+     * A maximum of 5 MiB before chunking.
      * 
      * @param {FileList} files The files to upload
      * @returns {AsyncGenerator<TranscriptionModel[]>} The transcribed audio files.
      */
-    async* chunkTranscribeFiles(files)
+    async* batchTranscribeFiles(files)
     {
         let filesToSubmit = [];
@@ -51 +53 @@
         let byteCounter = 0;
 
-        for (let file of files) {
-            if (fileCounter == 3 || byteCounter > 5242880) // 5 MiB
+        for (let file of files)
+        {
+            if (fileCounter == this.MAX_BATCH_COUNT || byteCounter > this.MAX_BATCH_SIZE) // 5 MiB
             {
                 yield await this.transcribeFiles(filesToSubmit);

main/trunk/model-interfaces-dev/atea/js/asr/asr-controller.js

@@ -50 +50 @@
     const transcribeService = new TranscribeService();
 
+    $(FILE_UPLOAD_INPUT_NAME).prop("disabled", true);
     $(FILE_UPLOAD_PROGRESS_CONTAINER_NAME).removeClass("asr-hidden");
 
@@ -66 +67 @@
     try
     {
-        for await (const transcriptionBundle of transcribeService.chunkTranscribeFiles(files))
+        for await (const transcriptionBundle of transcribeService.batchTranscribeFiles(files))
         {
             for (const t of transcriptionBundle)
@@ -86 +87 @@
 
     $(FILE_UPLOAD_PROGRESS_CONTAINER_NAME).addClass("asr-hidden");
+    $(FILE_UPLOAD_INPUT_NAME).prop("disabled", false);
 }
 

main/trunk/model-interfaces-dev/atea/transform/pages/asr.xsl

@@ -38 +38 @@
     <!-- Template for processing audio file uploads -->
     <xsl:template name="audio-upload">
-        <link rel="stylesheet" href="interfaces/{$interface_name}/style/asr.css" type="text/css" />
+        <link href="interfaces/{$interface_name}/style/asr.css" rel="stylesheet" type="text/css" />
         
         <div>