| Index: sitescripts/extensions/bin/updateExternalFilterlists.py | 
| =================================================================== | 
| new file mode 100644 | 
| --- /dev/null | 
| +++ b/sitescripts/extensions/bin/updateExternalFilterlists.py | 
| @@ -0,0 +1,74 @@ | 
| +# coding: utf-8 | 
| + | 
| +# This file is part of the Adblock Plus web scripts, | 
| +# Copyright (C) 2006-2013 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 | 
| +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| +# GNU General Public License for more details. | 
| +# | 
| +# You should have received a copy of the GNU General Public License | 
| +# along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 
| + | 
| +import os, subprocess, codecs, urllib, re | 
| 
 
Felix Dahlke
2013/06/25 10:10:02
Seems like the re module is not being used here.
 
 | 
| +from sitescripts.utils import get_config, setupStderr | 
| +from tempfile import mkdtemp | 
| +from shutil import rmtree | 
| + | 
| +def updateExternalFiles(): | 
| + settings = readSettings() | 
| + for name, setting in settings.iteritems(): | 
| 
 
Wladimir Palant
2013/06/25 11:21:03
Nit: for setting in settings.itervalues() - the ke
 
 | 
| + tempdir = mkdtemp(prefix='external') | 
| + try: | 
| + repoPath = setting['targetrepository'] | 
| + targetPath = os.path.dirname(setting['targetfile']) | 
| + filename = os.path.basename(setting['targetfile']) | 
| + | 
| + subprocess.Popen(['hg', 'clone', '-q', '-U', repoPath, tempdir], stdout=subprocess.PIPE).communicate() | 
| + subprocess.Popen(['hg', 'up', '-q', '-R', tempdir, '-r', 'default'], stdout=subprocess.PIPE).communicate() | 
| + | 
| + path = os.path.join(tempdir, targetPath) | 
| + if not os.path.exists(path): | 
| + os.makedirs(path) | 
| + | 
| + path = os.path.join(path, filename) | 
| + exists = os.path.exists(path) | 
| + file = codecs.open(path, 'wb', encoding='utf-8') | 
| + data = urllib.urlopen(setting['source']).read() | 
| 
 
Wladimir Palant
2013/06/25 11:21:03
You need to add .decode('utf-8') at the end - as i
 
 | 
| + file.write(data) | 
| + file.close() | 
| + | 
| + message = 'Updated copy of external file %s' | 
| + if not exists: | 
| + message = 'Added copy of external file %s' | 
| + subprocess.Popen(['hg', 'commit', '-q', '-A', '-R', tempdir, '-u', 'hgbot', '-m', message % filename], stdout=subprocess.PIPE).communicate() | 
| + subprocess.Popen(['hg', 'push', '-q', '-R', tempdir], stdout=subprocess.PIPE).communicate() | 
| + finally: | 
| + rmtree(tempdir) | 
| + | 
| +def readSettings(): | 
| + result = {} | 
| + for option, value in get_config().items('externalFiles'): | 
| + if option.find('_') < 0: | 
| + continue | 
| + name, setting = option.rsplit('_', 2) | 
| + if not setting in ('source', 'targetrepository', 'targetfile'): | 
| + continue | 
| + | 
| + if not name in result: | 
| + result[name] = { | 
| + 'source': None, | 
| + 'targetrepository': None, | 
| + 'targetfile': None | 
| + } | 
| + result[name][setting] = value | 
| + return result | 
| + | 
| +if __name__ == '__main__': | 
| + setupStderr() | 
| + updateExternalFiles() |