Use non greedy operator when parsing identify responses

master
Ludovic Werwinski 11 years ago
parent 13ba1dc11b
commit 1b1af7455d
  1. 4
      lib/getters.js
  2. BIN
      test/fixtures/iptc.jpg
  3. 26
      test/getterIptc.js

@ -188,8 +188,8 @@ module.exports = function (gm) {
try {
var len = parts.length
, rgx1 = /^( *)(.+): (.*)$/ // key: val
, rgx2 = /^( *)(.+):$/ // key: begin nested object
, rgx1 = /^( *)(.+?): (.*)$/ // key: val
, rgx2 = /^( *)(.+?):$/ // key: begin nested object
, out = { indent: {} }
, level = null
, lastkey

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

@ -0,0 +1,26 @@
var assert = require('assert')
module.exports = function (_, dir, finish, gm) {
if (!gm.integration)
return finish();
var im = _._options.imageMagick;
var test = gm(__dirname + '/fixtures/iptc.jpg');
if (im) test.options({ imageMagick: true });
test.identify(function (err) {
if (err) return finish(err);
var d = this.data;
if (im) {
var iptc = d['Profiles'] && d['Profiles']['Profile-iptc'];
assert.equal(iptc['Caption[2,120]'], 'Some caption with colon space: for example');
}
finish();
});
}
Loading…
Cancel
Save