core(logging): adjust logging messages

Change-Id: Iccfb83392dcbc2241d835d7da41cc3126c4c75ef
andi34 · Jan 22, 2022 · ade299c · ade299c
1 parent bfe50b4
commit ade299c
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/js/core.js b/src/js/core.js
@@ -480,7 +480,7 @@ const photoBooth = (function () {
             .done(function (result) {
                 endTime = new Date().getTime();
                 totalTime = endTime - startTime;
-                photoboothTools.console.log('took ' + data.style, result);
+                photoboothTools.console.log('Took ' + data.style, result);
                 photoboothTools.console.logDev('Taking picture took ' + totalTime + 'ms');
                 if (config.ui.shutter_animation) {
                     api.shutter.stop();
@@ -665,7 +665,7 @@ const photoBooth = (function () {
             }
             takingPic = false;
             remoteBuzzerClient.inProgress(false);
-            photoboothTools.console.logDev('Taking photo: ' + takingPic);
+            photoboothTools.console.logDev('Taking picture in progress: ' + takingPic);
             if (config.dev.reload_on_error) {
                 loading.append($('<p>').text(photoboothTools.getTranslation('auto_reload')));
                 setTimeout(function () {
@@ -747,7 +747,7 @@ const photoBooth = (function () {
 
         preloadImage.onload = function () {
             $('body').attr('data-main-image', filename);
-            photoboothTools.console.log(config.foldersRoot.keying + '/' + filename);
+            photoboothTools.console.log('Chroma image: ' + config.foldersRoot.keying + '/' + filename);
             const chromaimage = config.foldersRoot.keying + '/' + filename;
 
             loader.hide();
@@ -759,9 +759,9 @@ const photoBooth = (function () {
 
         takingPic = false;
         remoteBuzzerClient.inProgress(false);
+        photoboothTools.console.logDev('Taking picture in progress: ' + takingPic);
 
         api.resetTimeOut();
-        photoboothTools.console.logDev('Taking photo: ' + takingPic);
     };
 
     api.renderPic = function (filename, files) {
@@ -824,7 +824,7 @@ const photoBooth = (function () {
                             } else {
                                 photoboothTools.console.log('Error while deleting ' + file);
                                 if (data.error) {
-                                    photoboothTools.console.log(data.error);
+                                    photoboothTools.console.log('Error: ' + data.error);
                                 }
                                 setTimeout(function () {
                                     photoboothTools.reloadPage();
@@ -872,11 +872,10 @@ const photoBooth = (function () {
 
         takingPic = false;
         remoteBuzzerClient.inProgress(false);
+        photoboothTools.console.logDev('Taking picture in progress: ' + takingPic);
 
         api.resetTimeOut();
 
-        photoboothTools.console.logDev('Taking photo: ' + takingPic);
-
         if (config.preview.mode === PreviewMode.GPHOTO.valueOf() && !config.preview.gphoto_bsm) {
             api.startVideo(CameraDisplayMode.INIT);
         }
@@ -1002,7 +1001,7 @@ const photoBooth = (function () {
 
     api.printImage = function (imageSrc, cb) {
         if (isPrinting) {
-            photoboothTools.console.log('Printing already: ' + isPrinting);
+            photoboothTools.console.log('Printing in progress: ' + isPrinting);
         } else {
             photoboothTools.modal.open('#print_mesg');
             isPrinting = true;
@@ -1078,7 +1077,7 @@ const photoBooth = (function () {
             },
             success: (data) => {
                 if (data.error) {
-                    photoboothTools.console.log('Error while deleting image');
+                    photoboothTools.console.log('Error while deleting image!');
                 }
                 cb(data);
             },
@@ -1100,7 +1099,7 @@ const photoBooth = (function () {
             },
             success: (data) => {
                 if (data.error) {
-                    photoboothTools.console.log('Error while deleting image');
+                    photoboothTools.console.log('Error while deleting image!');
                 }
             },
             error: (jqXHR, textStatus) => {
@@ -1134,7 +1133,7 @@ const photoBooth = (function () {
         imgFilter = $(this).attr('id');
         const result = {file: resultPage.attr('data-img')};
 
-        photoboothTools.console.logDev('Applying filter', imgFilter, result);
+        photoboothTools.console.logDev('Applying filter: ' + imgFilter + ' ' + result);
 
         api.processPic(imgFilter, result);
 
@@ -1309,7 +1308,7 @@ const photoBooth = (function () {
         if (triggerPic[0] || triggerCollage[0]) {
             if (config.picture.key && parseInt(config.picture.key, 10) === ev.keyCode) {
                 if (takingPic) {
-                    photoboothTools.console.logDev('Taking photo already in progress!');
+                    photoboothTools.console.logDev('Taking picture already in progress!');
                 } else {
                     $('.closeGallery').trigger('click');
                     if (config.collage.enabled && config.collage.only) {
@@ -1325,7 +1324,7 @@ const photoBooth = (function () {
 
             if (config.collage.key && parseInt(config.collage.key, 10) === ev.keyCode) {
                 if (takingPic) {
-                    photoboothTools.console.logDev('Taking photo already in progress!');
+                    photoboothTools.console.logDev('Taking picture already in progress!');
                 } else {
                     $('.closeGallery').trigger('click');
                     if (config.collage.enabled) {