Changeset 35439 for main/trunk

Timestamp:

2021-09-21T11:17:55+12:00 (3 years ago)

Author:

cstephen

Message:

Include edits in downloads

Location:

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src

Files:

• components/AudioUpload.vue (modified) (1 diff)
• components/TranscriptionItem.vue (modified) (6 diffs)
• components/TranscriptionItemEditor.vue (modified) (1 diff)
• js/TranscribeModule.js (modified) (1 diff)
• main.js (modified) (2 diffs)
• styles/_material.scss (modified) (1 diff)

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/AudioUpload.vue

@@ -193 +193 @@
 
                         try {
-                            this.$store.commit("transcriptionAdd", tvm);
+                            this.$store.commit("rawTranscriptionAdd", tvm);
                         }
                         catch (TranscriptionExistsError) {

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/TranscriptionItem.vue

@@ -42 +42 @@
         <hr />
 
-        <TranscriptionItemEditor :transcription="transcription" style="margin-bottom: 1em" />
+        <TranscriptionItemEditor ref="editor" :transcription="transcription" style="margin-bottom: 1em" />
 
         <button @click="toggleEditor" type="button" class="btn-primary theme-flat">
@@ -94 +94 @@
 import { mapState } from "vuex";
 import { saveAs } from "file-saver"
-import TranscriptionItemEditor, { getWords } from "./TranscriptionItemEditor.vue"
+import TranscriptionItemEditor from "./TranscriptionItemEditor.vue"
 import { TranscriptionViewModel, PlaybackState } from "../main";
 import Util from "../js/Util"
@@ -124 +124 @@
         },
         remove() {
-            this.$store.commit("transcriptionRemove", this.transcription.id);
+            this.$store.commit("rawTranscriptionRemove", this.transcription.id);
         },
         downloadAsText() {
@@ -134 +134 @@
         downloadAsJson() {
             const fileName = buildDownloadableFileName(this.transcription.fileName, "json");
-            const toDownload = (({ fileName, transcription, metadata }) => ({ fileName, transcription, metadata }))(this.transcription);
+            const toDownload = (({ fileName, transcription }) => ({ fileName, transcription }))(this.transcription);
+            toDownload.words = this.$refs.editor.words.map(w => (({ word, startTime, endTime }) => ({ word, startTime, endTime }))(w));
 
             const blob = new Blob([ JSON.stringify(toDownload, null, 4) ], { type: "application/json;charset=utf-8" });
@@ -141 +142 @@
         downloadAsWebvtt() {
             const fileName = buildDownloadableFileName(this.transcription.fileName, "vtt");
-            const toDownload = buildWebvttFileContents(this.transcription);
+            const toDownload = buildWebvttFileContents(this.transcription, this.$refs.editor);
 
             const blob = new Blob([ toDownload ], { type: "text/vtt;charset=utf-8" });
@@ -168 +169 @@
  * @returns {String} The WebVTT content.
  */
-function buildWebvttFileContents(transcription) {
+function buildWebvttFileContents(transcription, editor) {
     let contents = "WEBVTT Transcription of " + transcription.fileName + "\n\n";
 
-    for (const word of getWords(transcription)) {
+    for (const word of editor.words) {
         const startTime = Util.formatSecondsTimeString(word.startTime, true);
         const endTime = Util.formatSecondsTimeString(word.endTime, true);

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/TranscriptionItemEditor.vue

@@ -13 +13 @@
             <li v-for="(word, index) in words" :key="word.id" class="word-container">
                 <input :size="word.word.length <= 1 ? 1 : word.word.length - 1" :ref="word.id"
-                    class="editor-word" v-model="word.word" type="text"
+                    class="editor-word" v-model="word.word" type="text" onpaste="return false;"
                     @input="onEditorInput($event, index)" @focusout="onEditorFocusOut(index)" @keyup="onEditorKeyUp($event, index)" />
                 <span>&nbsp;</span>

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/js/TranscribeModule.js

@@ -12 +12 @@
      *
      * @param {String} char The character.
-     * @param {Number} confidence The confidence that the character is corret. Smaller values are more confident.
+     * @param {Number} confidence The confidence that the character is correct. Smaller values are more confident.
      * @param {Number} start_time The timestamp in the audio at which this character is spoken.
      */

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/main.js

@@ -78 +78 @@
          * @param {TranscriptionViewModel} transcription The transcription's view model object.
          */
-        transcriptionAdd(state, transcription) {
+        rawTranscriptionAdd(state, transcription) {
             if (state.rawTranscriptions.has(transcription.id)) {
-                throw new Error("Transcription already exists");
+                throw new TranscriptionExistsError("Cannot add the transcription because it already exists.");
             }
             state.rawTranscriptions.set(transcription.id, transcription);
@@ -88 +88 @@
          * Removes a transcription from the store.
          * @param {*} state The state of the store.
-         * @param {String} id The UUID of the transcription.
+         * @param {String} id The ID of the transcription.
          */
-        transcriptionRemove(state, id) {
+        rawTranscriptionRemove(state, id) {
             state.rawTranscriptions.delete(id);
         },

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/styles/_material.scss

@@ -91 +91 @@
     display: flex;
     align-items: center;
+    text-align: left;
 
     background-color: var(--primary-bg-color);