Issue 2823 - Attach parent subscription types when parsing supplemental subscriptions

sitescripts/subscriptions/subscriptionParser.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # 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.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 27 matching lines @@
   type = define_property("type")
   maintainer = define_property("maintainer")
   email = define_property("email")
   specialization = define_property("specialization")
   languages = define_property("languages")
   recommendation = define_property("recommendation", readonly=True)
   deprecated = define_property("deprecated", readonly=True)
   unavailable = define_property("unavailable", readonly=True)
   catchall = define_property("catchall", readonly=True)
   supplements = define_property("supplements", readonly=True)
+  supplementsType = define_property("supplementsType", readonly=True)
   supplemented = define_property("supplemented", readonly=True)
   variants = define_property("variants", readonly=True)
   homepage = define_property("homepage")
   contact = define_property("contact")
   forum = define_property("forum")
   faq = define_property("faq")
   blog = define_property("blog")
   changelog = define_property("changelog")
   policy = define_property("policy")
   digest = define_property("digest")
   digestDay = define_property("digestDay")
 
   def __init__(self, path, data):
     self._data = {
       'name': None,
       'type': 'ads',
       'maintainer': None,
       'email': None,
       'specialization': None,
       'languages': None,
       'deprecated': False,
       'unavailable': False,
       'catchall': False,
       'supplements': [],
+      'supplementsType': set(),
       'supplemented': [],
       'variants': [],
       'recommendation': None,
       'homepage': None,
       'contact': None,
       'forum': None,
       'faq': None,
       'blog': None,
       'changelog': None,
       'policy': None,
@@ skipping 131 matching lines @@
 
 def parse_file(path, data):
   return Subscription(path, data)
 
 def calculate_supplemented(lists):
   for filedata in lists.itervalues():
     for supplements in filedata.supplements:
       if supplements in lists:
         if lists[supplements].type == filedata.type:
           lists[supplements].supplemented.append(filedata)
+        filedata.supplementsType.add(lists[supplements].type)
       else:
         warn('Subscription %s supplements an unknown subscription %s' % (filedata.name, supplements))
 
 @cached(60)
 def get_settings():
   repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
   settingsdata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'settings')])
   settings = SafeConfigParser()
   settings.readfp(codecs.getreader('utf8')(StringIO(settingsdata)))
   return settings
@@ skipping 18 matching lines @@
 
 def getFallbackData():
   repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
   redirectdata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'redirects')])
   gonedata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'gone')])
   return (redirectdata, gonedata)
 
 def _validate_URL(url):
   parse_result = urlparse(url)
   return parse_result.scheme in ('http', 'https') and parse_result.netloc != ''