| 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-2016 Eyeo GmbH | 2 # Copyright (C) 2006-2016 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 sys | 16 import sys |
| 17 import os | 17 import os |
| 18 import MySQLdb | 18 import MySQLdb |
| 19 from sitescripts.utils import get_config, setupStderr | 19 from sitescripts.utils import get_config, setupStderr |
| 20 | 20 |
| 21 """ | 21 ''' |
| 22 This script adds domains supplied on the command line to the "correct domains" | 22 This script adds domains supplied on the command line to the "correct domains" |
| 23 list permanently. This is useful for less popular domains that are commonly | 23 list permanently. This is useful for less popular domains that are commonly |
| 24 affected by false positives. | 24 affected by false positives. |
| 25 """ | 25 ''' |
| 26 | 26 |
| 27 | 27 |
| 28 def forceDomains(domains): | 28 def forceDomains(domains): |
| 29 db = _get_db() | 29 db = _get_db() |
| 30 for domain in domains: | 30 for domain in domains: |
| 31 cursor = db.cursor(MySQLdb.cursors.DictCursor) | 31 cursor = db.cursor(MySQLdb.cursors.DictCursor) |
| 32 cursor.execute("""INSERT INTO domains(domain, forceinclusion) VALUES (%s
, 1) | 32 cursor.execute('''INSERT INTO domains(domain, forceinclusion) VALUES (%s
, 1) |
| 33 ON DUPLICATE KEY UPDATE forceinclusion = 1""", domain) | 33 ON DUPLICATE KEY UPDATE forceinclusion = 1''', domain) |
| 34 db.commit() | 34 db.commit() |
| 35 | 35 |
| 36 | 36 |
| 37 def _get_db(): | 37 def _get_db(): |
| 38 database = get_config().get("urlfixer", "database") | 38 database = get_config().get('urlfixer', 'database') |
| 39 dbuser = get_config().get("urlfixer", "dbuser") | 39 dbuser = get_config().get('urlfixer', 'dbuser') |
| 40 dbpasswd = get_config().get("urlfixer", "dbpassword") | 40 dbpasswd = get_config().get('urlfixer', 'dbpassword') |
| 41 if os.name == "nt": | 41 if os.name == 'nt': |
| 42 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, | 42 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, |
| 43 use_unicode=True, charset="utf8", named_pipe=True
) | 43 use_unicode=True, charset='utf8', named_pipe=True
) |
| 44 else: | 44 else: |
| 45 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, | 45 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, |
| 46 use_unicode=True, charset="utf8") | 46 use_unicode=True, charset='utf8') |
| 47 | 47 |
| 48 if __name__ == '__main__': | 48 if __name__ == '__main__': |
| 49 setupStderr() | 49 setupStderr() |
| 50 | 50 |
| 51 if len(sys.argv) <= 1: | 51 if len(sys.argv) <= 1: |
| 52 print >>sys.stderr, "Please specify the domain names as command line par
ameters" | 52 print >>sys.stderr, 'Please specify the domain names as command line par
ameters' |
| 53 sys.exit(1) | 53 sys.exit(1) |
| 54 | 54 |
| 55 forceDomains(sys.argv[1:]) | 55 forceDomains(sys.argv[1:]) |
| OLD | NEW |