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,
@@ skipping 28 matching lines @@
                 comment, hasscreenshot, knownissues
                 FROM #PFX#reports WHERE ctime >= FROM_UNIXTIME(%s) LIMIT %s OFFSET %s''',
                 (startTime, count, offset))
     rows = cursor.fetchall()
     cursor.close()
     if len(rows) == 0:
       break
     for row in rows:
       yield row
     offset += len(rows)
+
+def getReportsForUser(contact):
+  cursor = get_db().cursor(MySQLdb.cursors.DictCursor)
+  executeQuery(cursor,
+              '''SELECT guid, type, UNIX_TIMESTAMP(ctime) AS ctime, status, site, contact,
+              comment, hasscreenshot, knownissues
+              FROM #PFX#reports WHERE contact = %s ORDER BY ctime DESC LIMIT 100''',
+              (contact))
+  rows = cursor.fetchall()
+  cursor.close()
+  return rows
 
 def getReport(guid):
   cursor = get_db().cursor()
   executeQuery(cursor,
               '''SELECT dump FROM #PFX#reports WHERE guid = %s''',
               (guid))
   report = cursor.fetchone()
   if report == None:
     return None
     
@@ skipping 36 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)
@@ skipping 127 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)