| OLD | NEW |
| 1 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, |
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present 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 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 for (title, url, complete) in subscription.variants: | 83 for (title, url, complete) in subscription.variants: |
| 84 site = urlparse(url).netloc | 84 site = urlparse(url).netloc |
| 85 s['links'].append({ | 85 s['links'].append({ |
| 86 'url': url, | 86 'url': url, |
| 87 'title': title, | 87 'title': title, |
| 88 'result': urls[url], | 88 'result': urls[url], |
| 89 'siteResult': site in sites and sites[site], | 89 'siteResult': site in sites and sites[site], |
| 90 }) | 90 }) |
| 91 return result | 91 return result |
| 92 | 92 |
| 93 |
| 93 if __name__ == '__main__': | 94 if __name__ == '__main__': |
| 94 setupStderr() | 95 setupStderr() |
| 95 | 96 |
| 96 subscriptions = checkSubscriptions() | 97 subscriptions = checkSubscriptions() |
| 97 outputFile = get_config().get('subscriptions', 'statusPage') | 98 outputFile = get_config().get('subscriptions', 'statusPage') |
| 98 template = get_template(get_config().get('subscriptions', 'statusTemplate')) | 99 template = get_template(get_config().get('subscriptions', 'statusTemplate')) |
| 99 template.stream({'subscriptions': subscriptions}).dump(outputFile, encoding=
'utf-8') | 100 template.stream({'subscriptions': subscriptions}).dump(outputFile, encoding=
'utf-8') |
| OLD | NEW |