Fix parsing Issue 63 3rd-Eden#63

Author: User4martin

Diff for: index.js

@@ -39,6 +39,21 @@ function Agent(family, major, minor, patch, source) {
   this.source = source || '';
 }
 
+function replaceRegExResult(matches, templates) {
+    var r = [];
+    var m = matches.map(function(v){ v = typeof v === 'string' ? v.replace(/\&/g, '&&').replace(/\$/g, '&D') : v; });
+    for(var t=1; t<=4; t++) {     // template[1..4]
+        r[t] = templates[t];
+        if (typeof r[t] === 'string') {
+            for(var i=1; i<=9; i++) { // $1..$9
+                r[t] = r[t].replace(new RegExp('\\$'+i, 'g'), matches[i] != undefined ? matches[i] : '');
+            }
+            r[t] = r[t].replace(/&D/g, '$').replace(/&&/g, '&');
+        }
+    }
+    return r;
+}
+
 /**
  * OnDemand parsing of the Operating System.
  *
@@ -58,7 +73,7 @@ Object.defineProperty(Agent.prototype, 'os', {
       if (res = parsers[i][0].exec(userAgent)) {
         parser = parsers[i];
 
-        if (parser[1]) res[1] = parser[1].replace('$1', res[1]);
+        res = replaceRegExResult(res, parser);
         break;
       }
     }
@@ -68,9 +83,9 @@ Object.defineProperty(Agent.prototype, 'os', {
           ? new OperatingSystem()
           : new OperatingSystem(
                 res[1]
-              , parser[2] || res[2]
-              , parser[3] || res[3]
-              , parser[4] || res[4]
+              , res[2]
+              , res[3]
+              , res[4]
             )
     }).os;
   },
@@ -109,7 +124,7 @@ Object.defineProperty(Agent.prototype, 'device', {
       if (res = parsers[i][0].exec(userAgent)) {
         parser = parsers[i];
 
-        if (parser[1]) res[1] = parser[1].replace('$1', res[1]);
+        res = replaceRegExResult(res, parser);
         break;
       }
     }
@@ -119,9 +134,9 @@ Object.defineProperty(Agent.prototype, 'device', {
           ? new Device()
           : new Device(
                 res[1]
-              , parser[2] || res[2]
-              , parser[3] || res[3]
-              , parser[4] || res[4]
+              , res[2]
+              , res[3]
+              , res[4]
             )
     }).device;
   },
@@ -427,12 +442,12 @@ exports.parse = function parse(userAgent, jsAgent) {
     if (res = parsers[i][0].exec(userAgent)) {
       parser = parsers[i];
 
-      if (parser[1]) res[1] = parser[1].replace('$1', res[1]);
+      res = replaceRegExResult(res, parser);
       if (!jsAgent) return new Agent(
           res[1]
-        , parser[2] || res[2]
-        , parser[3] || res[3]
-        , parser[4] || res[4]
+        , res[2]
+        , res[3]
+        , res[4]
         , userAgent
       );
 

Diff for: lib/update.js

@@ -50,6 +50,16 @@ exports.update = function update(callback) {
   });
 };
 
+function getReplacement(field, resource, fallback) {
+    if (! field)
+        return fallback;
+    if (Array.isArray(field))
+        field = field.filter(function(f){ return resource[f] })[0];
+    if (resource[field] != undefined)
+        return resource[field];
+    return fallback;
+}
+
 /**
  * Parse the given sources.
  *
@@ -93,17 +103,17 @@ exports.parse = function parse(sources, callback) {
   [
       {
           resource: 'user_agent_parsers'
-        , replacement: 'family_replacement'
+        , replacement: ['family_replacement', 'v1_replacement', 'v2_replacement', 'v3_replacement' ]
         , name: 'browser'
       }
     , {
           resource: 'device_parsers'
-        , replacement: 'device_replacement'
+        , replacement: [['brand_replacement', 'device_replacement' ], 'model_replacement'] // 
         , name: 'device'
       }
     , {
           resource: 'os_parsers'
-        , replacement: 'os_replacement'
+        , replacement: ['os_replacement', 'os_v1_replacement', 'os_v2_replacement' ]
         , name: 'os'
       }
   ].forEach(function parsing(details) {
@@ -120,39 +130,25 @@ exports.parse = function parse(sources, callback) {
       // We need to JSON stringify the data to properly add slashes escape other
       // kinds of crap in the RegularExpression. If we don't do thing we get
       // some illegal token warnings.
+      var rflags = resource.regex_flags || '';
+      if (rflags) rflags = ", '" + rflags + "'";
       parser = 'parser = Object.create(null);\n';
-      parser += 'parser[0] = new RegExp('+ JSON.stringify(resource.regex) + ');\n';
+      parser += 'parser[0] = new RegExp('+ JSON.stringify(resource.regex) + rflags + ');\n';
 
       // Check if we have replacement for the parsed family name
-      if (resource[details.replacement]) {
-        parser += 'parser[1] = "'+ resource[details.replacement].replace('"', '\\"') +'";';
-      } else {
-        parser += 'parser[1] = 0;';
-      }
+      parser += 'parser[1] = "'+ getReplacement(details.replacement[0], resource, '$1').replace('"', '\\"') +'";';
 
       parser += '\n';
 
-      if (resource.v1_replacement) {
-        parser += 'parser[2] = "'+ resource.v1_replacement.replace('"', '\\"') +'";';
-      } else {
-        parser += 'parser[2] = 0;';
-      }
+      parser += 'parser[2] = "'+ getReplacement(details.replacement[1], resource, '$2').replace('"', '\\"') +'";';
 
       parser += '\n';
 
-      if (resource.v2_replacement) {
-        parser += 'parser[3] = "'+ resource.v2_replacement.replace('"', '\\"') +'";';
-      } else {
-        parser += 'parser[3] = 0;';
-      }
+      parser += 'parser[3] = "'+ getReplacement(details.replacement[2], resource, '$3').replace('"', '\\"') +'";';
 
       parser += '\n';
 
-      if (resource.v3_replacement) {
-        parser += 'parser[4] = "'+ resource.v3_replacement.replace('"', '\\"') +'";';
-      } else {
-        parser += 'parser[4] = 0;';
-      }
+      parser += 'parser[4] = "'+ getReplacement(details.replacement[3], resource, '$4').replace('"', '\\"') +'";';
 
       parser += '\n';
       parser += 'exports.'+ details.name +'['+ i +'] = parser;';