update voice

dashboard-ui/scripts/librarymenu.js

@@ -165,7 +165,7 @@
 
     function showVoice() {
         require(['voice/voice'], function (voice) {
-            voice.startListening();
+            voice.showDialog();
         });
     }
 

dashboard-ui/voice/commands/controlcommands.js

@@ -1,5 +1,4 @@
-
+define([], function () {
-define([], function () {
 
     return function (result) {
         result.success = true;

dashboard-ui/voice/commands/disablecommands.js

@@ -1,5 +1,4 @@
-
+define([], function () {
-define([], function () {
 
      return function (result) {
         result.success = true;

dashboard-ui/voice/commands/enablecommands.js

@@ -1,5 +1,4 @@
-
+define([], function () {
-define([], function () {
 
     return function (result) {
         result.success = true;

dashboard-ui/voice/commands/searchcommands.js

@@ -1,12 +1,7 @@
-
+define([], function () {
-define([], function () {
 
      return function (result) {
-        result.success = true;
         switch (result.item.deviceid) {
-            case 'displaymirroring':
-                MediaController.enableDisplayMirroring(false);
-                break;
             default:
                 result.success = false;
                 return;

dashboard-ui/voice/commands/showcommands.js

@@ -1,5 +1,4 @@
-
+define([], function () {
-define([], function () {
 
     return function (result) {
         result.success = true;

dashboard-ui/voice/commands/togglecommands.js

@@ -1,5 +1,4 @@
-
+define([], function () {
-define([], function () {
 
     return function (result) {
         result.success = true;
@@ -12,5 +11,4 @@ define([], function () {
                 return;
         }
     }
-
 });

dashboard-ui/voice/grammar/en-US.json

@@ -139,7 +139,7 @@
         "commandtemplates": [
           "Play music",
           "Play my music",
-          "Listen to my music "
+          "Listen to my music"
         ]
       },
       {
@@ -188,7 +188,7 @@
         "commandtemplates": [
           "Play music",
           "Play my music",
-          "Listen to my music "
+          "Listen to my music"
         ]
       },
       {
@@ -200,7 +200,7 @@
         "commandtemplates": [
           "Play music",
           "Play my music",
-          "Listen to my music ",
+          "Listen to my music",
           "shuffle my favorite songs"
         ]
       }

dashboard-ui/voice/voice.css

@@ -1,5 +1,5 @@
 .voiceHelpContent {
-    max-width: 600px;
+    max-width: 700px;
     margin: auto;
 }
 

dashboard-ui/voice/voice.js

@@ -18,9 +18,9 @@ define([], function () {
                    window.msSpeechRecognition;
         },
 
-        startListening: function () {
+        showDialog: function () {
             require(['voice/voicedialog'], function (voicedialog) {
-                voicedialog.startListening();
+                voicedialog.showDialog();
             });
         }
     };

dashboard-ui/voice/voicedialog.js

@@ -1,37 +1,7 @@
-define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
+define(['dialogHelper', 'voice/voicereceiver', 'voice/voiceprocessor', 'globalize', 'emby-button', 'css!./voice.css', 'material-icons'], function (dialogHelper, voicereceiver, voiceprocessor, globalize) {
 
-    var currentRecognition;
     var lang = 'en-US';
 
-    var commandgroups;
-
-    function getCommandGroups() {
-    
-        if (commandgroups) {
-            return Promise.resolve(commandgroups);
-        }
-
-        return new Promise(function (resolve, reject) {
-
-            var file = "grammar";
-            //if (language && language.length > 0)
-            //    file = language;
-
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', "voice/grammar/" + file + ".json", true);
-
-            xhr.onload = function (e) {
-
-                commandgroups = JSON.parse(this.response);
-                resolve(commandgroups);
-            }
-
-            xhr.onerror = reject;
-
-            xhr.send();
-        });
-    }
-
     /// <summary> Shuffle array. </summary>
     /// <param name="array"> The array. </param>
     /// <returns> array </returns>
@@ -58,7 +28,7 @@ define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
     /// <returns> The sample commands. </returns>
     function getSampleCommands(groupid) {
 
-        return getCommandGroups().then(function (commandGroups) {
+        return voiceprocessor.getCommandGroups().then(function (commandGroups) {
             groupid = typeof (groupid) !== 'undefined' ? groupid : '';
 
             var commands = [];
@@ -86,17 +56,20 @@ define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
     /// <param name="groupid"> The groupid. </param>
     /// <returns> The command group. </returns>
     function getCommandGroup(groupid) {
-        if (commandgroups) {
+        return voicereceiver.getCommandGroups()
-            var idx = -1;
+            .then(function (commandgroups) {
-            idx = commandgroups.map(function (e) { return e.groupid; }).indexOf(groupid);
+                if (commandgroups) {
+                    var idx = -1;
 
-            if (idx > -1)
+                    idx = commandgroups.map(function (e) { return e.groupid; }).indexOf(groupid);
-                return commandgroups[idx];
+
-            else
+                    if (idx > -1)
-                return null;
+                        return commandgroups[idx];
-        }
+                    else
-        else
+                        return null;
-            return null;
+                } else
+                    return null;
+            });
     }
 
     /// <summary> Renders the sample commands. </summary>
@@ -113,7 +86,7 @@ define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
 
         }).join('');
 
-        $('.exampleCommands', elem).html(commands);
+        elem.querySelector('.exampleCommands').innerHTML = commands;
     }
 
     var currentDialog;
@@ -121,212 +94,179 @@ define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
     /// <returns> . </returns>
     function showVoiceHelp(groupid, title) {
 
-        var dlg = dialogHelper.createDialog({
+        console.log("Showing Voice Help", groupid, title);
-            size: 'medium',
-            removeOnClose: true
-        });
 
-        dlg.classList.add('ui-body-b');
+        var isNewDialog = false;
-        dlg.classList.add('background-theme-b');
+        var dlg;
 
-        var html = '';
+        if (!currentDialog) {
-        html += '<h2 class="dialogHeader">';
+
-        html += '<paper-fab icon="arrow-back" mini class="btnCancelVoiceInput"></paper-fab>';
+            isNewDialog = true;
-        if (groupid) {
+
-            var grp = getCommandGroup(groupid);
+            dlg = dialogHelper.createDialog({
-            if (grp)
+                size: 'medium',
-                html += '  ' + grp.name;
+                removeOnClose: true
+            });
+
+            dlg.classList.add('ui-body-b');
+            dlg.classList.add('background-theme-b');
+
+            var html = '';
+            html += '<div class="dialogHeader" style="margin:0 0 1em;">';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize btnCancelVoiceInput" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
+            html += '<div class="dialogHeaderTitle" id="voiceDialogGroupName">';
+            html += '</div>';
+            html += '</div>';
+
+            html += '<div>';
+
+            html += '<div class="dialogContent smoothScrollY">';
+            html += '<div class="dialogContentInner centeredContent">';
+            html += '<div class="voiceHelpContent">';
+
+            html += '<div class="defaultVoiceHelp">';
+
+            html += '<h1 style="margin-bottom:1.25em;">' + globalize.translate('HeaderSaySomethingLike') + '</h1>';
+
+            html += '<div class="exampleCommands">';
+            html += '</div>';
+
+            // defaultVoiceHelp
+            html += '</div>';
+
+            html += '<div class="unrecognizedCommand hide">';
+            html += '<h1>' + globalize.translate('HeaderYouSaid') + '</h1>';
+            html +=
+                '<p class="exampleCommand voiceInputContainer"><i class="fa fa-quote-left"></i><span class="voiceInputText exampleCommandText"></span><i class="fa fa-quote-right"></i></p>';
+            html += '<p>' + globalize.translate('MessageWeDidntRecognizeCommand') + '</p>';
+
+            html += '<br/>';
+            html += '<button is="emby-button" type="button" class="submit block btnRetry raised"><i class="md-icon">mic</i><span>' +
+                globalize.translate('ButtonTryAgain') +
+                '</span></button>';
+            html += '<p class="blockedMessage hide">' +
+                globalize.translate('MessageIfYouBlockedVoice') +
+                '<br/><br/></p>';
+
+            html += '</div>';
+
+            html +=
+                '<button is="emby-button" type="button" class="raised block btnCancelVoiceInput cancel"><i class="md-icon">close</i><span>' + globalize.translate('ButtonCancel') + '</span></button>';
+
+            html += '</div>';
+            html += '</div>';
+            html += '</div>';
+
+            html += '</div>';
+
+            dlg.innerHTML = html;
+            document.body.appendChild(dlg);
+
+            dialogHelper.open(dlg);
+            currentDialog = dlg;
+
+            dlg.addEventListener('close', function () {
+                currentDialog = null;
+            });
+
+            function onCancelClick() {
+                voicereceiver.cancel();
+                dialogHelper.close(dlg);
+            }
+
+            var closeButtons = dlg.querySelectorAll('.btnCancelVoiceInput');
+            for (var i = 0, length = closeButtons.length; i < length; i++) {
+                closeButtons[i].addEventListener('click', onCancelClick);
+            }
+
+            dlg.querySelector('.btnRetry').addEventListener('click', function () {
+                dlg.querySelector('.unrecognizedCommand').classList.add('hide');
+                dlg.querySelector('.defaultVoiceHelp').classList.remove('hide');
+                listen();
+            });
         }
-        html += '</h2>';
 
-        html += '<div>';
+        dlg = currentDialog;
 
-        var getCommandsPromise = getSampleCommands(groupid);
+        if (groupid) {
+            getCommandGroup(groupid)
+                .then(
+                    function (grp) {
+                        dlg.querySelector('#voiceDialogGroupName').innerText = '  ' + grp.name;
+                    });
 
-        html += '<div class="voiceHelpContent">';
 
-        html += '<div class="defaultVoiceHelp">';
+            getSampleCommands(groupid)
+                .then(function (commands) {
+                    renderSampleCommands(currentDialog, commands);
+                    listen();
+                })
+                .catch(function (e) { console.log("Error", e); });
+        } else if (isNewDialog) {
+            getSampleCommands()
+                .then(function (commands) {
+                    renderSampleCommands(currentDialog, commands);
+                });
 
-        html += '<h1 style="margin-bottom:1.25em;">' + Globalize.translate('HeaderSaySomethingLike') + '</h1>';
+        }
-
-        html += '<div class="exampleCommands">';
-        html += '</div>';
-
-        // defaultVoiceHelp
-        html += '</div>';
-
-        html += '<div class="unrecognizedCommand" style="display:none;">';
-        html += '<h1>' + Globalize.translate('HeaderYouSaid') + '</h1>';
-        html += '<p class="exampleCommand voiceInputContainer"><i class="fa fa-quote-left"></i><span class="voiceInputText exampleCommandText"></span><i class="fa fa-quote-right"></i></p>';
-        html += '<p>' + Globalize.translate('MessageWeDidntRecognizeCommand') + '</p>';
-
-        html += '<br/>';
-        html += '<button is="emby-button" type="button" class="raised submit block btnRetry"><iron-icon icon="mic"></iron-icon><span>' + Globalize.translate('ButtonTryAgain') + '</span></button>';
-        html += '<p class="blockedMessage" style="display:none;">' + Globalize.translate('MessageIfYouBlockedVoice') + '<br/><br/></p>';
-
-        html += '</div>';
-
-        html += '<button is="emby-button" type="button" class="raised block btnCancelVoiceInput" style="background-color:#444;"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></button>';
-
-        // voiceHelpContent
-        html += '</div>';
-
-        html += '</div>';
-
-        dlg.innerHTML = html;
-        document.body.appendChild(dlg);
-
-        dialogHelper.open(dlg);
-        currentDialog = dlg;
-
-        dlg.addEventListener('close', function () {
-            currentDialog = null;
-        });
-
-        $('.btnCancelVoiceInput', dlg).on('click', function () {
-            destroyCurrentRecognition();
-            dialogHelper.close(dlg);
-        });
-
-        $('.btnRetry', dlg).on('click', function () {
-            $('.unrecognizedCommand').hide();
-            $('.defaultVoiceHelp').show();
-            startListening(false);
-        });
-
-        getCommandsPromise.then(function (commands) {
-            renderSampleCommands(dlg.querySelector('.voiceHelpContent'), commands);
-        });
     }
-
+    function processInput(input) {
-    /// <summary> Hides the voice help. </summary>
+        return voiceprocessor.processTranscript(input);
-    /// <returns> . </returns>
-    function hideVoiceHelp() {
-
-        $('.voiceInputHelp').remove();
     }
 
     /// <summary> Shows the unrecognized command help. </summary>
     /// <returns> . </returns>
-    function showUnrecognizedCommandHelp() {
+    function showUnrecognizedCommandHelp(command) {
         //speak("I don't understend this command");
-        $('.unrecognizedCommand').show();
+        if (command)
-        $('.defaultVoiceHelp').hide();
+            currentDialog.querySelector('.voiceInputText').innerText = command;
-    }
+        currentDialog.querySelector('.unrecognizedCommand').classList.remove('hide');
-
+        currentDialog.querySelector('.defaultVoiceHelp').classList.add('hide');
-    /// <summary> Process the transcript described by text. </summary>
-    /// <param name="text"> The text. </param>
-    /// <returns> . </returns>
-    function processTranscript(text, isCancelled) {
-
-        $('.voiceInputText').html(text);
-
-        if (text || AppInfo.isNativeApp) {
-            $('.blockedMessage').hide();
-        }
-        else {
-            $('.blockedMessage').show();
-        }
-
-        if (text) {
-            require(['voice/voicecommands.js', 'voice/grammarprocessor.js'], function (voicecommands, grammarprocessor) {
-
-                var processor = grammarprocessor(commandgroups, text);
-                if (processor && processor.command) {
-                    voicecommands(processor)
-                        .then(function (result) {
-                            if (result.item.actionid === 'show' && result.item.sourceid === 'group') {
-                                var dlg = currentDialog;
-                                if (dlg)
-                                    showCommands(false, result)
-                                else
-                                    showCommands(true, result)
-                            }
-                        })
-                        .catch(showUnrecognizedCommandHelp);
-                }
-                else
-                    showUnrecognizedCommandHelp();
-
-                var dlg = currentDialog;
-                if (dlg) {
-                    dialogHelper.close(dlg);
-                }
-            });
-
-        }
-        else if (!isCancelled) {
-            showUnrecognizedCommandHelp();
-        }
-    }
-
-    /// <summary> Starts listening internal. </summary>
-    /// <returns> . </returns>
-    function startListening(createUI) {
-
-        destroyCurrentRecognition();
-        var recognition = new (window.SpeechRecognition || window.webkitSpeechRecognition || window.mozSpeechRecognition || window.oSpeechRecognition || window.msSpeechRecognition)();
-        recognition.lang = lang;
-        var groupid = '';
-        //recognition.continuous = true;
-        //recognition.interimResults = true;
-
-        recognition.onresult = function (event) {
-            if (event.results.length > 0) {
-                processTranscript(event.results[0][0].transcript || '');
-            }
-        };
-
-        recognition.onerror = function () {
-            processTranscript('', recognition.cancelled);
-        };
-
-        recognition.onnomatch = function () {
-            processTranscript('', recognition.cancelled);
-        };
-
-        recognition.start();
-        currentRecognition = recognition;
-        showCommands(createUI);
-    }
-
-    /// <summary> Destroys the current recognition. </summary>
-    /// <returns> . </returns>
-    function destroyCurrentRecognition() {
-
-        var recognition = currentRecognition;
-        if (recognition) {
-            recognition.abort();
-            currentRecognition = null;
-        }
-    }
-
-    /// <summary> Cancel listener. </summary>
-    /// <returns> . </returns>
-    function cancelListener() {
-
-        destroyCurrentRecognition();
-        hideVoiceHelp();
     }
 
     /// <summary> Shows the commands. </summary>
     /// <param name="createUI"> The create user interface. </param>
     /// <returns> . </returns>
-    function showCommands(createUI, result) {
+    function showCommands(result) {
-        if (createUI !== false) {
+        //speak('Hello, what can I do for you?');
-            //speak('Hello, what can I do for you?');
+        if (result)
-            require(['paper-fab', 'css!voice/voice.css'], function () {
+            showVoiceHelp(result.groupid, result.name);
-                if (result)
+        else
-                    showVoiceHelp(result.groupid, result.name);
+            showVoiceHelp();
-                else
+    }
-                    showVoiceHelp();
+
-            });
+    function resetDialog() {
+        if (currentDialog) {
+            currentDialog.querySelector('.unrecognizedCommand').classList.add('hide');
+            currentDialog.querySelector('.defaultVoiceHelp').classList.remove('hide');
         }
     }
+    function showDialog() {
+        resetDialog();
+        showCommands();
+        listen();
+    }
+    function listen() {
+        voicereceiver.listenForCommand(lang || "en-US").then(processInput).then(function (data) {
+
+            closeDialog();
+
+        }, function (result) {
+            if (result.error == 'group') {
+                showVoiceHelp(result.item.groupid, result.groupName);
+                return;
+            }
+            showUnrecognizedCommandHelp(result.text || '');
+        });
+    }
+    function closeDialog() {
+        dialogHelper.close(currentDialog);
+        voicereceiver.cancel();
+    }
 
     /// <summary> An enum constant representing the window. voice input manager option. </summary>
     return {
-        startListening: startListening
+        showDialog: showDialog
     };
 
 });

dashboard-ui/voice/voiceprocessor.js

@@ -0,0 +1,65 @@
+define(['voice/voicecommands.js', 'voice/grammarprocessor.js'], function (voicecommands, grammarprocessor) {
+
+    var commandgroups;
+
+    function getCommandGroups() {
+
+        if (commandgroups) {
+            return Promise.resolve(commandgroups);
+        }
+
+        return new Promise(function (resolve, reject) {
+
+            var file = "grammar";
+            //if (language && language.length > 0)
+            //    file = language;
+
+            var xhr = new XMLHttpRequest();
+            xhr.open('GET', "voice/grammar/" + file + ".json", true);
+
+            xhr.onload = function (e) {
+
+                commandgroups = JSON.parse(this.response);
+                resolve(commandgroups);
+            }
+
+            xhr.onerror = reject;
+
+            xhr.send();
+        });
+    }
+    /// <summary> Process the transcript described by text. </summary>
+    /// <param name="text"> The text. </param>
+    /// <returns> . </returns>
+    function processTranscript(text) {
+        if (text) {
+            var processor = grammarprocessor(commandgroups, text);
+            if (processor && processor.command) {
+                console.log("Command from Grammar Processor", processor);
+                return voicecommands(processor)
+                    .then(function (result) {
+                        console.log("Result of executed command", result);
+                        if (result.item.actionid === 'show' && result.item.sourceid === 'group') {
+                            return Promise.reject({ error: "group", item: result.item, groupName: result.name });
+                        } else {
+                            return Promise.resolve({ item: result.item });
+                        }
+                    }, function () {
+                        return Promise.reject({ error: "unrecognized-command", text: text });
+                    });
+            } else {
+                return Promise.reject({ error: "unrecognized-command", text: text });
+            }
+
+        } else {
+            return Promise.reject({ error: "empty" });
+        }
+    }
+
+    /// <summary> An enum constant representing the window. voice input manager option. </summary>
+    return {
+        processTranscript: processTranscript,
+        getCommandGroups: getCommandGroups
+    };
+
+});

dashboard-ui/voice/voicereceiver.js

@@ -0,0 +1,57 @@
+define([], function () {
+    var currentRecognition = null;
+
+
+    /// <summary> Starts listening for voice commands </summary>
+    /// <returns> . </returns>
+    function listenForCommand(lang) {
+        return new Promise(function (resolve, reject) {
+            cancelListener();
+
+            var recognition = new (window.SpeechRecognition ||
+                window.webkitSpeechRecognition ||
+                window.mozSpeechRecognition ||
+                window.oSpeechRecognition ||
+                window.msSpeechRecognition)();
+            recognition.lang = lang;
+
+            recognition.onresult = function (event) {
+                console.log(event);
+                if (event.results.length > 0) {
+                    var resultInput = event.results[0][0].transcript || '';
+                    resolve(resultInput);
+                }
+            };
+
+            recognition.onerror = function () {
+                reject({ error: event.error, message: event.message });
+            };
+
+            recognition.onnomatch = function () {
+                reject({ error: "no-match" });
+            };
+            currentRecognition = recognition;
+
+            currentRecognition.start();
+        });
+    }
+
+
+    /// <summary> Cancel listener. </summary>
+    /// <returns> . </returns>
+    function cancelListener() {
+
+        if (currentRecognition) {
+            currentRecognition.abort();
+            currentRecognition = null;
+        }
+
+    }
+
+    /// <summary> An enum constant representing the window. voice input manager option. </summary>
+    return {
+        listenForCommand: listenForCommand,
+        cancel: cancelListener
+    };
+
+});