Issue 3176 - Add metadata to content blocker lists

sitescripts/content_blocker_lists/bin/generate_lists.py

 #!/usr/bin/env python
 # coding: utf-8
 
 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-2015 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.
 #
@@ skipping 24 matching lines @@
     abp2blocklist_path = config["abp2blocklist_path"]
     if os.path.isdir(abp2blocklist_path):
         subprocess.check_call(("hg", "pull", "-u", "-R", abp2blocklist_path),
                               stdout=devnull)
     else:
       subprocess.check_call(("hg", "clone", config["abp2blocklist_url"],
                              abp2blocklist_path), stdout=devnull)
     subprocess.check_call(("npm", "install"), cwd=abp2blocklist_path,
                           stdout=devnull)
 
-def parse_filter_list_header(filter_list):
-  body_start = re.search(r"^[^![]", filter_list, re.MULTILINE).start()
-  field_re = re.compile(r"^!\s*([^:\s]+):\s*(.+)$", re.MULTILINE)
-  return {match.group(1): match.group(2)
-          for match in field_re.finditer(filter_list, 0, body_start)}
-
 def download_filter_list(url):
   with closing(urllib2.urlopen(url)) as response:
     body = response.read()
-  header = parse_filter_list_header(body)
-  return body, url, header["Version"]
+  version = re.search(r"^(?:[^[!])|^!\s*Version:\s*(.+)$",
+                      body, re.MULTILINE).group(1)
+  return body, url, version
 
 def generate_metadata(filter_lists, expires):
   metadata = OrderedDict((
     ("version", time.strftime("%Y%m%d%H%M", time.gmtime())),
     ("expires", expires),
     ("sources", [])
   ))
   for body, url, version in filter_lists:
     metadata["sources"].append({"url": url, "version": version})
   return metadata
@@ skipping 23 matching lines @@
 
   easylist = download_filter_list(config["easylist_url"])
   exceptionrules = download_filter_list(config["exceptionrules_url"])
 
   write_block_list([easylist],
                    config["easylist_content_blocker_path"],
                    config["easylist_content_blocker_expires"])
   write_block_list([easylist, exceptionrules],
                    config["combined_content_blocker_path"],
                    config["combined_content_blocker_expires"])