0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

log unknown locations

Browse source
This commit is contained in:
j 2017-07-19 18:37:27 +02:00
parent 3d100c033c
commit 62face2c21
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pandora/user/statistics.py
View file

@ -2,6 +2,9 @@
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
import ox.geo import ox.geo
import logging
logger = logging.getLogger('pandora.statistics')
colors = { colors = {
'system': { 'system': {
'Android': [0, 255, 0], 'Android': [0, 255, 0],
@ -100,19 +103,21 @@ class Statistics(dict):
split = ox.geo.split_geoname(item['location']) split = ox.geo.split_geoname(item['location'])
if len(split) == 1: if len(split) == 1:
split.insert(0, None) split.insert(0, None)
city, country = split if len(split) == 2:
city, country = split
country_data = ox.geo.get_country(country)
continent = country_data.get('continent', '')
region = ', '.join([continent, country_data.get('region', '')])
country = ', '.join([region, country])
city = ', '.join([country, city]) if city else ''
country_data = ox.geo.get_country(country) self._increment(self[mode]['continent'], continent)
continent = country_data.get('continent','') self._increment(self[mode]['region'], region)
region = ', '.join([continent, country_data.get('region', '')]) self._increment(self[mode]['country'], country)
country = ', '.join([region, country]) if city:
city = ', '.join([country, city]) if city else '' self._increment(self[mode]['city'], city)
else:
self._increment(self[mode]['continent'], continent) logger.error('unknown geo value: %s', item['location'])
self._increment(self[mode]['region'], region)
self._increment(self[mode]['country'], country)
if city:
self._increment(self[mode]['city'], city)
name = {} name = {}
for key in ['system', 'browser']: for key in ['system', 'browser']:
@ -122,13 +127,13 @@ class Statistics(dict):
if name[key]: if name[key]:
self._increment(self[mode][key], name[key]) self._increment(self[mode][key], name[key])
key = key + 'version'; key = key + 'version'
self._increment(self[mode][key], version) self._increment(self[mode][key], version)
if name.get('system') and name.get('browser'): if name.get('system') and name.get('browser'):
name = name['system'] + ' / ' + name['browser'] name = name['system'] + ' / ' + name['browser']
self._increment(self[mode]['systemandbrowser'], name) self._increment(self[mode]['systemandbrowser'], name)
name = item['system'] + ' / ' + item['browser'] name = item['system'] + ' / ' + item['browser']
self._increment(self[mode]['systemandbrowserversion'], name) self._increment(self[mode]['systemandbrowserversion'], name)