Issue 2822 - Added support for new subscription types

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 175 matching lines @@
       found = False
       for key in group:
         if self._data[key] != None:
           found = True
       if not found:
         str = ", ".join(group)
         warn('None of the attributes %s present in %s' % (str, path))
 
     if len(self.variants) == 0:
       warn('No list locations given in %s' % (path))
-    if self.type != 'ads' and self.type != 'other':
+    if self.type not in ['ads', 'anti-adblock', 'other', 'malware', 'social', 'privacy']:

[Sebastian Noack, 2015/08/31 15:53:44]

Nit: Please use a tuple. There is no reason to use a mutable data structure
here.

[Thomas Greiner, 2015/09/02 14:10:19]

Done.

       warn('Unknown type given in %s' % (path))
     if self.digest != 'daily' and self.digest != 'weekly':
       warn('Unknown digest frequency given in %s' % (path))
     if not self.digestDay[0:3].lower() in weekdays:
       warn('Unknown digest day given in %s' % (path))
       self.digestDay = 'wed'
     self.digestDay = weekdays[self.digestDay[0:3].lower()]
-    if self.recommendation != None and (self.languages == None or not re.search(r'\S', self.languages)):
+    if self.recommendation is not None and self.type == 'ads' and (self.languages is None or not self.languages.strip()):

[Sebastian Noack, 2015/08/31 15:53:44]

There are two ways to further simplify that check:

  not (self.languages || '').strip()

.. or ..

  not (self.languages and self.languages.strip()) 

[Thomas Greiner, 2015/09/02 14:10:19]

Done.

       warn('Recommendation without languages in %s' % (path))
     if len(self.supplements) == 0:
       for [name, url, complete] in self.variants:
         if complete:
           warn('Variant marked as complete for non-supplemental subscription in %s' % (path))
           break
 
     self.variants.sort(key=lambda variant: (self.recommendation == variant) * 2 + variant[2], reverse=True)
 
 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:
-        lists[supplements].supplemented.append(filedata)
+        if lists[supplements].type == filedata.type:
+          lists[supplements].supplemented.append(filedata)
       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 != ''