Reports - user profile

sitescripts/reports/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2012 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 hashlib, hmac, base64, MySQLdb, os, re, marshal, subprocess
-from sitescripts.utils import get_config, cached, get_template, sendMail
+from sitescripts.utils import get_config, cached, get_template, anonymizeMail, sendMail
 
 def getReportSubscriptions(guid):
   cursor = get_db().cursor(MySQLdb.cursors.DictCursor)
   executeQuery(cursor,
               '''SELECT url, hasmatches FROM #PFX#sublists INNER JOIN
               #PFX#subscriptions ON (#PFX#sublists.list = #PFX#subscriptions.id)
               WHERE report = %s''',
               (guid))
   rows = cursor.fetchall()
   cursor.close()
@@ skipping 65 matching lines @@
       if id != None:
         filterMatch = lambda f: any(u == sn['id'] for u in f.get('subscriptions', []))
         hasMatches = any(filterMatch(f) for f in reportData.get('filters', []))
         executeQuery(cursor,
                '''INSERT IGNORE INTO #PFX#sublists (report, list, hasmatches) VALUES (%s, %s, %s)''',
                (guid, id[0], hasMatches))
 
   get_db().commit()
 
   reportData['guid'] = guid
+  if contact:

[Wladimir Palant, 2012/11/07 08:38:15]

What if there is an email field but no contact? The check here should be
something like |if reportData.get('email', '')|, the |if contact| check should
only be used to set the uid field.

I realize that the two are connected - but generally it is better to make fewer
assumptions.

[Andrey Novikov, 2012/11/07 09:38:48]

Few lines above we have:
contact = getUserId(reportData.get('email', None)) if reportData.get('email',
None) else None

+    email = reportData['email']
+    email = re.sub(r' at ', r'@', email)
+    email = re.sub(r' dot ', r'.', email)
+    reportData['email'] = anonymizeMail(email)
+    reportData['uid'] = contact
+
   file = os.path.join(get_config().get('reports', 'dataPath'), guid[0], guid[1], guid[2], guid[3], guid + '.html')
   dir = os.path.dirname(file)
   if not os.path.exists(dir):
     os.makedirs(dir)
   template = get_template(get_config().get('reports', 'webTemplate'))
   template.stream(reportData).dump(file, encoding='utf-8')
 
 def removeReport(guid):
   cursor = get_db().cursor()
   executeQuery(cursor,
          '''DELETE FROM #PFX#reports WHERE guid = %s''',
          (guid))
   get_db().commit()
   file = os.path.join(get_config().get('reports', 'dataPath'), guid[0], guid[1], guid[2], guid[3], guid + '.html')
   if os.path.isfile(file):
     os.remove(file)
   file = os.path.join(get_config().get('reports', 'dataPath'), guid[0], guid[1], guid[2], guid[3], guid + '.png')
   if os.path.isfile(file):
     os.remove(file)
 
+def getUser(contact):
+  cursor = get_db().cursor(MySQLdb.cursors.DictCursor)
+  executeQuery(cursor,
+              '''SELECT reports, positive, negative FROM #PFX#users WHERE id = %s''',
+              (contact))
+  user = cursor.fetchone()
+  return user
+
 @cached(3600)
 def getUserUsefulnessScore(contact):
   if contact == None:
     return 0
 
   cursor = get_db().cursor()
   # source from http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
   executeQuery(cursor,
               '''SELECT ((positive + 1.9208) / (positive + negative)
                         - 1.96 * SQRT((positive * negative) / (positive + negative) + 0.9604) / (positive + negative))
@@ skipping 93 matching lines @@
   dbpasswd = get_config().get('reports', 'dbpassword')
   if os.name == 'nt':
     return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_unicode=True, charset='utf8', named_pipe=True)
   else:
     return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_unicode=True, charset='utf8')
     
 def executeQuery(cursor, query, args=None):
   tablePrefix = get_config().get('reports', 'dbprefix')
   query = re.sub(r'#PFX#', tablePrefix, query)
   cursor.execute(query, args)