| Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 1 # This file is part of the Adblock Plus website, | 1 # This file is part of the Adblock Plus website, | 
| 2 # Copyright (C) 2006-2015 Eyeo GmbH | 2 # Copyright (C) 2006-2015 Eyeo GmbH | 
| 3 # | 3 # | 
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as | 
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. | 
| 7 # | 7 # | 
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, | 
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 11 # GNU General Public License for more details. | 11 # GNU General Public License for more details. | 
| 12 # | 12 # | 
| 13 # You should have received a copy of the GNU General Public License | 13 # You should have received a copy of the GNU General Public License | 
| 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 
| 15 | 15 | 
| 16 import codecs | 16 import codecs | 
| 17 import os | 17 import os | 
| 18 import tarfile | 18 import tarfile | 
| 19 import urllib | 19 import urllib | 
| 20 from ConfigParser import SafeConfigParser | |
| 20 | 21 | 
| 21 def get_subscriptions(_): | 22 def get_subscriptions(_): | 
| 22 from sitescripts.subscriptions.subscriptionParser import parse_file, calculate _supplemented | 23 from sitescripts.subscriptions import subscriptionParser | 
| 23 | 24 | 
| 24 result = {} | 25 result = {} | 
| 25 utf8_reader = codecs.getreader('utf8') | 26 utf8_reader = codecs.getreader('utf8') | 
| 26 source = urllib.urlopen("https://hg.adblockplus.org/subscriptionlist/archive/d efault.tar.gz") | 27 source = urllib.urlopen("https://hg.adblockplus.org/subscriptionlist/archive/d efault.tar.gz") | 
| 28 orig_get_settings = subscriptionParser.get_settings | |
| 27 try: | 29 try: | 
| 30 # Hack: monkey-patch subscriptionParser.get_settings() | |
| 31 settings = SafeConfigParser() | |
| 32 settings_handle = urllib.urlopen("https://hg.adblockplus.org/subscriptionlis t/rawfile/default/settings") | |
| 
 
Sebastian Noack
2015/03/13 20:06:34
Consider moving that logic into subscriptionParser
 
Wladimir Palant
2015/03/13 20:08:54
Yes, that's the idea - the hacks here are merely t
 
 | |
| 33 try: | |
| 34 settings.readfp(utf8_reader(settings_handle)) | |
| 35 finally: | |
| 36 settings_handle.close() | |
| 37 subscriptionParser.get_settings = lambda: settings | |
| 38 | |
| 28 with tarfile.open(fileobj=source, mode="r|gz") as archive: | 39 with tarfile.open(fileobj=source, mode="r|gz") as archive: | 
| 29 for fileinfo in archive: | 40 for fileinfo in archive: | 
| 30 if os.path.splitext(fileinfo.name)[1] != ".subscription": | 41 if os.path.splitext(fileinfo.name)[1] != ".subscription": | 
| 31 continue | 42 continue | 
| 32 | 43 | 
| 33 filedata = parse_file(fileinfo.name, utf8_reader(archive.extractfile(fil einfo))) | 44 filedata = subscriptionParser.parse_file(fileinfo.name, utf8_reader(arch ive.extractfile(fileinfo))) | 
| 34 if filedata.unavailable: | 45 if filedata.unavailable: | 
| 35 continue | 46 continue | 
| 36 | 47 | 
| 37 result[filedata.name] = filedata | 48 result[filedata.name] = filedata | 
| 38 finally: | 49 finally: | 
| 39 source.close() | 50 source.close() | 
| 51 subscriptionParser.get_settings = orig_get_settings | |
| 40 | 52 | 
| 41 calculate_supplemented(result) | 53 subscriptionParser.calculate_supplemented(result) | 
| 42 return result.values() | 54 return result.values() | 
| OLD | NEW |