Resolve invalid option -- 'o'

Issue #495

packages/server/package.json

@@ -37,6 +37,7 @@
     "loglevel": "^1.7.0",
     "loglevel-plugin-prefix": "^0.8.4",
     "mv": "^2.1.1",
+    "semver": "^7.3.8",
     "swagger-jsdoc": "^6.2.5",
     "swagger-ui-express": "^4.6.0"
   },

packages/server/src/process.js

@@ -1,10 +1,21 @@
 const util = require('util');
 const log = require('loglevel').getLogger('Process');
 const exec = util.promisify(require('child_process').exec);
+const execSync = require('child_process').execSync;
 const spawn = require('child_process').spawn;
 const extend = require('./util').extend;
 
 const Process = {
+
+  /**
+   * @param {string} cmd 
+   * @returns {string}
+   */
+  executeSync(cmd) {
+    const stdout = execSync(cmd);
+    return Buffer.from(stdout).toString().trim();
+  },
+
   /**
    * @param {string} cmd 
    * @returns {Promise.<string>}

packages/server/src/scanimage.js

@@ -4,12 +4,33 @@ const CmdBuilder = require('./command-builder');
 /** @type {Configuration} */
 const Config = require('./config');
 const Constants = require('./constants');
+const Process = require('./process');
+const semver = require('semver');
 
 class Scanimage {
+  get version() {
+    if (this._version === undefined) {
+      const result = Process.executeSync(`${Config.scanimage} -V`);
+      this._version = /.*backend version (.*)/.exec(result)[1];
+    }
+    return this._version;
+  }
+
+  get supportsOutputFlag() {
+    return semver.satisfies(this.version, '>=1.0.28');
+  }
+}
+
+class ScanimageCommand {
+
+  constructor() {
+    this.scanimage = new Scanimage();
+  }
+
   /**
    * @returns {string}
    */
-  static devices() {
+  devices() {
     return new CmdBuilder(Config.scanimage)
       .arg('-L')
       .build();
@@ -19,7 +40,7 @@ class Scanimage {
    * @param {string} deviceId
    * @returns {string}
    */
-  static features(deviceId) {
+  features(deviceId) {
     return new CmdBuilder(Config.scanimage)
       .arg('-d', deviceId)
       .arg('-A')
@@ -30,7 +51,7 @@ class Scanimage {
    * @param {number} page 
    * @returns {string}
    */
-  static filename(page) {
+  filename(page) {
     const number = `000${page}`.slice(-4);
     return `${Config.tempDirectory}/${Constants.TEMP_FILESTEM}-0-${number}.tif`;
   }
@@ -39,7 +60,7 @@ class Scanimage {
    * @param {ScanRequest} request 
    * @returns {string}
    */
-  static scan(request) {
+  scan(request) {
     log.debug(JSON.stringify(request));
     const params = request.params;
     const cmdBuilder = new CmdBuilder(Config.scanimage);
@@ -83,19 +104,24 @@ class Scanimage {
     if (params.mode === 'Lineart' && params.dynamicLineart === false) {
       cmdBuilder.arg('--disable-dynamic-lineart=yes');
     }
-    if ([Constants.BATCH_AUTO, Constants.BATCH_COLLATE_STANDARD, Constants.BATCH_COLLATE_REVERSE]
-      .includes(request.batch)) {
+    if ([Constants.BATCH_AUTO, Constants.BATCH_COLLATE_STANDARD, Constants.BATCH_COLLATE_REVERSE].includes(request.batch)) {
       const pattern = `${Config.tempDirectory}/${Constants.TEMP_FILESTEM}-${request.index}-%04d.tif`;
       cmdBuilder.arg(`--batch=${pattern}`);
     } else {
-      if ('isPreview' in params && params.isPreview) {
-        cmdBuilder.arg(`-o ${Config.previewDirectory}/preview.tif`);
+      const outputFile = 'isPreview' in params && params.isPreview
+        ? `${Config.previewDirectory}/preview.tif`
+        : this.filename(request.index);
+
+      if (this.scanimage.supportsOutputFlag) {
+        cmdBuilder.arg('-o', outputFile);
       } else {
-        cmdBuilder.arg(`-o ${Scanimage.filename(request.index)}`);
+        cmdBuilder.arg(`> '${outputFile}'`);
       }
     }
     return cmdBuilder.build();
   }
 }
 
-module.exports = Scanimage;
+const scanimageCommand = new ScanimageCommand();
+
+module.exports = scanimageCommand;

packages/server/test/config.test.js

@@ -0,0 +1,9 @@
+/* eslint-env mocha */
+const assert = require('assert');
+const Config = require('../src/config');
+
+describe('Config', () => {
+  it.skip('scanimageVersion', () => {
+    assert.strictEqual(Config.scanimageVersion, '1.0.31');
+  });
+});

packages/server/test/scanimage-test.js

@@ -0,0 +1,61 @@
+/* eslint-env mocha */
+const assert = require('assert');
+const Scanimage = require('../src/scanimage');
+
+const requestScan = {
+  params: {
+    deviceId: 'deviceId',
+    resolution: '150',
+    format: 'TIF',
+    isPreview: false
+  }
+};
+
+const requestPreview = {
+  params: {
+    deviceId: 'deviceId',
+    resolution: '150',
+    format: 'TIF',
+    isPreview: true
+  }
+};
+
+function commandFor(version, request) {
+  const temp = Scanimage.scanimage.version;
+  Scanimage.scanimage._version = version;
+  const command = Scanimage.scan(request);
+  Scanimage.scanimage._version = temp;
+  return command;
+}
+
+describe('ScanimageCommand', () => {
+  it('scanimageVersion:1.0.27:scan', () => {
+    const command = commandFor('1.0.27', requestScan);
+    assert.ok(command.match(/.*scanimage.* > 'data\/temp\/~tmp-scan-0-ined.tif'/));
+  });
+
+  it('scanimageVersion:1.0.27:preview', () => {
+    const command = commandFor('1.0.27', requestPreview);
+    assert.ok(command.match(/.*scanimage.* > 'data\/preview\/preview.tif'/));
+  });
+
+  it('scanimageVersion:1.0.28:scan', () => {
+    const command = commandFor('1.0.28', requestScan);
+    assert.ok(command.match(/.*scanimage.* -o 'data\/temp\/~tmp-scan-0-ined.tif'/));
+  });
+
+  it('scanimageVersion:1.0.28:preview', () => {
+    const command = commandFor('1.0.28', requestPreview);
+    assert.ok(command.match(/.*scanimage.* -o 'data\/preview\/preview.tif'/));
+  });
+
+  it('scanimageVersion:1.0.31:scan', () => {
+    const command = commandFor('1.0.31', requestScan);
+    assert.ok(command.match(/.*scanimage.* -o 'data\/temp\/~tmp-scan-0-ined.tif'/));
+  });
+
+  it('scanimageVersion:1.0.31:preview', () => {
+    const command = commandFor('1.0.31', requestPreview);
+    assert.ok(command.match(/.*scanimage.* -o 'data\/preview\/preview.tif'/));
+  });
+});