diff --git a/README.md b/README.md index 5cc875b..cbff526 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,16 @@ qrdecoder.decode(path, ```javascript { - ZXingLocation: "/path", - try_harder: false, + ZXingLocation: "/path", + try_harder: false, multi: false } ``` ## ZXing -In this repository are two jars (javase.jar and core.jar). Both of these belong to https://github.com/zxing/zxing and were retrieved from http://repo1.maven.org/maven2/com/google/zxing/ +In this repository are three jars: javase-3.3.0.jar, core-3.3.0.jar and jcommander-1.60.jar. +The two first of these belong to https://github.com/zxing/zxing and were retrieved from http://repo1.maven.org/maven2/com/google/zxing/ +The last one is a dependency of ZXing which belong to https://github.com/cbeust/jcommander and was retrieved from https://repo1.maven.org/maven2/com/beust/jcommander/ ZXing included only for ease of use. diff --git a/lib/main.js b/lib/main.js index 4233ba0..12ce13e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -13,7 +13,11 @@ module.exports = function (options) { } if(defaults.ZXingVersion == null) { - defaults.ZXingVersion = "-3.1.0" + defaults.ZXingVersion = "3.3.0" + } + + if(defaults.JCommanderVersion == null) { + defaults.JCommanderVersion = "1.60" } var commandLineOptions = " "; @@ -25,7 +29,7 @@ module.exports = function (options) { } return { decode: function(filePath, cb) { - exec('java -cp '+path.join(defaults.ZXingLocation, 'javase', 'javase'+defaults.ZXingVersion+'.jar')+cpSeparator+path.join(defaults.ZXingLocation, 'core', 'core'+defaults.ZXingVersion+'.jar')+' com.google.zxing.client.j2se.CommandLineRunner'+commandLineOptions+''+filePath, + exec('java -cp '+path.join(defaults.ZXingLocation, 'javase', 'javase-'+defaults.ZXingVersion+'.jar')+cpSeparator+path.join(defaults.ZXingLocation, 'lib', 'jcommander-'+defaults.JCommanderVersion+'.jar')+cpSeparator+path.join(defaults.ZXingLocation, 'core', 'core-'+defaults.ZXingVersion+'.jar')+' com.google.zxing.client.j2se.CommandLineRunner'+commandLineOptions+''+filePath, function(err, stdout, stderr){ var qrcode = ""; var errorCache = null; diff --git a/zxing/core/core-3.1.0.jar b/zxing/core/core-3.1.0.jar deleted file mode 100644 index 63c228a..0000000 Binary files a/zxing/core/core-3.1.0.jar and /dev/null differ diff --git a/zxing/core/core-3.3.0.jar b/zxing/core/core-3.3.0.jar new file mode 100644 index 0000000..94f7406 Binary files /dev/null and b/zxing/core/core-3.3.0.jar differ diff --git a/zxing/javase/javase-3.1.0.jar b/zxing/javase/javase-3.1.0.jar deleted file mode 100644 index 2647da2..0000000 Binary files a/zxing/javase/javase-3.1.0.jar and /dev/null differ diff --git a/zxing/javase/javase-3.3.0.jar b/zxing/javase/javase-3.3.0.jar new file mode 100644 index 0000000..359ca5f Binary files /dev/null and b/zxing/javase/javase-3.3.0.jar differ diff --git a/zxing/lib/jcommander-1.60.jar b/zxing/lib/jcommander-1.60.jar new file mode 100644 index 0000000..514fa0f Binary files /dev/null and b/zxing/lib/jcommander-1.60.jar differ