Skip to content
This repository has been archived by the owner on Apr 23, 2018. It is now read-only.

Commit

Permalink
Fix tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
paradoxxxzero committed May 28, 2013
1 parent 66f7f64 commit 071e0a3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
4 changes: 3 additions & 1 deletion pystil/context.py
Expand Up @@ -40,6 +40,8 @@ def _wdb_execute(self, transforms, *args, **kwargs):


class Tracking(Thread):
daemon = True

def __init__(self, db, log, *args, **kwargs):
super(Tracking, self).__init__(*args, **kwargs)
self.log = log
Expand Down Expand Up @@ -139,7 +141,7 @@ def prepare(self):
self.set_secure_cookie('_pystil_site', 'local|' + str(uuid4()))

def on_finish(self):
self.db.rollback();
self.db.rollback()


class url(object):
Expand Down
19 changes: 11 additions & 8 deletions pystil/tracking.py
Expand Up @@ -143,15 +143,18 @@ def get(key, default=None, from_encoding=None):
visit['day'] = visit['date'].date()
visit['hour'] = visit['date'].hour
browser_minor_version = ''
if (
visit['browser_name'] not in ('opera', 'safari', 'chrome') and
len(visit['browser_version'].split('.')) > 1):
browser_minor_version = '.%s' % visit['browser_version'].split('.')[1]
if (visit['browser_version'] and visit['browser_name'] not in (
'opera', 'safari', 'chrome') and len(
visit['browser_version'].split('.')) > 1):
browser_minor_version = '.%s' % visit[
'browser_version'].split('.')[1]

visit['browser_name_version'] = '%s %s%s' % (visit['browser_name'],
visit['browser_version'].split('.')[0],
browser_minor_version)
visit['id'] = db.execute(select([VisitIdSeq.next_value()])).scalar()
visit['browser_name_version'] = '%s %s%s' % (
visit['browser_name'],
visit['browser_version'].split('.')[0],
browser_minor_version)
visit['id'] = db.execute(
select([VisitIdSeq.next_value()])).scalar()
db.execute(visits.insert().returning(visits.c.id), **visit)
self.log.debug('%r inserted' % self)
return visit, True
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,4 +1,4 @@
tornado
pygal
sqlalchemy

momoko
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -37,7 +37,7 @@
'templates/site/*',
'templates/*.html']
},
install_requires=['tornado', 'pygal', 'sqlalchemy', 'psycopg2'],
install_requires=['tornado', 'pygal', 'sqlalchemy', 'psycopg2', 'momoko'],
classifiers=[
"Development Status :: WIP",
"Intended Audience :: Public",
Expand Down

0 comments on commit 071e0a3

Please sign in to comment.