Merge pull request #170 from sbs20/staging

No matching pipeline

README.md

@@ -12,7 +12,7 @@
 
 -- *A satisfied user*
 
-scanservjs is a web-based UI for your scanner. It allows you to share one or
+scanservjs is a web UI frontend for your scanner. It allows you to share one or
 more scanners (using SANE) on a network without the need for drivers or
 complicated installation.
 
@@ -26,7 +26,8 @@ complicated installation.
 * Configurable overrides for all defaults as well as filters and formats
 * Multipage scanning (with collation for double sided scans)
 * Light and dark mode
-* **NEW**: International translations: Czech, German, Italian, Spanish (**help requested**)
+* **NEW**: International translations: Czech, German, Italian, Spanish (**help
+  requested**)
 
 It supports any
 [SANE compatible devices](http://www.sane-project.org/sane-supported-devices.html).

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scanservjs-server",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation. scanserv does not do image conversion or manipulation (beyond the bare minimum necessary for the purposes of browser preview) or OCR.",
   "scripts": {
     "serve": "nodemon --exec 'vue-cli-service serve'",

server/src/api.js

@@ -15,7 +15,7 @@ class Api {
    * @returns {Promise.<FileInfo[]>}
    */
   static async fileList() {
-    log.debug('fileList()');
+    log.trace('fileList()');
     const dir = new FileInfo(Config.outputDirectory);
     let files = await dir.list();
     files = files
@@ -30,6 +30,7 @@ class Api {
    * @returns {FileInfo}
    */
   static fileDelete(fullpath) {
+    log.trace('fileDelete()');
     const file = new FileInfo(fullpath);
     const parent = new FileInfo(file.path);
     const data = new FileInfo(Config.outputDirectory);
@@ -57,7 +58,7 @@ class Api {
     });
 
     const cmd = `${Scanimage.scan(request)} > ${Config.previewDirectory}preview.tif`;
-    log.debug('Executing cmd:', cmd);
+    log.trace('Executing cmd:', cmd);
     await Process.spawn(cmd);
     return {};
   }
@@ -66,6 +67,7 @@ class Api {
    * @returns {FileInfo}
    */
   static deletePreview() {
+    log.trace('deletePreview()');
     const file = new FileInfo(`${Config.previewDirectory}preview.tif`);
     return file.delete();
   }
@@ -75,6 +77,7 @@ class Api {
    * @returns {Promise.<Buffer>}
    */
   static async readPreview(filters) {
+    log.trace('readPreview()', filters);
     // The UI relies on this image being the correct aspect ratio. If there is a
     // preview image then just use it. 
     const source = new FileInfo(`${Config.previewDirectory}preview.tif`);

server/src/command-builder.js

@@ -43,7 +43,7 @@ class CmdBuilder {
     if (ignoreStderr) {
       cmd += ' 2>/dev/null';
     }
-    log.debug('build()', cmd);
+    log.trace('build()', cmd);
     return cmd;
   }
 }

server/src/context.js

@@ -3,9 +3,7 @@ const Config = require('./config');
 const Devices = require('./devices');
 
 const diagnostic = (path) => {
-  const exists = fs.existsSync(path);
-  const isDirectory = exists && fs.statSync(path).isDirectory();
-  const success = exists && !isDirectory;
+  const success = fs.existsSync(path) && !fs.statSync(path).isDirectory();
   const message = success ? `Found ${path}` : `Unable to find file ${path}`;
   return {
     success,

server/src/process.js

@@ -49,7 +49,7 @@ const Process = {
       }
 
       proc.on('close', (code) => {
-        log.debug(`close(${code}): ${cmd}`);
+        log.trace(`close(${code}): ${cmd}`);
         if (code !== 0 && !options.ignoreErrors) {
           reject(new Error(`${cmd} exited with code: ${code}, stderr: ${stderr}`));
         } else {

webui/src/components/Scan.vue

@@ -39,7 +39,7 @@
 
         <v-select
           v-model="request.filters"
-          :items="context.filters"
+          :items="filters"
           item-text="text"
           item-value="value"
           :label="$t('scan.filters')"
@@ -49,7 +49,7 @@
         <v-select
           :label="$t('scan.format')"
           v-model="request.pipeline"
-          :items="context.pipelines"
+          :items="pipelines"
           item-text="text"
           item-value="value"></v-select>
 
@@ -166,6 +166,32 @@ export default {
     });
   },
 
+  computed: {
+    filters() {
+      return this.context.filters.map(f => {
+        return {
+          text: this.$t(`scan.${f}`),
+          value: f
+        };
+      });
+    },
+
+    pipelines() {
+      return this.context.pipelines.map(p => {
+        const variables = (p.match(/@:[a-z-.]+/ig) || []).map(s => s.substr(2));
+        let text = p;
+        variables.forEach(v => {
+          text = text.replaceAll(`@:${v}`, this.$t(v));
+        });
+
+        return {
+          text: text,
+          value: p
+        };
+      });
+    }
+  },
+
   watch: {
     request: {
       handler(request) {
@@ -313,26 +339,6 @@ export default {
 
       return this._fetch(url).then(context => {
         window.clearTimeout(timer);
-        context.filters = context.filters.map(f => {
-          return {
-            text: this.$t(`scan.${f}`),
-            value: f
-          };
-        });
-
-        context.pipelines = context.pipelines.map(p => {
-          const variables = (p.match(/@:[a-z-.]+/ig) || []).map(s => s.substr(2));
-          let text = p;
-          variables.forEach(v => {
-            text = text.replaceAll(`@:${v}`, this.$t(v));
-          });
-
-          return {
-            text: text,
-            value: p
-          };
-        });
-
         this.context = context;
 
         if (context.devices.length > 0) {