Issue 6923 - Simplify parsing of metadata

lib/synchronizer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 142 matching lines @@
 
     let params = {
       redirect: null,
       homepage: null,
       title: null,
       version: null,
       expires: null
     };
     for (let i = 1; i < lines.length; i++)
     {
-      let match = /^\s*!\s*(?:(\w+)\s*:\s*(.*)|\S)/.exec(lines[i]);
+      let match = /^\s*!\s*(.*?)\s*:\s*(.*)/.exec(lines[i]);
       if (!match)
         break;
 
-      if (typeof match[1] != "undefined")
+      let keyword = match[1].toLowerCase();
+      if (params.hasOwnProperty(keyword))
       {
-        let keyword = match[1].toLowerCase();
-        if (params.hasOwnProperty(keyword))
-        {
-          params[keyword] = match[2];
-          lines.splice(i--, 1);
-        }
+        params[keyword] = match[2];
+        lines.splice(i--, 1);
       }
     }
 
     if (params.redirect)
       return redirectCallback(params.redirect);
 
     // Handle redirects
     let subscription = Subscription.fromURL(downloadable.redirectURL ||
                                             downloadable.url);
     if (downloadable.redirectURL &&
@@ skipping 156 matching lines @@
 }
 
 /**
  * This object is responsible for downloading filter subscriptions whenever
  * necessary.
  * @type {Synchronizer}
  */
 let synchronizer = new Synchronizer();
 
 exports.Synchronizer = synchronizer;