From b1549ca8845a03423a562fdb3b72ac558a356936 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 19 Nov 2014 08:01:12 +0100 Subject: [PATCH 001/195] Initial commit --- hooks_pre/H001_robot.py | 1 + hooks_pre/H002_soutade.py | 1 + iwla.py | 91 +++++++++++++++++++++---------- plugins/hooks_pre/H001_robot.py | 39 +++++++++++++ plugins/hooks_pre/H002_soutade.py | 19 +++++++ 5 files changed, 123 insertions(+), 28 deletions(-) create mode 120000 hooks_pre/H001_robot.py create mode 120000 hooks_pre/H002_soutade.py create mode 100644 plugins/hooks_pre/H001_robot.py create mode 100644 plugins/hooks_pre/H002_soutade.py diff --git a/hooks_pre/H001_robot.py b/hooks_pre/H001_robot.py new file mode 120000 index 0000000..5e6d168 --- /dev/null +++ b/hooks_pre/H001_robot.py @@ -0,0 +1 @@ +../plugins/hooks_pre/H001_robot.py \ No newline at end of file diff --git a/hooks_pre/H002_soutade.py b/hooks_pre/H002_soutade.py new file mode 120000 index 0000000..345c147 --- /dev/null +++ b/hooks_pre/H002_soutade.py @@ -0,0 +1 @@ +../plugins/hooks_pre/H002_soutade.py \ No newline at end of file diff --git a/iwla.py b/iwla.py index 39fcafd..b336243 100755 --- a/iwla.py +++ b/iwla.py @@ -9,6 +9,7 @@ from robots import awstats_robots; print '==> Start' +meta_visit = {} current_visit = {} log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ @@ -23,16 +24,53 @@ time_format = '%d/%b/%Y:%H:%M:%S +0100' #print "Log format : " + log_format_extracted log_re = re.compile(log_format_extracted) -uri_re = re.compile(r'(?P[^\?]*)\?(?P.*)') +uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] viewed_http_codes = [200] cur_time = None +PRE_HOOK_DIRECTORY = './hooks_pre/*.py' +POST_HOOK_DIRECTORY = './hooks_post/*.py' + print '==> Generating robot dictionary' awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) +def generate_day_stats(): + days_stats = {} + days_stats['viewed_bandwidth'] = 0 + days_stats['not_viewed_bandwidth'] = 0 + days_stats['viewed_pages'] = 0 + days_stats['viewed_hits'] = 0 + days_stats['pages'] = set() + + for k in current_visit.keys(): + super_hit = current_visit[k] + if super_hit['robot']: + days_stats['not_viewed_bandwidth'] += super_hit['bandwith'] + continue + + days_stats['viewed_bandwidth'] += super_hit['bandwith'] + days_stats['viewed_pages'] += super_hit['viewed_pages'] + days_stats['viewed_hits'] += super_hit['viewed_hits'] + + for p in super_hit['pages']: + if not p['is_page']: continue + req = p['extract_request'] + days_stats['pages'].add(req['extract_uri']) + + return days_stats + +def call_plugins(path, *kwargs): + print '==> Call plugins (%s)' % path + plugins = glob.glob(path) + plugins.sort() + for p in plugins: + print '\t%s' % (p) + mod = imp.load_source('hook', p) + mod.hook(*kwargs) + def isPage(request): for e in pages_extensions: if request.endswith(e): @@ -70,7 +108,7 @@ def appendHit(hit): else: super_hit[hit_key] += 1 -def createGeneric(hit): +def createUser(hit): super_hit = current_visit[hit['remote_addr']] = {} super_hit['viewed_pages'] = 0; super_hit['viewed_hits'] = 0; @@ -78,12 +116,7 @@ def createGeneric(hit): super_hit['not_viewed_hits'] = 0; super_hit['bandwith'] = 0; super_hit['pages'] = []; - - return super_hit - -def createUser(hit, robot): - super_hit = createGeneric(hit) - super_hit['robot'] = robot; + super_hit['robot'] = isRobot(hit); appendHit(hit) def isRobot(hit): @@ -101,16 +134,17 @@ def decode_http_request(hit): hit['extract_request'] = groups.groupdict() uri_groups = uri_re.match(hit['extract_request']['http_uri']); if uri_groups: - hit['extract_request']['extract_uri'] = uri_groups.group('extract_uri') - hit['extract_request']['extract_parameters'] = uri_groups.group('extract_parameters') + d = uri_groups.groupdict() + hit['extract_request']['extract_uri'] = d['extract_uri'] + if 'extract_parameters' in d.keys(): + hit['extract_request']['extract_parameters'] = d['extract_parameters'] else: print "Bad request extraction " + hit['request'] return False referer_groups = uri_re.match(hit['http_referer']); if referer_groups: - hit['extract_referer']['extract_uri'] = referer_groups.group('extract_uri') - hit['extract_referer']['extract_parameters'] = referer_groups.group('extract_parameters') + referer = hit['extract_referer'] = referer_groups.groupdict() return True def decode_time(hit): @@ -131,7 +165,7 @@ def newHit(hit): t = hit['time_decoded'] - current_visit['last_time'] = t + meta_visit['last_time'] = t if cur_time == None: cur_time = t @@ -143,7 +177,7 @@ def newHit(hit): if remote_addr in current_visit.keys(): appendHit(hit) else: - createUser(hit, isRobot(hit)) + createUser(hit) return True @@ -161,18 +195,19 @@ for l in f: print "No match " + l f.close(); -print '==> Call plugins' -plugins = glob.glob('./hooks_pre/*.py') -plugins.sort() -for p in plugins: - print '\t%s' % (p) - mod = imp.load_source('hook', p) - mod.hook(current_visit) +call_plugins(PRE_HOOK_DIRECTORY, current_visit) -for ip in current_visit.keys(): - hit = current_visit[ip] - if hit['robot']: continue - print "%s =>" % (ip) - for k in hit.keys(): - if k != 'pages': - print "\t%s : %s" % (k, current_visit[ip][k]) +stats = generate_day_stats() + +print stats +valid_visitors = {k: v for (k,v) in current_visit.items() if not current_visit[k]['robot']} +#print valid_visitors +# for ip in current_visit.keys(): +# hit = current_visit[ip] +# if hit['robot']: continue +# print "%s =>" % (ip) +# for k in hit.keys(): +# if k != 'pages': +# print "\t%s : %s" % (k, current_visit[ip][k]) + +call_plugins(POST_HOOK_DIRECTORY, valid_visitors) diff --git a/plugins/hooks_pre/H001_robot.py b/plugins/hooks_pre/H001_robot.py new file mode 100644 index 0000000..9ec45cb --- /dev/null +++ b/plugins/hooks_pre/H001_robot.py @@ -0,0 +1,39 @@ + +# Basic rule to detect robots + +def hook(hits): + for k in hits.keys(): + super_hit = hits[k] + + if super_hit['robot']: continue + + isRobot = False + referers = 0 + +# 1) no pages view --> robot + if not super_hit['viewed_pages']: + super_hit['robot'] = 1 + continue + +# 2) pages without hit --> robot + if not super_hit['viewed_hits']: + super_hit['robot'] = 1 + continue + + for hit in super_hit['pages']: +# 3) /robots.txt read + if hit['extract_request']['http_uri'] == '/robots.txt': + isRobot = True + break + +# 4) Any referer for hits + if not hit['is_page'] and hit['http_referer']: + referers += 1 + + if isRobot: + super_hit['robot'] = 1 + continue + + if super_hit['viewed_hits'] and not referers: + super_hit['robot'] = 1 + continue diff --git a/plugins/hooks_pre/H002_soutade.py b/plugins/hooks_pre/H002_soutade.py new file mode 100644 index 0000000..d6767aa --- /dev/null +++ b/plugins/hooks_pre/H002_soutade.py @@ -0,0 +1,19 @@ +import re + +# Remove logo from indefero +logo_re = re.compile(r'^.+/logo/$') + +# Basic rule to detect robots + +def hook(hits): + for k in hits.keys(): + super_hit = hits[k] + + if super_hit['robot']: continue + + for p in super_hit['pages']: + if not p['is_page']: continue + if logo_re.match(p['extract_request']['extract_uri']): + p['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 From db965a8070204d272a002ea22430b5fa610b0b42 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 19 Nov 2014 19:25:15 +0100 Subject: [PATCH 002/195] Commit --- hooks/pre_analysis/H001_robot.py | 1 + hooks/pre_analysis/H002_soutade.py | 1 + plugins/{hooks_pre => pre_analysis}/H001_robot.py | 0 plugins/{hooks_pre => pre_analysis}/H002_soutade.py | 0 4 files changed, 2 insertions(+) create mode 120000 hooks/pre_analysis/H001_robot.py create mode 120000 hooks/pre_analysis/H002_soutade.py rename plugins/{hooks_pre => pre_analysis}/H001_robot.py (100%) rename plugins/{hooks_pre => pre_analysis}/H002_soutade.py (100%) diff --git a/hooks/pre_analysis/H001_robot.py b/hooks/pre_analysis/H001_robot.py new file mode 120000 index 0000000..7328242 --- /dev/null +++ b/hooks/pre_analysis/H001_robot.py @@ -0,0 +1 @@ +../../plugins/pre_analysis/H001_robot.py \ No newline at end of file diff --git a/hooks/pre_analysis/H002_soutade.py b/hooks/pre_analysis/H002_soutade.py new file mode 120000 index 0000000..091105f --- /dev/null +++ b/hooks/pre_analysis/H002_soutade.py @@ -0,0 +1 @@ +../../plugins/pre_analysis/H002_soutade.py \ No newline at end of file diff --git a/plugins/hooks_pre/H001_robot.py b/plugins/pre_analysis/H001_robot.py similarity index 100% rename from plugins/hooks_pre/H001_robot.py rename to plugins/pre_analysis/H001_robot.py diff --git a/plugins/hooks_pre/H002_soutade.py b/plugins/pre_analysis/H002_soutade.py similarity index 100% rename from plugins/hooks_pre/H002_soutade.py rename to plugins/pre_analysis/H002_soutade.py From 888b481b1dd2ee05d6bd087e3bb7122d26e33f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 19 Nov 2014 19:34:16 +0100 Subject: [PATCH 003/195] On r715 --- hooks/pre_analysis/H001_robot.py | 40 +++++++- hooks/pre_analysis/H002_soutade.py | 20 +++- hooks_pre/H001_robot.py | 1 - hooks_pre/H002_soutade.py | 1 - iwla.py | 149 +++++++++++++++++++---------- 5 files changed, 156 insertions(+), 55 deletions(-) mode change 120000 => 100644 hooks/pre_analysis/H001_robot.py mode change 120000 => 100644 hooks/pre_analysis/H002_soutade.py delete mode 120000 hooks_pre/H001_robot.py delete mode 120000 hooks_pre/H002_soutade.py diff --git a/hooks/pre_analysis/H001_robot.py b/hooks/pre_analysis/H001_robot.py deleted file mode 120000 index 7328242..0000000 --- a/hooks/pre_analysis/H001_robot.py +++ /dev/null @@ -1 +0,0 @@ -../../plugins/pre_analysis/H001_robot.py \ No newline at end of file diff --git a/hooks/pre_analysis/H001_robot.py b/hooks/pre_analysis/H001_robot.py new file mode 100644 index 0000000..9ec45cb --- /dev/null +++ b/hooks/pre_analysis/H001_robot.py @@ -0,0 +1,39 @@ + +# Basic rule to detect robots + +def hook(hits): + for k in hits.keys(): + super_hit = hits[k] + + if super_hit['robot']: continue + + isRobot = False + referers = 0 + +# 1) no pages view --> robot + if not super_hit['viewed_pages']: + super_hit['robot'] = 1 + continue + +# 2) pages without hit --> robot + if not super_hit['viewed_hits']: + super_hit['robot'] = 1 + continue + + for hit in super_hit['pages']: +# 3) /robots.txt read + if hit['extract_request']['http_uri'] == '/robots.txt': + isRobot = True + break + +# 4) Any referer for hits + if not hit['is_page'] and hit['http_referer']: + referers += 1 + + if isRobot: + super_hit['robot'] = 1 + continue + + if super_hit['viewed_hits'] and not referers: + super_hit['robot'] = 1 + continue diff --git a/hooks/pre_analysis/H002_soutade.py b/hooks/pre_analysis/H002_soutade.py deleted file mode 120000 index 091105f..0000000 --- a/hooks/pre_analysis/H002_soutade.py +++ /dev/null @@ -1 +0,0 @@ -../../plugins/pre_analysis/H002_soutade.py \ No newline at end of file diff --git a/hooks/pre_analysis/H002_soutade.py b/hooks/pre_analysis/H002_soutade.py new file mode 100644 index 0000000..d6767aa --- /dev/null +++ b/hooks/pre_analysis/H002_soutade.py @@ -0,0 +1,19 @@ +import re + +# Remove logo from indefero +logo_re = re.compile(r'^.+/logo/$') + +# Basic rule to detect robots + +def hook(hits): + for k in hits.keys(): + super_hit = hits[k] + + if super_hit['robot']: continue + + for p in super_hit['pages']: + if not p['is_page']: continue + if logo_re.match(p['extract_request']['extract_uri']): + p['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 diff --git a/hooks_pre/H001_robot.py b/hooks_pre/H001_robot.py deleted file mode 120000 index 5e6d168..0000000 --- a/hooks_pre/H001_robot.py +++ /dev/null @@ -1 +0,0 @@ -../plugins/hooks_pre/H001_robot.py \ No newline at end of file diff --git a/hooks_pre/H002_soutade.py b/hooks_pre/H002_soutade.py deleted file mode 120000 index 345c147..0000000 --- a/hooks_pre/H002_soutade.py +++ /dev/null @@ -1 +0,0 @@ -../plugins/hooks_pre/H002_soutade.py \ No newline at end of file diff --git a/iwla.py b/iwla.py index b336243..5279434 100755 --- a/iwla.py +++ b/iwla.py @@ -5,11 +5,14 @@ import re import time import glob import imp +import pickle +import gzip from robots import awstats_robots; print '==> Start' -meta_visit = {} +meta_visit = {'last_time':None} +analyse_started = False current_visit = {} log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ @@ -28,39 +31,38 @@ uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] viewed_http_codes = [200] -cur_time = None - -PRE_HOOK_DIRECTORY = './hooks_pre/*.py' -POST_HOOK_DIRECTORY = './hooks_post/*.py' +PRE_HOOK_DIRECTORY = './hooks/pre_analysis/*.py' +POST_HOOK_DIRECTORY = './hooks/post_analysis/*.py' +DB_ROOT = './output/' +META_PATH = DB_ROOT + 'meta.db' +DB_FILENAME = 'iwla.db' print '==> Generating robot dictionary' awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) -def generate_day_stats(): - days_stats = {} - days_stats['viewed_bandwidth'] = 0 - days_stats['not_viewed_bandwidth'] = 0 - days_stats['viewed_pages'] = 0 - days_stats['viewed_hits'] = 0 - days_stats['pages'] = set() +def get_db_filename(time): + return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) - for k in current_visit.keys(): - super_hit = current_visit[k] - if super_hit['robot']: - days_stats['not_viewed_bandwidth'] += super_hit['bandwith'] - continue +def serialize(obj, filename): + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) - days_stats['viewed_bandwidth'] += super_hit['bandwith'] - days_stats['viewed_pages'] += super_hit['viewed_pages'] - days_stats['viewed_hits'] += super_hit['viewed_hits'] + with open(filename + '.tmp', 'wb+') as f: + pickle.dump(obj, f) + f.seek(0) + with gzip.open(filename, 'w') as fzip: + fzip.write(f.read()) + os.remove(filename + '.tmp') - for p in super_hit['pages']: - if not p['is_page']: continue - req = p['extract_request'] - days_stats['pages'].add(req['extract_uri']) +def deserialize(filename): + if not os.path.exists(filename): + return None - return days_stats + with gzip.open(filename, 'r') as f: + return pickle.load(f) + return None def call_plugins(path, *kwargs): print '==> Call plugins (%s)' % path @@ -153,25 +155,79 @@ def decode_time(hit): hit['time_decoded'] = time.strptime(t, time_format) +def generate_month_stats(): + call_plugins(PRE_HOOK_DIRECTORY, current_visit) + + valid_visitors = {k: v for (k,v) in current_visit.items() if not current_visit[k]['robot']} + + call_plugins(POST_HOOK_DIRECTORY, valid_visitors) + + stats = {} + stats['viewed_bandwidth'] = 0 + stats['not_viewed_bandwidth'] = 0 + stats['viewed_pages'] = 0 + stats['viewed_hits'] = 0 + stats['pages'] = set() + + for k in current_visit.keys(): + super_hit = current_visit[k] + if super_hit['robot']: + stats['not_viewed_bandwidth'] += super_hit['bandwith'] + continue + + stats['viewed_bandwidth'] += super_hit['bandwith'] + stats['viewed_pages'] += super_hit['viewed_pages'] + stats['viewed_hits'] += super_hit['viewed_hits'] + + for p in super_hit['pages']: + if not p['is_page']: continue + req = p['extract_request'] + stats['pages'].add(req['extract_uri']) + + cur_time = meta_visit['last_time'] + + print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) + print stats + + path = get_db_filename(cur_time) + if os.path.exists(path): + os.remove(path) + + print "==> Serialize to %s" % path + + serialize(current_visit, path) + def newHit(hit): - global cur_time - - if not decode_http_request(hit): return - - for k in hit.keys(): - if hit[k] == '-': hit[k] = '' + global current_visit + global analyse_started decode_time(hit) t = hit['time_decoded'] - meta_visit['last_time'] = t + cur_time = meta_visit['last_time'] if cur_time == None: - cur_time = t + current_visit = deserialize(get_db_filename(t)) + if not current_visit: current_visit = {} + analyse_started = True else: - if cur_time.tm_mday != t.tm_mday: - return False + if not analyse_started: + if time.mktime(cur_time) >= time.mktime(t): + return + else: + analyse_started = True + if cur_time.tm_mon != t.tm_mon: + generate_month_stats() + current_visit = deserialize(get_db_filename(t)) + if not current_visit: current_visit = {} + + meta_visit['last_time'] = t + + if not decode_http_request(hit): return False + + for k in hit.keys(): + if hit[k] == '-': hit[k] = '' remote_addr = hit['remote_addr'] if remote_addr in current_visit.keys(): @@ -182,6 +238,11 @@ def newHit(hit): return True print '==> Analysing log' + +meta_visit = deserialize(META_PATH) +if not meta_visit: + meta_visit = {'last_time':None} + f = open("access.log") for l in f: # print "line " + l; @@ -195,19 +256,5 @@ for l in f: print "No match " + l f.close(); -call_plugins(PRE_HOOK_DIRECTORY, current_visit) - -stats = generate_day_stats() - -print stats -valid_visitors = {k: v for (k,v) in current_visit.items() if not current_visit[k]['robot']} -#print valid_visitors -# for ip in current_visit.keys(): -# hit = current_visit[ip] -# if hit['robot']: continue -# print "%s =>" % (ip) -# for k in hit.keys(): -# if k != 'pages': -# print "\t%s : %s" % (k, current_visit[ip][k]) - -call_plugins(POST_HOOK_DIRECTORY, valid_visitors) +generate_month_stats() +serialize(meta_visit, META_PATH) From 53452fa4c3d2cabd945a1ea90f294b40afeb2aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 19 Nov 2014 19:45:41 +0100 Subject: [PATCH 004/195] Before dictionary rework --- iwla.py | 65 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/iwla.py b/iwla.py index 5279434..753179b 100755 --- a/iwla.py +++ b/iwla.py @@ -7,13 +7,14 @@ import glob import imp import pickle import gzip + from robots import awstats_robots; print '==> Start' meta_visit = {'last_time':None} analyse_started = False -current_visit = {} +current_visits = {} log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ '"$request" $status $body_bytes_sent ' +\ @@ -41,7 +42,11 @@ print '==> Generating robot dictionary' awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) -def get_db_filename(time): +def createEmptyVisits(): + visits = {'days_stats' : {}, 'month_stats' : {}, 'visits' : {}} + return visits + +def getDBFilename(time): return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) def serialize(obj, filename): @@ -64,7 +69,10 @@ def deserialize(filename): return pickle.load(f) return None -def call_plugins(path, *kwargs): +def createEmptyVisits(): + pass + +def callPlugins(path, *kwargs): print '==> Call plugins (%s)' % path plugins = glob.glob(path) plugins.sort() @@ -81,7 +89,7 @@ def isPage(request): return False def appendHit(hit): - super_hit = current_visit[hit['remote_addr']] + super_hit = current_visits[hit['remote_addr']] super_hit['pages'].append(hit) super_hit['bandwith'] += int(hit['body_bytes_sent']) @@ -111,7 +119,7 @@ def appendHit(hit): super_hit[hit_key] += 1 def createUser(hit): - super_hit = current_visit[hit['remote_addr']] = {} + super_hit = current_visits[hit['remote_addr']] = {} super_hit['viewed_pages'] = 0; super_hit['viewed_hits'] = 0; super_hit['not_viewed_pages'] = 0; @@ -127,7 +135,7 @@ def isRobot(hit): return True return False -def decode_http_request(hit): +def decodeHTTPRequest(hit): if not 'request' in hit.keys(): return False groups = http_request_extracted.match(hit['request']) @@ -149,18 +157,18 @@ def decode_http_request(hit): referer = hit['extract_referer'] = referer_groups.groupdict() return True -def decode_time(hit): +def decodeTime(hit): t = hit['time_local'] hit['time_decoded'] = time.strptime(t, time_format) -def generate_month_stats(): - call_plugins(PRE_HOOK_DIRECTORY, current_visit) +def generateMonthStats(): + callPlugins(PRE_HOOK_DIRECTORY, current_visits) - valid_visitors = {k: v for (k,v) in current_visit.items() if not current_visit[k]['robot']} + valid_visitors = {k: v for (k,v) in current_visits.items() if not current_visits[k]['robot']} - call_plugins(POST_HOOK_DIRECTORY, valid_visitors) + callPlugins(POST_HOOK_DIRECTORY, valid_visitors) stats = {} stats['viewed_bandwidth'] = 0 @@ -169,8 +177,8 @@ def generate_month_stats(): stats['viewed_hits'] = 0 stats['pages'] = set() - for k in current_visit.keys(): - super_hit = current_visit[k] + for k in current_visits.keys(): + super_hit = current_visits[k] if super_hit['robot']: stats['not_viewed_bandwidth'] += super_hit['bandwith'] continue @@ -189,27 +197,27 @@ def generate_month_stats(): print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) print stats - path = get_db_filename(cur_time) + path = getDBFilename(cur_time) if os.path.exists(path): os.remove(path) print "==> Serialize to %s" % path - serialize(current_visit, path) + serialize(current_visits, path) def newHit(hit): - global current_visit + global current_visits global analyse_started - decode_time(hit) + decodeTime(hit) t = hit['time_decoded'] cur_time = meta_visit['last_time'] if cur_time == None: - current_visit = deserialize(get_db_filename(t)) - if not current_visit: current_visit = {} + current_visits = deserialize(getDBFilename(t)) + if not current_visits: current_visits = {} analyse_started = True else: if not analyse_started: @@ -217,20 +225,22 @@ def newHit(hit): return else: analyse_started = True + current_visits = deserialize(getDBFilename(t)) + if not current_visits: current_visits = {} if cur_time.tm_mon != t.tm_mon: - generate_month_stats() - current_visit = deserialize(get_db_filename(t)) - if not current_visit: current_visit = {} + generateMonthStats() + current_visits = deserialize(getDBFilename(t)) + if not current_visits: current_visits = {} meta_visit['last_time'] = t - if not decode_http_request(hit): return False + if not decodeHTTPRequest(hit): return False for k in hit.keys(): if hit[k] == '-': hit[k] = '' remote_addr = hit['remote_addr'] - if remote_addr in current_visit.keys(): + if remote_addr in current_visits.keys(): appendHit(hit) else: createUser(hit) @@ -256,5 +266,8 @@ for l in f: print "No match " + l f.close(); -generate_month_stats() -serialize(meta_visit, META_PATH) +if analyse_started: + generateMonthStats() + serialize(meta_visit, META_PATH) +else: + print '==> Analyse not started : nothing to do' From b8027fe509f673f13df40268b9bf50815f0afab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 19 Nov 2014 21:37:37 +0100 Subject: [PATCH 005/195] Need to separate day and month stats --- .../{H002_soutade.py => H001_soutade.py} | 5 +- .../{H001_robot.py => H002_robot.py} | 0 iwla.py | 99 +++++++++++++------ 3 files changed, 74 insertions(+), 30 deletions(-) rename hooks/pre_analysis/{H002_soutade.py => H001_soutade.py} (73%) rename hooks/pre_analysis/{H001_robot.py => H002_robot.py} (100%) diff --git a/hooks/pre_analysis/H002_soutade.py b/hooks/pre_analysis/H001_soutade.py similarity index 73% rename from hooks/pre_analysis/H002_soutade.py rename to hooks/pre_analysis/H001_soutade.py index d6767aa..50a7932 100644 --- a/hooks/pre_analysis/H002_soutade.py +++ b/hooks/pre_analysis/H001_soutade.py @@ -15,5 +15,6 @@ def hook(hits): if not p['is_page']: continue if logo_re.match(p['extract_request']['extract_uri']): p['is_page'] = False - super_hit['viewed_pages'] -= 1 - super_hit['viewed_hits'] += 1 + if super_hit['viewed_pages']: + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 diff --git a/hooks/pre_analysis/H001_robot.py b/hooks/pre_analysis/H002_robot.py similarity index 100% rename from hooks/pre_analysis/H001_robot.py rename to hooks/pre_analysis/H002_robot.py diff --git a/iwla.py b/iwla.py index 753179b..2cd4c9e 100755 --- a/iwla.py +++ b/iwla.py @@ -15,6 +15,7 @@ print '==> Start' meta_visit = {'last_time':None} analyse_started = False current_visits = {} +cache_plugins = {} log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ '"$request" $status $body_bytes_sent ' +\ @@ -46,6 +47,10 @@ def createEmptyVisits(): visits = {'days_stats' : {}, 'month_stats' : {}, 'visits' : {}} return visits +def createEmptyMeta(): + meta = {'last_time':None} + return meta + def getDBFilename(time): return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) @@ -69,16 +74,17 @@ def deserialize(filename): return pickle.load(f) return None -def createEmptyVisits(): - pass - def callPlugins(path, *kwargs): print '==> Call plugins (%s)' % path plugins = glob.glob(path) plugins.sort() for p in plugins: print '\t%s' % (p) - mod = imp.load_source('hook', p) + if not p in cache_plugins: + mod = imp.load_source('hook', p) + cache_plugins[p] = mod + else: + mod = cache_plugins[p] mod.hook(*kwargs) def isPage(request): @@ -89,7 +95,7 @@ def isPage(request): return False def appendHit(hit): - super_hit = current_visits[hit['remote_addr']] + super_hit = current_visits['visits'][hit['remote_addr']] super_hit['pages'].append(hit) super_hit['bandwith'] += int(hit['body_bytes_sent']) @@ -102,8 +108,9 @@ def appendHit(hit): hit['is_page'] = isPage(uri) - # Don't count redirect status - if int(hit['status']) == 302: return + # Don't count 3xx status + status = int(hit['status']) + if status >= 300 and status < 400: return if super_hit['robot'] or\ not int(hit['status']) in viewed_http_codes: @@ -119,7 +126,7 @@ def appendHit(hit): super_hit[hit_key] += 1 def createUser(hit): - super_hit = current_visits[hit['remote_addr']] = {} + super_hit = current_visits['visits'][hit['remote_addr']] = {} super_hit['viewed_pages'] = 0; super_hit['viewed_hits'] = 0; super_hit['not_viewed_pages'] = 0; @@ -163,40 +170,49 @@ def decodeTime(hit): hit['time_decoded'] = time.strptime(t, time_format) -def generateMonthStats(): - callPlugins(PRE_HOOK_DIRECTORY, current_visits) - - valid_visitors = {k: v for (k,v) in current_visits.items() if not current_visits[k]['robot']} - - callPlugins(POST_HOOK_DIRECTORY, valid_visitors) - +def generateStats(visits): stats = {} stats['viewed_bandwidth'] = 0 stats['not_viewed_bandwidth'] = 0 stats['viewed_pages'] = 0 stats['viewed_hits'] = 0 - stats['pages'] = set() + #stats['pages'] = set() + stats['nb_visitors'] = 0 - for k in current_visits.keys(): - super_hit = current_visits[k] + for k in visits.keys(): + super_hit = visits[k] if super_hit['robot']: stats['not_viewed_bandwidth'] += super_hit['bandwith'] continue + print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) + + stats['nb_visitors'] += 1 stats['viewed_bandwidth'] += super_hit['bandwith'] stats['viewed_pages'] += super_hit['viewed_pages'] stats['viewed_hits'] += super_hit['viewed_hits'] - for p in super_hit['pages']: - if not p['is_page']: continue - req = p['extract_request'] - stats['pages'].add(req['extract_uri']) + # for p in super_hit['pages']: + # if not p['is_page']: continue + # req = p['extract_request'] + # stats['pages'].add(req['extract_uri']) + return stats + +def generateMonthStats(): + visits = current_visits['visits'] + + stats = generateStats(visits) + cur_time = meta_visit['last_time'] - print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) print stats + valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} + callPlugins(POST_HOOK_DIRECTORY, valid_visitors) + + current_visits['month_stats'] = stats + path = getDBFilename(cur_time) if os.path.exists(path): os.remove(path) @@ -205,6 +221,29 @@ def generateMonthStats(): serialize(current_visits, path) +def generateDayStats(): + visits = current_visits['visits'] + + callPlugins(PRE_HOOK_DIRECTORY, visits) + + stats = generateStats(visits) + + cur_time = meta_visit['last_time'] + print "== Stats for %d/%d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) + + if cur_time.tm_mday > 1: + last_day = cur_time.tm_mday - 1 + while last_day: + if last_day in current_visits['days_stats'].keys(): + break + last_day -= 1 + if last_day: + for k in stats.keys(): + stats[k] -= current_visits['days_stats'][last_day][k] + print stats + + current_visits['days_stats'][cur_time.tm_mday] = stats + def newHit(hit): global current_visits global analyse_started @@ -217,7 +256,7 @@ def newHit(hit): if cur_time == None: current_visits = deserialize(getDBFilename(t)) - if not current_visits: current_visits = {} + if not current_visits: current_visits = createEmptyVisits() analyse_started = True else: if not analyse_started: @@ -226,11 +265,13 @@ def newHit(hit): else: analyse_started = True current_visits = deserialize(getDBFilename(t)) - if not current_visits: current_visits = {} + if not current_visits: current_visits = createEmptyVisits() if cur_time.tm_mon != t.tm_mon: generateMonthStats() current_visits = deserialize(getDBFilename(t)) - if not current_visits: current_visits = {} + if not current_visits: current_visits = createEmptyVisits() + elif cur_time.tm_mday != t.tm_mday: + generateDayStats() meta_visit['last_time'] = t @@ -240,7 +281,7 @@ def newHit(hit): if hit[k] == '-': hit[k] = '' remote_addr = hit['remote_addr'] - if remote_addr in current_visits.keys(): + if remote_addr in current_visits['visits'].keys(): appendHit(hit) else: createUser(hit) @@ -251,7 +292,9 @@ print '==> Analysing log' meta_visit = deserialize(META_PATH) if not meta_visit: - meta_visit = {'last_time':None} + meta_visit = createEmptyMeta() + +current_visits = createEmptyVisits() f = open("access.log") for l in f: From 8c7f135741324ab7e1b0da15b1c3a50755a2a044 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 08:18:31 +0100 Subject: [PATCH 006/195] WIP --- iwla.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/iwla.py b/iwla.py index 2cd4c9e..9ad49d2 100755 --- a/iwla.py +++ b/iwla.py @@ -59,6 +59,9 @@ def serialize(obj, filename): if not os.path.exists(base): os.makedirs(base) + # TODO : remove return + return + with open(filename + '.tmp', 'wb+') as f: pickle.dump(obj, f) f.seek(0) @@ -95,10 +98,17 @@ def isPage(request): return False def appendHit(hit): - super_hit = current_visits['visits'][hit['remote_addr']] + remote_addr = hit['remote_addr'] + + if not remote_addr in current_visits['visits'].keys(): + createUser(hit) + return + + super_hit = current_visits['visits'][remote_addr] super_hit['pages'].append(hit) super_hit['bandwith'] += int(hit['body_bytes_sent']) - + super_hit['last_access'] = meta_visit['last_time'] + request = hit['extract_request'] if 'extract_uri' in request.keys(): @@ -132,6 +142,7 @@ def createUser(hit): super_hit['not_viewed_pages'] = 0; super_hit['not_viewed_hits'] = 0; super_hit['bandwith'] = 0; + super_hit['last_access'] = meta_visit['last_time'] super_hit['pages'] = []; super_hit['robot'] = isRobot(hit); appendHit(hit) @@ -240,6 +251,11 @@ def generateDayStats(): if last_day: for k in stats.keys(): stats[k] -= current_visits['days_stats'][last_day][k] + stats['nb_visitors'] = 0 + for k in visits.keys(): + if visits[k]['robot']: continue + if visits[k]['last_access'].tm_mday == cur_time.tm_mday: + stats['nb_visitors'] += 1 print stats current_visits['days_stats'][cur_time.tm_mday] = stats @@ -280,11 +296,7 @@ def newHit(hit): for k in hit.keys(): if hit[k] == '-': hit[k] = '' - remote_addr = hit['remote_addr'] - if remote_addr in current_visits['visits'].keys(): - appendHit(hit) - else: - createUser(hit) + appendHit(hit) return True @@ -310,6 +322,7 @@ for l in f: f.close(); if analyse_started: + generateDayStats() generateMonthStats() serialize(meta_visit, META_PATH) else: From 8ba8c99b3c86864153cd5acfad37abb021d2bdfc Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 09:37:54 +0100 Subject: [PATCH 007/195] WIP --- hooks/pre_analysis/H002_robot.py | 6 +++--- iwla.py | 17 ++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/hooks/pre_analysis/H002_robot.py b/hooks/pre_analysis/H002_robot.py index 9ec45cb..2e59ad5 100644 --- a/hooks/pre_analysis/H002_robot.py +++ b/hooks/pre_analysis/H002_robot.py @@ -11,9 +11,9 @@ def hook(hits): referers = 0 # 1) no pages view --> robot - if not super_hit['viewed_pages']: - super_hit['robot'] = 1 - continue + # if not super_hit['viewed_pages']: + # super_hit['robot'] = 1 + # continue # 2) pages without hit --> robot if not super_hit['viewed_hits']: diff --git a/iwla.py b/iwla.py index 9ad49d2..36a8f8f 100755 --- a/iwla.py +++ b/iwla.py @@ -12,7 +12,7 @@ from robots import awstats_robots; print '==> Start' -meta_visit = {'last_time':None} +meta_visit = {} analyse_started = False current_visits = {} cache_plugins = {} @@ -123,7 +123,7 @@ def appendHit(hit): if status >= 300 and status < 400: return if super_hit['robot'] or\ - not int(hit['status']) in viewed_http_codes: + not status in viewed_http_codes: page_key = 'not_viewed_pages' hit_key = 'not_viewed_hits' else: @@ -271,8 +271,7 @@ def newHit(hit): cur_time = meta_visit['last_time'] if cur_time == None: - current_visits = deserialize(getDBFilename(t)) - if not current_visits: current_visits = createEmptyVisits() + current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() analyse_started = True else: if not analyse_started: @@ -280,12 +279,10 @@ def newHit(hit): return else: analyse_started = True - current_visits = deserialize(getDBFilename(t)) - if not current_visits: current_visits = createEmptyVisits() + current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() if cur_time.tm_mon != t.tm_mon: generateMonthStats() - current_visits = deserialize(getDBFilename(t)) - if not current_visits: current_visits = createEmptyVisits() + current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() elif cur_time.tm_mday != t.tm_mday: generateDayStats() @@ -302,9 +299,7 @@ def newHit(hit): print '==> Analysing log' -meta_visit = deserialize(META_PATH) -if not meta_visit: - meta_visit = createEmptyMeta() +meta_visit = deserialize(META_PATH) or createEmptyMeta() current_visits = createEmptyVisits() From 7bd5a42962750cee68c672689fc76cf0fd45b75c Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 11:50:06 +0100 Subject: [PATCH 008/195] Display works --- iwla.py | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/iwla.py b/iwla.py index 36a8f8f..5dbb728 100755 --- a/iwla.py +++ b/iwla.py @@ -16,6 +16,7 @@ meta_visit = {} analyse_started = False current_visits = {} cache_plugins = {} +display = {} log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ '"$request" $status $body_bytes_sent ' +\ @@ -33,9 +34,12 @@ uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] viewed_http_codes = [200] -PRE_HOOK_DIRECTORY = './hooks/pre_analysis/*.py' -POST_HOOK_DIRECTORY = './hooks/post_analysis/*.py' +HOOKS_ROOT = './hooks/' +PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/*.py' +POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/*.py' +DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/*.py' DB_ROOT = './output/' +DISPLAY_ROOT = './output/' META_PATH = DB_ROOT + 'meta.db' DB_FILENAME = 'iwla.db' @@ -48,9 +52,21 @@ def createEmptyVisits(): return visits def createEmptyMeta(): - meta = {'last_time':None} + meta = {'last_time' : None} return meta +def createEmptyDisplay(): + display = {} + return display + +def createPage(filename, title): + page = {} + page['title'] = title; + page['blocks'] = [] + display[filename] = page + + return page + def getDBFilename(time): return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) @@ -180,6 +196,68 @@ def decodeTime(hit): hit['time_decoded'] = time.strptime(t, time_format) +def buildPages(): + for filename in display.keys(): + page = display[filename] + with open(DISPLAY_ROOT + filename, 'w') as f: + f.write('%s' % (page['title'])) + for block in page['blocks']: + if block['type'] == 'html': + f.write(block['value']) + elif block['type'] == 'table': + f.write('') + f.write('') + for title in block['cols']: + f.write('' % (title)) + f.write('') + for row in block['rows']: + f.write('') + for v in row: + f.write('' % (v)) + f.write('') + f.write('
%s
%s
') + f.write('') + +def generateDisplayDaysStat(): + cur_time = meta_visit['last_time'] + title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) + filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + page = createPage(filename, title) + + days = {'type' : 'table', 'title' : 'By day'} + days['cols'] = ['Day', 'Visits', 'Pages', 'Hits', 'Bandwith', 'Robot Bandwith'] + days['rows'] = [] + keys = current_visits['days_stats'].keys() + keys.sort() + nb_visits = 0 + for k in keys: + stats = current_visits['days_stats'][k] + row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + row = map(lambda(v): str(v), row) + days['rows'].append(row) + nb_visits += stats['nb_visitors'] + + stats = current_visits['month_stats'] + + nb_days = len(keys) + row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + if nb_days: + row = map(lambda(v): str(int(v/nb_days)), row) + else: + row = map(lambda(v): '0', row) + + row[0] = 'Average' + days['rows'].append(row) + + row = ['Total', nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + row = map(lambda(v): str(v), row) + days['rows'].append(row) + page['blocks'].append(days) + +def generateDisplay(): + generateDisplayDaysStat() + callPlugins(DISPLAY_HOOK_DIRECTORY, current_visits, display) + buildPages() def generateStats(visits): stats = {} @@ -211,6 +289,8 @@ def generateStats(visits): return stats def generateMonthStats(): + display = createEmptyDisplay() + visits = current_visits['visits'] stats = generateStats(visits) @@ -232,6 +312,8 @@ def generateMonthStats(): serialize(current_visits, path) + generateDisplay() + def generateDayStats(): visits = current_visits['visits'] From f593cc78d93d02e080dcd3f71b2993eb4f8dc96b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 14:09:01 +0100 Subject: [PATCH 009/195] Basically seems to work --- hooks/pre_analysis/H001_soutade.py | 2 ++ hooks/pre_analysis/H002_robot.py | 5 ++++- iwla.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hooks/pre_analysis/H001_soutade.py b/hooks/pre_analysis/H001_soutade.py index 50a7932..6d683be 100644 --- a/hooks/pre_analysis/H001_soutade.py +++ b/hooks/pre_analysis/H001_soutade.py @@ -13,6 +13,8 @@ def hook(hits): for p in super_hit['pages']: if not p['is_page']: continue + if int(p['status']) != 200: continue + if logo_re.match(p['extract_request']['extract_uri']): p['is_page'] = False if super_hit['viewed_pages']: diff --git a/hooks/pre_analysis/H002_robot.py b/hooks/pre_analysis/H002_robot.py index 2e59ad5..8a6e721 100644 --- a/hooks/pre_analysis/H002_robot.py +++ b/hooks/pre_analysis/H002_robot.py @@ -19,7 +19,10 @@ def hook(hits): if not super_hit['viewed_hits']: super_hit['robot'] = 1 continue - + elif not super_hit['viewed_pages']: +# Hit only + super_hit['hit_only'] = 1 + for hit in super_hit['pages']: # 3) /robots.txt read if hit['extract_request']['http_uri'] == '/robots.txt': diff --git a/iwla.py b/iwla.py index 5dbb728..25478d9 100755 --- a/iwla.py +++ b/iwla.py @@ -161,6 +161,7 @@ def createUser(hit): super_hit['last_access'] = meta_visit['last_time'] super_hit['pages'] = []; super_hit['robot'] = isRobot(hit); + super_hit['hit_only'] = 0; appendHit(hit) def isRobot(hit): @@ -276,7 +277,8 @@ def generateStats(visits): print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) - stats['nb_visitors'] += 1 + if not super_hit['hit_only']: + stats['nb_visitors'] += 1 stats['viewed_bandwidth'] += super_hit['bandwith'] stats['viewed_pages'] += super_hit['viewed_pages'] stats['viewed_hits'] += super_hit['viewed_hits'] From 4cc29487a298157892ea61f361fbfc05e262d8ff Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 15:25:43 +0100 Subject: [PATCH 010/195] Externalise conf --- conf.py | 12 ++++++++++++ iwla.py | 24 ++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 conf.py diff --git a/conf.py b/conf.py new file mode 100644 index 0000000..c42a7ba --- /dev/null +++ b/conf.py @@ -0,0 +1,12 @@ + +log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ + '"$request" $status $body_bytes_sent ' +\ + '"$http_referer" "$http_user_agent"'; + +#09/Nov/2014:06:35:16 +0100 +time_format = '%d/%b/%Y:%H:%M:%S +0100' + +analyzed_filename = 'access.log' + +DB_ROOT = './output/' +DISPLAY_ROOT = './output/' diff --git a/iwla.py b/iwla.py index 25478d9..8ef4f6a 100755 --- a/iwla.py +++ b/iwla.py @@ -10,6 +10,19 @@ import gzip from robots import awstats_robots; +# Default configuration + +DB_ROOT = './output/' +DISPLAY_ROOT = './output/' + +log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ + '"$request" $status $body_bytes_sent ' +\ + '"$http_referer" "$http_user_agent"'; + +time_format = '%d/%b/%Y:%H:%M:%S +0100' + +from conf import * + print '==> Start' meta_visit = {} @@ -18,16 +31,9 @@ current_visits = {} cache_plugins = {} display = {} -log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ - '"$request" $status $body_bytes_sent ' +\ - '"$http_referer" "$http_user_agent"'; - log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format); log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', log_format_extracted) http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') -#09/Nov/2014:06:35:16 +0100 -time_format = '%d/%b/%Y:%H:%M:%S +0100' -#print "Log format : " + log_format_extracted log_re = re.compile(log_format_extracted) uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') @@ -38,8 +44,6 @@ HOOKS_ROOT = './hooks/' PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/*.py' POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/*.py' DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/*.py' -DB_ROOT = './output/' -DISPLAY_ROOT = './output/' META_PATH = DB_ROOT + 'meta.db' DB_FILENAME = 'iwla.db' @@ -387,7 +391,7 @@ meta_visit = deserialize(META_PATH) or createEmptyMeta() current_visits = createEmptyVisits() -f = open("access.log") +f = open(analyzed_filename) for l in f: # print "line " + l; From f3cb04b16cf8856294ca426d1e5aa6bae87a719c Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 16:15:57 +0100 Subject: [PATCH 011/195] Externalize plugins --- robots.py => awstats_robots_data.py | 0 conf.py | 2 + hooks/pre_analysis/H001_soutade.py | 22 ---------- hooks/pre_analysis/H002_robot.py | 42 ------------------- iwla.py | 62 +++++++++++++++++----------- plugins/pre_analysis/H001_robot.py | 25 +++++++++++ plugins/pre_analysis/H002_soutade.py | 13 ++++++ 7 files changed, 77 insertions(+), 89 deletions(-) rename robots.py => awstats_robots_data.py (100%) delete mode 100644 hooks/pre_analysis/H001_soutade.py delete mode 100644 hooks/pre_analysis/H002_robot.py diff --git a/robots.py b/awstats_robots_data.py similarity index 100% rename from robots.py rename to awstats_robots_data.py diff --git a/conf.py b/conf.py index c42a7ba..9a0f235 100644 --- a/conf.py +++ b/conf.py @@ -10,3 +10,5 @@ analyzed_filename = 'access.log' DB_ROOT = './output/' DISPLAY_ROOT = './output/' + +pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] diff --git a/hooks/pre_analysis/H001_soutade.py b/hooks/pre_analysis/H001_soutade.py deleted file mode 100644 index 6d683be..0000000 --- a/hooks/pre_analysis/H001_soutade.py +++ /dev/null @@ -1,22 +0,0 @@ -import re - -# Remove logo from indefero -logo_re = re.compile(r'^.+/logo/$') - -# Basic rule to detect robots - -def hook(hits): - for k in hits.keys(): - super_hit = hits[k] - - if super_hit['robot']: continue - - for p in super_hit['pages']: - if not p['is_page']: continue - if int(p['status']) != 200: continue - - if logo_re.match(p['extract_request']['extract_uri']): - p['is_page'] = False - if super_hit['viewed_pages']: - super_hit['viewed_pages'] -= 1 - super_hit['viewed_hits'] += 1 diff --git a/hooks/pre_analysis/H002_robot.py b/hooks/pre_analysis/H002_robot.py deleted file mode 100644 index 8a6e721..0000000 --- a/hooks/pre_analysis/H002_robot.py +++ /dev/null @@ -1,42 +0,0 @@ - -# Basic rule to detect robots - -def hook(hits): - for k in hits.keys(): - super_hit = hits[k] - - if super_hit['robot']: continue - - isRobot = False - referers = 0 - -# 1) no pages view --> robot - # if not super_hit['viewed_pages']: - # super_hit['robot'] = 1 - # continue - -# 2) pages without hit --> robot - if not super_hit['viewed_hits']: - super_hit['robot'] = 1 - continue - elif not super_hit['viewed_pages']: -# Hit only - super_hit['hit_only'] = 1 - - for hit in super_hit['pages']: -# 3) /robots.txt read - if hit['extract_request']['http_uri'] == '/robots.txt': - isRobot = True - break - -# 4) Any referer for hits - if not hit['is_page'] and hit['http_referer']: - referers += 1 - - if isRobot: - super_hit['robot'] = 1 - continue - - if super_hit['viewed_hits'] and not referers: - super_hit['robot'] = 1 - continue diff --git a/iwla.py b/iwla.py index 8ef4f6a..a60d9ec 100755 --- a/iwla.py +++ b/iwla.py @@ -8,8 +8,6 @@ import imp import pickle import gzip -from robots import awstats_robots; - # Default configuration DB_ROOT = './output/' @@ -21,6 +19,10 @@ log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local time_format = '%d/%b/%Y:%H:%M:%S +0100' +pre_analysis_hooks = [] +post_analysis_hooks = [] +display_hooks = [] + from conf import * print '==> Start' @@ -40,16 +42,36 @@ uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] viewed_http_codes = [200] -HOOKS_ROOT = './hooks/' -PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/*.py' -POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/*.py' -DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/*.py' +HOOKS_ROOT = './plugins/' +PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/' +POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/' +DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/' META_PATH = DB_ROOT + 'meta.db' DB_FILENAME = 'iwla.db' -print '==> Generating robot dictionary' +plugins = {PRE_HOOK_DIRECTORY : pre_analysis_hooks, POST_HOOK_DIRECTORY : post_analysis_hooks, DISPLAY_HOOK_DIRECTORY : display_hooks} -awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) +ANALYSIS_CLASS = 'HTTP' +API_VERSION = 1 + +def preloadPlugins(): + for root in plugins.keys(): + for plugin_name in plugins[root]: + p = root + '/' + plugin_name + try: + mod = cache_plugins[p] = imp.load_source('hook', p) + infos = mod.get_plugins_infos() + if infos['class'] != ANALYSIS_CLASS or \ + API_VERSION < infos['min_version'] or\ + (infos['max_version'] != -1 and (API_VERSION > infos['max_version'])): + del cache_plugins[p] + elif not mod.load(): + del cache_plugins[p] + except Exception as e: + print 'Error loading \'%s\' => %s' % (p, e) + return False + return True + def createEmptyVisits(): visits = {'days_stats' : {}, 'month_stats' : {}, 'visits' : {}} @@ -97,17 +119,11 @@ def deserialize(filename): return pickle.load(f) return None -def callPlugins(path, *kwargs): - print '==> Call plugins (%s)' % path - plugins = glob.glob(path) - plugins.sort() - for p in plugins: +def callPlugins(root, *kwargs): + print '==> Call plugins (%s)' % root + for p in plugins[root]: print '\t%s' % (p) - if not p in cache_plugins: - mod = imp.load_source('hook', p) - cache_plugins[p] = mod - else: - mod = cache_plugins[p] + mod = cache_plugins[root + '/' + p] mod.hook(*kwargs) def isPage(request): @@ -164,16 +180,10 @@ def createUser(hit): super_hit['bandwith'] = 0; super_hit['last_access'] = meta_visit['last_time'] super_hit['pages'] = []; - super_hit['robot'] = isRobot(hit); + super_hit['robot'] = False super_hit['hit_only'] = 0; appendHit(hit) -def isRobot(hit): - for r in awstats_robots: - if r.match(hit['http_user_agent']): - return True - return False - def decodeHTTPRequest(hit): if not 'request' in hit.keys(): return False @@ -385,6 +395,8 @@ def newHit(hit): return True +preloadPlugins() + print '==> Analysing log' meta_visit = deserialize(META_PATH) or createEmptyMeta() diff --git a/plugins/pre_analysis/H001_robot.py b/plugins/pre_analysis/H001_robot.py index 9ec45cb..91cd5fc 100644 --- a/plugins/pre_analysis/H001_robot.py +++ b/plugins/pre_analysis/H001_robot.py @@ -1,3 +1,23 @@ +import re + +from awstats_robots_data import awstats_robots + +PLUGIN_CLASS = 'HTTP' +API_VERSION = 1 + +def get_plugins_infos(): + infos = {'class' : PLUGIN_CLASS, + 'min_version' : API_VERSION, + 'max_version' : -1} + return infos + +def load(): + global awstats_robots + print '==> Generating robot dictionary' + + awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) + + return True # Basic rule to detect robots @@ -10,6 +30,11 @@ def hook(hits): isRobot = False referers = 0 + for r in awstats_robots: + if r.match(super_hit['pages'][0]['http_user_agent']): + super_hit['robot'] = 1 + continue + # 1) no pages view --> robot if not super_hit['viewed_pages']: super_hit['robot'] = 1 diff --git a/plugins/pre_analysis/H002_soutade.py b/plugins/pre_analysis/H002_soutade.py index d6767aa..f546d76 100644 --- a/plugins/pre_analysis/H002_soutade.py +++ b/plugins/pre_analysis/H002_soutade.py @@ -3,6 +3,18 @@ import re # Remove logo from indefero logo_re = re.compile(r'^.+/logo/$') +PLUGIN_CLASS = 'HTTP' +API_VERSION = 1 + +def get_plugins_infos(): + infos = {'class' : PLUGIN_CLASS, + 'min_version' : API_VERSION, + 'max_version' : -1} + return infos + +def load(): + return True + # Basic rule to detect robots def hook(hits): @@ -13,6 +25,7 @@ def hook(hits): for p in super_hit['pages']: if not p['is_page']: continue + if int(p['status']) != 200: continue if logo_re.match(p['extract_request']['extract_uri']): p['is_page'] = False super_hit['viewed_pages'] -= 1 From 34aec57c46a8791b8bdee8c192afad71430413df Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 20 Nov 2014 16:31:00 +0100 Subject: [PATCH 012/195] Separate display functions into display.py --- display.py | 40 ++++++++++++++++++++++++++++++++++++++++ iwla.py | 47 +++++++++-------------------------------------- 2 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 display.py diff --git a/display.py b/display.py new file mode 100644 index 0000000..aa11976 --- /dev/null +++ b/display.py @@ -0,0 +1,40 @@ +def createPage(display, filename, title): + page = {} + page['title'] = title; + page['blocks'] = [] + display[filename] = page + + return page + +def appendBlockToPage(page, block): + page['blocks'].append(block) + +def createTable(title, cols): + table = {'type' : 'table', 'title' : title} + table['cols'] = cols + table['rows'] = [] + +def appendRowToTable(table, row): + table['rows'].append(row) + +def buildPages(display): + for filename in display.keys(): + page = display[filename] + with open(DISPLAY_ROOT + filename, 'w') as f: + f.write('%s' % (page['title'])) + for block in page['blocks']: + if block['type'] == 'html': + f.write(block['value']) + elif block['type'] == 'table': + f.write('') + f.write('') + for title in block['cols']: + f.write('' % (title)) + f.write('') + for row in block['rows']: + f.write('') + for v in row: + f.write('' % (v)) + f.write('') + f.write('
%s
%s
') + f.write('') diff --git a/iwla.py b/iwla.py index a60d9ec..f8441f2 100755 --- a/iwla.py +++ b/iwla.py @@ -8,6 +8,8 @@ import imp import pickle import gzip +from display import * + # Default configuration DB_ROOT = './output/' @@ -85,14 +87,6 @@ def createEmptyDisplay(): display = {} return display -def createPage(filename, title): - page = {} - page['title'] = title; - page['blocks'] = [] - display[filename] = page - - return page - def getDBFilename(time): return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) @@ -211,37 +205,14 @@ def decodeTime(hit): hit['time_decoded'] = time.strptime(t, time_format) -def buildPages(): - for filename in display.keys(): - page = display[filename] - with open(DISPLAY_ROOT + filename, 'w') as f: - f.write('%s' % (page['title'])) - for block in page['blocks']: - if block['type'] == 'html': - f.write(block['value']) - elif block['type'] == 'table': - f.write('') - f.write('') - for title in block['cols']: - f.write('' % (title)) - f.write('') - for row in block['rows']: - f.write('') - for v in row: - f.write('' % (v)) - f.write('') - f.write('
%s
%s
') - f.write('') - def generateDisplayDaysStat(): cur_time = meta_visit['last_time'] title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) - page = createPage(filename, title) + page = createPage(display, filename, title) - days = {'type' : 'table', 'title' : 'By day'} - days['cols'] = ['Day', 'Visits', 'Pages', 'Hits', 'Bandwith', 'Robot Bandwith'] - days['rows'] = [] + days = createTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwith', 'Robot Bandwith']) + keys = current_visits['days_stats'].keys() keys.sort() nb_visits = 0 @@ -249,7 +220,7 @@ def generateDisplayDaysStat(): stats = current_visits['days_stats'][k] row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] row = map(lambda(v): str(v), row) - days['rows'].append(row) + appendRowToTable(days, row) nb_visits += stats['nb_visitors'] stats = current_visits['month_stats'] @@ -262,12 +233,12 @@ def generateDisplayDaysStat(): row = map(lambda(v): '0', row) row[0] = 'Average' - days['rows'].append(row) + appendRowToTable(days, row) row = ['Total', nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] row = map(lambda(v): str(v), row) - days['rows'].append(row) - page['blocks'].append(days) + appendRowToTable(days, row) + appendBlockToPage(page, days) def generateDisplay(): generateDisplayDaysStat() From 7dada493abd0068bac180572621b43ddcbfd2f4b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 21 Nov 2014 10:41:29 +0100 Subject: [PATCH 013/195] Plugins OK --- conf.py | 8 ++- display.py | 37 ++++++++----- iwla.py | 80 +++++++++++++++++----------- plugins/pre_analysis/H001_robot.py | 12 +++-- plugins/pre_analysis/H002_soutade.py | 11 ++-- 5 files changed, 93 insertions(+), 55 deletions(-) diff --git a/conf.py b/conf.py index 9a0f235..5a850e4 100644 --- a/conf.py +++ b/conf.py @@ -11,4 +11,10 @@ analyzed_filename = 'access.log' DB_ROOT = './output/' DISPLAY_ROOT = './output/' -pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] +pre_analysis_hooks = ['H002_soutade', 'H001_robot'] +post_analysis_hooks = ['top_visitors'] +display_hooks = ['top_visitors'] + +# pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] +# post_analysis_hooks = ['top_visitors.py'] +# display_hooks = ['top_visitors.py'] diff --git a/display.py b/display.py index aa11976..4de1bd6 100644 --- a/display.py +++ b/display.py @@ -1,3 +1,4 @@ + def createPage(display, filename, title): page = {} page['title'] = title; @@ -14,27 +15,37 @@ def createTable(title, cols): table['cols'] = cols table['rows'] = [] + return table + def appendRowToTable(table, row): table['rows'].append(row) -def buildPages(display): +def buildTable(block, f): + print 'Write table %s' % block['title'] + f.write('') + f.write('') + for title in block['cols']: + f.write('' % (title)) + f.write('') + for row in block['rows']: + f.write('') + for v in row: + f.write('' % (v)) + f.write('') + f.write('
%s
%s
') + +def buildPages(display_root, display): for filename in display.keys(): page = display[filename] - with open(DISPLAY_ROOT + filename, 'w') as f: + print "OPEN %s" % (display_root + filename) + with open(display_root + filename, 'w') as f: f.write('%s' % (page['title'])) for block in page['blocks']: + print "Bluid block" + print block + print "End block" if block['type'] == 'html': f.write(block['value']) elif block['type'] == 'table': - f.write('') - f.write('') - for title in block['cols']: - f.write('' % (title)) - f.write('') - for row in block['rows']: - f.write('') - for v in row: - f.write('' % (v)) - f.write('') - f.write('
%s
%s
') + buildTable(block, f) f.write('') diff --git a/iwla.py b/iwla.py index f8441f2..d14695b 100755 --- a/iwla.py +++ b/iwla.py @@ -17,7 +17,7 @@ DISPLAY_ROOT = './output/' log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ '"$request" $status $body_bytes_sent ' +\ - '"$http_referer" "$http_user_agent"'; + '"$http_referer" "$http_user_agent"' time_format = '%d/%b/%Y:%H:%M:%S +0100' @@ -35,7 +35,7 @@ current_visits = {} cache_plugins = {} display = {} -log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format); +log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format) log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', log_format_extracted) http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') @@ -57,11 +57,18 @@ ANALYSIS_CLASS = 'HTTP' API_VERSION = 1 def preloadPlugins(): + ret = True for root in plugins.keys(): for plugin_name in plugins[root]: p = root + '/' + plugin_name try: - mod = cache_plugins[p] = imp.load_source('hook', p) + fp, pathname, description = imp.find_module(plugin_name, [root]) + cache_plugins[p] = imp.load_module(plugin_name, fp, pathname, description) + #cache_plugins[p] = imp.load_module(p,None,p,("py","r",imp.PKG_DIRECTORY)) + #cache_plugins[p] = imp.load_source(p, p) + mod = cache_plugins[p] + #print dir(mod) + #print "Register %s -> %s" % (p, mod) infos = mod.get_plugins_infos() if infos['class'] != ANALYSIS_CLASS or \ API_VERSION < infos['min_version'] or\ @@ -71,8 +78,8 @@ def preloadPlugins(): del cache_plugins[p] except Exception as e: print 'Error loading \'%s\' => %s' % (p, e) - return False - return True + ret = False + return ret def createEmptyVisits(): @@ -113,12 +120,12 @@ def deserialize(filename): return pickle.load(f) return None -def callPlugins(root, *kwargs): +def callPlugins(root, *args): print '==> Call plugins (%s)' % root for p in plugins[root]: print '\t%s' % (p) mod = cache_plugins[root + '/' + p] - mod.hook(*kwargs) + mod.hook(*args) def isPage(request): for e in pages_extensions: @@ -135,8 +142,8 @@ def appendHit(hit): return super_hit = current_visits['visits'][remote_addr] - super_hit['pages'].append(hit) - super_hit['bandwith'] += int(hit['body_bytes_sent']) + super_hit['requests'].append(hit) + super_hit['bandwidth'] += int(hit['body_bytes_sent']) super_hit['last_access'] = meta_visit['last_time'] request = hit['extract_request'] @@ -167,15 +174,16 @@ def appendHit(hit): def createUser(hit): super_hit = current_visits['visits'][hit['remote_addr']] = {} - super_hit['viewed_pages'] = 0; - super_hit['viewed_hits'] = 0; - super_hit['not_viewed_pages'] = 0; - super_hit['not_viewed_hits'] = 0; - super_hit['bandwith'] = 0; + super_hit['remote_addr'] = hit['remote_addr'] + super_hit['viewed_pages'] = 0 + super_hit['viewed_hits'] = 0 + super_hit['not_viewed_pages'] = 0 + super_hit['not_viewed_hits'] = 0 + super_hit['bandwidth'] = 0 super_hit['last_access'] = meta_visit['last_time'] - super_hit['pages'] = []; + super_hit['requests'] = [] super_hit['robot'] = False - super_hit['hit_only'] = 0; + super_hit['hit_only'] = 0 appendHit(hit) def decodeHTTPRequest(hit): @@ -185,7 +193,7 @@ def decodeHTTPRequest(hit): if groups: hit['extract_request'] = groups.groupdict() - uri_groups = uri_re.match(hit['extract_request']['http_uri']); + uri_groups = uri_re.match(hit['extract_request']['http_uri']) if uri_groups: d = uri_groups.groupdict() hit['extract_request']['extract_uri'] = d['extract_uri'] @@ -195,7 +203,7 @@ def decodeHTTPRequest(hit): print "Bad request extraction " + hit['request'] return False - referer_groups = uri_re.match(hit['http_referer']); + referer_groups = uri_re.match(hit['http_referer']) if referer_groups: referer = hit['extract_referer'] = referer_groups.groupdict() return True @@ -205,13 +213,19 @@ def decodeTime(hit): hit['time_decoded'] = time.strptime(t, time_format) +def getDisplayIndex(): + cur_time = meta_visit['last_time'] + filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + + return display.get(filename, None) + def generateDisplayDaysStat(): cur_time = meta_visit['last_time'] title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) page = createPage(display, filename, title) - days = createTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwith', 'Robot Bandwith']) + days = createTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Robot Bandwidth']) keys = current_visits['days_stats'].keys() keys.sort() @@ -243,7 +257,7 @@ def generateDisplayDaysStat(): def generateDisplay(): generateDisplayDaysStat() callPlugins(DISPLAY_HOOK_DIRECTORY, current_visits, display) - buildPages() + buildPages(DISPLAY_ROOT, display) def generateStats(visits): stats = {} @@ -251,27 +265,27 @@ def generateStats(visits): stats['not_viewed_bandwidth'] = 0 stats['viewed_pages'] = 0 stats['viewed_hits'] = 0 - #stats['pages'] = set() + #stats['requests'] = set() stats['nb_visitors'] = 0 for k in visits.keys(): super_hit = visits[k] if super_hit['robot']: - stats['not_viewed_bandwidth'] += super_hit['bandwith'] + stats['not_viewed_bandwidth'] += super_hit['bandwidth'] continue - print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) + #print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) if not super_hit['hit_only']: stats['nb_visitors'] += 1 - stats['viewed_bandwidth'] += super_hit['bandwith'] + stats['viewed_bandwidth'] += super_hit['bandwidth'] stats['viewed_pages'] += super_hit['viewed_pages'] stats['viewed_hits'] += super_hit['viewed_hits'] - # for p in super_hit['pages']: + # for p in super_hit['requests']: # if not p['is_page']: continue # req = p['extract_request'] - # stats['pages'].add(req['extract_uri']) + # stats['requests'].add(req['extract_uri']) return stats @@ -287,7 +301,7 @@ def generateMonthStats(): print stats valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} - callPlugins(POST_HOOK_DIRECTORY, valid_visitors) + callPlugins(POST_HOOK_DIRECTORY, valid_visitors, stats) current_visits['month_stats'] = stats @@ -348,7 +362,6 @@ def newHit(hit): return else: analyse_started = True - current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() if cur_time.tm_mon != t.tm_mon: generateMonthStats() current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() @@ -371,12 +384,14 @@ preloadPlugins() print '==> Analysing log' meta_visit = deserialize(META_PATH) or createEmptyMeta() - -current_visits = createEmptyVisits() +if meta_visit['last_time']: + current_visits = deserialize(getDBFilename(meta_visit['last_time'])) or createEmptyVisits() +else: + current_visits = createEmptyVisits() f = open(analyzed_filename) for l in f: - # print "line " + l; + # print "line " + l groups = log_re.match(l) @@ -385,7 +400,7 @@ for l in f: break else: print "No match " + l -f.close(); +f.close() if analyse_started: generateDayStats() @@ -393,3 +408,4 @@ if analyse_started: serialize(meta_visit, META_PATH) else: print '==> Analyse not started : nothing to do' + generateMonthStats() diff --git a/plugins/pre_analysis/H001_robot.py b/plugins/pre_analysis/H001_robot.py index 91cd5fc..a096dc8 100644 --- a/plugins/pre_analysis/H001_robot.py +++ b/plugins/pre_analysis/H001_robot.py @@ -30,10 +30,12 @@ def hook(hits): isRobot = False referers = 0 - for r in awstats_robots: - if r.match(super_hit['pages'][0]['http_user_agent']): - super_hit['robot'] = 1 - continue + first_page = super_hit['requests'][0] + if first_page['time_decoded'].tm_mday == super_hit['last_access'].tm_mday: + for r in awstats_robots: + if r.match(first_page['http_user_agent']): + super_hit['robot'] = 1 + continue # 1) no pages view --> robot if not super_hit['viewed_pages']: @@ -45,7 +47,7 @@ def hook(hits): super_hit['robot'] = 1 continue - for hit in super_hit['pages']: + for hit in super_hit['requests']: # 3) /robots.txt read if hit['extract_request']['http_uri'] == '/robots.txt': isRobot = True diff --git a/plugins/pre_analysis/H002_soutade.py b/plugins/pre_analysis/H002_soutade.py index f546d76..5b70f64 100644 --- a/plugins/pre_analysis/H002_soutade.py +++ b/plugins/pre_analysis/H002_soutade.py @@ -7,9 +7,11 @@ PLUGIN_CLASS = 'HTTP' API_VERSION = 1 def get_plugins_infos(): - infos = {'class' : PLUGIN_CLASS, - 'min_version' : API_VERSION, - 'max_version' : -1} + infos = { + 'class' : PLUGIN_CLASS, + 'min_version' : API_VERSION, + 'max_version' : -1 + } return infos def load(): @@ -23,9 +25,10 @@ def hook(hits): if super_hit['robot']: continue - for p in super_hit['pages']: + for p in super_hit['requests']: if not p['is_page']: continue if int(p['status']) != 200: continue + if p['time_decoded'].tm_mday != super_hit['last_access'].tm_mday: continue if logo_re.match(p['extract_request']['extract_uri']): p['is_page'] = False super_hit['viewed_pages'] -= 1 From c3c201fda1ff70981d8f95f0c1651bc7df475598 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 21 Nov 2014 14:46:12 +0100 Subject: [PATCH 014/195] Start using classes --- iwla.py | 645 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 319 insertions(+), 326 deletions(-) diff --git a/iwla.py b/iwla.py index d14695b..daf2b15 100755 --- a/iwla.py +++ b/iwla.py @@ -10,100 +10,95 @@ import gzip from display import * -# Default configuration - -DB_ROOT = './output/' -DISPLAY_ROOT = './output/' - -log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ - '"$request" $status $body_bytes_sent ' +\ - '"$http_referer" "$http_user_agent"' - -time_format = '%d/%b/%Y:%H:%M:%S +0100' - -pre_analysis_hooks = [] -post_analysis_hooks = [] -display_hooks = [] - +from default_conf import * from conf import * -print '==> Start' +class IWLA(object): -meta_visit = {} -analyse_started = False -current_visits = {} -cache_plugins = {} -display = {} + ANALYSIS_CLASS = 'HTTP' + API_VERSION = 1 -log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format) -log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', log_format_extracted) -http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') + def __init__(self): + print '==> Start' -log_re = re.compile(log_format_extracted) -uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') -pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] -viewed_http_codes = [200] + self.meta_infos = {} + self.analyse_started = False + self.current_analysis = {} + self.cache_plugins = {} + self.display = {} + self.valid_visitors = None -HOOKS_ROOT = './plugins/' -PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/' -POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/' -DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/' -META_PATH = DB_ROOT + 'meta.db' -DB_FILENAME = 'iwla.db' + self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format) + self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted) + self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') + self.log_re = re.compile(self.log_format_extracted) + self.uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') + self.plugins = {PRE_HOOK_DIRECTORY : pre_analysis_hooks, + POST_HOOK_DIRECTORY : post_analysis_hooks, + DISPLAY_HOOK_DIRECTORY : display_hooks} -plugins = {PRE_HOOK_DIRECTORY : pre_analysis_hooks, POST_HOOK_DIRECTORY : post_analysis_hooks, DISPLAY_HOOK_DIRECTORY : display_hooks} + def _preloadPlugins(self): + ret = True + for root in self.plugins.keys(): + for plugin_name in self.plugins[root]: + p = root + '/' + plugin_name + try: + fp, pathname, description = imp.find_module(plugin_name, [root]) + self.cache_plugins[p] = imp.load_module(plugin_name, fp, pathname, description) + mod = self.cache_plugins[p] + infos = mod.get_plugins_infos() + if infos['class'] != IWLA.ANALYSIS_CLASS or \ + IWLA.API_VERSION < infos['min_version'] or\ + (infos['max_version'] != -1 and (IWLA.API_VERSION > infos['max_version'])): + del self.cache_plugins[p] + elif not mod.load(): + del self.cache_plugins[p] + except Exception as e: + print 'Error loading \'%s\' => %s' % (p, e) + ret = False + return ret -ANALYSIS_CLASS = 'HTTP' -API_VERSION = 1 + def _clearVisits(self): + self.current_analysis = { + 'days_stats' : {}, + 'month_stats' : {}, + 'visits' : {} + } + self.valid_visitors = None + return self.current_analysis -def preloadPlugins(): - ret = True - for root in plugins.keys(): - for plugin_name in plugins[root]: - p = root + '/' + plugin_name - try: - fp, pathname, description = imp.find_module(plugin_name, [root]) - cache_plugins[p] = imp.load_module(plugin_name, fp, pathname, description) - #cache_plugins[p] = imp.load_module(p,None,p,("py","r",imp.PKG_DIRECTORY)) - #cache_plugins[p] = imp.load_source(p, p) - mod = cache_plugins[p] - #print dir(mod) - #print "Register %s -> %s" % (p, mod) - infos = mod.get_plugins_infos() - if infos['class'] != ANALYSIS_CLASS or \ - API_VERSION < infos['min_version'] or\ - (infos['max_version'] != -1 and (API_VERSION > infos['max_version'])): - del cache_plugins[p] - elif not mod.load(): - del cache_plugins[p] - except Exception as e: - print 'Error loading \'%s\' => %s' % (p, e) - ret = False - return ret - + def getDaysStats(self): + return self.current_analysis['days_stats'] -def createEmptyVisits(): - visits = {'days_stats' : {}, 'month_stats' : {}, 'visits' : {}} - return visits + def getMonthStatsStats(self): + return self.current_analysis['month_stats'] -def createEmptyMeta(): - meta = {'last_time' : None} - return meta + def getCurrentVisists(self): + return self.current_analysis['visits'] -def createEmptyDisplay(): - display = {} - return display + def getValidVisitors(self): + return self.current_analysis['visits'] -def getDBFilename(time): - return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) + def _clearMeta(self): + self.meta_infos = { + 'last_time' : None + } + return self.meta_infos -def serialize(obj, filename): - base = os.path.dirname(filename) - if not os.path.exists(base): - os.makedirs(base) + def _clearDisplay(self): + self.display = {} + return self.display - # TODO : remove return - return + def getDBFilename(self, time): + return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) + + def _serialize(self, obj, filename): + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) + + # TODO : remove return + return with open(filename + '.tmp', 'wb+') as f: pickle.dump(obj, f) @@ -112,300 +107,298 @@ def serialize(obj, filename): fzip.write(f.read()) os.remove(filename + '.tmp') -def deserialize(filename): - if not os.path.exists(filename): + def _deserialize(self, filename): + if not os.path.exists(filename): + return None + + with gzip.open(filename, 'r') as f: + return pickle.load(f) return None - with gzip.open(filename, 'r') as f: - return pickle.load(f) - return None + def _callPlugins(self, root, *args): + print '==> Call plugins (%s)' % root + for p in self.plugins[root]: + print '\t%s' % (p) + mod = self.cache_plugins[root + '/' + p] + mod.hook(*args) -def callPlugins(root, *args): - print '==> Call plugins (%s)' % root - for p in plugins[root]: - print '\t%s' % (p) - mod = cache_plugins[root + '/' + p] - mod.hook(*args) + def isPage(self, request): + for e in pages_extensions: + if request.endswith(e): + return True -def isPage(request): - for e in pages_extensions: - if request.endswith(e): - return True - - return False - -def appendHit(hit): - remote_addr = hit['remote_addr'] - - if not remote_addr in current_visits['visits'].keys(): - createUser(hit) - return - - super_hit = current_visits['visits'][remote_addr] - super_hit['requests'].append(hit) - super_hit['bandwidth'] += int(hit['body_bytes_sent']) - super_hit['last_access'] = meta_visit['last_time'] - - request = hit['extract_request'] - - if 'extract_uri' in request.keys(): - uri = request['extract_uri'] - else: - uri = request['http_uri'] - - hit['is_page'] = isPage(uri) - - # Don't count 3xx status - status = int(hit['status']) - if status >= 300 and status < 400: return - - if super_hit['robot'] or\ - not status in viewed_http_codes: - page_key = 'not_viewed_pages' - hit_key = 'not_viewed_hits' - else: - page_key = 'viewed_pages' - hit_key = 'viewed_hits' - - if hit['is_page']: - super_hit[page_key] += 1 - else: - super_hit[hit_key] += 1 - -def createUser(hit): - super_hit = current_visits['visits'][hit['remote_addr']] = {} - super_hit['remote_addr'] = hit['remote_addr'] - super_hit['viewed_pages'] = 0 - super_hit['viewed_hits'] = 0 - super_hit['not_viewed_pages'] = 0 - super_hit['not_viewed_hits'] = 0 - super_hit['bandwidth'] = 0 - super_hit['last_access'] = meta_visit['last_time'] - super_hit['requests'] = [] - super_hit['robot'] = False - super_hit['hit_only'] = 0 - appendHit(hit) - -def decodeHTTPRequest(hit): - if not 'request' in hit.keys(): return False - - groups = http_request_extracted.match(hit['request']) - - if groups: - hit['extract_request'] = groups.groupdict() - uri_groups = uri_re.match(hit['extract_request']['http_uri']) - if uri_groups: - d = uri_groups.groupdict() - hit['extract_request']['extract_uri'] = d['extract_uri'] - if 'extract_parameters' in d.keys(): - hit['extract_request']['extract_parameters'] = d['extract_parameters'] - else: - print "Bad request extraction " + hit['request'] return False - referer_groups = uri_re.match(hit['http_referer']) - if referer_groups: - referer = hit['extract_referer'] = referer_groups.groupdict() - return True + def _appendHit(self, hit): + remote_addr = hit['remote_addr'] + + if not remote_addr in self.current_analysis['visits'].keys(): + self._createUser(hit) + return + + super_hit = self.current_analysis['visits'][remote_addr] + super_hit['requests'].append(hit) + super_hit['bandwidth'] += int(hit['body_bytes_sent']) + super_hit['last_access'] = self.meta_infos['last_time'] -def decodeTime(hit): - t = hit['time_local'] + request = hit['extract_request'] - hit['time_decoded'] = time.strptime(t, time_format) + if 'extract_uri' in request.keys(): + uri = request['extract_uri'] + else: + uri = request['http_uri'] -def getDisplayIndex(): - cur_time = meta_visit['last_time'] - filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + hit['is_page'] = self.isPage(uri) - return display.get(filename, None) + # Don't count 3xx status + status = int(hit['status']) + if status >= 300 and status < 400: return -def generateDisplayDaysStat(): - cur_time = meta_visit['last_time'] - title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) - filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) - page = createPage(display, filename, title) - - days = createTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Robot Bandwidth']) + if super_hit['robot'] or\ + not status in viewed_http_codes: + page_key = 'not_viewed_pages' + hit_key = 'not_viewed_hits' + else: + page_key = 'viewed_pages' + hit_key = 'viewed_hits' - keys = current_visits['days_stats'].keys() - keys.sort() - nb_visits = 0 - for k in keys: - stats = current_visits['days_stats'][k] - row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + if hit['is_page']: + super_hit[page_key] += 1 + else: + super_hit[hit_key] += 1 + + def _createUser(self, hit): + super_hit = self.current_analysis['visits'][hit['remote_addr']] = {} + super_hit['remote_addr'] = hit['remote_addr'] + super_hit['viewed_pages'] = 0 + super_hit['viewed_hits'] = 0 + super_hit['not_viewed_pages'] = 0 + super_hit['not_viewed_hits'] = 0 + super_hit['bandwidth'] = 0 + super_hit['last_access'] = self.meta_infos['last_time'] + super_hit['requests'] = [] + super_hit['robot'] = False + super_hit['hit_only'] = 0 + self._appendHit(hit) + + def _decodeHTTPRequest(self, hit): + if not 'request' in hit.keys(): return False + + groups = self.http_request_extracted.match(hit['request']) + + if groups: + hit['extract_request'] = groups.groupdict() + uri_groups = self.uri_re.match(hit['extract_request']['http_uri']) + if uri_groups: + d = uri_groups.groupdict() + hit['extract_request']['extract_uri'] = d['extract_uri'] + if 'extract_parameters' in d.keys(): + hit['extract_request']['extract_parameters'] = d['extract_parameters'] + else: + print "Bad request extraction " + hit['request'] + return False + + referer_groups = self.uri_re.match(hit['http_referer']) + if referer_groups: + referer = hit['extract_referer'] = referer_groups.groupdict() + return True + + def _decodeTime(self, hit): + hit['time_decoded'] = time.strptime(hit['time_local'], time_format) + + def getDisplayIndex(self): + cur_time = self.meta_infos['last_time'] + filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + + return self.display.get(filename, None) + + def _generateDisplayDaysStat(self): + cur_time = self.meta_infos['last_time'] + title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) + filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + page = createPage(self.display, filename, title) + + days = createTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Robot Bandwidth']) + + keys = self.current_analysis['days_stats'].keys() + keys.sort() + nb_visits = 0 + for k in keys: + stats = self.current_analysis['days_stats'][k] + row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + row = map(lambda(v): str(v), row) + appendRowToTable(days, row) + nb_visits += stats['nb_visitors'] + + stats = self.current_analysis['month_stats'] + + nb_days = len(keys) + row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + if nb_days: + row = map(lambda(v): str(int(v/nb_days)), row) + else: + row = map(lambda(v): '0', row) + + row[0] = 'Average' + appendRowToTable(days, row) + + row = ['Total', nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] row = map(lambda(v): str(v), row) appendRowToTable(days, row) - nb_visits += stats['nb_visitors'] + appendBlockToPage(page, days) - stats = current_visits['month_stats'] + def _generateDisplay(self): + self._generateDisplayDaysStat() + self._callPlugins(DISPLAY_HOOK_DIRECTORY, self.current_analysis, self.display) + buildPages(DISPLAY_ROOT, self.display) - nb_days = len(keys) - row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] - if nb_days: - row = map(lambda(v): str(int(v/nb_days)), row) - else: - row = map(lambda(v): '0', row) + def _generateStats(self, visits): + stats = {} + stats['viewed_bandwidth'] = 0 + stats['not_viewed_bandwidth'] = 0 + stats['viewed_pages'] = 0 + stats['viewed_hits'] = 0 + #stats['requests'] = set() + stats['nb_visitors'] = 0 - row[0] = 'Average' - appendRowToTable(days, row) + for k in visits.keys(): + super_hit = visits[k] + if super_hit['robot']: + stats['not_viewed_bandwidth'] += super_hit['bandwidth'] + continue - row = ['Total', nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] - row = map(lambda(v): str(v), row) - appendRowToTable(days, row) - appendBlockToPage(page, days) + #print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) -def generateDisplay(): - generateDisplayDaysStat() - callPlugins(DISPLAY_HOOK_DIRECTORY, current_visits, display) - buildPages(DISPLAY_ROOT, display) + if not super_hit['hit_only']: + stats['nb_visitors'] += 1 + stats['viewed_bandwidth'] += super_hit['bandwidth'] + stats['viewed_pages'] += super_hit['viewed_pages'] + stats['viewed_hits'] += super_hit['viewed_hits'] -def generateStats(visits): - stats = {} - stats['viewed_bandwidth'] = 0 - stats['not_viewed_bandwidth'] = 0 - stats['viewed_pages'] = 0 - stats['viewed_hits'] = 0 - #stats['requests'] = set() - stats['nb_visitors'] = 0 + # for p in super_hit['requests']: + # if not p['is_page']: continue + # req = p['extract_request'] + # stats['requests'].add(req['extract_uri']) - for k in visits.keys(): - super_hit = visits[k] - if super_hit['robot']: - stats['not_viewed_bandwidth'] += super_hit['bandwidth'] - continue + return stats - #print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) - - if not super_hit['hit_only']: - stats['nb_visitors'] += 1 - stats['viewed_bandwidth'] += super_hit['bandwidth'] - stats['viewed_pages'] += super_hit['viewed_pages'] - stats['viewed_hits'] += super_hit['viewed_hits'] + def _generateMonthStats(self): + self._clearDisplay() - # for p in super_hit['requests']: - # if not p['is_page']: continue - # req = p['extract_request'] - # stats['requests'].add(req['extract_uri']) + visits = self.current_analysis['visits'] - return stats - -def generateMonthStats(): - display = createEmptyDisplay() + stats = self._generateStats(visits) - visits = current_visits['visits'] - - stats = generateStats(visits) - - cur_time = meta_visit['last_time'] - print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) - print stats + cur_time = self.meta_infos['last_time'] + print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) + print stats - valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} - callPlugins(POST_HOOK_DIRECTORY, valid_visitors, stats) + self.valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} + self._callPlugins(POST_HOOK_DIRECTORY, valid_visitors, stats) - current_visits['month_stats'] = stats + self.current_analysis['month_stats'] = stats - path = getDBFilename(cur_time) - if os.path.exists(path): - os.remove(path) + path = self.getDBFilename(cur_time) + if os.path.exists(path): + os.remove(path) - print "==> Serialize to %s" % path + print "==> Serialize to %s" % path - serialize(current_visits, path) + self._serialize(self.current_analysis, path) - generateDisplay() + self._generateDisplay() -def generateDayStats(): - visits = current_visits['visits'] - - callPlugins(PRE_HOOK_DIRECTORY, visits) + def _generateDayStats(self): + visits = self.current_analysis['visits'] - stats = generateStats(visits) - - cur_time = meta_visit['last_time'] - print "== Stats for %d/%d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) + self._callPlugins(PRE_HOOK_DIRECTORY, visits) - if cur_time.tm_mday > 1: - last_day = cur_time.tm_mday - 1 - while last_day: - if last_day in current_visits['days_stats'].keys(): - break - last_day -= 1 - if last_day: - for k in stats.keys(): - stats[k] -= current_visits['days_stats'][last_day][k] - stats['nb_visitors'] = 0 - for k in visits.keys(): - if visits[k]['robot']: continue - if visits[k]['last_access'].tm_mday == cur_time.tm_mday: - stats['nb_visitors'] += 1 - print stats + stats = self._generateStats(visits) - current_visits['days_stats'][cur_time.tm_mday] = stats + cur_time = self.meta_infos['last_time'] + print "== Stats for %d/%d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) -def newHit(hit): - global current_visits - global analyse_started + if cur_time.tm_mday > 1: + last_day = cur_time.tm_mday - 1 + while last_day: + if last_day in self.current_analysis['days_stats'].keys(): + break + last_day -= 1 + if last_day: + for k in stats.keys(): + stats[k] -= self.current_analysis['days_stats'][last_day][k] + stats['nb_visitors'] = 0 + for k in visits.keys(): + if visits[k]['robot']: continue + if visits[k]['last_access'].tm_mday == cur_time.tm_mday: + stats['nb_visitors'] += 1 + print stats - decodeTime(hit) + self.current_analysis['days_stats'][cur_time.tm_mday] = stats - t = hit['time_decoded'] + def _newHit(self, hit): + self._decodeTime(hit) - cur_time = meta_visit['last_time'] + t = hit['time_decoded'] - if cur_time == None: - current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() - analyse_started = True - else: - if not analyse_started: - if time.mktime(cur_time) >= time.mktime(t): - return - else: - analyse_started = True - if cur_time.tm_mon != t.tm_mon: - generateMonthStats() - current_visits = deserialize(getDBFilename(t)) or createEmptyVisits() - elif cur_time.tm_mday != t.tm_mday: - generateDayStats() + cur_time = self.meta_infos['last_time'] - meta_visit['last_time'] = t + if cur_time == None: + self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() + self.analyse_started = True + else: + if not self.analyse_started: + if time.mktime(cur_time) >= time.mktime(t): + return + else: + self.analyse_started = True + if cur_time.tm_mon != t.tm_mon: + self._generateMonthStats() + self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() + elif cur_time.tm_mday != t.tm_mday: + self._generateDayStats() - if not decodeHTTPRequest(hit): return False + self.meta_infos['last_time'] = t - for k in hit.keys(): - if hit[k] == '-': hit[k] = '' + if not self._decodeHTTPRequest(hit): return False - appendHit(hit) + for k in hit.keys(): + if hit[k] == '-': hit[k] = '' - return True + self._appendHit(hit) -preloadPlugins() + return True -print '==> Analysing log' + def start(self): + self._preloadPlugins() -meta_visit = deserialize(META_PATH) or createEmptyMeta() -if meta_visit['last_time']: - current_visits = deserialize(getDBFilename(meta_visit['last_time'])) or createEmptyVisits() -else: - current_visits = createEmptyVisits() + print '==> Analysing log' -f = open(analyzed_filename) -for l in f: - # print "line " + l - - groups = log_re.match(l) - - if groups: - if not newHit(groups.groupdict()): - break - else: - print "No match " + l -f.close() + self.meta_infos = self._deserialize(META_PATH) or self._clearMeta() + if self.meta_infos['last_time']: + self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() + else: + self._clearVisits() -if analyse_started: - generateDayStats() - generateMonthStats() - serialize(meta_visit, META_PATH) -else: - print '==> Analyse not started : nothing to do' - generateMonthStats() + with open(analyzed_filename) as f: + for l in f: + # print "line " + l + + groups = self.log_re.match(l) + + if groups: + if not self._newHit(groups.groupdict()): + break + else: + print "No match for " + l + + if self.analyse_started: + self._generateDayStats() + self._generateMonthStats() + self._serialize(meta_infos, META_PATH) + else: + print '==> Analyse not started : nothing to do' + self._generateMonthStats() + +iwla = IWLA() +iwla.start() From e51e07f65e983dfaff29450e86e99b8b5bc88306 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 21 Nov 2014 16:56:58 +0100 Subject: [PATCH 015/195] Very nice result --- conf.py | 2 +- display.py | 111 ++++++++++++++++----------- iwla.py | 59 +++++++------- plugins/pre_analysis/H001_robot.py | 4 +- plugins/pre_analysis/H002_soutade.py | 5 +- 5 files changed, 106 insertions(+), 75 deletions(-) diff --git a/conf.py b/conf.py index 5a850e4..7bf2c3b 100644 --- a/conf.py +++ b/conf.py @@ -12,7 +12,7 @@ DB_ROOT = './output/' DISPLAY_ROOT = './output/' pre_analysis_hooks = ['H002_soutade', 'H001_robot'] -post_analysis_hooks = ['top_visitors'] +post_analysis_hooks = ['top_visitors', 'reverse_dns'] display_hooks = ['top_visitors'] # pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] diff --git a/display.py b/display.py index 4de1bd6..6ddf1f8 100644 --- a/display.py +++ b/display.py @@ -1,51 +1,70 @@ -def createPage(display, filename, title): - page = {} - page['title'] = title; - page['blocks'] = [] - display[filename] = page +class DisplayHTMLBlock(object): - return page + def __init__(self, title): + self.title = title -def appendBlockToPage(page, block): - page['blocks'].append(block) + def build(self, f): + pass -def createTable(title, cols): - table = {'type' : 'table', 'title' : title} - table['cols'] = cols - table['rows'] = [] - - return table - -def appendRowToTable(table, row): - table['rows'].append(row) - -def buildTable(block, f): - print 'Write table %s' % block['title'] - f.write('') - f.write('') - for title in block['cols']: - f.write('' % (title)) - f.write('') - for row in block['rows']: - f.write('') - for v in row: - f.write('' % (v)) - f.write('') - f.write('
%s
%s
') +class DisplayHTMLBlockTable(DisplayHTMLBlock): -def buildPages(display_root, display): - for filename in display.keys(): - page = display[filename] - print "OPEN %s" % (display_root + filename) - with open(display_root + filename, 'w') as f: - f.write('%s' % (page['title'])) - for block in page['blocks']: - print "Bluid block" - print block - print "End block" - if block['type'] == 'html': - f.write(block['value']) - elif block['type'] == 'table': - buildTable(block, f) - f.write('') + def __init__(self, title, cols): + super(DisplayHTMLBlockTable, self).__init__(title) + self.cols = cols + self.rows = [] + + def appendRow(self, row): + self.rows.append(row) + + def build(self, f): + f.write('') + f.write('') + for title in self.cols: + f.write('' % (title)) + f.write('') + for row in self.rows: + f.write('') + for v in row: + f.write('' % (v)) + f.write('') + f.write('
%s
%s
') + +class DisplayHTMLPage(object): + + def __init__(self, title, filename): + self.title = title + self.filename = filename + self.blocks = [] + + def getFilename(self): + return self.filename; + + def appendBlock(self, block): + self.blocks.append(block) + + def build(self, root): + f = open(root + self.filename, 'w') + f.write('%s' % (self.title)) + for block in self.blocks: + block.build(f) + f.write('') + f.close() + +class DisplayHTMLBuild(object): + + def __init__(self): + self.pages = [] + + def getPage(self, filename): + for page in self.pages: + if page.getFilename() == filename: + return page + return None + + def addPage(self, page): + self.pages.append(page) + + def build(self, root): + for page in self.pages: + page.build(root) diff --git a/iwla.py b/iwla.py index daf2b15..e8a93d7 100755 --- a/iwla.py +++ b/iwla.py @@ -25,7 +25,7 @@ class IWLA(object): self.analyse_started = False self.current_analysis = {} self.cache_plugins = {} - self.display = {} + self.display = DisplayHTMLBuild() self.valid_visitors = None self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format) @@ -44,7 +44,7 @@ class IWLA(object): p = root + '/' + plugin_name try: fp, pathname, description = imp.find_module(plugin_name, [root]) - self.cache_plugins[p] = imp.load_module(plugin_name, fp, pathname, description) + self.cache_plugins[p] = imp.load_module(p, fp, pathname, description) mod = self.cache_plugins[p] infos = mod.get_plugins_infos() if infos['class'] != IWLA.ANALYSIS_CLASS or \ @@ -70,14 +70,17 @@ class IWLA(object): def getDaysStats(self): return self.current_analysis['days_stats'] - def getMonthStatsStats(self): + def getMonthStats(self): return self.current_analysis['month_stats'] def getCurrentVisists(self): return self.current_analysis['visits'] def getValidVisitors(self): - return self.current_analysis['visits'] + return self.valid_visitors + + def getDisplay(self): + return self.display def _clearMeta(self): self.meta_infos = { @@ -86,7 +89,7 @@ class IWLA(object): return self.meta_infos def _clearDisplay(self): - self.display = {} + self.display = DisplayHTMLBuild() return self.display def getDBFilename(self, time): @@ -100,11 +103,11 @@ class IWLA(object): # TODO : remove return return - with open(filename + '.tmp', 'wb+') as f: - pickle.dump(obj, f) - f.seek(0) - with gzip.open(filename, 'w') as fzip: - fzip.write(f.read()) + with open(filename + '.tmp', 'wb+') as f: + pickle.dump(obj, f) + f.seek(0) + with gzip.open(filename, 'w') as fzip: + fzip.write(f.read()) os.remove(filename + '.tmp') def _deserialize(self, filename): @@ -210,15 +213,16 @@ class IWLA(object): cur_time = self.meta_infos['last_time'] filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) - return self.display.get(filename, None) + return self.display.getPage(filename) def _generateDisplayDaysStat(self): cur_time = self.meta_infos['last_time'] title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) - page = createPage(self.display, filename, title) + print '==> Generate display (%s)' % (filename) + page = DisplayHTMLPage(title, filename) - days = createTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Robot Bandwidth']) + days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) keys = self.current_analysis['days_stats'].keys() keys.sort() @@ -227,7 +231,7 @@ class IWLA(object): stats = self.current_analysis['days_stats'][k] row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] row = map(lambda(v): str(v), row) - appendRowToTable(days, row) + days.appendRow(row) nb_visits += stats['nb_visitors'] stats = self.current_analysis['month_stats'] @@ -240,17 +244,18 @@ class IWLA(object): row = map(lambda(v): '0', row) row[0] = 'Average' - appendRowToTable(days, row) + days.appendRow(row) row = ['Total', nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] row = map(lambda(v): str(v), row) - appendRowToTable(days, row) - appendBlockToPage(page, days) + days.appendRow(row) + page.appendBlock(days) + self.display.addPage(page) def _generateDisplay(self): self._generateDisplayDaysStat() - self._callPlugins(DISPLAY_HOOK_DIRECTORY, self.current_analysis, self.display) - buildPages(DISPLAY_ROOT, self.display) + self._callPlugins(DISPLAY_HOOK_DIRECTORY, self) + self.display.build(DISPLAY_ROOT) def _generateStats(self, visits): stats = {} @@ -293,11 +298,11 @@ class IWLA(object): print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) print stats - self.valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} - self._callPlugins(POST_HOOK_DIRECTORY, valid_visitors, stats) - self.current_analysis['month_stats'] = stats + self.valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} + self._callPlugins(POST_HOOK_DIRECTORY, self) + path = self.getDBFilename(cur_time) if os.path.exists(path): os.remove(path) @@ -311,7 +316,7 @@ class IWLA(object): def _generateDayStats(self): visits = self.current_analysis['visits'] - self._callPlugins(PRE_HOOK_DIRECTORY, visits) + self._callPlugins(PRE_HOOK_DIRECTORY, self) stats = self._generateStats(visits) @@ -391,14 +396,16 @@ class IWLA(object): break else: print "No match for " + l + #break if self.analyse_started: self._generateDayStats() self._generateMonthStats() - self._serialize(meta_infos, META_PATH) + self._serialize(self.meta_infos, META_PATH) else: print '==> Analyse not started : nothing to do' self._generateMonthStats() -iwla = IWLA() -iwla.start() +if __name__ == '__main__': + iwla = IWLA() + iwla.start() diff --git a/plugins/pre_analysis/H001_robot.py b/plugins/pre_analysis/H001_robot.py index a096dc8..a299fa5 100644 --- a/plugins/pre_analysis/H001_robot.py +++ b/plugins/pre_analysis/H001_robot.py @@ -1,4 +1,5 @@ import re +from iwla import IWLA from awstats_robots_data import awstats_robots @@ -21,7 +22,8 @@ def load(): # Basic rule to detect robots -def hook(hits): +def hook(iwla): + hits = iwla.getCurrentVisists() for k in hits.keys(): super_hit = hits[k] diff --git a/plugins/pre_analysis/H002_soutade.py b/plugins/pre_analysis/H002_soutade.py index 5b70f64..b893715 100644 --- a/plugins/pre_analysis/H002_soutade.py +++ b/plugins/pre_analysis/H002_soutade.py @@ -1,4 +1,5 @@ import re +from iwla import IWLA # Remove logo from indefero logo_re = re.compile(r'^.+/logo/$') @@ -19,7 +20,9 @@ def load(): # Basic rule to detect robots -def hook(hits): +def hook(iwla): + hits = iwla.getCurrentVisists() + for k in hits.keys(): super_hit = hits[k] From 2cb8e193d39b401d41a0fdea9602d60ee3dfc857 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 21 Nov 2014 16:57:11 +0100 Subject: [PATCH 016/195] Add default config --- default_conf.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 default_conf.py diff --git a/default_conf.py b/default_conf.py new file mode 100644 index 0000000..9faf4e9 --- /dev/null +++ b/default_conf.py @@ -0,0 +1,24 @@ +# Default configuration + +DB_ROOT = './output/' +DISPLAY_ROOT = './output/' +HOOKS_ROOT = './plugins/' + +PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/' +POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/' +DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/' +META_PATH = DB_ROOT + 'meta.db' +DB_FILENAME = 'iwla.db' + +log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ + '"$request" $status $body_bytes_sent ' +\ + '"$http_referer" "$http_user_agent"' + +time_format = '%d/%b/%Y:%H:%M:%S +0100' + +pre_analysis_hooks = [] +post_analysis_hooks = [] +display_hooks = [] + +pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] +viewed_http_codes = [200] From ed0af6e6ac4da4a3cb468eab0b959e3778bf52e9 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 21 Nov 2014 16:57:37 +0100 Subject: [PATCH 017/195] Add top visitors and reverse dns plugins --- plugins/display/top_visitors.py | 27 +++++++++++++++++++++++++++ plugins/post_analysis/reverse_dns.py | 27 +++++++++++++++++++++++++++ plugins/post_analysis/top_visitors.py | 23 +++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 plugins/display/top_visitors.py create mode 100644 plugins/post_analysis/reverse_dns.py create mode 100644 plugins/post_analysis/top_visitors.py diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py new file mode 100644 index 0000000..f058a79 --- /dev/null +++ b/plugins/display/top_visitors.py @@ -0,0 +1,27 @@ +import time +from display import * + +PLUGIN_CLASS = 'HTTP' +API_VERSION = 1 + +def get_plugins_infos(): + infos = { + 'class' : PLUGIN_CLASS, + 'min_version' : API_VERSION, + 'max_version' : -1 + } + return infos + +def load(): + return True + +def hook(iwla): + stats = iwla.getMonthStats() + index = iwla.getDisplayIndex() + table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + for super_hit in stats['top_visitors']: + row = [super_hit['remote_addr'], super_hit['viewed_pages'], super_hit['viewed_hits'], super_hit['bandwidth'], 0] + row = map(lambda(v): str(v), row) + row[4] = time.asctime(super_hit['last_access']) + table.appendRow(row) + index.appendBlock(table) diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py new file mode 100644 index 0000000..9bc5bb1 --- /dev/null +++ b/plugins/post_analysis/reverse_dns.py @@ -0,0 +1,27 @@ +import socket +from iwla import IWLA + +PLUGIN_CLASS = 'HTTP' +API_VERSION = 1 + +def get_plugins_infos(): + infos = { + 'class' : PLUGIN_CLASS, + 'min_version' : API_VERSION, + 'max_version' : -1 + } + return infos + +def load(): + socket.setdefaulttimeout(0.5) + return True + +def hook(iwla): + hits = iwla.getValidVisitors() + for (k, hit) in hits.items(): + try: + name, _, _ = socket.gethostbyaddr(k) + hit['remote_addr'] = name + except: + pass + diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py new file mode 100644 index 0000000..345b947 --- /dev/null +++ b/plugins/post_analysis/top_visitors.py @@ -0,0 +1,23 @@ +from iwla import IWLA + +PLUGIN_CLASS = 'HTTP' +API_VERSION = 1 + +def get_plugins_infos(): + infos = { + 'class' : PLUGIN_CLASS, + 'min_version' : API_VERSION, + 'max_version' : -1 + } + return infos + +def load(): + return True + +def hook(iwla): + hits = iwla.getValidVisitors() + stats = iwla.getMonthStats() + top_bandwidth = [(k,hits[k]['bandwidth']) for (k,v) in hits.items()] + top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) + stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]] + From db84036d8a7c66e8a66bffceffdf1785670b1c96 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 21 Nov 2014 16:57:56 +0100 Subject: [PATCH 018/195] Add awstats robots --- robots.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 robots.py diff --git a/robots.py b/robots.py new file mode 100644 index 0000000..8373f65 --- /dev/null +++ b/robots.py @@ -0,0 +1,2 @@ +awstats_robots = ['.*appie.*', '.*architext.*', '.*jeeves.*', '.*bjaaland.*', '.*contentmatch.*', '.*ferret.*', '.*googlebot.*', '.*google\-sitemaps.*', '.*gulliver.*', '.*virus[_+ ]detector.*', '.*harvest.*', '.*htdig.*', '.*linkwalker.*', '.*lilina.*', '.*lycos[_+ ].*', '.*moget.*', '.*muscatferret.*', '.*myweb.*', '.*nomad.*', '.*scooter.*', '.*slurp.*', '.*^voyager\/.*', '.*weblayers.*', '.*antibot.*', '.*bruinbot.*', '.*digout4u.*', '.*echo!.*', '.*fast\-webcrawler.*', '.*ia_archiver\-web\.archive\.org.*', '.*ia_archiver.*', '.*jennybot.*', '.*mercator.*', '.*netcraft.*', '.*msnbot\-media.*', '.*msnbot.*', '.*petersnews.*', '.*relevantnoise\.com.*', '.*unlost_web_crawler.*', '.*voila.*', '.*webbase.*', '.*webcollage.*', '.*cfetch.*', '.*zyborg.*', '.*wisenutbot.*', '.*[^a]fish.*', '.*abcdatos.*', '.*acme\.spider.*', '.*ahoythehomepagefinder.*', '.*alkaline.*', '.*anthill.*', '.*arachnophilia.*', '.*arale.*', '.*araneo.*', '.*aretha.*', '.*ariadne.*', '.*powermarks.*', '.*arks.*', '.*aspider.*', '.*atn\.txt.*', '.*atomz.*', '.*auresys.*', '.*backrub.*', '.*bbot.*', '.*bigbrother.*', '.*blackwidow.*', '.*blindekuh.*', '.*bloodhound.*', '.*borg\-bot.*', '.*brightnet.*', '.*bspider.*', '.*cactvschemistryspider.*', '.*calif[^r].*', '.*cassandra.*', '.*cgireader.*', '.*checkbot.*', '.*christcrawler.*', '.*churl.*', '.*cienciaficcion.*', '.*collective.*', '.*combine.*', '.*conceptbot.*', '.*coolbot.*', '.*core.*', '.*cosmos.*', '.*cruiser.*', '.*cusco.*', '.*cyberspyder.*', '.*desertrealm.*', '.*deweb.*', '.*dienstspider.*', '.*digger.*', '.*diibot.*', '.*direct_hit.*', '.*dnabot.*', '.*download_express.*', '.*dragonbot.*', '.*dwcp.*', '.*e\-collector.*', '.*ebiness.*', '.*elfinbot.*', '.*emacs.*', '.*emcspider.*', '.*esther.*', '.*evliyacelebi.*', '.*fastcrawler.*', '.*feedcrawl.*', '.*fdse.*', '.*felix.*', '.*fetchrover.*', '.*fido.*', '.*finnish.*', '.*fireball.*', '.*fouineur.*', '.*francoroute.*', '.*freecrawl.*', '.*funnelweb.*', '.*gama.*', '.*gazz.*', '.*gcreep.*', '.*getbot.*', '.*geturl.*', '.*golem.*', '.*gougou.*', '.*grapnel.*', '.*griffon.*', '.*gromit.*', '.*gulperbot.*', '.*hambot.*', '.*havindex.*', '.*hometown.*', '.*htmlgobble.*', '.*hyperdecontextualizer.*', '.*iajabot.*', '.*iaskspider.*', '.*hl_ftien_spider.*', '.*sogou.*', '.*iconoclast.*', '.*ilse.*', '.*imagelock.*', '.*incywincy.*', '.*informant.*', '.*infoseek.*', '.*infoseeksidewinder.*', '.*infospider.*', '.*inspectorwww.*', '.*intelliagent.*', '.*irobot.*', '.*iron33.*', '.*israelisearch.*', '.*javabee.*', '.*jbot.*', '.*jcrawler.*', '.*jobo.*', '.*jobot.*', '.*joebot.*', '.*jubii.*', '.*jumpstation.*', '.*kapsi.*', '.*katipo.*', '.*kilroy.*', '.*ko[_+ ]yappo[_+ ]robot.*', '.*kummhttp.*', '.*labelgrabber\.txt.*', '.*larbin.*', '.*legs.*', '.*linkidator.*', '.*linkscan.*', '.*lockon.*', '.*logo_gif.*', '.*macworm.*', '.*magpie.*', '.*marvin.*', '.*mattie.*', '.*mediafox.*', '.*merzscope.*', '.*meshexplorer.*', '.*mindcrawler.*', '.*mnogosearch.*', '.*momspider.*', '.*monster.*', '.*motor.*', '.*muncher.*', '.*mwdsearch.*', '.*ndspider.*', '.*nederland\.zoek.*', '.*netcarta.*', '.*netmechanic.*', '.*netscoop.*', '.*newscan\-online.*', '.*nhse.*', '.*northstar.*', '.*nzexplorer.*', '.*objectssearch.*', '.*occam.*', '.*octopus.*', '.*openfind.*', '.*orb_search.*', '.*packrat.*', '.*pageboy.*', '.*parasite.*', '.*patric.*', '.*pegasus.*', '.*perignator.*', '.*perlcrawler.*', '.*phantom.*', '.*phpdig.*', '.*piltdownman.*', '.*pimptrain.*', '.*pioneer.*', '.*pitkow.*', '.*pjspider.*', '.*plumtreewebaccessor.*', '.*poppi.*', '.*portalb.*', '.*psbot.*', '.*python.*', '.*raven.*', '.*rbse.*', '.*resumerobot.*', '.*rhcs.*', '.*road_runner.*', '.*robbie.*', '.*robi.*', '.*robocrawl.*', '.*robofox.*', '.*robozilla.*', '.*roverbot.*', '.*rules.*', '.*safetynetrobot.*', '.*search\-info.*', '.*search_au.*', '.*searchprocess.*', '.*senrigan.*', '.*sgscout.*', '.*shaggy.*', '.*shaihulud.*', '.*sift.*', '.*simbot.*', '.*site\-valet.*', '.*sitetech.*', '.*skymob.*', '.*slcrawler.*', '.*smartspider.*', '.*snooper.*', '.*solbot.*', '.*speedy.*', '.*spider[_+ ]monkey.*', '.*spiderbot.*', '.*spiderline.*', '.*spiderman.*', '.*spiderview.*', '.*spry.*', '.*sqworm.*', '.*ssearcher.*', '.*suke.*', '.*sunrise.*', '.*suntek.*', '.*sven.*', '.*tach_bw.*', '.*tagyu_agent.*', '.*tailrank.*', '.*tarantula.*', '.*tarspider.*', '.*techbot.*', '.*templeton.*', '.*titan.*', '.*titin.*', '.*tkwww.*', '.*tlspider.*', '.*ucsd.*', '.*udmsearch.*', '.*universalfeedparser.*', '.*urlck.*', '.*valkyrie.*', '.*verticrawl.*', '.*victoria.*', '.*visionsearch.*', '.*voidbot.*', '.*vwbot.*', '.*w3index.*', '.*w3m2.*', '.*wallpaper.*', '.*wanderer.*', '.*wapspIRLider.*', '.*webbandit.*', '.*webcatcher.*', '.*webcopy.*', '.*webfetcher.*', '.*webfoot.*', '.*webinator.*', '.*weblinker.*', '.*webmirror.*', '.*webmoose.*', '.*webquest.*', '.*webreader.*', '.*webreaper.*', '.*websnarf.*', '.*webspider.*', '.*webvac.*', '.*webwalk.*', '.*webwalker.*', '.*webwatch.*', '.*whatuseek.*', '.*whowhere.*', '.*wired\-digital.*', '.*wmir.*', '.*wolp.*', '.*wombat.*', '.*wordpress.*', '.*worm.*', '.*woozweb.*', '.*wwwc.*', '.*wz101.*', '.*xget.*', '.*1\-more_scanner.*', '.*accoona\-ai\-agent.*', '.*activebookmark.*', '.*adamm_bot.*', '.*almaden.*', '.*aipbot.*', '.*aleadsoftbot.*', '.*alpha_search_agent.*', '.*allrati.*', '.*aport.*', '.*archive\.org_bot.*', '.*argus.*', '.*arianna\.libero\.it.*', '.*aspseek.*', '.*asterias.*', '.*awbot.*', '.*baiduspider.*', '.*becomebot.*', '.*bender.*', '.*betabot.*', '.*biglotron.*', '.*bittorrent_bot.*', '.*biz360[_+ ]spider.*', '.*blogbridge[_+ ]service.*', '.*bloglines.*', '.*blogpulse.*', '.*blogsearch.*', '.*blogshares.*', '.*blogslive.*', '.*blogssay.*', '.*bncf\.firenze\.sbn\.it\/raccolta\.txt.*', '.*bobby.*', '.*boitho\.com\-dc.*', '.*bookmark\-manager.*', '.*boris.*', '.*bumblebee.*', '.*candlelight[_+ ]favorites[_+ ]inspector.*', '.*cbn00glebot.*', '.*cerberian_drtrs.*', '.*cfnetwork.*', '.*cipinetbot.*', '.*checkweb_link_validator.*', '.*commons\-httpclient.*', '.*computer_and_automation_research_institute_crawler.*', '.*converamultimediacrawler.*', '.*converacrawler.*', '.*cscrawler.*', '.*cse_html_validator_lite_online.*', '.*cuasarbot.*', '.*cursor.*', '.*custo.*', '.*datafountains\/dmoz_downloader.*', '.*daviesbot.*', '.*daypopbot.*', '.*deepindex.*', '.*dipsie\.bot.*', '.*dnsgroup.*', '.*domainchecker.*', '.*domainsdb\.net.*', '.*dulance.*', '.*dumbot.*', '.*dumm\.de\-bot.*', '.*earthcom\.info.*', '.*easydl.*', '.*edgeio\-retriever.*', '.*ets_v.*', '.*exactseek.*', '.*extreme[_+ ]picture[_+ ]finder.*', '.*eventax.*', '.*everbeecrawler.*', '.*everest\-vulcan.*', '.*ezresult.*', '.*enteprise.*', '.*facebook.*', '.*fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de.*', '.*fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de.*', '.*matrix_s\.p\.a\._\-_fast_enterprise_crawler.*', '.*fast_enterprise_crawler.*', '.*fast\-search\-engine.*', '.*favicon.*', '.*favorg.*', '.*favorites_sweeper.*', '.*feedburner.*', '.*feedfetcher\-google.*', '.*feedflow.*', '.*feedster.*', '.*feedsky.*', '.*feedvalidator.*', '.*filmkamerabot.*', '.*findlinks.*', '.*findexa_crawler.*', '.*fooky\.com\/ScorpionBot.*', '.*g2crawler.*', '.*gaisbot.*', '.*geniebot.*', '.*gigabot.*', '.*girafabot.*', '.*global_fetch.*', '.*gnodspider.*', '.*goforit\.com.*', '.*goforitbot.*', '.*gonzo.*', '.*grub.*', '.*gpu_p2p_crawler.*', '.*henrythemiragorobot.*', '.*heritrix.*', '.*holmes.*', '.*hoowwwer.*', '.*hpprint.*', '.*htmlparser.*', '.*html[_+ ]link[_+ ]validator.*', '.*httrack.*', '.*hundesuche\.com\-bot.*', '.*ichiro.*', '.*iltrovatore\-setaccio.*', '.*infobot.*', '.*infociousbot.*', '.*infomine.*', '.*insurancobot.*', '.*internet[_+ ]ninja.*', '.*internetarchive.*', '.*internetseer.*', '.*internetsupervision.*', '.*irlbot.*', '.*isearch2006.*', '.*iupui_research_bot.*', '.*jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility.*', '.*justview.*', '.*kalambot.*', '.*kamano\.de_newsfeedverzeichnis.*', '.*kazoombot.*', '.*kevin.*', '.*keyoshid.*', '.*kinjabot.*', '.*kinja\-imagebot.*', '.*knowitall.*', '.*knowledge\.com.*', '.*kouaa_krawler.*', '.*krugle.*', '.*ksibot.*', '.*kurzor.*', '.*lanshanbot.*', '.*letscrawl\.com.*', '.*libcrawl.*', '.*linkbot.*', '.*link_valet_online.*', '.*metager\-linkchecker.*', '.*linkchecker.*', '.*livejournal\.com.*', '.*lmspider.*', '.*lwp\-request.*', '.*lwp\-trivial.*', '.*magpierss.*', '.*mail\.ru.*', '.*mapoftheinternet\.com.*', '.*mediapartners\-google.*', '.*megite.*', '.*metaspinner.*', '.*microsoft[_+ ]url[_+ ]control.*', '.*mini\-reptile.*', '.*minirank.*', '.*missigua_locator.*', '.*misterbot.*', '.*miva.*', '.*mizzu_labs.*', '.*mj12bot.*', '.*mojeekbot.*', '.*msiecrawler.*', '.*ms_search_4\.0_robot.*', '.*msrabot.*', '.*msrbot.*', '.*mt::telegraph::agent.*', '.*nagios.*', '.*nasa_search.*', '.*mydoyouhike.*', '.*netluchs.*', '.*netsprint.*', '.*newsgatoronline.*', '.*nicebot.*', '.*nimblecrawler.*', '.*noxtrumbot.*', '.*npbot.*', '.*nutchcvs.*', '.*nutchosu\-vlib.*', '.*nutch.*', '.*ocelli.*', '.*octora_beta_bot.*', '.*omniexplorer[_+ ]bot.*', '.*onet\.pl[_+ ]sa.*', '.*onfolio.*', '.*opentaggerbot.*', '.*openwebspider.*', '.*oracle_ultra_search.*', '.*orbiter.*', '.*yodaobot.*', '.*qihoobot.*', '.*passwordmaker\.org.*', '.*pear_http_request_class.*', '.*peerbot.*', '.*perman.*', '.*php[_+ ]version[_+ ]tracker.*', '.*pictureofinternet.*', '.*ping\.blo\.gs.*', '.*plinki.*', '.*pluckfeedcrawler.*', '.*pogodak.*', '.*pompos.*', '.*popdexter.*', '.*port_huron_labs.*', '.*postfavorites.*', '.*projectwf\-java\-test\-crawler.*', '.*proodlebot.*', '.*pyquery.*', '.*rambler.*', '.*redalert.*', '.*rojo.*', '.*rssimagesbot.*', '.*ruffle.*', '.*rufusbot.*', '.*sandcrawler.*', '.*sbider.*', '.*schizozilla.*', '.*scumbot.*', '.*searchguild[_+ ]dmoz[_+ ]experiment.*', '.*seekbot.*', '.*sensis_web_crawler.*', '.*seznambot.*', '.*shim\-crawler.*', '.*shoutcast.*', '.*slysearch.*', '.*snap\.com_beta_crawler.*', '.*sohu\-search.*', '.*sohu.*', '.*snappy.*', '.*sphere_scout.*', '.*spip.*', '.*sproose_crawler.*', '.*steeler.*', '.*steroid__download.*', '.*suchfin\-bot.*', '.*superbot.*', '.*surveybot.*', '.*susie.*', '.*syndic8.*', '.*syndicapi.*', '.*synoobot.*', '.*tcl_http_client_package.*', '.*technoratibot.*', '.*teragramcrawlersurf.*', '.*test_crawler.*', '.*testbot.*', '.*t\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e.*', '.*topicblogs.*', '.*turnitinbot.*', '.*turtlescanner.*', '.*turtle.*', '.*tutorgigbot.*', '.*twiceler.*', '.*ubicrawler.*', '.*ultraseek.*', '.*unchaos_bot_hybrid_web_search_engine.*', '.*unido\-bot.*', '.*updated.*', '.*ustc\-semantic\-group.*', '.*vagabondo\-wap.*', '.*vagabondo.*', '.*vermut.*', '.*versus_crawler_from_eda\.baykan@epfl\.ch.*', '.*vespa_crawler.*', '.*vortex.*', '.*vse\/.*', '.*w3c\-checklink.*', '.*w3c[_+ ]css[_+ ]validator[_+ ]jfouffa.*', '.*w3c_validator.*', '.*watchmouse.*', '.*wavefire.*', '.*webclipping\.com.*', '.*webcompass.*', '.*webcrawl\.net.*', '.*web_downloader.*', '.*webdup.*', '.*webfilter.*', '.*webindexer.*', '.*webminer.*', '.*website[_+ ]monitoring[_+ ]bot.*', '.*webvulncrawl.*', '.*wells_search.*', '.*wonderer.*', '.*wume_crawler.*', '.*wwweasel.*', '.*xenu\'s_link_sleuth.*', '.*xenu_link_sleuth.*', '.*xirq.*', '.*y!j.*', '.*yacy.*', '.*yahoo\-blogs.*', '.*yahoo\-verticalcrawler.*', '.*yahoofeedseeker.*', '.*yahooseeker\-testing.*', '.*yahooseeker.*', '.*yahoo\-mmcrawler.*', '.*yahoo!_mindset.*', '.*yandex.*', '.*flexum.*', '.*yanga.*', '.*yooglifetchagent.*', '.*z\-add_link_checker.*', '.*zealbot.*', '.*zhuaxia.*', '.*zspider.*', '.*zeus.*', '.*ng\/1\..*', '.*ng\/2\..*', '.*exabot.*', '.*wget.*', '.*libwww.*', '.*java\/[0-9].*'] + From 38c041126d1b1604ec47b64c5591b92a69e121b6 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sat, 22 Nov 2014 19:23:56 +0100 Subject: [PATCH 019/195] Plugins management seems ok --- default_conf.py | 8 ++++---- iwla.py | 16 ++++++++++++---- plugins/display/top_visitors.py | 5 +++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/default_conf.py b/default_conf.py index 9faf4e9..074a9e6 100644 --- a/default_conf.py +++ b/default_conf.py @@ -2,11 +2,11 @@ DB_ROOT = './output/' DISPLAY_ROOT = './output/' -HOOKS_ROOT = './plugins/' +HOOKS_ROOT = 'plugins' -PRE_HOOK_DIRECTORY = HOOKS_ROOT + 'pre_analysis/' -POST_HOOK_DIRECTORY = HOOKS_ROOT + 'post_analysis/' -DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + 'display/' +PRE_HOOK_DIRECTORY = HOOKS_ROOT + '.pre_analysis' +POST_HOOK_DIRECTORY = HOOKS_ROOT + '.post_analysis' +DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + '.display' META_PATH = DB_ROOT + 'meta.db' DB_FILENAME = 'iwla.db' diff --git a/iwla.py b/iwla.py index e8a93d7..af8d705 100755 --- a/iwla.py +++ b/iwla.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys import os import re import time @@ -7,6 +8,7 @@ import glob import imp import pickle import gzip +import importlib from display import * @@ -41,10 +43,16 @@ class IWLA(object): ret = True for root in self.plugins.keys(): for plugin_name in self.plugins[root]: - p = root + '/' + plugin_name + #p = root + '/' + plugin_name + p = root + '.' + plugin_name try: - fp, pathname, description = imp.find_module(plugin_name, [root]) - self.cache_plugins[p] = imp.load_module(p, fp, pathname, description) + # fp, pathname, description = imp.find_module(plugin_name, [root]) + # self.cache_plugins[p] = imp.load_module(p, fp, pathname, description) + #p = 'plugins.display.top_visitors' + #sys.path.append(root) + #self.cache_plugins[p] = importlib.import_module(plugin_name, root) + #sys.path.remove(root) + self.cache_plugins[p] = importlib.import_module(p) mod = self.cache_plugins[p] infos = mod.get_plugins_infos() if infos['class'] != IWLA.ANALYSIS_CLASS or \ @@ -122,7 +130,7 @@ class IWLA(object): print '==> Call plugins (%s)' % root for p in self.plugins[root]: print '\t%s' % (p) - mod = self.cache_plugins[root + '/' + p] + mod = self.cache_plugins[root + '.' + p] mod.hook(*args) def isPage(self, request): diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index f058a79..c4db4f8 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -17,6 +17,11 @@ def load(): def hook(iwla): stats = iwla.getMonthStats() + + if not 'top_visitors' in stats.keys(): + print 'Top visitors post analysis plugin not installed' + return + index = iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) for super_hit in stats['top_visitors']: From 670f0249053a9a265fff0c80ffadee6100e5fb1c Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 24 Nov 2014 13:44:04 +0100 Subject: [PATCH 020/195] Add bytesToStr() Automatically convert list into strings in appendRow() Add package information --- display.py | 20 +++++++++++++++++++- iwla.py | 19 +++++++++++-------- plugins/__init__.py | 2 ++ plugins/display/__init__.py | 1 + plugins/display/top_visitors.py | 15 ++++++++++----- plugins/post_analysis/__init__.py | 1 + plugins/post_analysis/reverse_dns.py | 3 +++ plugins/pre_analysis/__init__.py | 1 + 8 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 plugins/__init__.py create mode 100644 plugins/display/__init__.py create mode 100644 plugins/post_analysis/__init__.py create mode 100644 plugins/pre_analysis/__init__.py diff --git a/display.py b/display.py index 6ddf1f8..8356e49 100644 --- a/display.py +++ b/display.py @@ -15,7 +15,7 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.rows = [] def appendRow(self, row): - self.rows.append(row) + self.rows.append(listToStr(row)) def build(self, f): f.write('') @@ -68,3 +68,21 @@ class DisplayHTMLBuild(object): def build(self, root): for page in self.pages: page.build(root) + +def bytesToStr(bytes): + suffixes = ['', ' kB', ' MB', ' GB', ' TB'] + + for i in range(0, len(suffixes)): + if bytes < 1024: break + bytes /= 1024.0 + + if i: + return '%.02f%s' % (bytes, suffixes[i]) + else: + return '%d%s' % (bytes, suffixes[i]) + +def _toStr(v): + if type(v) != str: return str(v) + else: return v + +def listToStr(l): return map(lambda(v) : _toStr(v), l) diff --git a/iwla.py b/iwla.py index af8d705..b7c4072 100755 --- a/iwla.py +++ b/iwla.py @@ -237,8 +237,8 @@ class IWLA(object): nb_visits = 0 for k in keys: stats = self.current_analysis['days_stats'][k] - row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] - row = map(lambda(v): str(v), row) + row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + bytesToStr(stats['viewed_bandwidth']), bytesToStr(stats['not_viewed_bandwidth'])] days.appendRow(row) nb_visits += stats['nb_visitors'] @@ -247,15 +247,18 @@ class IWLA(object): nb_days = len(keys) row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] if nb_days: - row = map(lambda(v): str(int(v/nb_days)), row) + average_row = map(lambda(v): str(int(v/nb_days)), row) else: - row = map(lambda(v): '0', row) + average_row = map(lambda(v): '0', row) - row[0] = 'Average' - days.appendRow(row) + average_row[0] = 'Average' + average_row[4] = bytesToStr(row[4]) + average_row[5] = bytesToStr(row[5]) + days.appendRow(average_row) - row = ['Total', nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] - row = map(lambda(v): str(v), row) + row[0] = 'Total' + row[4] = bytesToStr(row[4]) + row[5] = bytesToStr(row[5]) days.appendRow(row) page.appendBlock(days) self.display.addPage(page) diff --git a/plugins/__init__.py b/plugins/__init__.py new file mode 100644 index 0000000..bd0daba --- /dev/null +++ b/plugins/__init__.py @@ -0,0 +1,2 @@ + +__all__ = ['pre_analysis', 'post_analysis', 'display'] diff --git a/plugins/display/__init__.py b/plugins/display/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/display/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index c4db4f8..796af31 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -18,15 +18,20 @@ def load(): def hook(iwla): stats = iwla.getMonthStats() - if not 'top_visitors' in stats.keys(): + top_visitors = stats.get('top_visitors', None) + if not top_visitors: print 'Top visitors post analysis plugin not installed' return index = iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - for super_hit in stats['top_visitors']: - row = [super_hit['remote_addr'], super_hit['viewed_pages'], super_hit['viewed_hits'], super_hit['bandwidth'], 0] - row = map(lambda(v): str(v), row) - row[4] = time.asctime(super_hit['last_access']) + for super_hit in top_visitors: + row = [ + super_hit['remote_addr'], + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] table.appendRow(row) index.appendBlock(table) diff --git a/plugins/post_analysis/__init__.py b/plugins/post_analysis/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/post_analysis/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 9bc5bb1..b935efa 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -19,9 +19,12 @@ def load(): def hook(iwla): hits = iwla.getValidVisitors() for (k, hit) in hits.items(): + if hit.get('dns_analysed', False): continue try: name, _, _ = socket.gethostbyaddr(k) hit['remote_addr'] = name except: pass + finally: + hit['dns_analysed'] = True diff --git a/plugins/pre_analysis/__init__.py b/plugins/pre_analysis/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/pre_analysis/__init__.py @@ -0,0 +1 @@ +# From 21a95cc2fab7a3ff5d48ee09ccaef59f8f7e0ff6 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 24 Nov 2014 17:13:59 +0100 Subject: [PATCH 021/195] Rework plugins with classes --- conf.py | 2 +- iplugin.py | 82 +++++++++++++++++++++++++++ iwla.py | 10 +--- plugins/display/top_visitors.py | 54 +++++++----------- plugins/post_analysis/reverse_dns.py | 42 ++++++-------- plugins/post_analysis/top_visitors.py | 30 ++++------ plugins/pre_analysis/H001_robot.py | 68 ---------------------- plugins/pre_analysis/H002_soutade.py | 38 ------------- plugins/pre_analysis/robots.py | 64 +++++++++++++++++++++ plugins/pre_analysis/soutade.py | 35 ++++++++++++ 10 files changed, 234 insertions(+), 191 deletions(-) create mode 100644 iplugin.py delete mode 100644 plugins/pre_analysis/H001_robot.py delete mode 100644 plugins/pre_analysis/H002_soutade.py create mode 100644 plugins/pre_analysis/robots.py create mode 100644 plugins/pre_analysis/soutade.py diff --git a/conf.py b/conf.py index 7bf2c3b..76981bb 100644 --- a/conf.py +++ b/conf.py @@ -11,7 +11,7 @@ analyzed_filename = 'access.log' DB_ROOT = './output/' DISPLAY_ROOT = './output/' -pre_analysis_hooks = ['H002_soutade', 'H001_robot'] +pre_analysis_hooks = ['soutade', 'robots'] post_analysis_hooks = ['top_visitors', 'reverse_dns'] display_hooks = ['top_visitors'] diff --git a/iplugin.py b/iplugin.py new file mode 100644 index 0000000..e2701ae --- /dev/null +++ b/iplugin.py @@ -0,0 +1,82 @@ +import importlib +import inspect +import traceback + +class IPlugin(object): + + def __init__(self, iwla): + self.iwla = iwla + self.requires = [] + self.API_VERSION = 1 + self.ANALYSIS_CLASS = 'HTTP' + + def isValid(self, analysis_class, api_version): + if analysis_class != self.ANALYSIS_CLASS: return False + + # For now there is only version 1 + if self.API_VERSION != api_version: + return False + + return True + + def getRequirements(self): + return self.requires + + def load(self): + return True + + def hook(self, iwla): + pass + +def preloadPlugins(plugins, iwla): + cache_plugins = {} + + for root in plugins.keys(): + for plugin_filename in plugins[root]: + plugin_path = root + '.' + plugin_filename + try: + mod = importlib.import_module(plugin_path) + classes = [c for _,c in inspect.getmembers(mod)\ + if inspect.isclass(c) and \ + issubclass(c, IPlugin) and \ + c.__name__ != 'IPlugin' + ] + + if not classes: + print 'No plugin defined in %s' % (plugin_path) + continue + + plugin = classes[0](iwla) + plugin_name = plugin.__class__.__name__ + + if not plugin.isValid(iwla.ANALYSIS_CLASS, iwla.API_VERSION): + #print 'Plugin not valid %s' % (plugin_filename) + continue + + #print 'Load plugin %s' % (plugin_name) + + requirements = plugin.getRequirements() + + if requirements: + requirement_validated = False + for r in requirements: + for (_,p) in cache_plugins.items(): + if p.__class__.__name__ == r: + requirement_validated = True + break + if not requirement_validated: + print 'Missing requirements for plugin %s' % (plugin_path) + break + if not requirement_validated: continue + + if not plugin.load(): + print 'Plugin %s load failed' % (plugin_path) + continue + + print '\tRegister %s' % (plugin_path) + cache_plugins[plugin_path] = plugin + except Exception as e: + print 'Error loading \'%s\' => %s' % (plugin_path, e) + traceback.print_exc() + + return cache_plugins diff --git a/iwla.py b/iwla.py index b7c4072..5c69a6e 100755 --- a/iwla.py +++ b/iwla.py @@ -10,6 +10,7 @@ import pickle import gzip import importlib +from iplugin import * from display import * from default_conf import * @@ -40,18 +41,13 @@ class IWLA(object): DISPLAY_HOOK_DIRECTORY : display_hooks} def _preloadPlugins(self): + self.cache_plugins = preloadPlugins(self.plugins, self) + return ret = True for root in self.plugins.keys(): for plugin_name in self.plugins[root]: - #p = root + '/' + plugin_name p = root + '.' + plugin_name try: - # fp, pathname, description = imp.find_module(plugin_name, [root]) - # self.cache_plugins[p] = imp.load_module(p, fp, pathname, description) - #p = 'plugins.display.top_visitors' - #sys.path.append(root) - #self.cache_plugins[p] = importlib.import_module(plugin_name, root) - #sys.path.remove(root) self.cache_plugins[p] = importlib.import_module(p) mod = self.cache_plugins[p] infos = mod.get_plugins_infos() diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 796af31..93f455a 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -1,37 +1,27 @@ import time + +from iwla import IWLA +from iplugin import IPlugin from display import * -PLUGIN_CLASS = 'HTTP' -API_VERSION = 1 +class IWLADisplayTopVisitors(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopVisitors, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopVisitors'] -def get_plugins_infos(): - infos = { - 'class' : PLUGIN_CLASS, - 'min_version' : API_VERSION, - 'max_version' : -1 - } - return infos + def hook(self, iwla): + stats = iwla.getMonthStats() -def load(): - return True - -def hook(iwla): - stats = iwla.getMonthStats() - - top_visitors = stats.get('top_visitors', None) - if not top_visitors: - print 'Top visitors post analysis plugin not installed' - return - - index = iwla.getDisplayIndex() - table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - for super_hit in top_visitors: - row = [ - super_hit['remote_addr'], - super_hit['viewed_pages'], - super_hit['viewed_hits'], - bytesToStr(super_hit['bandwidth']), - time.asctime(super_hit['last_access']) - ] - table.appendRow(row) - index.appendBlock(table) + index = iwla.getDisplayIndex() + table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + for super_hit in stats['top_visitors']: + row = [ + super_hit['remote_addr'], + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] + table.appendRow(row) + index.appendBlock(table) diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index b935efa..10b3903 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -1,30 +1,20 @@ -import socket from iwla import IWLA +from iplugin import IPlugin -PLUGIN_CLASS = 'HTTP' -API_VERSION = 1 +class IWLAPostAnalysisReverseDNS(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisReverseDNS, self).__init__(iwla) + self.API_VERSION = 1 -def get_plugins_infos(): - infos = { - 'class' : PLUGIN_CLASS, - 'min_version' : API_VERSION, - 'max_version' : -1 - } - return infos - -def load(): - socket.setdefaulttimeout(0.5) - return True - -def hook(iwla): - hits = iwla.getValidVisitors() - for (k, hit) in hits.items(): - if hit.get('dns_analysed', False): continue - try: - name, _, _ = socket.gethostbyaddr(k) - hit['remote_addr'] = name - except: - pass - finally: - hit['dns_analysed'] = True + def hook(self, iwla): + hits = iwla.getValidVisitors() + for (k, hit) in hits.items(): + if hit.get('dns_analysed', False): continue + try: + name, _, _ = socket.gethostbyaddr(k) + hit['remote_addr'] = name + except: + pass + finally: + hit['dns_analysed'] = True diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py index 345b947..c7de05b 100644 --- a/plugins/post_analysis/top_visitors.py +++ b/plugins/post_analysis/top_visitors.py @@ -1,23 +1,15 @@ from iwla import IWLA +from iplugin import IPlugin -PLUGIN_CLASS = 'HTTP' -API_VERSION = 1 +class IWLAPostAnalysisTopVisitors(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopVisitors, self).__init__(iwla) + self.API_VERSION = 1 -def get_plugins_infos(): - infos = { - 'class' : PLUGIN_CLASS, - 'min_version' : API_VERSION, - 'max_version' : -1 - } - return infos - -def load(): - return True - -def hook(iwla): - hits = iwla.getValidVisitors() - stats = iwla.getMonthStats() - top_bandwidth = [(k,hits[k]['bandwidth']) for (k,v) in hits.items()] - top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) - stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]] + def hook(self, iwla): + hits = iwla.getValidVisitors() + stats = iwla.getMonthStats() + top_bandwidth = [(k,hits[k]['bandwidth']) for (k,v) in hits.items()] + top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) + stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]] diff --git a/plugins/pre_analysis/H001_robot.py b/plugins/pre_analysis/H001_robot.py deleted file mode 100644 index a299fa5..0000000 --- a/plugins/pre_analysis/H001_robot.py +++ /dev/null @@ -1,68 +0,0 @@ -import re -from iwla import IWLA - -from awstats_robots_data import awstats_robots - -PLUGIN_CLASS = 'HTTP' -API_VERSION = 1 - -def get_plugins_infos(): - infos = {'class' : PLUGIN_CLASS, - 'min_version' : API_VERSION, - 'max_version' : -1} - return infos - -def load(): - global awstats_robots - print '==> Generating robot dictionary' - - awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) - - return True - -# Basic rule to detect robots - -def hook(iwla): - hits = iwla.getCurrentVisists() - for k in hits.keys(): - super_hit = hits[k] - - if super_hit['robot']: continue - - isRobot = False - referers = 0 - - first_page = super_hit['requests'][0] - if first_page['time_decoded'].tm_mday == super_hit['last_access'].tm_mday: - for r in awstats_robots: - if r.match(first_page['http_user_agent']): - super_hit['robot'] = 1 - continue - -# 1) no pages view --> robot - if not super_hit['viewed_pages']: - super_hit['robot'] = 1 - continue - -# 2) pages without hit --> robot - if not super_hit['viewed_hits']: - super_hit['robot'] = 1 - continue - - for hit in super_hit['requests']: -# 3) /robots.txt read - if hit['extract_request']['http_uri'] == '/robots.txt': - isRobot = True - break - -# 4) Any referer for hits - if not hit['is_page'] and hit['http_referer']: - referers += 1 - - if isRobot: - super_hit['robot'] = 1 - continue - - if super_hit['viewed_hits'] and not referers: - super_hit['robot'] = 1 - continue diff --git a/plugins/pre_analysis/H002_soutade.py b/plugins/pre_analysis/H002_soutade.py deleted file mode 100644 index b893715..0000000 --- a/plugins/pre_analysis/H002_soutade.py +++ /dev/null @@ -1,38 +0,0 @@ -import re -from iwla import IWLA - -# Remove logo from indefero -logo_re = re.compile(r'^.+/logo/$') - -PLUGIN_CLASS = 'HTTP' -API_VERSION = 1 - -def get_plugins_infos(): - infos = { - 'class' : PLUGIN_CLASS, - 'min_version' : API_VERSION, - 'max_version' : -1 - } - return infos - -def load(): - return True - -# Basic rule to detect robots - -def hook(iwla): - hits = iwla.getCurrentVisists() - - for k in hits.keys(): - super_hit = hits[k] - - if super_hit['robot']: continue - - for p in super_hit['requests']: - if not p['is_page']: continue - if int(p['status']) != 200: continue - if p['time_decoded'].tm_mday != super_hit['last_access'].tm_mday: continue - if logo_re.match(p['extract_request']['extract_uri']): - p['is_page'] = False - super_hit['viewed_pages'] -= 1 - super_hit['viewed_hits'] += 1 diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py new file mode 100644 index 0000000..596552e --- /dev/null +++ b/plugins/pre_analysis/robots.py @@ -0,0 +1,64 @@ +import re + +from iwla import IWLA +from iplugin import IPlugin + +from awstats_robots_data import awstats_robots + +class IWLAPreAnalysisRobots(IPlugin): + def __init__(self, iwla): + super(IWLAPreAnalysisRobots, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + global awstats_robots + + self.awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) + + return True + +# Basic rule to detect robots + def hook(self, iwla): + hits = iwla.getCurrentVisists() + for k in hits.keys(): + super_hit = hits[k] + + if super_hit['robot']: continue + + isRobot = False + referers = 0 + + first_page = super_hit['requests'][0] + if first_page['time_decoded'].tm_mday == super_hit['last_access'].tm_mday: + for r in self.awstats_robots: + if r.match(first_page['http_user_agent']): + super_hit['robot'] = 1 + continue + +# 1) no pages view --> robot + if not super_hit['viewed_pages']: + super_hit['robot'] = 1 + continue + +# 2) pages without hit --> robot + if not super_hit['viewed_hits']: + super_hit['robot'] = 1 + continue + + for hit in super_hit['requests']: +# 3) /robots.txt read + if hit['extract_request']['http_uri'] == '/robots.txt': + isRobot = True + break + +# 4) Any referer for hits + if not hit['is_page'] and hit['http_referer']: + referers += 1 + + if isRobot: + super_hit['robot'] = 1 + continue + + if super_hit['viewed_hits'] and not referers: + super_hit['robot'] = 1 + continue diff --git a/plugins/pre_analysis/soutade.py b/plugins/pre_analysis/soutade.py new file mode 100644 index 0000000..0ec4e69 --- /dev/null +++ b/plugins/pre_analysis/soutade.py @@ -0,0 +1,35 @@ +import re + +from iwla import IWLA +from iplugin import IPlugin + +# Basic rule to detect robots + +class IWLAPreAnalysisSoutade(IPlugin): + + def __init__(self, iwla): + super(IWLAPreAnalysisSoutade, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): +# Remove logo from indefero + self.logo_re = re.compile(r'^.+/logo/$') + + return True + + def hook(self, iwla): + hits = iwla.getCurrentVisists() + + for k in hits.keys(): + super_hit = hits[k] + + if super_hit['robot']: continue + + for p in super_hit['requests']: + if not p['is_page']: continue + if int(p['status']) != 200: continue + if p['time_decoded'].tm_mday != super_hit['last_access'].tm_mday: continue + if self.logo_re.match(p['extract_request']['extract_uri']): + p['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 From 549c0e5d973d1cd1ed2eab70ade49fe59feb742d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 24 Nov 2014 21:37:37 +0100 Subject: [PATCH 022/195] Update conf management --- conf.py | 5 ++- iplugin.py | 16 ++++++- iwla.py | 64 +++++++++------------------ plugins/display/top_visitors.py | 4 +- plugins/post_analysis/reverse_dns.py | 11 ++++- plugins/post_analysis/top_visitors.py | 4 +- plugins/pre_analysis/robots.py | 4 +- plugins/pre_analysis/soutade.py | 4 +- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/conf.py b/conf.py index 76981bb..e491559 100644 --- a/conf.py +++ b/conf.py @@ -1,7 +1,7 @@ log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ - '"$request" $status $body_bytes_sent ' +\ - '"$http_referer" "$http_user_agent"'; + '"$request" $status $body_bytes_sent ' +\ + '"$http_referer" "$http_user_agent"'; #09/Nov/2014:06:35:16 +0100 time_format = '%d/%b/%Y:%H:%M:%S +0100' @@ -15,6 +15,7 @@ pre_analysis_hooks = ['soutade', 'robots'] post_analysis_hooks = ['top_visitors', 'reverse_dns'] display_hooks = ['top_visitors'] +reverse_dns_timeout = 0.2 # pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] # post_analysis_hooks = ['top_visitors.py'] # display_hooks = ['top_visitors.py'] diff --git a/iplugin.py b/iplugin.py index e2701ae..ce0235d 100644 --- a/iplugin.py +++ b/iplugin.py @@ -2,10 +2,16 @@ import importlib import inspect import traceback +import default_conf as conf +import conf as _ +conf.__dict__.update(_.__dict__) +del _ + class IPlugin(object): - def __init__(self, iwla): + def __init__(self, iwla, conf): self.iwla = iwla + self.conf = conf self.requires = [] self.API_VERSION = 1 self.ANALYSIS_CLASS = 'HTTP' @@ -19,6 +25,12 @@ class IPlugin(object): return True + def getConfValue(self, key, default): + if not key in dir(self.conf): + return default + else: + return self.conf.__dict__[key] + def getRequirements(self): return self.requires @@ -46,7 +58,7 @@ def preloadPlugins(plugins, iwla): print 'No plugin defined in %s' % (plugin_path) continue - plugin = classes[0](iwla) + plugin = classes[0](iwla, conf) plugin_name = plugin.__class__.__name__ if not plugin.isValid(iwla.ANALYSIS_CLASS, iwla.API_VERSION): diff --git a/iwla.py b/iwla.py index 5c69a6e..45d8060 100755 --- a/iwla.py +++ b/iwla.py @@ -10,12 +10,14 @@ import pickle import gzip import importlib +import default_conf as conf +import conf as _ +conf.__dict__.update(_.__dict__) +del _ + from iplugin import * from display import * -from default_conf import * -from conf import * - class IWLA(object): ANALYSIS_CLASS = 'HTTP' @@ -31,36 +33,14 @@ class IWLA(object): self.display = DisplayHTMLBuild() self.valid_visitors = None - self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format) + self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', conf.log_format) self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted) self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') self.log_re = re.compile(self.log_format_extracted) self.uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') - self.plugins = {PRE_HOOK_DIRECTORY : pre_analysis_hooks, - POST_HOOK_DIRECTORY : post_analysis_hooks, - DISPLAY_HOOK_DIRECTORY : display_hooks} - - def _preloadPlugins(self): - self.cache_plugins = preloadPlugins(self.plugins, self) - return - ret = True - for root in self.plugins.keys(): - for plugin_name in self.plugins[root]: - p = root + '.' + plugin_name - try: - self.cache_plugins[p] = importlib.import_module(p) - mod = self.cache_plugins[p] - infos = mod.get_plugins_infos() - if infos['class'] != IWLA.ANALYSIS_CLASS or \ - IWLA.API_VERSION < infos['min_version'] or\ - (infos['max_version'] != -1 and (IWLA.API_VERSION > infos['max_version'])): - del self.cache_plugins[p] - elif not mod.load(): - del self.cache_plugins[p] - except Exception as e: - print 'Error loading \'%s\' => %s' % (p, e) - ret = False - return ret + self.plugins = {conf.PRE_HOOK_DIRECTORY : conf.pre_analysis_hooks, + conf.POST_HOOK_DIRECTORY : conf.post_analysis_hooks, + conf.DISPLAY_HOOK_DIRECTORY : conf.display_hooks} def _clearVisits(self): self.current_analysis = { @@ -97,7 +77,7 @@ class IWLA(object): return self.display def getDBFilename(self, time): - return (DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, DB_FILENAME) + return (conf.DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, conf.DB_FILENAME) def _serialize(self, obj, filename): base = os.path.dirname(filename) @@ -105,7 +85,7 @@ class IWLA(object): os.makedirs(base) # TODO : remove return - return + #return with open(filename + '.tmp', 'wb+') as f: pickle.dump(obj, f) @@ -130,7 +110,7 @@ class IWLA(object): mod.hook(*args) def isPage(self, request): - for e in pages_extensions: + for e in conf.pages_extensions: if request.endswith(e): return True @@ -162,7 +142,7 @@ class IWLA(object): if status >= 300 and status < 400: return if super_hit['robot'] or\ - not status in viewed_http_codes: + not status in conf.viewed_http_codes: page_key = 'not_viewed_pages' hit_key = 'not_viewed_hits' else: @@ -211,7 +191,7 @@ class IWLA(object): return True def _decodeTime(self, hit): - hit['time_decoded'] = time.strptime(hit['time_local'], time_format) + hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format) def getDisplayIndex(self): cur_time = self.meta_infos['last_time'] @@ -261,8 +241,8 @@ class IWLA(object): def _generateDisplay(self): self._generateDisplayDaysStat() - self._callPlugins(DISPLAY_HOOK_DIRECTORY, self) - self.display.build(DISPLAY_ROOT) + self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY, self) + self.display.build(conf.DISPLAY_ROOT) def _generateStats(self, visits): stats = {} @@ -308,7 +288,7 @@ class IWLA(object): self.current_analysis['month_stats'] = stats self.valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} - self._callPlugins(POST_HOOK_DIRECTORY, self) + self._callPlugins(conf.POST_HOOK_DIRECTORY, self) path = self.getDBFilename(cur_time) if os.path.exists(path): @@ -323,7 +303,7 @@ class IWLA(object): def _generateDayStats(self): visits = self.current_analysis['visits'] - self._callPlugins(PRE_HOOK_DIRECTORY, self) + self._callPlugins(conf.PRE_HOOK_DIRECTORY, self) stats = self._generateStats(visits) @@ -382,17 +362,17 @@ class IWLA(object): return True def start(self): - self._preloadPlugins() + self.cache_plugins = preloadPlugins(self.plugins, self) print '==> Analysing log' - self.meta_infos = self._deserialize(META_PATH) or self._clearMeta() + self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() if self.meta_infos['last_time']: self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() else: self._clearVisits() - with open(analyzed_filename) as f: + with open(conf.analyzed_filename) as f: for l in f: # print "line " + l @@ -408,7 +388,7 @@ class IWLA(object): if self.analyse_started: self._generateDayStats() self._generateMonthStats() - self._serialize(self.meta_infos, META_PATH) + self._serialize(self.meta_infos, conf.META_PATH) else: print '==> Analyse not started : nothing to do' self._generateMonthStats() diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 93f455a..6e9acda 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -5,8 +5,8 @@ from iplugin import IPlugin from display import * class IWLADisplayTopVisitors(IPlugin): - def __init__(self, iwla): - super(IWLADisplayTopVisitors, self).__init__(iwla) + def __init__(self, iwla, conf): + super(IWLADisplayTopVisitors, self).__init__(iwla, conf) self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisTopVisitors'] diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 10b3903..14cd434 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -1,11 +1,18 @@ +import socket + from iwla import IWLA from iplugin import IPlugin class IWLAPostAnalysisReverseDNS(IPlugin): - def __init__(self, iwla): - super(IWLAPostAnalysisReverseDNS, self).__init__(iwla) + def __init__(self, iwla, conf): + super(IWLAPostAnalysisReverseDNS, self).__init__(iwla, conf) self.API_VERSION = 1 + def load(self): + timeout = self.getConfValue('reverse_dns_timeout', 0.5) + socket.setdefaulttimeout(timeout) + return True + def hook(self, iwla): hits = iwla.getValidVisitors() for (k, hit) in hits.items(): diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py index c7de05b..525a9cd 100644 --- a/plugins/post_analysis/top_visitors.py +++ b/plugins/post_analysis/top_visitors.py @@ -2,8 +2,8 @@ from iwla import IWLA from iplugin import IPlugin class IWLAPostAnalysisTopVisitors(IPlugin): - def __init__(self, iwla): - super(IWLAPostAnalysisTopVisitors, self).__init__(iwla) + def __init__(self, iwla, conf): + super(IWLAPostAnalysisTopVisitors, self).__init__(iwla, conf) self.API_VERSION = 1 def hook(self, iwla): diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 596552e..fdafc44 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -6,8 +6,8 @@ from iplugin import IPlugin from awstats_robots_data import awstats_robots class IWLAPreAnalysisRobots(IPlugin): - def __init__(self, iwla): - super(IWLAPreAnalysisRobots, self).__init__(iwla) + def __init__(self, iwla, conf): + super(IWLAPreAnalysisRobots, self).__init__(iwla, conf) self.API_VERSION = 1 def load(self): diff --git a/plugins/pre_analysis/soutade.py b/plugins/pre_analysis/soutade.py index 0ec4e69..5113ad6 100644 --- a/plugins/pre_analysis/soutade.py +++ b/plugins/pre_analysis/soutade.py @@ -7,8 +7,8 @@ from iplugin import IPlugin class IWLAPreAnalysisSoutade(IPlugin): - def __init__(self, iwla): - super(IWLAPreAnalysisSoutade, self).__init__(iwla) + def __init__(self, iwla, conf): + super(IWLAPreAnalysisSoutade, self).__init__(iwla, conf) self.API_VERSION = 1 def load(self): From d5db763b48b02f0f24e760e83368738c73b2475a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 24 Nov 2014 21:42:57 +0100 Subject: [PATCH 023/195] Rework conf in plugins --- iplugin.py | 16 ++-------------- iwla.py | 6 ++++++ plugins/display/top_visitors.py | 4 ++-- plugins/post_analysis/reverse_dns.py | 6 +++--- plugins/post_analysis/top_visitors.py | 4 ++-- plugins/pre_analysis/robots.py | 4 ++-- plugins/pre_analysis/soutade.py | 4 ++-- 7 files changed, 19 insertions(+), 25 deletions(-) diff --git a/iplugin.py b/iplugin.py index ce0235d..91bfdc1 100644 --- a/iplugin.py +++ b/iplugin.py @@ -2,16 +2,10 @@ import importlib import inspect import traceback -import default_conf as conf -import conf as _ -conf.__dict__.update(_.__dict__) -del _ - class IPlugin(object): - def __init__(self, iwla, conf): + def __init__(self, iwla): self.iwla = iwla - self.conf = conf self.requires = [] self.API_VERSION = 1 self.ANALYSIS_CLASS = 'HTTP' @@ -24,12 +18,6 @@ class IPlugin(object): return False return True - - def getConfValue(self, key, default): - if not key in dir(self.conf): - return default - else: - return self.conf.__dict__[key] def getRequirements(self): return self.requires @@ -58,7 +46,7 @@ def preloadPlugins(plugins, iwla): print 'No plugin defined in %s' % (plugin_path) continue - plugin = classes[0](iwla, conf) + plugin = classes[0](iwla) plugin_name = plugin.__class__.__name__ if not plugin.isValid(iwla.ANALYSIS_CLASS, iwla.API_VERSION): diff --git a/iwla.py b/iwla.py index 45d8060..054ec1a 100755 --- a/iwla.py +++ b/iwla.py @@ -42,6 +42,12 @@ class IWLA(object): conf.POST_HOOK_DIRECTORY : conf.post_analysis_hooks, conf.DISPLAY_HOOK_DIRECTORY : conf.display_hooks} + def getConfValue(self, key, default): + if not key in dir(conf): + return default + else: + return conf.__dict__[key] + def _clearVisits(self): self.current_analysis = { 'days_stats' : {}, diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 6e9acda..93f455a 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -5,8 +5,8 @@ from iplugin import IPlugin from display import * class IWLADisplayTopVisitors(IPlugin): - def __init__(self, iwla, conf): - super(IWLADisplayTopVisitors, self).__init__(iwla, conf) + def __init__(self, iwla): + super(IWLADisplayTopVisitors, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisTopVisitors'] diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 14cd434..3a5210b 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -4,12 +4,12 @@ from iwla import IWLA from iplugin import IPlugin class IWLAPostAnalysisReverseDNS(IPlugin): - def __init__(self, iwla, conf): - super(IWLAPostAnalysisReverseDNS, self).__init__(iwla, conf) + def __init__(self, iwla): + super(IWLAPostAnalysisReverseDNS, self).__init__(iwla) self.API_VERSION = 1 def load(self): - timeout = self.getConfValue('reverse_dns_timeout', 0.5) + timeout = self.iwla.getConfValue('reverse_dns_timeout', 0.5) socket.setdefaulttimeout(timeout) return True diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py index 525a9cd..c7de05b 100644 --- a/plugins/post_analysis/top_visitors.py +++ b/plugins/post_analysis/top_visitors.py @@ -2,8 +2,8 @@ from iwla import IWLA from iplugin import IPlugin class IWLAPostAnalysisTopVisitors(IPlugin): - def __init__(self, iwla, conf): - super(IWLAPostAnalysisTopVisitors, self).__init__(iwla, conf) + def __init__(self, iwla): + super(IWLAPostAnalysisTopVisitors, self).__init__(iwla) self.API_VERSION = 1 def hook(self, iwla): diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index fdafc44..596552e 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -6,8 +6,8 @@ from iplugin import IPlugin from awstats_robots_data import awstats_robots class IWLAPreAnalysisRobots(IPlugin): - def __init__(self, iwla, conf): - super(IWLAPreAnalysisRobots, self).__init__(iwla, conf) + def __init__(self, iwla): + super(IWLAPreAnalysisRobots, self).__init__(iwla) self.API_VERSION = 1 def load(self): diff --git a/plugins/pre_analysis/soutade.py b/plugins/pre_analysis/soutade.py index 5113ad6..0ec4e69 100644 --- a/plugins/pre_analysis/soutade.py +++ b/plugins/pre_analysis/soutade.py @@ -7,8 +7,8 @@ from iplugin import IPlugin class IWLAPreAnalysisSoutade(IPlugin): - def __init__(self, iwla, conf): - super(IWLAPreAnalysisSoutade, self).__init__(iwla, conf) + def __init__(self, iwla): + super(IWLAPreAnalysisSoutade, self).__init__(iwla) self.API_VERSION = 1 def load(self): From 7405cf237acfbc4fa6d4a7d5a5e3f1d6ae05b368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 25 Nov 2014 16:22:07 +0100 Subject: [PATCH 024/195] Do a more generic plugin : page_to_hit --- conf.py | 3 ++- iplugin.py | 2 ++ iwla.py | 13 +++++----- plugins/pre_analysis/page_to_hit.py | 38 +++++++++++++++++++++++++++++ plugins/pre_analysis/soutade.py | 35 -------------------------- 5 files changed, 48 insertions(+), 43 deletions(-) create mode 100644 plugins/pre_analysis/page_to_hit.py delete mode 100644 plugins/pre_analysis/soutade.py diff --git a/conf.py b/conf.py index e491559..e4c6378 100644 --- a/conf.py +++ b/conf.py @@ -11,11 +11,12 @@ analyzed_filename = 'access.log' DB_ROOT = './output/' DISPLAY_ROOT = './output/' -pre_analysis_hooks = ['soutade', 'robots'] +pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['top_visitors', 'reverse_dns'] display_hooks = ['top_visitors'] reverse_dns_timeout = 0.2 +page_to_hit_conf = [r'^.+/logo/$'] # pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] # post_analysis_hooks = ['top_visitors.py'] # display_hooks = ['top_visitors.py'] diff --git a/iplugin.py b/iplugin.py index 91bfdc1..d13e62a 100644 --- a/iplugin.py +++ b/iplugin.py @@ -31,6 +31,8 @@ class IPlugin(object): def preloadPlugins(plugins, iwla): cache_plugins = {} + print "==> Preload plugins" + for root in plugins.keys(): for plugin_filename in plugins[root]: plugin_path = root + '.' + plugin_filename diff --git a/iwla.py b/iwla.py index 054ec1a..62deb66 100755 --- a/iwla.py +++ b/iwla.py @@ -1,11 +1,8 @@ #!/usr/bin/env python -import sys import os import re import time -import glob -import imp import pickle import gzip import importlib @@ -126,7 +123,7 @@ class IWLA(object): remote_addr = hit['remote_addr'] if not remote_addr in self.current_analysis['visits'].keys(): - self._createUser(hit) + self._createVisitor(hit) return super_hit = self.current_analysis['visits'][remote_addr] @@ -160,7 +157,7 @@ class IWLA(object): else: super_hit[hit_key] += 1 - def _createUser(self, hit): + def _createVisitor(self, hit): super_hit = self.current_analysis['visits'][hit['remote_addr']] = {} super_hit['remote_addr'] = hit['remote_addr'] super_hit['viewed_pages'] = 0 @@ -347,7 +344,7 @@ class IWLA(object): else: if not self.analyse_started: if time.mktime(cur_time) >= time.mktime(t): - return + return False else: self.analyse_started = True if cur_time.tm_mon != t.tm_mon: @@ -370,7 +367,7 @@ class IWLA(object): def start(self): self.cache_plugins = preloadPlugins(self.plugins, self) - print '==> Analysing log' + print '==> Analyse previous database' self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() if self.meta_infos['last_time']: @@ -378,6 +375,8 @@ class IWLA(object): else: self._clearVisits() + print '==> Analysing log' + with open(conf.analyzed_filename) as f: for l in f: # print "line " + l diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py new file mode 100644 index 0000000..8c046b6 --- /dev/null +++ b/plugins/pre_analysis/page_to_hit.py @@ -0,0 +1,38 @@ +import re + +from iwla import IWLA +from iplugin import IPlugin + +# Basic rule to detect robots + +class IWLAPreAnalysisPageToHit(IPlugin): + + def __init__(self, iwla): + super(IWLAPreAnalysisPageToHit, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): +# Remove logo from indefero + self.regexps = self.iwla.getConfValue('page_to_hit_conf', []) + if not self.regexps: return False + self.regexps = map(lambda(r): re.compile(r), self.regexps) + + return True + + def hook(self, iwla): + hits = iwla.getCurrentVisists() + + for (k, super_hit) in hits.items(): + if super_hit['robot']: continue + + for p in super_hit['requests']: + if not p['is_page']: continue + if int(p['status']) != 200: continue + if p['time_decoded'].tm_mday != super_hit['last_access'].tm_mday: continue + uri = p['extract_request']['extract_uri'] + for r in self.regexps: + if r.match(uri): + p['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 + break diff --git a/plugins/pre_analysis/soutade.py b/plugins/pre_analysis/soutade.py deleted file mode 100644 index 0ec4e69..0000000 --- a/plugins/pre_analysis/soutade.py +++ /dev/null @@ -1,35 +0,0 @@ -import re - -from iwla import IWLA -from iplugin import IPlugin - -# Basic rule to detect robots - -class IWLAPreAnalysisSoutade(IPlugin): - - def __init__(self, iwla): - super(IWLAPreAnalysisSoutade, self).__init__(iwla) - self.API_VERSION = 1 - - def load(self): -# Remove logo from indefero - self.logo_re = re.compile(r'^.+/logo/$') - - return True - - def hook(self, iwla): - hits = iwla.getCurrentVisists() - - for k in hits.keys(): - super_hit = hits[k] - - if super_hit['robot']: continue - - for p in super_hit['requests']: - if not p['is_page']: continue - if int(p['status']) != 200: continue - if p['time_decoded'].tm_mday != super_hit['last_access'].tm_mday: continue - if self.logo_re.match(p['extract_request']['extract_uri']): - p['is_page'] = False - super_hit['viewed_pages'] -= 1 - super_hit['viewed_hits'] += 1 From 6505ca3ee5d90fcad377ca89c1abc435cbc08095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 25 Nov 2014 16:59:29 +0100 Subject: [PATCH 025/195] Add all_visits plugin --- conf.py | 2 +- display.py | 14 +++++++++++- iwla.py | 3 +++ plugins/display/all_visits.py | 41 +++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 plugins/display/all_visits.py diff --git a/conf.py b/conf.py index e4c6378..574c47d 100644 --- a/conf.py +++ b/conf.py @@ -13,7 +13,7 @@ DISPLAY_ROOT = './output/' pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['top_visitors', 'reverse_dns'] -display_hooks = ['top_visitors'] +display_hooks = ['top_visitors', 'all_visits'] reverse_dns_timeout = 0.2 page_to_hit_conf = [r'^.+/logo/$'] diff --git a/display.py b/display.py index 8356e49..d414604 100644 --- a/display.py +++ b/display.py @@ -1,12 +1,24 @@ class DisplayHTMLBlock(object): - def __init__(self, title): + def __init__(self, title=''): self.title = title def build(self, f): pass +class DisplayHTMLRawBlock(DisplayHTMLBlock): + + def __init__(self, title=''): + super(DisplayHTMLRawBlock, self).__init__(title) + self.html = '' + + def setRawHTML(self, html): + self.html = html + + def build(self, f): + f.write(self.html) + class DisplayHTMLBlockTable(DisplayHTMLBlock): def __init__(self, title, cols): diff --git a/iwla.py b/iwla.py index 62deb66..b321620 100755 --- a/iwla.py +++ b/iwla.py @@ -69,6 +69,9 @@ class IWLA(object): def getDisplay(self): return self.display + def getCurTime(self): + return self.meta_infos['last_time'] + def _clearMeta(self): self.meta_infos = { 'last_time' : None diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py new file mode 100644 index 0000000..28a0534 --- /dev/null +++ b/plugins/display/all_visits.py @@ -0,0 +1,41 @@ +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +class IWLADisplayAllVisits(IPlugin): + def __init__(self, iwla): + super(IWLADisplayAllVisits, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self, iwla): + hits = iwla.getValidVisitors() + last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) + + cur_time = self.iwla.getCurTime() + title = time.strftime('All visits %B %Y', cur_time) + + filename = 'all_visits_%d.html' % (cur_time.tm_mon) + path = '%d/%s' % (cur_time.tm_year, filename) + + page = DisplayHTMLPage(title, path) + table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + for super_hit in last_access: + row = [ + super_hit['remote_addr'], + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] + table.appendRow(row) + page.appendBlock(table) + + display = self.iwla.getDisplay() + display.addPage(page) + + index = iwla.getDisplayIndex() + block = DisplayHTMLRawBlock() + block.setRawHTML('All visits' % (filename)) + index.appendBlock(block) From 81b3eee552d08d834e7258eaa20bb123cd7bf69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 16:17:16 +0100 Subject: [PATCH 026/195] Do a lot of things --- awstats_data.py | 12 ++ conf.py | 9 +- default_conf.py | 2 +- iwla.py | 22 +-- iwla_convert.pl | 87 ++++++++--- plugins/display/all_visits.py | 9 +- plugins/display/referers.py | 199 ++++++++++++++++++++++++++ plugins/display/top_visitors.py | 7 +- plugins/post_analysis/reverse_dns.py | 1 + plugins/post_analysis/top_visitors.py | 2 +- plugins/pre_analysis/robots.py | 23 +-- search_engines.py | 8 ++ 12 files changed, 333 insertions(+), 48 deletions(-) create mode 100644 awstats_data.py create mode 100644 plugins/display/referers.py create mode 100644 search_engines.py diff --git a/awstats_data.py b/awstats_data.py new file mode 100644 index 0000000..a6145f0 --- /dev/null +++ b/awstats_data.py @@ -0,0 +1,12 @@ +robots = ['.*appie.*', '.*architext.*', '.*jeeves.*', '.*bjaaland.*', '.*contentmatch.*', '.*ferret.*', '.*googlebot.*', '.*google\-sitemaps.*', '.*gulliver.*', '.*virus[_+ ]detector.*', '.*harvest.*', '.*htdig.*', '.*linkwalker.*', '.*lilina.*', '.*lycos[_+ ].*', '.*moget.*', '.*muscatferret.*', '.*myweb.*', '.*nomad.*', '.*scooter.*', '.*slurp.*', '.*^voyager\/.*', '.*weblayers.*', '.*antibot.*', '.*bruinbot.*', '.*digout4u.*', '.*echo!.*', '.*fast\-webcrawler.*', '.*ia_archiver\-web\.archive\.org.*', '.*ia_archiver.*', '.*jennybot.*', '.*mercator.*', '.*netcraft.*', '.*msnbot\-media.*', '.*msnbot.*', '.*petersnews.*', '.*relevantnoise\.com.*', '.*unlost_web_crawler.*', '.*voila.*', '.*webbase.*', '.*webcollage.*', '.*cfetch.*', '.*zyborg.*', '.*wisenutbot.*', '.*[^a]fish.*', '.*abcdatos.*', '.*acme\.spider.*', '.*ahoythehomepagefinder.*', '.*alkaline.*', '.*anthill.*', '.*arachnophilia.*', '.*arale.*', '.*araneo.*', '.*aretha.*', '.*ariadne.*', '.*powermarks.*', '.*arks.*', '.*aspider.*', '.*atn\.txt.*', '.*atomz.*', '.*auresys.*', '.*backrub.*', '.*bbot.*', '.*bigbrother.*', '.*blackwidow.*', '.*blindekuh.*', '.*bloodhound.*', '.*borg\-bot.*', '.*brightnet.*', '.*bspider.*', '.*cactvschemistryspider.*', '.*calif[^r].*', '.*cassandra.*', '.*cgireader.*', '.*checkbot.*', '.*christcrawler.*', '.*churl.*', '.*cienciaficcion.*', '.*collective.*', '.*combine.*', '.*conceptbot.*', '.*coolbot.*', '.*core.*', '.*cosmos.*', '.*cruiser.*', '.*cusco.*', '.*cyberspyder.*', '.*desertrealm.*', '.*deweb.*', '.*dienstspider.*', '.*digger.*', '.*diibot.*', '.*direct_hit.*', '.*dnabot.*', '.*download_express.*', '.*dragonbot.*', '.*dwcp.*', '.*e\-collector.*', '.*ebiness.*', '.*elfinbot.*', '.*emacs.*', '.*emcspider.*', '.*esther.*', '.*evliyacelebi.*', '.*fastcrawler.*', '.*feedcrawl.*', '.*fdse.*', '.*felix.*', '.*fetchrover.*', '.*fido.*', '.*finnish.*', '.*fireball.*', '.*fouineur.*', '.*francoroute.*', '.*freecrawl.*', '.*funnelweb.*', '.*gama.*', '.*gazz.*', '.*gcreep.*', '.*getbot.*', '.*geturl.*', '.*golem.*', '.*gougou.*', '.*grapnel.*', '.*griffon.*', '.*gromit.*', '.*gulperbot.*', '.*hambot.*', '.*havindex.*', '.*hometown.*', '.*htmlgobble.*', '.*hyperdecontextualizer.*', '.*iajabot.*', '.*iaskspider.*', '.*hl_ftien_spider.*', '.*sogou.*', '.*iconoclast.*', '.*ilse.*', '.*imagelock.*', '.*incywincy.*', '.*informant.*', '.*infoseek.*', '.*infoseeksidewinder.*', '.*infospider.*', '.*inspectorwww.*', '.*intelliagent.*', '.*irobot.*', '.*iron33.*', '.*israelisearch.*', '.*javabee.*', '.*jbot.*', '.*jcrawler.*', '.*jobo.*', '.*jobot.*', '.*joebot.*', '.*jubii.*', '.*jumpstation.*', '.*kapsi.*', '.*katipo.*', '.*kilroy.*', '.*ko[_+ ]yappo[_+ ]robot.*', '.*kummhttp.*', '.*labelgrabber\.txt.*', '.*larbin.*', '.*legs.*', '.*linkidator.*', '.*linkscan.*', '.*lockon.*', '.*logo_gif.*', '.*macworm.*', '.*magpie.*', '.*marvin.*', '.*mattie.*', '.*mediafox.*', '.*merzscope.*', '.*meshexplorer.*', '.*mindcrawler.*', '.*mnogosearch.*', '.*momspider.*', '.*monster.*', '.*motor.*', '.*muncher.*', '.*mwdsearch.*', '.*ndspider.*', '.*nederland\.zoek.*', '.*netcarta.*', '.*netmechanic.*', '.*netscoop.*', '.*newscan\-online.*', '.*nhse.*', '.*northstar.*', '.*nzexplorer.*', '.*objectssearch.*', '.*occam.*', '.*octopus.*', '.*openfind.*', '.*orb_search.*', '.*packrat.*', '.*pageboy.*', '.*parasite.*', '.*patric.*', '.*pegasus.*', '.*perignator.*', '.*perlcrawler.*', '.*phantom.*', '.*phpdig.*', '.*piltdownman.*', '.*pimptrain.*', '.*pioneer.*', '.*pitkow.*', '.*pjspider.*', '.*plumtreewebaccessor.*', '.*poppi.*', '.*portalb.*', '.*psbot.*', '.*python.*', '.*raven.*', '.*rbse.*', '.*resumerobot.*', '.*rhcs.*', '.*road_runner.*', '.*robbie.*', '.*robi.*', '.*robocrawl.*', '.*robofox.*', '.*robozilla.*', '.*roverbot.*', '.*rules.*', '.*safetynetrobot.*', '.*search\-info.*', '.*search_au.*', '.*searchprocess.*', '.*senrigan.*', '.*sgscout.*', '.*shaggy.*', '.*shaihulud.*', '.*sift.*', '.*simbot.*', '.*site\-valet.*', '.*sitetech.*', '.*skymob.*', '.*slcrawler.*', '.*smartspider.*', '.*snooper.*', '.*solbot.*', '.*speedy.*', '.*spider[_+ ]monkey.*', '.*spiderbot.*', '.*spiderline.*', '.*spiderman.*', '.*spiderview.*', '.*spry.*', '.*sqworm.*', '.*ssearcher.*', '.*suke.*', '.*sunrise.*', '.*suntek.*', '.*sven.*', '.*tach_bw.*', '.*tagyu_agent.*', '.*tailrank.*', '.*tarantula.*', '.*tarspider.*', '.*techbot.*', '.*templeton.*', '.*titan.*', '.*titin.*', '.*tkwww.*', '.*tlspider.*', '.*ucsd.*', '.*udmsearch.*', '.*universalfeedparser.*', '.*urlck.*', '.*valkyrie.*', '.*verticrawl.*', '.*victoria.*', '.*visionsearch.*', '.*voidbot.*', '.*vwbot.*', '.*w3index.*', '.*w3m2.*', '.*wallpaper.*', '.*wanderer.*', '.*wapspIRLider.*', '.*webbandit.*', '.*webcatcher.*', '.*webcopy.*', '.*webfetcher.*', '.*webfoot.*', '.*webinator.*', '.*weblinker.*', '.*webmirror.*', '.*webmoose.*', '.*webquest.*', '.*webreader.*', '.*webreaper.*', '.*websnarf.*', '.*webspider.*', '.*webvac.*', '.*webwalk.*', '.*webwalker.*', '.*webwatch.*', '.*whatuseek.*', '.*whowhere.*', '.*wired\-digital.*', '.*wmir.*', '.*wolp.*', '.*wombat.*', '.*wordpress.*', '.*worm.*', '.*woozweb.*', '.*wwwc.*', '.*wz101.*', '.*xget.*', '.*1\-more_scanner.*', '.*accoona\-ai\-agent.*', '.*activebookmark.*', '.*adamm_bot.*', '.*almaden.*', '.*aipbot.*', '.*aleadsoftbot.*', '.*alpha_search_agent.*', '.*allrati.*', '.*aport.*', '.*archive\.org_bot.*', '.*argus.*', '.*arianna\.libero\.it.*', '.*aspseek.*', '.*asterias.*', '.*awbot.*', '.*baiduspider.*', '.*becomebot.*', '.*bender.*', '.*betabot.*', '.*biglotron.*', '.*bittorrent_bot.*', '.*biz360[_+ ]spider.*', '.*blogbridge[_+ ]service.*', '.*bloglines.*', '.*blogpulse.*', '.*blogsearch.*', '.*blogshares.*', '.*blogslive.*', '.*blogssay.*', '.*bncf\.firenze\.sbn\.it\/raccolta\.txt.*', '.*bobby.*', '.*boitho\.com\-dc.*', '.*bookmark\-manager.*', '.*boris.*', '.*bumblebee.*', '.*candlelight[_+ ]favorites[_+ ]inspector.*', '.*cbn00glebot.*', '.*cerberian_drtrs.*', '.*cfnetwork.*', '.*cipinetbot.*', '.*checkweb_link_validator.*', '.*commons\-httpclient.*', '.*computer_and_automation_research_institute_crawler.*', '.*converamultimediacrawler.*', '.*converacrawler.*', '.*cscrawler.*', '.*cse_html_validator_lite_online.*', '.*cuasarbot.*', '.*cursor.*', '.*custo.*', '.*datafountains\/dmoz_downloader.*', '.*daviesbot.*', '.*daypopbot.*', '.*deepindex.*', '.*dipsie\.bot.*', '.*dnsgroup.*', '.*domainchecker.*', '.*domainsdb\.net.*', '.*dulance.*', '.*dumbot.*', '.*dumm\.de\-bot.*', '.*earthcom\.info.*', '.*easydl.*', '.*edgeio\-retriever.*', '.*ets_v.*', '.*exactseek.*', '.*extreme[_+ ]picture[_+ ]finder.*', '.*eventax.*', '.*everbeecrawler.*', '.*everest\-vulcan.*', '.*ezresult.*', '.*enteprise.*', '.*facebook.*', '.*fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de.*', '.*fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de.*', '.*matrix_s\.p\.a\._\-_fast_enterprise_crawler.*', '.*fast_enterprise_crawler.*', '.*fast\-search\-engine.*', '.*favicon.*', '.*favorg.*', '.*favorites_sweeper.*', '.*feedburner.*', '.*feedfetcher\-google.*', '.*feedflow.*', '.*feedster.*', '.*feedsky.*', '.*feedvalidator.*', '.*filmkamerabot.*', '.*findlinks.*', '.*findexa_crawler.*', '.*fooky\.com\/ScorpionBot.*', '.*g2crawler.*', '.*gaisbot.*', '.*geniebot.*', '.*gigabot.*', '.*girafabot.*', '.*global_fetch.*', '.*gnodspider.*', '.*goforit\.com.*', '.*goforitbot.*', '.*gonzo.*', '.*grub.*', '.*gpu_p2p_crawler.*', '.*henrythemiragorobot.*', '.*heritrix.*', '.*holmes.*', '.*hoowwwer.*', '.*hpprint.*', '.*htmlparser.*', '.*html[_+ ]link[_+ ]validator.*', '.*httrack.*', '.*hundesuche\.com\-bot.*', '.*ichiro.*', '.*iltrovatore\-setaccio.*', '.*infobot.*', '.*infociousbot.*', '.*infomine.*', '.*insurancobot.*', '.*internet[_+ ]ninja.*', '.*internetarchive.*', '.*internetseer.*', '.*internetsupervision.*', '.*irlbot.*', '.*isearch2006.*', '.*iupui_research_bot.*', '.*jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility.*', '.*justview.*', '.*kalambot.*', '.*kamano\.de_newsfeedverzeichnis.*', '.*kazoombot.*', '.*kevin.*', '.*keyoshid.*', '.*kinjabot.*', '.*kinja\-imagebot.*', '.*knowitall.*', '.*knowledge\.com.*', '.*kouaa_krawler.*', '.*krugle.*', '.*ksibot.*', '.*kurzor.*', '.*lanshanbot.*', '.*letscrawl\.com.*', '.*libcrawl.*', '.*linkbot.*', '.*link_valet_online.*', '.*metager\-linkchecker.*', '.*linkchecker.*', '.*livejournal\.com.*', '.*lmspider.*', '.*lwp\-request.*', '.*lwp\-trivial.*', '.*magpierss.*', '.*mail\.ru.*', '.*mapoftheinternet\.com.*', '.*mediapartners\-google.*', '.*megite.*', '.*metaspinner.*', '.*microsoft[_+ ]url[_+ ]control.*', '.*mini\-reptile.*', '.*minirank.*', '.*missigua_locator.*', '.*misterbot.*', '.*miva.*', '.*mizzu_labs.*', '.*mj12bot.*', '.*mojeekbot.*', '.*msiecrawler.*', '.*ms_search_4\.0_robot.*', '.*msrabot.*', '.*msrbot.*', '.*mt::telegraph::agent.*', '.*nagios.*', '.*nasa_search.*', '.*mydoyouhike.*', '.*netluchs.*', '.*netsprint.*', '.*newsgatoronline.*', '.*nicebot.*', '.*nimblecrawler.*', '.*noxtrumbot.*', '.*npbot.*', '.*nutchcvs.*', '.*nutchosu\-vlib.*', '.*nutch.*', '.*ocelli.*', '.*octora_beta_bot.*', '.*omniexplorer[_+ ]bot.*', '.*onet\.pl[_+ ]sa.*', '.*onfolio.*', '.*opentaggerbot.*', '.*openwebspider.*', '.*oracle_ultra_search.*', '.*orbiter.*', '.*yodaobot.*', '.*qihoobot.*', '.*passwordmaker\.org.*', '.*pear_http_request_class.*', '.*peerbot.*', '.*perman.*', '.*php[_+ ]version[_+ ]tracker.*', '.*pictureofinternet.*', '.*ping\.blo\.gs.*', '.*plinki.*', '.*pluckfeedcrawler.*', '.*pogodak.*', '.*pompos.*', '.*popdexter.*', '.*port_huron_labs.*', '.*postfavorites.*', '.*projectwf\-java\-test\-crawler.*', '.*proodlebot.*', '.*pyquery.*', '.*rambler.*', '.*redalert.*', '.*rojo.*', '.*rssimagesbot.*', '.*ruffle.*', '.*rufusbot.*', '.*sandcrawler.*', '.*sbider.*', '.*schizozilla.*', '.*scumbot.*', '.*searchguild[_+ ]dmoz[_+ ]experiment.*', '.*seekbot.*', '.*sensis_web_crawler.*', '.*seznambot.*', '.*shim\-crawler.*', '.*shoutcast.*', '.*slysearch.*', '.*snap\.com_beta_crawler.*', '.*sohu\-search.*', '.*sohu.*', '.*snappy.*', '.*sphere_scout.*', '.*spip.*', '.*sproose_crawler.*', '.*steeler.*', '.*steroid__download.*', '.*suchfin\-bot.*', '.*superbot.*', '.*surveybot.*', '.*susie.*', '.*syndic8.*', '.*syndicapi.*', '.*synoobot.*', '.*tcl_http_client_package.*', '.*technoratibot.*', '.*teragramcrawlersurf.*', '.*test_crawler.*', '.*testbot.*', '.*t\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e.*', '.*topicblogs.*', '.*turnitinbot.*', '.*turtlescanner.*', '.*turtle.*', '.*tutorgigbot.*', '.*twiceler.*', '.*ubicrawler.*', '.*ultraseek.*', '.*unchaos_bot_hybrid_web_search_engine.*', '.*unido\-bot.*', '.*updated.*', '.*ustc\-semantic\-group.*', '.*vagabondo\-wap.*', '.*vagabondo.*', '.*vermut.*', '.*versus_crawler_from_eda\.baykan@epfl\.ch.*', '.*vespa_crawler.*', '.*vortex.*', '.*vse\/.*', '.*w3c\-checklink.*', '.*w3c[_+ ]css[_+ ]validator[_+ ]jfouffa.*', '.*w3c_validator.*', '.*watchmouse.*', '.*wavefire.*', '.*webclipping\.com.*', '.*webcompass.*', '.*webcrawl\.net.*', '.*web_downloader.*', '.*webdup.*', '.*webfilter.*', '.*webindexer.*', '.*webminer.*', '.*website[_+ ]monitoring[_+ ]bot.*', '.*webvulncrawl.*', '.*wells_search.*', '.*wonderer.*', '.*wume_crawler.*', '.*wwweasel.*', '.*xenu\'s_link_sleuth.*', '.*xenu_link_sleuth.*', '.*xirq.*', '.*y!j.*', '.*yacy.*', '.*yahoo\-blogs.*', '.*yahoo\-verticalcrawler.*', '.*yahoofeedseeker.*', '.*yahooseeker\-testing.*', '.*yahooseeker.*', '.*yahoo\-mmcrawler.*', '.*yahoo!_mindset.*', '.*yandex.*', '.*flexum.*', '.*yanga.*', '.*yooglifetchagent.*', '.*z\-add_link_checker.*', '.*zealbot.*', '.*zhuaxia.*', '.*zspider.*', '.*zeus.*', '.*ng\/1\..*', '.*ng\/2\..*', '.*exabot.*', '.*wget.*', '.*libwww.*', '.*java\/[0-9].*'] + +search_engines = ['.*google\.[\w.]+/products.*', '.*base\.google\..*', '.*froogle\.google\..*', '.*groups\.google\..*', '.*images\.google\..*', '.*google\..*', '.*googlee\..*', '.*googlecom\.com.*', '.*goggle\.co\.hu.*', '.*216\.239\.(35|37|39|51)\.100.*', '.*216\.239\.(35|37|39|51)\.101.*', '.*216\.239\.5[0-9]\.104.*', '.*64\.233\.1[0-9]{2}\.104.*', '.*66\.102\.[1-9]\.104.*', '.*66\.249\.93\.104.*', '.*72\.14\.2[0-9]{2}\.104.*', '.*msn\..*', '.*live\.com.*', '.*bing\..*', '.*voila\..*', '.*mindset\.research\.yahoo.*', '.*yahoo\..*', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*', '.*search\.aol\.co.*', '.*tiscali\..*', '.*lycos\..*', '.*alexa\.com.*', '.*alltheweb\.com.*', '.*altavista\..*', '.*a9\.com.*', '.*dmoz\.org.*', '.*netscape\..*', '.*search\.terra\..*', '.*www\.search\.com.*', '.*search\.sli\.sympatico\.ca.*', '.*excite\..*'] + +search_engines_2 = ['.*4\-counter\.com.*', '.*att\.net.*', '.*bungeebonesdotcom.*', '.*northernlight\..*', '.*hotbot\..*', '.*kvasir\..*', '.*webcrawler\..*', '.*metacrawler\..*', '.*go2net\.com.*', '.*(^|\.)go\.com.*', '.*euroseek\..*', '.*looksmart\..*', '.*spray\..*', '.*nbci\.com\/search.*', '.*de\.ask.\com.*', '.*es\.ask.\com.*', '.*fr\.ask.\com.*', '.*it\.ask.\com.*', '.*nl\.ask.\com.*', '.*uk\.ask.\com.*', '.*(^|\.)ask\.com.*', '.*atomz\..*', '.*overture\.com.*', '.*teoma\..*', '.*findarticles\.com.*', '.*infospace\.com.*', '.*mamma\..*', '.*dejanews\..*', '.*dogpile\.com.*', '.*wisenut\.com.*', '.*ixquick\.com.*', '.*search\.earthlink\.net.*', '.*i-une\.com.*', '.*blingo\.com.*', '.*centraldatabase\.org.*', '.*clusty\.com.*', '.*mysearch\..*', '.*vivisimo\.com.*', '.*kartoo\.com.*', '.*icerocket\.com.*', '.*sphere\.com.*', '.*ledix\.net.*', '.*start\.shaw\.ca.*', '.*searchalot\.com.*', '.*copernic\.com.*', '.*avantfind\.com.*', '.*steadysearch\.com.*', '.*steady-search\.com.*', '.*chello\.at.*', '.*chello\.be.*', '.*chello\.cz.*', '.*chello\.fr.*', '.*chello\.hu.*', '.*chello\.nl.*', '.*chello\.no.*', '.*chello\.pl.*', '.*chello\.se.*', '.*chello\.sk.*', '.*chello.*', '.*mirago\.be.*', '.*mirago\.ch.*', '.*mirago\.de.*', '.*mirago\.dk.*', '.*es\.mirago\.com.*', '.*mirago\.fr.*', '.*mirago\.it.*', '.*mirago\.nl.*', '.*no\.mirago\.com.*', '.*mirago\.se.*', '.*mirago\.co\.uk.*', '.*mirago.*', '.*answerbus\.com.*', '.*icq\.com\/search.*', '.*nusearch\.com.*', '.*goodsearch\.com.*', '.*scroogle\.org.*', '.*questionanswering\.com.*', '.*mywebsearch\.com.*', '.*as\.starware\.com.*', '.*del\.icio\.us.*', '.*digg\.com.*', '.*stumbleupon\.com.*', '.*swik\.net.*', '.*segnalo\.alice\.it.*', '.*ineffabile\.it.*', '.*anzwers\.com\.au.*', '.*engine\.exe.*', '.*miner\.bol\.com\.br.*', '.*\.baidu\.com.*', '.*\.vnet\.cn.*', '.*\.soso\.com.*', '.*\.sogou\.com.*', '.*\.3721\.com.*', '.*iask\.com.*', '.*\.accoona\.com.*', '.*\.163\.com.*', '.*\.zhongsou\.com.*', '.*atlas\.cz.*', '.*seznam\.cz.*', '.*quick\.cz.*', '.*centrum\.cz.*', '.*jyxo\.(cz|com).*', '.*najdi\.to.*', '.*redbox\.cz.*', '.*opasia\.dk.*', '.*danielsen\.com.*', '.*sol\.dk.*', '.*jubii\.dk.*', '.*find\.dk.*', '.*edderkoppen\.dk.*', '.*netstjernen\.dk.*', '.*orbis\.dk.*', '.*tyfon\.dk.*', '.*1klik\.dk.*', '.*ofir\.dk.*', '.*ilse\..*', '.*vindex\..*', '.*(^|\.)ask\.co\.uk.*', '.*bbc\.co\.uk/cgi-bin/search.*', '.*ifind\.freeserve.*', '.*looksmart\.co\.uk.*', '.*splut\..*', '.*spotjockey\..*', '.*ukdirectory\..*', '.*ukindex\.co\.uk.*', '.*ukplus\..*', '.*searchy\.co\.uk.*', '.*haku\.www\.fi.*', '.*recherche\.aol\.fr.*', '.*ctrouve\..*', '.*francite\..*', '.*\.lbb\.org.*', '.*rechercher\.libertysurf\.fr.*', '.*search[\w\-]+\.free\.fr.*', '.*recherche\.club-internet\.fr.*', '.*toile\.com.*', '.*biglotron\.com.*', '.*mozbot\.fr.*', '.*sucheaol\.aol\.de.*', '.*fireball\.de.*', '.*infoseek\.de.*', '.*suche\d?\.web\.de.*', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*', '.*suchen\.abacho\.de.*', '.*(brisbane|suche)\.t-online\.de.*', '.*allesklar\.de.*', '.*meinestadt\.de.*', '.*212\.227\.33\.241.*', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*', '.*wwweasel\.de.*', '.*netluchs\.de.*', '.*schoenerbrausen\.de.*', '.*heureka\.hu.*', '.*vizsla\.origo\.hu.*', '.*lapkereso\.hu.*', '.*goliat\.hu.*', '.*index\.hu.*', '.*wahoo\.hu.*', '.*webmania\.hu.*', '.*search\.internetto\.hu.*', '.*tango\.hu.*', '.*keresolap\.hu.*', '.*polymeta\.hu.*', '.*sify\.com.*', '.*virgilio\.it.*', '.*arianna\.libero\.it.*', '.*supereva\.com.*', '.*kataweb\.it.*', '.*search\.alice\.it\.master.*', '.*search\.alice\.it.*', '.*gotuneed\.com.*', '.*godado.*', '.*jumpy\.it.*', '.*shinyseek\.it.*', '.*teecno\.it.*', '.*ask\.jp.*', '.*sagool\.jp.*', '.*sok\.start\.no.*', '.*eniro\.no.*', '.*szukaj\.wp\.pl.*', '.*szukaj\.onet\.pl.*', '.*dodaj\.pl.*', '.*gazeta\.pl.*', '.*gery\.pl.*', '.*hoga\.pl.*', '.*netsprint\.pl.*', '.*interia\.pl.*', '.*katalog\.onet\.pl.*', '.*o2\.pl.*', '.*polska\.pl.*', '.*szukacz\.pl.*', '.*wow\.pl.*', '.*ya(ndex)?\.ru.*', '.*aport\.ru.*', '.*rambler\.ru.*', '.*turtle\.ru.*', '.*metabot\.ru.*', '.*evreka\.passagen\.se.*', '.*eniro\.se.*', '.*zoznam\.sk.*', '.*sapo\.pt.*', '.*search\.ch.*', '.*search\.bluewin\.ch.*', '.*pogodak\..*'] + +not_search_engines_keys = {'.*yahoo\..*' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', '.*altavista\..*' : 'babelfish\.altavista\.', '.*tiscali\..*' : 'mail\.tiscali\.', '.*yandex\..*' : 'direct\.yandex\.', '.*google\..*' : 'translate\.google\.', '.*msn\..*' : 'hotmail\.msn\.'} + +search_engines_hashid = {'.*search\.sli\.sympatico\.ca.*' : 'sympatico', '.*mywebsearch\.com.*' : 'mywebsearch', '.*netsprint\.pl\/hoga\-search.*' : 'hogapl', '.*findarticles\.com.*' : 'findarticles', '.*wow\.pl.*' : 'wowpl', '.*allesklar\.de.*' : 'allesklar', '.*atomz\..*' : 'atomz', '.*bing\..*' : 'bing', '.*find\.dk.*' : 'finddk', '.*google\..*' : 'google', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*' : 'yahoo', '.*pogodak\..*' : 'pogodak', '.*ask\.jp.*' : 'askjp', '.*\.baidu\.com.*' : 'baidu', '.*tango\.hu.*' : 'tango_hu', '.*gotuneed\.com.*' : 'gotuneed', '.*quick\.cz.*' : 'quick', '.*mirago.*' : 'mirago', '.*szukaj\.wp\.pl.*' : 'wp', '.*mirago\.de.*' : 'miragode', '.*mirago\.dk.*' : 'miragodk', '.*katalog\.onet\.pl.*' : 'katalogonetpl', '.*googlee\..*' : 'google', '.*orbis\.dk.*' : 'orbis', '.*turtle\.ru.*' : 'turtle', '.*zoznam\.sk.*' : 'zoznam', '.*start\.shaw\.ca.*' : 'shawca', '.*chello\.at.*' : 'chelloat', '.*centraldatabase\.org.*' : 'centraldatabase', '.*centrum\.cz.*' : 'centrum', '.*kataweb\.it.*' : 'kataweb', '.*\.lbb\.org.*' : 'lbb', '.*blingo\.com.*' : 'blingo', '.*vivisimo\.com.*' : 'vivisimo', '.*stumbleupon\.com.*' : 'stumbleupon', '.*es\.ask.\com.*' : 'askes', '.*interia\.pl.*' : 'interiapl', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*' : 'meta', '.*search\.alice\.it.*' : 'aliceit', '.*shinyseek\.it.*' : 'shinyseek\.it', '.*i-une\.com.*' : 'iune', '.*dejanews\..*' : 'dejanews', '.*opasia\.dk.*' : 'opasia', '.*chello\.cz.*' : 'chellocz', '.*ya(ndex)?\.ru.*' : 'yandex', '.*kartoo\.com.*' : 'kartoo', '.*arianna\.libero\.it.*' : 'arianna', '.*ofir\.dk.*' : 'ofir', '.*search\.earthlink\.net.*' : 'earthlink', '.*biglotron\.com.*' : 'biglotron', '.*lapkereso\.hu.*' : 'lapkereso', '.*216\.239\.(35|37|39|51)\.101.*' : 'google_cache', '.*miner\.bol\.com\.br.*' : 'miner', '.*dodaj\.pl.*' : 'dodajpl', '.*mirago\.be.*' : 'miragobe', '.*googlecom\.com.*' : 'google', '.*steadysearch\.com.*' : 'steadysearch', '.*redbox\.cz.*' : 'redbox', '.*haku\.www\.fi.*' : 'haku', '.*sapo\.pt.*' : 'sapo', '.*sphere\.com.*' : 'sphere', '.*danielsen\.com.*' : 'danielsen', '.*alexa\.com.*' : 'alexa', '.*mamma\..*' : 'mamma', '.*swik\.net.*' : 'swik', '.*polska\.pl.*' : 'polskapl', '.*groups\.google\..*' : 'google_groups', '.*metabot\.ru.*' : 'metabot', '.*rechercher\.libertysurf\.fr.*' : 'libertysurf', '.*szukaj\.onet\.pl.*' : 'onetpl', '.*aport\.ru.*' : 'aport', '.*de\.ask.\com.*' : 'askde', '.*splut\..*' : 'splut', '.*live\.com.*' : 'live', '.*216\.239\.5[0-9]\.104.*' : 'google_cache', '.*mysearch\..*' : 'mysearch', '.*ukplus\..*' : 'ukplus', '.*najdi\.to.*' : 'najdi', '.*overture\.com.*' : 'overture', '.*iask\.com.*' : 'iask', '.*nl\.ask.\com.*' : 'asknl', '.*nbci\.com\/search.*' : 'nbci', '.*search\.aol\.co.*' : 'aol', '.*eniro\.se.*' : 'enirose', '.*64\.233\.1[0-9]{2}\.104.*' : 'google_cache', '.*mirago\.ch.*' : 'miragoch', '.*altavista\..*' : 'altavista', '.*chello\.hu.*' : 'chellohu', '.*mozbot\.fr.*' : 'mozbot', '.*northernlight\..*' : 'northernlight', '.*mirago\.co\.uk.*' : 'miragocouk', '.*search[\w\-]+\.free\.fr.*' : 'free', '.*mindset\.research\.yahoo.*' : 'yahoo_mindset', '.*copernic\.com.*' : 'copernic', '.*heureka\.hu.*' : 'heureka', '.*steady-search\.com.*' : 'steadysearch', '.*teecno\.it.*' : 'teecnoit', '.*voila\..*' : 'voila', '.*netstjernen\.dk.*' : 'netstjernen', '.*keresolap\.hu.*' : 'keresolap_hu', '.*yahoo\..*' : 'yahoo', '.*icerocket\.com.*' : 'icerocket', '.*alltheweb\.com.*' : 'alltheweb', '.*www\.search\.com.*' : 'search.com', '.*digg\.com.*' : 'digg', '.*tiscali\..*' : 'tiscali', '.*spotjockey\..*' : 'spotjockey', '.*a9\.com.*' : 'a9', '.*(brisbane|suche)\.t-online\.de.*' : 't-online', '.*ifind\.freeserve.*' : 'freeserve', '.*att\.net.*' : 'att', '.*mirago\.it.*' : 'miragoit', '.*index\.hu.*' : 'indexhu', '.*\.sogou\.com.*' : 'sogou', '.*no\.mirago\.com.*' : 'miragono', '.*ineffabile\.it.*' : 'ineffabile', '.*netluchs\.de.*' : 'netluchs', '.*toile\.com.*' : 'toile', '.*search\..*\.\w+.*' : 'search', '.*del\.icio\.us.*' : 'delicious', '.*vizsla\.origo\.hu.*' : 'origo', '.*netscape\..*' : 'netscape', '.*dogpile\.com.*' : 'dogpile', '.*anzwers\.com\.au.*' : 'anzwers', '.*\.zhongsou\.com.*' : 'zhongsou', '.*ctrouve\..*' : 'ctrouve', '.*gazeta\.pl.*' : 'gazetapl', '.*recherche\.club-internet\.fr.*' : 'clubinternet', '.*sok\.start\.no.*' : 'start', '.*scroogle\.org.*' : 'scroogle', '.*schoenerbrausen\.de.*' : 'schoenerbrausen', '.*looksmart\.co\.uk.*' : 'looksmartuk', '.*wwweasel\.de.*' : 'wwweasel', '.*godado.*' : 'godado', '.*216\.239\.(35|37|39|51)\.100.*' : 'google_cache', '.*jubii\.dk.*' : 'jubii', '.*212\.227\.33\.241.*' : 'metaspinner', '.*mirago\.fr.*' : 'miragofr', '.*sol\.dk.*' : 'sol', '.*bbc\.co\.uk/cgi-bin/search.*' : 'bbc', '.*jumpy\.it.*' : 'jumpy\.it', '.*francite\..*' : 'francite', '.*infoseek\.de.*' : 'infoseek', '.*es\.mirago\.com.*' : 'miragoes', '.*jyxo\.(cz|com).*' : 'jyxo', '.*hotbot\..*' : 'hotbot', '.*engine\.exe.*' : 'engine', '.*(^|\.)ask\.com.*' : 'ask', '.*goliat\.hu.*' : 'goliat', '.*wisenut\.com.*' : 'wisenut', '.*mirago\.nl.*' : 'miragonl', '.*base\.google\..*' : 'google_base', '.*search\.bluewin\.ch.*' : 'bluewin', '.*lycos\..*' : 'lycos', '.*meinestadt\.de.*' : 'meinestadt', '.*4\-counter\.com.*' : 'google4counter', '.*search\.alice\.it\.master.*' : 'aliceitmaster', '.*teoma\..*' : 'teoma', '.*(^|\.)ask\.co\.uk.*' : 'askuk', '.*tyfon\.dk.*' : 'tyfon', '.*froogle\.google\..*' : 'google_froogle', '.*ukdirectory\..*' : 'ukdirectory', '.*ledix\.net.*' : 'ledix', '.*edderkoppen\.dk.*' : 'edderkoppen', '.*recherche\.aol\.fr.*' : 'aolfr', '.*google\.[\w.]+/products.*' : 'google_products', '.*webmania\.hu.*' : 'webmania', '.*searchy\.co\.uk.*' : 'searchy', '.*fr\.ask.\com.*' : 'askfr', '.*spray\..*' : 'spray', '.*72\.14\.2[0-9]{2}\.104.*' : 'google_cache', '.*eniro\.no.*' : 'eniro', '.*goodsearch\.com.*' : 'goodsearch', '.*kvasir\..*' : 'kvasir', '.*\.accoona\.com.*' : 'accoona', '.*\.soso\.com.*' : 'soso', '.*as\.starware\.com.*' : 'comettoolbar', '.*virgilio\.it.*' : 'virgilio', '.*o2\.pl.*' : 'o2pl', '.*chello\.nl.*' : 'chellonl', '.*chello\.be.*' : 'chellobe', '.*icq\.com\/search.*' : 'icq', '.*msn\..*' : 'msn', '.*fireball\.de.*' : 'fireball', '.*sucheaol\.aol\.de.*' : 'aolde', '.*uk\.ask.\com.*' : 'askuk', '.*euroseek\..*' : 'euroseek', '.*gery\.pl.*' : 'gerypl', '.*chello\.fr.*' : 'chellofr', '.*netsprint\.pl.*' : 'netsprintpl', '.*avantfind\.com.*' : 'avantfind', '.*supereva\.com.*' : 'supereva', '.*polymeta\.hu.*' : 'polymeta_hu', '.*infospace\.com.*' : 'infospace', '.*sify\.com.*' : 'sify', '.*go2net\.com.*' : 'go2net', '.*wahoo\.hu.*' : 'wahoo', '.*suche\d?\.web\.de.*' : 'webde', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*' : 'metacrawler_de', '.*\.3721\.com.*' : '3721', '.*ilse\..*' : 'ilse', '.*metacrawler\..*' : 'metacrawler', '.*sagool\.jp.*' : 'sagool', '.*atlas\.cz.*' : 'atlas', '.*vindex\..*' : 'vindex', '.*ixquick\.com.*' : 'ixquick', '.*66\.102\.[1-9]\.104.*' : 'google_cache', '.*rambler\.ru.*' : 'rambler', '.*answerbus\.com.*' : 'answerbus', '.*evreka\.passagen\.se.*' : 'passagen', '.*chello\.se.*' : 'chellose', '.*clusty\.com.*' : 'clusty', '.*search\.ch.*' : 'searchch', '.*chello\.no.*' : 'chellono', '.*searchalot\.com.*' : 'searchalot', '.*questionanswering\.com.*' : 'questionanswering', '.*seznam\.cz.*' : 'seznam', '.*ukindex\.co\.uk.*' : 'ukindex', '.*dmoz\.org.*' : 'dmoz', '.*excite\..*' : 'excite', '.*chello\.pl.*' : 'chellopl', '.*looksmart\..*' : 'looksmart', '.*1klik\.dk.*' : '1klik', '.*\.vnet\.cn.*' : 'vnet', '.*chello\.sk.*' : 'chellosk', '.*(^|\.)go\.com.*' : 'go', '.*nusearch\.com.*' : 'nusearch', '.*it\.ask.\com.*' : 'askit', '.*bungeebonesdotcom.*' : 'bungeebonesdotcom', '.*search\.terra\..*' : 'terra', '.*webcrawler\..*' : 'webcrawler', '.*suchen\.abacho\.de.*' : 'abacho', '.*szukacz\.pl.*' : 'szukaczpl', '.*66\.249\.93\.104.*' : 'google_cache', '.*search\.internetto\.hu.*' : 'internetto', '.*goggle\.co\.hu.*' : 'google', '.*mirago\.se.*' : 'miragose', '.*images\.google\..*' : 'google_image', '.*segnalo\.alice\.it.*' : 'segnalo', '.*\.163\.com.*' : 'netease', '.*chello.*' : 'chellocom'} + +search_engines_knwown_url = {'.*dmoz.*' : 'search=', '.*google.*' : '(p|q|as_p|as_q)=', '.*searchalot.*' : 'q=', '.*teoma.*' : 'q=', '.*looksmartuk.*' : 'key=', '.*polymeta_hu.*' : '', '.*google_groups.*' : 'group\/', '.*iune.*' : '(keywords|q)=', '.*chellosk.*' : 'q1=', '.*eniro.*' : 'q=', '.*msn.*' : 'q=', '.*webcrawler.*' : 'searchText=', '.*mirago.*' : '(txtsearch|qry)=', '.*enirose.*' : 'q=', '.*miragobe.*' : '(txtsearch|qry)=', '.*netease.*' : 'q=', '.*netluchs.*' : 'query=', '.*google_products.*' : '(p|q|as_p|as_q)=', '.*jyxo.*' : '(s|q)=', '.*origo.*' : '(q|search)=', '.*ilse.*' : 'search_for=', '.*chellocom.*' : 'q1=', '.*goodsearch.*' : 'Keywords=', '.*ledix.*' : 'q=', '.*mozbot.*' : 'q=', '.*chellocz.*' : 'q1=', '.*webde.*' : 'su=', '.*biglotron.*' : 'question=', '.*metacrawler_de.*' : 'qry=', '.*finddk.*' : 'words=', '.*start.*' : 'q=', '.*sagool.*' : 'q=', '.*miragoch.*' : '(txtsearch|qry)=', '.*google_base.*' : '(p|q|as_p|as_q)=', '.*aliceit.*' : 'qs=', '.*shinyseek\.it.*' : 'KEY=', '.*onetpl.*' : 'qt=', '.*clusty.*' : 'query=', '.*chellonl.*' : 'q1=', '.*miragode.*' : '(txtsearch|qry)=', '.*miragose.*' : '(txtsearch|qry)=', '.*o2pl.*' : 'qt=', '.*goliat.*' : 'KERESES=', '.*kvasir.*' : 'q=', '.*askfr.*' : '(ask|q)=', '.*infoseek.*' : 'qt=', '.*yahoo_mindset.*' : 'p=', '.*comettoolbar.*' : 'qry=', '.*alltheweb.*' : 'q(|uery)=', '.*miner.*' : 'q=', '.*aol.*' : 'query=', '.*rambler.*' : 'words=', '.*scroogle.*' : 'Gw=', '.*chellose.*' : 'q1=', '.*ineffabile.*' : '', '.*miragoit.*' : '(txtsearch|qry)=', '.*yandex.*' : 'text=', '.*segnalo.*' : '', '.*dodajpl.*' : 'keyword=', '.*avantfind.*' : 'keywords=', '.*nusearch.*' : 'nusearch_terms=', '.*bbc.*' : 'q=', '.*supereva.*' : 'q=', '.*atomz.*' : 'sp-q=', '.*searchy.*' : 'search_term=', '.*dogpile.*' : 'q(|kw)=', '.*chellohu.*' : 'q1=', '.*vnet.*' : 'kw=', '.*1klik.*' : 'query=', '.*t-online.*' : 'q=', '.*hogapl.*' : 'qt=', '.*stumbleupon.*' : '', '.*soso.*' : 'q=', '.*zhongsou.*' : '(word|w)=', '.*a9.*' : 'a9\.com\/', '.*centraldatabase.*' : 'query=', '.*mamma.*' : 'query=', '.*icerocket.*' : 'q=', '.*ask.*' : '(ask|q)=', '.*chellobe.*' : 'q1=', '.*altavista.*' : 'q=', '.*vindex.*' : 'in=', '.*miragodk.*' : '(txtsearch|qry)=', '.*chelloat.*' : 'q1=', '.*digg.*' : 's=', '.*metacrawler.*' : 'general=', '.*nbci.*' : 'keyword=', '.*chellono.*' : 'q1=', '.*icq.*' : 'q=', '.*arianna.*' : 'query=', '.*miragocouk.*' : '(txtsearch|qry)=', '.*3721.*' : '(p|name)=', '.*pogodak.*' : 'q=', '.*ukdirectory.*' : 'k=', '.*overture.*' : 'keywords=', '.*heureka.*' : 'heureka=', '.*teecnoit.*' : 'q=', '.*miragoes.*' : '(txtsearch|qry)=', '.*haku.*' : 'w=', '.*go.*' : 'qt=', '.*fireball.*' : 'q=', '.*wisenut.*' : 'query=', '.*sify.*' : 'keyword=', '.*ixquick.*' : 'query=', '.*anzwers.*' : 'search=', '.*quick.*' : 'query=', '.*jubii.*' : 'soegeord=', '.*questionanswering.*' : '', '.*asknl.*' : '(ask|q)=', '.*askde.*' : '(ask|q)=', '.*att.*' : 'qry=', '.*terra.*' : 'query=', '.*bing.*' : 'q=', '.*wowpl.*' : 'q=', '.*freeserve.*' : 'q=', '.*atlas.*' : '(searchtext|q)=', '.*askuk.*' : '(ask|q)=', '.*godado.*' : 'Keywords=', '.*northernlight.*' : 'qr=', '.*answerbus.*' : '', '.*search.com.*' : 'q=', '.*google_image.*' : '(p|q|as_p|as_q)=', '.*jumpy\.it.*' : 'searchWord=', '.*gazetapl.*' : 'slowo=', '.*yahoo.*' : 'p=', '.*hotbot.*' : 'mt=', '.*metabot.*' : 'st=', '.*copernic.*' : 'web\/', '.*kartoo.*' : '', '.*metaspinner.*' : 'qry=', '.*toile.*' : 'q=', '.*aolde.*' : 'q=', '.*blingo.*' : 'q=', '.*askit.*' : '(ask|q)=', '.*netscape.*' : 'search=', '.*splut.*' : 'pattern=', '.*looksmart.*' : 'key=', '.*sphere.*' : 'q=', '.*sol.*' : 'q=', '.*miragono.*' : '(txtsearch|qry)=', '.*kataweb.*' : 'q=', '.*ofir.*' : 'querytext=', '.*aliceitmaster.*' : 'qs=', '.*miragofr.*' : '(txtsearch|qry)=', '.*spray.*' : 'string=', '.*seznam.*' : '(w|q)=', '.*interiapl.*' : 'q=', '.*euroseek.*' : 'query=', '.*schoenerbrausen.*' : 'q=', '.*centrum.*' : 'q=', '.*netsprintpl.*' : 'q=', '.*go2net.*' : 'general=', '.*katalogonetpl.*' : 'qt=', '.*ukindex.*' : 'stext=', '.*shawca.*' : 'q=', '.*szukaczpl.*' : 'q=', '.*accoona.*' : 'qt=', '.*live.*' : 'q=', '.*google4counter.*' : '(p|q|as_p|as_q)=', '.*iask.*' : '(w|k)=', '.*earthlink.*' : 'q=', '.*tiscali.*' : 'key=', '.*askes.*' : '(ask|q)=', '.*gotuneed.*' : '', '.*clubinternet.*' : 'q=', '.*redbox.*' : 'srch=', '.*delicious.*' : 'all=', '.*chellofr.*' : 'q1=', '.*lycos.*' : 'query=', '.*sympatico.*' : 'query=', '.*vivisimo.*' : 'query=', '.*bluewin.*' : 'qry=', '.*mysearch.*' : 'searchfor=', '.*google_cache.*' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', '.*ukplus.*' : 'search=', '.*gerypl.*' : 'q=', '.*keresolap_hu.*' : 'q=', '.*abacho.*' : 'q=', '.*engine.*' : 'p1=', '.*opasia.*' : 'q=', '.*wp.*' : 'szukaj=', '.*steadysearch.*' : 'w=', '.*chellopl.*' : 'q1=', '.*voila.*' : '(kw|rdata)=', '.*aport.*' : 'r=', '.*internetto.*' : 'searchstr=', '.*passagen.*' : 'q=', '.*wwweasel.*' : 'q=', '.*najdi.*' : 'dotaz=', '.*alexa.*' : 'q=', '.*baidu.*' : '(wd|word)=', '.*spotjockey.*' : 'Search_Keyword=', '.*virgilio.*' : 'qs=', '.*orbis.*' : 'search_field=', '.*tango_hu.*' : 'q=', '.*askjp.*' : '(ask|q)=', '.*bungeebonesdotcom.*' : 'query=', '.*francite.*' : 'name=', '.*searchch.*' : 'q=', '.*google_froogle.*' : '(p|q|as_p|as_q)=', '.*excite.*' : 'search=', '.*infospace.*' : 'qkw=', '.*polskapl.*' : 'qt=', '.*swik.*' : 'swik\.net/', '.*edderkoppen.*' : 'query=', '.*mywebsearch.*' : 'searchfor=', '.*danielsen.*' : 'q=', '.*wahoo.*' : 'q=', '.*sogou.*' : 'query=', '.*miragonl.*' : '(txtsearch|qry)=', '.*findarticles.*' : 'key='} + diff --git a/conf.py b/conf.py index 574c47d..6d9af11 100644 --- a/conf.py +++ b/conf.py @@ -8,12 +8,17 @@ time_format = '%d/%b/%Y:%H:%M:%S +0100' analyzed_filename = 'access.log' +domain_name = 'soutade.fr' + +display_visitor_ip = True + DB_ROOT = './output/' DISPLAY_ROOT = './output/' pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['top_visitors', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits'] +post_analysis_hooks = ['top_visitors'] +# post_analysis_hooks = ['top_visitors', 'reverse_dns'] +display_hooks = ['top_visitors', 'all_visits', 'referers'] reverse_dns_timeout = 0.2 page_to_hit_conf = [r'^.+/logo/$'] diff --git a/default_conf.py b/default_conf.py index 074a9e6..1b4c62b 100644 --- a/default_conf.py +++ b/default_conf.py @@ -21,4 +21,4 @@ post_analysis_hooks = [] display_hooks = [] pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] -viewed_http_codes = [200] +viewed_http_codes = [200, 304] diff --git a/iwla.py b/iwla.py index b321620..1a3cf0f 100755 --- a/iwla.py +++ b/iwla.py @@ -34,7 +34,7 @@ class IWLA(object): self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted) self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') self.log_re = re.compile(self.log_format_extracted) - self.uri_re = re.compile(r'(?P[^\?]*)[\?(?P.*)]?') + self.uri_re = re.compile(r'(?P[^\?]+)(\?(?P.+))?') self.plugins = {conf.PRE_HOOK_DIRECTORY : conf.pre_analysis_hooks, conf.POST_HOOK_DIRECTORY : conf.post_analysis_hooks, conf.DISPLAY_HOOK_DIRECTORY : conf.display_hooks} @@ -143,9 +143,9 @@ class IWLA(object): hit['is_page'] = self.isPage(uri) - # Don't count 3xx status status = int(hit['status']) - if status >= 300 and status < 400: return + if status not in conf.viewed_http_codes: + return if super_hit['robot'] or\ not status in conf.viewed_http_codes: @@ -163,6 +163,7 @@ class IWLA(object): def _createVisitor(self, hit): super_hit = self.current_analysis['visits'][hit['remote_addr']] = {} super_hit['remote_addr'] = hit['remote_addr'] + super_hit['remote_ip'] = hit['remote_addr'] super_hit['viewed_pages'] = 0 super_hit['viewed_hits'] = 0 super_hit['not_viewed_pages'] = 0 @@ -191,9 +192,10 @@ class IWLA(object): print "Bad request extraction " + hit['request'] return False - referer_groups = self.uri_re.match(hit['http_referer']) - if referer_groups: - referer = hit['extract_referer'] = referer_groups.groupdict() + if hit['http_referer']: + referer_groups = self.uri_re.match(hit['http_referer']) + if referer_groups: + hit['extract_referer'] = referer_groups.groupdict() return True def _decodeTime(self, hit): @@ -229,13 +231,13 @@ class IWLA(object): nb_days = len(keys) row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] if nb_days: - average_row = map(lambda(v): str(int(v/nb_days)), row) + average_row = map(lambda(v): int(v/nb_days), row) else: - average_row = map(lambda(v): '0', row) + average_row = map(lambda(v): 0, row) average_row[0] = 'Average' - average_row[4] = bytesToStr(row[4]) - average_row[5] = bytesToStr(row[5]) + average_row[4] = bytesToStr(average_row[4]) + average_row[5] = bytesToStr(average_row[5]) days.appendRow(average_row) row[0] = 'Total' diff --git a/iwla_convert.pl b/iwla_convert.pl index a47140a..5a74cf8 100755 --- a/iwla_convert.pl +++ b/iwla_convert.pl @@ -1,34 +1,79 @@ #!/usr/bin/perl -my $awstats_lib_root = '/usr/share/awstats/lib/'; -my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); +my $awstats_lib_root = './'; +my @awstats_libs = ('search_engines.pm', 'robots.pm'); + +# my $awstats_lib_root = '/usr/share/awstats/lib/'; +# my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); foreach $lib (@awstats_libs) {require $awstats_lib_root . $lib;} -open($FIC,">", "robots.py") or die $!; +sub dumpList { + my @list = @{$_[0]}; + my $FIC = $_[1]; + my $first = $_[2]; -print $FIC "awstats_robots = ["; -$first = 0; -foreach $r (@RobotsSearchIDOrder_list1) -{ - $r =~ s/\'/\\\'/g; - if ($first != 0) + foreach $r (@list) { - print $FIC ", "; + $r =~ s/\'/\\\'/g; + if ($first == 0) + { + print $FIC ", "; + } + else + { + $first = 0; + } + print $FIC "'.*$r.*'"; } - else - { - $first = 1; +} + +sub dumpHash { + my %hash = %{$_[0]}; + my $FIC = $_[1]; + my $first = $_[2]; + + while( my ($k,$v) = each(%hash) ) { + $k =~ s/\'/\\\'/g; + $v =~ s/\'/\\\'/g; + if ($first == 0) + { + print $FIC ", "; + } + else + { + $first = 0; + } + print $FIC "'.*$k.*' : '$v'"; } - print $FIC "'.*$r.*'"; -} -foreach $r (@RobotsSearchIDOrder_list2) -{ - $r =~ s/\'/\\\'/g; - print $FIC ", '.*$r.*'"; } + +# Robots +open($FIC,">", "awstats_data.py") or die $!; + +print $FIC "robots = ["; +dumpList(\@RobotsSearchIDOrder_list1, $FIC, 1); +dumpList(\@RobotsSearchIDOrder_list2, $FIC, 0); print $FIC "]\n\n"; +print $FIC "search_engines = ["; +dumpList(\@SearchEnginesSearchIDOrder_list1, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "search_engines_2 = ["; +dumpList(\@SearchEnginesSearchIDOrder_list2, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "not_search_engines_keys = {"; +dumpHash(\%NotSearchEnginesKeys, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "search_engines_hashid = {"; +dumpHash(\%SearchEnginesHashID, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "search_engines_knwown_url = {"; +dumpHash(\%SearchEnginesKnownUrl, $FIC, 1); +print $FIC "}\n\n"; + close($FIC); - - diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 28a0534..131c754 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -14,7 +14,7 @@ class IWLADisplayAllVisits(IPlugin): last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) cur_time = self.iwla.getCurTime() - title = time.strftime('All visits %B %Y', cur_time) + title = time.strftime('All visits - %B %Y', cur_time) filename = 'all_visits_%d.html' % (cur_time.tm_mon) path = '%d/%s' % (cur_time.tm_year, filename) @@ -22,8 +22,13 @@ class IWLADisplayAllVisits(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) for super_hit in last_access: + address = super_hit['remote_addr'] + if self.iwla.getConfValue('display_visitor_ip', False) and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + row = [ - super_hit['remote_addr'], + address, super_hit['viewed_pages'], super_hit['viewed_hits'], bytesToStr(super_hit['bandwidth']), diff --git a/plugins/display/referers.py b/plugins/display/referers.py new file mode 100644 index 0000000..56924d9 --- /dev/null +++ b/plugins/display/referers.py @@ -0,0 +1,199 @@ +import time +import re +import HTMLParser + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +import awstats_data + +class IWLADisplayReferers(IPlugin): + def __init__(self, iwla): + super(IWLADisplayReferers, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + domain_name = self.iwla.getConfValue('domain_name', '') + + if not domain_name: + print 'domain_name required in conf' + return False + + self.own_domain_re = re.compile('.*%s.*' % (domain_name)) + self.search_engines = {} + + for engine in awstats_data.search_engines: + self.search_engines[engine] = { + 're' : re.compile(engine, re.IGNORECASE) + } + + for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): + if not engine in self.search_engines: continue + self.search_engines[engine]['not_search_engine'] = \ + re.compile(not_engine, re.IGNORECASE) + + for (engine, name) in awstats_data.search_engines_hashid.items(): + if not engine in self.search_engines: continue + self.search_engines[engine]['name'] = name + + for (engine, knwown_url) in awstats_data.search_engines_knwown_url.items(): + engine = engin[2:-2] + if not engine in self.search_engines: continue + print knwown_url + self.search_engines[engine]['known_url'] = re.compile(known_url + '(?P.+)') + + + self.html_parser = HTMLParser.HTMLParser() + + return True + + def _extractKeyPhrase(self, key_phrase_re, parameters, key_phrases): + if not parameters or not key_phrase_re: return + + + for p in parameters.split('&'): + groups = key_phrase_re.match(p) + if groups: + print groups.groupddict() + key_phrase = self.html_parser.unescape(groups.groupddict()['key_phrase']).lower() + if not key_phrase in key_phrases.keys(): + key_phrases[key_phrase] = 1 + else: + key_phrases[key_phrase] += 1 + + def hook(self, iwla): + stats = iwla.getCurrentVisists() + referers = {} + robots_referers = {} + search_engine_referers = {} + key_phrases = {} + + for (k, super_hit) in stats.items(): + for r in super_hit['requests']: + if not r['http_referer']: continue + + uri = r['extract_referer']['extract_uri'] + is_search_engine = False + + if self.own_domain_re.match(uri): continue + + for e in self.search_engines.values(): + if e['re'].match(uri): + not_engine = e.get('not_search_engine', None) + # Try not engine + if not_engine and not_engine.match(uri): break + is_search_engine = True + uri = e['name'] + + parameters = r['extract_referer'].get('extract_parameters', None) + key_phrase_re = e.get('known_url', None) + + print parameters + print key_phrase_re + + self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) + + break + + if is_search_engine: + dictionary = search_engine_referers + elif super_hit['robot']: + dictionary = robots_referers + # print '%s => %s' % (uri, super_hit['remote_ip']) + else: + dictionary = referers + if r['is_page']: + key = 'pages' + else: + key = 'hits' + if not uri in dictionary: dictionary[uri] = {'pages':0, 'hits':0} + dictionary[uri][key] += 1 + + top_referers = [(k, referers[k]['pages']) for k in referers.keys()] + top_referers = sorted(top_referers, key=lambda t: t[1], reverse=True) + + top_robots_referers = [(k, robots_referers[k]['pages']) for k in robots_referers.keys()] + top_robots_referers = sorted(top_robots_referers, key=lambda t: t[1], reverse=True) + + top_search_engine_referers = [(k, search_engine_referers[k]['pages']) for k in search_engine_referers.keys()] + top_search_engine_referers = sorted(top_search_engine_referers, key=lambda t: t[1], reverse=True) + + top_key_phrases = key_phrases.items() + top_key_phrases = sorted(top_key_phrases, key=lambda t: t[1], reverse=True) + + # Top referers in index + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) + table.appendRow(['Search Engine', '', '']) + for r,_ in top_search_engine_referers[:10]: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + table.appendRow(row) + + table.appendRow(['External URL', '', '']) + for r,_ in top_referers[:10]: + row = [r, referers[r]['pages'], referers[r]['hits']] + table.appendRow(row) + + table.appendRow(['External URL (robot)', '', '']) + for r,_ in top_robots_referers[:10]: + row = [r, robots_referers[r]['pages'], robots_referers[r]['hits']] + table.appendRow(row) + + index.appendBlock(table) + + # All referers in a file + cur_time = self.iwla.getCurTime() + title = time.strftime('Connexion from - %B %Y', cur_time) + + filename = 'referers_%d.html' % (cur_time.tm_mon) + path = '%d/%s' % (cur_time.tm_year, filename) + + page = DisplayHTMLPage(title, path) + table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) + + table.appendRow(['Search Engine', '', '']) + for r,_ in top_search_engine_referers: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + table.appendRow(row) + + table.appendRow(['External URL', '', '']) + for r,_ in top_referers: + row = [r, referers[r]['pages'], referers[r]['hits']] + table.appendRow(row) + + table.appendRow(['External URL (robot)', '', '']) + for r,_ in top_robots_referers: + row = [r, robots_referers[r]['pages'], robots_referers[r]['hits']] + table.appendRow(row) + + page.appendBlock(table) + + display = self.iwla.getDisplay() + display.addPage(page) + + block = DisplayHTMLRawBlock() + block.setRawHTML('All referers' % (filename)) + index.appendBlock(block) + + # Top key phrases in index + table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) + for phrase in top_key_phrases[:10]: + table.appendRow([phrase[0], phrase[1]]) + index.appendBlock(table) + + # All key phrases in a file + cur_time = self.iwla.getCurTime() + title = time.strftime('Key Phrases - %B %Y', cur_time) + + filename = 'key_phrases_%d.html' % (cur_time.tm_mon) + path = '%d/%s' % (cur_time.tm_year, filename) + + page = DisplayHTMLPage(title, path) + table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) + for phrase in top_key_phrases: + table.appendRow([phrase[0], phrase[1]]) + page.appendBlock(table) + + display.addPage(page) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 93f455a..1959545 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -16,8 +16,13 @@ class IWLADisplayTopVisitors(IPlugin): index = iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) for super_hit in stats['top_visitors']: + address = super_hit['remote_addr'] + if self.iwla.getConfValue('display_visitor_ip', False) and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + row = [ - super_hit['remote_addr'], + address, super_hit['viewed_pages'], super_hit['viewed_hits'], bytesToStr(super_hit['bandwidth']), diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 3a5210b..8898115 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -20,6 +20,7 @@ class IWLAPostAnalysisReverseDNS(IPlugin): try: name, _, _ = socket.gethostbyaddr(k) hit['remote_addr'] = name + hit['dns_name_replaced'] = True except: pass finally: diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py index c7de05b..714ca66 100644 --- a/plugins/post_analysis/top_visitors.py +++ b/plugins/post_analysis/top_visitors.py @@ -9,7 +9,7 @@ class IWLAPostAnalysisTopVisitors(IPlugin): def hook(self, iwla): hits = iwla.getValidVisitors() stats = iwla.getMonthStats() - top_bandwidth = [(k,hits[k]['bandwidth']) for (k,v) in hits.items()] + top_bandwidth = [(k,hits[k]['bandwidth']) for k in hits.keys()] top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]] diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 596552e..6211ade 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -3,7 +3,7 @@ import re from iwla import IWLA from iplugin import IPlugin -from awstats_robots_data import awstats_robots +import awstats_data class IWLAPreAnalysisRobots(IPlugin): def __init__(self, iwla): @@ -11,9 +11,7 @@ class IWLAPreAnalysisRobots(IPlugin): self.API_VERSION = 1 def load(self): - global awstats_robots - - self.awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) + self.awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_data.robots) return True @@ -32,13 +30,17 @@ class IWLAPreAnalysisRobots(IPlugin): if first_page['time_decoded'].tm_mday == super_hit['last_access'].tm_mday: for r in self.awstats_robots: if r.match(first_page['http_user_agent']): - super_hit['robot'] = 1 - continue + isRobot = True + break + + if isRobot: + super_hit['robot'] = 1 + continue # 1) no pages view --> robot - if not super_hit['viewed_pages']: - super_hit['robot'] = 1 - continue + # if not super_hit['viewed_pages']: + # super_hit['robot'] = 1 + # continue # 2) pages without hit --> robot if not super_hit['viewed_hits']: @@ -59,6 +61,7 @@ class IWLAPreAnalysisRobots(IPlugin): super_hit['robot'] = 1 continue - if super_hit['viewed_hits'] and not referers: + if not super_hit['viewed_pages'] and \ + (super_hit['viewed_hits'] and not referers): super_hit['robot'] = 1 continue diff --git a/search_engines.py b/search_engines.py new file mode 100644 index 0000000..3c4f8ba --- /dev/null +++ b/search_engines.py @@ -0,0 +1,8 @@ +awstats_search_engines = ['.*google\.[\w.]+/products.*', '.*base\.google\..*', '.*froogle\.google\..*', '.*groups\.google\..*', '.*images\.google\..*', '.*google\..*', '.*googlee\..*', '.*googlecom\.com.*', '.*goggle\.co\.hu.*', '.*216\.239\.(35|37|39|51)\.100.*', '.*216\.239\.(35|37|39|51)\.101.*', '.*216\.239\.5[0-9]\.104.*', '.*64\.233\.1[0-9]{2}\.104.*', '.*66\.102\.[1-9]\.104.*', '.*66\.249\.93\.104.*', '.*72\.14\.2[0-9]{2}\.104.*', '.*msn\..*', '.*live\.com.*', '.*bing\..*', '.*voila\..*', '.*mindset\.research\.yahoo.*', '.*yahoo\..*', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*', '.*search\.aol\.co.*', '.*tiscali\..*', '.*lycos\..*', '.*alexa\.com.*', '.*alltheweb\.com.*', '.*altavista\..*', '.*a9\.com.*', '.*dmoz\.org.*', '.*netscape\..*', '.*search\.terra\..*', '.*www\.search\.com.*', '.*search\.sli\.sympatico\.ca.*', '.*excite\..*'] + +awstats_search_engines_2 = ['.*4\-counter\.com.*', '.*att\.net.*', '.*bungeebonesdotcom.*', '.*northernlight\..*', '.*hotbot\..*', '.*kvasir\..*', '.*webcrawler\..*', '.*metacrawler\..*', '.*go2net\.com.*', '.*(^|\.)go\.com.*', '.*euroseek\..*', '.*looksmart\..*', '.*spray\..*', '.*nbci\.com\/search.*', '.*de\.ask.\com.*', '.*es\.ask.\com.*', '.*fr\.ask.\com.*', '.*it\.ask.\com.*', '.*nl\.ask.\com.*', '.*uk\.ask.\com.*', '.*(^|\.)ask\.com.*', '.*atomz\..*', '.*overture\.com.*', '.*teoma\..*', '.*findarticles\.com.*', '.*infospace\.com.*', '.*mamma\..*', '.*dejanews\..*', '.*dogpile\.com.*', '.*wisenut\.com.*', '.*ixquick\.com.*', '.*search\.earthlink\.net.*', '.*i-une\.com.*', '.*blingo\.com.*', '.*centraldatabase\.org.*', '.*clusty\.com.*', '.*mysearch\..*', '.*vivisimo\.com.*', '.*kartoo\.com.*', '.*icerocket\.com.*', '.*sphere\.com.*', '.*ledix\.net.*', '.*start\.shaw\.ca.*', '.*searchalot\.com.*', '.*copernic\.com.*', '.*avantfind\.com.*', '.*steadysearch\.com.*', '.*steady-search\.com.*', '.*chello\.at.*', '.*chello\.be.*', '.*chello\.cz.*', '.*chello\.fr.*', '.*chello\.hu.*', '.*chello\.nl.*', '.*chello\.no.*', '.*chello\.pl.*', '.*chello\.se.*', '.*chello\.sk.*', '.*chello.*', '.*mirago\.be.*', '.*mirago\.ch.*', '.*mirago\.de.*', '.*mirago\.dk.*', '.*es\.mirago\.com.*', '.*mirago\.fr.*', '.*mirago\.it.*', '.*mirago\.nl.*', '.*no\.mirago\.com.*', '.*mirago\.se.*', '.*mirago\.co\.uk.*', '.*mirago.*', '.*answerbus\.com.*', '.*icq\.com\/search.*', '.*nusearch\.com.*', '.*goodsearch\.com.*', '.*scroogle\.org.*', '.*questionanswering\.com.*', '.*mywebsearch\.com.*', '.*as\.starware\.com.*', '.*del\.icio\.us.*', '.*digg\.com.*', '.*stumbleupon\.com.*', '.*swik\.net.*', '.*segnalo\.alice\.it.*', '.*ineffabile\.it.*', '.*anzwers\.com\.au.*', '.*engine\.exe.*', '.*miner\.bol\.com\.br.*', '.*\.baidu\.com.*', '.*\.vnet\.cn.*', '.*\.soso\.com.*', '.*\.sogou\.com.*', '.*\.3721\.com.*', '.*iask\.com.*', '.*\.accoona\.com.*', '.*\.163\.com.*', '.*\.zhongsou\.com.*', '.*atlas\.cz.*', '.*seznam\.cz.*', '.*quick\.cz.*', '.*centrum\.cz.*', '.*jyxo\.(cz|com).*', '.*najdi\.to.*', '.*redbox\.cz.*', '.*opasia\.dk.*', '.*danielsen\.com.*', '.*sol\.dk.*', '.*jubii\.dk.*', '.*find\.dk.*', '.*edderkoppen\.dk.*', '.*netstjernen\.dk.*', '.*orbis\.dk.*', '.*tyfon\.dk.*', '.*1klik\.dk.*', '.*ofir\.dk.*', '.*ilse\..*', '.*vindex\..*', '.*(^|\.)ask\.co\.uk.*', '.*bbc\.co\.uk/cgi-bin/search.*', '.*ifind\.freeserve.*', '.*looksmart\.co\.uk.*', '.*splut\..*', '.*spotjockey\..*', '.*ukdirectory\..*', '.*ukindex\.co\.uk.*', '.*ukplus\..*', '.*searchy\.co\.uk.*', '.*haku\.www\.fi.*', '.*recherche\.aol\.fr.*', '.*ctrouve\..*', '.*francite\..*', '.*\.lbb\.org.*', '.*rechercher\.libertysurf\.fr.*', '.*search[\w\-]+\.free\.fr.*', '.*recherche\.club-internet\.fr.*', '.*toile\.com.*', '.*biglotron\.com.*', '.*mozbot\.fr.*', '.*sucheaol\.aol\.de.*', '.*fireball\.de.*', '.*infoseek\.de.*', '.*suche\d?\.web\.de.*', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*', '.*suchen\.abacho\.de.*', '.*(brisbane|suche)\.t-online\.de.*', '.*allesklar\.de.*', '.*meinestadt\.de.*', '.*212\.227\.33\.241.*', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*', '.*wwweasel\.de.*', '.*netluchs\.de.*', '.*schoenerbrausen\.de.*', '.*heureka\.hu.*', '.*vizsla\.origo\.hu.*', '.*lapkereso\.hu.*', '.*goliat\.hu.*', '.*index\.hu.*', '.*wahoo\.hu.*', '.*webmania\.hu.*', '.*search\.internetto\.hu.*', '.*tango\.hu.*', '.*keresolap\.hu.*', '.*polymeta\.hu.*', '.*sify\.com.*', '.*virgilio\.it.*', '.*arianna\.libero\.it.*', '.*supereva\.com.*', '.*kataweb\.it.*', '.*search\.alice\.it\.master.*', '.*search\.alice\.it.*', '.*gotuneed\.com.*', '.*godado.*', '.*jumpy\.it.*', '.*shinyseek\.it.*', '.*teecno\.it.*', '.*ask\.jp.*', '.*sagool\.jp.*', '.*sok\.start\.no.*', '.*eniro\.no.*', '.*szukaj\.wp\.pl.*', '.*szukaj\.onet\.pl.*', '.*dodaj\.pl.*', '.*gazeta\.pl.*', '.*gery\.pl.*', '.*hoga\.pl.*', '.*netsprint\.pl.*', '.*interia\.pl.*', '.*katalog\.onet\.pl.*', '.*o2\.pl.*', '.*polska\.pl.*', '.*szukacz\.pl.*', '.*wow\.pl.*', '.*ya(ndex)?\.ru.*', '.*aport\.ru.*', '.*rambler\.ru.*', '.*turtle\.ru.*', '.*metabot\.ru.*', '.*evreka\.passagen\.se.*', '.*eniro\.se.*', '.*zoznam\.sk.*', '.*sapo\.pt.*', '.*search\.ch.*', '.*search\.bluewin\.ch.*', '.*pogodak\..*'] + +awstats_not_search_engines_keys = {'.*yahoo\..*' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', '.*altavista\..*' : 'babelfish\.altavista\.', '.*tiscali\..*' : 'mail\.tiscali\.', '.*yandex\..*' : 'direct\.yandex\.', '.*google\..*' : 'translate\.google\.', '.*msn\..*' : 'hotmail\.msn\.'} + +awstats_search_engines_hashid = {'.*search\.sli\.sympatico\.ca.*' : 'sympatico', '.*mywebsearch\.com.*' : 'mywebsearch', '.*netsprint\.pl\/hoga\-search.*' : 'hogapl', '.*findarticles\.com.*' : 'findarticles', '.*wow\.pl.*' : 'wowpl', '.*allesklar\.de.*' : 'allesklar', '.*atomz\..*' : 'atomz', '.*bing\..*' : 'bing', '.*find\.dk.*' : 'finddk', '.*google\..*' : 'google', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*' : 'yahoo', '.*pogodak\..*' : 'pogodak', '.*ask\.jp.*' : 'askjp', '.*\.baidu\.com.*' : 'baidu', '.*tango\.hu.*' : 'tango_hu', '.*gotuneed\.com.*' : 'gotuneed', '.*quick\.cz.*' : 'quick', '.*mirago.*' : 'mirago', '.*szukaj\.wp\.pl.*' : 'wp', '.*mirago\.de.*' : 'miragode', '.*mirago\.dk.*' : 'miragodk', '.*katalog\.onet\.pl.*' : 'katalogonetpl', '.*googlee\..*' : 'google', '.*orbis\.dk.*' : 'orbis', '.*turtle\.ru.*' : 'turtle', '.*zoznam\.sk.*' : 'zoznam', '.*start\.shaw\.ca.*' : 'shawca', '.*chello\.at.*' : 'chelloat', '.*centraldatabase\.org.*' : 'centraldatabase', '.*centrum\.cz.*' : 'centrum', '.*kataweb\.it.*' : 'kataweb', '.*\.lbb\.org.*' : 'lbb', '.*blingo\.com.*' : 'blingo', '.*vivisimo\.com.*' : 'vivisimo', '.*stumbleupon\.com.*' : 'stumbleupon', '.*es\.ask.\com.*' : 'askes', '.*interia\.pl.*' : 'interiapl', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*' : 'meta', '.*search\.alice\.it.*' : 'aliceit', '.*shinyseek\.it.*' : 'shinyseek\.it', '.*i-une\.com.*' : 'iune', '.*dejanews\..*' : 'dejanews', '.*opasia\.dk.*' : 'opasia', '.*chello\.cz.*' : 'chellocz', '.*ya(ndex)?\.ru.*' : 'yandex', '.*kartoo\.com.*' : 'kartoo', '.*arianna\.libero\.it.*' : 'arianna', '.*ofir\.dk.*' : 'ofir', '.*search\.earthlink\.net.*' : 'earthlink', '.*biglotron\.com.*' : 'biglotron', '.*lapkereso\.hu.*' : 'lapkereso', '.*216\.239\.(35|37|39|51)\.101.*' : 'google_cache', '.*miner\.bol\.com\.br.*' : 'miner', '.*dodaj\.pl.*' : 'dodajpl', '.*mirago\.be.*' : 'miragobe', '.*googlecom\.com.*' : 'google', '.*steadysearch\.com.*' : 'steadysearch', '.*redbox\.cz.*' : 'redbox', '.*haku\.www\.fi.*' : 'haku', '.*sapo\.pt.*' : 'sapo', '.*sphere\.com.*' : 'sphere', '.*danielsen\.com.*' : 'danielsen', '.*alexa\.com.*' : 'alexa', '.*mamma\..*' : 'mamma', '.*swik\.net.*' : 'swik', '.*polska\.pl.*' : 'polskapl', '.*groups\.google\..*' : 'google_groups', '.*metabot\.ru.*' : 'metabot', '.*rechercher\.libertysurf\.fr.*' : 'libertysurf', '.*szukaj\.onet\.pl.*' : 'onetpl', '.*aport\.ru.*' : 'aport', '.*de\.ask.\com.*' : 'askde', '.*splut\..*' : 'splut', '.*live\.com.*' : 'live', '.*216\.239\.5[0-9]\.104.*' : 'google_cache', '.*mysearch\..*' : 'mysearch', '.*ukplus\..*' : 'ukplus', '.*najdi\.to.*' : 'najdi', '.*overture\.com.*' : 'overture', '.*iask\.com.*' : 'iask', '.*nl\.ask.\com.*' : 'asknl', '.*nbci\.com\/search.*' : 'nbci', '.*search\.aol\.co.*' : 'aol', '.*eniro\.se.*' : 'enirose', '.*64\.233\.1[0-9]{2}\.104.*' : 'google_cache', '.*mirago\.ch.*' : 'miragoch', '.*altavista\..*' : 'altavista', '.*chello\.hu.*' : 'chellohu', '.*mozbot\.fr.*' : 'mozbot', '.*northernlight\..*' : 'northernlight', '.*mirago\.co\.uk.*' : 'miragocouk', '.*search[\w\-]+\.free\.fr.*' : 'free', '.*mindset\.research\.yahoo.*' : 'yahoo_mindset', '.*copernic\.com.*' : 'copernic', '.*heureka\.hu.*' : 'heureka', '.*steady-search\.com.*' : 'steadysearch', '.*teecno\.it.*' : 'teecnoit', '.*voila\..*' : 'voila', '.*netstjernen\.dk.*' : 'netstjernen', '.*keresolap\.hu.*' : 'keresolap_hu', '.*yahoo\..*' : 'yahoo', '.*icerocket\.com.*' : 'icerocket', '.*alltheweb\.com.*' : 'alltheweb', '.*www\.search\.com.*' : 'search.com', '.*digg\.com.*' : 'digg', '.*tiscali\..*' : 'tiscali', '.*spotjockey\..*' : 'spotjockey', '.*a9\.com.*' : 'a9', '.*(brisbane|suche)\.t-online\.de.*' : 't-online', '.*ifind\.freeserve.*' : 'freeserve', '.*att\.net.*' : 'att', '.*mirago\.it.*' : 'miragoit', '.*index\.hu.*' : 'indexhu', '.*\.sogou\.com.*' : 'sogou', '.*no\.mirago\.com.*' : 'miragono', '.*ineffabile\.it.*' : 'ineffabile', '.*netluchs\.de.*' : 'netluchs', '.*toile\.com.*' : 'toile', '.*search\..*\.\w+.*' : 'search', '.*del\.icio\.us.*' : 'delicious', '.*vizsla\.origo\.hu.*' : 'origo', '.*netscape\..*' : 'netscape', '.*dogpile\.com.*' : 'dogpile', '.*anzwers\.com\.au.*' : 'anzwers', '.*\.zhongsou\.com.*' : 'zhongsou', '.*ctrouve\..*' : 'ctrouve', '.*gazeta\.pl.*' : 'gazetapl', '.*recherche\.club-internet\.fr.*' : 'clubinternet', '.*sok\.start\.no.*' : 'start', '.*scroogle\.org.*' : 'scroogle', '.*schoenerbrausen\.de.*' : 'schoenerbrausen', '.*looksmart\.co\.uk.*' : 'looksmartuk', '.*wwweasel\.de.*' : 'wwweasel', '.*godado.*' : 'godado', '.*216\.239\.(35|37|39|51)\.100.*' : 'google_cache', '.*jubii\.dk.*' : 'jubii', '.*212\.227\.33\.241.*' : 'metaspinner', '.*mirago\.fr.*' : 'miragofr', '.*sol\.dk.*' : 'sol', '.*bbc\.co\.uk/cgi-bin/search.*' : 'bbc', '.*jumpy\.it.*' : 'jumpy\.it', '.*francite\..*' : 'francite', '.*infoseek\.de.*' : 'infoseek', '.*es\.mirago\.com.*' : 'miragoes', '.*jyxo\.(cz|com).*' : 'jyxo', '.*hotbot\..*' : 'hotbot', '.*engine\.exe.*' : 'engine', '.*(^|\.)ask\.com.*' : 'ask', '.*goliat\.hu.*' : 'goliat', '.*wisenut\.com.*' : 'wisenut', '.*mirago\.nl.*' : 'miragonl', '.*base\.google\..*' : 'google_base', '.*search\.bluewin\.ch.*' : 'bluewin', '.*lycos\..*' : 'lycos', '.*meinestadt\.de.*' : 'meinestadt', '.*4\-counter\.com.*' : 'google4counter', '.*search\.alice\.it\.master.*' : 'aliceitmaster', '.*teoma\..*' : 'teoma', '.*(^|\.)ask\.co\.uk.*' : 'askuk', '.*tyfon\.dk.*' : 'tyfon', '.*froogle\.google\..*' : 'google_froogle', '.*ukdirectory\..*' : 'ukdirectory', '.*ledix\.net.*' : 'ledix', '.*edderkoppen\.dk.*' : 'edderkoppen', '.*recherche\.aol\.fr.*' : 'aolfr', '.*google\.[\w.]+/products.*' : 'google_products', '.*webmania\.hu.*' : 'webmania', '.*searchy\.co\.uk.*' : 'searchy', '.*fr\.ask.\com.*' : 'askfr', '.*spray\..*' : 'spray', '.*72\.14\.2[0-9]{2}\.104.*' : 'google_cache', '.*eniro\.no.*' : 'eniro', '.*goodsearch\.com.*' : 'goodsearch', '.*kvasir\..*' : 'kvasir', '.*\.accoona\.com.*' : 'accoona', '.*\.soso\.com.*' : 'soso', '.*as\.starware\.com.*' : 'comettoolbar', '.*virgilio\.it.*' : 'virgilio', '.*o2\.pl.*' : 'o2pl', '.*chello\.nl.*' : 'chellonl', '.*chello\.be.*' : 'chellobe', '.*icq\.com\/search.*' : 'icq', '.*msn\..*' : 'msn', '.*fireball\.de.*' : 'fireball', '.*sucheaol\.aol\.de.*' : 'aolde', '.*uk\.ask.\com.*' : 'askuk', '.*euroseek\..*' : 'euroseek', '.*gery\.pl.*' : 'gerypl', '.*chello\.fr.*' : 'chellofr', '.*netsprint\.pl.*' : 'netsprintpl', '.*avantfind\.com.*' : 'avantfind', '.*supereva\.com.*' : 'supereva', '.*polymeta\.hu.*' : 'polymeta_hu', '.*infospace\.com.*' : 'infospace', '.*sify\.com.*' : 'sify', '.*go2net\.com.*' : 'go2net', '.*wahoo\.hu.*' : 'wahoo', '.*suche\d?\.web\.de.*' : 'webde', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*' : 'metacrawler_de', '.*\.3721\.com.*' : '3721', '.*ilse\..*' : 'ilse', '.*metacrawler\..*' : 'metacrawler', '.*sagool\.jp.*' : 'sagool', '.*atlas\.cz.*' : 'atlas', '.*vindex\..*' : 'vindex', '.*ixquick\.com.*' : 'ixquick', '.*66\.102\.[1-9]\.104.*' : 'google_cache', '.*rambler\.ru.*' : 'rambler', '.*answerbus\.com.*' : 'answerbus', '.*evreka\.passagen\.se.*' : 'passagen', '.*chello\.se.*' : 'chellose', '.*clusty\.com.*' : 'clusty', '.*search\.ch.*' : 'searchch', '.*chello\.no.*' : 'chellono', '.*searchalot\.com.*' : 'searchalot', '.*questionanswering\.com.*' : 'questionanswering', '.*seznam\.cz.*' : 'seznam', '.*ukindex\.co\.uk.*' : 'ukindex', '.*dmoz\.org.*' : 'dmoz', '.*excite\..*' : 'excite', '.*chello\.pl.*' : 'chellopl', '.*looksmart\..*' : 'looksmart', '.*1klik\.dk.*' : '1klik', '.*\.vnet\.cn.*' : 'vnet', '.*chello\.sk.*' : 'chellosk', '.*(^|\.)go\.com.*' : 'go', '.*nusearch\.com.*' : 'nusearch', '.*it\.ask.\com.*' : 'askit', '.*bungeebonesdotcom.*' : 'bungeebonesdotcom', '.*search\.terra\..*' : 'terra', '.*webcrawler\..*' : 'webcrawler', '.*suchen\.abacho\.de.*' : 'abacho', '.*szukacz\.pl.*' : 'szukaczpl', '.*66\.249\.93\.104.*' : 'google_cache', '.*search\.internetto\.hu.*' : 'internetto', '.*goggle\.co\.hu.*' : 'google', '.*mirago\.se.*' : 'miragose', '.*images\.google\..*' : 'google_image', '.*segnalo\.alice\.it.*' : 'segnalo', '.*\.163\.com.*' : 'netease', '.*chello.*' : 'chellocom'} + From b11411f1155fb2ad5eb97b4da6e7c0a02d4ab83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 16:18:26 +0100 Subject: [PATCH 027/195] WIP --- awstats_robots_data.py | 2 -- robots.py | 2 -- search_engines.py | 8 -------- 3 files changed, 12 deletions(-) delete mode 100644 awstats_robots_data.py delete mode 100644 robots.py delete mode 100644 search_engines.py diff --git a/awstats_robots_data.py b/awstats_robots_data.py deleted file mode 100644 index 8373f65..0000000 --- a/awstats_robots_data.py +++ /dev/null @@ -1,2 +0,0 @@ -awstats_robots = ['.*appie.*', '.*architext.*', '.*jeeves.*', '.*bjaaland.*', '.*contentmatch.*', '.*ferret.*', '.*googlebot.*', '.*google\-sitemaps.*', '.*gulliver.*', '.*virus[_+ ]detector.*', '.*harvest.*', '.*htdig.*', '.*linkwalker.*', '.*lilina.*', '.*lycos[_+ ].*', '.*moget.*', '.*muscatferret.*', '.*myweb.*', '.*nomad.*', '.*scooter.*', '.*slurp.*', '.*^voyager\/.*', '.*weblayers.*', '.*antibot.*', '.*bruinbot.*', '.*digout4u.*', '.*echo!.*', '.*fast\-webcrawler.*', '.*ia_archiver\-web\.archive\.org.*', '.*ia_archiver.*', '.*jennybot.*', '.*mercator.*', '.*netcraft.*', '.*msnbot\-media.*', '.*msnbot.*', '.*petersnews.*', '.*relevantnoise\.com.*', '.*unlost_web_crawler.*', '.*voila.*', '.*webbase.*', '.*webcollage.*', '.*cfetch.*', '.*zyborg.*', '.*wisenutbot.*', '.*[^a]fish.*', '.*abcdatos.*', '.*acme\.spider.*', '.*ahoythehomepagefinder.*', '.*alkaline.*', '.*anthill.*', '.*arachnophilia.*', '.*arale.*', '.*araneo.*', '.*aretha.*', '.*ariadne.*', '.*powermarks.*', '.*arks.*', '.*aspider.*', '.*atn\.txt.*', '.*atomz.*', '.*auresys.*', '.*backrub.*', '.*bbot.*', '.*bigbrother.*', '.*blackwidow.*', '.*blindekuh.*', '.*bloodhound.*', '.*borg\-bot.*', '.*brightnet.*', '.*bspider.*', '.*cactvschemistryspider.*', '.*calif[^r].*', '.*cassandra.*', '.*cgireader.*', '.*checkbot.*', '.*christcrawler.*', '.*churl.*', '.*cienciaficcion.*', '.*collective.*', '.*combine.*', '.*conceptbot.*', '.*coolbot.*', '.*core.*', '.*cosmos.*', '.*cruiser.*', '.*cusco.*', '.*cyberspyder.*', '.*desertrealm.*', '.*deweb.*', '.*dienstspider.*', '.*digger.*', '.*diibot.*', '.*direct_hit.*', '.*dnabot.*', '.*download_express.*', '.*dragonbot.*', '.*dwcp.*', '.*e\-collector.*', '.*ebiness.*', '.*elfinbot.*', '.*emacs.*', '.*emcspider.*', '.*esther.*', '.*evliyacelebi.*', '.*fastcrawler.*', '.*feedcrawl.*', '.*fdse.*', '.*felix.*', '.*fetchrover.*', '.*fido.*', '.*finnish.*', '.*fireball.*', '.*fouineur.*', '.*francoroute.*', '.*freecrawl.*', '.*funnelweb.*', '.*gama.*', '.*gazz.*', '.*gcreep.*', '.*getbot.*', '.*geturl.*', '.*golem.*', '.*gougou.*', '.*grapnel.*', '.*griffon.*', '.*gromit.*', '.*gulperbot.*', '.*hambot.*', '.*havindex.*', '.*hometown.*', '.*htmlgobble.*', '.*hyperdecontextualizer.*', '.*iajabot.*', '.*iaskspider.*', '.*hl_ftien_spider.*', '.*sogou.*', '.*iconoclast.*', '.*ilse.*', '.*imagelock.*', '.*incywincy.*', '.*informant.*', '.*infoseek.*', '.*infoseeksidewinder.*', '.*infospider.*', '.*inspectorwww.*', '.*intelliagent.*', '.*irobot.*', '.*iron33.*', '.*israelisearch.*', '.*javabee.*', '.*jbot.*', '.*jcrawler.*', '.*jobo.*', '.*jobot.*', '.*joebot.*', '.*jubii.*', '.*jumpstation.*', '.*kapsi.*', '.*katipo.*', '.*kilroy.*', '.*ko[_+ ]yappo[_+ ]robot.*', '.*kummhttp.*', '.*labelgrabber\.txt.*', '.*larbin.*', '.*legs.*', '.*linkidator.*', '.*linkscan.*', '.*lockon.*', '.*logo_gif.*', '.*macworm.*', '.*magpie.*', '.*marvin.*', '.*mattie.*', '.*mediafox.*', '.*merzscope.*', '.*meshexplorer.*', '.*mindcrawler.*', '.*mnogosearch.*', '.*momspider.*', '.*monster.*', '.*motor.*', '.*muncher.*', '.*mwdsearch.*', '.*ndspider.*', '.*nederland\.zoek.*', '.*netcarta.*', '.*netmechanic.*', '.*netscoop.*', '.*newscan\-online.*', '.*nhse.*', '.*northstar.*', '.*nzexplorer.*', '.*objectssearch.*', '.*occam.*', '.*octopus.*', '.*openfind.*', '.*orb_search.*', '.*packrat.*', '.*pageboy.*', '.*parasite.*', '.*patric.*', '.*pegasus.*', '.*perignator.*', '.*perlcrawler.*', '.*phantom.*', '.*phpdig.*', '.*piltdownman.*', '.*pimptrain.*', '.*pioneer.*', '.*pitkow.*', '.*pjspider.*', '.*plumtreewebaccessor.*', '.*poppi.*', '.*portalb.*', '.*psbot.*', '.*python.*', '.*raven.*', '.*rbse.*', '.*resumerobot.*', '.*rhcs.*', '.*road_runner.*', '.*robbie.*', '.*robi.*', '.*robocrawl.*', '.*robofox.*', '.*robozilla.*', '.*roverbot.*', '.*rules.*', '.*safetynetrobot.*', '.*search\-info.*', '.*search_au.*', '.*searchprocess.*', '.*senrigan.*', '.*sgscout.*', '.*shaggy.*', '.*shaihulud.*', '.*sift.*', '.*simbot.*', '.*site\-valet.*', '.*sitetech.*', '.*skymob.*', '.*slcrawler.*', '.*smartspider.*', '.*snooper.*', '.*solbot.*', '.*speedy.*', '.*spider[_+ ]monkey.*', '.*spiderbot.*', '.*spiderline.*', '.*spiderman.*', '.*spiderview.*', '.*spry.*', '.*sqworm.*', '.*ssearcher.*', '.*suke.*', '.*sunrise.*', '.*suntek.*', '.*sven.*', '.*tach_bw.*', '.*tagyu_agent.*', '.*tailrank.*', '.*tarantula.*', '.*tarspider.*', '.*techbot.*', '.*templeton.*', '.*titan.*', '.*titin.*', '.*tkwww.*', '.*tlspider.*', '.*ucsd.*', '.*udmsearch.*', '.*universalfeedparser.*', '.*urlck.*', '.*valkyrie.*', '.*verticrawl.*', '.*victoria.*', '.*visionsearch.*', '.*voidbot.*', '.*vwbot.*', '.*w3index.*', '.*w3m2.*', '.*wallpaper.*', '.*wanderer.*', '.*wapspIRLider.*', '.*webbandit.*', '.*webcatcher.*', '.*webcopy.*', '.*webfetcher.*', '.*webfoot.*', '.*webinator.*', '.*weblinker.*', '.*webmirror.*', '.*webmoose.*', '.*webquest.*', '.*webreader.*', '.*webreaper.*', '.*websnarf.*', '.*webspider.*', '.*webvac.*', '.*webwalk.*', '.*webwalker.*', '.*webwatch.*', '.*whatuseek.*', '.*whowhere.*', '.*wired\-digital.*', '.*wmir.*', '.*wolp.*', '.*wombat.*', '.*wordpress.*', '.*worm.*', '.*woozweb.*', '.*wwwc.*', '.*wz101.*', '.*xget.*', '.*1\-more_scanner.*', '.*accoona\-ai\-agent.*', '.*activebookmark.*', '.*adamm_bot.*', '.*almaden.*', '.*aipbot.*', '.*aleadsoftbot.*', '.*alpha_search_agent.*', '.*allrati.*', '.*aport.*', '.*archive\.org_bot.*', '.*argus.*', '.*arianna\.libero\.it.*', '.*aspseek.*', '.*asterias.*', '.*awbot.*', '.*baiduspider.*', '.*becomebot.*', '.*bender.*', '.*betabot.*', '.*biglotron.*', '.*bittorrent_bot.*', '.*biz360[_+ ]spider.*', '.*blogbridge[_+ ]service.*', '.*bloglines.*', '.*blogpulse.*', '.*blogsearch.*', '.*blogshares.*', '.*blogslive.*', '.*blogssay.*', '.*bncf\.firenze\.sbn\.it\/raccolta\.txt.*', '.*bobby.*', '.*boitho\.com\-dc.*', '.*bookmark\-manager.*', '.*boris.*', '.*bumblebee.*', '.*candlelight[_+ ]favorites[_+ ]inspector.*', '.*cbn00glebot.*', '.*cerberian_drtrs.*', '.*cfnetwork.*', '.*cipinetbot.*', '.*checkweb_link_validator.*', '.*commons\-httpclient.*', '.*computer_and_automation_research_institute_crawler.*', '.*converamultimediacrawler.*', '.*converacrawler.*', '.*cscrawler.*', '.*cse_html_validator_lite_online.*', '.*cuasarbot.*', '.*cursor.*', '.*custo.*', '.*datafountains\/dmoz_downloader.*', '.*daviesbot.*', '.*daypopbot.*', '.*deepindex.*', '.*dipsie\.bot.*', '.*dnsgroup.*', '.*domainchecker.*', '.*domainsdb\.net.*', '.*dulance.*', '.*dumbot.*', '.*dumm\.de\-bot.*', '.*earthcom\.info.*', '.*easydl.*', '.*edgeio\-retriever.*', '.*ets_v.*', '.*exactseek.*', '.*extreme[_+ ]picture[_+ ]finder.*', '.*eventax.*', '.*everbeecrawler.*', '.*everest\-vulcan.*', '.*ezresult.*', '.*enteprise.*', '.*facebook.*', '.*fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de.*', '.*fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de.*', '.*matrix_s\.p\.a\._\-_fast_enterprise_crawler.*', '.*fast_enterprise_crawler.*', '.*fast\-search\-engine.*', '.*favicon.*', '.*favorg.*', '.*favorites_sweeper.*', '.*feedburner.*', '.*feedfetcher\-google.*', '.*feedflow.*', '.*feedster.*', '.*feedsky.*', '.*feedvalidator.*', '.*filmkamerabot.*', '.*findlinks.*', '.*findexa_crawler.*', '.*fooky\.com\/ScorpionBot.*', '.*g2crawler.*', '.*gaisbot.*', '.*geniebot.*', '.*gigabot.*', '.*girafabot.*', '.*global_fetch.*', '.*gnodspider.*', '.*goforit\.com.*', '.*goforitbot.*', '.*gonzo.*', '.*grub.*', '.*gpu_p2p_crawler.*', '.*henrythemiragorobot.*', '.*heritrix.*', '.*holmes.*', '.*hoowwwer.*', '.*hpprint.*', '.*htmlparser.*', '.*html[_+ ]link[_+ ]validator.*', '.*httrack.*', '.*hundesuche\.com\-bot.*', '.*ichiro.*', '.*iltrovatore\-setaccio.*', '.*infobot.*', '.*infociousbot.*', '.*infomine.*', '.*insurancobot.*', '.*internet[_+ ]ninja.*', '.*internetarchive.*', '.*internetseer.*', '.*internetsupervision.*', '.*irlbot.*', '.*isearch2006.*', '.*iupui_research_bot.*', '.*jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility.*', '.*justview.*', '.*kalambot.*', '.*kamano\.de_newsfeedverzeichnis.*', '.*kazoombot.*', '.*kevin.*', '.*keyoshid.*', '.*kinjabot.*', '.*kinja\-imagebot.*', '.*knowitall.*', '.*knowledge\.com.*', '.*kouaa_krawler.*', '.*krugle.*', '.*ksibot.*', '.*kurzor.*', '.*lanshanbot.*', '.*letscrawl\.com.*', '.*libcrawl.*', '.*linkbot.*', '.*link_valet_online.*', '.*metager\-linkchecker.*', '.*linkchecker.*', '.*livejournal\.com.*', '.*lmspider.*', '.*lwp\-request.*', '.*lwp\-trivial.*', '.*magpierss.*', '.*mail\.ru.*', '.*mapoftheinternet\.com.*', '.*mediapartners\-google.*', '.*megite.*', '.*metaspinner.*', '.*microsoft[_+ ]url[_+ ]control.*', '.*mini\-reptile.*', '.*minirank.*', '.*missigua_locator.*', '.*misterbot.*', '.*miva.*', '.*mizzu_labs.*', '.*mj12bot.*', '.*mojeekbot.*', '.*msiecrawler.*', '.*ms_search_4\.0_robot.*', '.*msrabot.*', '.*msrbot.*', '.*mt::telegraph::agent.*', '.*nagios.*', '.*nasa_search.*', '.*mydoyouhike.*', '.*netluchs.*', '.*netsprint.*', '.*newsgatoronline.*', '.*nicebot.*', '.*nimblecrawler.*', '.*noxtrumbot.*', '.*npbot.*', '.*nutchcvs.*', '.*nutchosu\-vlib.*', '.*nutch.*', '.*ocelli.*', '.*octora_beta_bot.*', '.*omniexplorer[_+ ]bot.*', '.*onet\.pl[_+ ]sa.*', '.*onfolio.*', '.*opentaggerbot.*', '.*openwebspider.*', '.*oracle_ultra_search.*', '.*orbiter.*', '.*yodaobot.*', '.*qihoobot.*', '.*passwordmaker\.org.*', '.*pear_http_request_class.*', '.*peerbot.*', '.*perman.*', '.*php[_+ ]version[_+ ]tracker.*', '.*pictureofinternet.*', '.*ping\.blo\.gs.*', '.*plinki.*', '.*pluckfeedcrawler.*', '.*pogodak.*', '.*pompos.*', '.*popdexter.*', '.*port_huron_labs.*', '.*postfavorites.*', '.*projectwf\-java\-test\-crawler.*', '.*proodlebot.*', '.*pyquery.*', '.*rambler.*', '.*redalert.*', '.*rojo.*', '.*rssimagesbot.*', '.*ruffle.*', '.*rufusbot.*', '.*sandcrawler.*', '.*sbider.*', '.*schizozilla.*', '.*scumbot.*', '.*searchguild[_+ ]dmoz[_+ ]experiment.*', '.*seekbot.*', '.*sensis_web_crawler.*', '.*seznambot.*', '.*shim\-crawler.*', '.*shoutcast.*', '.*slysearch.*', '.*snap\.com_beta_crawler.*', '.*sohu\-search.*', '.*sohu.*', '.*snappy.*', '.*sphere_scout.*', '.*spip.*', '.*sproose_crawler.*', '.*steeler.*', '.*steroid__download.*', '.*suchfin\-bot.*', '.*superbot.*', '.*surveybot.*', '.*susie.*', '.*syndic8.*', '.*syndicapi.*', '.*synoobot.*', '.*tcl_http_client_package.*', '.*technoratibot.*', '.*teragramcrawlersurf.*', '.*test_crawler.*', '.*testbot.*', '.*t\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e.*', '.*topicblogs.*', '.*turnitinbot.*', '.*turtlescanner.*', '.*turtle.*', '.*tutorgigbot.*', '.*twiceler.*', '.*ubicrawler.*', '.*ultraseek.*', '.*unchaos_bot_hybrid_web_search_engine.*', '.*unido\-bot.*', '.*updated.*', '.*ustc\-semantic\-group.*', '.*vagabondo\-wap.*', '.*vagabondo.*', '.*vermut.*', '.*versus_crawler_from_eda\.baykan@epfl\.ch.*', '.*vespa_crawler.*', '.*vortex.*', '.*vse\/.*', '.*w3c\-checklink.*', '.*w3c[_+ ]css[_+ ]validator[_+ ]jfouffa.*', '.*w3c_validator.*', '.*watchmouse.*', '.*wavefire.*', '.*webclipping\.com.*', '.*webcompass.*', '.*webcrawl\.net.*', '.*web_downloader.*', '.*webdup.*', '.*webfilter.*', '.*webindexer.*', '.*webminer.*', '.*website[_+ ]monitoring[_+ ]bot.*', '.*webvulncrawl.*', '.*wells_search.*', '.*wonderer.*', '.*wume_crawler.*', '.*wwweasel.*', '.*xenu\'s_link_sleuth.*', '.*xenu_link_sleuth.*', '.*xirq.*', '.*y!j.*', '.*yacy.*', '.*yahoo\-blogs.*', '.*yahoo\-verticalcrawler.*', '.*yahoofeedseeker.*', '.*yahooseeker\-testing.*', '.*yahooseeker.*', '.*yahoo\-mmcrawler.*', '.*yahoo!_mindset.*', '.*yandex.*', '.*flexum.*', '.*yanga.*', '.*yooglifetchagent.*', '.*z\-add_link_checker.*', '.*zealbot.*', '.*zhuaxia.*', '.*zspider.*', '.*zeus.*', '.*ng\/1\..*', '.*ng\/2\..*', '.*exabot.*', '.*wget.*', '.*libwww.*', '.*java\/[0-9].*'] - diff --git a/robots.py b/robots.py deleted file mode 100644 index 8373f65..0000000 --- a/robots.py +++ /dev/null @@ -1,2 +0,0 @@ -awstats_robots = ['.*appie.*', '.*architext.*', '.*jeeves.*', '.*bjaaland.*', '.*contentmatch.*', '.*ferret.*', '.*googlebot.*', '.*google\-sitemaps.*', '.*gulliver.*', '.*virus[_+ ]detector.*', '.*harvest.*', '.*htdig.*', '.*linkwalker.*', '.*lilina.*', '.*lycos[_+ ].*', '.*moget.*', '.*muscatferret.*', '.*myweb.*', '.*nomad.*', '.*scooter.*', '.*slurp.*', '.*^voyager\/.*', '.*weblayers.*', '.*antibot.*', '.*bruinbot.*', '.*digout4u.*', '.*echo!.*', '.*fast\-webcrawler.*', '.*ia_archiver\-web\.archive\.org.*', '.*ia_archiver.*', '.*jennybot.*', '.*mercator.*', '.*netcraft.*', '.*msnbot\-media.*', '.*msnbot.*', '.*petersnews.*', '.*relevantnoise\.com.*', '.*unlost_web_crawler.*', '.*voila.*', '.*webbase.*', '.*webcollage.*', '.*cfetch.*', '.*zyborg.*', '.*wisenutbot.*', '.*[^a]fish.*', '.*abcdatos.*', '.*acme\.spider.*', '.*ahoythehomepagefinder.*', '.*alkaline.*', '.*anthill.*', '.*arachnophilia.*', '.*arale.*', '.*araneo.*', '.*aretha.*', '.*ariadne.*', '.*powermarks.*', '.*arks.*', '.*aspider.*', '.*atn\.txt.*', '.*atomz.*', '.*auresys.*', '.*backrub.*', '.*bbot.*', '.*bigbrother.*', '.*blackwidow.*', '.*blindekuh.*', '.*bloodhound.*', '.*borg\-bot.*', '.*brightnet.*', '.*bspider.*', '.*cactvschemistryspider.*', '.*calif[^r].*', '.*cassandra.*', '.*cgireader.*', '.*checkbot.*', '.*christcrawler.*', '.*churl.*', '.*cienciaficcion.*', '.*collective.*', '.*combine.*', '.*conceptbot.*', '.*coolbot.*', '.*core.*', '.*cosmos.*', '.*cruiser.*', '.*cusco.*', '.*cyberspyder.*', '.*desertrealm.*', '.*deweb.*', '.*dienstspider.*', '.*digger.*', '.*diibot.*', '.*direct_hit.*', '.*dnabot.*', '.*download_express.*', '.*dragonbot.*', '.*dwcp.*', '.*e\-collector.*', '.*ebiness.*', '.*elfinbot.*', '.*emacs.*', '.*emcspider.*', '.*esther.*', '.*evliyacelebi.*', '.*fastcrawler.*', '.*feedcrawl.*', '.*fdse.*', '.*felix.*', '.*fetchrover.*', '.*fido.*', '.*finnish.*', '.*fireball.*', '.*fouineur.*', '.*francoroute.*', '.*freecrawl.*', '.*funnelweb.*', '.*gama.*', '.*gazz.*', '.*gcreep.*', '.*getbot.*', '.*geturl.*', '.*golem.*', '.*gougou.*', '.*grapnel.*', '.*griffon.*', '.*gromit.*', '.*gulperbot.*', '.*hambot.*', '.*havindex.*', '.*hometown.*', '.*htmlgobble.*', '.*hyperdecontextualizer.*', '.*iajabot.*', '.*iaskspider.*', '.*hl_ftien_spider.*', '.*sogou.*', '.*iconoclast.*', '.*ilse.*', '.*imagelock.*', '.*incywincy.*', '.*informant.*', '.*infoseek.*', '.*infoseeksidewinder.*', '.*infospider.*', '.*inspectorwww.*', '.*intelliagent.*', '.*irobot.*', '.*iron33.*', '.*israelisearch.*', '.*javabee.*', '.*jbot.*', '.*jcrawler.*', '.*jobo.*', '.*jobot.*', '.*joebot.*', '.*jubii.*', '.*jumpstation.*', '.*kapsi.*', '.*katipo.*', '.*kilroy.*', '.*ko[_+ ]yappo[_+ ]robot.*', '.*kummhttp.*', '.*labelgrabber\.txt.*', '.*larbin.*', '.*legs.*', '.*linkidator.*', '.*linkscan.*', '.*lockon.*', '.*logo_gif.*', '.*macworm.*', '.*magpie.*', '.*marvin.*', '.*mattie.*', '.*mediafox.*', '.*merzscope.*', '.*meshexplorer.*', '.*mindcrawler.*', '.*mnogosearch.*', '.*momspider.*', '.*monster.*', '.*motor.*', '.*muncher.*', '.*mwdsearch.*', '.*ndspider.*', '.*nederland\.zoek.*', '.*netcarta.*', '.*netmechanic.*', '.*netscoop.*', '.*newscan\-online.*', '.*nhse.*', '.*northstar.*', '.*nzexplorer.*', '.*objectssearch.*', '.*occam.*', '.*octopus.*', '.*openfind.*', '.*orb_search.*', '.*packrat.*', '.*pageboy.*', '.*parasite.*', '.*patric.*', '.*pegasus.*', '.*perignator.*', '.*perlcrawler.*', '.*phantom.*', '.*phpdig.*', '.*piltdownman.*', '.*pimptrain.*', '.*pioneer.*', '.*pitkow.*', '.*pjspider.*', '.*plumtreewebaccessor.*', '.*poppi.*', '.*portalb.*', '.*psbot.*', '.*python.*', '.*raven.*', '.*rbse.*', '.*resumerobot.*', '.*rhcs.*', '.*road_runner.*', '.*robbie.*', '.*robi.*', '.*robocrawl.*', '.*robofox.*', '.*robozilla.*', '.*roverbot.*', '.*rules.*', '.*safetynetrobot.*', '.*search\-info.*', '.*search_au.*', '.*searchprocess.*', '.*senrigan.*', '.*sgscout.*', '.*shaggy.*', '.*shaihulud.*', '.*sift.*', '.*simbot.*', '.*site\-valet.*', '.*sitetech.*', '.*skymob.*', '.*slcrawler.*', '.*smartspider.*', '.*snooper.*', '.*solbot.*', '.*speedy.*', '.*spider[_+ ]monkey.*', '.*spiderbot.*', '.*spiderline.*', '.*spiderman.*', '.*spiderview.*', '.*spry.*', '.*sqworm.*', '.*ssearcher.*', '.*suke.*', '.*sunrise.*', '.*suntek.*', '.*sven.*', '.*tach_bw.*', '.*tagyu_agent.*', '.*tailrank.*', '.*tarantula.*', '.*tarspider.*', '.*techbot.*', '.*templeton.*', '.*titan.*', '.*titin.*', '.*tkwww.*', '.*tlspider.*', '.*ucsd.*', '.*udmsearch.*', '.*universalfeedparser.*', '.*urlck.*', '.*valkyrie.*', '.*verticrawl.*', '.*victoria.*', '.*visionsearch.*', '.*voidbot.*', '.*vwbot.*', '.*w3index.*', '.*w3m2.*', '.*wallpaper.*', '.*wanderer.*', '.*wapspIRLider.*', '.*webbandit.*', '.*webcatcher.*', '.*webcopy.*', '.*webfetcher.*', '.*webfoot.*', '.*webinator.*', '.*weblinker.*', '.*webmirror.*', '.*webmoose.*', '.*webquest.*', '.*webreader.*', '.*webreaper.*', '.*websnarf.*', '.*webspider.*', '.*webvac.*', '.*webwalk.*', '.*webwalker.*', '.*webwatch.*', '.*whatuseek.*', '.*whowhere.*', '.*wired\-digital.*', '.*wmir.*', '.*wolp.*', '.*wombat.*', '.*wordpress.*', '.*worm.*', '.*woozweb.*', '.*wwwc.*', '.*wz101.*', '.*xget.*', '.*1\-more_scanner.*', '.*accoona\-ai\-agent.*', '.*activebookmark.*', '.*adamm_bot.*', '.*almaden.*', '.*aipbot.*', '.*aleadsoftbot.*', '.*alpha_search_agent.*', '.*allrati.*', '.*aport.*', '.*archive\.org_bot.*', '.*argus.*', '.*arianna\.libero\.it.*', '.*aspseek.*', '.*asterias.*', '.*awbot.*', '.*baiduspider.*', '.*becomebot.*', '.*bender.*', '.*betabot.*', '.*biglotron.*', '.*bittorrent_bot.*', '.*biz360[_+ ]spider.*', '.*blogbridge[_+ ]service.*', '.*bloglines.*', '.*blogpulse.*', '.*blogsearch.*', '.*blogshares.*', '.*blogslive.*', '.*blogssay.*', '.*bncf\.firenze\.sbn\.it\/raccolta\.txt.*', '.*bobby.*', '.*boitho\.com\-dc.*', '.*bookmark\-manager.*', '.*boris.*', '.*bumblebee.*', '.*candlelight[_+ ]favorites[_+ ]inspector.*', '.*cbn00glebot.*', '.*cerberian_drtrs.*', '.*cfnetwork.*', '.*cipinetbot.*', '.*checkweb_link_validator.*', '.*commons\-httpclient.*', '.*computer_and_automation_research_institute_crawler.*', '.*converamultimediacrawler.*', '.*converacrawler.*', '.*cscrawler.*', '.*cse_html_validator_lite_online.*', '.*cuasarbot.*', '.*cursor.*', '.*custo.*', '.*datafountains\/dmoz_downloader.*', '.*daviesbot.*', '.*daypopbot.*', '.*deepindex.*', '.*dipsie\.bot.*', '.*dnsgroup.*', '.*domainchecker.*', '.*domainsdb\.net.*', '.*dulance.*', '.*dumbot.*', '.*dumm\.de\-bot.*', '.*earthcom\.info.*', '.*easydl.*', '.*edgeio\-retriever.*', '.*ets_v.*', '.*exactseek.*', '.*extreme[_+ ]picture[_+ ]finder.*', '.*eventax.*', '.*everbeecrawler.*', '.*everest\-vulcan.*', '.*ezresult.*', '.*enteprise.*', '.*facebook.*', '.*fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de.*', '.*fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de.*', '.*matrix_s\.p\.a\._\-_fast_enterprise_crawler.*', '.*fast_enterprise_crawler.*', '.*fast\-search\-engine.*', '.*favicon.*', '.*favorg.*', '.*favorites_sweeper.*', '.*feedburner.*', '.*feedfetcher\-google.*', '.*feedflow.*', '.*feedster.*', '.*feedsky.*', '.*feedvalidator.*', '.*filmkamerabot.*', '.*findlinks.*', '.*findexa_crawler.*', '.*fooky\.com\/ScorpionBot.*', '.*g2crawler.*', '.*gaisbot.*', '.*geniebot.*', '.*gigabot.*', '.*girafabot.*', '.*global_fetch.*', '.*gnodspider.*', '.*goforit\.com.*', '.*goforitbot.*', '.*gonzo.*', '.*grub.*', '.*gpu_p2p_crawler.*', '.*henrythemiragorobot.*', '.*heritrix.*', '.*holmes.*', '.*hoowwwer.*', '.*hpprint.*', '.*htmlparser.*', '.*html[_+ ]link[_+ ]validator.*', '.*httrack.*', '.*hundesuche\.com\-bot.*', '.*ichiro.*', '.*iltrovatore\-setaccio.*', '.*infobot.*', '.*infociousbot.*', '.*infomine.*', '.*insurancobot.*', '.*internet[_+ ]ninja.*', '.*internetarchive.*', '.*internetseer.*', '.*internetsupervision.*', '.*irlbot.*', '.*isearch2006.*', '.*iupui_research_bot.*', '.*jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility.*', '.*justview.*', '.*kalambot.*', '.*kamano\.de_newsfeedverzeichnis.*', '.*kazoombot.*', '.*kevin.*', '.*keyoshid.*', '.*kinjabot.*', '.*kinja\-imagebot.*', '.*knowitall.*', '.*knowledge\.com.*', '.*kouaa_krawler.*', '.*krugle.*', '.*ksibot.*', '.*kurzor.*', '.*lanshanbot.*', '.*letscrawl\.com.*', '.*libcrawl.*', '.*linkbot.*', '.*link_valet_online.*', '.*metager\-linkchecker.*', '.*linkchecker.*', '.*livejournal\.com.*', '.*lmspider.*', '.*lwp\-request.*', '.*lwp\-trivial.*', '.*magpierss.*', '.*mail\.ru.*', '.*mapoftheinternet\.com.*', '.*mediapartners\-google.*', '.*megite.*', '.*metaspinner.*', '.*microsoft[_+ ]url[_+ ]control.*', '.*mini\-reptile.*', '.*minirank.*', '.*missigua_locator.*', '.*misterbot.*', '.*miva.*', '.*mizzu_labs.*', '.*mj12bot.*', '.*mojeekbot.*', '.*msiecrawler.*', '.*ms_search_4\.0_robot.*', '.*msrabot.*', '.*msrbot.*', '.*mt::telegraph::agent.*', '.*nagios.*', '.*nasa_search.*', '.*mydoyouhike.*', '.*netluchs.*', '.*netsprint.*', '.*newsgatoronline.*', '.*nicebot.*', '.*nimblecrawler.*', '.*noxtrumbot.*', '.*npbot.*', '.*nutchcvs.*', '.*nutchosu\-vlib.*', '.*nutch.*', '.*ocelli.*', '.*octora_beta_bot.*', '.*omniexplorer[_+ ]bot.*', '.*onet\.pl[_+ ]sa.*', '.*onfolio.*', '.*opentaggerbot.*', '.*openwebspider.*', '.*oracle_ultra_search.*', '.*orbiter.*', '.*yodaobot.*', '.*qihoobot.*', '.*passwordmaker\.org.*', '.*pear_http_request_class.*', '.*peerbot.*', '.*perman.*', '.*php[_+ ]version[_+ ]tracker.*', '.*pictureofinternet.*', '.*ping\.blo\.gs.*', '.*plinki.*', '.*pluckfeedcrawler.*', '.*pogodak.*', '.*pompos.*', '.*popdexter.*', '.*port_huron_labs.*', '.*postfavorites.*', '.*projectwf\-java\-test\-crawler.*', '.*proodlebot.*', '.*pyquery.*', '.*rambler.*', '.*redalert.*', '.*rojo.*', '.*rssimagesbot.*', '.*ruffle.*', '.*rufusbot.*', '.*sandcrawler.*', '.*sbider.*', '.*schizozilla.*', '.*scumbot.*', '.*searchguild[_+ ]dmoz[_+ ]experiment.*', '.*seekbot.*', '.*sensis_web_crawler.*', '.*seznambot.*', '.*shim\-crawler.*', '.*shoutcast.*', '.*slysearch.*', '.*snap\.com_beta_crawler.*', '.*sohu\-search.*', '.*sohu.*', '.*snappy.*', '.*sphere_scout.*', '.*spip.*', '.*sproose_crawler.*', '.*steeler.*', '.*steroid__download.*', '.*suchfin\-bot.*', '.*superbot.*', '.*surveybot.*', '.*susie.*', '.*syndic8.*', '.*syndicapi.*', '.*synoobot.*', '.*tcl_http_client_package.*', '.*technoratibot.*', '.*teragramcrawlersurf.*', '.*test_crawler.*', '.*testbot.*', '.*t\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e.*', '.*topicblogs.*', '.*turnitinbot.*', '.*turtlescanner.*', '.*turtle.*', '.*tutorgigbot.*', '.*twiceler.*', '.*ubicrawler.*', '.*ultraseek.*', '.*unchaos_bot_hybrid_web_search_engine.*', '.*unido\-bot.*', '.*updated.*', '.*ustc\-semantic\-group.*', '.*vagabondo\-wap.*', '.*vagabondo.*', '.*vermut.*', '.*versus_crawler_from_eda\.baykan@epfl\.ch.*', '.*vespa_crawler.*', '.*vortex.*', '.*vse\/.*', '.*w3c\-checklink.*', '.*w3c[_+ ]css[_+ ]validator[_+ ]jfouffa.*', '.*w3c_validator.*', '.*watchmouse.*', '.*wavefire.*', '.*webclipping\.com.*', '.*webcompass.*', '.*webcrawl\.net.*', '.*web_downloader.*', '.*webdup.*', '.*webfilter.*', '.*webindexer.*', '.*webminer.*', '.*website[_+ ]monitoring[_+ ]bot.*', '.*webvulncrawl.*', '.*wells_search.*', '.*wonderer.*', '.*wume_crawler.*', '.*wwweasel.*', '.*xenu\'s_link_sleuth.*', '.*xenu_link_sleuth.*', '.*xirq.*', '.*y!j.*', '.*yacy.*', '.*yahoo\-blogs.*', '.*yahoo\-verticalcrawler.*', '.*yahoofeedseeker.*', '.*yahooseeker\-testing.*', '.*yahooseeker.*', '.*yahoo\-mmcrawler.*', '.*yahoo!_mindset.*', '.*yandex.*', '.*flexum.*', '.*yanga.*', '.*yooglifetchagent.*', '.*z\-add_link_checker.*', '.*zealbot.*', '.*zhuaxia.*', '.*zspider.*', '.*zeus.*', '.*ng\/1\..*', '.*ng\/2\..*', '.*exabot.*', '.*wget.*', '.*libwww.*', '.*java\/[0-9].*'] - diff --git a/search_engines.py b/search_engines.py deleted file mode 100644 index 3c4f8ba..0000000 --- a/search_engines.py +++ /dev/null @@ -1,8 +0,0 @@ -awstats_search_engines = ['.*google\.[\w.]+/products.*', '.*base\.google\..*', '.*froogle\.google\..*', '.*groups\.google\..*', '.*images\.google\..*', '.*google\..*', '.*googlee\..*', '.*googlecom\.com.*', '.*goggle\.co\.hu.*', '.*216\.239\.(35|37|39|51)\.100.*', '.*216\.239\.(35|37|39|51)\.101.*', '.*216\.239\.5[0-9]\.104.*', '.*64\.233\.1[0-9]{2}\.104.*', '.*66\.102\.[1-9]\.104.*', '.*66\.249\.93\.104.*', '.*72\.14\.2[0-9]{2}\.104.*', '.*msn\..*', '.*live\.com.*', '.*bing\..*', '.*voila\..*', '.*mindset\.research\.yahoo.*', '.*yahoo\..*', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*', '.*search\.aol\.co.*', '.*tiscali\..*', '.*lycos\..*', '.*alexa\.com.*', '.*alltheweb\.com.*', '.*altavista\..*', '.*a9\.com.*', '.*dmoz\.org.*', '.*netscape\..*', '.*search\.terra\..*', '.*www\.search\.com.*', '.*search\.sli\.sympatico\.ca.*', '.*excite\..*'] - -awstats_search_engines_2 = ['.*4\-counter\.com.*', '.*att\.net.*', '.*bungeebonesdotcom.*', '.*northernlight\..*', '.*hotbot\..*', '.*kvasir\..*', '.*webcrawler\..*', '.*metacrawler\..*', '.*go2net\.com.*', '.*(^|\.)go\.com.*', '.*euroseek\..*', '.*looksmart\..*', '.*spray\..*', '.*nbci\.com\/search.*', '.*de\.ask.\com.*', '.*es\.ask.\com.*', '.*fr\.ask.\com.*', '.*it\.ask.\com.*', '.*nl\.ask.\com.*', '.*uk\.ask.\com.*', '.*(^|\.)ask\.com.*', '.*atomz\..*', '.*overture\.com.*', '.*teoma\..*', '.*findarticles\.com.*', '.*infospace\.com.*', '.*mamma\..*', '.*dejanews\..*', '.*dogpile\.com.*', '.*wisenut\.com.*', '.*ixquick\.com.*', '.*search\.earthlink\.net.*', '.*i-une\.com.*', '.*blingo\.com.*', '.*centraldatabase\.org.*', '.*clusty\.com.*', '.*mysearch\..*', '.*vivisimo\.com.*', '.*kartoo\.com.*', '.*icerocket\.com.*', '.*sphere\.com.*', '.*ledix\.net.*', '.*start\.shaw\.ca.*', '.*searchalot\.com.*', '.*copernic\.com.*', '.*avantfind\.com.*', '.*steadysearch\.com.*', '.*steady-search\.com.*', '.*chello\.at.*', '.*chello\.be.*', '.*chello\.cz.*', '.*chello\.fr.*', '.*chello\.hu.*', '.*chello\.nl.*', '.*chello\.no.*', '.*chello\.pl.*', '.*chello\.se.*', '.*chello\.sk.*', '.*chello.*', '.*mirago\.be.*', '.*mirago\.ch.*', '.*mirago\.de.*', '.*mirago\.dk.*', '.*es\.mirago\.com.*', '.*mirago\.fr.*', '.*mirago\.it.*', '.*mirago\.nl.*', '.*no\.mirago\.com.*', '.*mirago\.se.*', '.*mirago\.co\.uk.*', '.*mirago.*', '.*answerbus\.com.*', '.*icq\.com\/search.*', '.*nusearch\.com.*', '.*goodsearch\.com.*', '.*scroogle\.org.*', '.*questionanswering\.com.*', '.*mywebsearch\.com.*', '.*as\.starware\.com.*', '.*del\.icio\.us.*', '.*digg\.com.*', '.*stumbleupon\.com.*', '.*swik\.net.*', '.*segnalo\.alice\.it.*', '.*ineffabile\.it.*', '.*anzwers\.com\.au.*', '.*engine\.exe.*', '.*miner\.bol\.com\.br.*', '.*\.baidu\.com.*', '.*\.vnet\.cn.*', '.*\.soso\.com.*', '.*\.sogou\.com.*', '.*\.3721\.com.*', '.*iask\.com.*', '.*\.accoona\.com.*', '.*\.163\.com.*', '.*\.zhongsou\.com.*', '.*atlas\.cz.*', '.*seznam\.cz.*', '.*quick\.cz.*', '.*centrum\.cz.*', '.*jyxo\.(cz|com).*', '.*najdi\.to.*', '.*redbox\.cz.*', '.*opasia\.dk.*', '.*danielsen\.com.*', '.*sol\.dk.*', '.*jubii\.dk.*', '.*find\.dk.*', '.*edderkoppen\.dk.*', '.*netstjernen\.dk.*', '.*orbis\.dk.*', '.*tyfon\.dk.*', '.*1klik\.dk.*', '.*ofir\.dk.*', '.*ilse\..*', '.*vindex\..*', '.*(^|\.)ask\.co\.uk.*', '.*bbc\.co\.uk/cgi-bin/search.*', '.*ifind\.freeserve.*', '.*looksmart\.co\.uk.*', '.*splut\..*', '.*spotjockey\..*', '.*ukdirectory\..*', '.*ukindex\.co\.uk.*', '.*ukplus\..*', '.*searchy\.co\.uk.*', '.*haku\.www\.fi.*', '.*recherche\.aol\.fr.*', '.*ctrouve\..*', '.*francite\..*', '.*\.lbb\.org.*', '.*rechercher\.libertysurf\.fr.*', '.*search[\w\-]+\.free\.fr.*', '.*recherche\.club-internet\.fr.*', '.*toile\.com.*', '.*biglotron\.com.*', '.*mozbot\.fr.*', '.*sucheaol\.aol\.de.*', '.*fireball\.de.*', '.*infoseek\.de.*', '.*suche\d?\.web\.de.*', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*', '.*suchen\.abacho\.de.*', '.*(brisbane|suche)\.t-online\.de.*', '.*allesklar\.de.*', '.*meinestadt\.de.*', '.*212\.227\.33\.241.*', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*', '.*wwweasel\.de.*', '.*netluchs\.de.*', '.*schoenerbrausen\.de.*', '.*heureka\.hu.*', '.*vizsla\.origo\.hu.*', '.*lapkereso\.hu.*', '.*goliat\.hu.*', '.*index\.hu.*', '.*wahoo\.hu.*', '.*webmania\.hu.*', '.*search\.internetto\.hu.*', '.*tango\.hu.*', '.*keresolap\.hu.*', '.*polymeta\.hu.*', '.*sify\.com.*', '.*virgilio\.it.*', '.*arianna\.libero\.it.*', '.*supereva\.com.*', '.*kataweb\.it.*', '.*search\.alice\.it\.master.*', '.*search\.alice\.it.*', '.*gotuneed\.com.*', '.*godado.*', '.*jumpy\.it.*', '.*shinyseek\.it.*', '.*teecno\.it.*', '.*ask\.jp.*', '.*sagool\.jp.*', '.*sok\.start\.no.*', '.*eniro\.no.*', '.*szukaj\.wp\.pl.*', '.*szukaj\.onet\.pl.*', '.*dodaj\.pl.*', '.*gazeta\.pl.*', '.*gery\.pl.*', '.*hoga\.pl.*', '.*netsprint\.pl.*', '.*interia\.pl.*', '.*katalog\.onet\.pl.*', '.*o2\.pl.*', '.*polska\.pl.*', '.*szukacz\.pl.*', '.*wow\.pl.*', '.*ya(ndex)?\.ru.*', '.*aport\.ru.*', '.*rambler\.ru.*', '.*turtle\.ru.*', '.*metabot\.ru.*', '.*evreka\.passagen\.se.*', '.*eniro\.se.*', '.*zoznam\.sk.*', '.*sapo\.pt.*', '.*search\.ch.*', '.*search\.bluewin\.ch.*', '.*pogodak\..*'] - -awstats_not_search_engines_keys = {'.*yahoo\..*' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', '.*altavista\..*' : 'babelfish\.altavista\.', '.*tiscali\..*' : 'mail\.tiscali\.', '.*yandex\..*' : 'direct\.yandex\.', '.*google\..*' : 'translate\.google\.', '.*msn\..*' : 'hotmail\.msn\.'} - -awstats_search_engines_hashid = {'.*search\.sli\.sympatico\.ca.*' : 'sympatico', '.*mywebsearch\.com.*' : 'mywebsearch', '.*netsprint\.pl\/hoga\-search.*' : 'hogapl', '.*findarticles\.com.*' : 'findarticles', '.*wow\.pl.*' : 'wowpl', '.*allesklar\.de.*' : 'allesklar', '.*atomz\..*' : 'atomz', '.*bing\..*' : 'bing', '.*find\.dk.*' : 'finddk', '.*google\..*' : 'google', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*' : 'yahoo', '.*pogodak\..*' : 'pogodak', '.*ask\.jp.*' : 'askjp', '.*\.baidu\.com.*' : 'baidu', '.*tango\.hu.*' : 'tango_hu', '.*gotuneed\.com.*' : 'gotuneed', '.*quick\.cz.*' : 'quick', '.*mirago.*' : 'mirago', '.*szukaj\.wp\.pl.*' : 'wp', '.*mirago\.de.*' : 'miragode', '.*mirago\.dk.*' : 'miragodk', '.*katalog\.onet\.pl.*' : 'katalogonetpl', '.*googlee\..*' : 'google', '.*orbis\.dk.*' : 'orbis', '.*turtle\.ru.*' : 'turtle', '.*zoznam\.sk.*' : 'zoznam', '.*start\.shaw\.ca.*' : 'shawca', '.*chello\.at.*' : 'chelloat', '.*centraldatabase\.org.*' : 'centraldatabase', '.*centrum\.cz.*' : 'centrum', '.*kataweb\.it.*' : 'kataweb', '.*\.lbb\.org.*' : 'lbb', '.*blingo\.com.*' : 'blingo', '.*vivisimo\.com.*' : 'vivisimo', '.*stumbleupon\.com.*' : 'stumbleupon', '.*es\.ask.\com.*' : 'askes', '.*interia\.pl.*' : 'interiapl', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*' : 'meta', '.*search\.alice\.it.*' : 'aliceit', '.*shinyseek\.it.*' : 'shinyseek\.it', '.*i-une\.com.*' : 'iune', '.*dejanews\..*' : 'dejanews', '.*opasia\.dk.*' : 'opasia', '.*chello\.cz.*' : 'chellocz', '.*ya(ndex)?\.ru.*' : 'yandex', '.*kartoo\.com.*' : 'kartoo', '.*arianna\.libero\.it.*' : 'arianna', '.*ofir\.dk.*' : 'ofir', '.*search\.earthlink\.net.*' : 'earthlink', '.*biglotron\.com.*' : 'biglotron', '.*lapkereso\.hu.*' : 'lapkereso', '.*216\.239\.(35|37|39|51)\.101.*' : 'google_cache', '.*miner\.bol\.com\.br.*' : 'miner', '.*dodaj\.pl.*' : 'dodajpl', '.*mirago\.be.*' : 'miragobe', '.*googlecom\.com.*' : 'google', '.*steadysearch\.com.*' : 'steadysearch', '.*redbox\.cz.*' : 'redbox', '.*haku\.www\.fi.*' : 'haku', '.*sapo\.pt.*' : 'sapo', '.*sphere\.com.*' : 'sphere', '.*danielsen\.com.*' : 'danielsen', '.*alexa\.com.*' : 'alexa', '.*mamma\..*' : 'mamma', '.*swik\.net.*' : 'swik', '.*polska\.pl.*' : 'polskapl', '.*groups\.google\..*' : 'google_groups', '.*metabot\.ru.*' : 'metabot', '.*rechercher\.libertysurf\.fr.*' : 'libertysurf', '.*szukaj\.onet\.pl.*' : 'onetpl', '.*aport\.ru.*' : 'aport', '.*de\.ask.\com.*' : 'askde', '.*splut\..*' : 'splut', '.*live\.com.*' : 'live', '.*216\.239\.5[0-9]\.104.*' : 'google_cache', '.*mysearch\..*' : 'mysearch', '.*ukplus\..*' : 'ukplus', '.*najdi\.to.*' : 'najdi', '.*overture\.com.*' : 'overture', '.*iask\.com.*' : 'iask', '.*nl\.ask.\com.*' : 'asknl', '.*nbci\.com\/search.*' : 'nbci', '.*search\.aol\.co.*' : 'aol', '.*eniro\.se.*' : 'enirose', '.*64\.233\.1[0-9]{2}\.104.*' : 'google_cache', '.*mirago\.ch.*' : 'miragoch', '.*altavista\..*' : 'altavista', '.*chello\.hu.*' : 'chellohu', '.*mozbot\.fr.*' : 'mozbot', '.*northernlight\..*' : 'northernlight', '.*mirago\.co\.uk.*' : 'miragocouk', '.*search[\w\-]+\.free\.fr.*' : 'free', '.*mindset\.research\.yahoo.*' : 'yahoo_mindset', '.*copernic\.com.*' : 'copernic', '.*heureka\.hu.*' : 'heureka', '.*steady-search\.com.*' : 'steadysearch', '.*teecno\.it.*' : 'teecnoit', '.*voila\..*' : 'voila', '.*netstjernen\.dk.*' : 'netstjernen', '.*keresolap\.hu.*' : 'keresolap_hu', '.*yahoo\..*' : 'yahoo', '.*icerocket\.com.*' : 'icerocket', '.*alltheweb\.com.*' : 'alltheweb', '.*www\.search\.com.*' : 'search.com', '.*digg\.com.*' : 'digg', '.*tiscali\..*' : 'tiscali', '.*spotjockey\..*' : 'spotjockey', '.*a9\.com.*' : 'a9', '.*(brisbane|suche)\.t-online\.de.*' : 't-online', '.*ifind\.freeserve.*' : 'freeserve', '.*att\.net.*' : 'att', '.*mirago\.it.*' : 'miragoit', '.*index\.hu.*' : 'indexhu', '.*\.sogou\.com.*' : 'sogou', '.*no\.mirago\.com.*' : 'miragono', '.*ineffabile\.it.*' : 'ineffabile', '.*netluchs\.de.*' : 'netluchs', '.*toile\.com.*' : 'toile', '.*search\..*\.\w+.*' : 'search', '.*del\.icio\.us.*' : 'delicious', '.*vizsla\.origo\.hu.*' : 'origo', '.*netscape\..*' : 'netscape', '.*dogpile\.com.*' : 'dogpile', '.*anzwers\.com\.au.*' : 'anzwers', '.*\.zhongsou\.com.*' : 'zhongsou', '.*ctrouve\..*' : 'ctrouve', '.*gazeta\.pl.*' : 'gazetapl', '.*recherche\.club-internet\.fr.*' : 'clubinternet', '.*sok\.start\.no.*' : 'start', '.*scroogle\.org.*' : 'scroogle', '.*schoenerbrausen\.de.*' : 'schoenerbrausen', '.*looksmart\.co\.uk.*' : 'looksmartuk', '.*wwweasel\.de.*' : 'wwweasel', '.*godado.*' : 'godado', '.*216\.239\.(35|37|39|51)\.100.*' : 'google_cache', '.*jubii\.dk.*' : 'jubii', '.*212\.227\.33\.241.*' : 'metaspinner', '.*mirago\.fr.*' : 'miragofr', '.*sol\.dk.*' : 'sol', '.*bbc\.co\.uk/cgi-bin/search.*' : 'bbc', '.*jumpy\.it.*' : 'jumpy\.it', '.*francite\..*' : 'francite', '.*infoseek\.de.*' : 'infoseek', '.*es\.mirago\.com.*' : 'miragoes', '.*jyxo\.(cz|com).*' : 'jyxo', '.*hotbot\..*' : 'hotbot', '.*engine\.exe.*' : 'engine', '.*(^|\.)ask\.com.*' : 'ask', '.*goliat\.hu.*' : 'goliat', '.*wisenut\.com.*' : 'wisenut', '.*mirago\.nl.*' : 'miragonl', '.*base\.google\..*' : 'google_base', '.*search\.bluewin\.ch.*' : 'bluewin', '.*lycos\..*' : 'lycos', '.*meinestadt\.de.*' : 'meinestadt', '.*4\-counter\.com.*' : 'google4counter', '.*search\.alice\.it\.master.*' : 'aliceitmaster', '.*teoma\..*' : 'teoma', '.*(^|\.)ask\.co\.uk.*' : 'askuk', '.*tyfon\.dk.*' : 'tyfon', '.*froogle\.google\..*' : 'google_froogle', '.*ukdirectory\..*' : 'ukdirectory', '.*ledix\.net.*' : 'ledix', '.*edderkoppen\.dk.*' : 'edderkoppen', '.*recherche\.aol\.fr.*' : 'aolfr', '.*google\.[\w.]+/products.*' : 'google_products', '.*webmania\.hu.*' : 'webmania', '.*searchy\.co\.uk.*' : 'searchy', '.*fr\.ask.\com.*' : 'askfr', '.*spray\..*' : 'spray', '.*72\.14\.2[0-9]{2}\.104.*' : 'google_cache', '.*eniro\.no.*' : 'eniro', '.*goodsearch\.com.*' : 'goodsearch', '.*kvasir\..*' : 'kvasir', '.*\.accoona\.com.*' : 'accoona', '.*\.soso\.com.*' : 'soso', '.*as\.starware\.com.*' : 'comettoolbar', '.*virgilio\.it.*' : 'virgilio', '.*o2\.pl.*' : 'o2pl', '.*chello\.nl.*' : 'chellonl', '.*chello\.be.*' : 'chellobe', '.*icq\.com\/search.*' : 'icq', '.*msn\..*' : 'msn', '.*fireball\.de.*' : 'fireball', '.*sucheaol\.aol\.de.*' : 'aolde', '.*uk\.ask.\com.*' : 'askuk', '.*euroseek\..*' : 'euroseek', '.*gery\.pl.*' : 'gerypl', '.*chello\.fr.*' : 'chellofr', '.*netsprint\.pl.*' : 'netsprintpl', '.*avantfind\.com.*' : 'avantfind', '.*supereva\.com.*' : 'supereva', '.*polymeta\.hu.*' : 'polymeta_hu', '.*infospace\.com.*' : 'infospace', '.*sify\.com.*' : 'sify', '.*go2net\.com.*' : 'go2net', '.*wahoo\.hu.*' : 'wahoo', '.*suche\d?\.web\.de.*' : 'webde', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*' : 'metacrawler_de', '.*\.3721\.com.*' : '3721', '.*ilse\..*' : 'ilse', '.*metacrawler\..*' : 'metacrawler', '.*sagool\.jp.*' : 'sagool', '.*atlas\.cz.*' : 'atlas', '.*vindex\..*' : 'vindex', '.*ixquick\.com.*' : 'ixquick', '.*66\.102\.[1-9]\.104.*' : 'google_cache', '.*rambler\.ru.*' : 'rambler', '.*answerbus\.com.*' : 'answerbus', '.*evreka\.passagen\.se.*' : 'passagen', '.*chello\.se.*' : 'chellose', '.*clusty\.com.*' : 'clusty', '.*search\.ch.*' : 'searchch', '.*chello\.no.*' : 'chellono', '.*searchalot\.com.*' : 'searchalot', '.*questionanswering\.com.*' : 'questionanswering', '.*seznam\.cz.*' : 'seznam', '.*ukindex\.co\.uk.*' : 'ukindex', '.*dmoz\.org.*' : 'dmoz', '.*excite\..*' : 'excite', '.*chello\.pl.*' : 'chellopl', '.*looksmart\..*' : 'looksmart', '.*1klik\.dk.*' : '1klik', '.*\.vnet\.cn.*' : 'vnet', '.*chello\.sk.*' : 'chellosk', '.*(^|\.)go\.com.*' : 'go', '.*nusearch\.com.*' : 'nusearch', '.*it\.ask.\com.*' : 'askit', '.*bungeebonesdotcom.*' : 'bungeebonesdotcom', '.*search\.terra\..*' : 'terra', '.*webcrawler\..*' : 'webcrawler', '.*suchen\.abacho\.de.*' : 'abacho', '.*szukacz\.pl.*' : 'szukaczpl', '.*66\.249\.93\.104.*' : 'google_cache', '.*search\.internetto\.hu.*' : 'internetto', '.*goggle\.co\.hu.*' : 'google', '.*mirago\.se.*' : 'miragose', '.*images\.google\..*' : 'google_image', '.*segnalo\.alice\.it.*' : 'segnalo', '.*\.163\.com.*' : 'netease', '.*chello.*' : 'chellocom'} - From e6b31fbf8a700b04ceb1ff0725f74848977bd2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 16:56:33 +0100 Subject: [PATCH 028/195] WIP --- awstats_data.py | 12 ++++---- iwla_convert.pl | 4 +-- plugins/display/referers.py | 55 +++++++++++++++++++++++----------- plugins/pre_analysis/robots.py | 2 +- 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/awstats_data.py b/awstats_data.py index a6145f0..8789384 100644 --- a/awstats_data.py +++ b/awstats_data.py @@ -1,12 +1,12 @@ -robots = ['.*appie.*', '.*architext.*', '.*jeeves.*', '.*bjaaland.*', '.*contentmatch.*', '.*ferret.*', '.*googlebot.*', '.*google\-sitemaps.*', '.*gulliver.*', '.*virus[_+ ]detector.*', '.*harvest.*', '.*htdig.*', '.*linkwalker.*', '.*lilina.*', '.*lycos[_+ ].*', '.*moget.*', '.*muscatferret.*', '.*myweb.*', '.*nomad.*', '.*scooter.*', '.*slurp.*', '.*^voyager\/.*', '.*weblayers.*', '.*antibot.*', '.*bruinbot.*', '.*digout4u.*', '.*echo!.*', '.*fast\-webcrawler.*', '.*ia_archiver\-web\.archive\.org.*', '.*ia_archiver.*', '.*jennybot.*', '.*mercator.*', '.*netcraft.*', '.*msnbot\-media.*', '.*msnbot.*', '.*petersnews.*', '.*relevantnoise\.com.*', '.*unlost_web_crawler.*', '.*voila.*', '.*webbase.*', '.*webcollage.*', '.*cfetch.*', '.*zyborg.*', '.*wisenutbot.*', '.*[^a]fish.*', '.*abcdatos.*', '.*acme\.spider.*', '.*ahoythehomepagefinder.*', '.*alkaline.*', '.*anthill.*', '.*arachnophilia.*', '.*arale.*', '.*araneo.*', '.*aretha.*', '.*ariadne.*', '.*powermarks.*', '.*arks.*', '.*aspider.*', '.*atn\.txt.*', '.*atomz.*', '.*auresys.*', '.*backrub.*', '.*bbot.*', '.*bigbrother.*', '.*blackwidow.*', '.*blindekuh.*', '.*bloodhound.*', '.*borg\-bot.*', '.*brightnet.*', '.*bspider.*', '.*cactvschemistryspider.*', '.*calif[^r].*', '.*cassandra.*', '.*cgireader.*', '.*checkbot.*', '.*christcrawler.*', '.*churl.*', '.*cienciaficcion.*', '.*collective.*', '.*combine.*', '.*conceptbot.*', '.*coolbot.*', '.*core.*', '.*cosmos.*', '.*cruiser.*', '.*cusco.*', '.*cyberspyder.*', '.*desertrealm.*', '.*deweb.*', '.*dienstspider.*', '.*digger.*', '.*diibot.*', '.*direct_hit.*', '.*dnabot.*', '.*download_express.*', '.*dragonbot.*', '.*dwcp.*', '.*e\-collector.*', '.*ebiness.*', '.*elfinbot.*', '.*emacs.*', '.*emcspider.*', '.*esther.*', '.*evliyacelebi.*', '.*fastcrawler.*', '.*feedcrawl.*', '.*fdse.*', '.*felix.*', '.*fetchrover.*', '.*fido.*', '.*finnish.*', '.*fireball.*', '.*fouineur.*', '.*francoroute.*', '.*freecrawl.*', '.*funnelweb.*', '.*gama.*', '.*gazz.*', '.*gcreep.*', '.*getbot.*', '.*geturl.*', '.*golem.*', '.*gougou.*', '.*grapnel.*', '.*griffon.*', '.*gromit.*', '.*gulperbot.*', '.*hambot.*', '.*havindex.*', '.*hometown.*', '.*htmlgobble.*', '.*hyperdecontextualizer.*', '.*iajabot.*', '.*iaskspider.*', '.*hl_ftien_spider.*', '.*sogou.*', '.*iconoclast.*', '.*ilse.*', '.*imagelock.*', '.*incywincy.*', '.*informant.*', '.*infoseek.*', '.*infoseeksidewinder.*', '.*infospider.*', '.*inspectorwww.*', '.*intelliagent.*', '.*irobot.*', '.*iron33.*', '.*israelisearch.*', '.*javabee.*', '.*jbot.*', '.*jcrawler.*', '.*jobo.*', '.*jobot.*', '.*joebot.*', '.*jubii.*', '.*jumpstation.*', '.*kapsi.*', '.*katipo.*', '.*kilroy.*', '.*ko[_+ ]yappo[_+ ]robot.*', '.*kummhttp.*', '.*labelgrabber\.txt.*', '.*larbin.*', '.*legs.*', '.*linkidator.*', '.*linkscan.*', '.*lockon.*', '.*logo_gif.*', '.*macworm.*', '.*magpie.*', '.*marvin.*', '.*mattie.*', '.*mediafox.*', '.*merzscope.*', '.*meshexplorer.*', '.*mindcrawler.*', '.*mnogosearch.*', '.*momspider.*', '.*monster.*', '.*motor.*', '.*muncher.*', '.*mwdsearch.*', '.*ndspider.*', '.*nederland\.zoek.*', '.*netcarta.*', '.*netmechanic.*', '.*netscoop.*', '.*newscan\-online.*', '.*nhse.*', '.*northstar.*', '.*nzexplorer.*', '.*objectssearch.*', '.*occam.*', '.*octopus.*', '.*openfind.*', '.*orb_search.*', '.*packrat.*', '.*pageboy.*', '.*parasite.*', '.*patric.*', '.*pegasus.*', '.*perignator.*', '.*perlcrawler.*', '.*phantom.*', '.*phpdig.*', '.*piltdownman.*', '.*pimptrain.*', '.*pioneer.*', '.*pitkow.*', '.*pjspider.*', '.*plumtreewebaccessor.*', '.*poppi.*', '.*portalb.*', '.*psbot.*', '.*python.*', '.*raven.*', '.*rbse.*', '.*resumerobot.*', '.*rhcs.*', '.*road_runner.*', '.*robbie.*', '.*robi.*', '.*robocrawl.*', '.*robofox.*', '.*robozilla.*', '.*roverbot.*', '.*rules.*', '.*safetynetrobot.*', '.*search\-info.*', '.*search_au.*', '.*searchprocess.*', '.*senrigan.*', '.*sgscout.*', '.*shaggy.*', '.*shaihulud.*', '.*sift.*', '.*simbot.*', '.*site\-valet.*', '.*sitetech.*', '.*skymob.*', '.*slcrawler.*', '.*smartspider.*', '.*snooper.*', '.*solbot.*', '.*speedy.*', '.*spider[_+ ]monkey.*', '.*spiderbot.*', '.*spiderline.*', '.*spiderman.*', '.*spiderview.*', '.*spry.*', '.*sqworm.*', '.*ssearcher.*', '.*suke.*', '.*sunrise.*', '.*suntek.*', '.*sven.*', '.*tach_bw.*', '.*tagyu_agent.*', '.*tailrank.*', '.*tarantula.*', '.*tarspider.*', '.*techbot.*', '.*templeton.*', '.*titan.*', '.*titin.*', '.*tkwww.*', '.*tlspider.*', '.*ucsd.*', '.*udmsearch.*', '.*universalfeedparser.*', '.*urlck.*', '.*valkyrie.*', '.*verticrawl.*', '.*victoria.*', '.*visionsearch.*', '.*voidbot.*', '.*vwbot.*', '.*w3index.*', '.*w3m2.*', '.*wallpaper.*', '.*wanderer.*', '.*wapspIRLider.*', '.*webbandit.*', '.*webcatcher.*', '.*webcopy.*', '.*webfetcher.*', '.*webfoot.*', '.*webinator.*', '.*weblinker.*', '.*webmirror.*', '.*webmoose.*', '.*webquest.*', '.*webreader.*', '.*webreaper.*', '.*websnarf.*', '.*webspider.*', '.*webvac.*', '.*webwalk.*', '.*webwalker.*', '.*webwatch.*', '.*whatuseek.*', '.*whowhere.*', '.*wired\-digital.*', '.*wmir.*', '.*wolp.*', '.*wombat.*', '.*wordpress.*', '.*worm.*', '.*woozweb.*', '.*wwwc.*', '.*wz101.*', '.*xget.*', '.*1\-more_scanner.*', '.*accoona\-ai\-agent.*', '.*activebookmark.*', '.*adamm_bot.*', '.*almaden.*', '.*aipbot.*', '.*aleadsoftbot.*', '.*alpha_search_agent.*', '.*allrati.*', '.*aport.*', '.*archive\.org_bot.*', '.*argus.*', '.*arianna\.libero\.it.*', '.*aspseek.*', '.*asterias.*', '.*awbot.*', '.*baiduspider.*', '.*becomebot.*', '.*bender.*', '.*betabot.*', '.*biglotron.*', '.*bittorrent_bot.*', '.*biz360[_+ ]spider.*', '.*blogbridge[_+ ]service.*', '.*bloglines.*', '.*blogpulse.*', '.*blogsearch.*', '.*blogshares.*', '.*blogslive.*', '.*blogssay.*', '.*bncf\.firenze\.sbn\.it\/raccolta\.txt.*', '.*bobby.*', '.*boitho\.com\-dc.*', '.*bookmark\-manager.*', '.*boris.*', '.*bumblebee.*', '.*candlelight[_+ ]favorites[_+ ]inspector.*', '.*cbn00glebot.*', '.*cerberian_drtrs.*', '.*cfnetwork.*', '.*cipinetbot.*', '.*checkweb_link_validator.*', '.*commons\-httpclient.*', '.*computer_and_automation_research_institute_crawler.*', '.*converamultimediacrawler.*', '.*converacrawler.*', '.*cscrawler.*', '.*cse_html_validator_lite_online.*', '.*cuasarbot.*', '.*cursor.*', '.*custo.*', '.*datafountains\/dmoz_downloader.*', '.*daviesbot.*', '.*daypopbot.*', '.*deepindex.*', '.*dipsie\.bot.*', '.*dnsgroup.*', '.*domainchecker.*', '.*domainsdb\.net.*', '.*dulance.*', '.*dumbot.*', '.*dumm\.de\-bot.*', '.*earthcom\.info.*', '.*easydl.*', '.*edgeio\-retriever.*', '.*ets_v.*', '.*exactseek.*', '.*extreme[_+ ]picture[_+ ]finder.*', '.*eventax.*', '.*everbeecrawler.*', '.*everest\-vulcan.*', '.*ezresult.*', '.*enteprise.*', '.*facebook.*', '.*fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de.*', '.*fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de.*', '.*matrix_s\.p\.a\._\-_fast_enterprise_crawler.*', '.*fast_enterprise_crawler.*', '.*fast\-search\-engine.*', '.*favicon.*', '.*favorg.*', '.*favorites_sweeper.*', '.*feedburner.*', '.*feedfetcher\-google.*', '.*feedflow.*', '.*feedster.*', '.*feedsky.*', '.*feedvalidator.*', '.*filmkamerabot.*', '.*findlinks.*', '.*findexa_crawler.*', '.*fooky\.com\/ScorpionBot.*', '.*g2crawler.*', '.*gaisbot.*', '.*geniebot.*', '.*gigabot.*', '.*girafabot.*', '.*global_fetch.*', '.*gnodspider.*', '.*goforit\.com.*', '.*goforitbot.*', '.*gonzo.*', '.*grub.*', '.*gpu_p2p_crawler.*', '.*henrythemiragorobot.*', '.*heritrix.*', '.*holmes.*', '.*hoowwwer.*', '.*hpprint.*', '.*htmlparser.*', '.*html[_+ ]link[_+ ]validator.*', '.*httrack.*', '.*hundesuche\.com\-bot.*', '.*ichiro.*', '.*iltrovatore\-setaccio.*', '.*infobot.*', '.*infociousbot.*', '.*infomine.*', '.*insurancobot.*', '.*internet[_+ ]ninja.*', '.*internetarchive.*', '.*internetseer.*', '.*internetsupervision.*', '.*irlbot.*', '.*isearch2006.*', '.*iupui_research_bot.*', '.*jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility.*', '.*justview.*', '.*kalambot.*', '.*kamano\.de_newsfeedverzeichnis.*', '.*kazoombot.*', '.*kevin.*', '.*keyoshid.*', '.*kinjabot.*', '.*kinja\-imagebot.*', '.*knowitall.*', '.*knowledge\.com.*', '.*kouaa_krawler.*', '.*krugle.*', '.*ksibot.*', '.*kurzor.*', '.*lanshanbot.*', '.*letscrawl\.com.*', '.*libcrawl.*', '.*linkbot.*', '.*link_valet_online.*', '.*metager\-linkchecker.*', '.*linkchecker.*', '.*livejournal\.com.*', '.*lmspider.*', '.*lwp\-request.*', '.*lwp\-trivial.*', '.*magpierss.*', '.*mail\.ru.*', '.*mapoftheinternet\.com.*', '.*mediapartners\-google.*', '.*megite.*', '.*metaspinner.*', '.*microsoft[_+ ]url[_+ ]control.*', '.*mini\-reptile.*', '.*minirank.*', '.*missigua_locator.*', '.*misterbot.*', '.*miva.*', '.*mizzu_labs.*', '.*mj12bot.*', '.*mojeekbot.*', '.*msiecrawler.*', '.*ms_search_4\.0_robot.*', '.*msrabot.*', '.*msrbot.*', '.*mt::telegraph::agent.*', '.*nagios.*', '.*nasa_search.*', '.*mydoyouhike.*', '.*netluchs.*', '.*netsprint.*', '.*newsgatoronline.*', '.*nicebot.*', '.*nimblecrawler.*', '.*noxtrumbot.*', '.*npbot.*', '.*nutchcvs.*', '.*nutchosu\-vlib.*', '.*nutch.*', '.*ocelli.*', '.*octora_beta_bot.*', '.*omniexplorer[_+ ]bot.*', '.*onet\.pl[_+ ]sa.*', '.*onfolio.*', '.*opentaggerbot.*', '.*openwebspider.*', '.*oracle_ultra_search.*', '.*orbiter.*', '.*yodaobot.*', '.*qihoobot.*', '.*passwordmaker\.org.*', '.*pear_http_request_class.*', '.*peerbot.*', '.*perman.*', '.*php[_+ ]version[_+ ]tracker.*', '.*pictureofinternet.*', '.*ping\.blo\.gs.*', '.*plinki.*', '.*pluckfeedcrawler.*', '.*pogodak.*', '.*pompos.*', '.*popdexter.*', '.*port_huron_labs.*', '.*postfavorites.*', '.*projectwf\-java\-test\-crawler.*', '.*proodlebot.*', '.*pyquery.*', '.*rambler.*', '.*redalert.*', '.*rojo.*', '.*rssimagesbot.*', '.*ruffle.*', '.*rufusbot.*', '.*sandcrawler.*', '.*sbider.*', '.*schizozilla.*', '.*scumbot.*', '.*searchguild[_+ ]dmoz[_+ ]experiment.*', '.*seekbot.*', '.*sensis_web_crawler.*', '.*seznambot.*', '.*shim\-crawler.*', '.*shoutcast.*', '.*slysearch.*', '.*snap\.com_beta_crawler.*', '.*sohu\-search.*', '.*sohu.*', '.*snappy.*', '.*sphere_scout.*', '.*spip.*', '.*sproose_crawler.*', '.*steeler.*', '.*steroid__download.*', '.*suchfin\-bot.*', '.*superbot.*', '.*surveybot.*', '.*susie.*', '.*syndic8.*', '.*syndicapi.*', '.*synoobot.*', '.*tcl_http_client_package.*', '.*technoratibot.*', '.*teragramcrawlersurf.*', '.*test_crawler.*', '.*testbot.*', '.*t\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e.*', '.*topicblogs.*', '.*turnitinbot.*', '.*turtlescanner.*', '.*turtle.*', '.*tutorgigbot.*', '.*twiceler.*', '.*ubicrawler.*', '.*ultraseek.*', '.*unchaos_bot_hybrid_web_search_engine.*', '.*unido\-bot.*', '.*updated.*', '.*ustc\-semantic\-group.*', '.*vagabondo\-wap.*', '.*vagabondo.*', '.*vermut.*', '.*versus_crawler_from_eda\.baykan@epfl\.ch.*', '.*vespa_crawler.*', '.*vortex.*', '.*vse\/.*', '.*w3c\-checklink.*', '.*w3c[_+ ]css[_+ ]validator[_+ ]jfouffa.*', '.*w3c_validator.*', '.*watchmouse.*', '.*wavefire.*', '.*webclipping\.com.*', '.*webcompass.*', '.*webcrawl\.net.*', '.*web_downloader.*', '.*webdup.*', '.*webfilter.*', '.*webindexer.*', '.*webminer.*', '.*website[_+ ]monitoring[_+ ]bot.*', '.*webvulncrawl.*', '.*wells_search.*', '.*wonderer.*', '.*wume_crawler.*', '.*wwweasel.*', '.*xenu\'s_link_sleuth.*', '.*xenu_link_sleuth.*', '.*xirq.*', '.*y!j.*', '.*yacy.*', '.*yahoo\-blogs.*', '.*yahoo\-verticalcrawler.*', '.*yahoofeedseeker.*', '.*yahooseeker\-testing.*', '.*yahooseeker.*', '.*yahoo\-mmcrawler.*', '.*yahoo!_mindset.*', '.*yandex.*', '.*flexum.*', '.*yanga.*', '.*yooglifetchagent.*', '.*z\-add_link_checker.*', '.*zealbot.*', '.*zhuaxia.*', '.*zspider.*', '.*zeus.*', '.*ng\/1\..*', '.*ng\/2\..*', '.*exabot.*', '.*wget.*', '.*libwww.*', '.*java\/[0-9].*'] +robots = ['appie', 'architext', 'jeeves', 'bjaaland', 'contentmatch', 'ferret', 'googlebot', 'google\-sitemaps', 'gulliver', 'virus[_+ ]detector', 'harvest', 'htdig', 'linkwalker', 'lilina', 'lycos[_+ ]', 'moget', 'muscatferret', 'myweb', 'nomad', 'scooter', 'slurp', '^voyager\/', 'weblayers', 'antibot', 'bruinbot', 'digout4u', 'echo!', 'fast\-webcrawler', 'ia_archiver\-web\.archive\.org', 'ia_archiver', 'jennybot', 'mercator', 'netcraft', 'msnbot\-media', 'msnbot', 'petersnews', 'relevantnoise\.com', 'unlost_web_crawler', 'voila', 'webbase', 'webcollage', 'cfetch', 'zyborg', 'wisenutbot', '[^a]fish', 'abcdatos', 'acme\.spider', 'ahoythehomepagefinder', 'alkaline', 'anthill', 'arachnophilia', 'arale', 'araneo', 'aretha', 'ariadne', 'powermarks', 'arks', 'aspider', 'atn\.txt', 'atomz', 'auresys', 'backrub', 'bbot', 'bigbrother', 'blackwidow', 'blindekuh', 'bloodhound', 'borg\-bot', 'brightnet', 'bspider', 'cactvschemistryspider', 'calif[^r]', 'cassandra', 'cgireader', 'checkbot', 'christcrawler', 'churl', 'cienciaficcion', 'collective', 'combine', 'conceptbot', 'coolbot', 'core', 'cosmos', 'cruiser', 'cusco', 'cyberspyder', 'desertrealm', 'deweb', 'dienstspider', 'digger', 'diibot', 'direct_hit', 'dnabot', 'download_express', 'dragonbot', 'dwcp', 'e\-collector', 'ebiness', 'elfinbot', 'emacs', 'emcspider', 'esther', 'evliyacelebi', 'fastcrawler', 'feedcrawl', 'fdse', 'felix', 'fetchrover', 'fido', 'finnish', 'fireball', 'fouineur', 'francoroute', 'freecrawl', 'funnelweb', 'gama', 'gazz', 'gcreep', 'getbot', 'geturl', 'golem', 'gougou', 'grapnel', 'griffon', 'gromit', 'gulperbot', 'hambot', 'havindex', 'hometown', 'htmlgobble', 'hyperdecontextualizer', 'iajabot', 'iaskspider', 'hl_ftien_spider', 'sogou', 'iconoclast', 'ilse', 'imagelock', 'incywincy', 'informant', 'infoseek', 'infoseeksidewinder', 'infospider', 'inspectorwww', 'intelliagent', 'irobot', 'iron33', 'israelisearch', 'javabee', 'jbot', 'jcrawler', 'jobo', 'jobot', 'joebot', 'jubii', 'jumpstation', 'kapsi', 'katipo', 'kilroy', 'ko[_+ ]yappo[_+ ]robot', 'kummhttp', 'labelgrabber\.txt', 'larbin', 'legs', 'linkidator', 'linkscan', 'lockon', 'logo_gif', 'macworm', 'magpie', 'marvin', 'mattie', 'mediafox', 'merzscope', 'meshexplorer', 'mindcrawler', 'mnogosearch', 'momspider', 'monster', 'motor', 'muncher', 'mwdsearch', 'ndspider', 'nederland\.zoek', 'netcarta', 'netmechanic', 'netscoop', 'newscan\-online', 'nhse', 'northstar', 'nzexplorer', 'objectssearch', 'occam', 'octopus', 'openfind', 'orb_search', 'packrat', 'pageboy', 'parasite', 'patric', 'pegasus', 'perignator', 'perlcrawler', 'phantom', 'phpdig', 'piltdownman', 'pimptrain', 'pioneer', 'pitkow', 'pjspider', 'plumtreewebaccessor', 'poppi', 'portalb', 'psbot', 'python', 'raven', 'rbse', 'resumerobot', 'rhcs', 'road_runner', 'robbie', 'robi', 'robocrawl', 'robofox', 'robozilla', 'roverbot', 'rules', 'safetynetrobot', 'search\-info', 'search_au', 'searchprocess', 'senrigan', 'sgscout', 'shaggy', 'shaihulud', 'sift', 'simbot', 'site\-valet', 'sitetech', 'skymob', 'slcrawler', 'smartspider', 'snooper', 'solbot', 'speedy', 'spider[_+ ]monkey', 'spiderbot', 'spiderline', 'spiderman', 'spiderview', 'spry', 'sqworm', 'ssearcher', 'suke', 'sunrise', 'suntek', 'sven', 'tach_bw', 'tagyu_agent', 'tailrank', 'tarantula', 'tarspider', 'techbot', 'templeton', 'titan', 'titin', 'tkwww', 'tlspider', 'ucsd', 'udmsearch', 'universalfeedparser', 'urlck', 'valkyrie', 'verticrawl', 'victoria', 'visionsearch', 'voidbot', 'vwbot', 'w3index', 'w3m2', 'wallpaper', 'wanderer', 'wapspIRLider', 'webbandit', 'webcatcher', 'webcopy', 'webfetcher', 'webfoot', 'webinator', 'weblinker', 'webmirror', 'webmoose', 'webquest', 'webreader', 'webreaper', 'websnarf', 'webspider', 'webvac', 'webwalk', 'webwalker', 'webwatch', 'whatuseek', 'whowhere', 'wired\-digital', 'wmir', 'wolp', 'wombat', 'wordpress', 'worm', 'woozweb', 'wwwc', 'wz101', 'xget', '1\-more_scanner', 'accoona\-ai\-agent', 'activebookmark', 'adamm_bot', 'almaden', 'aipbot', 'aleadsoftbot', 'alpha_search_agent', 'allrati', 'aport', 'archive\.org_bot', 'argus', 'arianna\.libero\.it', 'aspseek', 'asterias', 'awbot', 'baiduspider', 'becomebot', 'bender', 'betabot', 'biglotron', 'bittorrent_bot', 'biz360[_+ ]spider', 'blogbridge[_+ ]service', 'bloglines', 'blogpulse', 'blogsearch', 'blogshares', 'blogslive', 'blogssay', 'bncf\.firenze\.sbn\.it\/raccolta\.txt', 'bobby', 'boitho\.com\-dc', 'bookmark\-manager', 'boris', 'bumblebee', 'candlelight[_+ ]favorites[_+ ]inspector', 'cbn00glebot', 'cerberian_drtrs', 'cfnetwork', 'cipinetbot', 'checkweb_link_validator', 'commons\-httpclient', 'computer_and_automation_research_institute_crawler', 'converamultimediacrawler', 'converacrawler', 'cscrawler', 'cse_html_validator_lite_online', 'cuasarbot', 'cursor', 'custo', 'datafountains\/dmoz_downloader', 'daviesbot', 'daypopbot', 'deepindex', 'dipsie\.bot', 'dnsgroup', 'domainchecker', 'domainsdb\.net', 'dulance', 'dumbot', 'dumm\.de\-bot', 'earthcom\.info', 'easydl', 'edgeio\-retriever', 'ets_v', 'exactseek', 'extreme[_+ ]picture[_+ ]finder', 'eventax', 'everbeecrawler', 'everest\-vulcan', 'ezresult', 'enteprise', 'facebook', 'fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de', 'fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de', 'matrix_s\.p\.a\._\-_fast_enterprise_crawler', 'fast_enterprise_crawler', 'fast\-search\-engine', 'favicon', 'favorg', 'favorites_sweeper', 'feedburner', 'feedfetcher\-google', 'feedflow', 'feedster', 'feedsky', 'feedvalidator', 'filmkamerabot', 'findlinks', 'findexa_crawler', 'fooky\.com\/ScorpionBot', 'g2crawler', 'gaisbot', 'geniebot', 'gigabot', 'girafabot', 'global_fetch', 'gnodspider', 'goforit\.com', 'goforitbot', 'gonzo', 'grub', 'gpu_p2p_crawler', 'henrythemiragorobot', 'heritrix', 'holmes', 'hoowwwer', 'hpprint', 'htmlparser', 'html[_+ ]link[_+ ]validator', 'httrack', 'hundesuche\.com\-bot', 'ichiro', 'iltrovatore\-setaccio', 'infobot', 'infociousbot', 'infomine', 'insurancobot', 'internet[_+ ]ninja', 'internetarchive', 'internetseer', 'internetsupervision', 'irlbot', 'isearch2006', 'iupui_research_bot', 'jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility', 'justview', 'kalambot', 'kamano\.de_newsfeedverzeichnis', 'kazoombot', 'kevin', 'keyoshid', 'kinjabot', 'kinja\-imagebot', 'knowitall', 'knowledge\.com', 'kouaa_krawler', 'krugle', 'ksibot', 'kurzor', 'lanshanbot', 'letscrawl\.com', 'libcrawl', 'linkbot', 'link_valet_online', 'metager\-linkchecker', 'linkchecker', 'livejournal\.com', 'lmspider', 'lwp\-request', 'lwp\-trivial', 'magpierss', 'mail\.ru', 'mapoftheinternet\.com', 'mediapartners\-google', 'megite', 'metaspinner', 'microsoft[_+ ]url[_+ ]control', 'mini\-reptile', 'minirank', 'missigua_locator', 'misterbot', 'miva', 'mizzu_labs', 'mj12bot', 'mojeekbot', 'msiecrawler', 'ms_search_4\.0_robot', 'msrabot', 'msrbot', 'mt::telegraph::agent', 'nagios', 'nasa_search', 'mydoyouhike', 'netluchs', 'netsprint', 'newsgatoronline', 'nicebot', 'nimblecrawler', 'noxtrumbot', 'npbot', 'nutchcvs', 'nutchosu\-vlib', 'nutch', 'ocelli', 'octora_beta_bot', 'omniexplorer[_+ ]bot', 'onet\.pl[_+ ]sa', 'onfolio', 'opentaggerbot', 'openwebspider', 'oracle_ultra_search', 'orbiter', 'yodaobot', 'qihoobot', 'passwordmaker\.org', 'pear_http_request_class', 'peerbot', 'perman', 'php[_+ ]version[_+ ]tracker', 'pictureofinternet', 'ping\.blo\.gs', 'plinki', 'pluckfeedcrawler', 'pogodak', 'pompos', 'popdexter', 'port_huron_labs', 'postfavorites', 'projectwf\-java\-test\-crawler', 'proodlebot', 'pyquery', 'rambler', 'redalert', 'rojo', 'rssimagesbot', 'ruffle', 'rufusbot', 'sandcrawler', 'sbider', 'schizozilla', 'scumbot', 'searchguild[_+ ]dmoz[_+ ]experiment', 'seekbot', 'sensis_web_crawler', 'seznambot', 'shim\-crawler', 'shoutcast', 'slysearch', 'snap\.com_beta_crawler', 'sohu\-search', 'sohu', 'snappy', 'sphere_scout', 'spip', 'sproose_crawler', 'steeler', 'steroid__download', 'suchfin\-bot', 'superbot', 'surveybot', 'susie', 'syndic8', 'syndicapi', 'synoobot', 'tcl_http_client_package', 'technoratibot', 'teragramcrawlersurf', 'test_crawler', 'testbot', 't\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e', 'topicblogs', 'turnitinbot', 'turtlescanner', 'turtle', 'tutorgigbot', 'twiceler', 'ubicrawler', 'ultraseek', 'unchaos_bot_hybrid_web_search_engine', 'unido\-bot', 'updated', 'ustc\-semantic\-group', 'vagabondo\-wap', 'vagabondo', 'vermut', 'versus_crawler_from_eda\.baykan@epfl\.ch', 'vespa_crawler', 'vortex', 'vse\/', 'w3c\-checklink', 'w3c[_+ ]css[_+ ]validator[_+ ]jfouffa', 'w3c_validator', 'watchmouse', 'wavefire', 'webclipping\.com', 'webcompass', 'webcrawl\.net', 'web_downloader', 'webdup', 'webfilter', 'webindexer', 'webminer', 'website[_+ ]monitoring[_+ ]bot', 'webvulncrawl', 'wells_search', 'wonderer', 'wume_crawler', 'wwweasel', 'xenu\'s_link_sleuth', 'xenu_link_sleuth', 'xirq', 'y!j', 'yacy', 'yahoo\-blogs', 'yahoo\-verticalcrawler', 'yahoofeedseeker', 'yahooseeker\-testing', 'yahooseeker', 'yahoo\-mmcrawler', 'yahoo!_mindset', 'yandex', 'flexum', 'yanga', 'yooglifetchagent', 'z\-add_link_checker', 'zealbot', 'zhuaxia', 'zspider', 'zeus', 'ng\/1\.', 'ng\/2\.', 'exabot', 'wget', 'libwww', 'java\/[0-9]'] -search_engines = ['.*google\.[\w.]+/products.*', '.*base\.google\..*', '.*froogle\.google\..*', '.*groups\.google\..*', '.*images\.google\..*', '.*google\..*', '.*googlee\..*', '.*googlecom\.com.*', '.*goggle\.co\.hu.*', '.*216\.239\.(35|37|39|51)\.100.*', '.*216\.239\.(35|37|39|51)\.101.*', '.*216\.239\.5[0-9]\.104.*', '.*64\.233\.1[0-9]{2}\.104.*', '.*66\.102\.[1-9]\.104.*', '.*66\.249\.93\.104.*', '.*72\.14\.2[0-9]{2}\.104.*', '.*msn\..*', '.*live\.com.*', '.*bing\..*', '.*voila\..*', '.*mindset\.research\.yahoo.*', '.*yahoo\..*', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*', '.*search\.aol\.co.*', '.*tiscali\..*', '.*lycos\..*', '.*alexa\.com.*', '.*alltheweb\.com.*', '.*altavista\..*', '.*a9\.com.*', '.*dmoz\.org.*', '.*netscape\..*', '.*search\.terra\..*', '.*www\.search\.com.*', '.*search\.sli\.sympatico\.ca.*', '.*excite\..*'] +search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] -search_engines_2 = ['.*4\-counter\.com.*', '.*att\.net.*', '.*bungeebonesdotcom.*', '.*northernlight\..*', '.*hotbot\..*', '.*kvasir\..*', '.*webcrawler\..*', '.*metacrawler\..*', '.*go2net\.com.*', '.*(^|\.)go\.com.*', '.*euroseek\..*', '.*looksmart\..*', '.*spray\..*', '.*nbci\.com\/search.*', '.*de\.ask.\com.*', '.*es\.ask.\com.*', '.*fr\.ask.\com.*', '.*it\.ask.\com.*', '.*nl\.ask.\com.*', '.*uk\.ask.\com.*', '.*(^|\.)ask\.com.*', '.*atomz\..*', '.*overture\.com.*', '.*teoma\..*', '.*findarticles\.com.*', '.*infospace\.com.*', '.*mamma\..*', '.*dejanews\..*', '.*dogpile\.com.*', '.*wisenut\.com.*', '.*ixquick\.com.*', '.*search\.earthlink\.net.*', '.*i-une\.com.*', '.*blingo\.com.*', '.*centraldatabase\.org.*', '.*clusty\.com.*', '.*mysearch\..*', '.*vivisimo\.com.*', '.*kartoo\.com.*', '.*icerocket\.com.*', '.*sphere\.com.*', '.*ledix\.net.*', '.*start\.shaw\.ca.*', '.*searchalot\.com.*', '.*copernic\.com.*', '.*avantfind\.com.*', '.*steadysearch\.com.*', '.*steady-search\.com.*', '.*chello\.at.*', '.*chello\.be.*', '.*chello\.cz.*', '.*chello\.fr.*', '.*chello\.hu.*', '.*chello\.nl.*', '.*chello\.no.*', '.*chello\.pl.*', '.*chello\.se.*', '.*chello\.sk.*', '.*chello.*', '.*mirago\.be.*', '.*mirago\.ch.*', '.*mirago\.de.*', '.*mirago\.dk.*', '.*es\.mirago\.com.*', '.*mirago\.fr.*', '.*mirago\.it.*', '.*mirago\.nl.*', '.*no\.mirago\.com.*', '.*mirago\.se.*', '.*mirago\.co\.uk.*', '.*mirago.*', '.*answerbus\.com.*', '.*icq\.com\/search.*', '.*nusearch\.com.*', '.*goodsearch\.com.*', '.*scroogle\.org.*', '.*questionanswering\.com.*', '.*mywebsearch\.com.*', '.*as\.starware\.com.*', '.*del\.icio\.us.*', '.*digg\.com.*', '.*stumbleupon\.com.*', '.*swik\.net.*', '.*segnalo\.alice\.it.*', '.*ineffabile\.it.*', '.*anzwers\.com\.au.*', '.*engine\.exe.*', '.*miner\.bol\.com\.br.*', '.*\.baidu\.com.*', '.*\.vnet\.cn.*', '.*\.soso\.com.*', '.*\.sogou\.com.*', '.*\.3721\.com.*', '.*iask\.com.*', '.*\.accoona\.com.*', '.*\.163\.com.*', '.*\.zhongsou\.com.*', '.*atlas\.cz.*', '.*seznam\.cz.*', '.*quick\.cz.*', '.*centrum\.cz.*', '.*jyxo\.(cz|com).*', '.*najdi\.to.*', '.*redbox\.cz.*', '.*opasia\.dk.*', '.*danielsen\.com.*', '.*sol\.dk.*', '.*jubii\.dk.*', '.*find\.dk.*', '.*edderkoppen\.dk.*', '.*netstjernen\.dk.*', '.*orbis\.dk.*', '.*tyfon\.dk.*', '.*1klik\.dk.*', '.*ofir\.dk.*', '.*ilse\..*', '.*vindex\..*', '.*(^|\.)ask\.co\.uk.*', '.*bbc\.co\.uk/cgi-bin/search.*', '.*ifind\.freeserve.*', '.*looksmart\.co\.uk.*', '.*splut\..*', '.*spotjockey\..*', '.*ukdirectory\..*', '.*ukindex\.co\.uk.*', '.*ukplus\..*', '.*searchy\.co\.uk.*', '.*haku\.www\.fi.*', '.*recherche\.aol\.fr.*', '.*ctrouve\..*', '.*francite\..*', '.*\.lbb\.org.*', '.*rechercher\.libertysurf\.fr.*', '.*search[\w\-]+\.free\.fr.*', '.*recherche\.club-internet\.fr.*', '.*toile\.com.*', '.*biglotron\.com.*', '.*mozbot\.fr.*', '.*sucheaol\.aol\.de.*', '.*fireball\.de.*', '.*infoseek\.de.*', '.*suche\d?\.web\.de.*', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*', '.*suchen\.abacho\.de.*', '.*(brisbane|suche)\.t-online\.de.*', '.*allesklar\.de.*', '.*meinestadt\.de.*', '.*212\.227\.33\.241.*', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*', '.*wwweasel\.de.*', '.*netluchs\.de.*', '.*schoenerbrausen\.de.*', '.*heureka\.hu.*', '.*vizsla\.origo\.hu.*', '.*lapkereso\.hu.*', '.*goliat\.hu.*', '.*index\.hu.*', '.*wahoo\.hu.*', '.*webmania\.hu.*', '.*search\.internetto\.hu.*', '.*tango\.hu.*', '.*keresolap\.hu.*', '.*polymeta\.hu.*', '.*sify\.com.*', '.*virgilio\.it.*', '.*arianna\.libero\.it.*', '.*supereva\.com.*', '.*kataweb\.it.*', '.*search\.alice\.it\.master.*', '.*search\.alice\.it.*', '.*gotuneed\.com.*', '.*godado.*', '.*jumpy\.it.*', '.*shinyseek\.it.*', '.*teecno\.it.*', '.*ask\.jp.*', '.*sagool\.jp.*', '.*sok\.start\.no.*', '.*eniro\.no.*', '.*szukaj\.wp\.pl.*', '.*szukaj\.onet\.pl.*', '.*dodaj\.pl.*', '.*gazeta\.pl.*', '.*gery\.pl.*', '.*hoga\.pl.*', '.*netsprint\.pl.*', '.*interia\.pl.*', '.*katalog\.onet\.pl.*', '.*o2\.pl.*', '.*polska\.pl.*', '.*szukacz\.pl.*', '.*wow\.pl.*', '.*ya(ndex)?\.ru.*', '.*aport\.ru.*', '.*rambler\.ru.*', '.*turtle\.ru.*', '.*metabot\.ru.*', '.*evreka\.passagen\.se.*', '.*eniro\.se.*', '.*zoznam\.sk.*', '.*sapo\.pt.*', '.*search\.ch.*', '.*search\.bluewin\.ch.*', '.*pogodak\..*'] +search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.'] -not_search_engines_keys = {'.*yahoo\..*' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', '.*altavista\..*' : 'babelfish\.altavista\.', '.*tiscali\..*' : 'mail\.tiscali\.', '.*yandex\..*' : 'direct\.yandex\.', '.*google\..*' : 'translate\.google\.', '.*msn\..*' : 'hotmail\.msn\.'} +not_search_engines_keys = {'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'altavista\.' : 'babelfish\.altavista\.', 'tiscali\.' : 'mail\.tiscali\.', 'yandex\.' : 'direct\.yandex\.', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.'} -search_engines_hashid = {'.*search\.sli\.sympatico\.ca.*' : 'sympatico', '.*mywebsearch\.com.*' : 'mywebsearch', '.*netsprint\.pl\/hoga\-search.*' : 'hogapl', '.*findarticles\.com.*' : 'findarticles', '.*wow\.pl.*' : 'wowpl', '.*allesklar\.de.*' : 'allesklar', '.*atomz\..*' : 'atomz', '.*bing\..*' : 'bing', '.*find\.dk.*' : 'finddk', '.*google\..*' : 'google', '.*(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11).*' : 'yahoo', '.*pogodak\..*' : 'pogodak', '.*ask\.jp.*' : 'askjp', '.*\.baidu\.com.*' : 'baidu', '.*tango\.hu.*' : 'tango_hu', '.*gotuneed\.com.*' : 'gotuneed', '.*quick\.cz.*' : 'quick', '.*mirago.*' : 'mirago', '.*szukaj\.wp\.pl.*' : 'wp', '.*mirago\.de.*' : 'miragode', '.*mirago\.dk.*' : 'miragodk', '.*katalog\.onet\.pl.*' : 'katalogonetpl', '.*googlee\..*' : 'google', '.*orbis\.dk.*' : 'orbis', '.*turtle\.ru.*' : 'turtle', '.*zoznam\.sk.*' : 'zoznam', '.*start\.shaw\.ca.*' : 'shawca', '.*chello\.at.*' : 'chelloat', '.*centraldatabase\.org.*' : 'centraldatabase', '.*centrum\.cz.*' : 'centrum', '.*kataweb\.it.*' : 'kataweb', '.*\.lbb\.org.*' : 'lbb', '.*blingo\.com.*' : 'blingo', '.*vivisimo\.com.*' : 'vivisimo', '.*stumbleupon\.com.*' : 'stumbleupon', '.*es\.ask.\com.*' : 'askes', '.*interia\.pl.*' : 'interiapl', '.*[a-z]serv\.rrzn\.uni-hannover\.de.*' : 'meta', '.*search\.alice\.it.*' : 'aliceit', '.*shinyseek\.it.*' : 'shinyseek\.it', '.*i-une\.com.*' : 'iune', '.*dejanews\..*' : 'dejanews', '.*opasia\.dk.*' : 'opasia', '.*chello\.cz.*' : 'chellocz', '.*ya(ndex)?\.ru.*' : 'yandex', '.*kartoo\.com.*' : 'kartoo', '.*arianna\.libero\.it.*' : 'arianna', '.*ofir\.dk.*' : 'ofir', '.*search\.earthlink\.net.*' : 'earthlink', '.*biglotron\.com.*' : 'biglotron', '.*lapkereso\.hu.*' : 'lapkereso', '.*216\.239\.(35|37|39|51)\.101.*' : 'google_cache', '.*miner\.bol\.com\.br.*' : 'miner', '.*dodaj\.pl.*' : 'dodajpl', '.*mirago\.be.*' : 'miragobe', '.*googlecom\.com.*' : 'google', '.*steadysearch\.com.*' : 'steadysearch', '.*redbox\.cz.*' : 'redbox', '.*haku\.www\.fi.*' : 'haku', '.*sapo\.pt.*' : 'sapo', '.*sphere\.com.*' : 'sphere', '.*danielsen\.com.*' : 'danielsen', '.*alexa\.com.*' : 'alexa', '.*mamma\..*' : 'mamma', '.*swik\.net.*' : 'swik', '.*polska\.pl.*' : 'polskapl', '.*groups\.google\..*' : 'google_groups', '.*metabot\.ru.*' : 'metabot', '.*rechercher\.libertysurf\.fr.*' : 'libertysurf', '.*szukaj\.onet\.pl.*' : 'onetpl', '.*aport\.ru.*' : 'aport', '.*de\.ask.\com.*' : 'askde', '.*splut\..*' : 'splut', '.*live\.com.*' : 'live', '.*216\.239\.5[0-9]\.104.*' : 'google_cache', '.*mysearch\..*' : 'mysearch', '.*ukplus\..*' : 'ukplus', '.*najdi\.to.*' : 'najdi', '.*overture\.com.*' : 'overture', '.*iask\.com.*' : 'iask', '.*nl\.ask.\com.*' : 'asknl', '.*nbci\.com\/search.*' : 'nbci', '.*search\.aol\.co.*' : 'aol', '.*eniro\.se.*' : 'enirose', '.*64\.233\.1[0-9]{2}\.104.*' : 'google_cache', '.*mirago\.ch.*' : 'miragoch', '.*altavista\..*' : 'altavista', '.*chello\.hu.*' : 'chellohu', '.*mozbot\.fr.*' : 'mozbot', '.*northernlight\..*' : 'northernlight', '.*mirago\.co\.uk.*' : 'miragocouk', '.*search[\w\-]+\.free\.fr.*' : 'free', '.*mindset\.research\.yahoo.*' : 'yahoo_mindset', '.*copernic\.com.*' : 'copernic', '.*heureka\.hu.*' : 'heureka', '.*steady-search\.com.*' : 'steadysearch', '.*teecno\.it.*' : 'teecnoit', '.*voila\..*' : 'voila', '.*netstjernen\.dk.*' : 'netstjernen', '.*keresolap\.hu.*' : 'keresolap_hu', '.*yahoo\..*' : 'yahoo', '.*icerocket\.com.*' : 'icerocket', '.*alltheweb\.com.*' : 'alltheweb', '.*www\.search\.com.*' : 'search.com', '.*digg\.com.*' : 'digg', '.*tiscali\..*' : 'tiscali', '.*spotjockey\..*' : 'spotjockey', '.*a9\.com.*' : 'a9', '.*(brisbane|suche)\.t-online\.de.*' : 't-online', '.*ifind\.freeserve.*' : 'freeserve', '.*att\.net.*' : 'att', '.*mirago\.it.*' : 'miragoit', '.*index\.hu.*' : 'indexhu', '.*\.sogou\.com.*' : 'sogou', '.*no\.mirago\.com.*' : 'miragono', '.*ineffabile\.it.*' : 'ineffabile', '.*netluchs\.de.*' : 'netluchs', '.*toile\.com.*' : 'toile', '.*search\..*\.\w+.*' : 'search', '.*del\.icio\.us.*' : 'delicious', '.*vizsla\.origo\.hu.*' : 'origo', '.*netscape\..*' : 'netscape', '.*dogpile\.com.*' : 'dogpile', '.*anzwers\.com\.au.*' : 'anzwers', '.*\.zhongsou\.com.*' : 'zhongsou', '.*ctrouve\..*' : 'ctrouve', '.*gazeta\.pl.*' : 'gazetapl', '.*recherche\.club-internet\.fr.*' : 'clubinternet', '.*sok\.start\.no.*' : 'start', '.*scroogle\.org.*' : 'scroogle', '.*schoenerbrausen\.de.*' : 'schoenerbrausen', '.*looksmart\.co\.uk.*' : 'looksmartuk', '.*wwweasel\.de.*' : 'wwweasel', '.*godado.*' : 'godado', '.*216\.239\.(35|37|39|51)\.100.*' : 'google_cache', '.*jubii\.dk.*' : 'jubii', '.*212\.227\.33\.241.*' : 'metaspinner', '.*mirago\.fr.*' : 'miragofr', '.*sol\.dk.*' : 'sol', '.*bbc\.co\.uk/cgi-bin/search.*' : 'bbc', '.*jumpy\.it.*' : 'jumpy\.it', '.*francite\..*' : 'francite', '.*infoseek\.de.*' : 'infoseek', '.*es\.mirago\.com.*' : 'miragoes', '.*jyxo\.(cz|com).*' : 'jyxo', '.*hotbot\..*' : 'hotbot', '.*engine\.exe.*' : 'engine', '.*(^|\.)ask\.com.*' : 'ask', '.*goliat\.hu.*' : 'goliat', '.*wisenut\.com.*' : 'wisenut', '.*mirago\.nl.*' : 'miragonl', '.*base\.google\..*' : 'google_base', '.*search\.bluewin\.ch.*' : 'bluewin', '.*lycos\..*' : 'lycos', '.*meinestadt\.de.*' : 'meinestadt', '.*4\-counter\.com.*' : 'google4counter', '.*search\.alice\.it\.master.*' : 'aliceitmaster', '.*teoma\..*' : 'teoma', '.*(^|\.)ask\.co\.uk.*' : 'askuk', '.*tyfon\.dk.*' : 'tyfon', '.*froogle\.google\..*' : 'google_froogle', '.*ukdirectory\..*' : 'ukdirectory', '.*ledix\.net.*' : 'ledix', '.*edderkoppen\.dk.*' : 'edderkoppen', '.*recherche\.aol\.fr.*' : 'aolfr', '.*google\.[\w.]+/products.*' : 'google_products', '.*webmania\.hu.*' : 'webmania', '.*searchy\.co\.uk.*' : 'searchy', '.*fr\.ask.\com.*' : 'askfr', '.*spray\..*' : 'spray', '.*72\.14\.2[0-9]{2}\.104.*' : 'google_cache', '.*eniro\.no.*' : 'eniro', '.*goodsearch\.com.*' : 'goodsearch', '.*kvasir\..*' : 'kvasir', '.*\.accoona\.com.*' : 'accoona', '.*\.soso\.com.*' : 'soso', '.*as\.starware\.com.*' : 'comettoolbar', '.*virgilio\.it.*' : 'virgilio', '.*o2\.pl.*' : 'o2pl', '.*chello\.nl.*' : 'chellonl', '.*chello\.be.*' : 'chellobe', '.*icq\.com\/search.*' : 'icq', '.*msn\..*' : 'msn', '.*fireball\.de.*' : 'fireball', '.*sucheaol\.aol\.de.*' : 'aolde', '.*uk\.ask.\com.*' : 'askuk', '.*euroseek\..*' : 'euroseek', '.*gery\.pl.*' : 'gerypl', '.*chello\.fr.*' : 'chellofr', '.*netsprint\.pl.*' : 'netsprintpl', '.*avantfind\.com.*' : 'avantfind', '.*supereva\.com.*' : 'supereva', '.*polymeta\.hu.*' : 'polymeta_hu', '.*infospace\.com.*' : 'infospace', '.*sify\.com.*' : 'sify', '.*go2net\.com.*' : 'go2net', '.*wahoo\.hu.*' : 'wahoo', '.*suche\d?\.web\.de.*' : 'webde', '.*(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42).*' : 'metacrawler_de', '.*\.3721\.com.*' : '3721', '.*ilse\..*' : 'ilse', '.*metacrawler\..*' : 'metacrawler', '.*sagool\.jp.*' : 'sagool', '.*atlas\.cz.*' : 'atlas', '.*vindex\..*' : 'vindex', '.*ixquick\.com.*' : 'ixquick', '.*66\.102\.[1-9]\.104.*' : 'google_cache', '.*rambler\.ru.*' : 'rambler', '.*answerbus\.com.*' : 'answerbus', '.*evreka\.passagen\.se.*' : 'passagen', '.*chello\.se.*' : 'chellose', '.*clusty\.com.*' : 'clusty', '.*search\.ch.*' : 'searchch', '.*chello\.no.*' : 'chellono', '.*searchalot\.com.*' : 'searchalot', '.*questionanswering\.com.*' : 'questionanswering', '.*seznam\.cz.*' : 'seznam', '.*ukindex\.co\.uk.*' : 'ukindex', '.*dmoz\.org.*' : 'dmoz', '.*excite\..*' : 'excite', '.*chello\.pl.*' : 'chellopl', '.*looksmart\..*' : 'looksmart', '.*1klik\.dk.*' : '1klik', '.*\.vnet\.cn.*' : 'vnet', '.*chello\.sk.*' : 'chellosk', '.*(^|\.)go\.com.*' : 'go', '.*nusearch\.com.*' : 'nusearch', '.*it\.ask.\com.*' : 'askit', '.*bungeebonesdotcom.*' : 'bungeebonesdotcom', '.*search\.terra\..*' : 'terra', '.*webcrawler\..*' : 'webcrawler', '.*suchen\.abacho\.de.*' : 'abacho', '.*szukacz\.pl.*' : 'szukaczpl', '.*66\.249\.93\.104.*' : 'google_cache', '.*search\.internetto\.hu.*' : 'internetto', '.*goggle\.co\.hu.*' : 'google', '.*mirago\.se.*' : 'miragose', '.*images\.google\..*' : 'google_image', '.*segnalo\.alice\.it.*' : 'segnalo', '.*\.163\.com.*' : 'netease', '.*chello.*' : 'chellocom'} +search_engines_hashid = {'search\.sli\.sympatico\.ca' : 'sympatico', 'mywebsearch\.com' : 'mywebsearch', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'findarticles\.com' : 'findarticles', 'wow\.pl' : 'wowpl', 'allesklar\.de' : 'allesklar', 'atomz\.' : 'atomz', 'bing\.' : 'bing', 'find\.dk' : 'finddk', 'google\.' : 'google', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'pogodak\.' : 'pogodak', 'ask\.jp' : 'askjp', '\.baidu\.com' : 'baidu', 'tango\.hu' : 'tango_hu', 'gotuneed\.com' : 'gotuneed', 'quick\.cz' : 'quick', 'mirago' : 'mirago', 'szukaj\.wp\.pl' : 'wp', 'mirago\.de' : 'miragode', 'mirago\.dk' : 'miragodk', 'katalog\.onet\.pl' : 'katalogonetpl', 'googlee\.' : 'google', 'orbis\.dk' : 'orbis', 'turtle\.ru' : 'turtle', 'zoznam\.sk' : 'zoznam', 'start\.shaw\.ca' : 'shawca', 'chello\.at' : 'chelloat', 'centraldatabase\.org' : 'centraldatabase', 'centrum\.cz' : 'centrum', 'kataweb\.it' : 'kataweb', '\.lbb\.org' : 'lbb', 'blingo\.com' : 'blingo', 'vivisimo\.com' : 'vivisimo', 'stumbleupon\.com' : 'stumbleupon', 'es\.ask.\com' : 'askes', 'interia\.pl' : 'interiapl', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'search\.alice\.it' : 'aliceit', 'shinyseek\.it' : 'shinyseek\.it', 'i-une\.com' : 'iune', 'dejanews\.' : 'dejanews', 'opasia\.dk' : 'opasia', 'chello\.cz' : 'chellocz', 'ya(ndex)?\.ru' : 'yandex', 'kartoo\.com' : 'kartoo', 'arianna\.libero\.it' : 'arianna', 'ofir\.dk' : 'ofir', 'search\.earthlink\.net' : 'earthlink', 'biglotron\.com' : 'biglotron', 'lapkereso\.hu' : 'lapkereso', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'dodaj\.pl' : 'dodajpl', 'mirago\.be' : 'miragobe', 'googlecom\.com' : 'google', 'steadysearch\.com' : 'steadysearch', 'redbox\.cz' : 'redbox', 'haku\.www\.fi' : 'haku', 'sapo\.pt' : 'sapo', 'sphere\.com' : 'sphere', 'danielsen\.com' : 'danielsen', 'alexa\.com' : 'alexa', 'mamma\.' : 'mamma', 'swik\.net' : 'swik', 'polska\.pl' : 'polskapl', 'groups\.google\.' : 'google_groups', 'metabot\.ru' : 'metabot', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'szukaj\.onet\.pl' : 'onetpl', 'aport\.ru' : 'aport', 'de\.ask.\com' : 'askde', 'splut\.' : 'splut', 'live\.com' : 'live', '216\.239\.5[0-9]\.104' : 'google_cache', 'mysearch\.' : 'mysearch', 'ukplus\.' : 'ukplus', 'najdi\.to' : 'najdi', 'overture\.com' : 'overture', 'iask\.com' : 'iask', 'nl\.ask.\com' : 'asknl', 'nbci\.com\/search' : 'nbci', 'search\.aol\.co' : 'aol', 'eniro\.se' : 'enirose', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'mirago\.ch' : 'miragoch', 'altavista\.' : 'altavista', 'chello\.hu' : 'chellohu', 'mozbot\.fr' : 'mozbot', 'northernlight\.' : 'northernlight', 'mirago\.co\.uk' : 'miragocouk', 'search[\w\-]+\.free\.fr' : 'free', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'copernic\.com' : 'copernic', 'heureka\.hu' : 'heureka', 'steady-search\.com' : 'steadysearch', 'teecno\.it' : 'teecnoit', 'voila\.' : 'voila', 'netstjernen\.dk' : 'netstjernen', 'keresolap\.hu' : 'keresolap_hu', 'yahoo\.' : 'yahoo', 'icerocket\.com' : 'icerocket', 'alltheweb\.com' : 'alltheweb', 'www\.search\.com' : 'search.com', 'digg\.com' : 'digg', 'tiscali\.' : 'tiscali', 'spotjockey\.' : 'spotjockey', 'a9\.com' : 'a9', '(brisbane|suche)\.t-online\.de' : 't-online', 'ifind\.freeserve' : 'freeserve', 'att\.net' : 'att', 'mirago\.it' : 'miragoit', 'index\.hu' : 'indexhu', '\.sogou\.com' : 'sogou', 'no\.mirago\.com' : 'miragono', 'ineffabile\.it' : 'ineffabile', 'netluchs\.de' : 'netluchs', 'toile\.com' : 'toile', 'search\..*\.\w+' : 'search', 'del\.icio\.us' : 'delicious', 'vizsla\.origo\.hu' : 'origo', 'netscape\.' : 'netscape', 'dogpile\.com' : 'dogpile', 'anzwers\.com\.au' : 'anzwers', '\.zhongsou\.com' : 'zhongsou', 'ctrouve\.' : 'ctrouve', 'gazeta\.pl' : 'gazetapl', 'recherche\.club-internet\.fr' : 'clubinternet', 'sok\.start\.no' : 'start', 'scroogle\.org' : 'scroogle', 'schoenerbrausen\.de' : 'schoenerbrausen', 'looksmart\.co\.uk' : 'looksmartuk', 'wwweasel\.de' : 'wwweasel', 'godado' : 'godado', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'jubii\.dk' : 'jubii', '212\.227\.33\.241' : 'metaspinner', 'mirago\.fr' : 'miragofr', 'sol\.dk' : 'sol', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'jumpy\.it' : 'jumpy\.it', 'francite\.' : 'francite', 'infoseek\.de' : 'infoseek', 'es\.mirago\.com' : 'miragoes', 'jyxo\.(cz|com)' : 'jyxo', 'hotbot\.' : 'hotbot', 'engine\.exe' : 'engine', '(^|\.)ask\.com' : 'ask', 'goliat\.hu' : 'goliat', 'wisenut\.com' : 'wisenut', 'mirago\.nl' : 'miragonl', 'base\.google\.' : 'google_base', 'search\.bluewin\.ch' : 'bluewin', 'lycos\.' : 'lycos', 'meinestadt\.de' : 'meinestadt', '4\-counter\.com' : 'google4counter', 'search\.alice\.it\.master' : 'aliceitmaster', 'teoma\.' : 'teoma', '(^|\.)ask\.co\.uk' : 'askuk', 'tyfon\.dk' : 'tyfon', 'froogle\.google\.' : 'google_froogle', 'ukdirectory\.' : 'ukdirectory', 'ledix\.net' : 'ledix', 'edderkoppen\.dk' : 'edderkoppen', 'recherche\.aol\.fr' : 'aolfr', 'google\.[\w.]+/products' : 'google_products', 'webmania\.hu' : 'webmania', 'searchy\.co\.uk' : 'searchy', 'fr\.ask.\com' : 'askfr', 'spray\.' : 'spray', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'eniro\.no' : 'eniro', 'goodsearch\.com' : 'goodsearch', 'kvasir\.' : 'kvasir', '\.accoona\.com' : 'accoona', '\.soso\.com' : 'soso', 'as\.starware\.com' : 'comettoolbar', 'virgilio\.it' : 'virgilio', 'o2\.pl' : 'o2pl', 'chello\.nl' : 'chellonl', 'chello\.be' : 'chellobe', 'icq\.com\/search' : 'icq', 'msn\.' : 'msn', 'fireball\.de' : 'fireball', 'sucheaol\.aol\.de' : 'aolde', 'uk\.ask.\com' : 'askuk', 'euroseek\.' : 'euroseek', 'gery\.pl' : 'gerypl', 'chello\.fr' : 'chellofr', 'netsprint\.pl' : 'netsprintpl', 'avantfind\.com' : 'avantfind', 'supereva\.com' : 'supereva', 'polymeta\.hu' : 'polymeta_hu', 'infospace\.com' : 'infospace', 'sify\.com' : 'sify', 'go2net\.com' : 'go2net', 'wahoo\.hu' : 'wahoo', 'suche\d?\.web\.de' : 'webde', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', '\.3721\.com' : '3721', 'ilse\.' : 'ilse', 'metacrawler\.' : 'metacrawler', 'sagool\.jp' : 'sagool', 'atlas\.cz' : 'atlas', 'vindex\.' : 'vindex', 'ixquick\.com' : 'ixquick', '66\.102\.[1-9]\.104' : 'google_cache', 'rambler\.ru' : 'rambler', 'answerbus\.com' : 'answerbus', 'evreka\.passagen\.se' : 'passagen', 'chello\.se' : 'chellose', 'clusty\.com' : 'clusty', 'search\.ch' : 'searchch', 'chello\.no' : 'chellono', 'searchalot\.com' : 'searchalot', 'questionanswering\.com' : 'questionanswering', 'seznam\.cz' : 'seznam', 'ukindex\.co\.uk' : 'ukindex', 'dmoz\.org' : 'dmoz', 'excite\.' : 'excite', 'chello\.pl' : 'chellopl', 'looksmart\.' : 'looksmart', '1klik\.dk' : '1klik', '\.vnet\.cn' : 'vnet', 'chello\.sk' : 'chellosk', '(^|\.)go\.com' : 'go', 'nusearch\.com' : 'nusearch', 'it\.ask.\com' : 'askit', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'search\.terra\.' : 'terra', 'webcrawler\.' : 'webcrawler', 'suchen\.abacho\.de' : 'abacho', 'szukacz\.pl' : 'szukaczpl', '66\.249\.93\.104' : 'google_cache', 'search\.internetto\.hu' : 'internetto', 'goggle\.co\.hu' : 'google', 'mirago\.se' : 'miragose', 'images\.google\.' : 'google_image', 'segnalo\.alice\.it' : 'segnalo', '\.163\.com' : 'netease', 'chello' : 'chellocom'} -search_engines_knwown_url = {'.*dmoz.*' : 'search=', '.*google.*' : '(p|q|as_p|as_q)=', '.*searchalot.*' : 'q=', '.*teoma.*' : 'q=', '.*looksmartuk.*' : 'key=', '.*polymeta_hu.*' : '', '.*google_groups.*' : 'group\/', '.*iune.*' : '(keywords|q)=', '.*chellosk.*' : 'q1=', '.*eniro.*' : 'q=', '.*msn.*' : 'q=', '.*webcrawler.*' : 'searchText=', '.*mirago.*' : '(txtsearch|qry)=', '.*enirose.*' : 'q=', '.*miragobe.*' : '(txtsearch|qry)=', '.*netease.*' : 'q=', '.*netluchs.*' : 'query=', '.*google_products.*' : '(p|q|as_p|as_q)=', '.*jyxo.*' : '(s|q)=', '.*origo.*' : '(q|search)=', '.*ilse.*' : 'search_for=', '.*chellocom.*' : 'q1=', '.*goodsearch.*' : 'Keywords=', '.*ledix.*' : 'q=', '.*mozbot.*' : 'q=', '.*chellocz.*' : 'q1=', '.*webde.*' : 'su=', '.*biglotron.*' : 'question=', '.*metacrawler_de.*' : 'qry=', '.*finddk.*' : 'words=', '.*start.*' : 'q=', '.*sagool.*' : 'q=', '.*miragoch.*' : '(txtsearch|qry)=', '.*google_base.*' : '(p|q|as_p|as_q)=', '.*aliceit.*' : 'qs=', '.*shinyseek\.it.*' : 'KEY=', '.*onetpl.*' : 'qt=', '.*clusty.*' : 'query=', '.*chellonl.*' : 'q1=', '.*miragode.*' : '(txtsearch|qry)=', '.*miragose.*' : '(txtsearch|qry)=', '.*o2pl.*' : 'qt=', '.*goliat.*' : 'KERESES=', '.*kvasir.*' : 'q=', '.*askfr.*' : '(ask|q)=', '.*infoseek.*' : 'qt=', '.*yahoo_mindset.*' : 'p=', '.*comettoolbar.*' : 'qry=', '.*alltheweb.*' : 'q(|uery)=', '.*miner.*' : 'q=', '.*aol.*' : 'query=', '.*rambler.*' : 'words=', '.*scroogle.*' : 'Gw=', '.*chellose.*' : 'q1=', '.*ineffabile.*' : '', '.*miragoit.*' : '(txtsearch|qry)=', '.*yandex.*' : 'text=', '.*segnalo.*' : '', '.*dodajpl.*' : 'keyword=', '.*avantfind.*' : 'keywords=', '.*nusearch.*' : 'nusearch_terms=', '.*bbc.*' : 'q=', '.*supereva.*' : 'q=', '.*atomz.*' : 'sp-q=', '.*searchy.*' : 'search_term=', '.*dogpile.*' : 'q(|kw)=', '.*chellohu.*' : 'q1=', '.*vnet.*' : 'kw=', '.*1klik.*' : 'query=', '.*t-online.*' : 'q=', '.*hogapl.*' : 'qt=', '.*stumbleupon.*' : '', '.*soso.*' : 'q=', '.*zhongsou.*' : '(word|w)=', '.*a9.*' : 'a9\.com\/', '.*centraldatabase.*' : 'query=', '.*mamma.*' : 'query=', '.*icerocket.*' : 'q=', '.*ask.*' : '(ask|q)=', '.*chellobe.*' : 'q1=', '.*altavista.*' : 'q=', '.*vindex.*' : 'in=', '.*miragodk.*' : '(txtsearch|qry)=', '.*chelloat.*' : 'q1=', '.*digg.*' : 's=', '.*metacrawler.*' : 'general=', '.*nbci.*' : 'keyword=', '.*chellono.*' : 'q1=', '.*icq.*' : 'q=', '.*arianna.*' : 'query=', '.*miragocouk.*' : '(txtsearch|qry)=', '.*3721.*' : '(p|name)=', '.*pogodak.*' : 'q=', '.*ukdirectory.*' : 'k=', '.*overture.*' : 'keywords=', '.*heureka.*' : 'heureka=', '.*teecnoit.*' : 'q=', '.*miragoes.*' : '(txtsearch|qry)=', '.*haku.*' : 'w=', '.*go.*' : 'qt=', '.*fireball.*' : 'q=', '.*wisenut.*' : 'query=', '.*sify.*' : 'keyword=', '.*ixquick.*' : 'query=', '.*anzwers.*' : 'search=', '.*quick.*' : 'query=', '.*jubii.*' : 'soegeord=', '.*questionanswering.*' : '', '.*asknl.*' : '(ask|q)=', '.*askde.*' : '(ask|q)=', '.*att.*' : 'qry=', '.*terra.*' : 'query=', '.*bing.*' : 'q=', '.*wowpl.*' : 'q=', '.*freeserve.*' : 'q=', '.*atlas.*' : '(searchtext|q)=', '.*askuk.*' : '(ask|q)=', '.*godado.*' : 'Keywords=', '.*northernlight.*' : 'qr=', '.*answerbus.*' : '', '.*search.com.*' : 'q=', '.*google_image.*' : '(p|q|as_p|as_q)=', '.*jumpy\.it.*' : 'searchWord=', '.*gazetapl.*' : 'slowo=', '.*yahoo.*' : 'p=', '.*hotbot.*' : 'mt=', '.*metabot.*' : 'st=', '.*copernic.*' : 'web\/', '.*kartoo.*' : '', '.*metaspinner.*' : 'qry=', '.*toile.*' : 'q=', '.*aolde.*' : 'q=', '.*blingo.*' : 'q=', '.*askit.*' : '(ask|q)=', '.*netscape.*' : 'search=', '.*splut.*' : 'pattern=', '.*looksmart.*' : 'key=', '.*sphere.*' : 'q=', '.*sol.*' : 'q=', '.*miragono.*' : '(txtsearch|qry)=', '.*kataweb.*' : 'q=', '.*ofir.*' : 'querytext=', '.*aliceitmaster.*' : 'qs=', '.*miragofr.*' : '(txtsearch|qry)=', '.*spray.*' : 'string=', '.*seznam.*' : '(w|q)=', '.*interiapl.*' : 'q=', '.*euroseek.*' : 'query=', '.*schoenerbrausen.*' : 'q=', '.*centrum.*' : 'q=', '.*netsprintpl.*' : 'q=', '.*go2net.*' : 'general=', '.*katalogonetpl.*' : 'qt=', '.*ukindex.*' : 'stext=', '.*shawca.*' : 'q=', '.*szukaczpl.*' : 'q=', '.*accoona.*' : 'qt=', '.*live.*' : 'q=', '.*google4counter.*' : '(p|q|as_p|as_q)=', '.*iask.*' : '(w|k)=', '.*earthlink.*' : 'q=', '.*tiscali.*' : 'key=', '.*askes.*' : '(ask|q)=', '.*gotuneed.*' : '', '.*clubinternet.*' : 'q=', '.*redbox.*' : 'srch=', '.*delicious.*' : 'all=', '.*chellofr.*' : 'q1=', '.*lycos.*' : 'query=', '.*sympatico.*' : 'query=', '.*vivisimo.*' : 'query=', '.*bluewin.*' : 'qry=', '.*mysearch.*' : 'searchfor=', '.*google_cache.*' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', '.*ukplus.*' : 'search=', '.*gerypl.*' : 'q=', '.*keresolap_hu.*' : 'q=', '.*abacho.*' : 'q=', '.*engine.*' : 'p1=', '.*opasia.*' : 'q=', '.*wp.*' : 'szukaj=', '.*steadysearch.*' : 'w=', '.*chellopl.*' : 'q1=', '.*voila.*' : '(kw|rdata)=', '.*aport.*' : 'r=', '.*internetto.*' : 'searchstr=', '.*passagen.*' : 'q=', '.*wwweasel.*' : 'q=', '.*najdi.*' : 'dotaz=', '.*alexa.*' : 'q=', '.*baidu.*' : '(wd|word)=', '.*spotjockey.*' : 'Search_Keyword=', '.*virgilio.*' : 'qs=', '.*orbis.*' : 'search_field=', '.*tango_hu.*' : 'q=', '.*askjp.*' : '(ask|q)=', '.*bungeebonesdotcom.*' : 'query=', '.*francite.*' : 'name=', '.*searchch.*' : 'q=', '.*google_froogle.*' : '(p|q|as_p|as_q)=', '.*excite.*' : 'search=', '.*infospace.*' : 'qkw=', '.*polskapl.*' : 'qt=', '.*swik.*' : 'swik\.net/', '.*edderkoppen.*' : 'query=', '.*mywebsearch.*' : 'searchfor=', '.*danielsen.*' : 'q=', '.*wahoo.*' : 'q=', '.*sogou.*' : 'query=', '.*miragonl.*' : '(txtsearch|qry)=', '.*findarticles.*' : 'key='} +search_engines_knwown_url = {'dmoz' : 'search=', 'google' : '(p|q|as_p|as_q)=', 'searchalot' : 'q=', 'teoma' : 'q=', 'looksmartuk' : 'key=', 'polymeta_hu' : '', 'google_groups' : 'group\/', 'iune' : '(keywords|q)=', 'chellosk' : 'q1=', 'eniro' : 'q=', 'msn' : 'q=', 'webcrawler' : 'searchText=', 'mirago' : '(txtsearch|qry)=', 'enirose' : 'q=', 'miragobe' : '(txtsearch|qry)=', 'netease' : 'q=', 'netluchs' : 'query=', 'google_products' : '(p|q|as_p|as_q)=', 'jyxo' : '(s|q)=', 'origo' : '(q|search)=', 'ilse' : 'search_for=', 'chellocom' : 'q1=', 'goodsearch' : 'Keywords=', 'ledix' : 'q=', 'mozbot' : 'q=', 'chellocz' : 'q1=', 'webde' : 'su=', 'biglotron' : 'question=', 'metacrawler_de' : 'qry=', 'finddk' : 'words=', 'start' : 'q=', 'sagool' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'aliceit' : 'qs=', 'shinyseek\.it' : 'KEY=', 'onetpl' : 'qt=', 'clusty' : 'query=', 'chellonl' : 'q1=', 'miragode' : '(txtsearch|qry)=', 'miragose' : '(txtsearch|qry)=', 'o2pl' : 'qt=', 'goliat' : 'KERESES=', 'kvasir' : 'q=', 'askfr' : '(ask|q)=', 'infoseek' : 'qt=', 'yahoo_mindset' : 'p=', 'comettoolbar' : 'qry=', 'alltheweb' : 'q(|uery)=', 'miner' : 'q=', 'aol' : 'query=', 'rambler' : 'words=', 'scroogle' : 'Gw=', 'chellose' : 'q1=', 'ineffabile' : '', 'miragoit' : '(txtsearch|qry)=', 'yandex' : 'text=', 'segnalo' : '', 'dodajpl' : 'keyword=', 'avantfind' : 'keywords=', 'nusearch' : 'nusearch_terms=', 'bbc' : 'q=', 'supereva' : 'q=', 'atomz' : 'sp-q=', 'searchy' : 'search_term=', 'dogpile' : 'q(|kw)=', 'chellohu' : 'q1=', 'vnet' : 'kw=', '1klik' : 'query=', 't-online' : 'q=', 'hogapl' : 'qt=', 'stumbleupon' : '', 'soso' : 'q=', 'zhongsou' : '(word|w)=', 'a9' : 'a9\.com\/', 'centraldatabase' : 'query=', 'mamma' : 'query=', 'icerocket' : 'q=', 'ask' : '(ask|q)=', 'chellobe' : 'q1=', 'altavista' : 'q=', 'vindex' : 'in=', 'miragodk' : '(txtsearch|qry)=', 'chelloat' : 'q1=', 'digg' : 's=', 'metacrawler' : 'general=', 'nbci' : 'keyword=', 'chellono' : 'q1=', 'icq' : 'q=', 'arianna' : 'query=', 'miragocouk' : '(txtsearch|qry)=', '3721' : '(p|name)=', 'pogodak' : 'q=', 'ukdirectory' : 'k=', 'overture' : 'keywords=', 'heureka' : 'heureka=', 'teecnoit' : 'q=', 'miragoes' : '(txtsearch|qry)=', 'haku' : 'w=', 'go' : 'qt=', 'fireball' : 'q=', 'wisenut' : 'query=', 'sify' : 'keyword=', 'ixquick' : 'query=', 'anzwers' : 'search=', 'quick' : 'query=', 'jubii' : 'soegeord=', 'questionanswering' : '', 'asknl' : '(ask|q)=', 'askde' : '(ask|q)=', 'att' : 'qry=', 'terra' : 'query=', 'bing' : 'q=', 'wowpl' : 'q=', 'freeserve' : 'q=', 'atlas' : '(searchtext|q)=', 'askuk' : '(ask|q)=', 'godado' : 'Keywords=', 'northernlight' : 'qr=', 'answerbus' : '', 'search.com' : 'q=', 'google_image' : '(p|q|as_p|as_q)=', 'jumpy\.it' : 'searchWord=', 'gazetapl' : 'slowo=', 'yahoo' : 'p=', 'hotbot' : 'mt=', 'metabot' : 'st=', 'copernic' : 'web\/', 'kartoo' : '', 'metaspinner' : 'qry=', 'toile' : 'q=', 'aolde' : 'q=', 'blingo' : 'q=', 'askit' : '(ask|q)=', 'netscape' : 'search=', 'splut' : 'pattern=', 'looksmart' : 'key=', 'sphere' : 'q=', 'sol' : 'q=', 'miragono' : '(txtsearch|qry)=', 'kataweb' : 'q=', 'ofir' : 'querytext=', 'aliceitmaster' : 'qs=', 'miragofr' : '(txtsearch|qry)=', 'spray' : 'string=', 'seznam' : '(w|q)=', 'interiapl' : 'q=', 'euroseek' : 'query=', 'schoenerbrausen' : 'q=', 'centrum' : 'q=', 'netsprintpl' : 'q=', 'go2net' : 'general=', 'katalogonetpl' : 'qt=', 'ukindex' : 'stext=', 'shawca' : 'q=', 'szukaczpl' : 'q=', 'accoona' : 'qt=', 'live' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'iask' : '(w|k)=', 'earthlink' : 'q=', 'tiscali' : 'key=', 'askes' : '(ask|q)=', 'gotuneed' : '', 'clubinternet' : 'q=', 'redbox' : 'srch=', 'delicious' : 'all=', 'chellofr' : 'q1=', 'lycos' : 'query=', 'sympatico' : 'query=', 'vivisimo' : 'query=', 'bluewin' : 'qry=', 'mysearch' : 'searchfor=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ukplus' : 'search=', 'gerypl' : 'q=', 'keresolap_hu' : 'q=', 'abacho' : 'q=', 'engine' : 'p1=', 'opasia' : 'q=', 'wp' : 'szukaj=', 'steadysearch' : 'w=', 'chellopl' : 'q1=', 'voila' : '(kw|rdata)=', 'aport' : 'r=', 'internetto' : 'searchstr=', 'passagen' : 'q=', 'wwweasel' : 'q=', 'najdi' : 'dotaz=', 'alexa' : 'q=', 'baidu' : '(wd|word)=', 'spotjockey' : 'Search_Keyword=', 'virgilio' : 'qs=', 'orbis' : 'search_field=', 'tango_hu' : 'q=', 'askjp' : '(ask|q)=', 'bungeebonesdotcom' : 'query=', 'francite' : 'name=', 'searchch' : 'q=', 'google_froogle' : '(p|q|as_p|as_q)=', 'excite' : 'search=', 'infospace' : 'qkw=', 'polskapl' : 'qt=', 'swik' : 'swik\.net/', 'edderkoppen' : 'query=', 'mywebsearch' : 'searchfor=', 'danielsen' : 'q=', 'wahoo' : 'q=', 'sogou' : 'query=', 'miragonl' : '(txtsearch|qry)=', 'findarticles' : 'key='} diff --git a/iwla_convert.pl b/iwla_convert.pl index 5a74cf8..b5c9587 100755 --- a/iwla_convert.pl +++ b/iwla_convert.pl @@ -24,7 +24,7 @@ sub dumpList { { $first = 0; } - print $FIC "'.*$r.*'"; + print $FIC "'$r'"; } } @@ -44,7 +44,7 @@ sub dumpHash { { $first = 0; } - print $FIC "'.*$k.*' : '$v'"; + print $FIC "'$k' : '$v'"; } } diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 56924d9..a279c4a 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -13,6 +13,14 @@ class IWLADisplayReferers(IPlugin): super(IWLADisplayReferers, self).__init__(iwla) self.API_VERSION = 1 + def _getSearchEngine(self, engine): + for (k, e) in self.search_engines.items(): + for hashid in e['hashid']: + if hashid.match(engine): + return k + print 'Not found %s' % (engine) + return None + def load(self): domain_name = self.iwla.getConfValue('domain_name', '') @@ -23,26 +31,40 @@ class IWLADisplayReferers(IPlugin): self.own_domain_re = re.compile('.*%s.*' % (domain_name)) self.search_engines = {} - for engine in awstats_data.search_engines: + for (engine, known_url) in awstats_data.search_engines_knwown_url.items(): self.search_engines[engine] = { - 're' : re.compile(engine, re.IGNORECASE) + 'known_url' : re.compile(known_url + '(?P.+)'), + 'hashid' : [] } - + + for (hashid, engine) in awstats_data.search_engines_hashid.items(): + hashid_re = re.compile('.*%s.*' % (hashid)) + if not engine in self.search_engines.keys(): + self.search_engines[engine] = { + 'hashid' : [hashid_re] + } + else: + self.search_engines[engine]['hashid'].append(hashid_re) + print 'Hashid %s => %s' % (engine, hashid) + for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): - if not engine in self.search_engines: continue - self.search_engines[engine]['not_search_engine'] = \ - re.compile(not_engine, re.IGNORECASE) + not_engine_re = re.compile('.*%s.*' % (not_engine)) + key = self._getSearchEngine(engine) + if key: + self.search_engines[key]['not_search_engine'] = not_engine_re - for (engine, name) in awstats_data.search_engines_hashid.items(): - if not engine in self.search_engines: continue - self.search_engines[engine]['name'] = name + for engine in awstats_data.search_engines: + engine_re = re.compile('.*%s.*' % (engine), re.IGNORECASE) + key = self._getSearchEngine(engine) + if key: + self.search_engines[key]['re'] = not_engine_re - for (engine, knwown_url) in awstats_data.search_engines_knwown_url.items(): - engine = engin[2:-2] - if not engine in self.search_engines: continue - print knwown_url - self.search_engines[engine]['known_url'] = re.compile(known_url + '(?P.+)') + for (k,e) in self.search_engines.items(): + if not 're' in e.keys(): + print 'Remove %s' % k + del self.search_engines[k] + print self.search_engines self.html_parser = HTMLParser.HTMLParser() @@ -51,7 +73,6 @@ class IWLADisplayReferers(IPlugin): def _extractKeyPhrase(self, key_phrase_re, parameters, key_phrases): if not parameters or not key_phrase_re: return - for p in parameters.split('&'): groups = key_phrase_re.match(p) if groups: @@ -89,8 +110,8 @@ class IWLADisplayReferers(IPlugin): parameters = r['extract_referer'].get('extract_parameters', None) key_phrase_re = e.get('known_url', None) - print parameters - print key_phrase_re + # print parameters + # print key_phrase_re self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 6211ade..78ba2ff 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -11,7 +11,7 @@ class IWLAPreAnalysisRobots(IPlugin): self.API_VERSION = 1 def load(self): - self.awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_data.robots) + self.awstats_robots = map(lambda (x) : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots) return True From 92533cc244e05caa7a608308ac81f53e540b8378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 19:33:08 +0100 Subject: [PATCH 029/195] Fix key_phrases --- plugins/display/referers.py | 79 ++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index a279c4a..8c5d23d 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -1,6 +1,6 @@ import time import re -import HTMLParser +import xml.sax.saxutils as saxutils from iwla import IWLA from iplugin import IPlugin @@ -13,12 +13,13 @@ class IWLADisplayReferers(IPlugin): super(IWLADisplayReferers, self).__init__(iwla) self.API_VERSION = 1 - def _getSearchEngine(self, engine): + def _getSearchEngine(self, hashid): + #print 'Look for %s' % engine for (k, e) in self.search_engines.items(): - for hashid in e['hashid']: - if hashid.match(engine): + for (h,h_re) in e['hashid']: + if hashid == h: return k - print 'Not found %s' % (engine) + #print 'Not found %s' % (hashid) return None def load(self): @@ -28,45 +29,29 @@ class IWLADisplayReferers(IPlugin): print 'domain_name required in conf' return False - self.own_domain_re = re.compile('.*%s.*' % (domain_name)) + self.own_domain_re = re.compile(r'.*%s.*' % (domain_name)) self.search_engines = {} - for (engine, known_url) in awstats_data.search_engines_knwown_url.items(): - self.search_engines[engine] = { - 'known_url' : re.compile(known_url + '(?P.+)'), - 'hashid' : [] - } - - for (hashid, engine) in awstats_data.search_engines_hashid.items(): - hashid_re = re.compile('.*%s.*' % (hashid)) - if not engine in self.search_engines.keys(): - self.search_engines[engine] = { - 'hashid' : [hashid_re] + for (hashid, name) in awstats_data.search_engines_hashid.items(): + hashid_re = re.compile(r'.*%s.*' % (hashid)) + if not name in self.search_engines.keys(): + self.search_engines[name] = { + 'hashid' : [(hashid, hashid_re)] } else: - self.search_engines[engine]['hashid'].append(hashid_re) - print 'Hashid %s => %s' % (engine, hashid) + self.search_engines[name]['hashid'].append((hashid, hashid_re)) + #print 'Hashid %s => %s' % (name, hashid) + + for (name, known_url) in awstats_data.search_engines_knwown_url.items(): + self.search_engines[name]['known_url'] = re.compile(known_url + '(?P.+)') for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): - not_engine_re = re.compile('.*%s.*' % (not_engine)) + not_engine_re = re.compile(r'.*%s.*' % (not_engine)) key = self._getSearchEngine(engine) if key: self.search_engines[key]['not_search_engine'] = not_engine_re - for engine in awstats_data.search_engines: - engine_re = re.compile('.*%s.*' % (engine), re.IGNORECASE) - key = self._getSearchEngine(engine) - if key: - self.search_engines[key]['re'] = not_engine_re - - for (k,e) in self.search_engines.items(): - if not 're' in e.keys(): - print 'Remove %s' % k - del self.search_engines[k] - - print self.search_engines - - self.html_parser = HTMLParser.HTMLParser() + #self.html_parser = html.parser.HTMLParser() return True @@ -76,12 +61,14 @@ class IWLADisplayReferers(IPlugin): for p in parameters.split('&'): groups = key_phrase_re.match(p) if groups: - print groups.groupddict() - key_phrase = self.html_parser.unescape(groups.groupddict()['key_phrase']).lower() + key_phrase = groups.groupdict()['key_phrase'] + key_phrase = key_phrase.replace('+', ' ').lower() + key_phrase = saxutils.unescape(key_phrase) if not key_phrase in key_phrases.keys(): key_phrases[key_phrase] = 1 else: key_phrases[key_phrase] += 1 + break def hook(self, iwla): stats = iwla.getCurrentVisists() @@ -99,22 +86,20 @@ class IWLADisplayReferers(IPlugin): if self.own_domain_re.match(uri): continue - for e in self.search_engines.values(): - if e['re'].match(uri): - not_engine = e.get('not_search_engine', None) + for (name, engine) in self.search_engines.items(): + for (hashid, hashid_re) in engine['hashid']: + if not hashid_re.match(uri): continue + + not_engine = engine.get('not_search_engine', None) # Try not engine if not_engine and not_engine.match(uri): break is_search_engine = True - uri = e['name'] + uri = name parameters = r['extract_referer'].get('extract_parameters', None) - key_phrase_re = e.get('known_url', None) - - # print parameters - # print key_phrase_re + key_phrase_re = engine.get('known_url', None) self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) - break if is_search_engine: @@ -218,3 +203,7 @@ class IWLADisplayReferers(IPlugin): page.appendBlock(table) display.addPage(page) + + block = DisplayHTMLRawBlock() + block.setRawHTML('All key phrases' % (filename)) + index.appendBlock(block) From 9571bf09b650f7a7b12ecf731a9d418e77992ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 19:53:00 +0100 Subject: [PATCH 030/195] Work with time --- iwla.py | 18 +++++++++++++----- plugins/pre_analysis/page_to_hit.py | 10 +++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/iwla.py b/iwla.py index 1a3cf0f..9201baa 100755 --- a/iwla.py +++ b/iwla.py @@ -72,6 +72,9 @@ class IWLA(object): def getCurTime(self): return self.meta_infos['last_time'] + def getStartAnalysisTime(self): + return self.meta_infos['start_analysis_time'] + def _clearMeta(self): self.meta_infos = { 'last_time' : None @@ -200,6 +203,7 @@ class IWLA(object): def _decodeTime(self, hit): hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format) + return hit['time_decoded'] def getDisplayIndex(self): cur_time = self.meta_infos['last_time'] @@ -337,9 +341,7 @@ class IWLA(object): self.current_analysis['days_stats'][cur_time.tm_mday] = stats def _newHit(self, hit): - self._decodeTime(hit) - - t = hit['time_decoded'] + t = self._decodeTime(hit) cur_time = self.meta_infos['last_time'] @@ -360,6 +362,9 @@ class IWLA(object): self.meta_infos['last_time'] = t + if not self.meta_infos['start_analysis_time']: + self.meta_infos['start_analysis_time'] = t + if not self._decodeHTTPRequest(hit): return False for k in hit.keys(): @@ -370,8 +375,6 @@ class IWLA(object): return True def start(self): - self.cache_plugins = preloadPlugins(self.plugins, self) - print '==> Analyse previous database' self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() @@ -380,6 +383,10 @@ class IWLA(object): else: self._clearVisits() + self.meta_infos['start_analysis_time'] = None + + self.cache_plugins = preloadPlugins(self.plugins, self) + print '==> Analysing log' with open(conf.analyzed_filename) as f: @@ -398,6 +405,7 @@ class IWLA(object): if self.analyse_started: self._generateDayStats() self._generateMonthStats() + del self.meta_infos['start_analysis_time'] self._serialize(self.meta_infos, conf.META_PATH) else: print '==> Analyse not started : nothing to do' diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 8c046b6..d704b36 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -1,4 +1,5 @@ import re +import time from iwla import IWLA from iplugin import IPlugin @@ -20,15 +21,18 @@ class IWLAPreAnalysisPageToHit(IPlugin): return True def hook(self, iwla): - hits = iwla.getCurrentVisists() + start_time = self.iwla.getStartAnalysisTime() + start_time = time.mktime(start_time) + hits = iwla.getCurrentVisists() + viewed_http_codes = self.iwla.getConfValue('viewed_http_codes', [200, 304]) for (k, super_hit) in hits.items(): if super_hit['robot']: continue for p in super_hit['requests']: if not p['is_page']: continue - if int(p['status']) != 200: continue - if p['time_decoded'].tm_mday != super_hit['last_access'].tm_mday: continue + if int(p['status']) not in viewed_http_codes: continue + if time.mktime(p['time_decoded']) < start_time: continue uri = p['extract_request']['extract_uri'] for r in self.regexps: if r.match(uri): From fec5e375e44310887e644dffcf440d9a22b98deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 20:31:13 +0100 Subject: [PATCH 031/195] Remove iwla parameter in hook functions --- iplugin.py | 2 +- iwla.py | 6 +++--- plugins/display/all_visits.py | 6 +++--- plugins/display/referers.py | 4 ++-- plugins/display/top_visitors.py | 6 +++--- plugins/post_analysis/reverse_dns.py | 4 ++-- plugins/post_analysis/top_visitors.py | 6 +++--- plugins/pre_analysis/page_to_hit.py | 4 ++-- plugins/pre_analysis/robots.py | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/iplugin.py b/iplugin.py index d13e62a..b1801af 100644 --- a/iplugin.py +++ b/iplugin.py @@ -25,7 +25,7 @@ class IPlugin(object): def load(self): return True - def hook(self, iwla): + def hook(self): pass def preloadPlugins(plugins, iwla): diff --git a/iwla.py b/iwla.py index 9201baa..a11016b 100755 --- a/iwla.py +++ b/iwla.py @@ -253,7 +253,7 @@ class IWLA(object): def _generateDisplay(self): self._generateDisplayDaysStat() - self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY, self) + self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY) self.display.build(conf.DISPLAY_ROOT) def _generateStats(self, visits): @@ -300,7 +300,7 @@ class IWLA(object): self.current_analysis['month_stats'] = stats self.valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} - self._callPlugins(conf.POST_HOOK_DIRECTORY, self) + self._callPlugins(conf.POST_HOOK_DIRECTORY) path = self.getDBFilename(cur_time) if os.path.exists(path): @@ -315,7 +315,7 @@ class IWLA(object): def _generateDayStats(self): visits = self.current_analysis['visits'] - self._callPlugins(conf.PRE_HOOK_DIRECTORY, self) + self._callPlugins(conf.PRE_HOOK_DIRECTORY) stats = self._generateStats(visits) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 131c754..a0d7152 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -9,8 +9,8 @@ class IWLADisplayAllVisits(IPlugin): super(IWLADisplayAllVisits, self).__init__(iwla) self.API_VERSION = 1 - def hook(self, iwla): - hits = iwla.getValidVisitors() + def hook(self): + hits = self.iwla.getValidVisitors() last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) cur_time = self.iwla.getCurTime() @@ -40,7 +40,7 @@ class IWLADisplayAllVisits(IPlugin): display = self.iwla.getDisplay() display.addPage(page) - index = iwla.getDisplayIndex() + index = self.iwla.getDisplayIndex() block = DisplayHTMLRawBlock() block.setRawHTML('All visits' % (filename)) index.appendBlock(block) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 8c5d23d..a8bd891 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -70,8 +70,8 @@ class IWLADisplayReferers(IPlugin): key_phrases[key_phrase] += 1 break - def hook(self, iwla): - stats = iwla.getCurrentVisists() + def hook(self): + stats = self.iwla.getCurrentVisists() referers = {} robots_referers = {} search_engine_referers = {} diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 1959545..0da035b 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -10,10 +10,10 @@ class IWLADisplayTopVisitors(IPlugin): self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisTopVisitors'] - def hook(self, iwla): - stats = iwla.getMonthStats() + def hook(self): + stats = self.iwla.getMonthStats() - index = iwla.getDisplayIndex() + index = self.iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) for super_hit in stats['top_visitors']: address = super_hit['remote_addr'] diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 8898115..e638a45 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -13,8 +13,8 @@ class IWLAPostAnalysisReverseDNS(IPlugin): socket.setdefaulttimeout(timeout) return True - def hook(self, iwla): - hits = iwla.getValidVisitors() + def hook(self): + hits = self.iwla.getValidVisitors() for (k, hit) in hits.items(): if hit.get('dns_analysed', False): continue try: diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py index 714ca66..d20d5ca 100644 --- a/plugins/post_analysis/top_visitors.py +++ b/plugins/post_analysis/top_visitors.py @@ -6,9 +6,9 @@ class IWLAPostAnalysisTopVisitors(IPlugin): super(IWLAPostAnalysisTopVisitors, self).__init__(iwla) self.API_VERSION = 1 - def hook(self, iwla): - hits = iwla.getValidVisitors() - stats = iwla.getMonthStats() + def hook(self): + hits = self.iwla.getValidVisitors() + stats = self.iwla.getMonthStats() top_bandwidth = [(k,hits[k]['bandwidth']) for k in hits.keys()] top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]] diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index d704b36..7ad8454 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -20,11 +20,11 @@ class IWLAPreAnalysisPageToHit(IPlugin): return True - def hook(self, iwla): + def hook(self): start_time = self.iwla.getStartAnalysisTime() start_time = time.mktime(start_time) - hits = iwla.getCurrentVisists() + hits = self.iwla.getCurrentVisists() viewed_http_codes = self.iwla.getConfValue('viewed_http_codes', [200, 304]) for (k, super_hit) in hits.items(): if super_hit['robot']: continue diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 78ba2ff..2d120c5 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -16,8 +16,8 @@ class IWLAPreAnalysisRobots(IPlugin): return True # Basic rule to detect robots - def hook(self, iwla): - hits = iwla.getCurrentVisists() + def hook(self): + hits = self.iwla.getCurrentVisists() for k in hits.keys(): super_hit = hits[k] From f8a48a71444da17df8ceb8bad24985ca97a82f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 21:06:36 +0100 Subject: [PATCH 032/195] Split referers plugin in post_analysis and display Remove post_analysis top_visitors (done in display) --- conf.py | 2 +- plugins/display/referers.py | 111 ++--------------------- plugins/display/top_visitors.py | 9 +- plugins/post_analysis/referers.py | 121 ++++++++++++++++++++++++++ plugins/post_analysis/top_visitors.py | 15 ---- 5 files changed, 134 insertions(+), 124 deletions(-) create mode 100644 plugins/post_analysis/referers.py delete mode 100644 plugins/post_analysis/top_visitors.py diff --git a/conf.py b/conf.py index 6d9af11..2a84620 100644 --- a/conf.py +++ b/conf.py @@ -16,7 +16,7 @@ DB_ROOT = './output/' DISPLAY_ROOT = './output/' pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['top_visitors'] +post_analysis_hooks = ['referers'] # post_analysis_hooks = ['top_visitors', 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers'] diff --git a/plugins/display/referers.py b/plugins/display/referers.py index a8bd891..be743f0 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -1,120 +1,21 @@ import time -import re -import xml.sax.saxutils as saxutils from iwla import IWLA from iplugin import IPlugin from display import * -import awstats_data - class IWLADisplayReferers(IPlugin): def __init__(self, iwla): super(IWLADisplayReferers, self).__init__(iwla) self.API_VERSION = 1 - - def _getSearchEngine(self, hashid): - #print 'Look for %s' % engine - for (k, e) in self.search_engines.items(): - for (h,h_re) in e['hashid']: - if hashid == h: - return k - #print 'Not found %s' % (hashid) - return None - - def load(self): - domain_name = self.iwla.getConfValue('domain_name', '') - - if not domain_name: - print 'domain_name required in conf' - return False - - self.own_domain_re = re.compile(r'.*%s.*' % (domain_name)) - self.search_engines = {} - - for (hashid, name) in awstats_data.search_engines_hashid.items(): - hashid_re = re.compile(r'.*%s.*' % (hashid)) - if not name in self.search_engines.keys(): - self.search_engines[name] = { - 'hashid' : [(hashid, hashid_re)] - } - else: - self.search_engines[name]['hashid'].append((hashid, hashid_re)) - #print 'Hashid %s => %s' % (name, hashid) - - for (name, known_url) in awstats_data.search_engines_knwown_url.items(): - self.search_engines[name]['known_url'] = re.compile(known_url + '(?P.+)') - - for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): - not_engine_re = re.compile(r'.*%s.*' % (not_engine)) - key = self._getSearchEngine(engine) - if key: - self.search_engines[key]['not_search_engine'] = not_engine_re - - #self.html_parser = html.parser.HTMLParser() - - return True - - def _extractKeyPhrase(self, key_phrase_re, parameters, key_phrases): - if not parameters or not key_phrase_re: return - - for p in parameters.split('&'): - groups = key_phrase_re.match(p) - if groups: - key_phrase = groups.groupdict()['key_phrase'] - key_phrase = key_phrase.replace('+', ' ').lower() - key_phrase = saxutils.unescape(key_phrase) - if not key_phrase in key_phrases.keys(): - key_phrases[key_phrase] = 1 - else: - key_phrases[key_phrase] += 1 - break + self.requires = ['IWLAPostAnalysisReferers'] def hook(self): - stats = self.iwla.getCurrentVisists() - referers = {} - robots_referers = {} - search_engine_referers = {} - key_phrases = {} - - for (k, super_hit) in stats.items(): - for r in super_hit['requests']: - if not r['http_referer']: continue - - uri = r['extract_referer']['extract_uri'] - is_search_engine = False - - if self.own_domain_re.match(uri): continue - - for (name, engine) in self.search_engines.items(): - for (hashid, hashid_re) in engine['hashid']: - if not hashid_re.match(uri): continue - - not_engine = engine.get('not_search_engine', None) - # Try not engine - if not_engine and not_engine.match(uri): break - is_search_engine = True - uri = name - - parameters = r['extract_referer'].get('extract_parameters', None) - key_phrase_re = engine.get('known_url', None) - - self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) - break - - if is_search_engine: - dictionary = search_engine_referers - elif super_hit['robot']: - dictionary = robots_referers - # print '%s => %s' % (uri, super_hit['remote_ip']) - else: - dictionary = referers - if r['is_page']: - key = 'pages' - else: - key = 'hits' - if not uri in dictionary: dictionary[uri] = {'pages':0, 'hits':0} - dictionary[uri][key] += 1 + month_stats = self.iwla.getMonthStats() + referers = month_stats.get('referers', {}) + robots_referers = month_stats.get('robots_referers', {}) + search_engine_referers = month_stats.get('search_engine_referers', {}) + key_phrases = month_stats.get('key_phrases', {}) top_referers = [(k, referers[k]['pages']) for k in referers.keys()] top_referers = sorted(top_referers, key=lambda t: t[1], reverse=True) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 0da035b..b60f5ec 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -8,14 +8,17 @@ class IWLADisplayTopVisitors(IPlugin): def __init__(self, iwla): super(IWLADisplayTopVisitors, self).__init__(iwla) self.API_VERSION = 1 - self.requires = ['IWLAPostAnalysisTopVisitors'] def hook(self): - stats = self.iwla.getMonthStats() + hits = self.iwla.getValidVisitors() + + top_bandwidth = [(k,hits[k]['bandwidth']) for k in hits.keys()] + top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) + top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] index = self.iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - for super_hit in stats['top_visitors']: + for super_hit in top_visitors: address = super_hit['remote_addr'] if self.iwla.getConfValue('display_visitor_ip', False) and\ super_hit.get('dns_name_replaced', False): diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py new file mode 100644 index 0000000..c21da87 --- /dev/null +++ b/plugins/post_analysis/referers.py @@ -0,0 +1,121 @@ +import time +import re +import xml.sax.saxutils as saxutils + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +class IWLAPostAnalysisReferers(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisReferers, self).__init__(iwla) + self.API_VERSION = 1 + + def _getSearchEngine(self, hashid): + for (k, e) in self.search_engines.items(): + for (h,h_re) in e['hashid']: + if hashid == h: + return k + return None + + def load(self): + domain_name = self.iwla.getConfValue('domain_name', '') + + if not domain_name: + print 'domain_name required in conf' + return False + + self.own_domain_re = re.compile(r'.*%s.*' % (domain_name)) + self.search_engines = {} + + for (hashid, name) in awstats_data.search_engines_hashid.items(): + hashid_re = re.compile(r'.*%s.*' % (hashid)) + if not name in self.search_engines.keys(): + self.search_engines[name] = { + 'hashid' : [(hashid, hashid_re)] + } + else: + self.search_engines[name]['hashid'].append((hashid, hashid_re)) + #print 'Hashid %s => %s' % (name, hashid) + + for (name, known_url) in awstats_data.search_engines_knwown_url.items(): + self.search_engines[name]['known_url'] = re.compile(known_url + '(?P.+)') + + for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): + not_engine_re = re.compile(r'.*%s.*' % (not_engine)) + key = self._getSearchEngine(engine) + if key: + self.search_engines[key]['not_search_engine'] = not_engine_re + + return True + + def _extractKeyPhrase(self, key_phrase_re, parameters, key_phrases): + if not parameters or not key_phrase_re: return + + for p in parameters.split('&'): + groups = key_phrase_re.match(p) + if groups: + key_phrase = groups.groupdict()['key_phrase'] + key_phrase = key_phrase.replace('+', ' ').lower() + key_phrase = saxutils.unescape(key_phrase) + if not key_phrase in key_phrases.keys(): + key_phrases[key_phrase] = 1 + else: + key_phrases[key_phrase] += 1 + break + + def hook(self): + start_time = self.iwla.getStartAnalysisTime() + start_time = time.mktime(start_time) + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + referers = month_stats.get('referers', {}) + robots_referers = month_stats.get('robots_referers', {}) + search_engine_referers = month_stats.get('search_engine_referers', {}) + key_phrases = month_stats.get('key_phrases', {}) + + for (k, super_hit) in stats.items(): + for r in super_hit['requests']: + if time.mktime(r['time_decoded']) < start_time: continue + if not r['http_referer']: continue + + uri = r['extract_referer']['extract_uri'] + is_search_engine = False + + if self.own_domain_re.match(uri): continue + + for (name, engine) in self.search_engines.items(): + for (hashid, hashid_re) in engine['hashid']: + if not hashid_re.match(uri): continue + + not_engine = engine.get('not_search_engine', None) + # Try not engine + if not_engine and not_engine.match(uri): break + is_search_engine = True + uri = name + + parameters = r['extract_referer'].get('extract_parameters', None) + key_phrase_re = engine.get('known_url', None) + + self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) + break + + if is_search_engine: + dictionary = search_engine_referers + elif super_hit['robot']: + dictionary = robots_referers + # print '%s => %s' % (uri, super_hit['remote_ip']) + else: + dictionary = referers + if r['is_page']: + key = 'pages' + else: + key = 'hits' + if not uri in dictionary: dictionary[uri] = {'pages':0, 'hits':0} + dictionary[uri][key] += 1 + + month_stats['referers'] = referers + month_stats['robots_referers'] = robots_referers + month_stats['search_engine_referers'] = search_engine_referers + month_stats['key_phrases'] = key_phrases diff --git a/plugins/post_analysis/top_visitors.py b/plugins/post_analysis/top_visitors.py deleted file mode 100644 index d20d5ca..0000000 --- a/plugins/post_analysis/top_visitors.py +++ /dev/null @@ -1,15 +0,0 @@ -from iwla import IWLA -from iplugin import IPlugin - -class IWLAPostAnalysisTopVisitors(IPlugin): - def __init__(self, iwla): - super(IWLAPostAnalysisTopVisitors, self).__init__(iwla) - self.API_VERSION = 1 - - def hook(self): - hits = self.iwla.getValidVisitors() - stats = self.iwla.getMonthStats() - top_bandwidth = [(k,hits[k]['bandwidth']) for k in hits.keys()] - top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) - stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]] - From 5e965f4cc10bf41ad9791d69ff76a60fbf308ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 22:03:19 +0100 Subject: [PATCH 033/195] Add top_pages plugin --- conf.py | 4 +-- iwla.py | 5 ++-- plugins/display/top_pages.py | 42 +++++++++++++++++++++++++++++ plugins/post_analysis/referers.py | 1 + plugins/post_analysis/top_pages.py | 43 ++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 plugins/display/top_pages.py create mode 100644 plugins/post_analysis/top_pages.py diff --git a/conf.py b/conf.py index 2a84620..7b205cb 100644 --- a/conf.py +++ b/conf.py @@ -16,9 +16,9 @@ DB_ROOT = './output/' DISPLAY_ROOT = './output/' pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers'] +post_analysis_hooks = ['referers', 'top_pages'] # post_analysis_hooks = ['top_visitors', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages'] reverse_dns_timeout = 0.2 page_to_hit_conf = [r'^.+/logo/$'] diff --git a/iwla.py b/iwla.py index a11016b..ec8b40c 100755 --- a/iwla.py +++ b/iwla.py @@ -140,9 +140,8 @@ class IWLA(object): request = hit['extract_request'] if 'extract_uri' in request.keys(): - uri = request['extract_uri'] - else: - uri = request['http_uri'] + uri = request['extract_uri'] = request['http_uri'] + uri = request['extract_uri'] hit['is_page'] = self.isPage(uri) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py new file mode 100644 index 0000000..8168b1a --- /dev/null +++ b/plugins/display/top_pages.py @@ -0,0 +1,42 @@ +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +class IWLADisplayTopPages(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopPages, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopPages'] + + def hook(self): + top_pages = self.iwla.getMonthStats()['top_pages'] + + top_pages = sorted(top_pages.items(), key=lambda t: t[1], reverse=True) + + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) + for (uri, entrance) in top_pages[:10]: + table.appendRow([uri, entrance]) + index.appendBlock(table) + + cur_time = self.iwla.getCurTime() + title = time.strftime('Top Pages - %B %Y', cur_time) + + filename = 'top_pages_%d.html' % (cur_time.tm_mon) + path = '%d/%s' % (cur_time.tm_year, filename) + + page = DisplayHTMLPage(title, path) + table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) + for (uri, entrance) in top_pages: + table.appendRow([uri, entrance]) + page.appendBlock(table) + + display = self.iwla.getDisplay() + display.addPage(page) + + block = DisplayHTMLRawBlock() + block.setRawHTML('All pages' % (filename)) + index.appendBlock(block) diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index c21da87..af3b9f5 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -70,6 +70,7 @@ class IWLAPostAnalysisReferers(IPlugin): start_time = time.mktime(start_time) stats = self.iwla.getCurrentVisists() month_stats = self.iwla.getMonthStats() + referers = month_stats.get('referers', {}) robots_referers = month_stats.get('robots_referers', {}) search_engine_referers = month_stats.get('search_engine_referers', {}) diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py new file mode 100644 index 0000000..e4f01e7 --- /dev/null +++ b/plugins/post_analysis/top_pages.py @@ -0,0 +1,43 @@ +import time +import re + +from iwla import IWLA +from iplugin import IPlugin + +class IWLAPostAnalysisTopPages(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopPages, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.index_re = re.compile(r'/index.*') + return True + + def hook(self): + start_time = self.iwla.getStartAnalysisTime() + start_time = time.mktime(start_time) + + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + top_pages = month_stats.get('top_pages', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests']: + if not r['is_page']: continue + + if time.mktime(r['time_decoded']) < start_time: continue + + uri = r['extract_request']['extract_uri'] + if self.index_re.match(uri): + uri = '/' + + uri = "%s%s" % (r.get('server_name', ''), uri) + + if not uri in top_pages.keys(): + top_pages[uri] = 1 + else: + top_pages[uri] += 1 + + month_stats['top_pages'] = top_pages From 6b0ed18f35e6db6c8d0adcf02e69f458e0eef0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 26 Nov 2014 22:06:58 +0100 Subject: [PATCH 034/195] Remove viewed limitation in page_to_hit : skip good requests --- plugins/pre_analysis/page_to_hit.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 7ad8454..0f20c8e 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -31,7 +31,6 @@ class IWLAPreAnalysisPageToHit(IPlugin): for p in super_hit['requests']: if not p['is_page']: continue - if int(p['status']) not in viewed_http_codes: continue if time.mktime(p['time_decoded']) < start_time: continue uri = p['extract_request']['extract_uri'] for r in self.regexps: From dd8349ab082bca7acc7e4d722a0df60b46367f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 09:01:51 +0100 Subject: [PATCH 035/195] Add option count_hit_only_visitors and function isValidForCurrentAnalysis() --- conf.py | 5 ++--- default_conf.py | 2 ++ iwla.py | 32 +++++++++++++++++++++-------- plugins/display/all_visits.py | 4 +++- plugins/display/referers.py | 1 - plugins/display/top_visitors.py | 7 +++++-- plugins/post_analysis/referers.py | 5 +---- plugins/post_analysis/top_pages.py | 6 +----- plugins/pre_analysis/page_to_hit.py | 18 +++++++--------- plugins/pre_analysis/robots.py | 21 +++++++++---------- 10 files changed, 54 insertions(+), 47 deletions(-) diff --git a/conf.py b/conf.py index 7b205cb..94b66aa 100644 --- a/conf.py +++ b/conf.py @@ -22,6 +22,5 @@ display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages'] reverse_dns_timeout = 0.2 page_to_hit_conf = [r'^.+/logo/$'] -# pre_analysis_hooks = ['H002_soutade.py', 'H001_robot.py'] -# post_analysis_hooks = ['top_visitors.py'] -# display_hooks = ['top_visitors.py'] + +count_hit_only_visitors = False diff --git a/default_conf.py b/default_conf.py index 1b4c62b..765afa8 100644 --- a/default_conf.py +++ b/default_conf.py @@ -22,3 +22,5 @@ display_hooks = [] pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] viewed_http_codes = [200, 304] + +count_hit_only_visitors = True diff --git a/iwla.py b/iwla.py index ec8b40c..5fb4a78 100755 --- a/iwla.py +++ b/iwla.py @@ -75,6 +75,10 @@ class IWLA(object): def getStartAnalysisTime(self): return self.meta_infos['start_analysis_time'] + def isValidForCurrentAnalysis(self, request): + cur_time = self.meta_infos['start_analysis_time'] + return (time.mktime(cur_time) < time.mktime(request['time_decoded'])) + def _clearMeta(self): self.meta_infos = { 'last_time' : None @@ -264,15 +268,15 @@ class IWLA(object): #stats['requests'] = set() stats['nb_visitors'] = 0 - for k in visits.keys(): - super_hit = visits[k] + for (k, super_hit) in visits.items(): if super_hit['robot']: stats['not_viewed_bandwidth'] += super_hit['bandwidth'] continue #print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) - if not super_hit['hit_only']: + if conf.count_hit_only_visitors or\ + super_hit['viewed_pages']: stats['nb_visitors'] += 1 stats['viewed_bandwidth'] += super_hit['bandwidth'] stats['viewed_pages'] += super_hit['viewed_pages'] @@ -298,7 +302,14 @@ class IWLA(object): self.current_analysis['month_stats'] = stats - self.valid_visitors = {k: v for (k,v) in visits.items() if not visits[k]['robot']} + self.valid_visitors = {} + for (k,v) in visits.items(): + if v['robot']: continue + if conf.count_hit_only_visitors and\ + (not v['viewed_pages']): + continue + self.valid_visitors[k] = v + self._callPlugins(conf.POST_HOOK_DIRECTORY) path = self.getDBFilename(cur_time) @@ -331,9 +342,12 @@ class IWLA(object): for k in stats.keys(): stats[k] -= self.current_analysis['days_stats'][last_day][k] stats['nb_visitors'] = 0 - for k in visits.keys(): - if visits[k]['robot']: continue - if visits[k]['last_access'].tm_mday == cur_time.tm_mday: + for (k,v) in visits.items(): + if v['robot']: continue + if conf.count_hit_only_visitors and\ + (not v['viewed_pages']): + continue + if v['last_access'].tm_mday == cur_time.tm_mday: stats['nb_visitors'] += 1 print stats @@ -349,7 +363,7 @@ class IWLA(object): self.analyse_started = True else: if not self.analyse_started: - if time.mktime(cur_time) >= time.mktime(t): + if not self.isValidForCurrentAnalysis(hit): return False else: self.analyse_started = True @@ -374,7 +388,7 @@ class IWLA(object): return True def start(self): - print '==> Analyse previous database' + print '==> Load previous database' self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() if self.meta_infos['last_time']: diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index a0d7152..2374233 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -11,6 +11,8 @@ class IWLADisplayAllVisits(IPlugin): def hook(self): hits = self.iwla.getValidVisitors() + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) + last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) cur_time = self.iwla.getCurTime() @@ -23,7 +25,7 @@ class IWLADisplayAllVisits(IPlugin): table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) for super_hit in last_access: address = super_hit['remote_addr'] - if self.iwla.getConfValue('display_visitor_ip', False) and\ + if display_visitor_ip and\ super_hit.get('dns_name_replaced', False): address = '%s [%s]' % (address, super_hit['remote_ip']) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index be743f0..318c94f 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -91,7 +91,6 @@ class IWLADisplayReferers(IPlugin): index.appendBlock(table) # All key phrases in a file - cur_time = self.iwla.getCurTime() title = time.strftime('Key Phrases - %B %Y', cur_time) filename = 'key_phrases_%d.html' % (cur_time.tm_mon) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index b60f5ec..e806209 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -11,8 +11,11 @@ class IWLADisplayTopVisitors(IPlugin): def hook(self): hits = self.iwla.getValidVisitors() + count_hit_only = self.iwla.getConfValue('count_hit_only_visitors', False) + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) - top_bandwidth = [(k,hits[k]['bandwidth']) for k in hits.keys()] + top_bandwidth = [(k,v['bandwidth']) for (k,v) in hits.items() \ + if count_hit_only or v['viewed_pages']] top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] @@ -20,7 +23,7 @@ class IWLADisplayTopVisitors(IPlugin): table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) for super_hit in top_visitors: address = super_hit['remote_addr'] - if self.iwla.getConfValue('display_visitor_ip', False) and\ + if display_visitor_ip and\ super_hit.get('dns_name_replaced', False): address = '%s [%s]' % (address, super_hit['remote_ip']) diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index af3b9f5..6619ecd 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -1,4 +1,3 @@ -import time import re import xml.sax.saxutils as saxutils @@ -66,8 +65,6 @@ class IWLAPostAnalysisReferers(IPlugin): break def hook(self): - start_time = self.iwla.getStartAnalysisTime() - start_time = time.mktime(start_time) stats = self.iwla.getCurrentVisists() month_stats = self.iwla.getMonthStats() @@ -78,7 +75,7 @@ class IWLAPostAnalysisReferers(IPlugin): for (k, super_hit) in stats.items(): for r in super_hit['requests']: - if time.mktime(r['time_decoded']) < start_time: continue + if not self.iwla.isValidForCurrentAnalysis(r): continue if not r['http_referer']: continue uri = r['extract_referer']['extract_uri'] diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index e4f01e7..106f903 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -1,4 +1,3 @@ -import time import re from iwla import IWLA @@ -14,9 +13,6 @@ class IWLAPostAnalysisTopPages(IPlugin): return True def hook(self): - start_time = self.iwla.getStartAnalysisTime() - start_time = time.mktime(start_time) - stats = self.iwla.getCurrentVisists() month_stats = self.iwla.getMonthStats() @@ -27,7 +23,7 @@ class IWLAPostAnalysisTopPages(IPlugin): for r in super_hit['requests']: if not r['is_page']: continue - if time.mktime(r['time_decoded']) < start_time: continue + if not self.iwla.isValidForCurrentAnalysis(r): continue uri = r['extract_request']['extract_uri'] if self.index_re.match(uri): diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 0f20c8e..936cf63 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -1,5 +1,4 @@ import re -import time from iwla import IWLA from iplugin import IPlugin @@ -21,21 +20,18 @@ class IWLAPreAnalysisPageToHit(IPlugin): return True def hook(self): - start_time = self.iwla.getStartAnalysisTime() - start_time = time.mktime(start_time) - hits = self.iwla.getCurrentVisists() viewed_http_codes = self.iwla.getConfValue('viewed_http_codes', [200, 304]) for (k, super_hit) in hits.items(): if super_hit['robot']: continue - for p in super_hit['requests']: - if not p['is_page']: continue - if time.mktime(p['time_decoded']) < start_time: continue - uri = p['extract_request']['extract_uri'] - for r in self.regexps: - if r.match(uri): - p['is_page'] = False + for request in super_hit['requests']: + if not request['is_page']: continue + if not self.iwla.isValidForCurrentAnalysis(request): continue + uri = request['extract_request']['extract_uri'] + for regexp in self.regexps: + if regexp.match(uri): + request['is_page'] = False super_hit['viewed_pages'] -= 1 super_hit['viewed_hits'] += 1 break diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 2d120c5..0557448 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -18,24 +18,23 @@ class IWLAPreAnalysisRobots(IPlugin): # Basic rule to detect robots def hook(self): hits = self.iwla.getCurrentVisists() - for k in hits.keys(): - super_hit = hits[k] - + for (k, super_hit) in hits.items(): if super_hit['robot']: continue isRobot = False referers = 0 first_page = super_hit['requests'][0] - if first_page['time_decoded'].tm_mday == super_hit['last_access'].tm_mday: - for r in self.awstats_robots: - if r.match(first_page['http_user_agent']): - isRobot = True - break + if not self.iwla.isValidForCurrentAnalysis(first_page): continue - if isRobot: - super_hit['robot'] = 1 - continue + for r in self.awstats_robots: + if r.match(first_page['http_user_agent']): + isRobot = True + break + + if isRobot: + super_hit['robot'] = 1 + continue # 1) no pages view --> robot # if not super_hit['viewed_pages']: From 9fbc5448bc8262bf41346cb8b2b276dcabe7546a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 12:34:42 +0100 Subject: [PATCH 036/195] Add conf_requires. Load plugins in order --- conf.py | 8 +++--- default_conf.py | 5 +++- iplugin.py | 40 +++++++++++++++++++--------- iwla.py | 29 ++++++++++---------- plugins/post_analysis/referers.py | 3 ++- plugins/post_analysis/reverse_dns.py | 5 +++- plugins/pre_analysis/page_to_hit.py | 5 +++- 7 files changed, 60 insertions(+), 35 deletions(-) diff --git a/conf.py b/conf.py index 94b66aa..5f957d6 100644 --- a/conf.py +++ b/conf.py @@ -16,11 +16,11 @@ DB_ROOT = './output/' DISPLAY_ROOT = './output/' pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads'] # post_analysis_hooks = ['top_visitors', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads'] reverse_dns_timeout = 0.2 -page_to_hit_conf = [r'^.+/logo/$'] +page_to_hit_conf = [r'^.+/logo[/]?$', r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] -count_hit_only_visitors = False +count_hit_only_visitors = True diff --git a/default_conf.py b/default_conf.py index 765afa8..48ce1df 100644 --- a/default_conf.py +++ b/default_conf.py @@ -20,7 +20,10 @@ pre_analysis_hooks = [] post_analysis_hooks = [] display_hooks = [] -pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] +pages_extensions = ['/', 'htm', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] viewed_http_codes = [200, 304] count_hit_only_visitors = True + +multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', + 'css', 'js'] diff --git a/iplugin.py b/iplugin.py index b1801af..cac9f83 100644 --- a/iplugin.py +++ b/iplugin.py @@ -7,6 +7,7 @@ class IPlugin(object): def __init__(self, iwla): self.iwla = iwla self.requires = [] + self.conf_requires = [] self.API_VERSION = 1 self.ANALYSIS_CLASS = 'HTTP' @@ -22,6 +23,9 @@ class IPlugin(object): def getRequirements(self): return self.requires + def getConfRequirements(self): + return self.conf_requires + def load(self): return True @@ -33,8 +37,8 @@ def preloadPlugins(plugins, iwla): print "==> Preload plugins" - for root in plugins.keys(): - for plugin_filename in plugins[root]: + for (root, plugins_filenames) in plugins: + for plugin_filename in plugins_filenames: plugin_path = root + '.' + plugin_filename try: mod = importlib.import_module(plugin_path) @@ -57,19 +61,29 @@ def preloadPlugins(plugins, iwla): #print 'Load plugin %s' % (plugin_name) + conf_requirements = plugin.getConfRequirements() + + requirement_validated = True + for r in conf_requirements: + conf_value = iwla.getConfValue(r, None) + if conf_value is None: + print '\'%s\' conf value required for %s' % (r, plugin_path) + requirement_validated = False + break + if not requirement_validated: continue + requirements = plugin.getRequirements() - if requirements: - requirement_validated = False - for r in requirements: - for (_,p) in cache_plugins.items(): - if p.__class__.__name__ == r: - requirement_validated = True - break - if not requirement_validated: - print 'Missing requirements for plugin %s' % (plugin_path) + requirement_validated = False + for r in requirements: + for (_,p) in cache_plugins.items(): + if p.__class__.__name__ == r: + requirement_validated = True break - if not requirement_validated: continue + if not requirement_validated: + print 'Missing requirements \'%s\' for plugin %s' % (r, plugin_path) + break + if requirements and not requirement_validated: continue if not plugin.load(): print 'Plugin %s load failed' % (plugin_path) @@ -78,7 +92,7 @@ def preloadPlugins(plugins, iwla): print '\tRegister %s' % (plugin_path) cache_plugins[plugin_path] = plugin except Exception as e: - print 'Error loading \'%s\' => %s' % (plugin_path, e) + print 'Error loading %s => %s' % (plugin_path, e) traceback.print_exc() return cache_plugins diff --git a/iwla.py b/iwla.py index 5fb4a78..ba20aaa 100755 --- a/iwla.py +++ b/iwla.py @@ -35,11 +35,11 @@ class IWLA(object): self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') self.log_re = re.compile(self.log_format_extracted) self.uri_re = re.compile(r'(?P[^\?]+)(\?(?P.+))?') - self.plugins = {conf.PRE_HOOK_DIRECTORY : conf.pre_analysis_hooks, - conf.POST_HOOK_DIRECTORY : conf.post_analysis_hooks, - conf.DISPLAY_HOOK_DIRECTORY : conf.display_hooks} + self.plugins = [(conf.PRE_HOOK_DIRECTORY , conf.pre_analysis_hooks), + (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), + (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] - def getConfValue(self, key, default): + def getConfValue(self, key, default=None): if not key in dir(conf): return default else: @@ -77,7 +77,7 @@ class IWLA(object): def isValidForCurrentAnalysis(self, request): cur_time = self.meta_infos['start_analysis_time'] - return (time.mktime(cur_time) < time.mktime(request['time_decoded'])) + return (time.mktime(cur_time) <= time.mktime(request['time_decoded'])) def _clearMeta(self): self.meta_infos = { @@ -115,12 +115,15 @@ class IWLA(object): return pickle.load(f) return None - def _callPlugins(self, root, *args): - print '==> Call plugins (%s)' % root - for p in self.plugins[root]: - print '\t%s' % (p) - mod = self.cache_plugins[root + '.' + p] - mod.hook(*args) + def _callPlugins(self, target_root, *args): + print '==> Call plugins (%s)' % target_root + for (root, plugins) in self.plugins: + if root != target_root: continue + for p in plugins: + mod = self.cache_plugins.get(root + '.' + p, None) + if mod: + print '\t%s' % (p) + mod.hook(*args) def isPage(self, request): for e in conf.pages_extensions: @@ -143,9 +146,7 @@ class IWLA(object): request = hit['extract_request'] - if 'extract_uri' in request.keys(): - uri = request['extract_uri'] = request['http_uri'] - uri = request['extract_uri'] + uri = request.get('extract_uri', request['http_uri']) hit['is_page'] = self.isPage(uri) diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index 6619ecd..f7dc714 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -10,6 +10,7 @@ class IWLAPostAnalysisReferers(IPlugin): def __init__(self, iwla): super(IWLAPostAnalysisReferers, self).__init__(iwla) self.API_VERSION = 1 + self.conf_requires = ['domain_name'] def _getSearchEngine(self, hashid): for (k, e) in self.search_engines.items(): @@ -22,7 +23,7 @@ class IWLAPostAnalysisReferers(IPlugin): domain_name = self.iwla.getConfValue('domain_name', '') if not domain_name: - print 'domain_name required in conf' + print 'domain_name must not be empty !' return False self.own_domain_re = re.compile(r'.*%s.*' % (domain_name)) diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index e638a45..9ffb8ab 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -4,12 +4,15 @@ from iwla import IWLA from iplugin import IPlugin class IWLAPostAnalysisReverseDNS(IPlugin): + DEFAULT_DNS_TIMEOUT = 0.5 + def __init__(self, iwla): super(IWLAPostAnalysisReverseDNS, self).__init__(iwla) self.API_VERSION = 1 def load(self): - timeout = self.iwla.getConfValue('reverse_dns_timeout', 0.5) + timeout = self.iwla.getConfValue('reverse_dns_timeout', + IWLAPostAnalysisReverseDNS.DEFAULT_DNS_TIMEOUT) socket.setdefaulttimeout(timeout) return True diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 936cf63..2ecbc9c 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -10,6 +10,7 @@ class IWLAPreAnalysisPageToHit(IPlugin): def __init__(self, iwla): super(IWLAPreAnalysisPageToHit, self).__init__(iwla) self.API_VERSION = 1 + self.conf_requires = ['viewed_http_codes'] def load(self): # Remove logo from indefero @@ -21,7 +22,8 @@ class IWLAPreAnalysisPageToHit(IPlugin): def hook(self): hits = self.iwla.getCurrentVisists() - viewed_http_codes = self.iwla.getConfValue('viewed_http_codes', [200, 304]) + viewed_http_codes = self.iwla.getConfValue('viewed_http_codes') + for (k, super_hit) in hits.items(): if super_hit['robot']: continue @@ -31,6 +33,7 @@ class IWLAPreAnalysisPageToHit(IPlugin): uri = request['extract_request']['extract_uri'] for regexp in self.regexps: if regexp.match(uri): + #print '%s is an hit' % uri request['is_page'] = False super_hit['viewed_pages'] -= 1 super_hit['viewed_hits'] += 1 From e0d6b5dbbcfff919cf0c8dfcd71d7f4e51dc729b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 12:35:41 +0100 Subject: [PATCH 037/195] Add top_downloads plugin --- plugins/display/top_downloads.py | 42 ++++++++++++++++++++++ plugins/post_analysis/top_downloads.py | 48 ++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 plugins/display/top_downloads.py create mode 100644 plugins/post_analysis/top_downloads.py diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py new file mode 100644 index 0000000..47fedaf --- /dev/null +++ b/plugins/display/top_downloads.py @@ -0,0 +1,42 @@ +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +class IWLADisplayTopDownloads(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopDownloads, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopDownloads'] + + def hook(self): + top_downloads = self.iwla.getMonthStats()['top_downloads'] + + top_downloads = sorted(top_downloads.items(), key=lambda t: t[1], reverse=True) + + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable('Top Downloads', ['URI', 'Hits']) + for (uri, entrance) in top_downloads[:10]: + table.appendRow([uri, entrance]) + index.appendBlock(table) + + cur_time = self.iwla.getCurTime() + title = time.strftime('Top Downloads - %B %Y', cur_time) + + filename = 'top_downloads_%d.html' % (cur_time.tm_mon) + path = '%d/%s' % (cur_time.tm_year, filename) + + page = DisplayHTMLPage(title, path) + table = DisplayHTMLBlockTable('Top Downloads', ['URI', 'Hit']) + for (uri, entrance) in top_downloads: + table.appendRow([uri, entrance]) + page.appendBlock(table) + + display = self.iwla.getDisplay() + display.addPage(page) + + block = DisplayHTMLRawBlock() + block.setRawHTML('All Downloads' % (filename)) + index.appendBlock(block) diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py new file mode 100644 index 0000000..3ea7a38 --- /dev/null +++ b/plugins/post_analysis/top_downloads.py @@ -0,0 +1,48 @@ +import re + +from iwla import IWLA +from iplugin import IPlugin + +class IWLAPostAnalysisTopDownloads(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopDownloads, self).__init__(iwla) + self.API_VERSION = 1 + self.conf_requires = ['multimedia_files', 'viewed_http_codes'] + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + multimedia_files = self.iwla.getConfValue('multimedia_files') + viewed_http_codes = self.iwla.getConfValue('viewed_http_codes') + + top_downloads = month_stats.get('top_downloads', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests']: + if r['is_page']: continue + + if not self.iwla.isValidForCurrentAnalysis(r): continue + + if not int(r['status']) in viewed_http_codes: continue + + uri = r['extract_request']['extract_uri'].lower() + + isMultimedia = False + for ext in multimedia_files: + if uri.endswith(ext): + isMultimedia = True + break + + if isMultimedia: continue + + uri = "%s%s" % (r.get('server_name', ''), + r['extract_request']['extract_uri']) + + if not uri in top_downloads.keys(): + top_downloads[uri] = 1 + else: + top_downloads[uri] += 1 + + month_stats['top_downloads'] = top_downloads From 5ccc63c7ae33101cb4185b3217e5b0114f186d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 13:07:14 +0100 Subject: [PATCH 038/195] Add hasBeenViewed() function --- iwla.py | 3 +++ plugins/post_analysis/top_downloads.py | 4 +++- plugins/pre_analysis/page_to_hit.py | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/iwla.py b/iwla.py index ba20aaa..2261e80 100755 --- a/iwla.py +++ b/iwla.py @@ -79,6 +79,9 @@ class IWLA(object): cur_time = self.meta_infos['start_analysis_time'] return (time.mktime(cur_time) <= time.mktime(request['time_decoded'])) + def hasBeenViewed(self, request): + return int(request['status']) in conf.viewed_http_codes + def _clearMeta(self): self.meta_infos = { 'last_time' : None diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 3ea7a38..65f0b3f 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -21,9 +21,11 @@ class IWLAPostAnalysisTopDownloads(IPlugin): for (k, super_hit) in stats.items(): if super_hit['robot']: continue for r in super_hit['requests']: + if not self.iwla.isValidForCurrentAnalysis(r) or\ + not self.iwla.hasBeenViewed(r): + continue if r['is_page']: continue - if not self.iwla.isValidForCurrentAnalysis(r): continue if not int(r['status']) in viewed_http_codes: continue diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 2ecbc9c..7f18c91 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -10,7 +10,6 @@ class IWLAPreAnalysisPageToHit(IPlugin): def __init__(self, iwla): super(IWLAPreAnalysisPageToHit, self).__init__(iwla) self.API_VERSION = 1 - self.conf_requires = ['viewed_http_codes'] def load(self): # Remove logo from indefero @@ -22,14 +21,15 @@ class IWLAPreAnalysisPageToHit(IPlugin): def hook(self): hits = self.iwla.getCurrentVisists() - viewed_http_codes = self.iwla.getConfValue('viewed_http_codes') for (k, super_hit) in hits.items(): if super_hit['robot']: continue for request in super_hit['requests']: + if not self.iwla.isValidForCurrentAnalysis(request) or\ + not self.iwla.hasBeenViewed(request): + continue if not request['is_page']: continue - if not self.iwla.isValidForCurrentAnalysis(request): continue uri = request['extract_request']['extract_uri'] for regexp in self.regexps: if regexp.match(uri): From c87ddfb1aabdbbefd6dca0f01bd0aee3a6fd208a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 13:46:58 +0100 Subject: [PATCH 039/195] Add hit_to_page_conf in addition to page_to_hit_conf --- conf.py | 7 ++--- plugins/display/top_downloads.py | 2 +- plugins/display/top_pages.py | 2 +- plugins/post_analysis/top_pages.py | 4 ++- plugins/pre_analysis/page_to_hit.py | 41 ++++++++++++++++++++--------- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/conf.py b/conf.py index 5f957d6..da31821 100644 --- a/conf.py +++ b/conf.py @@ -16,11 +16,12 @@ DB_ROOT = './output/' DISPLAY_ROOT = './output/' pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits'] # post_analysis_hooks = ['top_visitors', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] reverse_dns_timeout = 0.2 -page_to_hit_conf = [r'^.+/logo[/]?$', r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] +page_to_hit_conf = [r'^.+/logo[/]?$'] +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] count_hit_only_visitors = True diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 47fedaf..970e104 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -29,7 +29,7 @@ class IWLADisplayTopDownloads(IPlugin): path = '%d/%s' % (cur_time.tm_year, filename) page = DisplayHTMLPage(title, path) - table = DisplayHTMLBlockTable('Top Downloads', ['URI', 'Hit']) + table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) for (uri, entrance) in top_downloads: table.appendRow([uri, entrance]) page.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 8168b1a..100f97b 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -23,7 +23,7 @@ class IWLADisplayTopPages(IPlugin): index.appendBlock(table) cur_time = self.iwla.getCurTime() - title = time.strftime('Top Pages - %B %Y', cur_time) + title = time.strftime('All Pages - %B %Y', cur_time) filename = 'top_pages_%d.html' % (cur_time.tm_mon) path = '%d/%s' % (cur_time.tm_year, filename) diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index 106f903..bb71f9d 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -23,7 +23,9 @@ class IWLAPostAnalysisTopPages(IPlugin): for r in super_hit['requests']: if not r['is_page']: continue - if not self.iwla.isValidForCurrentAnalysis(r): continue + if not self.iwla.isValidForCurrentAnalysis(r) or\ + not self.iwla.hasBeenViewed(r): + continue uri = r['extract_request']['extract_uri'] if self.index_re.match(uri): diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 7f18c91..51102c8 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -12,10 +12,15 @@ class IWLAPreAnalysisPageToHit(IPlugin): self.API_VERSION = 1 def load(self): -# Remove logo from indefero - self.regexps = self.iwla.getConfValue('page_to_hit_conf', []) - if not self.regexps: return False - self.regexps = map(lambda(r): re.compile(r), self.regexps) + # Page to hit + self.ph_regexps = self.iwla.getConfValue('page_to_hit_conf', []) + if not self.ph_regexps: return False + self.ph_regexps = map(lambda(r): re.compile(r), self.ph_regexps) + + # Hit to page + self.hp_regexps = self.iwla.getConfValue('hit_to_page_conf', []) + if not self.hp_regexps: return False + self.hp_regexps = map(lambda(r): re.compile(r), self.hp_regexps) return True @@ -29,12 +34,24 @@ class IWLAPreAnalysisPageToHit(IPlugin): if not self.iwla.isValidForCurrentAnalysis(request) or\ not self.iwla.hasBeenViewed(request): continue - if not request['is_page']: continue + uri = request['extract_request']['extract_uri'] - for regexp in self.regexps: - if regexp.match(uri): - #print '%s is an hit' % uri - request['is_page'] = False - super_hit['viewed_pages'] -= 1 - super_hit['viewed_hits'] += 1 - break + + if request['is_page']: + # Page to hit + for regexp in self.ph_regexps: + if regexp.match(uri): + #print '%s is a hit' % (uri ) + request['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 + break + else: + # Hit to page + for regexp in self.hp_regexps: + if regexp.match(uri): + #print '%s is a page' % (uri ) + request['is_page'] = True + super_hit['viewed_pages'] += 1 + super_hit['viewed_hits'] -= 1 + break From f7bf2e11bad5981f72f9680198e88d7abaa99d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 13:47:31 +0100 Subject: [PATCH 040/195] Add top_hits plugin --- plugins/display/top_hits.py | 42 +++++++++++++++++++++++++++++++ plugins/post_analysis/top_hits.py | 33 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 plugins/display/top_hits.py create mode 100644 plugins/post_analysis/top_hits.py diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py new file mode 100644 index 0000000..4809d0b --- /dev/null +++ b/plugins/display/top_hits.py @@ -0,0 +1,42 @@ +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +class IWLADisplayTopHits(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopHits, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopHits'] + + def hook(self): + top_hits = self.iwla.getMonthStats()['top_hits'] + + top_hits = sorted(top_hits.items(), key=lambda t: t[1], reverse=True) + + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) + for (uri, entrance) in top_hits[:10]: + table.appendRow([uri, entrance]) + index.appendBlock(table) + + cur_time = self.iwla.getCurTime() + title = time.strftime('All Hits - %B %Y', cur_time) + + filename = 'top_hits_%d.html' % (cur_time.tm_mon) + path = '%d/%s' % (cur_time.tm_year, filename) + + page = DisplayHTMLPage(title, path) + table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) + for (uri, entrance) in top_hits: + table.appendRow([uri, entrance]) + page.appendBlock(table) + + display = self.iwla.getDisplay() + display.addPage(page) + + block = DisplayHTMLRawBlock() + block.setRawHTML('All hits' % (filename)) + index.appendBlock(block) diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py new file mode 100644 index 0000000..b4f7ebf --- /dev/null +++ b/plugins/post_analysis/top_hits.py @@ -0,0 +1,33 @@ +from iwla import IWLA +from iplugin import IPlugin + +class IWLAPostAnalysisTopHits(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopHits, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + top_hits = month_stats.get('top_hits', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests']: + if r['is_page']: continue + + if not self.iwla.isValidForCurrentAnalysis(r) or\ + not self.iwla.hasBeenViewed(r): + continue + + uri = r['extract_request']['extract_uri'] + + uri = "%s%s" % (r.get('server_name', ''), uri) + + if not uri in top_hits.keys(): + top_hits[uri] = 1 + else: + top_hits[uri] += 1 + + month_stats['top_hits'] = top_hits From ce4bca056d2143a5ee034561d2b9944c0ae71bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 14:11:47 +0100 Subject: [PATCH 041/195] Store files in month directory --- display.py | 9 ++++++++- iwla.py | 16 +++++++++++----- plugins/display/all_visits.py | 7 +++---- plugins/display/referers.py | 8 ++++---- plugins/display/top_downloads.py | 7 +++---- plugins/display/top_hits.py | 7 +++---- plugins/display/top_pages.py | 7 +++---- 7 files changed, 35 insertions(+), 26 deletions(-) diff --git a/display.py b/display.py index d414604..3f5ae3c 100644 --- a/display.py +++ b/display.py @@ -1,3 +1,4 @@ +import os class DisplayHTMLBlock(object): @@ -56,7 +57,13 @@ class DisplayHTMLPage(object): self.blocks.append(block) def build(self, root): - f = open(root + self.filename, 'w') + filename = root + self.filename + + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) + + f = open(filename, 'w') f.write('%s' % (self.title)) for block in self.blocks: block.build(f) diff --git a/iwla.py b/iwla.py index 2261e80..c467687 100755 --- a/iwla.py +++ b/iwla.py @@ -77,11 +77,17 @@ class IWLA(object): def isValidForCurrentAnalysis(self, request): cur_time = self.meta_infos['start_analysis_time'] - return (time.mktime(cur_time) <= time.mktime(request['time_decoded'])) + # Analyse not started + if not cur_time: return False + return (time.mktime(cur_time) < time.mktime(request['time_decoded'])) def hasBeenViewed(self, request): return int(request['status']) in conf.viewed_http_codes + def getCurDisplayRoot(self): + cur_time = self.meta_infos['last_time'] + return '%d/%d/' % (cur_time.tm_year, cur_time.tm_mon) + def _clearMeta(self): self.meta_infos = { 'last_time' : None @@ -93,7 +99,7 @@ class IWLA(object): return self.display def getDBFilename(self, time): - return (conf.DB_ROOT + '%d/%d_%s') % (time.tm_year, time.tm_mon, conf.DB_FILENAME) + return (conf.DB_ROOT + '%d/%d/%s') % (time.tm_year, time.tm_mon, conf.DB_FILENAME) def _serialize(self, obj, filename): base = os.path.dirname(filename) @@ -214,14 +220,14 @@ class IWLA(object): def getDisplayIndex(self): cur_time = self.meta_infos['last_time'] - filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + filename = '%s/index.html' % (self.getCurDisplayRoot()) return self.display.getPage(filename) def _generateDisplayDaysStat(self): cur_time = self.meta_infos['last_time'] title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) - filename = '%d/index_%d.html' % (cur_time.tm_year, cur_time.tm_mon) + filename = '%s/index.html' % (self.getCurDisplayRoot()) print '==> Generate display (%s)' % (filename) page = DisplayHTMLPage(title, filename) @@ -367,7 +373,7 @@ class IWLA(object): self.analyse_started = True else: if not self.analyse_started: - if not self.isValidForCurrentAnalysis(hit): + if time.mktime(t) < time.mktime(cur_time): return False else: self.analyse_started = True diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 2374233..ae9ed40 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -15,11 +15,10 @@ class IWLADisplayAllVisits(IPlugin): last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) - cur_time = self.iwla.getCurTime() - title = time.strftime('All visits - %B %Y', cur_time) + title = time.strftime('All visits - %B %Y', self.iwla.getCurTime()) - filename = 'all_visits_%d.html' % (cur_time.tm_mon) - path = '%d/%s' % (cur_time.tm_year, filename) + filename = 'all_visits.html' + path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 318c94f..329f998 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -54,8 +54,8 @@ class IWLADisplayReferers(IPlugin): cur_time = self.iwla.getCurTime() title = time.strftime('Connexion from - %B %Y', cur_time) - filename = 'referers_%d.html' % (cur_time.tm_mon) - path = '%d/%s' % (cur_time.tm_year, filename) + filename = 'referers.html' + path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) @@ -93,8 +93,8 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file title = time.strftime('Key Phrases - %B %Y', cur_time) - filename = 'key_phrases_%d.html' % (cur_time.tm_mon) - path = '%d/%s' % (cur_time.tm_year, filename) + filename = 'key_phrases.html' + path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 970e104..44141a9 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -22,11 +22,10 @@ class IWLADisplayTopDownloads(IPlugin): table.appendRow([uri, entrance]) index.appendBlock(table) - cur_time = self.iwla.getCurTime() - title = time.strftime('Top Downloads - %B %Y', cur_time) + title = time.strftime('Top Downloads - %B %Y', self.iwla.getCurTime()) - filename = 'top_downloads_%d.html' % (cur_time.tm_mon) - path = '%d/%s' % (cur_time.tm_year, filename) + filename = 'top_downloads.html' + path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 4809d0b..fb7fe47 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -22,11 +22,10 @@ class IWLADisplayTopHits(IPlugin): table.appendRow([uri, entrance]) index.appendBlock(table) - cur_time = self.iwla.getCurTime() - title = time.strftime('All Hits - %B %Y', cur_time) + title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) - filename = 'top_hits_%d.html' % (cur_time.tm_mon) - path = '%d/%s' % (cur_time.tm_year, filename) + filename = 'top_hits.html' + path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 100f97b..e2e29c0 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -22,11 +22,10 @@ class IWLADisplayTopPages(IPlugin): table.appendRow([uri, entrance]) index.appendBlock(table) - cur_time = self.iwla.getCurTime() - title = time.strftime('All Pages - %B %Y', cur_time) + title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) - filename = 'top_pages_%d.html' % (cur_time.tm_mon) - path = '%d/%s' % (cur_time.tm_year, filename) + filename = 'top_pages.html' + path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) From 02233f2f37f7e03e621006e0b3768dd30fb12653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 14:29:25 +0100 Subject: [PATCH 042/195] Replace getCurDisplayRoot() by getCurDisplayPath() --- iwla.py | 10 +++++----- plugins/display/all_visits.py | 2 +- plugins/display/referers.py | 4 ++-- plugins/display/top_downloads.py | 2 +- plugins/display/top_hits.py | 2 +- plugins/display/top_pages.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/iwla.py b/iwla.py index c467687..2f01132 100755 --- a/iwla.py +++ b/iwla.py @@ -84,9 +84,9 @@ class IWLA(object): def hasBeenViewed(self, request): return int(request['status']) in conf.viewed_http_codes - def getCurDisplayRoot(self): + def getCurDisplayPath(self, filename): cur_time = self.meta_infos['last_time'] - return '%d/%d/' % (cur_time.tm_year, cur_time.tm_mon) + return os.path.join(str(cur_time.tm_year), str(cur_time.tm_mon), filename) def _clearMeta(self): self.meta_infos = { @@ -99,7 +99,7 @@ class IWLA(object): return self.display def getDBFilename(self, time): - return (conf.DB_ROOT + '%d/%d/%s') % (time.tm_year, time.tm_mon, conf.DB_FILENAME) + return os.path.join(conf.DB_ROOT, str(time.tm_year), str(time.tm_mon), conf.DB_FILENAME) def _serialize(self, obj, filename): base = os.path.dirname(filename) @@ -220,14 +220,14 @@ class IWLA(object): def getDisplayIndex(self): cur_time = self.meta_infos['last_time'] - filename = '%s/index.html' % (self.getCurDisplayRoot()) + filename = self.getCurDisplayPath('index.html') return self.display.getPage(filename) def _generateDisplayDaysStat(self): cur_time = self.meta_infos['last_time'] title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) - filename = '%s/index.html' % (self.getCurDisplayRoot()) + filename = self.getCurDisplayPath('index.html') print '==> Generate display (%s)' % (filename) page = DisplayHTMLPage(title, filename) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index ae9ed40..13e160b 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -18,7 +18,7 @@ class IWLADisplayAllVisits(IPlugin): title = time.strftime('All visits - %B %Y', self.iwla.getCurTime()) filename = 'all_visits.html' - path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) + path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 329f998..06a87c0 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -55,7 +55,7 @@ class IWLADisplayReferers(IPlugin): title = time.strftime('Connexion from - %B %Y', cur_time) filename = 'referers.html' - path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) + path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) @@ -94,7 +94,7 @@ class IWLADisplayReferers(IPlugin): title = time.strftime('Key Phrases - %B %Y', cur_time) filename = 'key_phrases.html' - path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) + path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 44141a9..efe92d3 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -25,7 +25,7 @@ class IWLADisplayTopDownloads(IPlugin): title = time.strftime('Top Downloads - %B %Y', self.iwla.getCurTime()) filename = 'top_downloads.html' - path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) + path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index fb7fe47..e196de9 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -25,7 +25,7 @@ class IWLADisplayTopHits(IPlugin): title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) filename = 'top_hits.html' - path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) + path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index e2e29c0..ddd68b9 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -25,7 +25,7 @@ class IWLADisplayTopPages(IPlugin): title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) filename = 'top_pages.html' - path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) + path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) From d2b0d0dae6e4851c367b34310315d9cec264d3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 19:38:41 +0100 Subject: [PATCH 043/195] Fully rework display with CSS style inclusion --- display.py | 126 ++++++++++++++++++++++++------- plugins/display/all_visits.py | 11 ++- plugins/display/referers.py | 59 +++++++-------- plugins/display/top_downloads.py | 28 ++++--- plugins/display/top_hits.py | 28 ++++--- plugins/display/top_pages.py | 28 ++++--- 6 files changed, 176 insertions(+), 104 deletions(-) diff --git a/display.py b/display.py index 3f5ae3c..69473a5 100644 --- a/display.py +++ b/display.py @@ -1,47 +1,109 @@ import os -class DisplayHTMLBlock(object): +class DisplayHTMLRaw(object): - def __init__(self, title=''): - self.title = title - - def build(self, f): - pass - -class DisplayHTMLRawBlock(DisplayHTMLBlock): - - def __init__(self, title=''): - super(DisplayHTMLRawBlock, self).__init__(title) - self.html = '' + def __init__(self, html=''): + self.html = html def setRawHTML(self, html): self.html = html + def _build(self, f, html): + if html: f.write(html) + def build(self, f): - f.write(self.html) + self._build(self.html) + +class DisplayHTMLBlock(DisplayHTMLRaw): + + def __init__(self, title=''): + super(DisplayHTMLBlock, self).__init__(html='') + self.title = title + self.cssclass = 'iwla_block' + self.title_cssclass = 'iwla_block_title' + self.value_cssclass = 'iwla_block_value' + + def getTitle(self): + return self.title + + def setTitle(self, value): + self.title = value + + def setCSSClass(self, cssclass): + self.cssclass = cssclass + + def setTitleCSSClass(self, cssclass): + self.title_cssclass = cssclass + + def setValueCSSClass(self, cssclass): + self.value_cssclass = cssclass + + def build(self, f): + html = '
' % (self.cssclass) + if self.title: + html += '
%s
' % (self.title_cssclass, self.title) + html += '
%s
' % (self.value_cssclass, self.html) + html += '
' + + self._build(f, html) class DisplayHTMLBlockTable(DisplayHTMLBlock): def __init__(self, title, cols): - super(DisplayHTMLBlockTable, self).__init__(title) + super(DisplayHTMLBlockTable, self).__init__(title=title) self.cols = cols self.rows = [] + self.cols_cssclasses = ['' for e in cols] + self.rows_cssclasses = [] def appendRow(self, row): self.rows.append(listToStr(row)) + self.rows_cssclasses.append(['' for e in row]) + def getCellValue(row, col): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices') + + return self.rows[row][col] + + def setCellValue(row, col, value): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices') + + return self.rows[row][col] + + def setCellCSSClass(row, col, value): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices') + + self.rows_cssclasses[row][col] = value + + def setRowCSSClass(row, value): + if row < 0 or row >= len(self.rows): + raise ValueError('Invalid indice') + + for i in range(0, self.rows_cssclasses[row]): + self.rows_cssclasses[row][i] = value + def build(self, f): - f.write('
') - f.write('') - for title in self.cols: - f.write('' % (title)) - f.write('') - for row in self.rows: - f.write('') - for v in row: - f.write('' % (v)) - f.write('') - f.write('
%s
%s
') + if not self.html: + html = '' + html += '' + for title in self.cols: + html += '' % (title) + html += '' + for row in self.rows: + html += '' + for v in row: + html += '' % (v) + html += '' + html += '
%s
%s
' + self.html = html + + super(DisplayHTMLBlockTable, self).build(f) class DisplayHTMLPage(object): @@ -53,6 +115,12 @@ class DisplayHTMLPage(object): def getFilename(self): return self.filename; + def getBlock(self, title): + for b in self.blocks: + if title == b.getTitle(): + return b + return None + def appendBlock(self, block): self.blocks.append(block) @@ -64,7 +132,13 @@ class DisplayHTMLPage(object): os.makedirs(base) f = open(filename, 'w') - f.write('%s' % (self.title)) + f.write('') + f.write('') + f.write('') + f.write('') + if self.title: + f.write('%s' % (self.title)) + f.write('') for block in self.blocks: block.build(f) f.write('') diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 13e160b..ea79b0f 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -42,6 +42,11 @@ class IWLADisplayAllVisits(IPlugin): display.addPage(page) index = self.iwla.getDisplayIndex() - block = DisplayHTMLRawBlock() - block.setRawHTML('All visits' % (filename)) - index.appendBlock(block) + link = 'All visits' % (filename) + block = index.getBlock('Top visitors') + if block: + block.setTitle('%s - %s' % (block.getTitle(), link)) + else: + block = DisplayHTMLRawBlock() + block.setRawHTML(link) + index.appendBlock(block) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 06a87c0..128026c 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -29,29 +29,10 @@ class IWLADisplayReferers(IPlugin): top_key_phrases = key_phrases.items() top_key_phrases = sorted(top_key_phrases, key=lambda t: t[1], reverse=True) - # Top referers in index + cur_time = self.iwla.getCurTime() index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) - table.appendRow(['Search Engine', '', '']) - for r,_ in top_search_engine_referers[:10]: - row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] - table.appendRow(row) - - table.appendRow(['External URL', '', '']) - for r,_ in top_referers[:10]: - row = [r, referers[r]['pages'], referers[r]['hits']] - table.appendRow(row) - - table.appendRow(['External URL (robot)', '', '']) - for r,_ in top_robots_referers[:10]: - row = [r, robots_referers[r]['pages'], robots_referers[r]['hits']] - table.appendRow(row) - - index.appendBlock(table) - # All referers in a file - cur_time = self.iwla.getCurTime() title = time.strftime('Connexion from - %B %Y', cur_time) filename = 'referers.html' @@ -80,14 +61,27 @@ class IWLADisplayReferers(IPlugin): display = self.iwla.getDisplay() display.addPage(page) - block = DisplayHTMLRawBlock() - block.setRawHTML('All referers' % (filename)) - index.appendBlock(block) + link = 'All referers' % (filename) + + # Top referers in index + title = '%s - %s' % ('Connexion from', link) + + table = DisplayHTMLBlockTable(title, ['Origin', 'Pages', 'Hits']) + table.appendRow(['Search Engine', '', '']) + for r,_ in top_search_engine_referers[:10]: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + table.appendRow(row) + + table.appendRow(['External URL', '', '']) + for r,_ in top_referers[:10]: + row = [r, referers[r]['pages'], referers[r]['hits']] + table.appendRow(row) + + table.appendRow(['External URL (robot)', '', '']) + for r,_ in top_robots_referers[:10]: + row = [r, robots_referers[r]['pages'], robots_referers[r]['hits']] + table.appendRow(row) - # Top key phrases in index - table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) - for phrase in top_key_phrases[:10]: - table.appendRow([phrase[0], phrase[1]]) index.appendBlock(table) # All key phrases in a file @@ -104,6 +98,11 @@ class IWLADisplayReferers(IPlugin): display.addPage(page) - block = DisplayHTMLRawBlock() - block.setRawHTML('All key phrases' % (filename)) - index.appendBlock(block) + link = 'All key phrases' % (filename) + + # Top key phrases in index + title = '%s - %s' % ('Top key phrases', link) + table = DisplayHTMLBlockTable(title, ['Key phrase', 'Search']) + for phrase in top_key_phrases[:10]: + table.appendRow([phrase[0], phrase[1]]) + index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index efe92d3..5ca8e9e 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -12,20 +12,12 @@ class IWLADisplayTopDownloads(IPlugin): def hook(self): top_downloads = self.iwla.getMonthStats()['top_downloads'] - top_downloads = sorted(top_downloads.items(), key=lambda t: t[1], reverse=True) - index = self.iwla.getDisplayIndex() - - table = DisplayHTMLBlockTable('Top Downloads', ['URI', 'Hits']) - for (uri, entrance) in top_downloads[:10]: - table.appendRow([uri, entrance]) - index.appendBlock(table) - - title = time.strftime('Top Downloads - %B %Y', self.iwla.getCurTime()) - + # All in a file filename = 'top_downloads.html' path = self.iwla.getCurDisplayPath(filename) + title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) @@ -33,9 +25,15 @@ class IWLADisplayTopDownloads(IPlugin): table.appendRow([uri, entrance]) page.appendBlock(table) - display = self.iwla.getDisplay() - display.addPage(page) + self.iwla.getDisplay().addPage(page) - block = DisplayHTMLRawBlock() - block.setRawHTML('All Downloads' % (filename)) - index.appendBlock(block) + link = 'All Downloads' % (filename) + title = '%s - %s' % ('Top Downloads', link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable(title, ['URI', 'Hits']) + for (uri, entrance) in top_downloads[:10]: + table.appendRow([uri, entrance]) + index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index e196de9..1e44259 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -12,30 +12,28 @@ class IWLADisplayTopHits(IPlugin): def hook(self): top_hits = self.iwla.getMonthStats()['top_hits'] - top_hits = sorted(top_hits.items(), key=lambda t: t[1], reverse=True) - index = self.iwla.getDisplayIndex() - - table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) - for (uri, entrance) in top_hits[:10]: - table.appendRow([uri, entrance]) - index.appendBlock(table) - + # All in a file title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) - filename = 'top_hits.html' path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) - table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) + table = DisplayHTMLBlockTable('All Hits', ['URI', 'Entrance']) for (uri, entrance) in top_hits: table.appendRow([uri, entrance]) page.appendBlock(table) - display = self.iwla.getDisplay() - display.addPage(page) + self.iwla.getDisplay().addPage(page) - block = DisplayHTMLRawBlock() - block.setRawHTML('All hits' % (filename)) - index.appendBlock(block) + link = 'All hits' % (filename) + title = '%s - %s' % ('Top Hits', link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + for (uri, entrance) in top_hits[:10]: + table.appendRow([uri, entrance]) + index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index ddd68b9..3c3cfee 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -12,30 +12,28 @@ class IWLADisplayTopPages(IPlugin): def hook(self): top_pages = self.iwla.getMonthStats()['top_pages'] - top_pages = sorted(top_pages.items(), key=lambda t: t[1], reverse=True) - index = self.iwla.getDisplayIndex() - - table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) - for (uri, entrance) in top_pages[:10]: - table.appendRow([uri, entrance]) - index.appendBlock(table) - + # All in a page title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) - filename = 'top_pages.html' path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) - table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) + table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) for (uri, entrance) in top_pages: table.appendRow([uri, entrance]) page.appendBlock(table) - display = self.iwla.getDisplay() - display.addPage(page) + self.iwla.getDisplay().addPage(page) - block = DisplayHTMLRawBlock() - block.setRawHTML('All pages' % (filename)) - index.appendBlock(block) + link = 'All pages' % (filename) + title = '%s - %s' % ('Top Pages', link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + for (uri, entrance) in top_pages[:10]: + table.appendRow([uri, entrance]) + index.appendBlock(table) From 3858127a6dbba4c27b5269d2b7ba0ade9d27658a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 27 Nov 2014 21:40:23 +0100 Subject: [PATCH 044/195] Work on CSS management --- display.py | 65 ++++++++++++++++++++++++-------- iwla.py | 2 +- plugins/display/all_visits.py | 2 + plugins/display/referers.py | 7 +++- plugins/display/top_downloads.py | 6 ++- plugins/display/top_hits.py | 2 + plugins/display/top_pages.py | 6 ++- plugins/display/top_visitors.py | 1 + 8 files changed, 69 insertions(+), 22 deletions(-) diff --git a/display.py b/display.py index 69473a5..c119712 100644 --- a/display.py +++ b/display.py @@ -60,45 +60,78 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.rows.append(listToStr(row)) self.rows_cssclasses.append(['' for e in row]) - def getCellValue(row, col): + def getCellValue(self, row, col): if row < 0 or col < 0 or\ row >= len(self.rows) or col >= len(self.cols): - raise ValueError('Invalid indices') + raise ValueError('Invalid indices %d,%d' % (row, col)) return self.rows[row][col] - def setCellValue(row, col, value): + def setCellValue(self, row, col, value): if row < 0 or col < 0 or\ row >= len(self.rows) or col >= len(self.cols): - raise ValueError('Invalid indices') + raise ValueError('Invalid indices %d,%d' % (row, col)) return self.rows[row][col] - def setCellCSSClass(row, col, value): + def setCellCSSClass(self, row, col, value): if row < 0 or col < 0 or\ row >= len(self.rows) or col >= len(self.cols): - raise ValueError('Invalid indices') + raise ValueError('Invalid indices %d,%d' % (row, col)) self.rows_cssclasses[row][col] = value - def setRowCSSClass(row, value): + def getCellCSSClass(self, row, col): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + return self.rows_cssclasses[row][col] + + def getColCSSClass(self, col): + if col < 0 or col >= len(self.cols): + raise ValueError('Invalid indice %d' % (col)) + + return self.cols_cssclasses[col] + + def setRowCSSClass(self, row, value): if row < 0 or row >= len(self.rows): - raise ValueError('Invalid indice') + raise ValueError('Invalid indice %d' % (row)) for i in range(0, self.rows_cssclasses[row]): self.rows_cssclasses[row][i] = value - + + def setColCSSClass(self, col, value): + if col < 0 or col >= len(self.cols): + raise ValueError('Invalid indice %d' % (col)) + + self.cols_cssclasses[col] = value + + def setColsCSSClass(self, values): + if len(values) != len(self.cols): + raise ValueError('Invalid values size') + + self.cols_cssclasses = values + def build(self, f): if not self.html: html = '' - html += '' - for title in self.cols: - html += '' % (title) - html += '' - for row in self.rows: + if self.cols: html += '' - for v in row: - html += '' % (v) + for i in range (0, len(self.cols)): + title = self.cols[i] + style = self.getColCSSClass(i) + if style: style = ' class="%s"' % (style) + html += '%s' % (style, title) + html += '' + for i in range(0, len(self.rows)): + row = self.rows[i] + html += '' + for j in range(0, len(row)): + v = row[j] + style = self.getCellCSSClass(i, j) + if style: style = ' class="%s"' % (style) + html += '%s' % (style, v) html += '' html += '
%s
%s
' self.html = html diff --git a/iwla.py b/iwla.py index 2f01132..f9e9d62 100755 --- a/iwla.py +++ b/iwla.py @@ -232,7 +232,7 @@ class IWLA(object): page = DisplayHTMLPage(title, filename) days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) - + days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwith', 'iwla_bandwith']) keys = self.current_analysis['days_stats'].keys() keys.sort() nb_visits = 0 diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index ea79b0f..2e643f5 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -22,6 +22,8 @@ class IWLADisplayAllVisits(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwith', '']) + for super_hit in last_access: address = super_hit['remote_addr'] if display_visitor_ip and\ diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 128026c..60bc154 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -40,7 +40,8 @@ class IWLADisplayReferers(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) - + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + table.appendRow(['Search Engine', '', '']) for r,_ in top_search_engine_referers: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] @@ -67,6 +68,8 @@ class IWLADisplayReferers(IPlugin): title = '%s - %s' % ('Connexion from', link) table = DisplayHTMLBlockTable(title, ['Origin', 'Pages', 'Hits']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + table.appendRow(['Search Engine', '', '']) for r,_ in top_search_engine_referers[:10]: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] @@ -92,6 +95,7 @@ class IWLADisplayReferers(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) + table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases: table.appendRow([phrase[0], phrase[1]]) page.appendBlock(table) @@ -103,6 +107,7 @@ class IWLADisplayReferers(IPlugin): # Top key phrases in index title = '%s - %s' % ('Top key phrases', link) table = DisplayHTMLBlockTable(title, ['Key phrase', 'Search']) + table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases[:10]: table.appendRow([phrase[0], phrase[1]]) index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 5ca8e9e..727c138 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -20,7 +20,8 @@ class IWLADisplayTopDownloads(IPlugin): title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) page = DisplayHTMLPage(title, path) - table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) + table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) + table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads: table.appendRow([uri, entrance]) page.appendBlock(table) @@ -33,7 +34,8 @@ class IWLADisplayTopDownloads(IPlugin): # Top in index index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable(title, ['URI', 'Hits']) + table = DisplayHTMLBlockTable(title, ['URI', 'Hits']) + table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads[:10]: table.appendRow([uri, entrance]) index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 1e44259..9beecd1 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -21,6 +21,7 @@ class IWLADisplayTopHits(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('All Hits', ['URI', 'Entrance']) + table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits: table.appendRow([uri, entrance]) page.appendBlock(table) @@ -34,6 +35,7 @@ class IWLADisplayTopHits(IPlugin): index = self.iwla.getDisplayIndex() table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits[:10]: table.appendRow([uri, entrance]) index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 3c3cfee..bf7c907 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -20,7 +20,8 @@ class IWLADisplayTopPages(IPlugin): path = self.iwla.getCurDisplayPath(filename) page = DisplayHTMLPage(title, path) - table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) + table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) + table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages: table.appendRow([uri, entrance]) page.appendBlock(table) @@ -33,7 +34,8 @@ class IWLADisplayTopPages(IPlugin): # Top in index index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages[:10]: table.appendRow([uri, entrance]) index.appendBlock(table) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index e806209..8748f27 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -21,6 +21,7 @@ class IWLADisplayTopVisitors(IPlugin): index = self.iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwith', '']) for super_hit in top_visitors: address = super_hit['remote_addr'] if display_visitor_ip and\ From 1b4f9c0ad590199ba1486a1f7138f3b5b7488015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 28 Nov 2014 16:02:04 +0100 Subject: [PATCH 045/195] Add First CSS --- display.py | 1 + iwla.py | 7 ++-- plugins/display/all_visits.py | 2 +- plugins/display/top_visitors.py | 2 +- resources/css/iwla.css | 63 +++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 resources/css/iwla.css diff --git a/display.py b/display.py index c119712..bcecc3c 100644 --- a/display.py +++ b/display.py @@ -169,6 +169,7 @@ class DisplayHTMLPage(object): f.write('') f.write('') f.write('') + f.write('') if self.title: f.write('%s' % (self.title)) f.write('') diff --git a/iwla.py b/iwla.py index f9e9d62..1295259 100755 --- a/iwla.py +++ b/iwla.py @@ -144,6 +144,8 @@ class IWLA(object): def _appendHit(self, hit): remote_addr = hit['remote_addr'] + if not remote_addr: return + if not remote_addr in self.current_analysis['visits'].keys(): self._createVisitor(hit) return @@ -232,7 +234,7 @@ class IWLA(object): page = DisplayHTMLPage(title, filename) days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) - days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwith', 'iwla_bandwith']) + days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) keys = self.current_analysis['days_stats'].keys() keys.sort() nb_visits = 0 @@ -391,7 +393,8 @@ class IWLA(object): if not self._decodeHTTPRequest(hit): return False for k in hit.keys(): - if hit[k] == '-': hit[k] = '' + if hit[k] == '-' or hit[k] == '*': + hit[k] = '' self._appendHit(hit) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 2e643f5..ef5e71c 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -22,7 +22,7 @@ class IWLADisplayAllVisits(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwith', '']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in last_access: address = super_hit['remote_addr'] diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 8748f27..fa4eecf 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -21,7 +21,7 @@ class IWLADisplayTopVisitors(IPlugin): index = self.iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwith', '']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in top_visitors: address = super_hit['remote_addr'] if display_visitor_ip and\ diff --git a/resources/css/iwla.css b/resources/css/iwla.css new file mode 100644 index 0000000..7566123 --- /dev/null +++ b/resources/css/iwla.css @@ -0,0 +1,63 @@ + +body +{ + font: 11px verdana, arial, helvetica, sans-serif; + background-color: #FFFFFF; +} + +.iwla_block +{ + display:block; + margin: 2em; +} + +.iwla_block_title { + font: 13px verdana, arial, helvetica, sans-serif; + font-weight: bold; + background-color: #CCCCDD; + text-align: center; + color: #000000; + width: 60%; +} + +.iwla_block_title > a +{ + font: 11px verdana, arial, helvetica, sans-serif; + font-weight: normal; + text-decoration: none; +} + +.iwla_block_value +{ + border-width : 0.2em; + border-color : #CCCCDD; + border-style : solid; +} + +/* .iwla_block_value table tr th */ +th +{ + padding : 0.5em; + background : #ECECEC; + font-weight: normal; + white-space: nowrap; +} + +td +{ + text-align:center; + vertical-align:middle; +} + +td:first-child +{ + text-align:left; + /* width : 100%; */ +} + +.iwla_visitor { background : #FFAA66; } +.iwla_visit { background : #F4F090; } +.iwla_page { background : #4477DD; } +.iwla_hit { background : #66DDEE; } +.iwla_bandwidth { background : #2EA495; } +.iwla_search { background : #F4F090; } \ No newline at end of file From d4170ad3ed47751d75904b4aee0bfa38adfa5b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 28 Nov 2014 16:26:11 +0100 Subject: [PATCH 046/195] Display empty stats --- iwla.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/iwla.py b/iwla.py index 1295259..d4fff1e 100755 --- a/iwla.py +++ b/iwla.py @@ -6,6 +6,7 @@ import time import pickle import gzip import importlib +from calendar import monthrange import default_conf as conf import conf as _ @@ -235,19 +236,22 @@ class IWLA(object): days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) - keys = self.current_analysis['days_stats'].keys() - keys.sort() nb_visits = 0 - for k in keys: - stats = self.current_analysis['days_stats'][k] - row = [k, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], - bytesToStr(stats['viewed_bandwidth']), bytesToStr(stats['not_viewed_bandwidth'])] + nb_days = 0 + _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) + for i in range(0, nb_month_days+1): + if i in self.current_analysis['days_stats'].keys(): + stats = self.current_analysis['days_stats'][i] + row = [i, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + bytesToStr(stats['viewed_bandwidth']), bytesToStr(stats['not_viewed_bandwidth'])] + nb_visits += stats['nb_visitors'] + nb_days += 1 + else: + row = [i, '', '', '', '', ''] days.appendRow(row) - nb_visits += stats['nb_visitors'] stats = self.current_analysis['month_stats'] - nb_days = len(keys) row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] if nb_days: average_row = map(lambda(v): int(v/nb_days), row) From 81c3aa8099d37a0c6d73e77f2366f36e7272f9f8 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 30 Nov 2014 19:05:17 +0100 Subject: [PATCH 047/195] Try to manage CSS path --- default_conf.py | 11 +++++++++-- display.py | 16 +++++++++++++--- iwla.py | 14 ++++++++++---- plugins/display/all_visits.py | 2 +- plugins/display/referers.py | 4 ++-- plugins/display/top_downloads.py | 2 +- plugins/display/top_hits.py | 2 +- plugins/display/top_pages.py | 2 +- resources/icon/vh.png | Bin 0 -> 239 bytes resources/icon/vk.png | Bin 0 -> 236 bytes resources/icon/vp.png | Bin 0 -> 248 bytes resources/icon/vu.png | Bin 0 -> 239 bytes resources/icon/vv.png | Bin 0 -> 239 bytes 13 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 resources/icon/vh.png create mode 100644 resources/icon/vk.png create mode 100644 resources/icon/vp.png create mode 100644 resources/icon/vu.png create mode 100644 resources/icon/vv.png diff --git a/default_conf.py b/default_conf.py index 48ce1df..1d5e1b4 100644 --- a/default_conf.py +++ b/default_conf.py @@ -1,7 +1,9 @@ +import os + # Default configuration -DB_ROOT = './output/' -DISPLAY_ROOT = './output/' +DB_ROOT = './output' +DISPLAY_ROOT = './output' HOOKS_ROOT = 'plugins' PRE_HOOK_DIRECTORY = HOOKS_ROOT + '.pre_analysis' @@ -27,3 +29,8 @@ count_hit_only_visitors = True multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'] + +resources_path = ['resources'] +css_path = [os.path.join( '/', + os.path.basename(resources_path[0]), + os.path.join('css', 'iwla.css'))] diff --git a/display.py b/display.py index bcecc3c..6750309 100644 --- a/display.py +++ b/display.py @@ -140,10 +140,11 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): class DisplayHTMLPage(object): - def __init__(self, title, filename): + def __init__(self, title, filename, css_path): self.title = title self.filename = filename self.blocks = [] + self.css_path = css_path def getFilename(self): return self.filename; @@ -169,7 +170,8 @@ class DisplayHTMLPage(object): f.write('') f.write('') f.write('') - f.write('') + for css in self.css_path: + f.write('' % (css)) if self.title: f.write('%s' % (self.title)) f.write('') @@ -180,8 +182,9 @@ class DisplayHTMLPage(object): class DisplayHTMLBuild(object): - def __init__(self): + def __init__(self, iwla): self.pages = [] + self.iwla = iwla def getPage(self, filename): for page in self.pages: @@ -193,6 +196,13 @@ class DisplayHTMLBuild(object): self.pages.append(page) def build(self, root): + display_root = self.iwla.getConfValue('DISPLAY_ROOT', '') + for res_path in self.iwla.getResourcesPath(): + target = os.path.abspath(res_path) + link_name = os.path.join(display_root, res_path) + if not os.path.exists(link_name): + os.symlink(target, link_name) + for page in self.pages: page.build(root) diff --git a/iwla.py b/iwla.py index d4fff1e..5896422 100755 --- a/iwla.py +++ b/iwla.py @@ -28,7 +28,7 @@ class IWLA(object): self.analyse_started = False self.current_analysis = {} self.cache_plugins = {} - self.display = DisplayHTMLBuild() + self.display = DisplayHTMLBuild(self) self.valid_visitors = None self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', conf.log_format) @@ -89,6 +89,12 @@ class IWLA(object): cur_time = self.meta_infos['last_time'] return os.path.join(str(cur_time.tm_year), str(cur_time.tm_mon), filename) + def getResourcesPath(self): + return conf.resources_path + + def getCSSPath(self): + return conf.css_path + def _clearMeta(self): self.meta_infos = { 'last_time' : None @@ -96,7 +102,7 @@ class IWLA(object): return self.meta_infos def _clearDisplay(self): - self.display = DisplayHTMLBuild() + self.display = DisplayHTMLBuild(self) return self.display def getDBFilename(self, time): @@ -108,7 +114,7 @@ class IWLA(object): os.makedirs(base) # TODO : remove return - #return + return with open(filename + '.tmp', 'wb+') as f: pickle.dump(obj, f) @@ -232,7 +238,7 @@ class IWLA(object): title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) filename = self.getCurDisplayPath('index.html') print '==> Generate display (%s)' % (filename) - page = DisplayHTMLPage(title, filename) + page = DisplayHTMLPage(title, filename, conf.css_path) days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index ef5e71c..42a5b3c 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -20,7 +20,7 @@ class IWLADisplayAllVisits(IPlugin): filename = 'all_visits.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path) + page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 60bc154..36381bc 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -38,7 +38,7 @@ class IWLADisplayReferers(IPlugin): filename = 'referers.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path) + page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) @@ -93,7 +93,7 @@ class IWLADisplayReferers(IPlugin): filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path) + page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases: diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 727c138..baf6a1b 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -19,7 +19,7 @@ class IWLADisplayTopDownloads(IPlugin): path = self.iwla.getCurDisplayPath(filename) title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) - page = DisplayHTMLPage(title, path) + page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads: diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 9beecd1..05b74eb 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -19,7 +19,7 @@ class IWLADisplayTopHits(IPlugin): filename = 'top_hits.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path) + page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('All Hits', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits: diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index bf7c907..5533166 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -19,7 +19,7 @@ class IWLADisplayTopPages(IPlugin): filename = 'top_pages.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path) + page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages: diff --git a/resources/icon/vh.png b/resources/icon/vh.png new file mode 100644 index 0000000000000000000000000000000000000000..13e52f9ef9a675349c93b1eeeef2ea1388a3bdc6 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLoTn9*sC$qb+%OS+@4BLl<6e(pbstU$hcfKP}k$FXyY=dL+De_#Fo z|D5mtTb{o!zV|%&+P$D-=M1;*WmvkFVagPNwQD^ta>oF*2za_UhE&{2P6#RUeIHW` Yw7Z?@X!#7GUZ5OmdKI;Vst0F_-zU;qFB literal 0 HcmV?d00001 diff --git a/resources/icon/vk.png b/resources/icon/vk.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1bc63b7f1b1566abc0986fc6a8d5f0c70aff44 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLoi7I;J!Gca&{0AWU_H6}BFf-LEdzK#qG8~eHcB(eheDgizrt_%%<3>{$%3kp@Y z&aq#;NN>qh;i}1Cxn#wzK_`}!@!=$ Vv?lgUttn8B!PC{xWt~$(695VHJjDP2 literal 0 HcmV?d00001 diff --git a/resources/icon/vp.png b/resources/icon/vp.png new file mode 100644 index 0000000000000000000000000000000000000000..8ebf70216123ac0fd386005e511f20f42be2d5ca GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLo*8o|0J>k`33<#A+8)==M=V@SoV21sUuG2GF=Z-H zdhh`##981GS*8o|0J>k`RV~aA+DEChTJ%o^5SmQ z=V$Xizg_q8@#4pKXWYBqclm7diG6wdw)(G|<-c!TPZ!6Kid)GEA!WYr cV`^m>*!!5ylr{#t0p%DxUHx3vIVCg!0ItzYF#rGn literal 0 HcmV?d00001 From 5d6362105b0b520fba1f792a3066d563bd127bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 1 Dec 2014 21:13:35 +0100 Subject: [PATCH 048/195] Save month stats in meta dictionary --- default_conf.py | 2 +- iwla.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/default_conf.py b/default_conf.py index 1d5e1b4..ec62210 100644 --- a/default_conf.py +++ b/default_conf.py @@ -9,7 +9,7 @@ HOOKS_ROOT = 'plugins' PRE_HOOK_DIRECTORY = HOOKS_ROOT + '.pre_analysis' POST_HOOK_DIRECTORY = HOOKS_ROOT + '.post_analysis' DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + '.display' -META_PATH = DB_ROOT + 'meta.db' +META_PATH = os.path.join(DB_ROOT, 'meta.db') DB_FILENAME = 'iwla.db' log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ diff --git a/iwla.py b/iwla.py index 5896422..2dea3f5 100755 --- a/iwla.py +++ b/iwla.py @@ -114,7 +114,7 @@ class IWLA(object): os.makedirs(base) # TODO : remove return - return + #return with open(filename + '.tmp', 'wb+') as f: pickle.dump(obj, f) @@ -317,6 +317,7 @@ class IWLA(object): visits = self.current_analysis['visits'] stats = self._generateStats(visits) + duplicated_stats = {k:v for (k,v) in stats.items()} cur_time = self.meta_infos['last_time'] print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) @@ -344,6 +345,15 @@ class IWLA(object): self._generateDisplay() + # Save month stats + year = '%d' % (cur_time.tm_year) + month = '%d' % (cur_time.tm_mon) + if not 'stats' in self.meta_infos.keys(): + self.meta_infos['stats'] = {} + if not year in self.meta_infos['stats'].keys(): + self.meta_infos['stats'][year] = {} + self.meta_infos['stats'][year][month] = duplicated_stats + def _generateDayStats(self): visits = self.current_analysis['visits'] From 2846394dad766a59505e922868ba0c774b7ba53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 1 Dec 2014 21:45:26 +0100 Subject: [PATCH 049/195] Introduce _buildHTML() and DisplayHTMLBlockTableWithGraph class in display.py --- display.py | 68 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/display.py b/display.py index 6750309..33b9f13 100644 --- a/display.py +++ b/display.py @@ -8,11 +8,15 @@ class DisplayHTMLRaw(object): def setRawHTML(self, html): self.html = html + def _buildHTML(self): + pass + def _build(self, f, html): if html: f.write(html) - + def build(self, f): - self._build(self.html) + self._buildHTML() + self._build(f, self.html) class DisplayHTMLBlock(DisplayHTMLRaw): @@ -38,14 +42,14 @@ class DisplayHTMLBlock(DisplayHTMLRaw): def setValueCSSClass(self, cssclass): self.value_cssclass = cssclass - def build(self, f): + def _buildHTML(self): html = '
' % (self.cssclass) if self.title: html += '
%s
' % (self.title_cssclass, self.title) html += '
%s
' % (self.value_cssclass, self.html) html += '
' - self._build(f, html) + self.html = html class DisplayHTMLBlockTable(DisplayHTMLBlock): @@ -113,30 +117,40 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.cols_cssclasses = values - def build(self, f): - if not self.html: - html = '' - if self.cols: - html += '' - for i in range (0, len(self.cols)): - title = self.cols[i] - style = self.getColCSSClass(i) - if style: style = ' class="%s"' % (style) - html += '%s' % (style, title) - html += '' - for i in range(0, len(self.rows)): - row = self.rows[i] - html += '' - for j in range(0, len(row)): - v = row[j] - style = self.getCellCSSClass(i, j) - if style: style = ' class="%s"' % (style) - html += '%s' % (style, v) - html += '' - html += '
' - self.html = html + def _buildHTML(self): + html = '' + if self.cols: + html += '' + for i in range (0, len(self.cols)): + title = self.cols[i] + style = self.getColCSSClass(i) + if style: style = ' class="%s"' % (style) + html += '%s' % (style, title) + html += '' + for i in range(0, len(self.rows)): + row = self.rows[i] + html += '' + for j in range(0, len(row)): + v = row[j] + style = self.getCellCSSClass(i, j) + if style: style = ' class="%s"' % (style) + html += '%s' % (style, v) + html += '' + html += '
' - super(DisplayHTMLBlockTable, self).build(f) + self.html = html + + super(DisplayHTMLBlockTable, self)._buildHTML() + +class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): + + def __init__(self, title, cols, short_title, nb_valid_rows=0): + super(DisplayHTMLBlockTableWithGraph, self).__init__(title=title, cols=cols) + self.short_title = short_title + self.nb_valid_rows = nb_valid_rows + + def setNbValidRows(self, nb_valid_rows): + self.nb_valid_rows = nb_valid_rows class DisplayHTMLPage(object): From 63a9b40b4699c6f54bdb98089b9006ad23ec4241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 2 Dec 2014 16:53:54 +0100 Subject: [PATCH 050/195] Work for DisplayHTMLBlockTableWithGraph class --- default_conf.py | 5 ++-- display.py | 71 ++++++++++++++++++++++++++++++++++++++++++++++--- iwla.py | 11 +++++--- 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/default_conf.py b/default_conf.py index ec62210..6e78888 100644 --- a/default_conf.py +++ b/default_conf.py @@ -31,6 +31,5 @@ multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'] resources_path = ['resources'] -css_path = [os.path.join( '/', - os.path.basename(resources_path[0]), - os.path.join('css', 'iwla.css'))] +icon_path = ['/%s/%s' % (os.path.basename(resources_path[0]), 'icon')] +css_path = ['/%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] diff --git a/display.py b/display.py index 33b9f13..50fbbeb 100644 --- a/display.py +++ b/display.py @@ -138,20 +138,85 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): html += '' html += '' - self.html = html + self.html += html super(DisplayHTMLBlockTable, self)._buildHTML() class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): - def __init__(self, title, cols, short_title, nb_valid_rows=0): + def __init__(self, title, cols, short_titles=[], nb_valid_rows=0): super(DisplayHTMLBlockTableWithGraph, self).__init__(title=title, cols=cols) - self.short_title = short_title + self.short_titles = short_titles self.nb_valid_rows = nb_valid_rows + # TOFIX + self.icon_path = '/resources/icon' + # self.icon_path = self.iwla.getConfValue('icon_path', '/') + self.raw_rows = [] + self.maxes = [0 for c in cols] + + def appendRow(self, row): + self.raw_rows.append(row) + super(DisplayHTMLBlockTableWithGraph, self).appendRow(row) + + def appendShortTitle(self, short_title): + self.short_titles.append(short_title) + + def setShortTitle(self, short_titles): + self.short_titles = short_titles def setNbValidRows(self, nb_valid_rows): self.nb_valid_rows = nb_valid_rows + def _computeMax(self): + for i in range(0, self.nb_valid_rows): + row = self.raw_rows[i] + for j in range(1, len(row)): + if row[j] > self.maxes[j]: + self.maxes[j] = row[j] + + def _getIconFromStyle(self, style): + if style.startswith('iwla_page'): icon = 'vp.png' + elif style.startswith('iwla_hit'): icon = 'vh.png' + elif style.startswith('iwla_bandwidth'): icon = 'vk.png' + elif style.startswith('iwla_visit'): icon = 'vv.png' + elif style.startswith('iwla_search'): icon = 'vu.png' + else: return '' + + return '%s/%s' % (self.icon_path, icon) + + def _buildHTML(self): + self._computeMax() + + html = '' + html += '' + for i in range(0, self.nb_valid_rows): + row = self.rows[i] + html += '' + html += '' + html += '' + for i in range(0, len(self.short_titles)): + style = self.getCellCSSClass(0, j) + if style: style = ' class="%s"' % (style) + html += '%s' % (style, self.short_titles[i]) + html += '' + html += '
' + for j in range(1, len(row)): + style = self.getColCSSClass(j) + icon = self._getIconFromStyle(style) + if not icon: continue + if style: style = ' class="%s"' % (style) + alt = '%s: %s' % (row[j], self.cols[j]) + if self.maxes[j]: + height = int((self.raw_rows[i][j] * 100) / self.maxes[j]) + else: + height = 0 + html += '' % (style, icon, height, alt, alt) + html += '
' + + self.html += html + + super(DisplayHTMLBlockTableWithGraph, self)._buildHTML() + class DisplayHTMLPage(object): def __init__(self, title, filename, css_path): diff --git a/iwla.py b/iwla.py index 2dea3f5..5fd1bde 100755 --- a/iwla.py +++ b/iwla.py @@ -240,21 +240,24 @@ class IWLA(object): print '==> Generate display (%s)' % (filename) page = DisplayHTMLPage(title, filename, conf.css_path) - days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) + _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) + days = DisplayHTMLBlockTableWithGraph('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], nb_valid_rows=nb_month_days) days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 - _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) for i in range(0, nb_month_days+1): if i in self.current_analysis['days_stats'].keys(): stats = self.current_analysis['days_stats'][i] row = [i, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], - bytesToStr(stats['viewed_bandwidth']), bytesToStr(stats['not_viewed_bandwidth'])] + stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] nb_visits += stats['nb_visitors'] nb_days += 1 else: - row = [i, '', '', '', '', ''] + row = [i, 0, 0, 0, 0, 0] days.appendRow(row) + days.setCellValue(i, 4, bytesToStr(row[4])) + days.setCellValue(i, 5, bytesToStr(row[5])) + days.appendShortTitle(str(i)) stats = self.current_analysis['month_stats'] From 7d45b45e8af6ec10b70238791e25228215dee92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 2 Dec 2014 20:49:56 +0100 Subject: [PATCH 051/195] class DisplayHTMLBlockTableWithGraph() seems to work Fix a bug : month_stats override if iwla.py called twice --- default_conf.py | 4 ++-- display.py | 14 ++++++++++---- iwla.py | 16 +++++++++++----- resources/css/iwla.css | 14 +++++++++++++- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/default_conf.py b/default_conf.py index 6e78888..3812624 100644 --- a/default_conf.py +++ b/default_conf.py @@ -31,5 +31,5 @@ multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'] resources_path = ['resources'] -icon_path = ['/%s/%s' % (os.path.basename(resources_path[0]), 'icon')] -css_path = ['/%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] +icon_path = ['%s/%s' % (os.path.basename(resources_path[0]), 'icon')] +css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] diff --git a/display.py b/display.py index 50fbbeb..646d049 100644 --- a/display.py +++ b/display.py @@ -59,6 +59,7 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.rows = [] self.cols_cssclasses = ['' for e in cols] self.rows_cssclasses = [] + self.table_css = 'iwla_table' def appendRow(self, row): self.rows.append(listToStr(row)) @@ -76,7 +77,7 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): row >= len(self.rows) or col >= len(self.cols): raise ValueError('Invalid indices %d,%d' % (row, col)) - return self.rows[row][col] + self.rows[row][col] = value def setCellCSSClass(self, row, col, value): if row < 0 or col < 0 or\ @@ -118,7 +119,9 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.cols_cssclasses = values def _buildHTML(self): - html = '' + style = '' + if self.table_css: style = ' class="%s"' % (self.table_css) + html = '' % (style) if self.cols: html += '' for i in range (0, len(self.cols)): @@ -149,10 +152,11 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): self.short_titles = short_titles self.nb_valid_rows = nb_valid_rows # TOFIX - self.icon_path = '/resources/icon' + self.icon_path = 'resources/icon' # self.icon_path = self.iwla.getConfValue('icon_path', '/') self.raw_rows = [] self.maxes = [0 for c in cols] + self.table_graph_css = 'iwla_graph_table' def appendRow(self, row): self.raw_rows.append(row) @@ -187,7 +191,9 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): def _buildHTML(self): self._computeMax() - html = '
' + style = '' + if self.table_graph_css: style = ' class="%s"' % (self.table_graph_css) + html = '' % (style) html += '' for i in range(0, self.nb_valid_rows): row = self.rows[i] diff --git a/iwla.py b/iwla.py index 5fd1bde..6192312 100755 --- a/iwla.py +++ b/iwla.py @@ -245,19 +245,21 @@ class IWLA(object): days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 - for i in range(0, nb_month_days+1): + for i in range(0, nb_month_days): + cur_day = '%d %s' % (i+1, time.strftime('%b', cur_time)) + full_cur_day = '%s %d' % (cur_day, cur_time.tm_year) if i in self.current_analysis['days_stats'].keys(): stats = self.current_analysis['days_stats'][i] - row = [i, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + row = [full_cur_day, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] nb_visits += stats['nb_visitors'] nb_days += 1 else: - row = [i, 0, 0, 0, 0, 0] + row = [full_cur_day, 0, 0, 0, 0, 0] days.appendRow(row) days.setCellValue(i, 4, bytesToStr(row[4])) days.setCellValue(i, 5, bytesToStr(row[5])) - days.appendShortTitle(str(i)) + days.appendShortTitle(cur_day) stats = self.current_analysis['month_stats'] @@ -326,7 +328,11 @@ class IWLA(object): print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) print stats - self.current_analysis['month_stats'] = stats + if not 'month_stats' in self.current_analysis.keys(): + self.current_analysis['month_stats'] = stats + else: + for (k,v) in stats.items(): + self.current_analysis['month_stats'][k] = v self.valid_visitors = {} for (k,v) in visits.items(): diff --git a/resources/css/iwla.css b/resources/css/iwla.css index 7566123..a694c21 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -60,4 +60,16 @@ td:first-child .iwla_page { background : #4477DD; } .iwla_hit { background : #66DDEE; } .iwla_bandwidth { background : #2EA495; } -.iwla_search { background : #F4F090; } \ No newline at end of file +.iwla_search { background : #F4F090; } + +.iwla_graph_table +{ + margin-left:auto; + margin-right:auto; +} + +table.iwla_graph_table > table.iwla_table +{ + margin-left:auto; + margin-right:auto; +} \ No newline at end of file From 273bcd3526ec5d04eadac0e3a413a33eb1e94709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 2 Dec 2014 21:16:27 +0100 Subject: [PATCH 052/195] Add weekend coloration --- display.py | 11 +++++------ iwla.py | 4 ++++ resources/css/iwla.css | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/display.py b/display.py index 646d049..ab9e582 100644 --- a/display.py +++ b/display.py @@ -57,13 +57,13 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): super(DisplayHTMLBlockTable, self).__init__(title=title) self.cols = cols self.rows = [] - self.cols_cssclasses = ['' for e in cols] + self.cols_cssclasses = [''] * len(cols) self.rows_cssclasses = [] self.table_css = 'iwla_table' def appendRow(self, row): self.rows.append(listToStr(row)) - self.rows_cssclasses.append(['' for e in row]) + self.rows_cssclasses.append([''] * len(row)) def getCellValue(self, row, col): if row < 0 or col < 0 or\ @@ -103,8 +103,7 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): if row < 0 or row >= len(self.rows): raise ValueError('Invalid indice %d' % (row)) - for i in range(0, self.rows_cssclasses[row]): - self.rows_cssclasses[row][i] = value + self.rows_cssclasses[row] = [value] * len(self.rows_cssclasses[row]) def setColCSSClass(self, col, value): if col < 0 or col >= len(self.cols): @@ -155,7 +154,7 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): self.icon_path = 'resources/icon' # self.icon_path = self.iwla.getConfValue('icon_path', '/') self.raw_rows = [] - self.maxes = [0 for c in cols] + self.maxes = [0] * len(cols) self.table_graph_css = 'iwla_graph_table' def appendRow(self, row): @@ -213,7 +212,7 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): html += '' html += '' for i in range(0, len(self.short_titles)): - style = self.getCellCSSClass(0, j) + style = self.getCellCSSClass(i, 0) if style: style = ' class="%s"' % (style) html += '%s' % (style, self.short_titles[i]) html += '' diff --git a/iwla.py b/iwla.py index 6192312..16b3b08 100755 --- a/iwla.py +++ b/iwla.py @@ -7,6 +7,7 @@ import pickle import gzip import importlib from calendar import monthrange +from datetime import date import default_conf as conf import conf as _ @@ -260,6 +261,9 @@ class IWLA(object): days.setCellValue(i, 4, bytesToStr(row[4])) days.setCellValue(i, 5, bytesToStr(row[5])) days.appendShortTitle(cur_day) + week_day = date(cur_time.tm_year, cur_time.tm_mon, i+1).weekday() + if week_day == 5 or week_day == 6: + days.setRowCSSClass(i, 'iwla_weekend') stats = self.current_analysis['month_stats'] diff --git a/resources/css/iwla.css b/resources/css/iwla.css index a694c21..a1be30c 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -61,6 +61,7 @@ td:first-child .iwla_hit { background : #66DDEE; } .iwla_bandwidth { background : #2EA495; } .iwla_search { background : #F4F090; } +.iwla_weekend { background : #ECECEC; } .iwla_graph_table { From 95023a5db3d2e90a20dff62fcf9944cb6bce4d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 2 Dec 2014 21:53:20 +0100 Subject: [PATCH 053/195] Do a bunch of CSS and presentation --- display.py | 6 +++--- iwla.py | 18 ++++++++++++------ resources/css/iwla.css | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/display.py b/display.py index ab9e582..012ab66 100644 --- a/display.py +++ b/display.py @@ -204,10 +204,10 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): if style: style = ' class="%s"' % (style) alt = '%s: %s' % (row[j], self.cols[j]) if self.maxes[j]: - height = int((self.raw_rows[i][j] * 100) / self.maxes[j]) + height = int((self.raw_rows[i][j] * 100) / self.maxes[j]) or 1 else: - height = 0 - html += '' % (style, icon, height, alt, alt) + height = 1 + html += '' % (style, icon, height, alt, alt) html += '' html += '' html += '' diff --git a/iwla.py b/iwla.py index 16b3b08..a82f858 100755 --- a/iwla.py +++ b/iwla.py @@ -247,23 +247,29 @@ class IWLA(object): nb_visits = 0 nb_days = 0 for i in range(0, nb_month_days): - cur_day = '%d %s' % (i+1, time.strftime('%b', cur_time)) - full_cur_day = '%s %d' % (cur_day, cur_time.tm_year) + day = '%d
%s' % (i+1, time.strftime('%b', cur_time)) + full_day = '%d %s %d' % (i+1, time.strftime('%b', cur_time), cur_time.tm_year) if i in self.current_analysis['days_stats'].keys(): stats = self.current_analysis['days_stats'][i] - row = [full_cur_day, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + row = [full_day, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] nb_visits += stats['nb_visitors'] nb_days += 1 else: - row = [full_cur_day, 0, 0, 0, 0, 0] + row = [full_day, 0, 0, 0, 0, 0] days.appendRow(row) days.setCellValue(i, 4, bytesToStr(row[4])) days.setCellValue(i, 5, bytesToStr(row[5])) - days.appendShortTitle(cur_day) - week_day = date(cur_time.tm_year, cur_time.tm_mon, i+1).weekday() + days.appendShortTitle(day) + adate = date(cur_time.tm_year, cur_time.tm_mon, i+1) + week_day = adate.weekday() if week_day == 5 or week_day == 6: days.setRowCSSClass(i, 'iwla_weekend') + if adate == date.today(): + css = days.getCellCSSClass(i, 0) + if css: css = '%s %s' % (css, 'iwla_curday') + else: css = 'iwla_curday' + days.setCellCSSClass(i, 0, css) stats = self.current_analysis['month_stats'] diff --git a/resources/css/iwla.css b/resources/css/iwla.css index a1be30c..6caeee3 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -49,6 +49,11 @@ td vertical-align:middle; } +td img +{ + vertical-align:bottom; +} + td:first-child { text-align:left; @@ -62,6 +67,7 @@ td:first-child .iwla_bandwidth { background : #2EA495; } .iwla_search { background : #F4F090; } .iwla_weekend { background : #ECECEC; } +.iwla_curday { font-weight: bold; } .iwla_graph_table { @@ -69,8 +75,13 @@ td:first-child margin-right:auto; } -table.iwla_graph_table > table.iwla_table +table.iwla_graph_table + table.iwla_table { margin-left:auto; margin-right:auto; -} \ No newline at end of file +} + +table.iwla_graph_table td +{ + text-align:center; +} From 9c82c61cf8acb63e387a6b2513e1b3554eb765b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 3 Dec 2014 10:55:32 +0100 Subject: [PATCH 054/195] Add some arguments --- iwla.py | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/iwla.py b/iwla.py index a82f858..8b02c79 100755 --- a/iwla.py +++ b/iwla.py @@ -1,11 +1,14 @@ #!/usr/bin/env python import os +import shutil +import sys import re import time import pickle import gzip import importlib +import argparse from calendar import monthrange from datetime import date @@ -439,7 +442,7 @@ class IWLA(object): return True - def start(self): + def start(self, _file): print '==> Load previous database' self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() @@ -454,17 +457,16 @@ class IWLA(object): print '==> Analysing log' - with open(conf.analyzed_filename) as f: - for l in f: - # print "line " + l + for l in _file: + # print "line " + l - groups = self.log_re.match(l) + groups = self.log_re.match(l) - if groups: - if not self._newHit(groups.groupdict()): - break - else: - print "No match for " + l + if groups: + if not self._newHit(groups.groupdict()): + break + else: + print "No match for " + l #break if self.analyse_started: @@ -477,5 +479,29 @@ class IWLA(object): self._generateMonthStats() if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Intelligent Web Log Analyzer') + + parser.add_argument('-c', '--clean-output', dest='clean_output', action='store_true', + default=False, + help='Clean output before starting') + + parser.add_argument('-i', '--stdin', dest='stdin', action='store_true', + default=False, + help='Read data from stdin instead of conf.analyzed_filename') + + args = parser.parse_args() + + if args.clean_output: + if os.path.exists(conf.DB_ROOT): shutil.rmtree(conf.DB_ROOT) + if os.path.exists(conf.DISPLAY_ROOT): shutil.rmtree(conf.DISPLAY_ROOT) + iwla = IWLA() - iwla.start() + + if args.stdin: + iwla.start(sys.stdin) + else: + if not os.path.exists(conf.analyzed_filename): + print 'No such file \'%s\'' % (conf.analyzed_filename) + sys.exit(-1) + with open(conf.analyzed_filename) as f: + iwla.start(f) From 269b8e54de98ad9811be7ad4b2257d022a10f169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 3 Dec 2014 11:29:05 +0100 Subject: [PATCH 055/195] Add minimal conf values requirements for main --- iplugin.py | 19 ++++++++++--------- iwla.py | 4 ++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/iplugin.py b/iplugin.py index cac9f83..1617ebe 100644 --- a/iplugin.py +++ b/iplugin.py @@ -32,6 +32,14 @@ class IPlugin(object): def hook(self): pass +def validConfRequirements(conf_requirements, iwla, plugin_path): + for r in conf_requirements: + if iwla.getConfValue(r, None) is None: + print '\'%s\' conf value required for %s' % (r, plugin_path) + return False + + return True + def preloadPlugins(plugins, iwla): cache_plugins = {} @@ -62,15 +70,8 @@ def preloadPlugins(plugins, iwla): #print 'Load plugin %s' % (plugin_name) conf_requirements = plugin.getConfRequirements() - - requirement_validated = True - for r in conf_requirements: - conf_value = iwla.getConfValue(r, None) - if conf_value is None: - print '\'%s\' conf value required for %s' % (r, plugin_path) - requirement_validated = False - break - if not requirement_validated: continue + if not validConfRequirements(conf_requirements, iwla, plugin_path): + continue requirements = plugin.getRequirements() diff --git a/iwla.py b/iwla.py index 8b02c79..070fbcc 100755 --- a/iwla.py +++ b/iwla.py @@ -497,6 +497,10 @@ if __name__ == '__main__': iwla = IWLA() + required_conf = ['analyzed_filename', 'domain_name'] + if not validConfRequirements(required_conf, iwla, 'Main Conf'): + sys.exit(0) + if args.stdin: iwla.start(sys.stdin) else: From 897f96232c2671a86bb8034031e467963a258408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 3 Dec 2014 21:58:55 +0100 Subject: [PATCH 056/195] Work on index (not finished) --- display.py | 4 ++-- iwla.py | 69 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/display.py b/display.py index 012ab66..c3dc4e4 100644 --- a/display.py +++ b/display.py @@ -146,9 +146,9 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): - def __init__(self, title, cols, short_titles=[], nb_valid_rows=0): + def __init__(self, title, cols, short_titles=None, nb_valid_rows=0): super(DisplayHTMLBlockTableWithGraph, self).__init__(title=title, cols=cols) - self.short_titles = short_titles + self.short_titles = short_titles or [] self.nb_valid_rows = nb_valid_rows # TOFIX self.icon_path = 'resources/icon' diff --git a/iwla.py b/iwla.py index 070fbcc..8fa6f0c 100755 --- a/iwla.py +++ b/iwla.py @@ -237,7 +237,7 @@ class IWLA(object): return self.display.getPage(filename) - def _generateDisplayDaysStat(self): + def _generateDisplayDaysStats(self): cur_time = self.meta_infos['last_time'] title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) filename = self.getCurDisplayPath('index.html') @@ -245,8 +245,8 @@ class IWLA(object): page = DisplayHTMLPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) - days = DisplayHTMLBlockTableWithGraph('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], nb_valid_rows=nb_month_days) - days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) + days = DisplayHTMLBlockTableWithGraph('By day', ['Day', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], nb_valid_rows=nb_month_days) + days.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 for i in range(0, nb_month_days): @@ -294,9 +294,60 @@ class IWLA(object): page.appendBlock(days) self.display.addPage(page) + def _generateDisplayMonthStats(self, page, year, month_stats): + + title = 'Summary %d' % (year) + cols = ['Month', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'] + months = DisplayHTMLBlockTableWithGraph(title, cols, nb_valid_rows=12) + months.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) + total = [0] * len(cols) + for i in range(0, 12): + month = '%s
%d' % ('Jan', year) + full_month = '%s %d' % ('Jan', year) + if i in month_stats.keys(): + stats = month_stats[i] + row = [full_month, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + for i in range(1, len(row[1:])): + total[i] += row[i] + else: + row = [full_month, 0, 0, 0, 0, 0] + months.appendRow(row) + months.setCellValue(i, 4, bytesToStr(row[4])) + months.setCellValue(i, 5, bytesToStr(row[5])) + months.appendShortTitle(month) + # adate = date(cur_time.tm_year, cur_time.tm_mon, i+1) + # week_day = adate.weekday() + # if week_day == 5 or week_day == 6: + # months.setRowCSSClass(i, 'iwla_weekend') + # if adate == date.today(): + # css = months.getCellCSSClass(i, 0) + # if css: css = '%s %s' % (css, 'iwla_curday') + # else: css = 'iwla_curday' + # months.setCellCSSClass(i, 0, css) + + total[0] = 'Total' + total[4] = bytesToStr(total[4]) + total[5] = bytesToStr(total[5]) + months.appendRow(total) + page.appendBlock(months) + + def _generateDisplayWholeMonthStats(self): + title = 'Stats for %s' % (conf.domain_name) + filename = 'index.html' + print '==> Generate main page (%s)' % (filename) + + page = DisplayHTMLPage(title, filename, conf.css_path) + + for year in self.meta_infos['stats'].keys(): + self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) + + self.display.addPage(page) + def _generateDisplay(self): - self._generateDisplayDaysStat() + self._generateDisplayDaysStats() self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY) + self._generateDisplayWholeMonthStats() self.display.build(conf.DISPLAY_ROOT) def _generateStats(self, visits): @@ -355,6 +406,8 @@ class IWLA(object): continue self.valid_visitors[k] = v + duplicated_stats['visitors'] = stats['visitors'] = len(self.valid_visitors.keys()) + self._callPlugins(conf.POST_HOOK_DIRECTORY) path = self.getDBFilename(cur_time) @@ -365,17 +418,17 @@ class IWLA(object): self._serialize(self.current_analysis, path) - self._generateDisplay() - # Save month stats - year = '%d' % (cur_time.tm_year) - month = '%d' % (cur_time.tm_mon) + year = cur_time.tm_year + month = cur_time.tm_mon if not 'stats' in self.meta_infos.keys(): self.meta_infos['stats'] = {} if not year in self.meta_infos['stats'].keys(): self.meta_infos['stats'][year] = {} self.meta_infos['stats'][year][month] = duplicated_stats + self._generateDisplay() + def _generateDayStats(self): visits = self.current_analysis['visits'] From 5f72a9c91236654100c0e694e2f653d8f7eebfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 4 Dec 2014 19:15:15 +0100 Subject: [PATCH 057/195] Fix presentation problems --- display.py | 10 ++++--- iwla.py | 61 +++++++++++++++++++++--------------------- resources/css/iwla.css | 4 +-- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/display.py b/display.py index c3dc4e4..febb705 100644 --- a/display.py +++ b/display.py @@ -146,7 +146,7 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): - def __init__(self, title, cols, short_titles=None, nb_valid_rows=0): + def __init__(self, title, cols, short_titles=None, nb_valid_rows=0, graph_cols=None): super(DisplayHTMLBlockTableWithGraph, self).__init__(title=title, cols=cols) self.short_titles = short_titles or [] self.nb_valid_rows = nb_valid_rows @@ -156,6 +156,8 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): self.raw_rows = [] self.maxes = [0] * len(cols) self.table_graph_css = 'iwla_graph_table' + self.td_img_css = 'iwla_td_img' + self.graph_cols = graph_cols or [] def appendRow(self, row): self.raw_rows.append(row) @@ -196,8 +198,10 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): html += '' for i in range(0, self.nb_valid_rows): row = self.rows[i] - html += '' + html += u'' for i in range (0, len(self.cols)): title = self.cols[i] style = self.getColCSSClass(i) - if style: style = ' class="%s"' % (style) - html += '%s' % (style, title) - html += '' + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, title) + html += u'' for i in range(0, len(self.rows)): row = self.rows[i] - html += '' + html += u'' for j in range(0, len(row)): v = row[j] style = self.getCellCSSClass(i, j) - if style: style = ' class="%s"' % (style) - html += '%s' % (style, v) - html += '' - html += '
' - for j in range(1, len(row)): + css = '' + if self.td_img_css: css=' class="%s"' % (self.td_img_css) + html += '' % (css) + for j in self.graph_cols: style = self.getColCSSClass(j) icon = self._getIconFromStyle(style) if not icon: continue diff --git a/iwla.py b/iwla.py index 8fa6f0c..66acaf2 100755 --- a/iwla.py +++ b/iwla.py @@ -245,13 +245,13 @@ class IWLA(object): page = DisplayHTMLPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) - days = DisplayHTMLBlockTableWithGraph('By day', ['Day', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], nb_valid_rows=nb_month_days) + days = DisplayHTMLBlockTableWithGraph('By day', ['Day', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], nb_valid_rows=nb_month_days, graph_cols=range(1,6)) days.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 - for i in range(0, nb_month_days): - day = '%d
%s' % (i+1, time.strftime('%b', cur_time)) - full_day = '%d %s %d' % (i+1, time.strftime('%b', cur_time), cur_time.tm_year) + for i in range(1, nb_month_days+1): + day = '%d
%s' % (i, time.strftime('%b', cur_time)) + full_day = '%d %s %d' % (i, time.strftime('%b', cur_time), cur_time.tm_year) if i in self.current_analysis['days_stats'].keys(): stats = self.current_analysis['days_stats'][i] row = [full_day, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], @@ -261,18 +261,18 @@ class IWLA(object): else: row = [full_day, 0, 0, 0, 0, 0] days.appendRow(row) - days.setCellValue(i, 4, bytesToStr(row[4])) - days.setCellValue(i, 5, bytesToStr(row[5])) + days.setCellValue(i-1, 4, bytesToStr(row[4])) + days.setCellValue(i-1, 5, bytesToStr(row[5])) days.appendShortTitle(day) - adate = date(cur_time.tm_year, cur_time.tm_mon, i+1) + adate = date(cur_time.tm_year, cur_time.tm_mon, i) week_day = adate.weekday() if week_day == 5 or week_day == 6: - days.setRowCSSClass(i, 'iwla_weekend') + days.setRowCSSClass(i-1, 'iwla_weekend') if adate == date.today(): css = days.getCellCSSClass(i, 0) if css: css = '%s %s' % (css, 'iwla_curday') else: css = 'iwla_curday' - days.setCellCSSClass(i, 0, css) + days.setCellCSSClass(i-1, 0, css) stats = self.current_analysis['month_stats'] @@ -295,36 +295,35 @@ class IWLA(object): self.display.addPage(page) def _generateDisplayMonthStats(self, page, year, month_stats): - + cur_time = time.localtime() + months_name = ['', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] title = 'Summary %d' % (year) - cols = ['Month', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'] - months = DisplayHTMLBlockTableWithGraph(title, cols, nb_valid_rows=12) - months.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) + cols = ['Month', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth', 'Details'] + graph_cols=range(1,6) + months = DisplayHTMLBlockTableWithGraph(title, cols, nb_valid_rows=12, graph_cols=graph_cols) + months.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) total = [0] * len(cols) - for i in range(0, 12): - month = '%s
%d' % ('Jan', year) - full_month = '%s %d' % ('Jan', year) + for i in range(1, 13): + month = '%s
%d' % (months_name[i], year) + full_month = '%s %d' % (months_name[i], year) if i in month_stats.keys(): stats = month_stats[i] + link = 'Details' % (year, i) row = [full_month, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], - stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] - for i in range(1, len(row[1:])): - total[i] += row[i] + stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] + for j in graph_cols: + total[j] += row[j] else: - row = [full_month, 0, 0, 0, 0, 0] + row = [full_month, 0, 0, 0, 0, 0, ''] months.appendRow(row) - months.setCellValue(i, 4, bytesToStr(row[4])) - months.setCellValue(i, 5, bytesToStr(row[5])) + months.setCellValue(i-1, 4, bytesToStr(row[4])) + months.setCellValue(i-1, 5, bytesToStr(row[5])) months.appendShortTitle(month) - # adate = date(cur_time.tm_year, cur_time.tm_mon, i+1) - # week_day = adate.weekday() - # if week_day == 5 or week_day == 6: - # months.setRowCSSClass(i, 'iwla_weekend') - # if adate == date.today(): - # css = months.getCellCSSClass(i, 0) - # if css: css = '%s %s' % (css, 'iwla_curday') - # else: css = 'iwla_curday' - # months.setCellCSSClass(i, 0, css) + if year == cur_time.tm_year and i == cur_time.tm_mon: + css = months.getCellCSSClass(i-1, 0) + if css: css = '%s %s' % (css, 'iwla_curday') + else: css = 'iwla_curday' + months.setCellCSSClass(i-1, 0, css) total[0] = 'Total' total[4] = bytesToStr(total[4]) diff --git a/resources/css/iwla.css b/resources/css/iwla.css index 6caeee3..5371769 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -20,7 +20,7 @@ body width: 60%; } -.iwla_block_title > a +a { font: 11px verdana, arial, helvetica, sans-serif; font-weight: normal; @@ -49,7 +49,7 @@ td vertical-align:middle; } -td img +.iwla_td_img { vertical-align:bottom; } From 2362fd1fd26460556dd06b11c55c179575d8eb30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 4 Dec 2014 21:04:41 +0100 Subject: [PATCH 058/195] Fix unicode problems Add generateHTMLLink() --- display.py | 160 ++++++++++++++++-------------- iwla.py | 2 +- plugins/display/referers.py | 10 +- plugins/display/top_downloads.py | 4 +- plugins/display/top_hits.py | 4 +- plugins/display/top_pages.py | 4 +- plugins/post_analysis/referers.py | 5 +- 7 files changed, 98 insertions(+), 91 deletions(-) diff --git a/display.py b/display.py index febb705..bb14313 100644 --- a/display.py +++ b/display.py @@ -1,8 +1,9 @@ import os +import codecs class DisplayHTMLRaw(object): - def __init__(self, html=''): + def __init__(self, html=u''): self.html = html def setRawHTML(self, html): @@ -23,31 +24,31 @@ class DisplayHTMLBlock(DisplayHTMLRaw): def __init__(self, title=''): super(DisplayHTMLBlock, self).__init__(html='') self.title = title - self.cssclass = 'iwla_block' - self.title_cssclass = 'iwla_block_title' - self.value_cssclass = 'iwla_block_value' + self.cssclass = u'iwla_block' + self.title_cssclass = u'iwla_block_title' + self.value_cssclass = u'iwla_block_value' def getTitle(self): return self.title def setTitle(self, value): - self.title = value + self.title = unicode(value) def setCSSClass(self, cssclass): - self.cssclass = cssclass + self.cssclass = unicode(cssclass) def setTitleCSSClass(self, cssclass): - self.title_cssclass = cssclass + self.title_cssclass = unicode(cssclass) def setValueCSSClass(self, cssclass): - self.value_cssclass = cssclass + self.value_cssclass = unicode(cssclass) def _buildHTML(self): - html = '
' % (self.cssclass) + html = u'
' % (self.cssclass) if self.title: - html += '
%s
' % (self.title_cssclass, self.title) - html += '
%s
' % (self.value_cssclass, self.html) - html += '
' + html += u'
%s
' % (self.title_cssclass, self.title) + html += u'
%s
' % (self.value_cssclass, self.html) + html += u'
' self.html = html @@ -55,15 +56,15 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): def __init__(self, title, cols): super(DisplayHTMLBlockTable, self).__init__(title=title) - self.cols = cols + self.cols = listToStr(cols) self.rows = [] - self.cols_cssclasses = [''] * len(cols) + self.cols_cssclasses = [u''] * len(cols) self.rows_cssclasses = [] - self.table_css = 'iwla_table' + self.table_css = u'iwla_table' def appendRow(self, row): self.rows.append(listToStr(row)) - self.rows_cssclasses.append([''] * len(row)) + self.rows_cssclasses.append([u''] * len(row)) def getCellValue(self, row, col): if row < 0 or col < 0 or\ @@ -77,14 +78,14 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): row >= len(self.rows) or col >= len(self.cols): raise ValueError('Invalid indices %d,%d' % (row, col)) - self.rows[row][col] = value + self.rows[row][col] = unicode(value) def setCellCSSClass(self, row, col, value): if row < 0 or col < 0 or\ row >= len(self.rows) or col >= len(self.cols): raise ValueError('Invalid indices %d,%d' % (row, col)) - self.rows_cssclasses[row][col] = value + self.rows_cssclasses[row][col] = unicode(value) def getCellCSSClass(self, row, col): if row < 0 or col < 0 or\ @@ -103,42 +104,42 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): if row < 0 or row >= len(self.rows): raise ValueError('Invalid indice %d' % (row)) - self.rows_cssclasses[row] = [value] * len(self.rows_cssclasses[row]) + self.rows_cssclasses[row] = [unicode(value)] * len(self.rows_cssclasses[row]) def setColCSSClass(self, col, value): if col < 0 or col >= len(self.cols): raise ValueError('Invalid indice %d' % (col)) - self.cols_cssclasses[col] = value + self.cols_cssclasses[col] = unicode(value) def setColsCSSClass(self, values): if len(values) != len(self.cols): raise ValueError('Invalid values size') - self.cols_cssclasses = values + self.cols_cssclasses = [unicode(values)] * len(self.cols) def _buildHTML(self): - style = '' - if self.table_css: style = ' class="%s"' % (self.table_css) - html = '' % (style) + style = u'' + if self.table_css: style = u' class="%s"' % (self.table_css) + html = u'' % (style) if self.cols: - html += '
' + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, v) + html += u'' + html += u'' self.html += html @@ -149,14 +150,15 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): def __init__(self, title, cols, short_titles=None, nb_valid_rows=0, graph_cols=None): super(DisplayHTMLBlockTableWithGraph, self).__init__(title=title, cols=cols) self.short_titles = short_titles or [] + self.short_titles = listToStr(self.short_titles) self.nb_valid_rows = nb_valid_rows # TOFIX - self.icon_path = 'resources/icon' + self.icon_path = u'resources/icon' # self.icon_path = self.iwla.getConfValue('icon_path', '/') self.raw_rows = [] self.maxes = [0] * len(cols) - self.table_graph_css = 'iwla_graph_table' - self.td_img_css = 'iwla_td_img' + self.table_graph_css = u'iwla_graph_table' + self.td_img_css = u'iwla_td_img' self.graph_cols = graph_cols or [] def appendRow(self, row): @@ -164,10 +166,10 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): super(DisplayHTMLBlockTableWithGraph, self).appendRow(row) def appendShortTitle(self, short_title): - self.short_titles.append(short_title) + self.short_titles.append(unicode(short_title)) def setShortTitle(self, short_titles): - self.short_titles = short_titles + self.short_titles = listToStr(short_titles) def setNbValidRows(self, nb_valid_rows): self.nb_valid_rows = nb_valid_rows @@ -180,47 +182,47 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): self.maxes[j] = row[j] def _getIconFromStyle(self, style): - if style.startswith('iwla_page'): icon = 'vp.png' - elif style.startswith('iwla_hit'): icon = 'vh.png' - elif style.startswith('iwla_bandwidth'): icon = 'vk.png' - elif style.startswith('iwla_visit'): icon = 'vv.png' - elif style.startswith('iwla_search'): icon = 'vu.png' + if style.startswith(u'iwla_page'): icon = u'vp.png' + elif style.startswith(u'iwla_hit'): icon = u'vh.png' + elif style.startswith(u'iwla_bandwidth'): icon = u'vk.png' + elif style.startswith(u'iwla_visitor'): icon = u'vu.png' + elif style.startswith(u'iwla_visit'): icon = u'vv.png' else: return '' - return '%s/%s' % (self.icon_path, icon) + return u'%s/%s' % (self.icon_path, icon) def _buildHTML(self): self._computeMax() - style = '' - if self.table_graph_css: style = ' class="%s"' % (self.table_graph_css) - html = '' % (style) - html += '' + style = u'' + if self.table_graph_css: style = u' class="%s"' % (self.table_graph_css) + html = u'' % (style) + html += u'' for i in range(0, self.nb_valid_rows): row = self.rows[i] - css = '' - if self.td_img_css: css=' class="%s"' % (self.td_img_css) - html += '' % (css) + css = u'' + if self.td_img_css: css=u' class="%s"' % (self.td_img_css) + html += u'' % (css) for j in self.graph_cols: style = self.getColCSSClass(j) icon = self._getIconFromStyle(style) if not icon: continue - if style: style = ' class="%s"' % (style) - alt = '%s: %s' % (row[j], self.cols[j]) + if style: style = u' class="%s"' % (style) + alt = u'%s: %s' % (row[j], self.cols[j]) if self.maxes[j]: height = int((self.raw_rows[i][j] * 100) / self.maxes[j]) or 1 else: height = 1 - html += '' % (style, icon, height, alt, alt) - html += '' - html += '' - html += '' + html += u'' % (style, icon, height, alt, alt) + html += u'' + html += u'' + html += u'' for i in range(0, len(self.short_titles)): style = self.getCellCSSClass(i, 0) - if style: style = ' class="%s"' % (style) - html += '%s' % (style, self.short_titles[i]) - html += '' - html += '' + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, self.short_titles[i]) + html += u'' + html += u'' self.html += html @@ -229,10 +231,10 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): class DisplayHTMLPage(object): def __init__(self, title, filename, css_path): - self.title = title + self.title = unicode(title) self.filename = filename self.blocks = [] - self.css_path = css_path + self.css_path = listToStr(css_path) def getFilename(self): return self.filename; @@ -253,19 +255,19 @@ class DisplayHTMLPage(object): if not os.path.exists(base): os.makedirs(base) - f = open(filename, 'w') - f.write('') - f.write('') - f.write('') - f.write('') + f = codecs.open(filename, 'w', 'utf-8') + f.write(u'') + f.write(u'') + f.write(u'') + f.write(u'') for css in self.css_path: - f.write('' % (css)) + f.write(u'' % (css)) if self.title: - f.write('%s' % (self.title)) - f.write('') + f.write(u'%s' % (self.title)) + f.write(u'') for block in self.blocks: block.build(f) - f.write('') + f.write(u'') f.close() class DisplayHTMLBuild(object): @@ -295,19 +297,25 @@ class DisplayHTMLBuild(object): page.build(root) def bytesToStr(bytes): - suffixes = ['', ' kB', ' MB', ' GB', ' TB'] + suffixes = [u'', u' kB', u' MB', u' GB', u' TB'] for i in range(0, len(suffixes)): if bytes < 1024: break bytes /= 1024.0 if i: - return '%.02f%s' % (bytes, suffixes[i]) + return u'%.02f%s' % (bytes, suffixes[i]) else: - return '%d%s' % (bytes, suffixes[i]) + return u'%d%s' % (bytes, suffixes[i]) def _toStr(v): - if type(v) != str: return str(v) + if type(v) != unicode: return unicode(v) else: return v def listToStr(l): return map(lambda(v) : _toStr(v), l) + +def generateHTMLLink(url, name=None, max_length=100, prefix=u'http'): + url = unicode(url) + if not name: name = unicode(url) + if not url.startswith(prefix): url = u'%s://%s' % (prefix, url) + return u'%s' % (url, name[:max_length]) diff --git a/iwla.py b/iwla.py index 66acaf2..634f0b0 100755 --- a/iwla.py +++ b/iwla.py @@ -301,7 +301,7 @@ class IWLA(object): cols = ['Month', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth', 'Details'] graph_cols=range(1,6) months = DisplayHTMLBlockTableWithGraph(title, cols, nb_valid_rows=12, graph_cols=graph_cols) - months.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) + months.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) total = [0] * len(cols) for i in range(1, 13): month = '%s
%d' % (months_name[i], year) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 36381bc..4e28bf1 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -49,12 +49,12 @@ class IWLADisplayReferers(IPlugin): table.appendRow(['External URL', '', '']) for r,_ in top_referers: - row = [r, referers[r]['pages'], referers[r]['hits']] + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] table.appendRow(row) table.appendRow(['External URL (robot)', '', '']) for r,_ in top_robots_referers: - row = [r, robots_referers[r]['pages'], robots_referers[r]['hits']] + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] table.appendRow(row) page.appendBlock(table) @@ -77,12 +77,12 @@ class IWLADisplayReferers(IPlugin): table.appendRow(['External URL', '', '']) for r,_ in top_referers[:10]: - row = [r, referers[r]['pages'], referers[r]['hits']] + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] table.appendRow(row) table.appendRow(['External URL (robot)', '', '']) for r,_ in top_robots_referers[:10]: - row = [r, robots_referers[r]['pages'], robots_referers[r]['hits']] + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] table.appendRow(row) index.appendBlock(table) @@ -99,7 +99,7 @@ class IWLADisplayReferers(IPlugin): for phrase in top_key_phrases: table.appendRow([phrase[0], phrase[1]]) page.appendBlock(table) - + display.addPage(page) link = 'All key phrases' % (filename) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index baf6a1b..9629db2 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -23,7 +23,7 @@ class IWLADisplayTopDownloads(IPlugin): table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads: - table.appendRow([uri, entrance]) + table.appendRow([generateHTMLLink(uri), entrance]) page.appendBlock(table) self.iwla.getDisplay().addPage(page) @@ -37,5 +37,5 @@ class IWLADisplayTopDownloads(IPlugin): table = DisplayHTMLBlockTable(title, ['URI', 'Hits']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads[:10]: - table.appendRow([uri, entrance]) + table.appendRow([generateHTMLLink(uri), entrance]) index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 05b74eb..107204d 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -23,7 +23,7 @@ class IWLADisplayTopHits(IPlugin): table = DisplayHTMLBlockTable('All Hits', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits: - table.appendRow([uri, entrance]) + table.appendRow([generateHTMLLink(uri), entrance]) page.appendBlock(table) self.iwla.getDisplay().addPage(page) @@ -37,5 +37,5 @@ class IWLADisplayTopHits(IPlugin): table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits[:10]: - table.appendRow([uri, entrance]) + table.appendRow([generateHTMLLink(uri), entrance]) index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 5533166..23f9dfe 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -23,7 +23,7 @@ class IWLADisplayTopPages(IPlugin): table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages: - table.appendRow([uri, entrance]) + table.appendRow([generateHTMLLink(uri), entrance]) page.appendBlock(table) self.iwla.getDisplay().addPage(page) @@ -37,5 +37,5 @@ class IWLADisplayTopPages(IPlugin): table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages[:10]: - table.appendRow([uri, entrance]) + table.appendRow([generateHTMLLink(uri), entrance]) index.appendBlock(table) diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index f7dc714..eb6fe3e 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -1,5 +1,5 @@ import re -import xml.sax.saxutils as saxutils +import urllib from iwla import IWLA from iplugin import IPlugin @@ -57,8 +57,7 @@ class IWLAPostAnalysisReferers(IPlugin): groups = key_phrase_re.match(p) if groups: key_phrase = groups.groupdict()['key_phrase'] - key_phrase = key_phrase.replace('+', ' ').lower() - key_phrase = saxutils.unescape(key_phrase) + key_phrase = urllib.unquote_plus(key_phrase).decode('utf8') if not key_phrase in key_phrases.keys(): key_phrases[key_phrase] = 1 else: From 4cb2736e22dcd856e8c49162ea2e52396b54f036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 4 Dec 2014 21:47:11 +0100 Subject: [PATCH 059/195] We're need a first version --- display.py | 6 +++--- iwla.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/display.py b/display.py index bb14313..0bb6b26 100644 --- a/display.py +++ b/display.py @@ -116,7 +116,7 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): if len(values) != len(self.cols): raise ValueError('Invalid values size') - self.cols_cssclasses = [unicode(values)] * len(self.cols) + self.cols_cssclasses = listToStr(values) def _buildHTML(self): style = u'' @@ -153,7 +153,7 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): self.short_titles = listToStr(self.short_titles) self.nb_valid_rows = nb_valid_rows # TOFIX - self.icon_path = u'resources/icon' + self.icon_path = u'/resources/icon' # self.icon_path = self.iwla.getConfValue('icon_path', '/') self.raw_rows = [] self.maxes = [0] * len(cols) @@ -261,7 +261,7 @@ class DisplayHTMLPage(object): f.write(u'') f.write(u'') for css in self.css_path: - f.write(u'' % (css)) + f.write(u'' % (css)) if self.title: f.write(u'%s' % (self.title)) f.write(u'') diff --git a/iwla.py b/iwla.py index 634f0b0..72a9774 100755 --- a/iwla.py +++ b/iwla.py @@ -338,6 +338,9 @@ class IWLA(object): page = DisplayHTMLPage(title, filename, conf.css_path) + last_update = 'Last update %s
' % (time.strftime('%d %b %Y %H:%M', time.localtime())) + page.appendBlock(DisplayHTMLRaw(last_update)) + for year in self.meta_infos['stats'].keys(): self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) From fd858034fb1e2badc2b5e7d482c9f7d0f1bce67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 5 Dec 2014 16:03:09 +0100 Subject: [PATCH 060/195] Add Others field in index --- display.py | 6 ++++++ plugins/display/referers.py | 34 ++++++++++++++++++++++++++++++++ plugins/display/top_downloads.py | 8 ++++++++ plugins/display/top_hits.py | 7 +++++++ plugins/display/top_pages.py | 7 +++++++ plugins/display/top_visitors.py | 19 +++++++++++++++--- resources/css/iwla.css | 2 +- 7 files changed, 79 insertions(+), 4 deletions(-) diff --git a/display.py b/display.py index 0bb6b26..0ffd61d 100644 --- a/display.py +++ b/display.py @@ -66,6 +66,12 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.rows.append(listToStr(row)) self.rows_cssclasses.append([u''] * len(row)) + def getNbRows(self): + return len(self.rows) + + def getNbCols(self): + return len(self.cols) + def getCellValue(self, row, col): if row < 0 or col < 0 or\ row >= len(self.rows) or col >= len(self.cols): diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 4e28bf1..be08acd 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -42,19 +42,28 @@ class IWLADisplayReferers(IPlugin): table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + total_search = [0]*3 table.appendRow(['Search Engine', '', '']) for r,_ in top_search_engine_referers: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] += search_engine_referers[r]['pages'] + total_search[2] += search_engine_referers[r]['hits'] table.appendRow(row) + total_external = [0]*3 table.appendRow(['External URL', '', '']) for r,_ in top_referers: row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] += referers[r]['pages'] + total_external[2] += referers[r]['hits'] table.appendRow(row) + total_robot = [0]*3 table.appendRow(['External URL (robot)', '', '']) for r,_ in top_robots_referers: row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] += robots_referers[r]['pages'] + total_robot[2] += robots_referers[r]['hits'] table.appendRow(row) page.appendBlock(table) @@ -73,17 +82,35 @@ class IWLADisplayReferers(IPlugin): table.appendRow(['Search Engine', '', '']) for r,_ in top_search_engine_referers[:10]: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] -= search_engine_referers[r]['pages'] + total_search[2] -= search_engine_referers[r]['hits'] table.appendRow(row) + if total_search[1] or total_search[2]: + total_search[0] = 'Others' + table.appendRow(total_search) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') table.appendRow(['External URL', '', '']) for r,_ in top_referers[:10]: row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] -= referers[r]['pages'] + total_external[2] -= referers[r]['hits'] table.appendRow(row) + if total_external[1] or total_external[2]: + total_external[0] = 'Others' + table.appendRow(total_external) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') table.appendRow(['External URL (robot)', '', '']) for r,_ in top_robots_referers[:10]: row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] -= robots_referers[r]['pages'] + total_robot[2] -= robots_referers[r]['hits'] table.appendRow(row) + if total_robot[1] or total_robot[2]: + total_robot[0] = 'Others' + table.appendRow(total_robot) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) @@ -93,11 +120,13 @@ class IWLADisplayReferers(IPlugin): filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) + total_search = [0]*2 page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases: table.appendRow([phrase[0], phrase[1]]) + total_search[1] += phrase[1] page.appendBlock(table) display.addPage(page) @@ -110,4 +139,9 @@ class IWLADisplayReferers(IPlugin): table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases[:10]: table.appendRow([phrase[0], phrase[1]]) + total_search[1] -= phrase[1] + if total_search[1]: + total_search[0] = 'Others' + table.appendRow(total_search) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 9629db2..0e42b8d 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -22,8 +22,11 @@ class IWLADisplayTopDownloads(IPlugin): page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) table.setColsCSSClass(['', 'iwla_hit']) + + total_entrance = [0]*2 for (uri, entrance) in top_downloads: table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] += entrance page.appendBlock(table) self.iwla.getDisplay().addPage(page) @@ -38,4 +41,9 @@ class IWLADisplayTopDownloads(IPlugin): table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads[:10]: table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] -= entrance + if total_entrance[1]: + total_entrance[0] = 'Others' + table.appendRow(total_entrance) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 107204d..8128fc9 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -22,8 +22,10 @@ class IWLADisplayTopHits(IPlugin): page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('All Hits', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 for (uri, entrance) in top_hits: table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance page.appendBlock(table) self.iwla.getDisplay().addPage(page) @@ -38,4 +40,9 @@ class IWLADisplayTopHits(IPlugin): table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits[:10]: table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] -= entrance + if total_hits[1]: + total_hits[0] = 'Others' + table.appendRow(total_hits) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 23f9dfe..0c7211e 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -22,8 +22,10 @@ class IWLADisplayTopPages(IPlugin): page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 for (uri, entrance) in top_pages: table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance page.appendBlock(table) self.iwla.getDisplay().addPage(page) @@ -38,4 +40,9 @@ class IWLADisplayTopPages(IPlugin): table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages[:10]: table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] -= entrance + if total_hits[1]: + total_hits[0] = 'Others' + table.appendRow(total_hits) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index fa4eecf..1711005 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -11,11 +11,15 @@ class IWLADisplayTopVisitors(IPlugin): def hook(self): hits = self.iwla.getValidVisitors() - count_hit_only = self.iwla.getConfValue('count_hit_only_visitors', False) display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) - top_bandwidth = [(k,v['bandwidth']) for (k,v) in hits.items() \ - if count_hit_only or v['viewed_pages']] + total = [0]*5 + for super_hit in hits.values(): + total[1] += super_hit['viewed_pages'] + total[2] += super_hit['viewed_hits'] + total[3] += super_hit['bandwidth'] + + top_bandwidth = [(k,v['bandwidth']) for (k,v) in hits.items()] top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] @@ -35,5 +39,14 @@ class IWLADisplayTopVisitors(IPlugin): bytesToStr(super_hit['bandwidth']), time.asctime(super_hit['last_access']) ] + total[1] -= super_hit['viewed_pages'] + total[2] -= super_hit['viewed_hits'] + total[3] -= super_hit['bandwidth'] table.appendRow(row) + if total[1] or total[2] or total[3]: + total[0] = 'Others' + total[3] = bytesToStr(total[3]) + total[4] = '' + table.appendRow(total) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/resources/css/iwla.css b/resources/css/iwla.css index 5371769..71b652b 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -68,7 +68,7 @@ td:first-child .iwla_search { background : #F4F090; } .iwla_weekend { background : #ECECEC; } .iwla_curday { font-weight: bold; } - +.iwla_others { color: #668; } .iwla_graph_table { margin-left:auto; From 010c16cacad0016d21ea439a124fb73a4e411627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 8 Dec 2014 14:13:26 +0100 Subject: [PATCH 061/195] Give iwla to each display class Add generic functions createPage() and createBlock() in DisplayHTMLBuild Add and display IWLA version --- default_conf.py | 2 +- display.py | 32 ++++++++++++++++++++------------ iwla.py | 14 +++++++++----- plugins/display/all_visits.py | 8 ++++---- plugins/display/referers.py | 14 +++++++------- plugins/display/top_downloads.py | 9 +++++---- plugins/display/top_hits.py | 9 +++++---- plugins/display/top_pages.py | 9 +++++---- plugins/display/top_visitors.py | 3 ++- 9 files changed, 58 insertions(+), 42 deletions(-) diff --git a/default_conf.py b/default_conf.py index 3812624..d9b445e 100644 --- a/default_conf.py +++ b/default_conf.py @@ -31,5 +31,5 @@ multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'] resources_path = ['resources'] -icon_path = ['%s/%s' % (os.path.basename(resources_path[0]), 'icon')] +icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] diff --git a/display.py b/display.py index 0ffd61d..5e8dbd4 100644 --- a/display.py +++ b/display.py @@ -3,7 +3,8 @@ import codecs class DisplayHTMLRaw(object): - def __init__(self, html=u''): + def __init__(self, iwla, html=u''): + self.iwla = iwla self.html = html def setRawHTML(self, html): @@ -21,8 +22,8 @@ class DisplayHTMLRaw(object): class DisplayHTMLBlock(DisplayHTMLRaw): - def __init__(self, title=''): - super(DisplayHTMLBlock, self).__init__(html='') + def __init__(self, iwla, title=''): + super(DisplayHTMLBlock, self).__init__(iwla, html='') self.title = title self.cssclass = u'iwla_block' self.title_cssclass = u'iwla_block_title' @@ -54,8 +55,8 @@ class DisplayHTMLBlock(DisplayHTMLRaw): class DisplayHTMLBlockTable(DisplayHTMLBlock): - def __init__(self, title, cols): - super(DisplayHTMLBlockTable, self).__init__(title=title) + def __init__(self, iwla, title, cols): + super(DisplayHTMLBlockTable, self).__init__(iwla=iwla, title=title) self.cols = listToStr(cols) self.rows = [] self.cols_cssclasses = [u''] * len(cols) @@ -153,14 +154,12 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): - def __init__(self, title, cols, short_titles=None, nb_valid_rows=0, graph_cols=None): - super(DisplayHTMLBlockTableWithGraph, self).__init__(title=title, cols=cols) + def __init__(self, iwla, title, cols, short_titles=None, nb_valid_rows=0, graph_cols=None): + super(DisplayHTMLBlockTableWithGraph, self).__init__(iwla=iwla, title=title, cols=cols) self.short_titles = short_titles or [] self.short_titles = listToStr(self.short_titles) self.nb_valid_rows = nb_valid_rows - # TOFIX - self.icon_path = u'/resources/icon' - # self.icon_path = self.iwla.getConfValue('icon_path', '/') + self.icon_path = self.iwla.getConfValue('icon_path', '/') self.raw_rows = [] self.maxes = [0] * len(cols) self.table_graph_css = u'iwla_graph_table' @@ -195,7 +194,7 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): elif style.startswith(u'iwla_visit'): icon = u'vv.png' else: return '' - return u'%s/%s' % (self.icon_path, icon) + return u'/%s/%s' % (self.icon_path, icon) def _buildHTML(self): self._computeMax() @@ -236,7 +235,8 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): class DisplayHTMLPage(object): - def __init__(self, title, filename, css_path): + def __init__(self, iwla, title, filename, css_path): + self.iwla = iwla self.title = unicode(title) self.filename = filename self.blocks = [] @@ -273,6 +273,8 @@ class DisplayHTMLPage(object): f.write(u'') for block in self.blocks: block.build(f) + f.write(u'
Generated by IWLA %s
' % + ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) f.write(u'') f.close() @@ -282,6 +284,12 @@ class DisplayHTMLBuild(object): self.pages = [] self.iwla = iwla + def createPage(self, *args): + return DisplayHTMLPage(self.iwla, *args) + + def createBlock(self, _class, *args): + return _class(self.iwla, *args) + def getPage(self, filename): for page in self.pages: if page.getFilename() == filename: diff --git a/iwla.py b/iwla.py index 72a9774..6ddf237 100755 --- a/iwla.py +++ b/iwla.py @@ -24,6 +24,7 @@ class IWLA(object): ANALYSIS_CLASS = 'HTTP' API_VERSION = 1 + IWLA_VERSION = '0.1' def __init__(self): print '==> Start' @@ -44,6 +45,9 @@ class IWLA(object): (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] + def getVersion(self): + return IWLA.IWLA_VERSION + def getConfValue(self, key, default=None): if not key in dir(conf): return default @@ -242,10 +246,10 @@ class IWLA(object): title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) filename = self.getCurDisplayPath('index.html') print '==> Generate display (%s)' % (filename) - page = DisplayHTMLPage(title, filename, conf.css_path) + page = self.display.createPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) - days = DisplayHTMLBlockTableWithGraph('By day', ['Day', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], nb_valid_rows=nb_month_days, graph_cols=range(1,6)) + days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, 'By day', ['Day', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], None, nb_month_days, range(1,6)) days.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 @@ -300,7 +304,7 @@ class IWLA(object): title = 'Summary %d' % (year) cols = ['Month', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth', 'Details'] graph_cols=range(1,6) - months = DisplayHTMLBlockTableWithGraph(title, cols, nb_valid_rows=12, graph_cols=graph_cols) + months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) months.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) total = [0] * len(cols) for i in range(1, 13): @@ -336,10 +340,10 @@ class IWLA(object): filename = 'index.html' print '==> Generate main page (%s)' % (filename) - page = DisplayHTMLPage(title, filename, conf.css_path) + page = self.display.createPage(title, filename, conf.css_path) last_update = 'Last update %s
' % (time.strftime('%d %b %Y %H:%M', time.localtime())) - page.appendBlock(DisplayHTMLRaw(last_update)) + page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) for year in self.meta_infos['stats'].keys(): self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 42a5b3c..b327362 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -10,6 +10,7 @@ class IWLADisplayAllVisits(IPlugin): self.API_VERSION = 1 def hook(self): + display = self.iwla.getDisplay() hits = self.iwla.getValidVisitors() display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) @@ -20,8 +21,8 @@ class IWLADisplayAllVisits(IPlugin): filename = 'all_visits.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) - table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in last_access: @@ -40,7 +41,6 @@ class IWLADisplayAllVisits(IPlugin): table.appendRow(row) page.appendBlock(table) - display = self.iwla.getDisplay() display.addPage(page) index = self.iwla.getDisplayIndex() @@ -49,6 +49,6 @@ class IWLADisplayAllVisits(IPlugin): if block: block.setTitle('%s - %s' % (block.getTitle(), link)) else: - block = DisplayHTMLRawBlock() + block = display.createBlock(DisplayHTMLRawBlock) block.setRawHTML(link) index.appendBlock(block) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index be08acd..4cdfc79 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -11,6 +11,7 @@ class IWLADisplayReferers(IPlugin): self.requires = ['IWLAPostAnalysisReferers'] def hook(self): + display = self.iwla.getDisplay() month_stats = self.iwla.getMonthStats() referers = month_stats.get('referers', {}) robots_referers = month_stats.get('robots_referers', {}) @@ -38,8 +39,8 @@ class IWLADisplayReferers(IPlugin): filename = 'referers.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) - table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'Connexion from', ['Origin', 'Pages', 'Hits']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) total_search = [0]*3 @@ -68,7 +69,6 @@ class IWLADisplayReferers(IPlugin): page.appendBlock(table) - display = self.iwla.getDisplay() display.addPage(page) link = 'All referers' % (filename) @@ -76,7 +76,7 @@ class IWLADisplayReferers(IPlugin): # Top referers in index title = '%s - %s' % ('Connexion from', link) - table = DisplayHTMLBlockTable(title, ['Origin', 'Pages', 'Hits']) + table = display.createBlock(DisplayHTMLBlockTable, title, ['Origin', 'Pages', 'Hits']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) table.appendRow(['Search Engine', '', '']) @@ -121,8 +121,8 @@ class IWLADisplayReferers(IPlugin): path = self.iwla.getCurDisplayPath(filename) total_search = [0]*2 - page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) - table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'Top key phrases', ['Key phrase', 'Search']) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases: table.appendRow([phrase[0], phrase[1]]) @@ -135,7 +135,7 @@ class IWLADisplayReferers(IPlugin): # Top key phrases in index title = '%s - %s' % ('Top key phrases', link) - table = DisplayHTMLBlockTable(title, ['Key phrase', 'Search']) + table = display.createBlock(DisplayHTMLBlockTable, title, ['Key phrase', 'Search']) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases[:10]: table.appendRow([phrase[0], phrase[1]]) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 0e42b8d..0be4fb4 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -11,6 +11,7 @@ class IWLADisplayTopDownloads(IPlugin): self.requires = ['IWLAPostAnalysisTopDownloads'] def hook(self): + display = self.iwla.getDisplay() top_downloads = self.iwla.getMonthStats()['top_downloads'] top_downloads = sorted(top_downloads.items(), key=lambda t: t[1], reverse=True) @@ -19,8 +20,8 @@ class IWLADisplayTopDownloads(IPlugin): path = self.iwla.getCurDisplayPath(filename) title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) - page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) - table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'All Downloads', ['URI', 'Hit']) table.setColsCSSClass(['', 'iwla_hit']) total_entrance = [0]*2 @@ -29,7 +30,7 @@ class IWLADisplayTopDownloads(IPlugin): total_entrance[1] += entrance page.appendBlock(table) - self.iwla.getDisplay().addPage(page) + display.addPage(page) link = 'All Downloads' % (filename) title = '%s - %s' % ('Top Downloads', link) @@ -37,7 +38,7 @@ class IWLADisplayTopDownloads(IPlugin): # Top in index index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable(title, ['URI', 'Hits']) + table = display.createBlock(DisplayHTMLBlockTable, title, ['URI', 'Hits']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads[:10]: table.appendRow([generateHTMLLink(uri), entrance]) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 8128fc9..5cc24e0 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -11,6 +11,7 @@ class IWLADisplayTopHits(IPlugin): self.requires = ['IWLAPostAnalysisTopHits'] def hook(self): + display = self.iwla.getDisplay() top_hits = self.iwla.getMonthStats()['top_hits'] top_hits = sorted(top_hits.items(), key=lambda t: t[1], reverse=True) @@ -19,8 +20,8 @@ class IWLADisplayTopHits(IPlugin): filename = 'top_hits.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) - table = DisplayHTMLBlockTable('All Hits', ['URI', 'Entrance']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'All Hits', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) total_hits = [0]*2 for (uri, entrance) in top_hits: @@ -28,7 +29,7 @@ class IWLADisplayTopHits(IPlugin): total_hits[1] += entrance page.appendBlock(table) - self.iwla.getDisplay().addPage(page) + display.addPage(page) link = 'All hits' % (filename) title = '%s - %s' % ('Top Hits', link) @@ -36,7 +37,7 @@ class IWLADisplayTopHits(IPlugin): # Top in index index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + table = display.createBlock(DisplayHTMLBlockTable, title, ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits[:10]: table.appendRow([generateHTMLLink(uri), entrance]) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 0c7211e..524ad49 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -11,6 +11,7 @@ class IWLADisplayTopPages(IPlugin): self.requires = ['IWLAPostAnalysisTopPages'] def hook(self): + display = self.iwla.getDisplay() top_pages = self.iwla.getMonthStats()['top_pages'] top_pages = sorted(top_pages.items(), key=lambda t: t[1], reverse=True) @@ -19,8 +20,8 @@ class IWLADisplayTopPages(IPlugin): filename = 'top_pages.html' path = self.iwla.getCurDisplayPath(filename) - page = DisplayHTMLPage(title, path, self.iwla.getConfValue('css_path', [])) - table = DisplayHTMLBlockTable('All Pages', ['URI', 'Entrance']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'All Pages', ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) total_hits = [0]*2 for (uri, entrance) in top_pages: @@ -28,7 +29,7 @@ class IWLADisplayTopPages(IPlugin): total_hits[1] += entrance page.appendBlock(table) - self.iwla.getDisplay().addPage(page) + display.addPage(page) link = 'All pages' % (filename) title = '%s - %s' % ('Top Pages', link) @@ -36,7 +37,7 @@ class IWLADisplayTopPages(IPlugin): # Top in index index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable(title, ['URI', 'Entrance']) + table = display.createBlock(DisplayHTMLBlockTable, title, ['URI', 'Entrance']) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages[:10]: table.appendRow([generateHTMLLink(uri), entrance]) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 1711005..4e22af4 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -11,6 +11,7 @@ class IWLADisplayTopVisitors(IPlugin): def hook(self): hits = self.iwla.getValidVisitors() + display = self.iwla.getDisplay() display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) total = [0]*5 @@ -24,7 +25,7 @@ class IWLADisplayTopVisitors(IPlugin): top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] index = self.iwla.getDisplayIndex() - table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + table = display.createBlock(DisplayHTMLBlockTable, 'Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in top_visitors: address = super_hit['remote_addr'] From 43e5e97c5a810db3cd06e000be1732f52f1d58bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 8 Dec 2014 18:38:40 +0100 Subject: [PATCH 062/195] Add some comments --- conf.py | 23 +++++++++-------------- default_conf.py | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/conf.py b/conf.py index da31821..d3c7dfc 100644 --- a/conf.py +++ b/conf.py @@ -1,27 +1,22 @@ -log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ - '"$request" $status $body_bytes_sent ' +\ - '"$http_referer" "$http_user_agent"'; - -#09/Nov/2014:06:35:16 +0100 -time_format = '%d/%b/%Y:%H:%M:%S +0100' - +# Web server log analyzed_filename = 'access.log' +# Domain name to analyze domain_name = 'soutade.fr' +# Display visitor IP in addition to resolved names display_visitor_ip = True -DB_ROOT = './output/' -DISPLAY_ROOT = './output/' - +# Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits'] -# post_analysis_hooks = ['top_visitors', 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] +# Reverse DNS timeout reverse_dns_timeout = 0.2 -page_to_hit_conf = [r'^.+/logo[/]?$'] -hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] -count_hit_only_visitors = True +# Count this addresses as hit +page_to_hit_conf = [r'^.+/logo[/]?$'] +# Count this addresses as page +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] diff --git a/default_conf.py b/default_conf.py index d9b445e..18cc103 100644 --- a/default_conf.py +++ b/default_conf.py @@ -2,34 +2,50 @@ import os # Default configuration +# Default directory where to store database information DB_ROOT = './output' +# Default directory where to create html files DISPLAY_ROOT = './output' -HOOKS_ROOT = 'plugins' +# Hooks directories (don't edit) +HOOKS_ROOT = 'plugins' PRE_HOOK_DIRECTORY = HOOKS_ROOT + '.pre_analysis' POST_HOOK_DIRECTORY = HOOKS_ROOT + '.post_analysis' DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + '.display' +# Meta Database filename META_PATH = os.path.join(DB_ROOT, 'meta.db') +# Database filename per month DB_FILENAME = 'iwla.db' +# Web server log format (nginx style). Default is what apache log log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ '"$request" $status $body_bytes_sent ' +\ '"$http_referer" "$http_user_agent"' +# Time format used in log format +# TOFIX UTC time_format = '%d/%b/%Y:%H:%M:%S +0100' +# Hooks that are loaded at runtime (only set names without path and extensions) pre_analysis_hooks = [] post_analysis_hooks = [] display_hooks = [] +# Extensions that are considered as a HTML page (or result) pages_extensions = ['/', 'htm', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] +# HTTP codes that are cosidered OK viewed_http_codes = [200, 304] +# If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) count_hit_only_visitors = True +# Multimedia extensions (not accounted as downloaded files) multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'] +# Default resources path (will be symlinked in DISPLAY_OUTPUT) resources_path = ['resources'] +# Icon path icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') +# CSS path (you can add yours) css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] From 751a9b3fae17a5caf76933e65415573e0b346b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 9 Dec 2014 16:54:02 +0100 Subject: [PATCH 063/195] Start big comments (post analysis / referers) --- display.py | 8 +++ iplugin.py | 4 ++ iwla.py | 83 +++++++++++++++++++++++++++-- plugins/post_analysis/referers.py | 26 +++++++++ plugins/pre_analysis/page_to_hit.py | 25 ++++++++- plugins/pre_analysis/robots.py | 26 +++++++++ 6 files changed, 168 insertions(+), 4 deletions(-) diff --git a/display.py b/display.py index 5e8dbd4..25cb0a2 100644 --- a/display.py +++ b/display.py @@ -1,6 +1,10 @@ import os import codecs +# +# Create output HTML files +# + class DisplayHTMLRaw(object): def __init__(self, iwla, html=u''): @@ -310,6 +314,10 @@ class DisplayHTMLBuild(object): for page in self.pages: page.build(root) +# +# Global functions +# + def bytesToStr(bytes): suffixes = [u'', u' kB', u' MB', u' GB', u' TB'] diff --git a/iplugin.py b/iplugin.py index 1617ebe..0ba739a 100644 --- a/iplugin.py +++ b/iplugin.py @@ -2,6 +2,10 @@ import importlib import inspect import traceback +# +# IWLA Plugin interface +# + class IPlugin(object): def __init__(self, iwla): diff --git a/iwla.py b/iwla.py index 6ddf237..1566dd5 100755 --- a/iwla.py +++ b/iwla.py @@ -20,6 +20,84 @@ del _ from iplugin import * from display import * +# +# Main class IWLA +# Parse Log, compute them, call plugins and produce output +# For now, only HTTP log are valid +# +# Plugin requirements : None +# +# Conf values needed : +# analyzed_filename +# domain_name +# +# Output files : +# DB_ROOT/meta.db +# DB_ROOT/year/month/iwla.db +# OUTPUT_ROOT/index.html +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# +# meta => +# last_time +# start_analysis_time +# stats => +# year => +# month => +# viewed_bandwidth +# not_viewed_bandwidth +# viewed_pages +# viewed_hits +# nb_visitors +# +# month_stats : +# viewed_bandwidth +# not_viewed_bandwidth +# viewed_pages +# viewed_hits +# nb_visitors +# +# days_stats : +# day => +# viewed_bandwidth +# not_viewed_bandwidth +# viewed_pages +# viewed_hits +# nb_visitors +# +# visits : +# remote_addr => +# remote_addr +# remote_ip +# viewed_pages +# viewed_hits +# not_viewed_pages +# not_viewed_hits +# bandwidth +# last_access +# requests => +# [fields_from_format_log] +# extract_request => +# extract_uri +# extract_parameters* +# extract_referer* => +# extract_uri +# extract_parameters* +# robot +# hit_only +# is_page +# +# valid_visitors: +# month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# + class IWLA(object): ANALYSIS_CLASS = 'HTTP' @@ -105,7 +183,8 @@ class IWLA(object): def _clearMeta(self): self.meta_infos = { - 'last_time' : None + 'last_time' : None, + 'start_analysis_time' : None } return self.meta_infos @@ -163,7 +242,6 @@ class IWLA(object): if not remote_addr in self.current_analysis['visits'].keys(): self._createVisitor(hit) - return super_hit = self.current_analysis['visits'][remote_addr] super_hit['requests'].append(hit) @@ -206,7 +284,6 @@ class IWLA(object): super_hit['requests'] = [] super_hit['robot'] = False super_hit['hit_only'] = 0 - self._appendHit(hit) def _decodeHTTPRequest(self, hit): if not 'request' in hit.keys(): return False diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index eb6fe3e..d689aa5 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -6,6 +6,32 @@ from iplugin import IPlugin import awstats_data +# +# Post analysis hook +# +# Extract referers and key phrases from requests +# +# Plugin requirements : None +# +# Conf values needed : +# page_to_hit_conf* +# hit_to_page_conf* +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# visits : +# remote_addr => +# robot +# +# Statistics deletion : +# None +# + class IWLAPostAnalysisReferers(IPlugin): def __init__(self, iwla): super(IWLAPostAnalysisReferers, self).__init__(iwla) diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 51102c8..ff05f0a 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -3,7 +3,30 @@ import re from iwla import IWLA from iplugin import IPlugin -# Basic rule to detect robots +# +# Pre analysis hook +# Change page into hit and hit into page into statistics +# +# Plugin requirements : None +# +# Conf values needed : +# page_to_hit_conf* +# hit_to_page_conf* +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# visits : +# remote_addr => +# is_page +# +# Statistics deletion : +# None +# class IWLAPreAnalysisPageToHit(IPlugin): diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 0557448..e2db3aa 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -5,6 +5,32 @@ from iplugin import IPlugin import awstats_data +# +# Pre analysis hook +# +# Filter robots +# +# Plugin requirements : None +# +# Conf values needed : +# page_to_hit_conf* +# hit_to_page_conf* +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# visits : +# remote_addr => +# robot +# +# Statistics deletion : +# None +# + class IWLAPreAnalysisRobots(IPlugin): def __init__(self, iwla): super(IWLAPreAnalysisRobots, self).__init__(iwla) From 4f1c09867d2ccf1710d72b370ebead0a4351ad8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 10 Dec 2014 07:09:05 +0100 Subject: [PATCH 064/195] WIP --- iwla.py | 5 +++-- plugins/post_analysis/referers.py | 21 ++++++++++++++------ plugins/post_analysis/reverse_dns.py | 27 ++++++++++++++++++++++++++ plugins/post_analysis/top_downloads.py | 26 +++++++++++++++++++++++++ plugins/pre_analysis/page_to_hit.py | 3 ++- plugins/pre_analysis/robots.py | 3 ++- 6 files changed, 75 insertions(+), 10 deletions(-) diff --git a/iwla.py b/iwla.py index 1566dd5..d24dacc 100755 --- a/iwla.py +++ b/iwla.py @@ -25,7 +25,8 @@ from display import * # Parse Log, compute them, call plugins and produce output # For now, only HTTP log are valid # -# Plugin requirements : None +# Plugin requirements : +# None # # Conf values needed : # analyzed_filename @@ -582,7 +583,7 @@ class IWLA(object): print '==> Load previous database' self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() - if self.meta_infos['last_time']: + if 'last_time' in self.meta_infos.keys(): self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() else: self._clearVisits() diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index d689aa5..100ab6b 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -11,11 +11,11 @@ import awstats_data # # Extract referers and key phrases from requests # -# Plugin requirements : None +# Plugin requirements : +# None # # Conf values needed : -# page_to_hit_conf* -# hit_to_page_conf* +# domain_name # # Output files : # None @@ -24,9 +24,18 @@ import awstats_data # None # # Statistics update : -# visits : -# remote_addr => -# robot +# month_stats : +# referers => +# pages +# hits +# robots_referers => +# pages +# hits +# search_engine_referers => +# pages +# hits +# key_phrases => +# phrase # # Statistics deletion : # None diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 9ffb8ab..aecd38a 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -3,6 +3,33 @@ import socket from iwla import IWLA from iplugin import IPlugin +# +# Post analysis hook +# +# Replace IP by reverse DNS names +# +# Plugin requirements : +# None +# +# Conf values needed : +# reverse_dns_timeout* +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# valid_visitors: +# remote_addr +# dns_name_replaced +# dns_analyzed +# +# Statistics deletion : +# None +# + class IWLAPostAnalysisReverseDNS(IPlugin): DEFAULT_DNS_TIMEOUT = 0.5 diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 65f0b3f..20cc05f 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -3,6 +3,32 @@ import re from iwla import IWLA from iplugin import IPlugin +# +# Post analysis hook +# +# Count TOP downloads +# +# Plugin requirements : +# None +# +# Conf values needed : +# reverse_dns_timeout* +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# month_stats: +# top_downloads => +# uri +# +# Statistics deletion : +# None +# + class IWLAPostAnalysisTopDownloads(IPlugin): def __init__(self, iwla): super(IWLAPostAnalysisTopDownloads, self).__init__(iwla) diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index ff05f0a..fd8ad87 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -7,7 +7,8 @@ from iplugin import IPlugin # Pre analysis hook # Change page into hit and hit into page into statistics # -# Plugin requirements : None +# Plugin requirements : +# None # # Conf values needed : # page_to_hit_conf* diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index e2db3aa..83a31a4 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -10,7 +10,8 @@ import awstats_data # # Filter robots # -# Plugin requirements : None +# Plugin requirements : +# None # # Conf values needed : # page_to_hit_conf* From 2d1e3638833d8f40831a0e35c9e22afe918b0a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 10 Dec 2014 16:53:50 +0100 Subject: [PATCH 065/195] WIP --- plugins/post_analysis/top_downloads.py | 2 +- plugins/post_analysis/top_hits.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 20cc05f..ab73ba0 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -12,7 +12,7 @@ from iplugin import IPlugin # None # # Conf values needed : -# reverse_dns_timeout* +# None # # Output files : # None diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py index b4f7ebf..2cf1216 100644 --- a/plugins/post_analysis/top_hits.py +++ b/plugins/post_analysis/top_hits.py @@ -1,6 +1,32 @@ from iwla import IWLA from iplugin import IPlugin +# +# Post analysis hook +# +# Count TOP hits +# +# Plugin requirements : +# None +# +# Conf values needed : +# reverse_dns_timeout* +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# month_stats: +# top_hits => +# uri +# +# Statistics deletion : +# None +# + class IWLAPostAnalysisTopHits(IPlugin): def __init__(self, iwla): super(IWLAPostAnalysisTopHits, self).__init__(iwla) From 6d62f2137389f22688214d6c31b0d78cbe6d5ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 10 Dec 2014 21:15:56 +0100 Subject: [PATCH 066/195] Finalize comments --- plugins/display/all_visits.py | 25 +++++++++++++++++++++++++ plugins/display/referers.py | 26 ++++++++++++++++++++++++++ plugins/display/top_downloads.py | 25 +++++++++++++++++++++++++ plugins/display/top_hits.py | 25 +++++++++++++++++++++++++ plugins/display/top_pages.py | 25 +++++++++++++++++++++++++ plugins/display/top_visitors.py | 23 +++++++++++++++++++++++ plugins/post_analysis/top_hits.py | 2 +- plugins/post_analysis/top_pages.py | 26 ++++++++++++++++++++++++++ 8 files changed, 176 insertions(+), 1 deletion(-) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index b327362..18bea36 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -4,6 +4,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * +# +# Display hook +# +# Create All visits page +# +# Plugin requirements : +# None +# +# Conf values needed : +# display_visitor_ip* +# +# Output files : +# OUTPUT_ROOT/year/month/all_visits.html +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# None +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# + class IWLADisplayAllVisits(IPlugin): def __init__(self, iwla): super(IWLADisplayAllVisits, self).__init__(iwla) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 4cdfc79..c2c2105 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -4,6 +4,32 @@ from iwla import IWLA from iplugin import IPlugin from display import * +# +# Display hook +# +# Create Referers page +# +# Plugin requirements : +# post_analysis/referers +# +# Conf values needed : +# None +# +# Output files : +# OUTPUT_ROOT/year/month/referers.html +# OUTPUT_ROOT/year/month/key_phrases.html +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# None +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# + class IWLADisplayReferers(IPlugin): def __init__(self, iwla): super(IWLADisplayReferers, self).__init__(iwla) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 0be4fb4..c2351bd 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -4,6 +4,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * +# +# Display hook +# +# Create TOP downloads page +# +# Plugin requirements : +# post_analysis/top_downloads +# +# Conf values needed : +# None +# +# Output files : +# OUTPUT_ROOT/year/month/top_downloads.html +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# None +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# + class IWLADisplayTopDownloads(IPlugin): def __init__(self, iwla): super(IWLADisplayTopDownloads, self).__init__(iwla) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 5cc24e0..f4c27c8 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -4,6 +4,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * +# +# Display hook +# +# Create TOP hits page +# +# Plugin requirements : +# post_analysis/top_hits +# +# Conf values needed : +# None +# +# Output files : +# OUTPUT_ROOT/year/month/top_hits.html +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# None +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# + class IWLADisplayTopHits(IPlugin): def __init__(self, iwla): super(IWLADisplayTopHits, self).__init__(iwla) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 524ad49..30ee110 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -4,6 +4,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * +# +# Display hook +# +# Create TOP pages page +# +# Plugin requirements : +# post_analysis/top_pages +# +# Conf values needed : +# None +# +# Output files : +# OUTPUT_ROOT/year/month/top_pages.html +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# None +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# + class IWLADisplayTopPages(IPlugin): def __init__(self, iwla): super(IWLADisplayTopPages, self).__init__(iwla) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 4e22af4..b501009 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -4,6 +4,29 @@ from iwla import IWLA from iplugin import IPlugin from display import * +# +# Display hook +# +# Create TOP visitors block +# +# Plugin requirements : +# None +# +# Conf values needed : +# display_visitor_ip* +# +# Output files : +# OUTPUT_ROOT/year/month/index.html +# +# Statistics creation : +# None +# +# Statistics update : +# None +# +# Statistics deletion : +# None +# class IWLADisplayTopVisitors(IPlugin): def __init__(self, iwla): super(IWLADisplayTopVisitors, self).__init__(iwla) diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py index 2cf1216..a6c15e1 100644 --- a/plugins/post_analysis/top_hits.py +++ b/plugins/post_analysis/top_hits.py @@ -10,7 +10,7 @@ from iplugin import IPlugin # None # # Conf values needed : -# reverse_dns_timeout* +# None # # Output files : # None diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index bb71f9d..9c85cd8 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -3,6 +3,32 @@ import re from iwla import IWLA from iplugin import IPlugin +# +# Post analysis hook +# +# Count TOP pages +# +# Plugin requirements : +# None +# +# Conf values needed : +# None +# +# Output files : +# None +# +# Statistics creation : +# None +# +# Statistics update : +# month_stats: +# top_pages => +# uri +# +# Statistics deletion : +# None +# + class IWLAPostAnalysisTopPages(IPlugin): def __init__(self, iwla): super(IWLAPostAnalysisTopPages, self).__init__(iwla) From 1a5f65bdc2e485afe5e67729a340a4d486f48fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 10 Dec 2014 21:41:22 +0100 Subject: [PATCH 067/195] Try to fix UTC problem --- default_conf.py | 3 +-- iwla.py | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/default_conf.py b/default_conf.py index 18cc103..0d1df53 100644 --- a/default_conf.py +++ b/default_conf.py @@ -23,8 +23,7 @@ log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local '"$http_referer" "$http_user_agent"' # Time format used in log format -# TOFIX UTC -time_format = '%d/%b/%Y:%H:%M:%S +0100' +time_format = '%d/%b/%Y:%H:%M:%S %z' # Hooks that are loaded at runtime (only set names without path and extensions) pre_analysis_hooks = [] diff --git a/iwla.py b/iwla.py index d24dacc..44ea4b4 100755 --- a/iwla.py +++ b/iwla.py @@ -310,7 +310,22 @@ class IWLA(object): return True def _decodeTime(self, hit): - hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format) + try: + hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format) + except ValueError, e: + if sys.version_info < (3, 2): + # Try without UTC value at the end (%z not recognized) + gmt_offset_str = hit['time_local'][-5:] + gmt_offset_hours = int(gmt_offset_str[1:3])*60*60 + gmt_offset_minutes = int(gmt_offset_str[3:5])*60 + gmt_offset = gmt_offset_hours + gmt_offset_minutes + hit['time_decoded'] = time.strptime(hit['time_local'][:-6], conf.time_format[:-3]) + if gmt_offset_str[0] == '+': + hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])+gmt_offset) + else: + hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])-gmt_offset) + else: + raise e return hit['time_decoded'] def getDisplayIndex(self): @@ -583,7 +598,7 @@ class IWLA(object): print '==> Load previous database' self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() - if 'last_time' in self.meta_infos.keys(): + if self.meta_infos['last_time']: self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() else: self._clearVisits() From 2df258676c69759a76680e6b523db43e62d58709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 10 Dec 2014 22:17:11 +0100 Subject: [PATCH 068/195] Fix a bug in filename output (not properly concatened) --- display.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/display.py b/display.py index 25cb0a2..99cf33e 100644 --- a/display.py +++ b/display.py @@ -259,7 +259,7 @@ class DisplayHTMLPage(object): self.blocks.append(block) def build(self, root): - filename = root + self.filename + filename = os.path.join(root, self.filename) base = os.path.dirname(filename) if not os.path.exists(base): From e012dc1b24fb49d83c06ffc8171115f2f990e72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 11 Dec 2014 21:13:24 +0100 Subject: [PATCH 069/195] Add max_x_displayed and create_x_page parameters for most display plugins --- display.py | 9 +++ plugins/display/referers.py | 110 ++++++++++++++++++------------- plugins/display/top_downloads.py | 37 ++++++----- plugins/display/top_hits.py | 37 ++++++----- plugins/display/top_pages.py | 39 ++++++----- plugins/display/top_visitors.py | 1 + 6 files changed, 140 insertions(+), 93 deletions(-) diff --git a/display.py b/display.py index 99cf33e..ed5546f 100644 --- a/display.py +++ b/display.py @@ -1,5 +1,6 @@ import os import codecs +import time # # Create output HTML files @@ -21,8 +22,14 @@ class DisplayHTMLRaw(object): if html: f.write(html) def build(self, f): + # t1 = time.time() self._buildHTML() + # t2 = time.time() + # print 'Time for _buildHTML : %d seconds' % (t2-t1) + # t1 = time.time() self._build(f, self.html) + # t2 = time.time() + # print 'Time for _build : %d seconds' % (t2-t1) class DisplayHTMLBlock(DisplayHTMLRaw): @@ -312,7 +319,9 @@ class DisplayHTMLBuild(object): os.symlink(target, link_name) for page in self.pages: + print 'Build %s' % (page.filename) page.build(root) + print 'Built' # # Global functions diff --git a/plugins/display/referers.py b/plugins/display/referers.py index c2c2105..6bdb043 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -13,7 +13,10 @@ from display import * # post_analysis/referers # # Conf values needed : -# None +# max_referers_displayed* +# create_all_referers_page* +# max_key_phrases_displayed* +# create_all_key_phrases_page* # # Output files : # OUTPUT_ROOT/year/month/referers.html @@ -35,6 +38,10 @@ class IWLADisplayReferers(IPlugin): super(IWLADisplayReferers, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisReferers'] + self.max_referers = self.iwla.getConfValue('max_referers_displayed', 0) + self.create_all_referers = self.iwla.getConfValue('create_all_referers_page', True) + self.max_key_phrases = self.iwla.getConfValue('max_key_phrases_displayed', 0) + self.create_all_key_phrases = self.iwla.getConfValue('create_all_key_phrases_page', True) def hook(self): display = self.iwla.getDisplay() @@ -60,48 +67,53 @@ class IWLADisplayReferers(IPlugin): index = self.iwla.getDisplayIndex() # All referers in a file - title = time.strftime('Connexion from - %B %Y', cur_time) + if self.create_all_referers: + title = time.strftime('Connexion from - %B %Y', cur_time) - filename = 'referers.html' - path = self.iwla.getCurDisplayPath(filename) + filename = 'referers.html' + path = self.iwla.getCurDisplayPath(filename) - page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'Connexion from', ['Origin', 'Pages', 'Hits']) - table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'Connexion from', ['Origin', 'Pages', 'Hits']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) - total_search = [0]*3 - table.appendRow(['Search Engine', '', '']) - for r,_ in top_search_engine_referers: - row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] - total_search[1] += search_engine_referers[r]['pages'] - total_search[2] += search_engine_referers[r]['hits'] - table.appendRow(row) + total_search = [0]*3 + table.appendRow(['Search Engine', '', '']) + new_list = self.max_referers and top_search_engine_referers[:self.max_referers] or top_search_engine_referers + for r,_ in new_list: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] += search_engine_referers[r]['pages'] + total_search[2] += search_engine_referers[r]['hits'] + table.appendRow(row) - total_external = [0]*3 - table.appendRow(['External URL', '', '']) - for r,_ in top_referers: - row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] - total_external[1] += referers[r]['pages'] - total_external[2] += referers[r]['hits'] - table.appendRow(row) + total_external = [0]*3 + table.appendRow(['External URL', '', '']) + new_list = self.max_referers and top_referers[:self.max_referers] or top_referers + for r,_ in new_list: + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] += referers[r]['pages'] + total_external[2] += referers[r]['hits'] + table.appendRow(row) - total_robot = [0]*3 - table.appendRow(['External URL (robot)', '', '']) - for r,_ in top_robots_referers: - row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] - total_robot[1] += robots_referers[r]['pages'] - total_robot[2] += robots_referers[r]['hits'] - table.appendRow(row) + total_robot = [0]*3 + table.appendRow(['External URL (robot)', '', '']) + new_list = self.max_referers and top_robots_referers[:self.max_referers] or top_robots_referers + for r,_ in new_list: + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] += robots_referers[r]['pages'] + total_robot[2] += robots_referers[r]['hits'] + table.appendRow(row) - page.appendBlock(table) + page.appendBlock(table) - display.addPage(page) + display.addPage(page) - link = 'All referers' % (filename) + title = 'Top Referers' + if self.create_all_referers: + link = 'All Referers' % (filename) + title = '%s - %s' % (title, link) # Top referers in index - title = '%s - %s' % ('Connexion from', link) - table = display.createBlock(DisplayHTMLBlockTable, title, ['Origin', 'Pages', 'Hits']) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) @@ -141,26 +153,30 @@ class IWLADisplayReferers(IPlugin): index.appendBlock(table) # All key phrases in a file - title = time.strftime('Key Phrases - %B %Y', cur_time) + if self.create_all_key_phrases: + title = time.strftime('Key Phrases - %B %Y', cur_time) - filename = 'key_phrases.html' - path = self.iwla.getCurDisplayPath(filename) + filename = 'key_phrases.html' + path = self.iwla.getCurDisplayPath(filename) - total_search = [0]*2 - page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'Top key phrases', ['Key phrase', 'Search']) - table.setColsCSSClass(['', 'iwla_search']) - for phrase in top_key_phrases: - table.appendRow([phrase[0], phrase[1]]) - total_search[1] += phrase[1] - page.appendBlock(table) + total_search = [0]*2 + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'Top key phrases', ['Key phrase', 'Search']) + table.setColsCSSClass(['', 'iwla_search']) + new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases + for phrase in new_list: + table.appendRow([phrase[0], phrase[1]]) + total_search[1] += phrase[1] + page.appendBlock(table) - display.addPage(page) + display.addPage(page) - link = 'All key phrases' % (filename) + title = 'Top key phrases' + if self.create_all_key_phrases: + link = 'All key phrases' % (filename) + title = '%s - %s' % (title, link) # Top key phrases in index - title = '%s - %s' % ('Top key phrases', link) table = display.createBlock(DisplayHTMLBlockTable, title, ['Key phrase', 'Search']) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases[:10]: diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index c2351bd..97d7f4a 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -13,7 +13,8 @@ from display import * # post_analysis/top_downloads # # Conf values needed : -# None +# max_downloads_displayed* +# create_all_downloads_page* # # Output files : # OUTPUT_ROOT/year/month/top_downloads.html @@ -34,6 +35,8 @@ class IWLADisplayTopDownloads(IPlugin): super(IWLADisplayTopDownloads, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisTopDownloads'] + self.max_downloads = self.iwla.getConfValue('max_downloads_displayed', 0) + self.create_all_downloads = self.iwla.getConfValue('create_all_downloads_page', True) def hook(self): display = self.iwla.getDisplay() @@ -41,24 +44,28 @@ class IWLADisplayTopDownloads(IPlugin): top_downloads = sorted(top_downloads.items(), key=lambda t: t[1], reverse=True) # All in a file - filename = 'top_downloads.html' - path = self.iwla.getCurDisplayPath(filename) - title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) + if self.create_all_downloads: + filename = 'top_downloads.html' + path = self.iwla.getCurDisplayPath(filename) + title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) - page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'All Downloads', ['URI', 'Hit']) - table.setColsCSSClass(['', 'iwla_hit']) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'All Downloads', ['URI', 'Hit']) + table.setColsCSSClass(['', 'iwla_hit']) - total_entrance = [0]*2 - for (uri, entrance) in top_downloads: - table.appendRow([generateHTMLLink(uri), entrance]) - total_entrance[1] += entrance - page.appendBlock(table) + total_entrance = [0]*2 + new_list = self.max_downloads and top_downloads[:self.max_downloads] or top_downloads + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] += entrance + page.appendBlock(table) - display.addPage(page) + display.addPage(page) - link = 'All Downloads' % (filename) - title = '%s - %s' % ('Top Downloads', link) + title = 'Top Downloads' + if self.create_all_downloads: + link = 'All Downloads' % (filename) + title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index f4c27c8..bf9496d 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -13,7 +13,8 @@ from display import * # post_analysis/top_hits # # Conf values needed : -# None +# max_hits_displayed* +# create_all_hits_page* # # Output files : # OUTPUT_ROOT/year/month/top_hits.html @@ -34,6 +35,8 @@ class IWLADisplayTopHits(IPlugin): super(IWLADisplayTopHits, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisTopHits'] + self.max_hits = self.iwla.getConfValue('max_hits_displayed', 0) + self.create_all_hits = self.iwla.getConfValue('create_all_hits_page', True) def hook(self): display = self.iwla.getDisplay() @@ -41,23 +44,27 @@ class IWLADisplayTopHits(IPlugin): top_hits = sorted(top_hits.items(), key=lambda t: t[1], reverse=True) # All in a file - title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) - filename = 'top_hits.html' - path = self.iwla.getCurDisplayPath(filename) + if self.create_all_hits: + title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) + filename = 'top_hits.html' + path = self.iwla.getCurDisplayPath(filename) - page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'All Hits', ['URI', 'Entrance']) - table.setColsCSSClass(['', 'iwla_hit']) - total_hits = [0]*2 - for (uri, entrance) in top_hits: - table.appendRow([generateHTMLLink(uri), entrance]) - total_hits[1] += entrance - page.appendBlock(table) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'All Hits', ['URI', 'Entrance']) + table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 + new_list = self.max_hits and top_hits[:self.max_hits] or top_hits + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance + page.appendBlock(table) - display.addPage(page) + display.addPage(page) - link = 'All hits' % (filename) - title = '%s - %s' % ('Top Hits', link) + title = 'Top Hits' + if self.create_all_hits: + link = 'All Hits' % (filename) + title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 30ee110..b41ef43 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -13,7 +13,8 @@ from display import * # post_analysis/top_pages # # Conf values needed : -# None +# max_pages_displayed* +# create_all_pages_page* # # Output files : # OUTPUT_ROOT/year/month/top_pages.html @@ -34,6 +35,8 @@ class IWLADisplayTopPages(IPlugin): super(IWLADisplayTopPages, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLAPostAnalysisTopPages'] + self.max_pages = self.iwla.getConfValue('max_pages_displayed', 0) + self.create_all_pages = self.iwla.getConfValue('create_all_pages_page', True) def hook(self): display = self.iwla.getDisplay() @@ -41,23 +44,27 @@ class IWLADisplayTopPages(IPlugin): top_pages = sorted(top_pages.items(), key=lambda t: t[1], reverse=True) # All in a page - title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) - filename = 'top_pages.html' - path = self.iwla.getCurDisplayPath(filename) + if self.create_all_pages: + title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) + filename = 'top_pages.html' + path = self.iwla.getCurDisplayPath(filename) - page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'All Pages', ['URI', 'Entrance']) - table.setColsCSSClass(['', 'iwla_hit']) - total_hits = [0]*2 - for (uri, entrance) in top_pages: - table.appendRow([generateHTMLLink(uri), entrance]) - total_hits[1] += entrance - page.appendBlock(table) - - display.addPage(page) + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, 'All Pages', ['URI', 'Entrance']) + table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 + new_list = self.max_pages and top_pages[:self.max_pages] or top_pages + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance + page.appendBlock(table) - link = 'All pages' % (filename) - title = '%s - %s' % ('Top Pages', link) + display.addPage(page) + + title = 'Top Pages' + if self.create_all_pages: + link = 'All Pages' % (filename) + title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index b501009..4562980 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -27,6 +27,7 @@ from display import * # Statistics deletion : # None # + class IWLADisplayTopVisitors(IPlugin): def __init__(self, iwla): super(IWLADisplayTopVisitors, self).__init__(iwla) From 9ab1687c7613d4d4423140a8e362f6d19abd08f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 11 Dec 2014 22:31:40 +0100 Subject: [PATCH 070/195] Fix two bugs : don't break on logs < last_access and -1 missed for cur day CSS --- conf.py | 6 +++++- display.py | 4 ++-- iwla.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/conf.py b/conf.py index d3c7dfc..87043ac 100644 --- a/conf.py +++ b/conf.py @@ -10,7 +10,7 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits', 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] # Reverse DNS timeout @@ -20,3 +20,7 @@ reverse_dns_timeout = 0.2 page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] + +# Because it's too long to build HTML when there is too much entries +max_hits_displayed = 100 +max_downloads_displayed = 100 diff --git a/display.py b/display.py index ed5546f..6343849 100644 --- a/display.py +++ b/display.py @@ -319,9 +319,9 @@ class DisplayHTMLBuild(object): os.symlink(target, link_name) for page in self.pages: - print 'Build %s' % (page.filename) + # print 'Build %s' % (page.filename) page.build(root) - print 'Built' + # print 'Built' # # Global functions diff --git a/iwla.py b/iwla.py index 44ea4b4..c41f06b 100755 --- a/iwla.py +++ b/iwla.py @@ -366,7 +366,7 @@ class IWLA(object): if week_day == 5 or week_day == 6: days.setRowCSSClass(i-1, 'iwla_weekend') if adate == date.today(): - css = days.getCellCSSClass(i, 0) + css = days.getCellCSSClass(i-1, 0) if css: css = '%s %s' % (css, 'iwla_curday') else: css = 'iwla_curday' days.setCellCSSClass(i-1, 0, css) @@ -616,7 +616,7 @@ class IWLA(object): if groups: if not self._newHit(groups.groupdict()): - break + continue else: print "No match for " + l #break From f8503e895e77f047a32b9827829f7d3dc7e00fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 11 Dec 2014 22:35:59 +0100 Subject: [PATCH 071/195] Add TODO --- TODO | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 TODO diff --git a/TODO b/TODO new file mode 100644 index 0000000..70f107d --- /dev/null +++ b/TODO @@ -0,0 +1,12 @@ +reverse analysis +-f option to read a file instead of the one in conf +Other when pages truncated +translations +doc auto generation +doc enhancement +Limit hits/pages/downloads by rate +Automatic tests +Test separate directory for DB and display +quiet mode +Add 0 before month when < 10 +Add Licence \ No newline at end of file From 15d2877e5a9f592cefd1cb1be9b13a8a4258141f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 12 Dec 2014 08:18:54 +0100 Subject: [PATCH 072/195] update TODO --- TODO | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 70f107d..f12a9cc 100644 --- a/TODO +++ b/TODO @@ -9,4 +9,6 @@ Automatic tests Test separate directory for DB and display quiet mode Add 0 before month when < 10 -Add Licence \ No newline at end of file +Add Licence +Free memory as soon as possible +Bug in bandwidth account (x10) \ No newline at end of file From 2c3d8d22f8b37465f2a5565be93577647ec3df25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 12 Dec 2014 13:18:12 +0100 Subject: [PATCH 073/195] Always checks time before append hit --- iwla.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/iwla.py b/iwla.py index c41f06b..0f49362 100755 --- a/iwla.py +++ b/iwla.py @@ -194,7 +194,7 @@ class IWLA(object): return self.display def getDBFilename(self, time): - return os.path.join(conf.DB_ROOT, str(time.tm_year), str(time.tm_mon), conf.DB_FILENAME) + return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % time.tm_mon, conf.DB_FILENAME) def _serialize(self, obj, filename): base = os.path.dirname(filename) @@ -514,7 +514,6 @@ class IWLA(object): os.remove(path) print "==> Serialize to %s" % path - self._serialize(self.current_analysis, path) # Save month stats @@ -568,11 +567,10 @@ class IWLA(object): self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() self.analyse_started = True else: + if time.mktime(t) < time.mktime(cur_time): + return False if not self.analyse_started: - if time.mktime(t) < time.mktime(cur_time): - return False - else: - self.analyse_started = True + self.analyse_started = True if cur_time.tm_mon != t.tm_mon: self._generateMonthStats() self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() From f116eacbcc623232270e60874da4dccc1a13975a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 12 Dec 2014 13:24:47 +0100 Subject: [PATCH 074/195] Set two digits for month numbers --- conf.py | 2 +- iwla.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.py b/conf.py index 87043ac..181f7b3 100644 --- a/conf.py +++ b/conf.py @@ -10,7 +10,7 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits', 'reverse_dns'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits'] #, 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] # Reverse DNS timeout diff --git a/iwla.py b/iwla.py index 0f49362..c73ed86 100755 --- a/iwla.py +++ b/iwla.py @@ -174,7 +174,7 @@ class IWLA(object): def getCurDisplayPath(self, filename): cur_time = self.meta_infos['last_time'] - return os.path.join(str(cur_time.tm_year), str(cur_time.tm_mon), filename) + return os.path.join(str(cur_time.tm_year), '%02d' % (cur_time.tm_mon), filename) def getResourcesPath(self): return conf.resources_path @@ -194,7 +194,7 @@ class IWLA(object): return self.display def getDBFilename(self, time): - return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % time.tm_mon, conf.DB_FILENAME) + return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % (time.tm_mon), conf.DB_FILENAME) def _serialize(self, obj, filename): base = os.path.dirname(filename) @@ -336,7 +336,7 @@ class IWLA(object): def _generateDisplayDaysStats(self): cur_time = self.meta_infos['last_time'] - title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) + title = 'Stats %d/%02d' % (cur_time.tm_year, cur_time.tm_mon) filename = self.getCurDisplayPath('index.html') print '==> Generate display (%s)' % (filename) page = self.display.createPage(title, filename, conf.css_path) @@ -405,7 +405,7 @@ class IWLA(object): full_month = '%s %d' % (months_name[i], year) if i in month_stats.keys(): stats = month_stats[i] - link = 'Details' % (year, i) + link = 'Details' % (year, i) row = [full_month, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] for j in graph_cols: @@ -488,7 +488,7 @@ class IWLA(object): duplicated_stats = {k:v for (k,v) in stats.items()} cur_time = self.meta_infos['last_time'] - print "== Stats for %d/%d ==" % (cur_time.tm_year, cur_time.tm_mon) + print "== Stats for %d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon) print stats if not 'month_stats' in self.current_analysis.keys(): @@ -535,7 +535,7 @@ class IWLA(object): stats = self._generateStats(visits) cur_time = self.meta_infos['last_time'] - print "== Stats for %d/%d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) + print "== Stats for %d/%02d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) if cur_time.tm_mday > 1: last_day = cur_time.tm_mday - 1 From bb7ce4af907b0f2064c1c7a225f230d5f64f3035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 12 Dec 2014 14:01:23 +0100 Subject: [PATCH 075/195] Start refactoring statistics computation --- iwla.py | 56 +++++++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/iwla.py b/iwla.py index c73ed86..08c9dcb 100755 --- a/iwla.py +++ b/iwla.py @@ -449,34 +449,14 @@ class IWLA(object): self._generateDisplayWholeMonthStats() self.display.build(conf.DISPLAY_ROOT) - def _generateStats(self, visits): + def _createEmptyStats(self): stats = {} stats['viewed_bandwidth'] = 0 stats['not_viewed_bandwidth'] = 0 stats['viewed_pages'] = 0 stats['viewed_hits'] = 0 - #stats['requests'] = set() stats['nb_visitors'] = 0 - for (k, super_hit) in visits.items(): - if super_hit['robot']: - stats['not_viewed_bandwidth'] += super_hit['bandwidth'] - continue - - #print "[%s] =>\t%d/%d" % (k, super_hit['viewed_pages'], super_hit['viewed_hits']) - - if conf.count_hit_only_visitors or\ - super_hit['viewed_pages']: - stats['nb_visitors'] += 1 - stats['viewed_bandwidth'] += super_hit['bandwidth'] - stats['viewed_pages'] += super_hit['viewed_pages'] - stats['viewed_hits'] += super_hit['viewed_hits'] - - # for p in super_hit['requests']: - # if not p['is_page']: continue - # req = p['extract_request'] - # stats['requests'].add(req['extract_uri']) - return stats def _generateMonthStats(self): @@ -484,7 +464,11 @@ class IWLA(object): visits = self.current_analysis['visits'] - stats = self._generateStats(visits) + stats = self._createEmptyStats() + for (day, stat) in self.current_analysis['days_stats'].items(): + for k in stats.keys(): + stats[k] += stat[k] + duplicated_stats = {k:v for (k,v) in stats.items()} cur_time = self.meta_infos['last_time'] @@ -529,12 +513,24 @@ class IWLA(object): def _generateDayStats(self): visits = self.current_analysis['visits'] + cur_time = self.meta_infos['last_time'] self._callPlugins(conf.PRE_HOOK_DIRECTORY) - stats = self._generateStats(visits) + stats = self._createEmptyStats() + + for (k, super_hit) in visits.items(): + if super_hit['robot']: + stats['not_viewed_bandwidth'] += super_hit['bandwidth'] + continue + if (conf.count_hit_only_visitors or\ + super_hit['viewed_pages']) and\ + super_hit['last_access'].tm_mday == cur_time.tm_mday: + stats['nb_visitors'] += 1 + stats['viewed_bandwidth'] += super_hit['bandwidth'] + stats['viewed_pages'] += super_hit['viewed_pages'] + stats['viewed_hits'] += super_hit['viewed_hits'] - cur_time = self.meta_infos['last_time'] print "== Stats for %d/%02d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) if cur_time.tm_mday > 1: @@ -545,15 +541,9 @@ class IWLA(object): last_day -= 1 if last_day: for k in stats.keys(): - stats[k] -= self.current_analysis['days_stats'][last_day][k] - stats['nb_visitors'] = 0 - for (k,v) in visits.items(): - if v['robot']: continue - if conf.count_hit_only_visitors and\ - (not v['viewed_pages']): - continue - if v['last_access'].tm_mday == cur_time.tm_mday: - stats['nb_visitors'] += 1 + if k != 'nb_visitors': + print '%s : %d %d' % (k, stats[k], self.current_analysis['days_stats'][last_day][k]) + stats[k] -= self.current_analysis['days_stats'][last_day][k] print stats self.current_analysis['days_stats'][cur_time.tm_mday] = stats From 9da4eb385820683e6a54a9e6e5b8031157d4dd94 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 14:50:30 +0100 Subject: [PATCH 076/195] Seems ok for account --- iwla.py | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/iwla.py b/iwla.py index 08c9dcb..d3361cc 100755 --- a/iwla.py +++ b/iwla.py @@ -255,12 +255,8 @@ class IWLA(object): hit['is_page'] = self.isPage(uri) - status = int(hit['status']) - if status not in conf.viewed_http_codes: - return - if super_hit['robot'] or\ - not status in conf.viewed_http_codes: + not int(hit['status']) in conf.viewed_http_codes: page_key = 'not_viewed_pages' hit_key = 'not_viewed_hits' else: @@ -520,30 +516,28 @@ class IWLA(object): stats = self._createEmptyStats() for (k, super_hit) in visits.items(): - if super_hit['robot']: - stats['not_viewed_bandwidth'] += super_hit['bandwidth'] + if super_hit['last_access'].tm_mday != cur_time.tm_mday: continue + viewed_page = False + for hit in super_hit['requests'][::-1]: + if hit['time_decoded'].tm_mday != cur_time.tm_mday: + break + if super_hit['robot'] or\ + not int(hit['status']) in conf.viewed_http_codes: + stats['not_viewed_bandwidth'] += int(hit['body_bytes_sent']) + continue + stats['viewed_bandwidth'] += int(hit['body_bytes_sent']) + if hit['is_page']: + stats['viewed_pages'] += 1 + viewed_pages = True + else: + stats['viewed_hits'] += 1 if (conf.count_hit_only_visitors or\ - super_hit['viewed_pages']) and\ - super_hit['last_access'].tm_mday == cur_time.tm_mday: + viewed_pages): stats['nb_visitors'] += 1 - stats['viewed_bandwidth'] += super_hit['bandwidth'] - stats['viewed_pages'] += super_hit['viewed_pages'] - stats['viewed_hits'] += super_hit['viewed_hits'] print "== Stats for %d/%02d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) - if cur_time.tm_mday > 1: - last_day = cur_time.tm_mday - 1 - while last_day: - if last_day in self.current_analysis['days_stats'].keys(): - break - last_day -= 1 - if last_day: - for k in stats.keys(): - if k != 'nb_visitors': - print '%s : %d %d' % (k, stats[k], self.current_analysis['days_stats'][last_day][k]) - stats[k] -= self.current_analysis['days_stats'][last_day][k] print stats self.current_analysis['days_stats'][cur_time.tm_mday] = stats From 3a246d5cd6aa07418313b5b47879acb07e199a52 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:10:13 +0100 Subject: [PATCH 077/195] Optimize analysis using reverse loop --- iwla.py | 4 ++-- plugins/post_analysis/referers.py | 7 +++---- plugins/post_analysis/top_downloads.py | 12 +++++------- plugins/post_analysis/top_hits.py | 13 ++++++------- plugins/post_analysis/top_pages.py | 10 +++++----- plugins/pre_analysis/page_to_hit.py | 8 +++++--- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/iwla.py b/iwla.py index d3361cc..93de2cd 100755 --- a/iwla.py +++ b/iwla.py @@ -256,7 +256,7 @@ class IWLA(object): hit['is_page'] = self.isPage(uri) if super_hit['robot'] or\ - not int(hit['status']) in conf.viewed_http_codes: + not self.hasBeenViewed(hit): page_key = 'not_viewed_pages' hit_key = 'not_viewed_hits' else: @@ -523,7 +523,7 @@ class IWLA(object): if hit['time_decoded'].tm_mday != cur_time.tm_mday: break if super_hit['robot'] or\ - not int(hit['status']) in conf.viewed_http_codes: + not self.hasBeenViewed(hit): stats['not_viewed_bandwidth'] += int(hit['body_bytes_sent']) continue stats['viewed_bandwidth'] += int(hit['body_bytes_sent']) diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index 100ab6b..f4ef9e9 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -109,15 +109,14 @@ class IWLAPostAnalysisReferers(IPlugin): key_phrases = month_stats.get('key_phrases', {}) for (k, super_hit) in stats.items(): - for r in super_hit['requests']: - if not self.iwla.isValidForCurrentAnalysis(r): continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): break if not r['http_referer']: continue uri = r['extract_referer']['extract_uri'] - is_search_engine = False - if self.own_domain_re.match(uri): continue + is_search_engine = False for (name, engine) in self.search_engines.items(): for (hashid, hashid_re) in engine['hashid']: if not hashid_re.match(uri): continue diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index ab73ba0..9aa9c6a 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -46,14 +46,12 @@ class IWLAPostAnalysisTopDownloads(IPlugin): for (k, super_hit) in stats.items(): if super_hit['robot']: continue - for r in super_hit['requests']: - if not self.iwla.isValidForCurrentAnalysis(r) or\ - not self.iwla.hasBeenViewed(r): + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + r['is_page']: continue - if r['is_page']: continue - - - if not int(r['status']) in viewed_http_codes: continue uri = r['extract_request']['extract_uri'].lower() diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py index a6c15e1..05f272a 100644 --- a/plugins/post_analysis/top_hits.py +++ b/plugins/post_analysis/top_hits.py @@ -40,15 +40,14 @@ class IWLAPostAnalysisTopHits(IPlugin): for (k, super_hit) in stats.items(): if super_hit['robot']: continue - for r in super_hit['requests']: - if r['is_page']: continue - - if not self.iwla.isValidForCurrentAnalysis(r) or\ - not self.iwla.hasBeenViewed(r): + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + r['is_page']: continue - uri = r['extract_request']['extract_uri'] - + uri = r['extract_request']['extract_uri'].lower() uri = "%s%s" % (r.get('server_name', ''), uri) if not uri in top_hits.keys(): diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index 9c85cd8..8d938dd 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -46,11 +46,11 @@ class IWLAPostAnalysisTopPages(IPlugin): for (k, super_hit) in stats.items(): if super_hit['robot']: continue - for r in super_hit['requests']: - if not r['is_page']: continue - - if not self.iwla.isValidForCurrentAnalysis(r) or\ - not self.iwla.hasBeenViewed(r): + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + not r['is_page']: continue uri = r['extract_request']['extract_uri'] diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index fd8ad87..c202efb 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -54,9 +54,11 @@ class IWLAPreAnalysisPageToHit(IPlugin): for (k, super_hit) in hits.items(): if super_hit['robot']: continue - for request in super_hit['requests']: - if not self.iwla.isValidForCurrentAnalysis(request) or\ - not self.iwla.hasBeenViewed(request): + for request in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(request): + break + + if not self.iwla.hasBeenViewed(request): continue uri = request['extract_request']['extract_uri'] From 094b05900eee100b03b144e74452f1235735a709 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:11:50 +0100 Subject: [PATCH 078/195] Final version of conf --- conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.py b/conf.py index 87043ac..0b4342c 100644 --- a/conf.py +++ b/conf.py @@ -1,6 +1,6 @@ # Web server log -analyzed_filename = 'access.log' +analyzed_filename = '/var/log/apache2/soutade.fr_access.log' # Domain name to analyze domain_name = 'soutade.fr' @@ -10,8 +10,8 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'reverse_dns'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads'] # Reverse DNS timeout reverse_dns_timeout = 0.2 From 3c5f117870f1ec1737d9c2edb90daf1573b4fc44 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:28:12 +0100 Subject: [PATCH 079/195] Create display root before symlink css --- display.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/display.py b/display.py index 6343849..b0cca4c 100644 --- a/display.py +++ b/display.py @@ -312,6 +312,8 @@ class DisplayHTMLBuild(object): def build(self, root): display_root = self.iwla.getConfValue('DISPLAY_ROOT', '') + if not os.path.exists(display_root): + os.makedirs(display_root) for res_path in self.iwla.getResourcesPath(): target = os.path.abspath(res_path) link_name = os.path.join(display_root, res_path) From c221c813bf26b8d7702a248c848b2b4d43591792 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:41:47 +0100 Subject: [PATCH 080/195] Don't account hits <= last_access (< before) --- iwla.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iwla.py b/iwla.py index 93de2cd..81571be 100755 --- a/iwla.py +++ b/iwla.py @@ -551,10 +551,9 @@ class IWLA(object): self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() self.analyse_started = True else: - if time.mktime(t) < time.mktime(cur_time): + if time.mktime(t) <= time.mktime(cur_time): return False - if not self.analyse_started: - self.analyse_started = True + self.analyse_started = True if cur_time.tm_mon != t.tm_mon: self._generateMonthStats() self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() @@ -581,6 +580,8 @@ class IWLA(object): self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() if self.meta_infos['last_time']: + print 'Last time' + print self.meta_infos['last_time'] self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() else: self._clearVisits() @@ -609,8 +610,7 @@ class IWLA(object): del self.meta_infos['start_analysis_time'] self._serialize(self.meta_infos, conf.META_PATH) else: - print '==> Analyse not started : nothing to do' - self._generateMonthStats() + print '==> Analyse not started : nothing new' if __name__ == '__main__': parser = argparse.ArgumentParser(description='Intelligent Web Log Analyzer') From 2ab98c4090d5523aedcf762c4a54f63067ca1f28 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:46:01 +0100 Subject: [PATCH 081/195] Add -f paramter --- iwla.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/iwla.py b/iwla.py index 81571be..42f5f2c 100755 --- a/iwla.py +++ b/iwla.py @@ -623,6 +623,9 @@ if __name__ == '__main__': default=False, help='Read data from stdin instead of conf.analyzed_filename') + parser.add_argument('-f', '--file', dest='file', + help='Analyse this log file') + args = parser.parse_args() if args.clean_output: @@ -638,8 +641,9 @@ if __name__ == '__main__': if args.stdin: iwla.start(sys.stdin) else: - if not os.path.exists(conf.analyzed_filename): - print 'No such file \'%s\'' % (conf.analyzed_filename) + filename = args.file or conf.analyzed_filename + if not os.path.exists(filename): + print 'No such file \'%s\'' % (filename) sys.exit(-1) - with open(conf.analyzed_filename) as f: + with open(filename) as f: iwla.start(f) From d4e3c0ecdd0cea7b43c45df32cd1bff24d5b9ba7 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:46:44 +0100 Subject: [PATCH 082/195] Update TODO --- TODO | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/TODO b/TODO index f12a9cc..9e7b605 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,9 @@ -reverse analysis --f option to read a file instead of the one in conf Other when pages truncated translations doc auto generation doc enhancement Limit hits/pages/downloads by rate Automatic tests -Test separate directory for DB and display quiet mode -Add 0 before month when < 10 Add Licence -Free memory as soon as possible -Bug in bandwidth account (x10) \ No newline at end of file +Free memory as soon as possible \ No newline at end of file From 59e234b9bf5cc1785ea0966d6c95a7abb7006a7f Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 14 Dec 2014 15:48:57 +0100 Subject: [PATCH 083/195] Update TODO --- TODO | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 9e7b605..7f71f61 100644 --- a/TODO +++ b/TODO @@ -6,4 +6,5 @@ Limit hits/pages/downloads by rate Automatic tests quiet mode Add Licence -Free memory as soon as possible \ No newline at end of file +Free memory as soon as possible +gzip output files \ No newline at end of file From caeab70ca627c5b2a9da06c238be1c10d94cd05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 15 Dec 2014 08:21:46 +0100 Subject: [PATCH 084/195] Forgot to remove robots from visitors in days statistics --- iwla.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iwla.py b/iwla.py index 42f5f2c..5a20786 100755 --- a/iwla.py +++ b/iwla.py @@ -533,7 +533,8 @@ class IWLA(object): else: stats['viewed_hits'] += 1 if (conf.count_hit_only_visitors or\ - viewed_pages): + viewed_pages) and\ + not super_hit['robot']: stats['nb_visitors'] += 1 print "== Stats for %d/%02d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) From e327a1ff3579bcb2c378d7ef58b4f495fcdc2fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 15 Dec 2014 20:43:43 +0100 Subject: [PATCH 085/195] Add visitors in addition to visits --- iwla.py | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/iwla.py b/iwla.py index 5a20786..bfdf62a 100755 --- a/iwla.py +++ b/iwla.py @@ -50,6 +50,7 @@ from display import * # not_viewed_bandwidth # viewed_pages # viewed_hits +# nb_visits # nb_visitors # # month_stats : @@ -57,7 +58,7 @@ from display import * # not_viewed_bandwidth # viewed_pages # viewed_hits -# nb_visitors +# nb_visits # # days_stats : # day => @@ -65,6 +66,7 @@ from display import * # not_viewed_bandwidth # viewed_pages # viewed_hits +# nb_visits # nb_visitors # # visits : @@ -338,18 +340,18 @@ class IWLA(object): page = self.display.createPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) - days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, 'By day', ['Day', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], None, nb_month_days, range(1,6)) - days.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) + days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, 'By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], None, nb_month_days, range(1,6)) + days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 for i in range(1, nb_month_days+1): day = '%d
%s' % (i, time.strftime('%b', cur_time)) - full_day = '%d %s %d' % (i, time.strftime('%b', cur_time), cur_time.tm_year) + full_day = '%02d %s %d' % (i, time.strftime('%b', cur_time), cur_time.tm_year) if i in self.current_analysis['days_stats'].keys(): stats = self.current_analysis['days_stats'][i] - row = [full_day, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + row = [full_day, stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] - nb_visits += stats['nb_visitors'] + nb_visits += stats['nb_visits'] nb_days += 1 else: row = [full_day, 0, 0, 0, 0, 0] @@ -391,10 +393,10 @@ class IWLA(object): cur_time = time.localtime() months_name = ['', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] title = 'Summary %d' % (year) - cols = ['Month', 'Visitors', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth', 'Details'] - graph_cols=range(1,6) + cols = ['Month', 'Visitors', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth', 'Details'] + graph_cols=range(1,7) months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) - months.setColsCSSClass(['', 'iwla_visitor', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) + months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) total = [0] * len(cols) for i in range(1, 13): month = '%s
%d' % (months_name[i], year) @@ -402,15 +404,15 @@ class IWLA(object): if i in month_stats.keys(): stats = month_stats[i] link = 'Details' % (year, i) - row = [full_month, stats['nb_visitors'], stats['viewed_pages'], stats['viewed_hits'], + row = [full_month, stats['nb_visitors'], stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] for j in graph_cols: total[j] += row[j] else: - row = [full_month, 0, 0, 0, 0, 0, ''] + row = [full_month, 0, 0, 0, 0, 0, 0, ''] months.appendRow(row) - months.setCellValue(i-1, 4, bytesToStr(row[4])) months.setCellValue(i-1, 5, bytesToStr(row[5])) + months.setCellValue(i-1, 6, bytesToStr(row[6])) months.appendShortTitle(month) if year == cur_time.tm_year and i == cur_time.tm_mon: css = months.getCellCSSClass(i-1, 0) @@ -419,8 +421,8 @@ class IWLA(object): months.setCellCSSClass(i-1, 0, css) total[0] = 'Total' - total[4] = bytesToStr(total[4]) total[5] = bytesToStr(total[5]) + total[6] = bytesToStr(total[6]) months.appendRow(total) page.appendBlock(months) @@ -431,7 +433,7 @@ class IWLA(object): page = self.display.createPage(title, filename, conf.css_path) - last_update = 'Last update %s
' % (time.strftime('%d %b %Y %H:%M', time.localtime())) + last_update = 'Last update %s
' % (time.strftime('%02d %b %Y %H:%M', time.localtime())) page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) for year in self.meta_infos['stats'].keys(): @@ -451,7 +453,7 @@ class IWLA(object): stats['not_viewed_bandwidth'] = 0 stats['viewed_pages'] = 0 stats['viewed_hits'] = 0 - stats['nb_visitors'] = 0 + stats['nb_visits'] = 0 return stats @@ -464,7 +466,7 @@ class IWLA(object): for (day, stat) in self.current_analysis['days_stats'].items(): for k in stats.keys(): stats[k] += stat[k] - + duplicated_stats = {k:v for (k,v) in stats.items()} cur_time = self.meta_infos['last_time'] @@ -485,7 +487,7 @@ class IWLA(object): continue self.valid_visitors[k] = v - duplicated_stats['visitors'] = stats['visitors'] = len(self.valid_visitors.keys()) + duplicated_stats['nb_visitors'] = stats['nb_visitors'] = len(self.valid_visitors.keys()) self._callPlugins(conf.POST_HOOK_DIRECTORY) @@ -535,9 +537,9 @@ class IWLA(object): if (conf.count_hit_only_visitors or\ viewed_pages) and\ not super_hit['robot']: - stats['nb_visitors'] += 1 + stats['nb_visits'] += 1 - print "== Stats for %d/%02d/%d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) + print "== Stats for %d/%02d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) print stats From 4f4e4648438819f3316d7ab4cae9a6589c22f752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 15 Dec 2014 21:28:25 +0100 Subject: [PATCH 086/195] Add file compression --- TODO | 4 ++-- conf.py | 2 ++ default_conf.py | 3 +++ iwla.py | 25 ++++++++++++++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index 7f71f61..e18bc14 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,7 @@ doc auto generation doc enhancement Limit hits/pages/downloads by rate Automatic tests -quiet mode Add Licence Free memory as soon as possible -gzip output files \ No newline at end of file +gzip output files +different debug output levels \ No newline at end of file diff --git a/conf.py b/conf.py index 181f7b3..22d8e17 100644 --- a/conf.py +++ b/conf.py @@ -24,3 +24,5 @@ hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^ # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 max_downloads_displayed = 100 + +compress_output_files = ['html', 'css', 'js'] diff --git a/default_conf.py b/default_conf.py index 0d1df53..7ccd2ff 100644 --- a/default_conf.py +++ b/default_conf.py @@ -48,3 +48,6 @@ resources_path = ['resources'] icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') # CSS path (you can add yours) css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] + +# Extensions to compress in gzip during display build +compress_output_files = [] diff --git a/iwla.py b/iwla.py index bfdf62a..c5e55a6 100755 --- a/iwla.py +++ b/iwla.py @@ -31,6 +31,7 @@ from display import * # Conf values needed : # analyzed_filename # domain_name +# compress_output_files* # # Output files : # DB_ROOT/meta.db @@ -40,7 +41,7 @@ from display import * # # Statistics creation : # -# meta => +# meta : # last_time # start_analysis_time # stats => @@ -441,11 +442,33 @@ class IWLA(object): self.display.addPage(page) + def _compressFile(self, build_time, root, filename): + path = os.path.join(root, filename) + gz_path = path + '.gz' + #print 'Compress %s => %s' % (path, gz_path) + if not os.path.exists(gz_path) or\ + os.stat(filename).st_mtime > build_time: + with open(path, 'rb') as f_in: + with gzip.open(gz_path, 'wb') as f_out: + f_out.write(f_in.read()) + + def _compressFiles(self, build_time, root): + if not conf.compress_output_files: return + print root + for rootdir, subdirs, files in os.walk(root, followlinks=True): + for f in files: + for ext in conf.compress_output_files: + if f.endswith(ext): + self._compressFile(build_time, rootdir, f) + break + def _generateDisplay(self): self._generateDisplayDaysStats() self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY) self._generateDisplayWholeMonthStats() + build_time = time.localtime() self.display.build(conf.DISPLAY_ROOT) + self._compressFiles(build_time, conf.DISPLAY_ROOT) def _createEmptyStats(self): stats = {} From 4d4fcf407522285f6ab3fe9ecb5be80671e60e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 15 Dec 2014 22:20:47 +0100 Subject: [PATCH 087/195] Fix a copy/past bug in _compressFile (bad filename) --- iwla.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index c5e55a6..e577b31 100755 --- a/iwla.py +++ b/iwla.py @@ -447,14 +447,13 @@ class IWLA(object): gz_path = path + '.gz' #print 'Compress %s => %s' % (path, gz_path) if not os.path.exists(gz_path) or\ - os.stat(filename).st_mtime > build_time: + os.stat(path).st_mtime > build_time: with open(path, 'rb') as f_in: with gzip.open(gz_path, 'wb') as f_out: f_out.write(f_in.read()) def _compressFiles(self, build_time, root): if not conf.compress_output_files: return - print root for rootdir, subdirs, files in os.walk(root, followlinks=True): for f in files: for ext in conf.compress_output_files: From ba5bd75ac1a4cca6a669ac648c0913a9a097da2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 15 Dec 2014 22:30:17 +0100 Subject: [PATCH 088/195] Sort years in reverse order for main index.html --- iwla.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iwla.py b/iwla.py index e577b31..325b06d 100755 --- a/iwla.py +++ b/iwla.py @@ -437,7 +437,7 @@ class IWLA(object): last_update = 'Last update %s
' % (time.strftime('%02d %b %Y %H:%M', time.localtime())) page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) - for year in self.meta_infos['stats'].keys(): + for year in sorted(self.meta_infos['stats'].keys(), reverse=True): self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) self.display.addPage(page) From e69af5e675d80a76ded9abc6c8413a32a6f288f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 15 Dec 2014 22:30:49 +0100 Subject: [PATCH 089/195] Start implementing logging --- TODO | 1 - iwla.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index e18bc14..85c48e1 100644 --- a/TODO +++ b/TODO @@ -6,5 +6,4 @@ Limit hits/pages/downloads by rate Automatic tests Add Licence Free memory as soon as possible -gzip output files different debug output levels \ No newline at end of file diff --git a/iwla.py b/iwla.py index 325b06d..df48c58 100755 --- a/iwla.py +++ b/iwla.py @@ -9,6 +9,7 @@ import pickle import gzip import importlib import argparse +import logging from calendar import monthrange from datetime import date @@ -127,6 +128,12 @@ class IWLA(object): (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] + self.logger = logging.getLogger('iwla') + self.logger.setFormatter(logging.Formatter('%(name)s %(message)s')) + + def setLoggerLevel(self, level): + self.logger.setLevel(level) + def getVersion(self): return IWLA.IWLA_VERSION @@ -651,6 +658,10 @@ if __name__ == '__main__': parser.add_argument('-f', '--file', dest='file', help='Analyse this log file') + parser.add_argument('-d', '--log-level', dest='loglevel', + default=logging.INFO, + help='Loglevel') + args = parser.parse_args() if args.clean_output: @@ -659,6 +670,12 @@ if __name__ == '__main__': iwla = IWLA() + numeric_level = getattr(logging, args.loglevel.upper(), None) + if not isinstance(numeric_level, int): + raise ValueError('Invalid log level: %s' % (args.loglevel)) + + iwla.setLoggerLevel(numeric_level) + required_conf = ['analyzed_filename', 'domain_name'] if not validConfRequirements(required_conf, iwla, 'Main Conf'): sys.exit(0) From 28d3e9765f4b7b54be0e513799fb5a7d8e99c4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 16 Dec 2014 07:38:57 +0100 Subject: [PATCH 090/195] Set reverse DNS names in lower case --- plugins/post_analysis/reverse_dns.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index aecd38a..d83c6d0 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -49,7 +49,7 @@ class IWLAPostAnalysisReverseDNS(IPlugin): if hit.get('dns_analysed', False): continue try: name, _, _ = socket.gethostbyaddr(k) - hit['remote_addr'] = name + hit['remote_addr'] = name.lower() hit['dns_name_replaced'] = True except: pass From 9bff7aa1b35674be862837eb3c08e2b33903ed2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 16 Dec 2014 07:42:42 +0100 Subject: [PATCH 091/195] Separate DB_ROOT and DISPLAY_ROOT by default --- default_conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default_conf.py b/default_conf.py index 7ccd2ff..5f0b255 100644 --- a/default_conf.py +++ b/default_conf.py @@ -3,7 +3,7 @@ import os # Default configuration # Default directory where to store database information -DB_ROOT = './output' +DB_ROOT = './output_db' # Default directory where to create html files DISPLAY_ROOT = './output' From 7afbf4fa96f2cb120bd107b70c7c3fa2472574d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 16 Dec 2014 20:23:33 +0100 Subject: [PATCH 092/195] Logging seems OK, except names --- display.py | 12 ++++------- iplugin.py | 17 ++++++++------- iwla.py | 62 +++++++++++++++++++++++++----------------------------- 3 files changed, 42 insertions(+), 49 deletions(-) diff --git a/display.py b/display.py index b0cca4c..0a965c2 100644 --- a/display.py +++ b/display.py @@ -1,6 +1,7 @@ import os import codecs import time +import logging # # Create output HTML files @@ -22,14 +23,8 @@ class DisplayHTMLRaw(object): if html: f.write(html) def build(self, f): - # t1 = time.time() self._buildHTML() - # t2 = time.time() - # print 'Time for _buildHTML : %d seconds' % (t2-t1) - # t1 = time.time() self._build(f, self.html) - # t2 = time.time() - # print 'Time for _build : %d seconds' % (t2-t1) class DisplayHTMLBlock(DisplayHTMLRaw): @@ -252,6 +247,7 @@ class DisplayHTMLPage(object): self.filename = filename self.blocks = [] self.css_path = listToStr(css_path) + self.logger = logging.getLogger(self.__class__.__name__) def getFilename(self): return self.filename; @@ -272,6 +268,8 @@ class DisplayHTMLPage(object): if not os.path.exists(base): os.makedirs(base) + self.logger.debug('Write %s' % (filename)) + f = codecs.open(filename, 'w', 'utf-8') f.write(u'') f.write(u'') @@ -321,9 +319,7 @@ class DisplayHTMLBuild(object): os.symlink(target, link_name) for page in self.pages: - # print 'Build %s' % (page.filename) page.build(root) - # print 'Built' # # Global functions diff --git a/iplugin.py b/iplugin.py index 0ba739a..29be462 100644 --- a/iplugin.py +++ b/iplugin.py @@ -1,6 +1,6 @@ import importlib import inspect -import traceback +import logging # # IWLA Plugin interface @@ -47,7 +47,9 @@ def validConfRequirements(conf_requirements, iwla, plugin_path): def preloadPlugins(plugins, iwla): cache_plugins = {} - print "==> Preload plugins" + logger = logging.getLogger(__name__) + + logger.info("==> Preload plugins") for (root, plugins_filenames) in plugins: for plugin_filename in plugins_filenames: @@ -61,7 +63,7 @@ def preloadPlugins(plugins, iwla): ] if not classes: - print 'No plugin defined in %s' % (plugin_path) + logger.warning('No plugin defined in %s' % (plugin_path)) continue plugin = classes[0](iwla) @@ -86,18 +88,17 @@ def preloadPlugins(plugins, iwla): requirement_validated = True break if not requirement_validated: - print 'Missing requirements \'%s\' for plugin %s' % (r, plugin_path) + logger.error('Missing requirements \'%s\' for plugin %s' % (r, plugin_path)) break if requirements and not requirement_validated: continue if not plugin.load(): - print 'Plugin %s load failed' % (plugin_path) + logger.error('Plugin %s load failed' % (plugin_path)) continue - print '\tRegister %s' % (plugin_path) + logger.info('\tRegister %s' % (plugin_path)) cache_plugins[plugin_path] = plugin except Exception as e: - print 'Error loading %s => %s' % (plugin_path, e) - traceback.print_exc() + logger.exception('Error loading %s => %s' % (plugin_path, e)) return cache_plugins diff --git a/iwla.py b/iwla.py index df48c58..8f9d57a 100755 --- a/iwla.py +++ b/iwla.py @@ -109,9 +109,7 @@ class IWLA(object): API_VERSION = 1 IWLA_VERSION = '0.1' - def __init__(self): - print '==> Start' - + def __init__(self, logLevel): self.meta_infos = {} self.analyse_started = False self.current_analysis = {} @@ -128,11 +126,9 @@ class IWLA(object): (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] - self.logger = logging.getLogger('iwla') - self.logger.setFormatter(logging.Formatter('%(name)s %(message)s')) - - def setLoggerLevel(self, level): - self.logger.setLevel(level) + logging.basicConfig(format='%(name)s %(message)s', level=logLevel) + self.logger = logging.getLogger(self.__class__.__name__) + self.logger.info('==> Start') def getVersion(self): return IWLA.IWLA_VERSION @@ -230,13 +226,13 @@ class IWLA(object): return None def _callPlugins(self, target_root, *args): - print '==> Call plugins (%s)' % target_root + self.logger.info('==> Call plugins (%s)' % (target_root)) for (root, plugins) in self.plugins: if root != target_root: continue for p in plugins: mod = self.cache_plugins.get(root + '.' + p, None) if mod: - print '\t%s' % (p) + self.logger.info('\t%s' % (p)) mod.hook(*args) def isPage(self, request): @@ -306,7 +302,7 @@ class IWLA(object): if 'extract_parameters' in d.keys(): hit['extract_request']['extract_parameters'] = d['extract_parameters'] else: - print "Bad request extraction " + hit['request'] + self.logger.warning("Bad request extraction %s" % (hit['request'])) return False if hit['http_referer']: @@ -344,7 +340,7 @@ class IWLA(object): cur_time = self.meta_infos['last_time'] title = 'Stats %d/%02d' % (cur_time.tm_year, cur_time.tm_mon) filename = self.getCurDisplayPath('index.html') - print '==> Generate display (%s)' % (filename) + self.logger.info('==> Generate display (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) @@ -437,7 +433,8 @@ class IWLA(object): def _generateDisplayWholeMonthStats(self): title = 'Stats for %s' % (conf.domain_name) filename = 'index.html' - print '==> Generate main page (%s)' % (filename) + + self.logger.info('==> Generate main page (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) @@ -452,7 +449,9 @@ class IWLA(object): def _compressFile(self, build_time, root, filename): path = os.path.join(root, filename) gz_path = path + '.gz' - #print 'Compress %s => %s' % (path, gz_path) + + self.logger.debug('Compress %s => %s' % (path, gz_path)) + if not os.path.exists(gz_path) or\ os.stat(path).st_mtime > build_time: with open(path, 'rb') as f_in: @@ -499,8 +498,8 @@ class IWLA(object): duplicated_stats = {k:v for (k,v) in stats.items()} cur_time = self.meta_infos['last_time'] - print "== Stats for %d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon) - print stats + self.logger.info("== Stats for %d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon)) + self.logger.info(stats) if not 'month_stats' in self.current_analysis.keys(): self.current_analysis['month_stats'] = stats @@ -524,7 +523,7 @@ class IWLA(object): if os.path.exists(path): os.remove(path) - print "==> Serialize to %s" % path + self.logger.info("==> Serialize to %s" % (path)) self._serialize(self.current_analysis, path) # Save month stats @@ -568,9 +567,8 @@ class IWLA(object): not super_hit['robot']: stats['nb_visits'] += 1 - print "== Stats for %d/%02d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday) - - print stats + self.logger.info("== Stats for %d/%02d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday)) + self.logger.info(stats) self.current_analysis['days_stats'][cur_time.tm_mday] = stats @@ -608,12 +606,12 @@ class IWLA(object): return True def start(self, _file): - print '==> Load previous database' + self.logger.info('==> Load previous database') self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() if self.meta_infos['last_time']: - print 'Last time' - print self.meta_infos['last_time'] + self.logger.info('Last time') + self.logger.info(self.meta_infos['last_time']) self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() else: self._clearVisits() @@ -622,7 +620,7 @@ class IWLA(object): self.cache_plugins = preloadPlugins(self.plugins, self) - print '==> Analysing log' + self.logger.info('==> Analysing log') for l in _file: # print "line " + l @@ -633,7 +631,7 @@ class IWLA(object): if not self._newHit(groups.groupdict()): continue else: - print "No match for " + l + self.logger.warning("No match for %s" % (l)) #break if self.analyse_started: @@ -642,7 +640,7 @@ class IWLA(object): del self.meta_infos['start_analysis_time'] self._serialize(self.meta_infos, conf.META_PATH) else: - print '==> Analyse not started : nothing new' + self.logger.info('==> Analyse not started : nothing new') if __name__ == '__main__': parser = argparse.ArgumentParser(description='Intelligent Web Log Analyzer') @@ -659,8 +657,8 @@ if __name__ == '__main__': help='Analyse this log file') parser.add_argument('-d', '--log-level', dest='loglevel', - default=logging.INFO, - help='Loglevel') + default='INFO', type=str, + help='Loglevel in %s, default : %s' % (['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], 'INFO')) args = parser.parse_args() @@ -668,13 +666,11 @@ if __name__ == '__main__': if os.path.exists(conf.DB_ROOT): shutil.rmtree(conf.DB_ROOT) if os.path.exists(conf.DISPLAY_ROOT): shutil.rmtree(conf.DISPLAY_ROOT) - iwla = IWLA() - - numeric_level = getattr(logging, args.loglevel.upper(), None) - if not isinstance(numeric_level, int): + loglevel = getattr(logging, args.loglevel.upper(), None) + if not isinstance(loglevel, int): raise ValueError('Invalid log level: %s' % (args.loglevel)) - iwla.setLoggerLevel(numeric_level) + iwla = IWLA(loglevel) required_conf = ['analyzed_filename', 'domain_name'] if not validConfRequirements(required_conf, iwla, 'Main Conf'): From c278ff30f0d83278844b96b087aa61d973042278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 17 Dec 2014 19:00:42 +0100 Subject: [PATCH 093/195] Use g.gettext for translations --- TODO | 2 +- conf.py | 4 ++++ default_conf.py | 6 +++++ iwla.py | 39 ++++++++++++++++++++---------- plugins/display/all_visits.py | 9 +++---- plugins/display/referers.py | 41 ++++++++++++++++---------------- plugins/display/top_downloads.py | 13 +++++----- plugins/display/top_hits.py | 11 +++++---- plugins/display/top_pages.py | 13 +++++----- plugins/display/top_visitors.py | 5 ++-- 10 files changed, 87 insertions(+), 56 deletions(-) diff --git a/TODO b/TODO index 85c48e1..c340d87 100644 --- a/TODO +++ b/TODO @@ -6,4 +6,4 @@ Limit hits/pages/downloads by rate Automatic tests Add Licence Free memory as soon as possible -different debug output levels \ No newline at end of file +filter log with domain name diff --git a/conf.py b/conf.py index 22d8e17..d12cd0c 100644 --- a/conf.py +++ b/conf.py @@ -26,3 +26,7 @@ max_hits_displayed = 100 max_downloads_displayed = 100 compress_output_files = ['html', 'css', 'js'] + +# locale = 'fr' +locale = 'fr_FR' +# locale = 'fr_FR.utf8' diff --git a/default_conf.py b/default_conf.py index 5f0b255..c28a4c6 100644 --- a/default_conf.py +++ b/default_conf.py @@ -51,3 +51,9 @@ css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css' # Extensions to compress in gzip during display build compress_output_files = [] + +# Path to locales files +locales_path = './locales' + +# Default locale (english) +locale = 'en_EN' diff --git a/iwla.py b/iwla.py index 8f9d57a..13f427b 100755 --- a/iwla.py +++ b/iwla.py @@ -10,6 +10,7 @@ import gzip import importlib import argparse import logging +import gettext as g from calendar import monthrange from datetime import date @@ -32,6 +33,7 @@ from display import * # Conf values needed : # analyzed_filename # domain_name +# locales_path # compress_output_files* # # Output files : @@ -130,6 +132,19 @@ class IWLA(object): self.logger = logging.getLogger(self.__class__.__name__) self.logger.info('==> Start') + # print conf.locales_path + # print conf.locale + #print g.find('iwla', localedir=conf.locales_path, all=False) + # print g.find('iwla', localedir=conf.locales_path, languages=[conf.locale], all=True) + #g.install('iwla', localedir=conf.locales_path) + t = g.translation('iwla', localedir=conf.locales_path, languages=[conf.locale]) + self._ = t.gettext + #t.install() + # g.install('iwla', localedir=conf.locales_path, names=conf.locale) + + print(self._('Statistics')) + # print(_('Statistics')) + def getVersion(self): return IWLA.IWLA_VERSION @@ -338,13 +353,13 @@ class IWLA(object): def _generateDisplayDaysStats(self): cur_time = self.meta_infos['last_time'] - title = 'Stats %d/%02d' % (cur_time.tm_year, cur_time.tm_mon) + title = '%s %d/%02d' % (g.gettext('Statistics'), cur_time.tm_year, cur_time.tm_mon) filename = self.getCurDisplayPath('index.html') self.logger.info('==> Generate display (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) - days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, 'By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth'], None, nb_month_days, range(1,6)) + days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, g.gettext('By day'), [g.gettext('Day'), g.gettext('Visits'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 @@ -381,12 +396,12 @@ class IWLA(object): else: average_row = map(lambda(v): 0, row) - average_row[0] = 'Average' + average_row[0] = g.gettext('Average') average_row[4] = bytesToStr(average_row[4]) average_row[5] = bytesToStr(average_row[5]) days.appendRow(average_row) - row[0] = 'Total' + row[0] = g.gettext('Total') row[4] = bytesToStr(row[4]) row[5] = bytesToStr(row[5]) days.appendRow(row) @@ -395,9 +410,9 @@ class IWLA(object): def _generateDisplayMonthStats(self, page, year, month_stats): cur_time = time.localtime() - months_name = ['', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] - title = 'Summary %d' % (year) - cols = ['Month', 'Visitors', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth', 'Details'] + months_name = ['', g.gettext('Jan'), g.gettext('Feb'), g.gettext('Mar'), g.gettext('Apr'), g.gettext('May'), g.gettext('June'), g.gettext('July'), g.gettext('Aug'), g.gettext('Sep'), g.gettext('Oct'), g.gettext('Nov'), g.gettext('Dec')] + title = '%s %d' % (g.gettext('Summary'), year) + cols = [g.gettext('Month'), g.gettext('Visitors'), g.gettext('Visits'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Not viewed Bandwidth'), g.gettext('Details')] graph_cols=range(1,7) months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) @@ -407,7 +422,7 @@ class IWLA(object): full_month = '%s %d' % (months_name[i], year) if i in month_stats.keys(): stats = month_stats[i] - link = 'Details' % (year, i) + link = '%s' % (year, i, g.gettext('Details')) row = [full_month, stats['nb_visitors'], stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] for j in graph_cols: @@ -424,21 +439,21 @@ class IWLA(object): else: css = 'iwla_curday' months.setCellCSSClass(i-1, 0, css) - total[0] = 'Total' + total[0] = g.gettext('Total') total[5] = bytesToStr(total[5]) total[6] = bytesToStr(total[6]) months.appendRow(total) page.appendBlock(months) def _generateDisplayWholeMonthStats(self): - title = 'Stats for %s' % (conf.domain_name) + title = '%s %s' % (g.gettext('Statistics for'), conf.domain_name) filename = 'index.html' self.logger.info('==> Generate main page (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) - last_update = 'Last update %s
' % (time.strftime('%02d %b %Y %H:%M', time.localtime())) + last_update = '%s %s
' % (g.gettext('Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) for year in sorted(self.meta_infos['stats'].keys(), reverse=True): @@ -669,7 +684,7 @@ if __name__ == '__main__': loglevel = getattr(logging, args.loglevel.upper(), None) if not isinstance(loglevel, int): raise ValueError('Invalid log level: %s' % (args.loglevel)) - + iwla = IWLA(loglevel) required_conf = ['analyzed_filename', 'domain_name'] diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 18bea36..4873b3f 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -1,4 +1,5 @@ import time +import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -41,13 +42,13 @@ class IWLADisplayAllVisits(IPlugin): last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) - title = time.strftime('All visits - %B %Y', self.iwla.getCurTime()) + title = time.strftime(g.gettext('All visits') + ' - %B %Y', self.iwla.getCurTime()) filename = 'all_visits.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Last seen'), [g.gettext('Host'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Last seen')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in last_access: @@ -69,8 +70,8 @@ class IWLADisplayAllVisits(IPlugin): display.addPage(page) index = self.iwla.getDisplayIndex() - link = 'All visits' % (filename) - block = index.getBlock('Top visitors') + link = '%s' % (g.gettext('All visits'), filename) + block = index.getBlock(g.gettext('Top visitors')) if block: block.setTitle('%s - %s' % (block.getTitle(), link)) else: diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 6bdb043..29e4bb9 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -1,4 +1,5 @@ import time +import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -68,17 +69,17 @@ class IWLADisplayReferers(IPlugin): # All referers in a file if self.create_all_referers: - title = time.strftime('Connexion from - %B %Y', cur_time) + title = time.strftime(g.gettext('Connexion from') + ' - %B %Y', cur_time) filename = 'referers.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'Connexion from', ['Origin', 'Pages', 'Hits']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Connexion from'), [g.gettext('Origin'), g.gettext('Pages'), g.gettext('Hits')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) total_search = [0]*3 - table.appendRow(['Search Engine', '', '']) + table.appendRow(['%s' % (g.gettext('Search Engine')), '', '']) new_list = self.max_referers and top_search_engine_referers[:self.max_referers] or top_search_engine_referers for r,_ in new_list: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] @@ -87,7 +88,7 @@ class IWLADisplayReferers(IPlugin): table.appendRow(row) total_external = [0]*3 - table.appendRow(['External URL', '', '']) + table.appendRow(['%s' % (g.gettext('External URL')), '', '']) new_list = self.max_referers and top_referers[:self.max_referers] or top_referers for r,_ in new_list: row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] @@ -96,7 +97,7 @@ class IWLADisplayReferers(IPlugin): table.appendRow(row) total_robot = [0]*3 - table.appendRow(['External URL (robot)', '', '']) + table.appendRow(['%s' % (g.gettext('External URL (robot)')), '', '']) new_list = self.max_referers and top_robots_referers[:self.max_referers] or top_robots_referers for r,_ in new_list: row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] @@ -108,45 +109,45 @@ class IWLADisplayReferers(IPlugin): display.addPage(page) - title = 'Top Referers' + title = g.gettext('Top Referers') if self.create_all_referers: - link = 'All Referers' % (filename) + link = '%s' % (filename, g.gettext('All Referers')) title = '%s - %s' % (title, link) # Top referers in index - table = display.createBlock(DisplayHTMLBlockTable, title, ['Origin', 'Pages', 'Hits']) + table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('Origin'), g.gettext('Pages'), g.gettext('Hits')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) - table.appendRow(['Search Engine', '', '']) + table.appendRow(['%s' % (g.gettext('Search Engine')), '', '']) for r,_ in top_search_engine_referers[:10]: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] total_search[1] -= search_engine_referers[r]['pages'] total_search[2] -= search_engine_referers[r]['hits'] table.appendRow(row) if total_search[1] or total_search[2]: - total_search[0] = 'Others' + total_search[0] = g.gettext('Others') table.appendRow(total_search) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') - table.appendRow(['External URL', '', '']) + table.appendRow(['%s' % (g.gettext('External URL')), '', '']) for r,_ in top_referers[:10]: row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] total_external[1] -= referers[r]['pages'] total_external[2] -= referers[r]['hits'] table.appendRow(row) if total_external[1] or total_external[2]: - total_external[0] = 'Others' + total_external[0] = g.gettext('Others') table.appendRow(total_external) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') - table.appendRow(['External URL (robot)', '', '']) + table.appendRow(['%s' % (g.gettext('External URL (robot)')), '', '']) for r,_ in top_robots_referers[:10]: row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] total_robot[1] -= robots_referers[r]['pages'] total_robot[2] -= robots_referers[r]['hits'] table.appendRow(row) if total_robot[1] or total_robot[2]: - total_robot[0] = 'Others' + total_robot[0] = g.gettext('Others') table.appendRow(total_robot) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') @@ -154,14 +155,14 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = time.strftime('Key Phrases - %B %Y', cur_time) + title = time.strftime(g.gettext('Key Phrases') + ' - %B %Y', cur_time) filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'Top key phrases', ['Key phrase', 'Search']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Top key phrases'), [g.gettext('Key phrase'), g.gettext('Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: @@ -171,19 +172,19 @@ class IWLADisplayReferers(IPlugin): display.addPage(page) - title = 'Top key phrases' + title = g.gettext('Top key phrases') if self.create_all_key_phrases: - link = 'All key phrases' % (filename) + link = '%s' % (filename, g.gettext('All key phrases')) title = '%s - %s' % (title, link) # Top key phrases in index - table = display.createBlock(DisplayHTMLBlockTable, title, ['Key phrase', 'Search']) + table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('Key phrase'), g.gettext('Search')]) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases[:10]: table.appendRow([phrase[0], phrase[1]]) total_search[1] -= phrase[1] if total_search[1]: - total_search[0] = 'Others' + total_search[0] = g.gettext('Others') table.appendRow(total_search) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 97d7f4a..55a71f5 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -1,4 +1,5 @@ import time +import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -47,10 +48,10 @@ class IWLADisplayTopDownloads(IPlugin): if self.create_all_downloads: filename = 'top_downloads.html' path = self.iwla.getCurDisplayPath(filename) - title = time.strftime('All Downloads - %B %Y', self.iwla.getCurTime()) + title = time.strftime(g.gettext('All Downloads') + ' - %B %Y', self.iwla.getCurTime()) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'All Downloads', ['URI', 'Hit']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('All Downloads'), [g.gettext('URI'), g.gettext('Hit')]) table.setColsCSSClass(['', 'iwla_hit']) total_entrance = [0]*2 @@ -62,21 +63,21 @@ class IWLADisplayTopDownloads(IPlugin): display.addPage(page) - title = 'Top Downloads' + title = g.gettext('Top Downloads') if self.create_all_downloads: - link = 'All Downloads' % (filename) + link = '%s' % (filename, g.gettext('All Downloads')) title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, ['URI', 'Hits']) + table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('URI'), g.gettext('Hits')]) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads[:10]: table.appendRow([generateHTMLLink(uri), entrance]) total_entrance[1] -= entrance if total_entrance[1]: - total_entrance[0] = 'Others' + total_entrance[0] = g.gettext('Others') table.appendRow(total_entrance) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index bf9496d..230ffa0 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -1,4 +1,5 @@ import time +import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -45,12 +46,12 @@ class IWLADisplayTopHits(IPlugin): # All in a file if self.create_all_hits: - title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) + title = time.strftime(g.gettext('All Hits') + ' - %B %Y', self.iwla.getCurTime()) filename = 'top_hits.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'All Hits', ['URI', 'Entrance']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('All Hits'), [g.gettext('URI'), g.gettext('Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) total_hits = [0]*2 new_list = self.max_hits and top_hits[:self.max_hits] or top_hits @@ -63,19 +64,19 @@ class IWLADisplayTopHits(IPlugin): title = 'Top Hits' if self.create_all_hits: - link = 'All Hits' % (filename) + link = '%s' % (filename, g.gettext('All Hits')) title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, ['URI', 'Entrance']) + table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('URI'), g.gettext('Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits[:10]: table.appendRow([generateHTMLLink(uri), entrance]) total_hits[1] -= entrance if total_hits[1]: - total_hits[0] = 'Others' + total_hits[0] = g.gettext('Others') table.appendRow(total_hits) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index b41ef43..a7af675 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -1,4 +1,5 @@ import time +import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -45,12 +46,12 @@ class IWLADisplayTopPages(IPlugin): # All in a page if self.create_all_pages: - title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) + title = time.strftime(g.gettext('All Pages') + ' - %B %Y', self.iwla.getCurTime()) filename = 'top_pages.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, 'All Pages', ['URI', 'Entrance']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('All Pages'), [g.gettext('URI'), g.gettext('Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) total_hits = [0]*2 new_list = self.max_pages and top_pages[:self.max_pages] or top_pages @@ -61,21 +62,21 @@ class IWLADisplayTopPages(IPlugin): display.addPage(page) - title = 'Top Pages' + title = g.gettext('Top Pages') if self.create_all_pages: - link = 'All Pages' % (filename) + link = '%s' % (filename, g.gettext('All Pages')) title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, ['URI', 'Entrance']) + table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('URI'), g.gettext('Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages[:10]: table.appendRow([generateHTMLLink(uri), entrance]) total_hits[1] -= entrance if total_hits[1]: - total_hits[0] = 'Others' + total_hits[0] = g.gettext('Others') table.appendRow(total_hits) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 4562980..cf90aef 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -1,4 +1,5 @@ import time +import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -49,7 +50,7 @@ class IWLADisplayTopVisitors(IPlugin): top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, 'Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) + table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Top visitors'), [g.gettext('Host'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Last seen')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in top_visitors: address = super_hit['remote_addr'] @@ -69,7 +70,7 @@ class IWLADisplayTopVisitors(IPlugin): total[3] -= super_hit['bandwidth'] table.appendRow(row) if total[1] or total[2] or total[3]: - total[0] = 'Others' + total[0] = g.gettext('Others') total[3] = bytesToStr(total[3]) total[4] = '' table.appendRow(total) From ccab40b4e17e54e9f0d33786949184470417d599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 17 Dec 2014 20:31:59 +0100 Subject: [PATCH 094/195] Replace g.gettext by iwla._ Add createCurTitle() to factorize code --- conf.py | 3 +-- display.py | 5 ++++ iwla.py | 44 ++++++++++++++------------------ plugins/display/all_visits.py | 9 +++---- plugins/display/referers.py | 43 +++++++++++++++---------------- plugins/display/top_downloads.py | 15 +++++------ plugins/display/top_hits.py | 13 ++++------ plugins/display/top_pages.py | 15 +++++------ plugins/display/top_visitors.py | 5 ++-- 9 files changed, 68 insertions(+), 84 deletions(-) diff --git a/conf.py b/conf.py index d12cd0c..18bccee 100644 --- a/conf.py +++ b/conf.py @@ -27,6 +27,5 @@ max_downloads_displayed = 100 compress_output_files = ['html', 'css', 'js'] -# locale = 'fr' -locale = 'fr_FR' +locale = 'fr' # locale = 'fr_FR.utf8' diff --git a/display.py b/display.py index 0a965c2..d7bb9c6 100644 --- a/display.py +++ b/display.py @@ -348,3 +348,8 @@ def generateHTMLLink(url, name=None, max_length=100, prefix=u'http'): if not name: name = unicode(url) if not url.startswith(prefix): url = u'%s://%s' % (prefix, url) return u'%s' % (url, name[:max_length]) + +def createCurTitle(iwla, title): + title = iwla._(title) + time.strftime(u' - %B %Y', iwla.getCurTime()) + return title + diff --git a/iwla.py b/iwla.py index 13f427b..befe36d 100755 --- a/iwla.py +++ b/iwla.py @@ -10,7 +10,7 @@ import gzip import importlib import argparse import logging -import gettext as g +import gettext from calendar import monthrange from datetime import date @@ -131,19 +131,13 @@ class IWLA(object): logging.basicConfig(format='%(name)s %(message)s', level=logLevel) self.logger = logging.getLogger(self.__class__.__name__) self.logger.info('==> Start') - - # print conf.locales_path - # print conf.locale - #print g.find('iwla', localedir=conf.locales_path, all=False) - # print g.find('iwla', localedir=conf.locales_path, languages=[conf.locale], all=True) - #g.install('iwla', localedir=conf.locales_path) - t = g.translation('iwla', localedir=conf.locales_path, languages=[conf.locale]) - self._ = t.gettext - #t.install() - # g.install('iwla', localedir=conf.locales_path, names=conf.locale) - - print(self._('Statistics')) - # print(_('Statistics')) + try: + t = gettext.translation('iwla', localedir=conf.locales_path, languages=[conf.locale], codeset='utf8') + self.logger.info('\tUsing locale %s' % (conf.locale)) + except IOError: + t = gettext.NullTranslations() + self.logger.info('\tUsing default locale en_EN') + self._ = t.ugettext def getVersion(self): return IWLA.IWLA_VERSION @@ -353,13 +347,13 @@ class IWLA(object): def _generateDisplayDaysStats(self): cur_time = self.meta_infos['last_time'] - title = '%s %d/%02d' % (g.gettext('Statistics'), cur_time.tm_year, cur_time.tm_mon) + title = '%s %d/%02d' % (self._('Statistics'), cur_time.tm_year, cur_time.tm_mon) filename = self.getCurDisplayPath('index.html') self.logger.info('==> Generate display (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) - days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, g.gettext('By day'), [g.gettext('Day'), g.gettext('Visits'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) + days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, self._('By day'), [self._('Day'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) nb_visits = 0 nb_days = 0 @@ -396,12 +390,12 @@ class IWLA(object): else: average_row = map(lambda(v): 0, row) - average_row[0] = g.gettext('Average') + average_row[0] = self._('Average') average_row[4] = bytesToStr(average_row[4]) average_row[5] = bytesToStr(average_row[5]) days.appendRow(average_row) - row[0] = g.gettext('Total') + row[0] = self._('Total') row[4] = bytesToStr(row[4]) row[5] = bytesToStr(row[5]) days.appendRow(row) @@ -410,9 +404,9 @@ class IWLA(object): def _generateDisplayMonthStats(self, page, year, month_stats): cur_time = time.localtime() - months_name = ['', g.gettext('Jan'), g.gettext('Feb'), g.gettext('Mar'), g.gettext('Apr'), g.gettext('May'), g.gettext('June'), g.gettext('July'), g.gettext('Aug'), g.gettext('Sep'), g.gettext('Oct'), g.gettext('Nov'), g.gettext('Dec')] - title = '%s %d' % (g.gettext('Summary'), year) - cols = [g.gettext('Month'), g.gettext('Visitors'), g.gettext('Visits'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Not viewed Bandwidth'), g.gettext('Details')] + months_name = ['', self._('Jan'), self._('Feb'), self._('Mar'), self._('Apr'), self._('May'), self._('June'), self._('July'), self._('Aug'), self._('Sep'), self._('Oct'), self._('Nov'), self._('Dec')] + title = '%s %d' % (self._('Summary'), year) + cols = [self._('Month'), self._('Visitors'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth'), self._('Details')] graph_cols=range(1,7) months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) @@ -422,7 +416,7 @@ class IWLA(object): full_month = '%s %d' % (months_name[i], year) if i in month_stats.keys(): stats = month_stats[i] - link = '%s' % (year, i, g.gettext('Details')) + link = '%s' % (year, i, self._('Details')) row = [full_month, stats['nb_visitors'], stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] for j in graph_cols: @@ -439,21 +433,21 @@ class IWLA(object): else: css = 'iwla_curday' months.setCellCSSClass(i-1, 0, css) - total[0] = g.gettext('Total') + total[0] = self._('Total') total[5] = bytesToStr(total[5]) total[6] = bytesToStr(total[6]) months.appendRow(total) page.appendBlock(months) def _generateDisplayWholeMonthStats(self): - title = '%s %s' % (g.gettext('Statistics for'), conf.domain_name) + title = '%s %s' % (self._('Statistics for'), conf.domain_name) filename = 'index.html' self.logger.info('==> Generate main page (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) - last_update = '%s %s
' % (g.gettext('Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) + last_update = '%s %s
' % (self._('Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) for year in sorted(self.meta_infos['stats'].keys(), reverse=True): diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 4873b3f..54e6e76 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -1,5 +1,4 @@ import time -import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -42,13 +41,13 @@ class IWLADisplayAllVisits(IPlugin): last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) - title = time.strftime(g.gettext('All visits') + ' - %B %Y', self.iwla.getCurTime()) + title = time.strftime(self.iwla._(u'All visits') + u' - %B %Y', self.iwla.getCurTime()) filename = 'all_visits.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Last seen'), [g.gettext('Host'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Last seen')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Last seen'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Bandwidth'), self.iwla._(u'Last seen')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in last_access: @@ -70,8 +69,8 @@ class IWLADisplayAllVisits(IPlugin): display.addPage(page) index = self.iwla.getDisplayIndex() - link = '%s' % (g.gettext('All visits'), filename) - block = index.getBlock(g.gettext('Top visitors')) + link = '%s' % (filename, self.iwla._(u'All visits')) + block = index.getBlock(self.iwla._(u'Top visitors')) if block: block.setTitle('%s - %s' % (block.getTitle(), link)) else: diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 29e4bb9..db56caf 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -1,6 +1,3 @@ -import time -import gettext as g - from iwla import IWLA from iplugin import IPlugin from display import * @@ -69,17 +66,17 @@ class IWLADisplayReferers(IPlugin): # All referers in a file if self.create_all_referers: - title = time.strftime(g.gettext('Connexion from') + ' - %B %Y', cur_time) + title = createCurTitle(self.iwla, u'Connexion from') filename = 'referers.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Connexion from'), [g.gettext('Origin'), g.gettext('Pages'), g.gettext('Hits')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Connexion from'), [self.iwla._(u'Origin'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) total_search = [0]*3 - table.appendRow(['%s' % (g.gettext('Search Engine')), '', '']) + table.appendRow(['%s' % (self.iwla._(u'Search Engine')), '', '']) new_list = self.max_referers and top_search_engine_referers[:self.max_referers] or top_search_engine_referers for r,_ in new_list: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] @@ -88,7 +85,7 @@ class IWLADisplayReferers(IPlugin): table.appendRow(row) total_external = [0]*3 - table.appendRow(['%s' % (g.gettext('External URL')), '', '']) + table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) new_list = self.max_referers and top_referers[:self.max_referers] or top_referers for r,_ in new_list: row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] @@ -97,7 +94,7 @@ class IWLADisplayReferers(IPlugin): table.appendRow(row) total_robot = [0]*3 - table.appendRow(['%s' % (g.gettext('External URL (robot)')), '', '']) + table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) new_list = self.max_referers and top_robots_referers[:self.max_referers] or top_robots_referers for r,_ in new_list: row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] @@ -109,45 +106,45 @@ class IWLADisplayReferers(IPlugin): display.addPage(page) - title = g.gettext('Top Referers') + title = self.iwla._(u'Top Referers') if self.create_all_referers: - link = '%s' % (filename, g.gettext('All Referers')) + link = '%s' % (filename, self.iwla._(u'All Referers')) title = '%s - %s' % (title, link) # Top referers in index - table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('Origin'), g.gettext('Pages'), g.gettext('Hits')]) + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Origin'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) - table.appendRow(['%s' % (g.gettext('Search Engine')), '', '']) + table.appendRow(['%s' % (self.iwla._(u'Search Engine')), '', '']) for r,_ in top_search_engine_referers[:10]: row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] total_search[1] -= search_engine_referers[r]['pages'] total_search[2] -= search_engine_referers[r]['hits'] table.appendRow(row) if total_search[1] or total_search[2]: - total_search[0] = g.gettext('Others') + total_search[0] = self.iwla._(u'Others') table.appendRow(total_search) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') - table.appendRow(['%s' % (g.gettext('External URL')), '', '']) + table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) for r,_ in top_referers[:10]: row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] total_external[1] -= referers[r]['pages'] total_external[2] -= referers[r]['hits'] table.appendRow(row) if total_external[1] or total_external[2]: - total_external[0] = g.gettext('Others') + total_external[0] = self.iwla._(u'Others') table.appendRow(total_external) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') - table.appendRow(['%s' % (g.gettext('External URL (robot)')), '', '']) + table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) for r,_ in top_robots_referers[:10]: row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] total_robot[1] -= robots_referers[r]['pages'] total_robot[2] -= robots_referers[r]['hits'] table.appendRow(row) if total_robot[1] or total_robot[2]: - total_robot[0] = g.gettext('Others') + total_robot[0] = self.iwla._(u'Others') table.appendRow(total_robot) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') @@ -155,14 +152,14 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = time.strftime(g.gettext('Key Phrases') + ' - %B %Y', cur_time) + title = createCurTitle(self.iwla, u'Key Phrases') filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Top key phrases'), [g.gettext('Key phrase'), g.gettext('Search')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: @@ -172,19 +169,19 @@ class IWLADisplayReferers(IPlugin): display.addPage(page) - title = g.gettext('Top key phrases') + title = self.iwla._(u'Top key phrases') if self.create_all_key_phrases: - link = '%s' % (filename, g.gettext('All key phrases')) + link = '%s' % (filename, self.iwla._(u'All key phrases')) title = '%s - %s' % (title, link) # Top key phrases in index - table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('Key phrase'), g.gettext('Search')]) + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) for phrase in top_key_phrases[:10]: table.appendRow([phrase[0], phrase[1]]) total_search[1] -= phrase[1] if total_search[1]: - total_search[0] = g.gettext('Others') + total_search[0] = self.iwla._(u'Others') table.appendRow(total_search) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 55a71f5..790dc38 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -1,6 +1,3 @@ -import time -import gettext as g - from iwla import IWLA from iplugin import IPlugin from display import * @@ -48,10 +45,10 @@ class IWLADisplayTopDownloads(IPlugin): if self.create_all_downloads: filename = 'top_downloads.html' path = self.iwla.getCurDisplayPath(filename) - title = time.strftime(g.gettext('All Downloads') + ' - %B %Y', self.iwla.getCurTime()) + title = createCurTitle(self.iwla, u'All Downloads') page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('All Downloads'), [g.gettext('URI'), g.gettext('Hit')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Downloads'), [self.iwla._(u'URI'), self.iwla._(u'Hit')]) table.setColsCSSClass(['', 'iwla_hit']) total_entrance = [0]*2 @@ -63,21 +60,21 @@ class IWLADisplayTopDownloads(IPlugin): display.addPage(page) - title = g.gettext('Top Downloads') + title = self.iwla._(u'Top Downloads') if self.create_all_downloads: - link = '%s' % (filename, g.gettext('All Downloads')) + link = '%s' % (filename, self.iwla._(u'All Downloads')) title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('URI'), g.gettext('Hits')]) + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Hits')]) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_downloads[:10]: table.appendRow([generateHTMLLink(uri), entrance]) total_entrance[1] -= entrance if total_entrance[1]: - total_entrance[0] = g.gettext('Others') + total_entrance[0] = self.iwla._(u'Others') table.appendRow(total_entrance) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 230ffa0..73d29ee 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -1,6 +1,3 @@ -import time -import gettext as g - from iwla import IWLA from iplugin import IPlugin from display import * @@ -46,12 +43,12 @@ class IWLADisplayTopHits(IPlugin): # All in a file if self.create_all_hits: - title = time.strftime(g.gettext('All Hits') + ' - %B %Y', self.iwla.getCurTime()) + title = createCurTitle(self.iwla, u'All Hits') filename = 'top_hits.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('All Hits'), [g.gettext('URI'), g.gettext('Entrance')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Hits'), [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) total_hits = [0]*2 new_list = self.max_hits and top_hits[:self.max_hits] or top_hits @@ -64,19 +61,19 @@ class IWLADisplayTopHits(IPlugin): title = 'Top Hits' if self.create_all_hits: - link = '%s' % (filename, g.gettext('All Hits')) + link = '%s' % (filename, self.iwla._(u'All Hits')) title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('URI'), g.gettext('Entrance')]) + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_hits[:10]: table.appendRow([generateHTMLLink(uri), entrance]) total_hits[1] -= entrance if total_hits[1]: - total_hits[0] = g.gettext('Others') + total_hits[0] = self.iwla._(u'Others') table.appendRow(total_hits) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index a7af675..f0d8fd6 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -1,6 +1,3 @@ -import time -import gettext as g - from iwla import IWLA from iplugin import IPlugin from display import * @@ -46,12 +43,12 @@ class IWLADisplayTopPages(IPlugin): # All in a page if self.create_all_pages: - title = time.strftime(g.gettext('All Pages') + ' - %B %Y', self.iwla.getCurTime()) + title = createCurTitle(self.iwla, u'All Pages') filename = 'top_pages.html' path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('All Pages'), [g.gettext('URI'), g.gettext('Entrance')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Pages'), [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) total_hits = [0]*2 new_list = self.max_pages and top_pages[:self.max_pages] or top_pages @@ -62,21 +59,21 @@ class IWLADisplayTopPages(IPlugin): display.addPage(page) - title = g.gettext('Top Pages') + title = self.iwla._(u'Top Pages') if self.create_all_pages: - link = '%s' % (filename, g.gettext('All Pages')) + link = '%s' % (filename, self.iwla._(u'All Pages')) title = '%s - %s' % (title, link) # Top in index index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, [g.gettext('URI'), g.gettext('Entrance')]) + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) table.setColsCSSClass(['', 'iwla_hit']) for (uri, entrance) in top_pages[:10]: table.appendRow([generateHTMLLink(uri), entrance]) total_hits[1] -= entrance if total_hits[1]: - total_hits[0] = g.gettext('Others') + total_hits[0] = self.iwla._(u'Others') table.appendRow(total_hits) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index cf90aef..4a34875 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -1,5 +1,4 @@ import time -import gettext as g from iwla import IWLA from iplugin import IPlugin @@ -50,7 +49,7 @@ class IWLADisplayTopVisitors(IPlugin): top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, g.gettext('Top visitors'), [g.gettext('Host'), g.gettext('Pages'), g.gettext('Hits'), g.gettext('Bandwidth'), g.gettext('Last seen')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top visitors'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Bandwidth'), self.iwla._(u'Last seen')]) table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in top_visitors: address = super_hit['remote_addr'] @@ -70,7 +69,7 @@ class IWLADisplayTopVisitors(IPlugin): total[3] -= super_hit['bandwidth'] table.appendRow(row) if total[1] or total[2] or total[3]: - total[0] = g.gettext('Others') + total[0] = self.iwla._(u'Others') total[3] = bytesToStr(total[3]) total[4] = '' table.appendRow(total) From 14c1686d981dd9749d6ffebf8499dbaed86cfff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 17 Dec 2014 20:39:19 +0100 Subject: [PATCH 095/195] Add POT and MO files plus script to generate POT file --- iwla.pot | 245 +++++++++++++++++++++++++++++ iwla_get.sh | 20 +++ locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 0 -> 2596 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 244 ++++++++++++++++++++++++++++ 4 files changed, 509 insertions(+) create mode 100644 iwla.pot create mode 100755 iwla_get.sh create mode 100644 locales/fr_FR/LC_MESSAGES/iwla.mo create mode 100644 locales/fr_FR/LC_MESSAGES/iwla.pot diff --git a/iwla.pot b/iwla.pot new file mode 100644 index 0000000..3f9a174 --- /dev/null +++ b/iwla.pot @@ -0,0 +1,245 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: iwla\n" +"POT-Creation-Date: 2014-12-16 21:36+CET\n" +"PO-Revision-Date: 2014-12-17 19:07+0100\n" +"Last-Translator: Soutadé \n" +"Language-Team: iwla \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: en\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: iwla.py:343 +msgid "Statistics" +msgstr "" + +#: iwla.py:349 +msgid "By day" +msgstr "" + +#: iwla.py:349 +msgid "Day" +msgstr "" + +#: iwla.py:349 iwla.py:402 +msgid "Not viewed Bandwidth" +msgstr "" + +#: iwla.py:349 iwla.py:402 +msgid "Visits" +msgstr "" + +#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 +#: plugins/display/referers.py:78 plugins/display/referers.py:118 +#: plugins/display/top_downloads.py:74 plugins/display/top_visitors.py:53 +msgid "Hits" +msgstr "" + +#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 +#: plugins/display/referers.py:78 plugins/display/referers.py:118 +#: plugins/display/top_visitors.py:53 +msgid "Pages" +msgstr "" + +#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 +#: plugins/display/top_visitors.py:53 +msgid "Bandwidth" +msgstr "" + +#: iwla.py:386 +msgid "Average" +msgstr "" + +#: iwla.py:391 iwla.py:429 +msgid "Total" +msgstr "" + +#: iwla.py:400 +msgid "Apr" +msgstr "" + +#: iwla.py:400 +msgid "Aug" +msgstr "" + +#: iwla.py:400 +msgid "Dec" +msgstr "" + +#: iwla.py:400 +msgid "Feb" +msgstr "" + +#: iwla.py:400 +msgid "Jan" +msgstr "" + +#: iwla.py:400 +msgid "July" +msgstr "" + +#: iwla.py:400 +msgid "June" +msgstr "" + +#: iwla.py:400 +msgid "Mar" +msgstr "" + +#: iwla.py:400 +msgid "May" +msgstr "" + +#: iwla.py:400 +msgid "Nov" +msgstr "" + +#: iwla.py:400 +msgid "Oct" +msgstr "" + +#: iwla.py:400 +msgid "Sep" +msgstr "" + +#: iwla.py:401 +msgid "Summary" +msgstr "" + +#: iwla.py:402 +msgid "Month" +msgstr "" + +#: iwla.py:402 +msgid "Visitors" +msgstr "" + +#: iwla.py:402 iwla.py:412 +msgid "Details" +msgstr "" + +#: iwla.py:436 +msgid "Statistics for" +msgstr "" + +#: iwla.py:443 +msgid "Last update" +msgstr "" + +#: plugins/display/all_visits.py:45 plugins/display/all_visits.py:73 +msgid "All visits" +msgstr "" + +#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +msgid "Host" +msgstr "" + +#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +msgid "Last seen" +msgstr "" + +#: plugins/display/all_visits.py:74 plugins/display/top_visitors.py:53 +msgid "Top visitors" +msgstr "" + +#: plugins/display/referers.py:72 plugins/display/referers.py:78 +msgid "Connexion from" +msgstr "" + +#: plugins/display/referers.py:78 plugins/display/referers.py:118 +msgid "Origin" +msgstr "" + +#: plugins/display/referers.py:82 plugins/display/referers.py:121 +msgid "Search Engine" +msgstr "" + +#: plugins/display/referers.py:91 plugins/display/referers.py:132 +msgid "External URL" +msgstr "" + +#: plugins/display/referers.py:100 plugins/display/referers.py:143 +msgid "External URL (robot)" +msgstr "" + +#: plugins/display/referers.py:112 +msgid "Top Referers" +msgstr "" + +#: plugins/display/referers.py:114 +msgid "All Referers" +msgstr "" + +#: plugins/display/referers.py:128 plugins/display/referers.py:139 +#: plugins/display/referers.py:150 plugins/display/referers.py:187 +#: plugins/display/top_downloads.py:80 plugins/display/top_hits.py:79 +#: plugins/display/top_pages.py:79 plugins/display/top_visitors.py:73 +msgid "Others" +msgstr "" + +#: plugins/display/referers.py:158 +msgid "Key Phrases" +msgstr "" + +#: plugins/display/referers.py:165 plugins/display/referers.py:175 +msgid "Top key phrases" +msgstr "" + +#: plugins/display/referers.py:165 plugins/display/referers.py:181 +msgid "Key phrase" +msgstr "" + +#: plugins/display/referers.py:165 plugins/display/referers.py:181 +msgid "Search" +msgstr "" + +#: plugins/display/referers.py:177 +msgid "All key phrases" +msgstr "" + +#: plugins/display/top_downloads.py:51 plugins/display/top_downloads.py:54 +#: plugins/display/top_downloads.py:68 +msgid "All Downloads" +msgstr "" + +#: plugins/display/top_downloads.py:54 +msgid "Hit" +msgstr "" + +#: plugins/display/top_downloads.py:54 plugins/display/top_downloads.py:74 +#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 +#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +msgid "URI" +msgstr "" + +#: plugins/display/top_downloads.py:66 +msgid "Top Downloads" +msgstr "" + +#: plugins/display/top_hits.py:49 plugins/display/top_hits.py:54 +#: plugins/display/top_hits.py:67 +msgid "All Hits" +msgstr "" + +#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 +#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +msgid "Entrance" +msgstr "" + +#: plugins/display/top_pages.py:49 plugins/display/top_pages.py:54 +#: plugins/display/top_pages.py:67 +msgid "All Pages" +msgstr "" + +#: plugins/display/top_pages.py:65 +msgid "Top Pages" +msgstr "" diff --git a/iwla_get.sh b/iwla_get.sh new file mode 100755 index 0000000..eef3164 --- /dev/null +++ b/iwla_get.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +rm -f mega_log +for i in `seq 53 -1 2` ; do + [ ! -f "cybelle/soutade.fr_access.log.$i.gz" ] && continue + zcat "cybelle/soutade.fr_access.log.$i.gz" >> mega_log + echo "cybelle/soutade.fr_access.log.$i.gz" +done + +#cat "cybelle/soutade.fr_access.log.2" >> mega_log +echo "cybelle/soutade.fr_access.log.1" +cat "cybelle/soutade.fr_access.log.1" >> mega_log +# cat "cybelle/soutade.fr_access.log" >> mega_log +cat mega_log | ./iwla.py -i -c +# cat "cybelle/soutade.fr_access.log.1" | ./iwla.py -i +# cat "cybelle/soutade.fr_access.log" | ./iwla.py -i + +# TODO : reverse analysis +# -f option +# other when pages truncated diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo new file mode 100644 index 0000000000000000000000000000000000000000..933477e0bbe4248cb5cde51610aeb02461f0fee0 GIT binary patch literal 2596 zcmZvcO^g&p6o3m|6c+_V{6o|N|M;<&nPpjV6vMJVvdFUQ>@1N3lHQrx*@l_!p}S^w zC*hz+6AvELgBQUVu&sQD0bg-`~dQ(k9f(xpStmH9KVHfj_)0Rf;{TH(|>~!w?CoS z{Ts@@SD>7GC5z>p8=%bF1jV22P|iC5C9XqGe-W}&y$r=(1xkG8A&)x6tIpjm!j0&E zU|j63VA49c7TyIlycZ6@_3#iBd&i;JFGKMwfa2#V$fI82C3aqe67P2$--SHteaDZX z#Q6&-`<;U_|7R%soOk*KDEs~H#xFWva^EjQiNilo?DY^F*?%3p2X2O9cMlZ1d!0T6 z#qTjUKI3>4%DIj~iI;)0e+}}en3wo_8j8I)pzQx9yc3>=-YoruKaCPe-j zyO0~({R~J9a>(Yck59P%!;X(biJinp+EzqzQ}TWQc@j}WwVED@7Q$NOSCUja5ZJ6U zbTWnznAt$A02Iwt^&G(TLShv#N$#CT5}9?}wFzpkn9M{6zl8>lD2;j%FjfO^umZg_k0U zIuIpR9rQzWuvu&K3XOUJ52u`m($BnAhy29q#F#MaH5(P*8a3g^NLx)rA-*1ttZoHn z!Bq6}0S-qkHCeW5G7hRis3z^a#3BpNwDIHeyvm?QLnaushMKm%4H6raldi6wi()n1 ztk?axtx8d&EA*meCZ%^R;-Yj%T=X>J5iXP>>(|swaa#sPED4);n?6?6nY~BprHG6`2jEA@8t(|f4;D5aL4dyiFsbp$VUI2_LR;) zUC0gY$mMgnUJ0sK;^vZ?j{^lg9W||A=`87IleA~{RqI@EUpcBj$Lz4$Bs;v4@$1f` ziSdciWhe7}xn45Gnh>+?2JTt2Xm>Vheh@yR%kzGm7`u0-H0JGDo+sOrq26d%jw(S| zE$BV7f$e?Xgyf<%6>opLpd0O~v0|*R(boCC-PfEckdVj6ioGv+Zh;(QDl(P8GHyVo8iojg3kQl9-4`+nMB*pQmwNjURF(=BghrGPxF$jXqIU*wUJg=*FcnJ z7e&=I=ITtBvD!VJW`NXRi=vAY$8{ z;HN>v()OUz|QCFl$BsW1yUle`ZB*WCF_r1Gw6I6n=FY9 z<$rac9wbJ0&SdUVl?i1Ta4vi$zvkwGvJUxqw3-xYcRd<@J2uAata^&3OnD+KwWb;C ziqY}4vF^$|)nw7tG8IKPBqqhqQqrua@ownS|6FKyoo2rT>_}bSa9gfW@j*UcSE=b( ITBi_@% literal 0 HcmV?d00001 diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot new file mode 100644 index 0000000..ce1f3a9 --- /dev/null +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -0,0 +1,244 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: iwla\n" +"POT-Creation-Date: 2014-12-16 21:36+CET\n" +"PO-Revision-Date: 2014-12-17 19:06+0100\n" +"Last-Translator: Soutadé \n" +"Language-Team: iwla\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: fr_FR\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: iwla.py:343 +msgid "Statistics" +msgstr "Statistiques" + +#: iwla.py:349 +msgid "By day" +msgstr "Par jour" + +#: iwla.py:349 +msgid "Day" +msgstr "Jour" + +#: iwla.py:349 iwla.py:402 +msgid "Not viewed Bandwidth" +msgstr "Traffic non vu" + +#: iwla.py:349 iwla.py:402 +msgid "Visits" +msgstr "Visites" + +#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 +#: plugins/display/referers.py:78 plugins/display/referers.py:118 +#: plugins/display/top_downloads.py:74 plugins/display/top_visitors.py:53 +msgid "Hits" +msgstr "Hits" + +#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 +#: plugins/display/referers.py:78 plugins/display/referers.py:118 +#: plugins/display/top_visitors.py:53 +msgid "Pages" +msgstr "Pages" + +#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 +#: plugins/display/top_visitors.py:53 +msgid "Bandwidth" +msgstr "Bande passante" + +#: iwla.py:386 +msgid "Average" +msgstr "Moyenne" + +#: iwla.py:391 iwla.py:429 +msgid "Total" +msgstr "Total" + +#: iwla.py:400 +msgid "Apr" +msgstr "Avr" + +#: iwla.py:400 +msgid "Aug" +msgstr "Août" + +#: iwla.py:400 +msgid "Dec" +msgstr "Déc" + +#: iwla.py:400 +msgid "Feb" +msgstr "Fév" + +#: iwla.py:400 +msgid "Jan" +msgstr "Jan" + +#: iwla.py:400 +msgid "July" +msgstr "Jui" + +#: iwla.py:400 +msgid "June" +msgstr "Juin" + +#: iwla.py:400 +msgid "Mar" +msgstr "Mars" + +#: iwla.py:400 +msgid "May" +msgstr "Mai" + +#: iwla.py:400 +msgid "Nov" +msgstr "Nov" + +#: iwla.py:400 +msgid "Oct" +msgstr "Oct" + +#: iwla.py:400 +msgid "Sep" +msgstr "Sep" + +#: iwla.py:401 +msgid "Summary" +msgstr "Résumé" + +#: iwla.py:402 +msgid "Month" +msgstr "Mois" + +#: iwla.py:402 +msgid "Visitors" +msgstr "Visiteurs" + +#: iwla.py:402 iwla.py:412 +msgid "Details" +msgstr "Détails" + +#: iwla.py:436 +msgid "Statistics for" +msgstr "Statistiques pour" + +#: iwla.py:443 +msgid "Last update" +msgstr "Dernière mise à jour" + +#: plugins/display/all_visits.py:45 plugins/display/all_visits.py:73 +msgid "All visits" +msgstr "Toutes les visites" + +#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +msgid "Host" +msgstr "Hôte" + +#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +msgid "Last seen" +msgstr "Dernière visite" + +#: plugins/display/all_visits.py:74 plugins/display/top_visitors.py:53 +msgid "Top visitors" +msgstr "Top visiteurs" + +#: plugins/display/referers.py:72 plugins/display/referers.py:78 +msgid "Connexion from" +msgstr "Connexion depuis" + +#: plugins/display/referers.py:78 plugins/display/referers.py:118 +msgid "Origin" +msgstr "Origine" + +#: plugins/display/referers.py:82 plugins/display/referers.py:121 +msgid "Search Engine" +msgstr "Moteur de recherche" + +#: plugins/display/referers.py:91 plugins/display/referers.py:132 +msgid "External URL" +msgstr "URL externe" + +#: plugins/display/referers.py:100 plugins/display/referers.py:143 +msgid "External URL (robot)" +msgstr "URL externe (robot)" + +#: plugins/display/referers.py:112 +msgid "Top Referers" +msgstr "Top Origines" + +#: plugins/display/referers.py:114 +msgid "All Referers" +msgstr "Toutes les origines" + +#: plugins/display/referers.py:128 plugins/display/referers.py:139 +#: plugins/display/referers.py:150 plugins/display/referers.py:187 +#: plugins/display/top_downloads.py:80 plugins/display/top_hits.py:79 +#: plugins/display/top_pages.py:79 plugins/display/top_visitors.py:73 +msgid "Others" +msgstr "Autres" + +#: plugins/display/referers.py:158 +msgid "Key Phrases" +msgstr "Phrases clé" + +#: plugins/display/referers.py:165 plugins/display/referers.py:175 +msgid "Top key phrases" +msgstr "Top phrases clé" + +#: plugins/display/referers.py:165 plugins/display/referers.py:181 +msgid "Key phrase" +msgstr "Phrase clé" + +#: plugins/display/referers.py:165 plugins/display/referers.py:181 +msgid "Search" +msgstr "Recherche" + +#: plugins/display/referers.py:177 +msgid "All key phrases" +msgstr "Toutes les phrases clé" + +#: plugins/display/top_downloads.py:51 plugins/display/top_downloads.py:54 +#: plugins/display/top_downloads.py:68 +msgid "All Downloads" +msgstr "Tous les téléchargements" + +#: plugins/display/top_downloads.py:54 +msgid "Hit" +msgstr "Hit" + +#: plugins/display/top_downloads.py:54 plugins/display/top_downloads.py:74 +#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 +#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +msgid "URI" +msgstr "URI" + +#: plugins/display/top_downloads.py:66 +msgid "Top Downloads" +msgstr "Top Téléchargements" + +#: plugins/display/top_hits.py:49 plugins/display/top_hits.py:54 +#: plugins/display/top_hits.py:67 +msgid "All Hits" +msgstr "Tous les hits" + +#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 +#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +msgid "Entrance" +msgstr "Entrées" + +#: plugins/display/top_pages.py:49 plugins/display/top_pages.py:54 +#: plugins/display/top_pages.py:67 +msgid "All Pages" +msgstr "Toutes les pages" + +#: plugins/display/top_pages.py:65 +msgid "Top Pages" +msgstr "Top Pages" From 50fb09104ea0b2714e8893cee0b3005b32e8bec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 17 Dec 2014 21:06:48 +0100 Subject: [PATCH 096/195] Filter by domain name --- iwla.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/iwla.py b/iwla.py index befe36d..7a43ceb 100755 --- a/iwla.py +++ b/iwla.py @@ -124,6 +124,7 @@ class IWLA(object): self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') self.log_re = re.compile(self.log_format_extracted) self.uri_re = re.compile(r'(?P[^\?]+)(\?(?P.+))?') + self.domain_name_re = re.compile(r'.*%s' % conf.domain_name) self.plugins = [(conf.PRE_HOOK_DIRECTORY , conf.pre_analysis_hooks), (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] @@ -582,6 +583,9 @@ class IWLA(object): self.current_analysis['days_stats'][cur_time.tm_mday] = stats def _newHit(self, hit): + if not self.domain_name_re.match(hit['server_name']): + return False + t = self._decodeTime(hit) cur_time = self.meta_infos['last_time'] @@ -609,7 +613,7 @@ class IWLA(object): for k in hit.keys(): if hit[k] == '-' or hit[k] == '*': hit[k] = '' - + self._appendHit(hit) return True @@ -637,8 +641,7 @@ class IWLA(object): groups = self.log_re.match(l) if groups: - if not self._newHit(groups.groupdict()): - continue + self._newHit(groups.groupdict()) else: self.logger.warning("No match for %s" % (l)) #break From f82e26e3bce8917516d3cbd4df179cb672b6f93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 17 Dec 2014 21:08:17 +0100 Subject: [PATCH 097/195] Update --- TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO b/TODO index c340d87..ea96611 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,7 @@ Other when pages truncated -translations doc auto generation doc enhancement Limit hits/pages/downloads by rate Automatic tests Add Licence Free memory as soon as possible -filter log with domain name From a74a6b8469e399d33838a40fb105e619b2f7318e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Wed, 17 Dec 2014 21:27:31 +0100 Subject: [PATCH 098/195] Display 'Others' when max displayed reached --- plugins/display/referers.py | 18 ++++++++++++++++++ plugins/display/top_downloads.py | 6 ++++++ plugins/display/top_hits.py | 7 +++++++ plugins/display/top_pages.py | 6 ++++++ 4 files changed, 37 insertions(+) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index db56caf..5676053 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -83,6 +83,12 @@ class IWLADisplayReferers(IPlugin): total_search[1] += search_engine_referers[r]['pages'] total_search[2] += search_engine_referers[r]['hits'] table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') total_external = [0]*3 table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) @@ -92,6 +98,12 @@ class IWLADisplayReferers(IPlugin): total_external[1] += referers[r]['pages'] total_external[2] += referers[r]['hits'] table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') total_robot = [0]*3 table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) @@ -101,6 +113,12 @@ class IWLADisplayReferers(IPlugin): total_robot[1] += robots_referers[r]['pages'] total_robot[2] += robots_referers[r]['hits'] table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') page.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 790dc38..140e508 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -56,6 +56,12 @@ class IWLADisplayTopDownloads(IPlugin): for (uri, entrance) in new_list: table.appendRow([generateHTMLLink(uri), entrance]) total_entrance[1] += entrance + if self.max_downloads: + others = 0 + for (uri, entrance) in top_downloads[self.max_downloads:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') page.appendBlock(table) display.addPage(page) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index 73d29ee..cb0be25 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -55,6 +55,13 @@ class IWLADisplayTopHits(IPlugin): for (uri, entrance) in new_list: table.appendRow([generateHTMLLink(uri), entrance]) total_hits[1] += entrance + if self.max_hits: + others = 0 + for (uri, entrance) in top_hits[self.max_hits:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + page.appendBlock(table) display.addPage(page) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index f0d8fd6..6ae97d8 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -55,6 +55,12 @@ class IWLADisplayTopPages(IPlugin): for (uri, entrance) in new_list: table.appendRow([generateHTMLLink(uri), entrance]) total_hits[1] += entrance + if self.max_pages: + others = 0 + for (uri, entrance) in top_pages[self.max_pages:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') page.appendBlock(table) display.addPage(page) From 4363c90197b86cab6e64235fe1c74ec1a65da65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 18 Dec 2014 07:46:12 +0100 Subject: [PATCH 099/195] Bug in valid visitor creation and count_hit_only_visitors --- iwla.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index 7a43ceb..4bfb630 100755 --- a/iwla.py +++ b/iwla.py @@ -520,8 +520,8 @@ class IWLA(object): self.valid_visitors = {} for (k,v) in visits.items(): if v['robot']: continue - if conf.count_hit_only_visitors and\ - (not v['viewed_pages']): + if not (conf.count_hit_only_visitors or\ + v['viewed_pages']): continue self.valid_visitors[k] = v From e740bf1e45e89b24c5967a20210c92e430a30f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 18 Dec 2014 19:54:31 +0100 Subject: [PATCH 100/195] Add licence information --- LICENCE | 674 +++++++++++++++++++++++++ TODO | 2 - conf.py | 2 +- display.py | 20 + iplugin.py | 20 + iwla.py | 19 + plugins/display/all_visits.py | 20 + plugins/display/referers.py | 20 + plugins/display/top_downloads.py | 20 + plugins/display/top_hits.py | 20 + plugins/display/top_pages.py | 20 + plugins/display/top_visitors.py | 20 + plugins/post_analysis/referers.py | 20 + plugins/post_analysis/reverse_dns.py | 20 + plugins/post_analysis/top_downloads.py | 20 + plugins/post_analysis/top_hits.py | 20 + plugins/post_analysis/top_pages.py | 20 + plugins/pre_analysis/page_to_hit.py | 20 + plugins/pre_analysis/robots.py | 20 + 19 files changed, 994 insertions(+), 3 deletions(-) create mode 100644 LICENCE diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENCE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/TODO b/TODO index ea96611..84bc632 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,5 @@ -Other when pages truncated doc auto generation doc enhancement Limit hits/pages/downloads by rate Automatic tests -Add Licence Free memory as soon as possible diff --git a/conf.py b/conf.py index 18bccee..3d8b4c2 100644 --- a/conf.py +++ b/conf.py @@ -28,4 +28,4 @@ max_downloads_displayed = 100 compress_output_files = ['html', 'css', 'js'] locale = 'fr' -# locale = 'fr_FR.utf8' + diff --git a/display.py b/display.py index d7bb9c6..7fe7a8b 100644 --- a/display.py +++ b/display.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import os import codecs import time diff --git a/iplugin.py b/iplugin.py index 29be462..2664190 100644 --- a/iplugin.py +++ b/iplugin.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import importlib import inspect import logging diff --git a/iwla.py b/iwla.py index 7a43ceb..4db29b4 100755 --- a/iwla.py +++ b/iwla.py @@ -1,4 +1,23 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# import os import shutil diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 54e6e76..442f4e2 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import time from iwla import IWLA diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 5676053..cbdbeea 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + from iwla import IWLA from iplugin import IPlugin from display import * diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index 140e508..b97c6a7 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + from iwla import IWLA from iplugin import IPlugin from display import * diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index cb0be25..f080004 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + from iwla import IWLA from iplugin import IPlugin from display import * diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 6ae97d8..53378ce 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + from iwla import IWLA from iplugin import IPlugin from display import * diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 4a34875..a48255b 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import time from iwla import IWLA diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index f4ef9e9..4a44b24 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import re import urllib diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index d83c6d0..6def2ff 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import socket from iwla import IWLA diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 9aa9c6a..31bb112 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import re from iwla import IWLA diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py index 05f272a..2f056b2 100644 --- a/plugins/post_analysis/top_hits.py +++ b/plugins/post_analysis/top_hits.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + from iwla import IWLA from iplugin import IPlugin diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index 8d938dd..e47413e 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import re from iwla import IWLA diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index c202efb..9093c66 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import re from iwla import IWLA diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 83a31a4..a311588 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + import re from iwla import IWLA From 2f05a70ee505456e11c6fa3fa84857a019ebc51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 18 Dec 2014 21:57:44 +0100 Subject: [PATCH 101/195] 0 in place of nothing in total year overview --- iwla.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iwla.py b/iwla.py index 8cfd6ed..609108d 100755 --- a/iwla.py +++ b/iwla.py @@ -142,7 +142,7 @@ class IWLA(object): self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted) self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') self.log_re = re.compile(self.log_format_extracted) - self.uri_re = re.compile(r'(?P[^\?]+)(\?(?P.+))?') + self.uri_re = re.compile(r'(?P[^\?#]+)(\?(?P[^#]+))?(#.*)?') self.domain_name_re = re.compile(r'.*%s' % conf.domain_name) self.plugins = [(conf.PRE_HOOK_DIRECTORY , conf.pre_analysis_hooks), (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), @@ -456,6 +456,7 @@ class IWLA(object): total[0] = self._('Total') total[5] = bytesToStr(total[5]) total[6] = bytesToStr(total[6]) + total[7] = u'' months.appendRow(total) page.appendBlock(months) From a35d462cb773a135cd09e6e9e12bcac1a041c7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 11:34:25 +0100 Subject: [PATCH 102/195] Replace # for module description by """ (help auto extraction) --- default_conf.py | 6 +- iwla.py | 165 ++++++++++++----------- plugins/display/all_visits.py | 48 +++---- plugins/display/referers.py | 56 ++++---- plugins/display/top_downloads.py | 50 +++---- plugins/display/top_hits.py | 50 +++---- plugins/display/top_pages.py | 50 +++---- plugins/display/top_visitors.py | 46 +++---- plugins/post_analysis/referers.py | 68 +++++----- plugins/post_analysis/reverse_dns.py | 52 +++---- plugins/post_analysis/top_downloads.py | 50 +++---- plugins/post_analysis/top_hits.py | 50 +++---- plugins/post_analysis/top_pages.py | 50 +++---- plugins/pre_analysis/page_to_hit.py | 50 +++---- plugins/pre_analysis/robots.py | 52 +++---- iwla_convert.pl => tools/iwla_convert.pl | 0 16 files changed, 422 insertions(+), 421 deletions(-) rename iwla_convert.pl => tools/iwla_convert.pl (100%) diff --git a/default_conf.py b/default_conf.py index c28a4c6..e1b94b7 100644 --- a/default_conf.py +++ b/default_conf.py @@ -2,9 +2,9 @@ import os # Default configuration -# Default directory where to store database information +# Default database directory DB_ROOT = './output_db' -# Default directory where to create html files +# Default HTML output directory DISPLAY_ROOT = './output' # Hooks directories (don't edit) @@ -49,7 +49,7 @@ icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') # CSS path (you can add yours) css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] -# Extensions to compress in gzip during display build +# Extensions to compress in gzip during display build compress_output_files = [] # Path to locales files diff --git a/iwla.py b/iwla.py index 609108d..0bcc3fc 100755 --- a/iwla.py +++ b/iwla.py @@ -41,88 +41,89 @@ del _ from iplugin import * from display import * -# -# Main class IWLA -# Parse Log, compute them, call plugins and produce output -# For now, only HTTP log are valid -# -# Plugin requirements : -# None -# -# Conf values needed : -# analyzed_filename -# domain_name -# locales_path -# compress_output_files* -# -# Output files : -# DB_ROOT/meta.db -# DB_ROOT/year/month/iwla.db -# OUTPUT_ROOT/index.html -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# -# meta : -# last_time -# start_analysis_time -# stats => -# year => -# month => -# viewed_bandwidth -# not_viewed_bandwidth -# viewed_pages -# viewed_hits -# nb_visits -# nb_visitors -# -# month_stats : -# viewed_bandwidth -# not_viewed_bandwidth -# viewed_pages -# viewed_hits -# nb_visits -# -# days_stats : -# day => -# viewed_bandwidth -# not_viewed_bandwidth -# viewed_pages -# viewed_hits -# nb_visits -# nb_visitors -# -# visits : -# remote_addr => -# remote_addr -# remote_ip -# viewed_pages -# viewed_hits -# not_viewed_pages -# not_viewed_hits -# bandwidth -# last_access -# requests => -# [fields_from_format_log] -# extract_request => -# extract_uri -# extract_parameters* -# extract_referer* => -# extract_uri -# extract_parameters* -# robot -# hit_only -# is_page -# -# valid_visitors: -# month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Main class IWLA +Parse Log, compute them, call plugins and produce output +For now, only HTTP log are valid + +Plugin requirements : + None + +Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + +Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + +meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + +month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + +days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + +visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + +valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + +Statistics update : + None + +Statistics deletion : + None +""" + class IWLA(object): diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 442f4e2..4f4dd52 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -24,30 +24,30 @@ from iwla import IWLA from iplugin import IPlugin from display import * -# -# Display hook -# -# Create All visits page -# -# Plugin requirements : -# None -# -# Conf values needed : -# display_visitor_ip* -# -# Output files : -# OUTPUT_ROOT/year/month/all_visits.html -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# None -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Display hook + +Create All visits page + +Plugin requirements : + None + +Conf values needed : + display_visitor_ip* + +Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" class IWLADisplayAllVisits(IPlugin): def __init__(self, iwla): diff --git a/plugins/display/referers.py b/plugins/display/referers.py index cbdbeea..bdd04a5 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -22,34 +22,34 @@ from iwla import IWLA from iplugin import IPlugin from display import * -# -# Display hook -# -# Create Referers page -# -# Plugin requirements : -# post_analysis/referers -# -# Conf values needed : -# max_referers_displayed* -# create_all_referers_page* -# max_key_phrases_displayed* -# create_all_key_phrases_page* -# -# Output files : -# OUTPUT_ROOT/year/month/referers.html -# OUTPUT_ROOT/year/month/key_phrases.html -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# None -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Display hook + +Create Referers page + +Plugin requirements : + post_analysis/referers + +Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + +Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" class IWLADisplayReferers(IPlugin): def __init__(self, iwla): diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py index b97c6a7..f5d4a60 100644 --- a/plugins/display/top_downloads.py +++ b/plugins/display/top_downloads.py @@ -22,31 +22,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * -# -# Display hook -# -# Create TOP downloads page -# -# Plugin requirements : -# post_analysis/top_downloads -# -# Conf values needed : -# max_downloads_displayed* -# create_all_downloads_page* -# -# Output files : -# OUTPUT_ROOT/year/month/top_downloads.html -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# None -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Display hook + +Create TOP downloads page + +Plugin requirements : + post_analysis/top_downloads + +Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + +Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" class IWLADisplayTopDownloads(IPlugin): def __init__(self, iwla): diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py index f080004..412b3fe 100644 --- a/plugins/display/top_hits.py +++ b/plugins/display/top_hits.py @@ -22,31 +22,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * -# -# Display hook -# -# Create TOP hits page -# -# Plugin requirements : -# post_analysis/top_hits -# -# Conf values needed : -# max_hits_displayed* -# create_all_hits_page* -# -# Output files : -# OUTPUT_ROOT/year/month/top_hits.html -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# None -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Display hook + +Create TOP hits page + +Plugin requirements : + post_analysis/top_hits + +Conf values needed : + max_hits_displayed* + create_all_hits_page* + +Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" class IWLADisplayTopHits(IPlugin): def __init__(self, iwla): diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py index 53378ce..b44bf81 100644 --- a/plugins/display/top_pages.py +++ b/plugins/display/top_pages.py @@ -22,31 +22,31 @@ from iwla import IWLA from iplugin import IPlugin from display import * -# -# Display hook -# -# Create TOP pages page -# -# Plugin requirements : -# post_analysis/top_pages -# -# Conf values needed : -# max_pages_displayed* -# create_all_pages_page* -# -# Output files : -# OUTPUT_ROOT/year/month/top_pages.html -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# None -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Display hook + +Create TOP pages page + +Plugin requirements : + post_analysis/top_pages + +Conf values needed : + max_pages_displayed* + create_all_pages_page* + +Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" class IWLADisplayTopPages(IPlugin): def __init__(self, iwla): diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index a48255b..b7d3b66 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -24,29 +24,29 @@ from iwla import IWLA from iplugin import IPlugin from display import * -# -# Display hook -# -# Create TOP visitors block -# -# Plugin requirements : -# None -# -# Conf values needed : -# display_visitor_ip* -# -# Output files : -# OUTPUT_ROOT/year/month/index.html -# -# Statistics creation : -# None -# -# Statistics update : -# None -# -# Statistics deletion : -# None -# +""" +Display hook + +Create TOP visitors block + +Plugin requirements : + None + +Conf values needed : + display_visitor_ip* + +Output files : + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" class IWLADisplayTopVisitors(IPlugin): def __init__(self, iwla): diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index 4a44b24..64ec66f 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -26,40 +26,40 @@ from iplugin import IPlugin import awstats_data -# -# Post analysis hook -# -# Extract referers and key phrases from requests -# -# Plugin requirements : -# None -# -# Conf values needed : -# domain_name -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# month_stats : -# referers => -# pages -# hits -# robots_referers => -# pages -# hits -# search_engine_referers => -# pages -# hits -# key_phrases => -# phrase -# -# Statistics deletion : -# None -# +""" +Post analysis hook + +Extract referers and key phrases from requests + +Plugin requirements : + None + +Conf values needed : + domain_name + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + +Statistics deletion : + None +""" class IWLAPostAnalysisReferers(IPlugin): def __init__(self, iwla): diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py index 6def2ff..c63965f 100644 --- a/plugins/post_analysis/reverse_dns.py +++ b/plugins/post_analysis/reverse_dns.py @@ -23,32 +23,32 @@ import socket from iwla import IWLA from iplugin import IPlugin -# -# Post analysis hook -# -# Replace IP by reverse DNS names -# -# Plugin requirements : -# None -# -# Conf values needed : -# reverse_dns_timeout* -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# valid_visitors: -# remote_addr -# dns_name_replaced -# dns_analyzed -# -# Statistics deletion : -# None -# +""" +Post analysis hook + +Replace IP by reverse DNS names + +Plugin requirements : + None + +Conf values needed : + reverse_dns_timeout* + +Output files : + None + +Statistics creation : + None + +Statistics update : +valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + +Statistics deletion : + None +""" class IWLAPostAnalysisReverseDNS(IPlugin): DEFAULT_DNS_TIMEOUT = 0.5 diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 31bb112..7b28c33 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -23,31 +23,31 @@ import re from iwla import IWLA from iplugin import IPlugin -# -# Post analysis hook -# -# Count TOP downloads -# -# Plugin requirements : -# None -# -# Conf values needed : -# None -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# month_stats: -# top_downloads => -# uri -# -# Statistics deletion : -# None -# +""" +Post analysis hook + +Count TOP downloads + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_downloads => + uri + +Statistics deletion : + None +""" class IWLAPostAnalysisTopDownloads(IPlugin): def __init__(self, iwla): diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py index 2f056b2..64446c7 100644 --- a/plugins/post_analysis/top_hits.py +++ b/plugins/post_analysis/top_hits.py @@ -21,31 +21,31 @@ from iwla import IWLA from iplugin import IPlugin -# -# Post analysis hook -# -# Count TOP hits -# -# Plugin requirements : -# None -# -# Conf values needed : -# None -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# month_stats: -# top_hits => -# uri -# -# Statistics deletion : -# None -# +""" +Post analysis hook + +Count TOP hits + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_hits => + uri + +Statistics deletion : + None +""" class IWLAPostAnalysisTopHits(IPlugin): def __init__(self, iwla): diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index e47413e..a5d086c 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -23,31 +23,31 @@ import re from iwla import IWLA from iplugin import IPlugin -# -# Post analysis hook -# -# Count TOP pages -# -# Plugin requirements : -# None -# -# Conf values needed : -# None -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# month_stats: -# top_pages => -# uri -# -# Statistics deletion : -# None -# +""" +Post analysis hook + +Count TOP pages + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_pages => + uri + +Statistics deletion : + None +""" class IWLAPostAnalysisTopPages(IPlugin): def __init__(self, iwla): diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 9093c66..a3919c4 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -23,31 +23,31 @@ import re from iwla import IWLA from iplugin import IPlugin -# -# Pre analysis hook -# Change page into hit and hit into page into statistics -# -# Plugin requirements : -# None -# -# Conf values needed : -# page_to_hit_conf* -# hit_to_page_conf* -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# visits : -# remote_addr => -# is_page -# -# Statistics deletion : -# None -# +""" +Pre analysis hook +Change page into hit and hit into page into statistics + +Plugin requirements : + None + +Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + +Output files : + None + +Statistics creation : + None + +Statistics update : +visits : + remote_addr => + is_page + +Statistics deletion : + None +""" class IWLAPreAnalysisPageToHit(IPlugin): diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index a311588..662ce57 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -25,32 +25,32 @@ from iplugin import IPlugin import awstats_data -# -# Pre analysis hook -# -# Filter robots -# -# Plugin requirements : -# None -# -# Conf values needed : -# page_to_hit_conf* -# hit_to_page_conf* -# -# Output files : -# None -# -# Statistics creation : -# None -# -# Statistics update : -# visits : -# remote_addr => -# robot -# -# Statistics deletion : -# None -# +""" +Pre analysis hook + +Filter robots + +Plugin requirements : + None + +Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + +Output files : + None + +Statistics creation : + None + +Statistics update : +visits : + remote_addr => + robot + +Statistics deletion : + None +""" class IWLAPreAnalysisRobots(IPlugin): def __init__(self, iwla): diff --git a/iwla_convert.pl b/tools/iwla_convert.pl similarity index 100% rename from iwla_convert.pl rename to tools/iwla_convert.pl From a37b661c1fdfd7a970b8b7f6861fa220657c4839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 11:35:00 +0100 Subject: [PATCH 103/195] Add tools to automatically extract documentation --- tools/extract_doc.py | 29 +++++++++++++++++++++++++++++ tools/extract_docs.sh | 16 ++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100755 tools/extract_doc.py create mode 100755 tools/extract_docs.sh diff --git a/tools/extract_doc.py b/tools/extract_doc.py new file mode 100755 index 0000000..0f5fbc3 --- /dev/null +++ b/tools/extract_doc.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python + +import sys + +filename = sys.argv[1] + +if filename.endswith('__init__.py'): + sys.exit(0) + +package_name = filename.replace('/', '.').replace('.py', '') +sys.stdout.write('**%s**' % (package_name)) +sys.stdout.write('\n\n') +# sys.stdout.write('-' * len(package_name)) +# sys.stdout.write('\n\n') + +sys.stderr.write('\tExtract doc from %s\n' % (filename)) + +with open(filename) as infile: + copy = False + for line in infile: + if line.strip() in ['"""', "'''"]: + if not copy: + copy = True + else: + break + elif copy: + sys.stdout.write(line) + +sys.stdout.write('\n\n') diff --git a/tools/extract_docs.sh b/tools/extract_docs.sh new file mode 100755 index 0000000..e556330 --- /dev/null +++ b/tools/extract_docs.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +MODULES_TARGET="docs/modules.md" +MAIN_MD="docs/main.md" +TARGET_MD="docs/index.md" + +rm -f "${MODULES_TARGET}" + +echo "Generate doc from iwla.py" +python tools/extract_doc.py iwla.py > "${MODULES_TARGET}" + +echo "Generate plugins documentation" +find plugins -name '*.py' -exec python tools/extract_doc.py \{\} \; >> "${MODULES_TARGET}" + +echo "Generate ${TARGET_MD}" +cat "${MAIN_MD}" "${MODULES_TARGET}" > "${TARGET_MD}" From f92cec4428b15dec25af1058f3df40ee1dc0a672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 11:35:27 +0100 Subject: [PATCH 104/195] Add Markdown documentation --- docs/main.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docs/main.md diff --git a/docs/main.md b/docs/main.md new file mode 100644 index 0000000..389e653 --- /dev/null +++ b/docs/main.md @@ -0,0 +1,74 @@ +iwla +==== + +Introduction +------------ + +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modulor : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. + +Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). + +Usage +----- + +./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + + -c : Clean output (database and HTML) before starting + -i : Read data from stdin instead of conf.analyzed_filename + -f : Read data from FILE instead of conf.analyzed_filename + -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + +Basic usage +----------- + +In addition to command line, iwla read parameters in _ default_conf.py _. User can override default values using _conf.py_ file. Each module requires its own parameters. +Main valued to edit are : + analyzed_filename : web server log + domaine_name : domain name to filter + pre_analysis_hooks + post_analysis_hooks + display_hooks + locale + +You can then launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type + python -m SimpleHTTPServer 8000 +Open your favorite web browser at _http://localhost:8000_. Enjoy ! + +Interesting default configuration values +---------------------------------------- + + DB_ROOT : Default database directory + DISPLAY_ROOT : Default HTML output directory + log_format : Web server log format (nginx style). Default is what apache log + time_format : Time format used in log format + pages_extensions : Extensions that are considered as a HTML page (or result) + viewed_http_codes : HTTP codes that are cosidered OK + count_hit_only_visitors : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + multimedia_files : Multimedia extensions (not accounted as downloaded files) + css_path : CSS path (you can add yours) + compress_output_files : Extensions to compress in gzip during display build + +Plugins +------- + +As previously described, plugins acts like UNIX pipes : final statistics are constantly updated by each plugin to produce final result. We have three type of plugins : + Pre analysis plugins : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + Post analysis plugins : Called after basic statistics computation. They are in charge to enlight them with each own algorithms + Display plugins : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in pre_analysis_hooks, post_analysis_hooks and display_hooks list. + +Create a Plugins +---------------- + +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/your_plugin.py_). + +Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). + +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and graphs. + +Modules +------- + +Optional configuration values ends with *. + From d6bc6ea19285fdb6d4cbb9ed9698d861ccd3fb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 11:35:49 +0100 Subject: [PATCH 105/195] Update TODO --- TODO | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO b/TODO index 84bc632..c3e15d5 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -doc auto generation doc enhancement Limit hits/pages/downloads by rate Automatic tests From 54b7b59899565938c72e772dac37858f87acc3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 17:21:45 +0100 Subject: [PATCH 106/195] Update documentation --- default_conf.py | 6 ++-- docs/main.md | 78 +++++++++++++++++++++++++++----------------- tools/extract_doc.py | 9 ++--- 3 files changed, 56 insertions(+), 37 deletions(-) diff --git a/default_conf.py b/default_conf.py index e1b94b7..3c42a1e 100644 --- a/default_conf.py +++ b/default_conf.py @@ -17,7 +17,7 @@ META_PATH = os.path.join(DB_ROOT, 'meta.db') # Database filename per month DB_FILENAME = 'iwla.db' -# Web server log format (nginx style). Default is what apache log +# Web server log format (nginx style). Default is apache log format log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ '"$request" $status $body_bytes_sent ' +\ '"$http_referer" "$http_user_agent"' @@ -30,7 +30,7 @@ pre_analysis_hooks = [] post_analysis_hooks = [] display_hooks = [] -# Extensions that are considered as a HTML page (or result) +# Extensions that are considered as a HTML page (or result) in opposite to hits pages_extensions = ['/', 'htm', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] # HTTP codes that are cosidered OK viewed_http_codes = [200, 304] @@ -49,7 +49,7 @@ icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') # CSS path (you can add yours) css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] -# Extensions to compress in gzip during display build +# Files extensions to compress in gzip during display build compress_output_files = [] # Path to locales files diff --git a/docs/main.md b/docs/main.md index 389e653..8fe2240 100644 --- a/docs/main.md +++ b/docs/main.md @@ -4,14 +4,14 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modulor : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). Usage ----- -./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] -c : Clean output (database and HTML) before starting -i : Read data from stdin instead of conf.analyzed_filename @@ -21,54 +21,72 @@ Usage Basic usage ----------- -In addition to command line, iwla read parameters in _ default_conf.py _. User can override default values using _conf.py_ file. Each module requires its own parameters. -Main valued to edit are : - analyzed_filename : web server log - domaine_name : domain name to filter - pre_analysis_hooks - post_analysis_hooks - display_hooks - locale +In addition to command line, iwla read parameters in default_conf.py. User can override default values using _conf.py_ file. Each module requires its own parameters. + +Main values to edit are : + + * **analyzed_filename** : web server log + * **domaine_name** : domain name to filter + * **pre_analysis_hooks** : List of pre analysis hooks + * **post_analysis_hooks** : List of post analysis hooks + * **display_hooks** : List of display hooks + * **locale** : Displayed locale (_en_ or _fr_) + +Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type -You can then launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type python -m SimpleHTTPServer 8000 + Open your favorite web browser at _http://localhost:8000_. Enjoy ! +**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. + + Interesting default configuration values ---------------------------------------- - DB_ROOT : Default database directory - DISPLAY_ROOT : Default HTML output directory - log_format : Web server log format (nginx style). Default is what apache log - time_format : Time format used in log format - pages_extensions : Extensions that are considered as a HTML page (or result) - viewed_http_codes : HTTP codes that are cosidered OK - count_hit_only_visitors : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) - multimedia_files : Multimedia extensions (not accounted as downloaded files) - css_path : CSS path (you can add yours) - compress_output_files : Extensions to compress in gzip during display build + * **DB_ROOT** : Default database directory (default ./output_db) + * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **log_format** : Web server log format (nginx style). Default is apache log format + * **time_format** : Time format used in log format + * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits + * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) + * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) + * **css_path** : CSS path (you can add yours) + * **compress_output_files** : Files extensions to compress in gzip during display build Plugins ------- -As previously described, plugins acts like UNIX pipes : final statistics are constantly updated by each plugin to produce final result. We have three type of plugins : - Pre analysis plugins : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... - Post analysis plugins : Called after basic statistics computation. They are in charge to enlight them with each own algorithms - Display plugins : They are in charge to produce HTML files from statistics. +As previously described, plugins acts like UNIX pipes : statistics are constantly updated by each plugin to produce final result. We have three type of plugins : -To use plugins, just insert their name in pre_analysis_hooks, post_analysis_hooks and display_hooks list. + * **Pre analysis plugins** : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms + * **Display plugins** : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. + +Statistics are stored in dictionaries : + + * **month_stats** : Statistics of current analysed month + * **valid_visitor** : A subset of month_stats without robots + * **days_stats** : Statistics of current analysed day + * **visits** : All visitors with all of its requests + * **meta** : Final result of month statistics (by year) Create a Plugins ---------------- -To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/your_plugin.py_). +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). -For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and graphs. +The two functions to overload are _load(self)_ that must returns True or False if all is good (or not). It's called after _init_. The second is _hook(self)_ that is the body of plugins. -Modules -------- +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and bar graphs. + +Plugins +======= Optional configuration values ends with *. diff --git a/tools/extract_doc.py b/tools/extract_doc.py index 0f5fbc3..eee534b 100755 --- a/tools/extract_doc.py +++ b/tools/extract_doc.py @@ -8,10 +8,11 @@ if filename.endswith('__init__.py'): sys.exit(0) package_name = filename.replace('/', '.').replace('.py', '') -sys.stdout.write('**%s**' % (package_name)) -sys.stdout.write('\n\n') -# sys.stdout.write('-' * len(package_name)) +sys.stdout.write('%s' % (package_name)) +sys.stdout.write('\n') # sys.stdout.write('\n\n') +sys.stdout.write('-' * len(package_name)) +sys.stdout.write('\n\n') sys.stderr.write('\tExtract doc from %s\n' % (filename)) @@ -24,6 +25,6 @@ with open(filename) as infile: else: break elif copy: - sys.stdout.write(line) + sys.stdout.write(' %s' % (line)) sys.stdout.write('\n\n') From d47a4609d87cd2b71e3b1b34ac80dbd04e35b6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 17:50:34 +0100 Subject: [PATCH 107/195] Update locales --- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 2596 -> 2934 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 311 ++++++++++++++++------------- 2 files changed, 175 insertions(+), 136 deletions(-) diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index 933477e0bbe4248cb5cde51610aeb02461f0fee0..360249b9be26cf63291f68baccb3bc9bf31d6867 100644 GIT binary patch literal 2934 zcmZ{kO^g&p6vqn%#SxKD6%{EJ5X4?)_-2+5cXxIL++~;9fhaN2-kI9jhMw-Gx_Wje z#t;uA9yAdX4n_@LNZf<*LOei1Ool|G2M-)HhL~_sPF_s(Ac_9}-L*S|(MrGm)vKz0 z^O067U1?VelfD1HS<8 z1+Rd3#5Jp52k(Ra4R}BJJxDu0*zsH7Qs}oqe*dTCUm*AW8{~J3VTAfJko&IzSAiQr ze%EW~4_f^Y$WVqYkJ<4PAnl#B`h=aIv^)(mo(QC$Z-Nhk=Rodr9)wHcg4I8=`bCib zT(aX=K>B;l>R*H0_d5`exMBGdNPD-e{wv6H{|)4RcR>2VkLgzqUDVT>k>d zbw!ZpQv#WvV^()T?h}BtYe4!p17ZvDHrQBz{DO}|{{xe>yBtQBf$PAPU>sbhM`0vJhy2%c11|NfLh3v6oJTErp`5DLtDqW3rz_uOI1Hn;=1CTs~xp)G? zvwR-HwjNS|?1u2nSs&{lY3uWSSqi5EKXhxcpmxYJS!c|xtE^X6lS(U{DW_FSMpN32 z?PSx7(=Q?|`XcT5qA#galGup8rqZw?`rV*5?bXbb=x@oI+Y$p|5U3e14CJH^8={1v zlB!ZvV?t?kjO+Qa7z~VdgQ^mPGe+sa_2u#M@Lh`Bq{E5OY!*Xmf}#^ww*-Qq#Ntp0 zH;%XgC7n5v_yW?xD^TL)`C!Db8ygub6=c06s<}pq5m!^HQ+T(;NEjf7qoI*aPfe?u z>;!f+Y+|CBxj$Mp0unNmQSH^eK#ZCxo?v#U<0>_oK@J93pv1U}C?+#8Zd~KV#;eAn z)0LB<7UM~y!5AxH)Rj7FnQ`{!Ge)I5W7N}(g>a@48rK)c%ZJ4YCXqvF2X5-{l&Tu% zaLqXZw~?r#^rn3`H#S;v2DE~2Vc?W-LPfbPU)bRkwmF5pvaq|jWBZnY!3x$nWyOvD ze_6he&*ymRP6auReHRWC<#?DFx7MDO`{J~xUaU886?&>+;{a9%^#m8nsVKK$J(?RU z;wrs9RL+eY9vSR7UFgZ@aM_FsuuUt1yGG5Jt~L9eV%xjI&6|MAL@v!}C;?%>8d zgF!W{c|pA>_e^*u_mT>5osFtF{jH*mT6JY;tS4&8LeI|JD~?^jFvdbv^9;s!^%U}$ z%5(?O>8cvYwk^tRU*sW)rLSUX+OvLpmR{9W11>W~c4~^Z8JfW|E{)Ra>>3EudxoOy z8nbmOtFYQVp56e~Zxcn^Op7*bUq!v9?~$;jP@ZYkDr^+TE)Eb^SIblIzpHp_DoVUq z9N}mQj;Al&U#-~dlyG|%o1tozneHokE5=Pl+RIW$y zeTC9aP+Mc^?@#FbTDSyfTs5ZE#*(Xytbo*(O~Z5Ws<=rajE?^a~QlPtGq o@1N3lHQrx*@l_!p}S^w zC*hz+6AvELgBQUVu&sQD0bg-`~dQ(k9f(xpStmH9KVHfj_)0Rf;{TH(|>~!w?CoS z{Ts@@SD>7GC5z>p8=%bF1jV22P|iC5C9XqGe-W}&y$r=(1xkG8A&)x6tIpjm!j0&E zU|j63VA49c7TyIlycZ6@_3#iBd&i;JFGKMwfa2#V$fI82C3aqe67P2$--SHteaDZX z#Q6&-`<;U_|7R%soOk*KDEs~H#xFWva^EjQiNilo?DY^F*?%3p2X2O9cMlZ1d!0T6 z#qTjUKI3>4%DIj~iI;)0e+}}en3wo_8j8I)pzQx9yc3>=-YoruKaCPe-j zyO0~({R~J9a>(Yck59P%!;X(biJinp+EzqzQ}TWQc@j}WwVED@7Q$NOSCUja5ZJ6U zbTWnznAt$A02Iwt^&G(TLShv#N$#CT5}9?}wFzpkn9M{6zl8>lD2;j%FjfO^umZg_k0U zIuIpR9rQzWuvu&K3XOUJ52u`m($BnAhy29q#F#MaH5(P*8a3g^NLx)rA-*1ttZoHn z!Bq6}0S-qkHCeW5G7hRis3z^a#3BpNwDIHeyvm?QLnaushMKm%4H6raldi6wi()n1 ztk?axtx8d&EA*meCZ%^R;-Yj%T=X>J5iXP>>(|swaa#sPED4);n?6?6nY~BprHG6`2jEA@8t(|f4;D5aL4dyiFsbp$VUI2_LR;) zUC0gY$mMgnUJ0sK;^vZ?j{^lg9W||A=`87IleA~{RqI@EUpcBj$Lz4$Bs;v4@$1f` ziSdciWhe7}xn45Gnh>+?2JTt2Xm>Vheh@yR%kzGm7`u0-H0JGDo+sOrq26d%jw(S| zE$BV7f$e?Xgyf<%6>opLpd0O~v0|*R(boCC-PfEckdVj6ioGv+Zh;(QDl(P8GHyVo8iojg3kQl9-4`+nMB*pQmwNjURF(=BghrGPxF$jXqIU*wUJg=*FcnJ z7e&=I=ITtBvD!VJW`NXRi=vAY$8{ z;HN>v()OUz|QCFl$BsW1yUle`ZB*WCF_r1Gw6I6n=FY9 z<$rac9wbJ0&SdUVl?i1Ta4vi$zvkwGvJUxqw3-xYcRd<@J2uAata^&3OnD+KwWb;C ziqY}4vF^$|)nw7tG8IKPBqqhqQqrua@ownS|6FKyoo2rT>_}bSa9gfW@j*UcSE=b( ITBi_@% diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot index ce1f3a9..2286f1d 100644 --- a/locales/fr_FR/LC_MESSAGES/iwla.pot +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -5,240 +5,279 @@ msgid "" msgstr "" "Project-Id-Version: iwla\n" -"POT-Creation-Date: 2014-12-16 21:36+CET\n" -"PO-Revision-Date: 2014-12-17 19:06+0100\n" +"POT-Creation-Date: 2014-12-19 17:43+CET\n" +"PO-Revision-Date: 2014-12-19 17:43+0100\n" "Last-Translator: Soutadé \n" "Language-Team: iwla\n" +"Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -"Language: fr_FR\n" "X-Generator: Poedit 1.6.10\n" "X-Poedit-SourceCharset: UTF-8\n" -#: iwla.py:343 -msgid "Statistics" -msgstr "Statistiques" +#: display.py:32 +msgid "April" +msgstr "Avril" -#: iwla.py:349 -msgid "By day" -msgstr "Par jour" +#: display.py:32 +msgid "February" +msgstr "Février" -#: iwla.py:349 -msgid "Day" -msgstr "Jour" +#: display.py:32 +msgid "January" +msgstr "Janvier" -#: iwla.py:349 iwla.py:402 -msgid "Not viewed Bandwidth" -msgstr "Traffic non vu" - -#: iwla.py:349 iwla.py:402 -msgid "Visits" -msgstr "Visites" - -#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 -#: plugins/display/referers.py:78 plugins/display/referers.py:118 -#: plugins/display/top_downloads.py:74 plugins/display/top_visitors.py:53 -msgid "Hits" -msgstr "Hits" - -#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 -#: plugins/display/referers.py:78 plugins/display/referers.py:118 -#: plugins/display/top_visitors.py:53 -msgid "Pages" -msgstr "Pages" - -#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 -#: plugins/display/top_visitors.py:53 -msgid "Bandwidth" -msgstr "Bande passante" - -#: iwla.py:386 -msgid "Average" -msgstr "Moyenne" - -#: iwla.py:391 iwla.py:429 -msgid "Total" -msgstr "Total" - -#: iwla.py:400 -msgid "Apr" -msgstr "Avr" - -#: iwla.py:400 -msgid "Aug" -msgstr "Août" - -#: iwla.py:400 -msgid "Dec" -msgstr "Déc" - -#: iwla.py:400 -msgid "Feb" -msgstr "Fév" - -#: iwla.py:400 -msgid "Jan" -msgstr "Jan" - -#: iwla.py:400 +#: display.py:32 msgid "July" -msgstr "Jui" +msgstr "Juillet" -#: iwla.py:400 +#: display.py:32 +msgid "March" +msgstr "Mars" + +#: display.py:32 iwla.py:428 msgid "June" msgstr "Juin" -#: iwla.py:400 -msgid "Mar" -msgstr "Mars" - -#: iwla.py:400 +#: display.py:32 iwla.py:428 msgid "May" msgstr "Mai" -#: iwla.py:400 +#: display.py:33 +msgid "August" +msgstr "Août" + +#: display.py:33 +msgid "December" +msgstr "Décembre" + +#: display.py:33 +msgid "November" +msgstr "Novembre" + +#: display.py:33 +msgid "October" +msgstr "Octobre" + +#: display.py:33 +msgid "September" +msgstr "Septembre" + +#: iwla.py:371 +msgid "Statistics" +msgstr "Statistiques" + +#: iwla.py:377 +msgid "By day" +msgstr "Par jour" + +#: iwla.py:377 +msgid "Day" +msgstr "Jour" + +#: iwla.py:377 iwla.py:430 +msgid "Not viewed Bandwidth" +msgstr "Traffic non vu" + +#: iwla.py:377 iwla.py:430 +msgid "Visits" +msgstr "Visites" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +msgid "Hits" +msgstr "Hits" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_visitors.py:72 +msgid "Pages" +msgstr "Pages" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/top_visitors.py:72 +msgid "Bandwidth" +msgstr "Bande passante" + +#: iwla.py:414 +msgid "Average" +msgstr "Moyenne" + +#: iwla.py:419 iwla.py:457 +msgid "Total" +msgstr "Total" + +#: iwla.py:428 +msgid "Apr" +msgstr "Avr" + +#: iwla.py:428 +msgid "Aug" +msgstr "Août" + +#: iwla.py:428 +msgid "Dec" +msgstr "Déc" + +#: iwla.py:428 +msgid "Feb" +msgstr "Fév" + +#: iwla.py:428 +msgid "Jan" +msgstr "Jan" + +#: iwla.py:428 +msgid "Jul" +msgstr "Jui" + +#: iwla.py:428 +msgid "Mar" +msgstr "Mars" + +#: iwla.py:428 msgid "Nov" msgstr "Nov" -#: iwla.py:400 +#: iwla.py:428 msgid "Oct" msgstr "Oct" -#: iwla.py:400 +#: iwla.py:428 msgid "Sep" msgstr "Sep" -#: iwla.py:401 +#: iwla.py:429 msgid "Summary" msgstr "Résumé" -#: iwla.py:402 +#: iwla.py:430 msgid "Month" msgstr "Mois" -#: iwla.py:402 +#: iwla.py:430 msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:402 iwla.py:412 +#: iwla.py:430 iwla.py:440 msgid "Details" msgstr "Détails" -#: iwla.py:436 +#: iwla.py:465 msgid "Statistics for" msgstr "Statistiques pour" -#: iwla.py:443 +#: iwla.py:472 msgid "Last update" msgstr "Dernière mise à jour" -#: plugins/display/all_visits.py:45 plugins/display/all_visits.py:73 -msgid "All visits" -msgstr "Toutes les visites" - -#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 msgid "Host" msgstr "Hôte" -#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 msgid "Last seen" msgstr "Dernière visite" -#: plugins/display/all_visits.py:74 plugins/display/top_visitors.py:53 +#: plugins/display/all_visits.py:92 +msgid "All visits" +msgstr "Toutes les visites" + +#: plugins/display/all_visits.py:93 plugins/display/top_visitors.py:72 msgid "Top visitors" msgstr "Top visiteurs" -#: plugins/display/referers.py:72 plugins/display/referers.py:78 +#: plugins/display/referers.py:95 msgid "Connexion from" msgstr "Connexion depuis" -#: plugins/display/referers.py:78 plugins/display/referers.py:118 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 msgid "Origin" msgstr "Origine" -#: plugins/display/referers.py:82 plugins/display/referers.py:121 +#: plugins/display/referers.py:99 plugins/display/referers.py:156 msgid "Search Engine" msgstr "Moteur de recherche" -#: plugins/display/referers.py:91 plugins/display/referers.py:132 -msgid "External URL" -msgstr "URL externe" - -#: plugins/display/referers.py:100 plugins/display/referers.py:143 -msgid "External URL (robot)" -msgstr "URL externe (robot)" - -#: plugins/display/referers.py:112 -msgid "Top Referers" -msgstr "Top Origines" - -#: plugins/display/referers.py:114 -msgid "All Referers" -msgstr "Toutes les origines" - -#: plugins/display/referers.py:128 plugins/display/referers.py:139 -#: plugins/display/referers.py:150 plugins/display/referers.py:187 -#: plugins/display/top_downloads.py:80 plugins/display/top_hits.py:79 -#: plugins/display/top_pages.py:79 plugins/display/top_visitors.py:73 +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 msgid "Others" msgstr "Autres" -#: plugins/display/referers.py:158 -msgid "Key Phrases" -msgstr "Phrases clé" +#: plugins/display/referers.py:114 plugins/display/referers.py:167 +msgid "External URL" +msgstr "URL externe" -#: plugins/display/referers.py:165 plugins/display/referers.py:175 +#: plugins/display/referers.py:129 plugins/display/referers.py:178 +msgid "External URL (robot)" +msgstr "URL externe (robot)" + +#: plugins/display/referers.py:147 +msgid "Top Referers" +msgstr "Top Origines" + +#: plugins/display/referers.py:149 +msgid "All Referers" +msgstr "Toutes les origines" + +#: plugins/display/referers.py:200 plugins/display/referers.py:210 msgid "Top key phrases" msgstr "Top phrases clé" -#: plugins/display/referers.py:165 plugins/display/referers.py:181 +#: plugins/display/referers.py:200 plugins/display/referers.py:216 msgid "Key phrase" msgstr "Phrase clé" -#: plugins/display/referers.py:165 plugins/display/referers.py:181 +#: plugins/display/referers.py:200 plugins/display/referers.py:216 msgid "Search" msgstr "Recherche" -#: plugins/display/referers.py:177 +#: plugins/display/referers.py:212 msgid "All key phrases" msgstr "Toutes les phrases clé" -#: plugins/display/top_downloads.py:51 plugins/display/top_downloads.py:54 -#: plugins/display/top_downloads.py:68 -msgid "All Downloads" -msgstr "Tous les téléchargements" - -#: plugins/display/top_downloads.py:54 +#: plugins/display/top_downloads.py:71 msgid "Hit" msgstr "Hit" -#: plugins/display/top_downloads.py:54 plugins/display/top_downloads.py:74 -#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 -#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:91 +msgid "All Downloads" +msgstr "Tous les téléchargements" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:97 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 msgid "URI" msgstr "URI" -#: plugins/display/top_downloads.py:66 +#: plugins/display/top_downloads.py:89 msgid "Top Downloads" msgstr "Top Téléchargements" -#: plugins/display/top_hits.py:49 plugins/display/top_hits.py:54 -#: plugins/display/top_hits.py:67 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:91 msgid "All Hits" msgstr "Tous les hits" -#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 -#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 msgid "Entrance" msgstr "Entrées" -#: plugins/display/top_pages.py:49 plugins/display/top_pages.py:54 -#: plugins/display/top_pages.py:67 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 msgid "All Pages" msgstr "Toutes les pages" -#: plugins/display/top_pages.py:65 +#: plugins/display/top_pages.py:88 msgid "Top Pages" msgstr "Top Pages" + +#~ msgid "Key Phrases" +#~ msgstr "Phrases clé" From ea32f7f0ae59876fd601b373dda5450b9cb11f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 17:50:45 +0100 Subject: [PATCH 108/195] Append domain_name in pages title --- display.py | 14 +- iwla.pot | 312 +++++++++++++++++++--------------- iwla.py | 4 +- plugins/display/all_visits.py | 2 +- 4 files changed, 189 insertions(+), 143 deletions(-) diff --git a/display.py b/display.py index 7fe7a8b..cb98693 100644 --- a/display.py +++ b/display.py @@ -27,6 +27,12 @@ import logging # Create output HTML files # +# Just for detection +def _(name): pass +_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July') +_('August'), _('September'), _('October'), _('November'), _('December') +del _ + class DisplayHTMLRaw(object): def __init__(self, iwla, html=u''): @@ -370,6 +376,12 @@ def generateHTMLLink(url, name=None, max_length=100, prefix=u'http'): return u'%s' % (url, name[:max_length]) def createCurTitle(iwla, title): - title = iwla._(title) + time.strftime(u' - %B %Y', iwla.getCurTime()) + title = iwla._(title) + month_name = time.strftime(u'%B', iwla.getCurTime()) + year = time.strftime(u'%Y', iwla.getCurTime()) + title += u' - %s %s' % (iwla._(month_name), year) + domain_name = iwla.getConfValue('domain_name', '') + if domain_name: + title += u' - %s' % (domain_name) return title diff --git a/iwla.pot b/iwla.pot index 3f9a174..d8b1510 100644 --- a/iwla.pot +++ b/iwla.pot @@ -4,242 +4,276 @@ # msgid "" msgstr "" -"Project-Id-Version: iwla\n" -"POT-Creation-Date: 2014-12-16 21:36+CET\n" -"PO-Revision-Date: 2014-12-17 19:07+0100\n" -"Last-Translator: Soutadé \n" -"Language-Team: iwla \n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2014-12-19 17:46+CET\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" "Generated-By: pygettext.py 1.5\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: en\n" -"X-Generator: Poedit 1.6.10\n" -"X-Poedit-SourceCharset: UTF-8\n" -#: iwla.py:343 -msgid "Statistics" + +#: display.py:32 +msgid "April" msgstr "" -#: iwla.py:349 -msgid "By day" +#: display.py:32 +msgid "February" msgstr "" -#: iwla.py:349 -msgid "Day" +#: display.py:32 +msgid "January" msgstr "" -#: iwla.py:349 iwla.py:402 -msgid "Not viewed Bandwidth" -msgstr "" - -#: iwla.py:349 iwla.py:402 -msgid "Visits" -msgstr "" - -#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 -#: plugins/display/referers.py:78 plugins/display/referers.py:118 -#: plugins/display/top_downloads.py:74 plugins/display/top_visitors.py:53 -msgid "Hits" -msgstr "" - -#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 -#: plugins/display/referers.py:78 plugins/display/referers.py:118 -#: plugins/display/top_visitors.py:53 -msgid "Pages" -msgstr "" - -#: iwla.py:349 iwla.py:402 plugins/display/all_visits.py:51 -#: plugins/display/top_visitors.py:53 -msgid "Bandwidth" -msgstr "" - -#: iwla.py:386 -msgid "Average" -msgstr "" - -#: iwla.py:391 iwla.py:429 -msgid "Total" -msgstr "" - -#: iwla.py:400 -msgid "Apr" -msgstr "" - -#: iwla.py:400 -msgid "Aug" -msgstr "" - -#: iwla.py:400 -msgid "Dec" -msgstr "" - -#: iwla.py:400 -msgid "Feb" -msgstr "" - -#: iwla.py:400 -msgid "Jan" -msgstr "" - -#: iwla.py:400 +#: display.py:32 msgid "July" msgstr "" -#: iwla.py:400 +#: display.py:32 +msgid "March" +msgstr "" + +#: display.py:32 iwla.py:428 msgid "June" msgstr "" -#: iwla.py:400 -msgid "Mar" -msgstr "" - -#: iwla.py:400 +#: display.py:32 iwla.py:428 msgid "May" msgstr "" -#: iwla.py:400 +#: display.py:33 +msgid "August" +msgstr "" + +#: display.py:33 +msgid "December" +msgstr "" + +#: display.py:33 +msgid "November" +msgstr "" + +#: display.py:33 +msgid "October" +msgstr "" + +#: display.py:33 +msgid "September" +msgstr "" + +#: iwla.py:371 +msgid "Statistics" +msgstr "" + +#: iwla.py:377 +msgid "By day" +msgstr "" + +#: iwla.py:377 +msgid "Day" +msgstr "" + +#: iwla.py:377 iwla.py:430 +msgid "Not viewed Bandwidth" +msgstr "" + +#: iwla.py:377 iwla.py:430 +msgid "Visits" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +msgid "Hits" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_visitors.py:72 +msgid "Pages" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/top_visitors.py:72 +msgid "Bandwidth" +msgstr "" + +#: iwla.py:414 +msgid "Average" +msgstr "" + +#: iwla.py:419 iwla.py:457 +msgid "Total" +msgstr "" + +#: iwla.py:428 +msgid "Apr" +msgstr "" + +#: iwla.py:428 +msgid "Aug" +msgstr "" + +#: iwla.py:428 +msgid "Dec" +msgstr "" + +#: iwla.py:428 +msgid "Feb" +msgstr "" + +#: iwla.py:428 +msgid "Jan" +msgstr "" + +#: iwla.py:428 +msgid "Jul" +msgstr "" + +#: iwla.py:428 +msgid "Mar" +msgstr "" + +#: iwla.py:428 msgid "Nov" msgstr "" -#: iwla.py:400 +#: iwla.py:428 msgid "Oct" msgstr "" -#: iwla.py:400 +#: iwla.py:428 msgid "Sep" msgstr "" -#: iwla.py:401 +#: iwla.py:429 msgid "Summary" msgstr "" -#: iwla.py:402 +#: iwla.py:430 msgid "Month" msgstr "" -#: iwla.py:402 +#: iwla.py:430 msgid "Visitors" msgstr "" -#: iwla.py:402 iwla.py:412 +#: iwla.py:430 iwla.py:440 msgid "Details" msgstr "" -#: iwla.py:436 +#: iwla.py:465 msgid "Statistics for" msgstr "" -#: iwla.py:443 +#: iwla.py:472 msgid "Last update" msgstr "" -#: plugins/display/all_visits.py:45 plugins/display/all_visits.py:73 -msgid "All visits" -msgstr "" - -#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 msgid "Host" msgstr "" -#: plugins/display/all_visits.py:51 plugins/display/top_visitors.py:53 +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 msgid "Last seen" msgstr "" -#: plugins/display/all_visits.py:74 plugins/display/top_visitors.py:53 +#: plugins/display/all_visits.py:92 +msgid "All visits" +msgstr "" + +#: plugins/display/all_visits.py:93 plugins/display/top_visitors.py:72 msgid "Top visitors" msgstr "" -#: plugins/display/referers.py:72 plugins/display/referers.py:78 +#: plugins/display/referers.py:95 msgid "Connexion from" msgstr "" -#: plugins/display/referers.py:78 plugins/display/referers.py:118 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 msgid "Origin" msgstr "" -#: plugins/display/referers.py:82 plugins/display/referers.py:121 +#: plugins/display/referers.py:99 plugins/display/referers.py:156 msgid "Search Engine" msgstr "" -#: plugins/display/referers.py:91 plugins/display/referers.py:132 -msgid "External URL" -msgstr "" - -#: plugins/display/referers.py:100 plugins/display/referers.py:143 -msgid "External URL (robot)" -msgstr "" - -#: plugins/display/referers.py:112 -msgid "Top Referers" -msgstr "" - -#: plugins/display/referers.py:114 -msgid "All Referers" -msgstr "" - -#: plugins/display/referers.py:128 plugins/display/referers.py:139 -#: plugins/display/referers.py:150 plugins/display/referers.py:187 -#: plugins/display/top_downloads.py:80 plugins/display/top_hits.py:79 -#: plugins/display/top_pages.py:79 plugins/display/top_visitors.py:73 +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 msgid "Others" msgstr "" -#: plugins/display/referers.py:158 -msgid "Key Phrases" +#: plugins/display/referers.py:114 plugins/display/referers.py:167 +msgid "External URL" msgstr "" -#: plugins/display/referers.py:165 plugins/display/referers.py:175 +#: plugins/display/referers.py:129 plugins/display/referers.py:178 +msgid "External URL (robot)" +msgstr "" + +#: plugins/display/referers.py:147 +msgid "Top Referers" +msgstr "" + +#: plugins/display/referers.py:149 +msgid "All Referers" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:210 msgid "Top key phrases" msgstr "" -#: plugins/display/referers.py:165 plugins/display/referers.py:181 +#: plugins/display/referers.py:200 plugins/display/referers.py:216 msgid "Key phrase" msgstr "" -#: plugins/display/referers.py:165 plugins/display/referers.py:181 +#: plugins/display/referers.py:200 plugins/display/referers.py:216 msgid "Search" msgstr "" -#: plugins/display/referers.py:177 +#: plugins/display/referers.py:212 msgid "All key phrases" msgstr "" -#: plugins/display/top_downloads.py:51 plugins/display/top_downloads.py:54 -#: plugins/display/top_downloads.py:68 -msgid "All Downloads" -msgstr "" - -#: plugins/display/top_downloads.py:54 +#: plugins/display/top_downloads.py:71 msgid "Hit" msgstr "" -#: plugins/display/top_downloads.py:54 plugins/display/top_downloads.py:74 -#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 -#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:91 +msgid "All Downloads" +msgstr "" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:97 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 msgid "URI" msgstr "" -#: plugins/display/top_downloads.py:66 +#: plugins/display/top_downloads.py:89 msgid "Top Downloads" msgstr "" -#: plugins/display/top_hits.py:49 plugins/display/top_hits.py:54 -#: plugins/display/top_hits.py:67 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:91 msgid "All Hits" msgstr "" -#: plugins/display/top_hits.py:54 plugins/display/top_hits.py:73 -#: plugins/display/top_pages.py:54 plugins/display/top_pages.py:73 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 msgid "Entrance" msgstr "" -#: plugins/display/top_pages.py:49 plugins/display/top_pages.py:54 -#: plugins/display/top_pages.py:67 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 msgid "All Pages" msgstr "" -#: plugins/display/top_pages.py:65 +#: plugins/display/top_pages.py:88 msgid "Top Pages" msgstr "" + diff --git a/iwla.py b/iwla.py index 0bcc3fc..9eade1c 100755 --- a/iwla.py +++ b/iwla.py @@ -368,7 +368,7 @@ class IWLA(object): def _generateDisplayDaysStats(self): cur_time = self.meta_infos['last_time'] - title = '%s %d/%02d' % (self._('Statistics'), cur_time.tm_year, cur_time.tm_mon) + title = createCurTitle(self, self._('Statistics')) filename = self.getCurDisplayPath('index.html') self.logger.info('==> Generate display (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) @@ -425,7 +425,7 @@ class IWLA(object): def _generateDisplayMonthStats(self, page, year, month_stats): cur_time = time.localtime() - months_name = ['', self._('Jan'), self._('Feb'), self._('Mar'), self._('Apr'), self._('May'), self._('June'), self._('July'), self._('Aug'), self._('Sep'), self._('Oct'), self._('Nov'), self._('Dec')] + months_name = ['', self._('Jan'), self._('Feb'), self._('Mar'), self._('Apr'), self._('May'), self._('June'), self._('Jul'), self._('Aug'), self._('Sep'), self._('Oct'), self._('Nov'), self._('Dec')] title = '%s %d' % (self._('Summary'), year) cols = [self._('Month'), self._('Visitors'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth'), self._('Details')] graph_cols=range(1,7) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 4f4dd52..4dbc92c 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -61,7 +61,7 @@ class IWLADisplayAllVisits(IPlugin): last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) - title = time.strftime(self.iwla._(u'All visits') + u' - %B %Y', self.iwla.getCurTime()) + title = createCurTitle(self.iwla, u'All visits') filename = 'all_visits.html' path = self.iwla.getCurDisplayPath(filename) From a14600ccda887f1724c8fd09327018f023d6396a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 18:01:38 +0100 Subject: [PATCH 109/195] Update TODO --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index c3e15d5..4999056 100644 --- a/TODO +++ b/TODO @@ -2,3 +2,4 @@ doc enhancement Limit hits/pages/downloads by rate Automatic tests Free memory as soon as possible +Remove some IP from statistics From 046c1d898300a8f755f2dd41362083a892a74630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 18:06:02 +0100 Subject: [PATCH 110/195] Use a clear conf file --- conf.py | 13 ++++++++----- default_conf.py | 2 ++ iwla.py | 10 ++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/conf.py b/conf.py index 3d8b4c2..e930832 100644 --- a/conf.py +++ b/conf.py @@ -1,6 +1,7 @@ +# -*- coding: utf-8 -*- # Web server log -analyzed_filename = 'access.log' +analyzed_filename = '/var/log/apache2/access.log' # Domain name to analyze domain_name = 'soutade.fr' @@ -10,22 +11,24 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits'] #, 'reverse_dns'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits', 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] # Reverse DNS timeout reverse_dns_timeout = 0.2 # Count this addresses as hit -page_to_hit_conf = [r'^.+/logo[/]?$'] -# Count this addresses as page -hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] +#page_to_hit_conf = [r'^.+/logo[/]?$'] +## Count this addresses as page +#hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 max_downloads_displayed = 100 +# Compress these files after generation compress_output_files = ['html', 'css', 'js'] +# Display result in French locale = 'fr' diff --git a/default_conf.py b/default_conf.py index 3c42a1e..dcc8190 100644 --- a/default_conf.py +++ b/default_conf.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os # Default configuration diff --git a/iwla.py b/iwla.py index 9eade1c..0c0f331 100755 --- a/iwla.py +++ b/iwla.py @@ -240,11 +240,10 @@ class IWLA(object): # TODO : remove return #return - with open(filename + '.tmp', 'wb+') as f: + with open(filename + '.tmp', 'wb+') as f, gzip.open(filename, 'w') as fzip: pickle.dump(obj, f) f.seek(0) - with gzip.open(filename, 'w') as fzip: - fzip.write(f.read()) + fzip.write(f.read()) os.remove(filename + '.tmp') def _deserialize(self, filename): @@ -485,9 +484,8 @@ class IWLA(object): if not os.path.exists(gz_path) or\ os.stat(path).st_mtime > build_time: - with open(path, 'rb') as f_in: - with gzip.open(gz_path, 'wb') as f_out: - f_out.write(f_in.read()) + with open(path, 'rb') as f_in, gzip.open(gz_path, 'wb') as f_out: + f_out.write(f_in.read()) def _compressFiles(self, build_time, root): if not conf.compress_output_files: return From 251086dcc0979c1958462fb2f0b17e13af5553e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 18:21:34 +0100 Subject: [PATCH 111/195] Forgot some files --- conf.py | 8 +- docs/index.md | 552 +++++++++++++++++++++++++++++++++++++++++++++++ docs/modules.md | 460 +++++++++++++++++++++++++++++++++++++++ tools/gettext.sh | 3 + 4 files changed, 1019 insertions(+), 4 deletions(-) create mode 100644 docs/index.md create mode 100644 docs/modules.md create mode 100755 tools/gettext.sh diff --git a/conf.py b/conf.py index e930832..e26b953 100644 --- a/conf.py +++ b/conf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Web server log -analyzed_filename = '/var/log/apache2/access.log' +analyzed_filename = 'access.log' # Domain name to analyze domain_name = 'soutade.fr' @@ -11,16 +11,16 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits', 'reverse_dns'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits']#, 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] # Reverse DNS timeout reverse_dns_timeout = 0.2 # Count this addresses as hit -#page_to_hit_conf = [r'^.+/logo[/]?$'] +page_to_hit_conf = [r'^.+/logo[/]?$'] ## Count this addresses as page -#hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 0000000..4c39f15 --- /dev/null +++ b/docs/index.md @@ -0,0 +1,552 @@ +iwla +==== + +Introduction +------------ + +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. + +Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). + +Usage +----- + + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + + -c : Clean output (database and HTML) before starting + -i : Read data from stdin instead of conf.analyzed_filename + -f : Read data from FILE instead of conf.analyzed_filename + -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + +Basic usage +----------- + +In addition to command line, iwla read parameters in default_conf.py. User can override default values using _conf.py_ file. Each module requires its own parameters. + +Main values to edit are : + + * **analyzed_filename** : web server log + * **domaine_name** : domain name to filter + * **pre_analysis_hooks** : List of pre analysis hooks + * **post_analysis_hooks** : List of post analysis hooks + * **display_hooks** : List of display hooks + * **locale** : Displayed locale (_en_ or _fr_) + +Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type + + python -m SimpleHTTPServer 8000 + +Open your favorite web browser at _http://localhost:8000_. Enjoy ! + +**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. + + +Interesting default configuration values +---------------------------------------- + + * **DB_ROOT** : Default database directory (default ./output_db) + * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **log_format** : Web server log format (nginx style). Default is apache log format + * **time_format** : Time format used in log format + * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits + * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) + * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) + * **css_path** : CSS path (you can add yours) + * **compress_output_files** : Files extensions to compress in gzip during display build + +Plugins +------- + +As previously described, plugins acts like UNIX pipes : statistics are constantly updated by each plugin to produce final result. We have three type of plugins : + + * **Pre analysis plugins** : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms + * **Display plugins** : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. + +Statistics are stored in dictionaries : + + * **month_stats** : Statistics of current analysed month + * **valid_visitor** : A subset of month_stats without robots + * **days_stats** : Statistics of current analysed day + * **visits** : All visitors with all of its requests + * **meta** : Final result of month statistics (by year) + +Create a Plugins +---------------- + +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). + +Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). + +The two functions to overload are _load(self)_ that must returns True or False if all is good (or not). It's called after _init_. The second is _hook(self)_ that is the body of plugins. + +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and bar graphs. + +Plugins +======= + +Optional configuration values ends with *. + +iwla +---- + + Main class IWLA + Parse Log, compute them, call plugins and produce output + For now, only HTTP log are valid + + Plugin requirements : + None + + Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + + Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + + meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + + days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + + valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.all_visits +-------------------------- + + Display hook + + Create All visits page + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers +------------------------ + + Display hook + + Create Referers page + + Plugin requirements : + post_analysis/referers + + Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + + Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page + + Statistics deletion : + None + + +plugins.pre_analysis.robots +--------------------------- + + Pre analysis hook + + Filter robots + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + robot + + Statistics deletion : + None + + diff --git a/docs/modules.md b/docs/modules.md new file mode 100644 index 0000000..41167c3 --- /dev/null +++ b/docs/modules.md @@ -0,0 +1,460 @@ +iwla +---- + + Main class IWLA + Parse Log, compute them, call plugins and produce output + For now, only HTTP log are valid + + Plugin requirements : + None + + Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + + Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + + meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + + days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + + valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.all_visits +-------------------------- + + Display hook + + Create All visits page + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers +------------------------ + + Display hook + + Create Referers page + + Plugin requirements : + post_analysis/referers + + Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + + Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page + + Statistics deletion : + None + + +plugins.pre_analysis.robots +--------------------------- + + Pre analysis hook + + Filter robots + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + robot + + Statistics deletion : + None + + diff --git a/tools/gettext.sh b/tools/gettext.sh new file mode 100755 index 0000000..81bafab --- /dev/null +++ b/tools/gettext.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +pygettext -a -d iwla -o iwla.pot -k gettext *.py plugins/pre_analysis/*.py plugins/post_analysis/*.py plugins/display/*.py From 1003a8659344e9d2109c8a9bc47b4c97a22504e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 19 Dec 2014 18:30:12 +0100 Subject: [PATCH 112/195] Update doc --- docs/index.md | 2 +- docs/main.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 4c39f15..1a3b36c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). diff --git a/docs/main.md b/docs/main.md index 8fe2240..0b5b16e 100644 --- a/docs/main.md +++ b/docs/main.md @@ -4,7 +4,7 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). From 15047f91f1d82478279c50afb6d61e0bd302e62c Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 21 Dec 2014 15:36:39 +0100 Subject: [PATCH 113/195] First version of referers_diff --- conf.py | 2 +- docs/index.md | 182 ++++++++++++++++++------------- docs/modules.md | 182 ++++++++++++++++++------------- plugins/display/referers.py | 2 +- plugins/display/referers_diff.py | 84 ++++++++++++++ resources/css/iwla.css | 4 + 6 files changed, 298 insertions(+), 158 deletions(-) create mode 100644 plugins/display/referers_diff.py diff --git a/conf.py b/conf.py index e26b953..fd015b5 100644 --- a/conf.py +++ b/conf.py @@ -12,7 +12,7 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits']#, 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits', 'referers_diff'] # Reverse DNS timeout reverse_dns_timeout = 0.2 diff --git a/docs/index.md b/docs/index.md index 1a3b36c..aa927c0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -175,34 +175,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -230,34 +202,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -289,20 +233,50 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- +plugins.display.top_downloads +----------------------------- Display hook - Create TOP visitors block + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - display_visitor_ip* + max_downloads_displayed* + create_all_downloads_page* Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -343,43 +317,41 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_visitors +---------------------------- - Post analysis hook + Display hook - Count TOP downloads + Create TOP visitors block Plugin requirements : None Conf values needed : - None + display_visitor_ip* Output files : - None + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.referers_diff +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - None + display/referers Conf values needed : None @@ -391,9 +363,7 @@ plugins.post_analysis.top_hits None Statistics update : - month_stats: - top_hits => - uri + None Statistics deletion : None @@ -465,6 +435,62 @@ plugins.post_analysis.reverse_dns None +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + plugins.post_analysis.top_pages ------------------------------- diff --git a/docs/modules.md b/docs/modules.md index 41167c3..f530620 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -83,34 +83,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -138,34 +110,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -197,20 +141,50 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- +plugins.display.top_downloads +----------------------------- Display hook - Create TOP visitors block + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - display_visitor_ip* + max_downloads_displayed* + create_all_downloads_page* Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -251,43 +225,41 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_visitors +---------------------------- - Post analysis hook + Display hook - Count TOP downloads + Create TOP visitors block Plugin requirements : None Conf values needed : - None + display_visitor_ip* Output files : - None + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.referers_diff +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - None + display/referers Conf values needed : None @@ -299,9 +271,7 @@ plugins.post_analysis.top_hits None Statistics update : - month_stats: - top_hits => - uri + None Statistics deletion : None @@ -373,6 +343,62 @@ plugins.post_analysis.reverse_dns None +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + plugins.post_analysis.top_pages ------------------------------- diff --git a/plugins/display/referers.py b/plugins/display/referers.py index bdd04a5..777dc8a 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -197,7 +197,7 @@ class IWLADisplayReferers(IPlugin): total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: diff --git a/plugins/display/referers_diff.py b/plugins/display/referers_diff.py new file mode 100644 index 0000000..ddfd91b --- /dev/null +++ b/plugins/display/referers_diff.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Enlight new and updated key phrases in in all_key_phrases.html + +Plugin requirements : + display/referers + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayReferersDiff(IPlugin): + def __init__(self, iwla): + super(IWLADisplayReferersDiff, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLADisplayReferers'] + + def load(self): + if not self.iwla.getConfValue('create_all_key_phrases_page', True): + return False + month_stats = self.iwla.getMonthStats() + self.cur_key_phrases = {k:v for (k,v) in month_stats.get('key_phrases', {})} + return True + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + + filename = 'key_phrases.html' + path = self.iwla.getCurDisplayPath(filename) + page = display.getPage(path) + if not page: return + title = self.iwla._(u'All key phrases') + referers_block = page.getBlock(title) + + kp_diff = {} + for (k, v) in month_stats['key_phrases'].items(): + new_value = self.cur_key_phrases.get(k, 0) + if new_value: + if new_value != v: + kp_diff[k] = 'iwla_update' + else: + kp_diff[k] = 'iwla_new' + + for (idx, row) in enumerate(referers_block.rows): + if row[0] in kp_diff.keys(): + referers_block.setCellCSSClass(idx, 0, kp_diff[row[0]]) diff --git a/resources/css/iwla.css b/resources/css/iwla.css index 71b652b..fe4d5ab 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -69,6 +69,9 @@ td:first-child .iwla_weekend { background : #ECECEC; } .iwla_curday { font-weight: bold; } .iwla_others { color: #668; } +.iwla_update { background : orange; } +.iwla_new { background : green } + .iwla_graph_table { margin-left:auto; @@ -85,3 +88,4 @@ table.iwla_graph_table td { text-align:center; } + From c56bb65b4f2d7ba4cb21899fef94f86db8874759 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 22 Dec 2014 09:38:20 +0100 Subject: [PATCH 114/195] Page title not translated in key_phrases.html --- plugins/display/referers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 777dc8a..b7a14fb 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -190,7 +190,7 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = createCurTitle(self.iwla, u'Key Phrases') + title = createCurTitle(self.iwla, u'All Key Phrases') filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) From 0a2494cb70a17b000271fbf0fb1f708d74877c20 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 23 Dec 2014 07:48:25 +0100 Subject: [PATCH 115/195] Initial commit --- LICENCE | 674 +++++++++++++++++++++++ TODO | 5 + awstats_data.py | 12 + conf.py | 34 ++ default_conf.py | 61 +++ display.py | 387 +++++++++++++ docs/index.md | 552 +++++++++++++++++++ docs/main.md | 92 ++++ docs/modules.md | 460 ++++++++++++++++ iplugin.py | 124 +++++ iwla.pot | 279 ++++++++++ iwla.py | 718 +++++++++++++++++++++++++ locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 0 -> 2934 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 283 ++++++++++ plugins/__init__.py | 2 + plugins/display/__init__.py | 1 + plugins/display/all_visits.py | 99 ++++ plugins/display/referers.py | 225 ++++++++ plugins/display/top_downloads.py | 106 ++++ plugins/display/top_hits.py | 106 ++++ plugins/display/top_pages.py | 105 ++++ plugins/display/top_visitors.py | 97 ++++ plugins/post_analysis/__init__.py | 1 + plugins/post_analysis/referers.py | 173 ++++++ plugins/post_analysis/reverse_dns.py | 78 +++ plugins/post_analysis/top_downloads.py | 94 ++++ plugins/post_analysis/top_hits.py | 78 +++ plugins/post_analysis/top_pages.py | 87 +++ plugins/pre_analysis/__init__.py | 1 + plugins/pre_analysis/page_to_hit.py | 103 ++++ plugins/pre_analysis/robots.py | 113 ++++ resources/css/iwla.css | 87 +++ resources/icon/vh.png | Bin 0 -> 239 bytes resources/icon/vk.png | Bin 0 -> 236 bytes resources/icon/vp.png | Bin 0 -> 248 bytes resources/icon/vu.png | Bin 0 -> 239 bytes resources/icon/vv.png | Bin 0 -> 239 bytes tools/extract_doc.py | 30 ++ tools/extract_docs.sh | 16 + tools/gettext.sh | 3 + tools/iwla_convert.pl | 79 +++ 41 files changed, 5365 insertions(+) create mode 100644 LICENCE create mode 100644 TODO create mode 100644 awstats_data.py create mode 100644 conf.py create mode 100644 default_conf.py create mode 100644 display.py create mode 100644 docs/index.md create mode 100644 docs/main.md create mode 100644 docs/modules.md create mode 100644 iplugin.py create mode 100644 iwla.pot create mode 100755 iwla.py create mode 100644 locales/fr_FR/LC_MESSAGES/iwla.mo create mode 100644 locales/fr_FR/LC_MESSAGES/iwla.pot create mode 100644 plugins/__init__.py create mode 100644 plugins/display/__init__.py create mode 100644 plugins/display/all_visits.py create mode 100644 plugins/display/referers.py create mode 100644 plugins/display/top_downloads.py create mode 100644 plugins/display/top_hits.py create mode 100644 plugins/display/top_pages.py create mode 100644 plugins/display/top_visitors.py create mode 100644 plugins/post_analysis/__init__.py create mode 100644 plugins/post_analysis/referers.py create mode 100644 plugins/post_analysis/reverse_dns.py create mode 100644 plugins/post_analysis/top_downloads.py create mode 100644 plugins/post_analysis/top_hits.py create mode 100644 plugins/post_analysis/top_pages.py create mode 100644 plugins/pre_analysis/__init__.py create mode 100644 plugins/pre_analysis/page_to_hit.py create mode 100644 plugins/pre_analysis/robots.py create mode 100644 resources/css/iwla.css create mode 100644 resources/icon/vh.png create mode 100644 resources/icon/vk.png create mode 100644 resources/icon/vp.png create mode 100644 resources/icon/vu.png create mode 100644 resources/icon/vv.png create mode 100755 tools/extract_doc.py create mode 100755 tools/extract_docs.sh create mode 100755 tools/gettext.sh create mode 100755 tools/iwla_convert.pl diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENCE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/TODO b/TODO new file mode 100644 index 0000000..4999056 --- /dev/null +++ b/TODO @@ -0,0 +1,5 @@ +doc enhancement +Limit hits/pages/downloads by rate +Automatic tests +Free memory as soon as possible +Remove some IP from statistics diff --git a/awstats_data.py b/awstats_data.py new file mode 100644 index 0000000..8789384 --- /dev/null +++ b/awstats_data.py @@ -0,0 +1,12 @@ +robots = ['appie', 'architext', 'jeeves', 'bjaaland', 'contentmatch', 'ferret', 'googlebot', 'google\-sitemaps', 'gulliver', 'virus[_+ ]detector', 'harvest', 'htdig', 'linkwalker', 'lilina', 'lycos[_+ ]', 'moget', 'muscatferret', 'myweb', 'nomad', 'scooter', 'slurp', '^voyager\/', 'weblayers', 'antibot', 'bruinbot', 'digout4u', 'echo!', 'fast\-webcrawler', 'ia_archiver\-web\.archive\.org', 'ia_archiver', 'jennybot', 'mercator', 'netcraft', 'msnbot\-media', 'msnbot', 'petersnews', 'relevantnoise\.com', 'unlost_web_crawler', 'voila', 'webbase', 'webcollage', 'cfetch', 'zyborg', 'wisenutbot', '[^a]fish', 'abcdatos', 'acme\.spider', 'ahoythehomepagefinder', 'alkaline', 'anthill', 'arachnophilia', 'arale', 'araneo', 'aretha', 'ariadne', 'powermarks', 'arks', 'aspider', 'atn\.txt', 'atomz', 'auresys', 'backrub', 'bbot', 'bigbrother', 'blackwidow', 'blindekuh', 'bloodhound', 'borg\-bot', 'brightnet', 'bspider', 'cactvschemistryspider', 'calif[^r]', 'cassandra', 'cgireader', 'checkbot', 'christcrawler', 'churl', 'cienciaficcion', 'collective', 'combine', 'conceptbot', 'coolbot', 'core', 'cosmos', 'cruiser', 'cusco', 'cyberspyder', 'desertrealm', 'deweb', 'dienstspider', 'digger', 'diibot', 'direct_hit', 'dnabot', 'download_express', 'dragonbot', 'dwcp', 'e\-collector', 'ebiness', 'elfinbot', 'emacs', 'emcspider', 'esther', 'evliyacelebi', 'fastcrawler', 'feedcrawl', 'fdse', 'felix', 'fetchrover', 'fido', 'finnish', 'fireball', 'fouineur', 'francoroute', 'freecrawl', 'funnelweb', 'gama', 'gazz', 'gcreep', 'getbot', 'geturl', 'golem', 'gougou', 'grapnel', 'griffon', 'gromit', 'gulperbot', 'hambot', 'havindex', 'hometown', 'htmlgobble', 'hyperdecontextualizer', 'iajabot', 'iaskspider', 'hl_ftien_spider', 'sogou', 'iconoclast', 'ilse', 'imagelock', 'incywincy', 'informant', 'infoseek', 'infoseeksidewinder', 'infospider', 'inspectorwww', 'intelliagent', 'irobot', 'iron33', 'israelisearch', 'javabee', 'jbot', 'jcrawler', 'jobo', 'jobot', 'joebot', 'jubii', 'jumpstation', 'kapsi', 'katipo', 'kilroy', 'ko[_+ ]yappo[_+ ]robot', 'kummhttp', 'labelgrabber\.txt', 'larbin', 'legs', 'linkidator', 'linkscan', 'lockon', 'logo_gif', 'macworm', 'magpie', 'marvin', 'mattie', 'mediafox', 'merzscope', 'meshexplorer', 'mindcrawler', 'mnogosearch', 'momspider', 'monster', 'motor', 'muncher', 'mwdsearch', 'ndspider', 'nederland\.zoek', 'netcarta', 'netmechanic', 'netscoop', 'newscan\-online', 'nhse', 'northstar', 'nzexplorer', 'objectssearch', 'occam', 'octopus', 'openfind', 'orb_search', 'packrat', 'pageboy', 'parasite', 'patric', 'pegasus', 'perignator', 'perlcrawler', 'phantom', 'phpdig', 'piltdownman', 'pimptrain', 'pioneer', 'pitkow', 'pjspider', 'plumtreewebaccessor', 'poppi', 'portalb', 'psbot', 'python', 'raven', 'rbse', 'resumerobot', 'rhcs', 'road_runner', 'robbie', 'robi', 'robocrawl', 'robofox', 'robozilla', 'roverbot', 'rules', 'safetynetrobot', 'search\-info', 'search_au', 'searchprocess', 'senrigan', 'sgscout', 'shaggy', 'shaihulud', 'sift', 'simbot', 'site\-valet', 'sitetech', 'skymob', 'slcrawler', 'smartspider', 'snooper', 'solbot', 'speedy', 'spider[_+ ]monkey', 'spiderbot', 'spiderline', 'spiderman', 'spiderview', 'spry', 'sqworm', 'ssearcher', 'suke', 'sunrise', 'suntek', 'sven', 'tach_bw', 'tagyu_agent', 'tailrank', 'tarantula', 'tarspider', 'techbot', 'templeton', 'titan', 'titin', 'tkwww', 'tlspider', 'ucsd', 'udmsearch', 'universalfeedparser', 'urlck', 'valkyrie', 'verticrawl', 'victoria', 'visionsearch', 'voidbot', 'vwbot', 'w3index', 'w3m2', 'wallpaper', 'wanderer', 'wapspIRLider', 'webbandit', 'webcatcher', 'webcopy', 'webfetcher', 'webfoot', 'webinator', 'weblinker', 'webmirror', 'webmoose', 'webquest', 'webreader', 'webreaper', 'websnarf', 'webspider', 'webvac', 'webwalk', 'webwalker', 'webwatch', 'whatuseek', 'whowhere', 'wired\-digital', 'wmir', 'wolp', 'wombat', 'wordpress', 'worm', 'woozweb', 'wwwc', 'wz101', 'xget', '1\-more_scanner', 'accoona\-ai\-agent', 'activebookmark', 'adamm_bot', 'almaden', 'aipbot', 'aleadsoftbot', 'alpha_search_agent', 'allrati', 'aport', 'archive\.org_bot', 'argus', 'arianna\.libero\.it', 'aspseek', 'asterias', 'awbot', 'baiduspider', 'becomebot', 'bender', 'betabot', 'biglotron', 'bittorrent_bot', 'biz360[_+ ]spider', 'blogbridge[_+ ]service', 'bloglines', 'blogpulse', 'blogsearch', 'blogshares', 'blogslive', 'blogssay', 'bncf\.firenze\.sbn\.it\/raccolta\.txt', 'bobby', 'boitho\.com\-dc', 'bookmark\-manager', 'boris', 'bumblebee', 'candlelight[_+ ]favorites[_+ ]inspector', 'cbn00glebot', 'cerberian_drtrs', 'cfnetwork', 'cipinetbot', 'checkweb_link_validator', 'commons\-httpclient', 'computer_and_automation_research_institute_crawler', 'converamultimediacrawler', 'converacrawler', 'cscrawler', 'cse_html_validator_lite_online', 'cuasarbot', 'cursor', 'custo', 'datafountains\/dmoz_downloader', 'daviesbot', 'daypopbot', 'deepindex', 'dipsie\.bot', 'dnsgroup', 'domainchecker', 'domainsdb\.net', 'dulance', 'dumbot', 'dumm\.de\-bot', 'earthcom\.info', 'easydl', 'edgeio\-retriever', 'ets_v', 'exactseek', 'extreme[_+ ]picture[_+ ]finder', 'eventax', 'everbeecrawler', 'everest\-vulcan', 'ezresult', 'enteprise', 'facebook', 'fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de', 'fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de', 'matrix_s\.p\.a\._\-_fast_enterprise_crawler', 'fast_enterprise_crawler', 'fast\-search\-engine', 'favicon', 'favorg', 'favorites_sweeper', 'feedburner', 'feedfetcher\-google', 'feedflow', 'feedster', 'feedsky', 'feedvalidator', 'filmkamerabot', 'findlinks', 'findexa_crawler', 'fooky\.com\/ScorpionBot', 'g2crawler', 'gaisbot', 'geniebot', 'gigabot', 'girafabot', 'global_fetch', 'gnodspider', 'goforit\.com', 'goforitbot', 'gonzo', 'grub', 'gpu_p2p_crawler', 'henrythemiragorobot', 'heritrix', 'holmes', 'hoowwwer', 'hpprint', 'htmlparser', 'html[_+ ]link[_+ ]validator', 'httrack', 'hundesuche\.com\-bot', 'ichiro', 'iltrovatore\-setaccio', 'infobot', 'infociousbot', 'infomine', 'insurancobot', 'internet[_+ ]ninja', 'internetarchive', 'internetseer', 'internetsupervision', 'irlbot', 'isearch2006', 'iupui_research_bot', 'jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility', 'justview', 'kalambot', 'kamano\.de_newsfeedverzeichnis', 'kazoombot', 'kevin', 'keyoshid', 'kinjabot', 'kinja\-imagebot', 'knowitall', 'knowledge\.com', 'kouaa_krawler', 'krugle', 'ksibot', 'kurzor', 'lanshanbot', 'letscrawl\.com', 'libcrawl', 'linkbot', 'link_valet_online', 'metager\-linkchecker', 'linkchecker', 'livejournal\.com', 'lmspider', 'lwp\-request', 'lwp\-trivial', 'magpierss', 'mail\.ru', 'mapoftheinternet\.com', 'mediapartners\-google', 'megite', 'metaspinner', 'microsoft[_+ ]url[_+ ]control', 'mini\-reptile', 'minirank', 'missigua_locator', 'misterbot', 'miva', 'mizzu_labs', 'mj12bot', 'mojeekbot', 'msiecrawler', 'ms_search_4\.0_robot', 'msrabot', 'msrbot', 'mt::telegraph::agent', 'nagios', 'nasa_search', 'mydoyouhike', 'netluchs', 'netsprint', 'newsgatoronline', 'nicebot', 'nimblecrawler', 'noxtrumbot', 'npbot', 'nutchcvs', 'nutchosu\-vlib', 'nutch', 'ocelli', 'octora_beta_bot', 'omniexplorer[_+ ]bot', 'onet\.pl[_+ ]sa', 'onfolio', 'opentaggerbot', 'openwebspider', 'oracle_ultra_search', 'orbiter', 'yodaobot', 'qihoobot', 'passwordmaker\.org', 'pear_http_request_class', 'peerbot', 'perman', 'php[_+ ]version[_+ ]tracker', 'pictureofinternet', 'ping\.blo\.gs', 'plinki', 'pluckfeedcrawler', 'pogodak', 'pompos', 'popdexter', 'port_huron_labs', 'postfavorites', 'projectwf\-java\-test\-crawler', 'proodlebot', 'pyquery', 'rambler', 'redalert', 'rojo', 'rssimagesbot', 'ruffle', 'rufusbot', 'sandcrawler', 'sbider', 'schizozilla', 'scumbot', 'searchguild[_+ ]dmoz[_+ ]experiment', 'seekbot', 'sensis_web_crawler', 'seznambot', 'shim\-crawler', 'shoutcast', 'slysearch', 'snap\.com_beta_crawler', 'sohu\-search', 'sohu', 'snappy', 'sphere_scout', 'spip', 'sproose_crawler', 'steeler', 'steroid__download', 'suchfin\-bot', 'superbot', 'surveybot', 'susie', 'syndic8', 'syndicapi', 'synoobot', 'tcl_http_client_package', 'technoratibot', 'teragramcrawlersurf', 'test_crawler', 'testbot', 't\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e', 'topicblogs', 'turnitinbot', 'turtlescanner', 'turtle', 'tutorgigbot', 'twiceler', 'ubicrawler', 'ultraseek', 'unchaos_bot_hybrid_web_search_engine', 'unido\-bot', 'updated', 'ustc\-semantic\-group', 'vagabondo\-wap', 'vagabondo', 'vermut', 'versus_crawler_from_eda\.baykan@epfl\.ch', 'vespa_crawler', 'vortex', 'vse\/', 'w3c\-checklink', 'w3c[_+ ]css[_+ ]validator[_+ ]jfouffa', 'w3c_validator', 'watchmouse', 'wavefire', 'webclipping\.com', 'webcompass', 'webcrawl\.net', 'web_downloader', 'webdup', 'webfilter', 'webindexer', 'webminer', 'website[_+ ]monitoring[_+ ]bot', 'webvulncrawl', 'wells_search', 'wonderer', 'wume_crawler', 'wwweasel', 'xenu\'s_link_sleuth', 'xenu_link_sleuth', 'xirq', 'y!j', 'yacy', 'yahoo\-blogs', 'yahoo\-verticalcrawler', 'yahoofeedseeker', 'yahooseeker\-testing', 'yahooseeker', 'yahoo\-mmcrawler', 'yahoo!_mindset', 'yandex', 'flexum', 'yanga', 'yooglifetchagent', 'z\-add_link_checker', 'zealbot', 'zhuaxia', 'zspider', 'zeus', 'ng\/1\.', 'ng\/2\.', 'exabot', 'wget', 'libwww', 'java\/[0-9]'] + +search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] + +search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.'] + +not_search_engines_keys = {'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'altavista\.' : 'babelfish\.altavista\.', 'tiscali\.' : 'mail\.tiscali\.', 'yandex\.' : 'direct\.yandex\.', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.'} + +search_engines_hashid = {'search\.sli\.sympatico\.ca' : 'sympatico', 'mywebsearch\.com' : 'mywebsearch', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'findarticles\.com' : 'findarticles', 'wow\.pl' : 'wowpl', 'allesklar\.de' : 'allesklar', 'atomz\.' : 'atomz', 'bing\.' : 'bing', 'find\.dk' : 'finddk', 'google\.' : 'google', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'pogodak\.' : 'pogodak', 'ask\.jp' : 'askjp', '\.baidu\.com' : 'baidu', 'tango\.hu' : 'tango_hu', 'gotuneed\.com' : 'gotuneed', 'quick\.cz' : 'quick', 'mirago' : 'mirago', 'szukaj\.wp\.pl' : 'wp', 'mirago\.de' : 'miragode', 'mirago\.dk' : 'miragodk', 'katalog\.onet\.pl' : 'katalogonetpl', 'googlee\.' : 'google', 'orbis\.dk' : 'orbis', 'turtle\.ru' : 'turtle', 'zoznam\.sk' : 'zoznam', 'start\.shaw\.ca' : 'shawca', 'chello\.at' : 'chelloat', 'centraldatabase\.org' : 'centraldatabase', 'centrum\.cz' : 'centrum', 'kataweb\.it' : 'kataweb', '\.lbb\.org' : 'lbb', 'blingo\.com' : 'blingo', 'vivisimo\.com' : 'vivisimo', 'stumbleupon\.com' : 'stumbleupon', 'es\.ask.\com' : 'askes', 'interia\.pl' : 'interiapl', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'search\.alice\.it' : 'aliceit', 'shinyseek\.it' : 'shinyseek\.it', 'i-une\.com' : 'iune', 'dejanews\.' : 'dejanews', 'opasia\.dk' : 'opasia', 'chello\.cz' : 'chellocz', 'ya(ndex)?\.ru' : 'yandex', 'kartoo\.com' : 'kartoo', 'arianna\.libero\.it' : 'arianna', 'ofir\.dk' : 'ofir', 'search\.earthlink\.net' : 'earthlink', 'biglotron\.com' : 'biglotron', 'lapkereso\.hu' : 'lapkereso', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'dodaj\.pl' : 'dodajpl', 'mirago\.be' : 'miragobe', 'googlecom\.com' : 'google', 'steadysearch\.com' : 'steadysearch', 'redbox\.cz' : 'redbox', 'haku\.www\.fi' : 'haku', 'sapo\.pt' : 'sapo', 'sphere\.com' : 'sphere', 'danielsen\.com' : 'danielsen', 'alexa\.com' : 'alexa', 'mamma\.' : 'mamma', 'swik\.net' : 'swik', 'polska\.pl' : 'polskapl', 'groups\.google\.' : 'google_groups', 'metabot\.ru' : 'metabot', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'szukaj\.onet\.pl' : 'onetpl', 'aport\.ru' : 'aport', 'de\.ask.\com' : 'askde', 'splut\.' : 'splut', 'live\.com' : 'live', '216\.239\.5[0-9]\.104' : 'google_cache', 'mysearch\.' : 'mysearch', 'ukplus\.' : 'ukplus', 'najdi\.to' : 'najdi', 'overture\.com' : 'overture', 'iask\.com' : 'iask', 'nl\.ask.\com' : 'asknl', 'nbci\.com\/search' : 'nbci', 'search\.aol\.co' : 'aol', 'eniro\.se' : 'enirose', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'mirago\.ch' : 'miragoch', 'altavista\.' : 'altavista', 'chello\.hu' : 'chellohu', 'mozbot\.fr' : 'mozbot', 'northernlight\.' : 'northernlight', 'mirago\.co\.uk' : 'miragocouk', 'search[\w\-]+\.free\.fr' : 'free', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'copernic\.com' : 'copernic', 'heureka\.hu' : 'heureka', 'steady-search\.com' : 'steadysearch', 'teecno\.it' : 'teecnoit', 'voila\.' : 'voila', 'netstjernen\.dk' : 'netstjernen', 'keresolap\.hu' : 'keresolap_hu', 'yahoo\.' : 'yahoo', 'icerocket\.com' : 'icerocket', 'alltheweb\.com' : 'alltheweb', 'www\.search\.com' : 'search.com', 'digg\.com' : 'digg', 'tiscali\.' : 'tiscali', 'spotjockey\.' : 'spotjockey', 'a9\.com' : 'a9', '(brisbane|suche)\.t-online\.de' : 't-online', 'ifind\.freeserve' : 'freeserve', 'att\.net' : 'att', 'mirago\.it' : 'miragoit', 'index\.hu' : 'indexhu', '\.sogou\.com' : 'sogou', 'no\.mirago\.com' : 'miragono', 'ineffabile\.it' : 'ineffabile', 'netluchs\.de' : 'netluchs', 'toile\.com' : 'toile', 'search\..*\.\w+' : 'search', 'del\.icio\.us' : 'delicious', 'vizsla\.origo\.hu' : 'origo', 'netscape\.' : 'netscape', 'dogpile\.com' : 'dogpile', 'anzwers\.com\.au' : 'anzwers', '\.zhongsou\.com' : 'zhongsou', 'ctrouve\.' : 'ctrouve', 'gazeta\.pl' : 'gazetapl', 'recherche\.club-internet\.fr' : 'clubinternet', 'sok\.start\.no' : 'start', 'scroogle\.org' : 'scroogle', 'schoenerbrausen\.de' : 'schoenerbrausen', 'looksmart\.co\.uk' : 'looksmartuk', 'wwweasel\.de' : 'wwweasel', 'godado' : 'godado', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'jubii\.dk' : 'jubii', '212\.227\.33\.241' : 'metaspinner', 'mirago\.fr' : 'miragofr', 'sol\.dk' : 'sol', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'jumpy\.it' : 'jumpy\.it', 'francite\.' : 'francite', 'infoseek\.de' : 'infoseek', 'es\.mirago\.com' : 'miragoes', 'jyxo\.(cz|com)' : 'jyxo', 'hotbot\.' : 'hotbot', 'engine\.exe' : 'engine', '(^|\.)ask\.com' : 'ask', 'goliat\.hu' : 'goliat', 'wisenut\.com' : 'wisenut', 'mirago\.nl' : 'miragonl', 'base\.google\.' : 'google_base', 'search\.bluewin\.ch' : 'bluewin', 'lycos\.' : 'lycos', 'meinestadt\.de' : 'meinestadt', '4\-counter\.com' : 'google4counter', 'search\.alice\.it\.master' : 'aliceitmaster', 'teoma\.' : 'teoma', '(^|\.)ask\.co\.uk' : 'askuk', 'tyfon\.dk' : 'tyfon', 'froogle\.google\.' : 'google_froogle', 'ukdirectory\.' : 'ukdirectory', 'ledix\.net' : 'ledix', 'edderkoppen\.dk' : 'edderkoppen', 'recherche\.aol\.fr' : 'aolfr', 'google\.[\w.]+/products' : 'google_products', 'webmania\.hu' : 'webmania', 'searchy\.co\.uk' : 'searchy', 'fr\.ask.\com' : 'askfr', 'spray\.' : 'spray', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'eniro\.no' : 'eniro', 'goodsearch\.com' : 'goodsearch', 'kvasir\.' : 'kvasir', '\.accoona\.com' : 'accoona', '\.soso\.com' : 'soso', 'as\.starware\.com' : 'comettoolbar', 'virgilio\.it' : 'virgilio', 'o2\.pl' : 'o2pl', 'chello\.nl' : 'chellonl', 'chello\.be' : 'chellobe', 'icq\.com\/search' : 'icq', 'msn\.' : 'msn', 'fireball\.de' : 'fireball', 'sucheaol\.aol\.de' : 'aolde', 'uk\.ask.\com' : 'askuk', 'euroseek\.' : 'euroseek', 'gery\.pl' : 'gerypl', 'chello\.fr' : 'chellofr', 'netsprint\.pl' : 'netsprintpl', 'avantfind\.com' : 'avantfind', 'supereva\.com' : 'supereva', 'polymeta\.hu' : 'polymeta_hu', 'infospace\.com' : 'infospace', 'sify\.com' : 'sify', 'go2net\.com' : 'go2net', 'wahoo\.hu' : 'wahoo', 'suche\d?\.web\.de' : 'webde', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', '\.3721\.com' : '3721', 'ilse\.' : 'ilse', 'metacrawler\.' : 'metacrawler', 'sagool\.jp' : 'sagool', 'atlas\.cz' : 'atlas', 'vindex\.' : 'vindex', 'ixquick\.com' : 'ixquick', '66\.102\.[1-9]\.104' : 'google_cache', 'rambler\.ru' : 'rambler', 'answerbus\.com' : 'answerbus', 'evreka\.passagen\.se' : 'passagen', 'chello\.se' : 'chellose', 'clusty\.com' : 'clusty', 'search\.ch' : 'searchch', 'chello\.no' : 'chellono', 'searchalot\.com' : 'searchalot', 'questionanswering\.com' : 'questionanswering', 'seznam\.cz' : 'seznam', 'ukindex\.co\.uk' : 'ukindex', 'dmoz\.org' : 'dmoz', 'excite\.' : 'excite', 'chello\.pl' : 'chellopl', 'looksmart\.' : 'looksmart', '1klik\.dk' : '1klik', '\.vnet\.cn' : 'vnet', 'chello\.sk' : 'chellosk', '(^|\.)go\.com' : 'go', 'nusearch\.com' : 'nusearch', 'it\.ask.\com' : 'askit', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'search\.terra\.' : 'terra', 'webcrawler\.' : 'webcrawler', 'suchen\.abacho\.de' : 'abacho', 'szukacz\.pl' : 'szukaczpl', '66\.249\.93\.104' : 'google_cache', 'search\.internetto\.hu' : 'internetto', 'goggle\.co\.hu' : 'google', 'mirago\.se' : 'miragose', 'images\.google\.' : 'google_image', 'segnalo\.alice\.it' : 'segnalo', '\.163\.com' : 'netease', 'chello' : 'chellocom'} + +search_engines_knwown_url = {'dmoz' : 'search=', 'google' : '(p|q|as_p|as_q)=', 'searchalot' : 'q=', 'teoma' : 'q=', 'looksmartuk' : 'key=', 'polymeta_hu' : '', 'google_groups' : 'group\/', 'iune' : '(keywords|q)=', 'chellosk' : 'q1=', 'eniro' : 'q=', 'msn' : 'q=', 'webcrawler' : 'searchText=', 'mirago' : '(txtsearch|qry)=', 'enirose' : 'q=', 'miragobe' : '(txtsearch|qry)=', 'netease' : 'q=', 'netluchs' : 'query=', 'google_products' : '(p|q|as_p|as_q)=', 'jyxo' : '(s|q)=', 'origo' : '(q|search)=', 'ilse' : 'search_for=', 'chellocom' : 'q1=', 'goodsearch' : 'Keywords=', 'ledix' : 'q=', 'mozbot' : 'q=', 'chellocz' : 'q1=', 'webde' : 'su=', 'biglotron' : 'question=', 'metacrawler_de' : 'qry=', 'finddk' : 'words=', 'start' : 'q=', 'sagool' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'aliceit' : 'qs=', 'shinyseek\.it' : 'KEY=', 'onetpl' : 'qt=', 'clusty' : 'query=', 'chellonl' : 'q1=', 'miragode' : '(txtsearch|qry)=', 'miragose' : '(txtsearch|qry)=', 'o2pl' : 'qt=', 'goliat' : 'KERESES=', 'kvasir' : 'q=', 'askfr' : '(ask|q)=', 'infoseek' : 'qt=', 'yahoo_mindset' : 'p=', 'comettoolbar' : 'qry=', 'alltheweb' : 'q(|uery)=', 'miner' : 'q=', 'aol' : 'query=', 'rambler' : 'words=', 'scroogle' : 'Gw=', 'chellose' : 'q1=', 'ineffabile' : '', 'miragoit' : '(txtsearch|qry)=', 'yandex' : 'text=', 'segnalo' : '', 'dodajpl' : 'keyword=', 'avantfind' : 'keywords=', 'nusearch' : 'nusearch_terms=', 'bbc' : 'q=', 'supereva' : 'q=', 'atomz' : 'sp-q=', 'searchy' : 'search_term=', 'dogpile' : 'q(|kw)=', 'chellohu' : 'q1=', 'vnet' : 'kw=', '1klik' : 'query=', 't-online' : 'q=', 'hogapl' : 'qt=', 'stumbleupon' : '', 'soso' : 'q=', 'zhongsou' : '(word|w)=', 'a9' : 'a9\.com\/', 'centraldatabase' : 'query=', 'mamma' : 'query=', 'icerocket' : 'q=', 'ask' : '(ask|q)=', 'chellobe' : 'q1=', 'altavista' : 'q=', 'vindex' : 'in=', 'miragodk' : '(txtsearch|qry)=', 'chelloat' : 'q1=', 'digg' : 's=', 'metacrawler' : 'general=', 'nbci' : 'keyword=', 'chellono' : 'q1=', 'icq' : 'q=', 'arianna' : 'query=', 'miragocouk' : '(txtsearch|qry)=', '3721' : '(p|name)=', 'pogodak' : 'q=', 'ukdirectory' : 'k=', 'overture' : 'keywords=', 'heureka' : 'heureka=', 'teecnoit' : 'q=', 'miragoes' : '(txtsearch|qry)=', 'haku' : 'w=', 'go' : 'qt=', 'fireball' : 'q=', 'wisenut' : 'query=', 'sify' : 'keyword=', 'ixquick' : 'query=', 'anzwers' : 'search=', 'quick' : 'query=', 'jubii' : 'soegeord=', 'questionanswering' : '', 'asknl' : '(ask|q)=', 'askde' : '(ask|q)=', 'att' : 'qry=', 'terra' : 'query=', 'bing' : 'q=', 'wowpl' : 'q=', 'freeserve' : 'q=', 'atlas' : '(searchtext|q)=', 'askuk' : '(ask|q)=', 'godado' : 'Keywords=', 'northernlight' : 'qr=', 'answerbus' : '', 'search.com' : 'q=', 'google_image' : '(p|q|as_p|as_q)=', 'jumpy\.it' : 'searchWord=', 'gazetapl' : 'slowo=', 'yahoo' : 'p=', 'hotbot' : 'mt=', 'metabot' : 'st=', 'copernic' : 'web\/', 'kartoo' : '', 'metaspinner' : 'qry=', 'toile' : 'q=', 'aolde' : 'q=', 'blingo' : 'q=', 'askit' : '(ask|q)=', 'netscape' : 'search=', 'splut' : 'pattern=', 'looksmart' : 'key=', 'sphere' : 'q=', 'sol' : 'q=', 'miragono' : '(txtsearch|qry)=', 'kataweb' : 'q=', 'ofir' : 'querytext=', 'aliceitmaster' : 'qs=', 'miragofr' : '(txtsearch|qry)=', 'spray' : 'string=', 'seznam' : '(w|q)=', 'interiapl' : 'q=', 'euroseek' : 'query=', 'schoenerbrausen' : 'q=', 'centrum' : 'q=', 'netsprintpl' : 'q=', 'go2net' : 'general=', 'katalogonetpl' : 'qt=', 'ukindex' : 'stext=', 'shawca' : 'q=', 'szukaczpl' : 'q=', 'accoona' : 'qt=', 'live' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'iask' : '(w|k)=', 'earthlink' : 'q=', 'tiscali' : 'key=', 'askes' : '(ask|q)=', 'gotuneed' : '', 'clubinternet' : 'q=', 'redbox' : 'srch=', 'delicious' : 'all=', 'chellofr' : 'q1=', 'lycos' : 'query=', 'sympatico' : 'query=', 'vivisimo' : 'query=', 'bluewin' : 'qry=', 'mysearch' : 'searchfor=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ukplus' : 'search=', 'gerypl' : 'q=', 'keresolap_hu' : 'q=', 'abacho' : 'q=', 'engine' : 'p1=', 'opasia' : 'q=', 'wp' : 'szukaj=', 'steadysearch' : 'w=', 'chellopl' : 'q1=', 'voila' : '(kw|rdata)=', 'aport' : 'r=', 'internetto' : 'searchstr=', 'passagen' : 'q=', 'wwweasel' : 'q=', 'najdi' : 'dotaz=', 'alexa' : 'q=', 'baidu' : '(wd|word)=', 'spotjockey' : 'Search_Keyword=', 'virgilio' : 'qs=', 'orbis' : 'search_field=', 'tango_hu' : 'q=', 'askjp' : '(ask|q)=', 'bungeebonesdotcom' : 'query=', 'francite' : 'name=', 'searchch' : 'q=', 'google_froogle' : '(p|q|as_p|as_q)=', 'excite' : 'search=', 'infospace' : 'qkw=', 'polskapl' : 'qt=', 'swik' : 'swik\.net/', 'edderkoppen' : 'query=', 'mywebsearch' : 'searchfor=', 'danielsen' : 'q=', 'wahoo' : 'q=', 'sogou' : 'query=', 'miragonl' : '(txtsearch|qry)=', 'findarticles' : 'key='} + diff --git a/conf.py b/conf.py new file mode 100644 index 0000000..e26b953 --- /dev/null +++ b/conf.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- + +# Web server log +analyzed_filename = 'access.log' + +# Domain name to analyze +domain_name = 'soutade.fr' + +# Display visitor IP in addition to resolved names +display_visitor_ip = True + +# Hooks used +pre_analysis_hooks = ['page_to_hit', 'robots'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits']#, 'reverse_dns'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] + +# Reverse DNS timeout +reverse_dns_timeout = 0.2 + +# Count this addresses as hit +page_to_hit_conf = [r'^.+/logo[/]?$'] +## Count this addresses as page +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] + +# Because it's too long to build HTML when there is too much entries +max_hits_displayed = 100 +max_downloads_displayed = 100 + +# Compress these files after generation +compress_output_files = ['html', 'css', 'js'] + +# Display result in French +locale = 'fr' + diff --git a/default_conf.py b/default_conf.py new file mode 100644 index 0000000..dcc8190 --- /dev/null +++ b/default_conf.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- + +import os + +# Default configuration + +# Default database directory +DB_ROOT = './output_db' +# Default HTML output directory +DISPLAY_ROOT = './output' + +# Hooks directories (don't edit) +HOOKS_ROOT = 'plugins' +PRE_HOOK_DIRECTORY = HOOKS_ROOT + '.pre_analysis' +POST_HOOK_DIRECTORY = HOOKS_ROOT + '.post_analysis' +DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + '.display' +# Meta Database filename +META_PATH = os.path.join(DB_ROOT, 'meta.db') +# Database filename per month +DB_FILENAME = 'iwla.db' + +# Web server log format (nginx style). Default is apache log format +log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ + '"$request" $status $body_bytes_sent ' +\ + '"$http_referer" "$http_user_agent"' + +# Time format used in log format +time_format = '%d/%b/%Y:%H:%M:%S %z' + +# Hooks that are loaded at runtime (only set names without path and extensions) +pre_analysis_hooks = [] +post_analysis_hooks = [] +display_hooks = [] + +# Extensions that are considered as a HTML page (or result) in opposite to hits +pages_extensions = ['/', 'htm', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] +# HTTP codes that are cosidered OK +viewed_http_codes = [200, 304] + +# If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) +count_hit_only_visitors = True + +# Multimedia extensions (not accounted as downloaded files) +multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', + 'css', 'js'] + +# Default resources path (will be symlinked in DISPLAY_OUTPUT) +resources_path = ['resources'] +# Icon path +icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') +# CSS path (you can add yours) +css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] + +# Files extensions to compress in gzip during display build +compress_output_files = [] + +# Path to locales files +locales_path = './locales' + +# Default locale (english) +locale = 'en_EN' diff --git a/display.py b/display.py new file mode 100644 index 0000000..cb98693 --- /dev/null +++ b/display.py @@ -0,0 +1,387 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import os +import codecs +import time +import logging + +# +# Create output HTML files +# + +# Just for detection +def _(name): pass +_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July') +_('August'), _('September'), _('October'), _('November'), _('December') +del _ + +class DisplayHTMLRaw(object): + + def __init__(self, iwla, html=u''): + self.iwla = iwla + self.html = html + + def setRawHTML(self, html): + self.html = html + + def _buildHTML(self): + pass + + def _build(self, f, html): + if html: f.write(html) + + def build(self, f): + self._buildHTML() + self._build(f, self.html) + +class DisplayHTMLBlock(DisplayHTMLRaw): + + def __init__(self, iwla, title=''): + super(DisplayHTMLBlock, self).__init__(iwla, html='') + self.title = title + self.cssclass = u'iwla_block' + self.title_cssclass = u'iwla_block_title' + self.value_cssclass = u'iwla_block_value' + + def getTitle(self): + return self.title + + def setTitle(self, value): + self.title = unicode(value) + + def setCSSClass(self, cssclass): + self.cssclass = unicode(cssclass) + + def setTitleCSSClass(self, cssclass): + self.title_cssclass = unicode(cssclass) + + def setValueCSSClass(self, cssclass): + self.value_cssclass = unicode(cssclass) + + def _buildHTML(self): + html = u'
' % (self.cssclass) + if self.title: + html += u'
%s
' % (self.title_cssclass, self.title) + html += u'
%s
' % (self.value_cssclass, self.html) + html += u'
' + + self.html = html + +class DisplayHTMLBlockTable(DisplayHTMLBlock): + + def __init__(self, iwla, title, cols): + super(DisplayHTMLBlockTable, self).__init__(iwla=iwla, title=title) + self.cols = listToStr(cols) + self.rows = [] + self.cols_cssclasses = [u''] * len(cols) + self.rows_cssclasses = [] + self.table_css = u'iwla_table' + + def appendRow(self, row): + self.rows.append(listToStr(row)) + self.rows_cssclasses.append([u''] * len(row)) + + def getNbRows(self): + return len(self.rows) + + def getNbCols(self): + return len(self.cols) + + def getCellValue(self, row, col): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + return self.rows[row][col] + + def setCellValue(self, row, col, value): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + self.rows[row][col] = unicode(value) + + def setCellCSSClass(self, row, col, value): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + self.rows_cssclasses[row][col] = unicode(value) + + def getCellCSSClass(self, row, col): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + return self.rows_cssclasses[row][col] + + def getColCSSClass(self, col): + if col < 0 or col >= len(self.cols): + raise ValueError('Invalid indice %d' % (col)) + + return self.cols_cssclasses[col] + + def setRowCSSClass(self, row, value): + if row < 0 or row >= len(self.rows): + raise ValueError('Invalid indice %d' % (row)) + + self.rows_cssclasses[row] = [unicode(value)] * len(self.rows_cssclasses[row]) + + def setColCSSClass(self, col, value): + if col < 0 or col >= len(self.cols): + raise ValueError('Invalid indice %d' % (col)) + + self.cols_cssclasses[col] = unicode(value) + + def setColsCSSClass(self, values): + if len(values) != len(self.cols): + raise ValueError('Invalid values size') + + self.cols_cssclasses = listToStr(values) + + def _buildHTML(self): + style = u'' + if self.table_css: style = u' class="%s"' % (self.table_css) + html = u'' % (style) + if self.cols: + html += u'' + for i in range (0, len(self.cols)): + title = self.cols[i] + style = self.getColCSSClass(i) + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, title) + html += u'' + for i in range(0, len(self.rows)): + row = self.rows[i] + html += u'' + for j in range(0, len(row)): + v = row[j] + style = self.getCellCSSClass(i, j) + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, v) + html += u'' + html += u'' + + self.html += html + + super(DisplayHTMLBlockTable, self)._buildHTML() + +class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): + + def __init__(self, iwla, title, cols, short_titles=None, nb_valid_rows=0, graph_cols=None): + super(DisplayHTMLBlockTableWithGraph, self).__init__(iwla=iwla, title=title, cols=cols) + self.short_titles = short_titles or [] + self.short_titles = listToStr(self.short_titles) + self.nb_valid_rows = nb_valid_rows + self.icon_path = self.iwla.getConfValue('icon_path', '/') + self.raw_rows = [] + self.maxes = [0] * len(cols) + self.table_graph_css = u'iwla_graph_table' + self.td_img_css = u'iwla_td_img' + self.graph_cols = graph_cols or [] + + def appendRow(self, row): + self.raw_rows.append(row) + super(DisplayHTMLBlockTableWithGraph, self).appendRow(row) + + def appendShortTitle(self, short_title): + self.short_titles.append(unicode(short_title)) + + def setShortTitle(self, short_titles): + self.short_titles = listToStr(short_titles) + + def setNbValidRows(self, nb_valid_rows): + self.nb_valid_rows = nb_valid_rows + + def _computeMax(self): + for i in range(0, self.nb_valid_rows): + row = self.raw_rows[i] + for j in range(1, len(row)): + if row[j] > self.maxes[j]: + self.maxes[j] = row[j] + + def _getIconFromStyle(self, style): + if style.startswith(u'iwla_page'): icon = u'vp.png' + elif style.startswith(u'iwla_hit'): icon = u'vh.png' + elif style.startswith(u'iwla_bandwidth'): icon = u'vk.png' + elif style.startswith(u'iwla_visitor'): icon = u'vu.png' + elif style.startswith(u'iwla_visit'): icon = u'vv.png' + else: return '' + + return u'/%s/%s' % (self.icon_path, icon) + + def _buildHTML(self): + self._computeMax() + + style = u'' + if self.table_graph_css: style = u' class="%s"' % (self.table_graph_css) + html = u'' % (style) + html += u'' + for i in range(0, self.nb_valid_rows): + row = self.rows[i] + css = u'' + if self.td_img_css: css=u' class="%s"' % (self.td_img_css) + html += u'' % (css) + for j in self.graph_cols: + style = self.getColCSSClass(j) + icon = self._getIconFromStyle(style) + if not icon: continue + if style: style = u' class="%s"' % (style) + alt = u'%s: %s' % (row[j], self.cols[j]) + if self.maxes[j]: + height = int((self.raw_rows[i][j] * 100) / self.maxes[j]) or 1 + else: + height = 1 + html += u'' % (style, icon, height, alt, alt) + html += u'' + html += u'' + html += u'' + for i in range(0, len(self.short_titles)): + style = self.getCellCSSClass(i, 0) + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, self.short_titles[i]) + html += u'' + html += u'' + + self.html += html + + super(DisplayHTMLBlockTableWithGraph, self)._buildHTML() + +class DisplayHTMLPage(object): + + def __init__(self, iwla, title, filename, css_path): + self.iwla = iwla + self.title = unicode(title) + self.filename = filename + self.blocks = [] + self.css_path = listToStr(css_path) + self.logger = logging.getLogger(self.__class__.__name__) + + def getFilename(self): + return self.filename; + + def getBlock(self, title): + for b in self.blocks: + if title == b.getTitle(): + return b + return None + + def appendBlock(self, block): + self.blocks.append(block) + + def build(self, root): + filename = os.path.join(root, self.filename) + + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) + + self.logger.debug('Write %s' % (filename)) + + f = codecs.open(filename, 'w', 'utf-8') + f.write(u'') + f.write(u'') + f.write(u'') + f.write(u'') + for css in self.css_path: + f.write(u'' % (css)) + if self.title: + f.write(u'%s' % (self.title)) + f.write(u'') + for block in self.blocks: + block.build(f) + f.write(u'
Generated by IWLA %s
' % + ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) + f.write(u'') + f.close() + +class DisplayHTMLBuild(object): + + def __init__(self, iwla): + self.pages = [] + self.iwla = iwla + + def createPage(self, *args): + return DisplayHTMLPage(self.iwla, *args) + + def createBlock(self, _class, *args): + return _class(self.iwla, *args) + + def getPage(self, filename): + for page in self.pages: + if page.getFilename() == filename: + return page + return None + + def addPage(self, page): + self.pages.append(page) + + def build(self, root): + display_root = self.iwla.getConfValue('DISPLAY_ROOT', '') + if not os.path.exists(display_root): + os.makedirs(display_root) + for res_path in self.iwla.getResourcesPath(): + target = os.path.abspath(res_path) + link_name = os.path.join(display_root, res_path) + if not os.path.exists(link_name): + os.symlink(target, link_name) + + for page in self.pages: + page.build(root) + +# +# Global functions +# + +def bytesToStr(bytes): + suffixes = [u'', u' kB', u' MB', u' GB', u' TB'] + + for i in range(0, len(suffixes)): + if bytes < 1024: break + bytes /= 1024.0 + + if i: + return u'%.02f%s' % (bytes, suffixes[i]) + else: + return u'%d%s' % (bytes, suffixes[i]) + +def _toStr(v): + if type(v) != unicode: return unicode(v) + else: return v + +def listToStr(l): return map(lambda(v) : _toStr(v), l) + +def generateHTMLLink(url, name=None, max_length=100, prefix=u'http'): + url = unicode(url) + if not name: name = unicode(url) + if not url.startswith(prefix): url = u'%s://%s' % (prefix, url) + return u'%s' % (url, name[:max_length]) + +def createCurTitle(iwla, title): + title = iwla._(title) + month_name = time.strftime(u'%B', iwla.getCurTime()) + year = time.strftime(u'%Y', iwla.getCurTime()) + title += u' - %s %s' % (iwla._(month_name), year) + domain_name = iwla.getConfValue('domain_name', '') + if domain_name: + title += u' - %s' % (domain_name) + return title + diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 0000000..1a3b36c --- /dev/null +++ b/docs/index.md @@ -0,0 +1,552 @@ +iwla +==== + +Introduction +------------ + +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. + +Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). + +Usage +----- + + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + + -c : Clean output (database and HTML) before starting + -i : Read data from stdin instead of conf.analyzed_filename + -f : Read data from FILE instead of conf.analyzed_filename + -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + +Basic usage +----------- + +In addition to command line, iwla read parameters in default_conf.py. User can override default values using _conf.py_ file. Each module requires its own parameters. + +Main values to edit are : + + * **analyzed_filename** : web server log + * **domaine_name** : domain name to filter + * **pre_analysis_hooks** : List of pre analysis hooks + * **post_analysis_hooks** : List of post analysis hooks + * **display_hooks** : List of display hooks + * **locale** : Displayed locale (_en_ or _fr_) + +Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type + + python -m SimpleHTTPServer 8000 + +Open your favorite web browser at _http://localhost:8000_. Enjoy ! + +**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. + + +Interesting default configuration values +---------------------------------------- + + * **DB_ROOT** : Default database directory (default ./output_db) + * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **log_format** : Web server log format (nginx style). Default is apache log format + * **time_format** : Time format used in log format + * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits + * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) + * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) + * **css_path** : CSS path (you can add yours) + * **compress_output_files** : Files extensions to compress in gzip during display build + +Plugins +------- + +As previously described, plugins acts like UNIX pipes : statistics are constantly updated by each plugin to produce final result. We have three type of plugins : + + * **Pre analysis plugins** : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms + * **Display plugins** : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. + +Statistics are stored in dictionaries : + + * **month_stats** : Statistics of current analysed month + * **valid_visitor** : A subset of month_stats without robots + * **days_stats** : Statistics of current analysed day + * **visits** : All visitors with all of its requests + * **meta** : Final result of month statistics (by year) + +Create a Plugins +---------------- + +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). + +Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). + +The two functions to overload are _load(self)_ that must returns True or False if all is good (or not). It's called after _init_. The second is _hook(self)_ that is the body of plugins. + +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and bar graphs. + +Plugins +======= + +Optional configuration values ends with *. + +iwla +---- + + Main class IWLA + Parse Log, compute them, call plugins and produce output + For now, only HTTP log are valid + + Plugin requirements : + None + + Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + + Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + + meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + + days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + + valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.all_visits +-------------------------- + + Display hook + + Create All visits page + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers +------------------------ + + Display hook + + Create Referers page + + Plugin requirements : + post_analysis/referers + + Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + + Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page + + Statistics deletion : + None + + +plugins.pre_analysis.robots +--------------------------- + + Pre analysis hook + + Filter robots + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + robot + + Statistics deletion : + None + + diff --git a/docs/main.md b/docs/main.md new file mode 100644 index 0000000..0b5b16e --- /dev/null +++ b/docs/main.md @@ -0,0 +1,92 @@ +iwla +==== + +Introduction +------------ + +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. + +Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). + +Usage +----- + + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + + -c : Clean output (database and HTML) before starting + -i : Read data from stdin instead of conf.analyzed_filename + -f : Read data from FILE instead of conf.analyzed_filename + -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + +Basic usage +----------- + +In addition to command line, iwla read parameters in default_conf.py. User can override default values using _conf.py_ file. Each module requires its own parameters. + +Main values to edit are : + + * **analyzed_filename** : web server log + * **domaine_name** : domain name to filter + * **pre_analysis_hooks** : List of pre analysis hooks + * **post_analysis_hooks** : List of post analysis hooks + * **display_hooks** : List of display hooks + * **locale** : Displayed locale (_en_ or _fr_) + +Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type + + python -m SimpleHTTPServer 8000 + +Open your favorite web browser at _http://localhost:8000_. Enjoy ! + +**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. + + +Interesting default configuration values +---------------------------------------- + + * **DB_ROOT** : Default database directory (default ./output_db) + * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **log_format** : Web server log format (nginx style). Default is apache log format + * **time_format** : Time format used in log format + * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits + * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) + * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) + * **css_path** : CSS path (you can add yours) + * **compress_output_files** : Files extensions to compress in gzip during display build + +Plugins +------- + +As previously described, plugins acts like UNIX pipes : statistics are constantly updated by each plugin to produce final result. We have three type of plugins : + + * **Pre analysis plugins** : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms + * **Display plugins** : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. + +Statistics are stored in dictionaries : + + * **month_stats** : Statistics of current analysed month + * **valid_visitor** : A subset of month_stats without robots + * **days_stats** : Statistics of current analysed day + * **visits** : All visitors with all of its requests + * **meta** : Final result of month statistics (by year) + +Create a Plugins +---------------- + +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). + +Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). + +The two functions to overload are _load(self)_ that must returns True or False if all is good (or not). It's called after _init_. The second is _hook(self)_ that is the body of plugins. + +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and bar graphs. + +Plugins +======= + +Optional configuration values ends with *. + diff --git a/docs/modules.md b/docs/modules.md new file mode 100644 index 0000000..41167c3 --- /dev/null +++ b/docs/modules.md @@ -0,0 +1,460 @@ +iwla +---- + + Main class IWLA + Parse Log, compute them, call plugins and produce output + For now, only HTTP log are valid + + Plugin requirements : + None + + Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + + Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + + meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + + days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + + valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.all_visits +-------------------------- + + Display hook + + Create All visits page + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers +------------------------ + + Display hook + + Create Referers page + + Plugin requirements : + post_analysis/referers + + Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + + Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page + + Statistics deletion : + None + + +plugins.pre_analysis.robots +--------------------------- + + Pre analysis hook + + Filter robots + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + robot + + Statistics deletion : + None + + diff --git a/iplugin.py b/iplugin.py new file mode 100644 index 0000000..2664190 --- /dev/null +++ b/iplugin.py @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import importlib +import inspect +import logging + +# +# IWLA Plugin interface +# + +class IPlugin(object): + + def __init__(self, iwla): + self.iwla = iwla + self.requires = [] + self.conf_requires = [] + self.API_VERSION = 1 + self.ANALYSIS_CLASS = 'HTTP' + + def isValid(self, analysis_class, api_version): + if analysis_class != self.ANALYSIS_CLASS: return False + + # For now there is only version 1 + if self.API_VERSION != api_version: + return False + + return True + + def getRequirements(self): + return self.requires + + def getConfRequirements(self): + return self.conf_requires + + def load(self): + return True + + def hook(self): + pass + +def validConfRequirements(conf_requirements, iwla, plugin_path): + for r in conf_requirements: + if iwla.getConfValue(r, None) is None: + print '\'%s\' conf value required for %s' % (r, plugin_path) + return False + + return True + +def preloadPlugins(plugins, iwla): + cache_plugins = {} + + logger = logging.getLogger(__name__) + + logger.info("==> Preload plugins") + + for (root, plugins_filenames) in plugins: + for plugin_filename in plugins_filenames: + plugin_path = root + '.' + plugin_filename + try: + mod = importlib.import_module(plugin_path) + classes = [c for _,c in inspect.getmembers(mod)\ + if inspect.isclass(c) and \ + issubclass(c, IPlugin) and \ + c.__name__ != 'IPlugin' + ] + + if not classes: + logger.warning('No plugin defined in %s' % (plugin_path)) + continue + + plugin = classes[0](iwla) + plugin_name = plugin.__class__.__name__ + + if not plugin.isValid(iwla.ANALYSIS_CLASS, iwla.API_VERSION): + #print 'Plugin not valid %s' % (plugin_filename) + continue + + #print 'Load plugin %s' % (plugin_name) + + conf_requirements = plugin.getConfRequirements() + if not validConfRequirements(conf_requirements, iwla, plugin_path): + continue + + requirements = plugin.getRequirements() + + requirement_validated = False + for r in requirements: + for (_,p) in cache_plugins.items(): + if p.__class__.__name__ == r: + requirement_validated = True + break + if not requirement_validated: + logger.error('Missing requirements \'%s\' for plugin %s' % (r, plugin_path)) + break + if requirements and not requirement_validated: continue + + if not plugin.load(): + logger.error('Plugin %s load failed' % (plugin_path)) + continue + + logger.info('\tRegister %s' % (plugin_path)) + cache_plugins[plugin_path] = plugin + except Exception as e: + logger.exception('Error loading %s => %s' % (plugin_path, e)) + + return cache_plugins diff --git a/iwla.pot b/iwla.pot new file mode 100644 index 0000000..d8b1510 --- /dev/null +++ b/iwla.pot @@ -0,0 +1,279 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2014-12-19 17:46+CET\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" +"Generated-By: pygettext.py 1.5\n" + + +#: display.py:32 +msgid "April" +msgstr "" + +#: display.py:32 +msgid "February" +msgstr "" + +#: display.py:32 +msgid "January" +msgstr "" + +#: display.py:32 +msgid "July" +msgstr "" + +#: display.py:32 +msgid "March" +msgstr "" + +#: display.py:32 iwla.py:428 +msgid "June" +msgstr "" + +#: display.py:32 iwla.py:428 +msgid "May" +msgstr "" + +#: display.py:33 +msgid "August" +msgstr "" + +#: display.py:33 +msgid "December" +msgstr "" + +#: display.py:33 +msgid "November" +msgstr "" + +#: display.py:33 +msgid "October" +msgstr "" + +#: display.py:33 +msgid "September" +msgstr "" + +#: iwla.py:371 +msgid "Statistics" +msgstr "" + +#: iwla.py:377 +msgid "By day" +msgstr "" + +#: iwla.py:377 +msgid "Day" +msgstr "" + +#: iwla.py:377 iwla.py:430 +msgid "Not viewed Bandwidth" +msgstr "" + +#: iwla.py:377 iwla.py:430 +msgid "Visits" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +msgid "Hits" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_visitors.py:72 +msgid "Pages" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/top_visitors.py:72 +msgid "Bandwidth" +msgstr "" + +#: iwla.py:414 +msgid "Average" +msgstr "" + +#: iwla.py:419 iwla.py:457 +msgid "Total" +msgstr "" + +#: iwla.py:428 +msgid "Apr" +msgstr "" + +#: iwla.py:428 +msgid "Aug" +msgstr "" + +#: iwla.py:428 +msgid "Dec" +msgstr "" + +#: iwla.py:428 +msgid "Feb" +msgstr "" + +#: iwla.py:428 +msgid "Jan" +msgstr "" + +#: iwla.py:428 +msgid "Jul" +msgstr "" + +#: iwla.py:428 +msgid "Mar" +msgstr "" + +#: iwla.py:428 +msgid "Nov" +msgstr "" + +#: iwla.py:428 +msgid "Oct" +msgstr "" + +#: iwla.py:428 +msgid "Sep" +msgstr "" + +#: iwla.py:429 +msgid "Summary" +msgstr "" + +#: iwla.py:430 +msgid "Month" +msgstr "" + +#: iwla.py:430 +msgid "Visitors" +msgstr "" + +#: iwla.py:430 iwla.py:440 +msgid "Details" +msgstr "" + +#: iwla.py:465 +msgid "Statistics for" +msgstr "" + +#: iwla.py:472 +msgid "Last update" +msgstr "" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Host" +msgstr "" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Last seen" +msgstr "" + +#: plugins/display/all_visits.py:92 +msgid "All visits" +msgstr "" + +#: plugins/display/all_visits.py:93 plugins/display/top_visitors.py:72 +msgid "Top visitors" +msgstr "" + +#: plugins/display/referers.py:95 +msgid "Connexion from" +msgstr "" + +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +msgid "Origin" +msgstr "" + +#: plugins/display/referers.py:99 plugins/display/referers.py:156 +msgid "Search Engine" +msgstr "" + +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 +msgid "Others" +msgstr "" + +#: plugins/display/referers.py:114 plugins/display/referers.py:167 +msgid "External URL" +msgstr "" + +#: plugins/display/referers.py:129 plugins/display/referers.py:178 +msgid "External URL (robot)" +msgstr "" + +#: plugins/display/referers.py:147 +msgid "Top Referers" +msgstr "" + +#: plugins/display/referers.py:149 +msgid "All Referers" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:210 +msgid "Top key phrases" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Key phrase" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Search" +msgstr "" + +#: plugins/display/referers.py:212 +msgid "All key phrases" +msgstr "" + +#: plugins/display/top_downloads.py:71 +msgid "Hit" +msgstr "" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:91 +msgid "All Downloads" +msgstr "" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:97 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "URI" +msgstr "" + +#: plugins/display/top_downloads.py:89 +msgid "Top Downloads" +msgstr "" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:91 +msgid "All Hits" +msgstr "" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "Entrance" +msgstr "" + +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 +msgid "All Pages" +msgstr "" + +#: plugins/display/top_pages.py:88 +msgid "Top Pages" +msgstr "" + diff --git a/iwla.py b/iwla.py new file mode 100755 index 0000000..0c0f331 --- /dev/null +++ b/iwla.py @@ -0,0 +1,718 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import os +import shutil +import sys +import re +import time +import pickle +import gzip +import importlib +import argparse +import logging +import gettext +from calendar import monthrange +from datetime import date + +import default_conf as conf +import conf as _ +conf.__dict__.update(_.__dict__) +del _ + +from iplugin import * +from display import * + +""" +Main class IWLA +Parse Log, compute them, call plugins and produce output +For now, only HTTP log are valid + +Plugin requirements : + None + +Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + +Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + +meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + +month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + +days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + +visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + +valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + +Statistics update : + None + +Statistics deletion : + None +""" + + +class IWLA(object): + + ANALYSIS_CLASS = 'HTTP' + API_VERSION = 1 + IWLA_VERSION = '0.1' + + def __init__(self, logLevel): + self.meta_infos = {} + self.analyse_started = False + self.current_analysis = {} + self.cache_plugins = {} + self.display = DisplayHTMLBuild(self) + self.valid_visitors = None + + self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', conf.log_format) + self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted) + self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') + self.log_re = re.compile(self.log_format_extracted) + self.uri_re = re.compile(r'(?P[^\?#]+)(\?(?P[^#]+))?(#.*)?') + self.domain_name_re = re.compile(r'.*%s' % conf.domain_name) + self.plugins = [(conf.PRE_HOOK_DIRECTORY , conf.pre_analysis_hooks), + (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), + (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] + + logging.basicConfig(format='%(name)s %(message)s', level=logLevel) + self.logger = logging.getLogger(self.__class__.__name__) + self.logger.info('==> Start') + try: + t = gettext.translation('iwla', localedir=conf.locales_path, languages=[conf.locale], codeset='utf8') + self.logger.info('\tUsing locale %s' % (conf.locale)) + except IOError: + t = gettext.NullTranslations() + self.logger.info('\tUsing default locale en_EN') + self._ = t.ugettext + + def getVersion(self): + return IWLA.IWLA_VERSION + + def getConfValue(self, key, default=None): + if not key in dir(conf): + return default + else: + return conf.__dict__[key] + + def _clearVisits(self): + self.current_analysis = { + 'days_stats' : {}, + 'month_stats' : {}, + 'visits' : {} + } + self.valid_visitors = None + return self.current_analysis + + def getDaysStats(self): + return self.current_analysis['days_stats'] + + def getMonthStats(self): + return self.current_analysis['month_stats'] + + def getCurrentVisists(self): + return self.current_analysis['visits'] + + def getValidVisitors(self): + return self.valid_visitors + + def getDisplay(self): + return self.display + + def getCurTime(self): + return self.meta_infos['last_time'] + + def getStartAnalysisTime(self): + return self.meta_infos['start_analysis_time'] + + def isValidForCurrentAnalysis(self, request): + cur_time = self.meta_infos['start_analysis_time'] + # Analyse not started + if not cur_time: return False + return (time.mktime(cur_time) < time.mktime(request['time_decoded'])) + + def hasBeenViewed(self, request): + return int(request['status']) in conf.viewed_http_codes + + def getCurDisplayPath(self, filename): + cur_time = self.meta_infos['last_time'] + return os.path.join(str(cur_time.tm_year), '%02d' % (cur_time.tm_mon), filename) + + def getResourcesPath(self): + return conf.resources_path + + def getCSSPath(self): + return conf.css_path + + def _clearMeta(self): + self.meta_infos = { + 'last_time' : None, + 'start_analysis_time' : None + } + return self.meta_infos + + def _clearDisplay(self): + self.display = DisplayHTMLBuild(self) + return self.display + + def getDBFilename(self, time): + return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % (time.tm_mon), conf.DB_FILENAME) + + def _serialize(self, obj, filename): + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) + + # TODO : remove return + #return + + with open(filename + '.tmp', 'wb+') as f, gzip.open(filename, 'w') as fzip: + pickle.dump(obj, f) + f.seek(0) + fzip.write(f.read()) + os.remove(filename + '.tmp') + + def _deserialize(self, filename): + if not os.path.exists(filename): + return None + + with gzip.open(filename, 'r') as f: + return pickle.load(f) + return None + + def _callPlugins(self, target_root, *args): + self.logger.info('==> Call plugins (%s)' % (target_root)) + for (root, plugins) in self.plugins: + if root != target_root: continue + for p in plugins: + mod = self.cache_plugins.get(root + '.' + p, None) + if mod: + self.logger.info('\t%s' % (p)) + mod.hook(*args) + + def isPage(self, request): + for e in conf.pages_extensions: + if request.endswith(e): + return True + + return False + + def _appendHit(self, hit): + remote_addr = hit['remote_addr'] + + if not remote_addr: return + + if not remote_addr in self.current_analysis['visits'].keys(): + self._createVisitor(hit) + + super_hit = self.current_analysis['visits'][remote_addr] + super_hit['requests'].append(hit) + super_hit['bandwidth'] += int(hit['body_bytes_sent']) + super_hit['last_access'] = self.meta_infos['last_time'] + + request = hit['extract_request'] + + uri = request.get('extract_uri', request['http_uri']) + + hit['is_page'] = self.isPage(uri) + + if super_hit['robot'] or\ + not self.hasBeenViewed(hit): + page_key = 'not_viewed_pages' + hit_key = 'not_viewed_hits' + else: + page_key = 'viewed_pages' + hit_key = 'viewed_hits' + + if hit['is_page']: + super_hit[page_key] += 1 + else: + super_hit[hit_key] += 1 + + def _createVisitor(self, hit): + super_hit = self.current_analysis['visits'][hit['remote_addr']] = {} + super_hit['remote_addr'] = hit['remote_addr'] + super_hit['remote_ip'] = hit['remote_addr'] + super_hit['viewed_pages'] = 0 + super_hit['viewed_hits'] = 0 + super_hit['not_viewed_pages'] = 0 + super_hit['not_viewed_hits'] = 0 + super_hit['bandwidth'] = 0 + super_hit['last_access'] = self.meta_infos['last_time'] + super_hit['requests'] = [] + super_hit['robot'] = False + super_hit['hit_only'] = 0 + + def _decodeHTTPRequest(self, hit): + if not 'request' in hit.keys(): return False + + groups = self.http_request_extracted.match(hit['request']) + + if groups: + hit['extract_request'] = groups.groupdict() + uri_groups = self.uri_re.match(hit['extract_request']['http_uri']) + if uri_groups: + d = uri_groups.groupdict() + hit['extract_request']['extract_uri'] = d['extract_uri'] + if 'extract_parameters' in d.keys(): + hit['extract_request']['extract_parameters'] = d['extract_parameters'] + else: + self.logger.warning("Bad request extraction %s" % (hit['request'])) + return False + + if hit['http_referer']: + referer_groups = self.uri_re.match(hit['http_referer']) + if referer_groups: + hit['extract_referer'] = referer_groups.groupdict() + return True + + def _decodeTime(self, hit): + try: + hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format) + except ValueError, e: + if sys.version_info < (3, 2): + # Try without UTC value at the end (%z not recognized) + gmt_offset_str = hit['time_local'][-5:] + gmt_offset_hours = int(gmt_offset_str[1:3])*60*60 + gmt_offset_minutes = int(gmt_offset_str[3:5])*60 + gmt_offset = gmt_offset_hours + gmt_offset_minutes + hit['time_decoded'] = time.strptime(hit['time_local'][:-6], conf.time_format[:-3]) + if gmt_offset_str[0] == '+': + hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])+gmt_offset) + else: + hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])-gmt_offset) + else: + raise e + return hit['time_decoded'] + + def getDisplayIndex(self): + cur_time = self.meta_infos['last_time'] + filename = self.getCurDisplayPath('index.html') + + return self.display.getPage(filename) + + def _generateDisplayDaysStats(self): + cur_time = self.meta_infos['last_time'] + title = createCurTitle(self, self._('Statistics')) + filename = self.getCurDisplayPath('index.html') + self.logger.info('==> Generate display (%s)' % (filename)) + page = self.display.createPage(title, filename, conf.css_path) + + _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) + days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, self._('By day'), [self._('Day'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) + days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) + nb_visits = 0 + nb_days = 0 + for i in range(1, nb_month_days+1): + day = '%d
%s' % (i, time.strftime('%b', cur_time)) + full_day = '%02d %s %d' % (i, time.strftime('%b', cur_time), cur_time.tm_year) + if i in self.current_analysis['days_stats'].keys(): + stats = self.current_analysis['days_stats'][i] + row = [full_day, stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], + stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + nb_visits += stats['nb_visits'] + nb_days += 1 + else: + row = [full_day, 0, 0, 0, 0, 0] + days.appendRow(row) + days.setCellValue(i-1, 4, bytesToStr(row[4])) + days.setCellValue(i-1, 5, bytesToStr(row[5])) + days.appendShortTitle(day) + adate = date(cur_time.tm_year, cur_time.tm_mon, i) + week_day = adate.weekday() + if week_day == 5 or week_day == 6: + days.setRowCSSClass(i-1, 'iwla_weekend') + if adate == date.today(): + css = days.getCellCSSClass(i-1, 0) + if css: css = '%s %s' % (css, 'iwla_curday') + else: css = 'iwla_curday' + days.setCellCSSClass(i-1, 0, css) + + stats = self.current_analysis['month_stats'] + + row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + if nb_days: + average_row = map(lambda(v): int(v/nb_days), row) + else: + average_row = map(lambda(v): 0, row) + + average_row[0] = self._('Average') + average_row[4] = bytesToStr(average_row[4]) + average_row[5] = bytesToStr(average_row[5]) + days.appendRow(average_row) + + row[0] = self._('Total') + row[4] = bytesToStr(row[4]) + row[5] = bytesToStr(row[5]) + days.appendRow(row) + page.appendBlock(days) + self.display.addPage(page) + + def _generateDisplayMonthStats(self, page, year, month_stats): + cur_time = time.localtime() + months_name = ['', self._('Jan'), self._('Feb'), self._('Mar'), self._('Apr'), self._('May'), self._('June'), self._('Jul'), self._('Aug'), self._('Sep'), self._('Oct'), self._('Nov'), self._('Dec')] + title = '%s %d' % (self._('Summary'), year) + cols = [self._('Month'), self._('Visitors'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth'), self._('Details')] + graph_cols=range(1,7) + months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) + months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) + total = [0] * len(cols) + for i in range(1, 13): + month = '%s
%d' % (months_name[i], year) + full_month = '%s %d' % (months_name[i], year) + if i in month_stats.keys(): + stats = month_stats[i] + link = '%s' % (year, i, self._('Details')) + row = [full_month, stats['nb_visitors'], stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], + stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] + for j in graph_cols: + total[j] += row[j] + else: + row = [full_month, 0, 0, 0, 0, 0, 0, ''] + months.appendRow(row) + months.setCellValue(i-1, 5, bytesToStr(row[5])) + months.setCellValue(i-1, 6, bytesToStr(row[6])) + months.appendShortTitle(month) + if year == cur_time.tm_year and i == cur_time.tm_mon: + css = months.getCellCSSClass(i-1, 0) + if css: css = '%s %s' % (css, 'iwla_curday') + else: css = 'iwla_curday' + months.setCellCSSClass(i-1, 0, css) + + total[0] = self._('Total') + total[5] = bytesToStr(total[5]) + total[6] = bytesToStr(total[6]) + total[7] = u'' + months.appendRow(total) + page.appendBlock(months) + + def _generateDisplayWholeMonthStats(self): + title = '%s %s' % (self._('Statistics for'), conf.domain_name) + filename = 'index.html' + + self.logger.info('==> Generate main page (%s)' % (filename)) + + page = self.display.createPage(title, filename, conf.css_path) + + last_update = '%s %s
' % (self._('Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) + page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) + + for year in sorted(self.meta_infos['stats'].keys(), reverse=True): + self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) + + self.display.addPage(page) + + def _compressFile(self, build_time, root, filename): + path = os.path.join(root, filename) + gz_path = path + '.gz' + + self.logger.debug('Compress %s => %s' % (path, gz_path)) + + if not os.path.exists(gz_path) or\ + os.stat(path).st_mtime > build_time: + with open(path, 'rb') as f_in, gzip.open(gz_path, 'wb') as f_out: + f_out.write(f_in.read()) + + def _compressFiles(self, build_time, root): + if not conf.compress_output_files: return + for rootdir, subdirs, files in os.walk(root, followlinks=True): + for f in files: + for ext in conf.compress_output_files: + if f.endswith(ext): + self._compressFile(build_time, rootdir, f) + break + + def _generateDisplay(self): + self._generateDisplayDaysStats() + self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY) + self._generateDisplayWholeMonthStats() + build_time = time.localtime() + self.display.build(conf.DISPLAY_ROOT) + self._compressFiles(build_time, conf.DISPLAY_ROOT) + + def _createEmptyStats(self): + stats = {} + stats['viewed_bandwidth'] = 0 + stats['not_viewed_bandwidth'] = 0 + stats['viewed_pages'] = 0 + stats['viewed_hits'] = 0 + stats['nb_visits'] = 0 + + return stats + + def _generateMonthStats(self): + self._clearDisplay() + + visits = self.current_analysis['visits'] + + stats = self._createEmptyStats() + for (day, stat) in self.current_analysis['days_stats'].items(): + for k in stats.keys(): + stats[k] += stat[k] + + duplicated_stats = {k:v for (k,v) in stats.items()} + + cur_time = self.meta_infos['last_time'] + self.logger.info("== Stats for %d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon)) + self.logger.info(stats) + + if not 'month_stats' in self.current_analysis.keys(): + self.current_analysis['month_stats'] = stats + else: + for (k,v) in stats.items(): + self.current_analysis['month_stats'][k] = v + + self.valid_visitors = {} + for (k,v) in visits.items(): + if v['robot']: continue + if not (conf.count_hit_only_visitors or\ + v['viewed_pages']): + continue + self.valid_visitors[k] = v + + duplicated_stats['nb_visitors'] = stats['nb_visitors'] = len(self.valid_visitors.keys()) + + self._callPlugins(conf.POST_HOOK_DIRECTORY) + + path = self.getDBFilename(cur_time) + if os.path.exists(path): + os.remove(path) + + self.logger.info("==> Serialize to %s" % (path)) + self._serialize(self.current_analysis, path) + + # Save month stats + year = cur_time.tm_year + month = cur_time.tm_mon + if not 'stats' in self.meta_infos.keys(): + self.meta_infos['stats'] = {} + if not year in self.meta_infos['stats'].keys(): + self.meta_infos['stats'][year] = {} + self.meta_infos['stats'][year][month] = duplicated_stats + + self._generateDisplay() + + def _generateDayStats(self): + visits = self.current_analysis['visits'] + cur_time = self.meta_infos['last_time'] + + self._callPlugins(conf.PRE_HOOK_DIRECTORY) + + stats = self._createEmptyStats() + + for (k, super_hit) in visits.items(): + if super_hit['last_access'].tm_mday != cur_time.tm_mday: + continue + viewed_page = False + for hit in super_hit['requests'][::-1]: + if hit['time_decoded'].tm_mday != cur_time.tm_mday: + break + if super_hit['robot'] or\ + not self.hasBeenViewed(hit): + stats['not_viewed_bandwidth'] += int(hit['body_bytes_sent']) + continue + stats['viewed_bandwidth'] += int(hit['body_bytes_sent']) + if hit['is_page']: + stats['viewed_pages'] += 1 + viewed_pages = True + else: + stats['viewed_hits'] += 1 + if (conf.count_hit_only_visitors or\ + viewed_pages) and\ + not super_hit['robot']: + stats['nb_visits'] += 1 + + self.logger.info("== Stats for %d/%02d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday)) + self.logger.info(stats) + + self.current_analysis['days_stats'][cur_time.tm_mday] = stats + + def _newHit(self, hit): + if not self.domain_name_re.match(hit['server_name']): + return False + + t = self._decodeTime(hit) + + cur_time = self.meta_infos['last_time'] + + if cur_time == None: + self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() + self.analyse_started = True + else: + if time.mktime(t) <= time.mktime(cur_time): + return False + self.analyse_started = True + if cur_time.tm_mon != t.tm_mon: + self._generateMonthStats() + self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() + elif cur_time.tm_mday != t.tm_mday: + self._generateDayStats() + + self.meta_infos['last_time'] = t + + if not self.meta_infos['start_analysis_time']: + self.meta_infos['start_analysis_time'] = t + + if not self._decodeHTTPRequest(hit): return False + + for k in hit.keys(): + if hit[k] == '-' or hit[k] == '*': + hit[k] = '' + + self._appendHit(hit) + + return True + + def start(self, _file): + self.logger.info('==> Load previous database') + + self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() + if self.meta_infos['last_time']: + self.logger.info('Last time') + self.logger.info(self.meta_infos['last_time']) + self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() + else: + self._clearVisits() + + self.meta_infos['start_analysis_time'] = None + + self.cache_plugins = preloadPlugins(self.plugins, self) + + self.logger.info('==> Analysing log') + + for l in _file: + # print "line " + l + + groups = self.log_re.match(l) + + if groups: + self._newHit(groups.groupdict()) + else: + self.logger.warning("No match for %s" % (l)) + #break + + if self.analyse_started: + self._generateDayStats() + self._generateMonthStats() + del self.meta_infos['start_analysis_time'] + self._serialize(self.meta_infos, conf.META_PATH) + else: + self.logger.info('==> Analyse not started : nothing new') + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Intelligent Web Log Analyzer') + + parser.add_argument('-c', '--clean-output', dest='clean_output', action='store_true', + default=False, + help='Clean output before starting') + + parser.add_argument('-i', '--stdin', dest='stdin', action='store_true', + default=False, + help='Read data from stdin instead of conf.analyzed_filename') + + parser.add_argument('-f', '--file', dest='file', + help='Analyse this log file') + + parser.add_argument('-d', '--log-level', dest='loglevel', + default='INFO', type=str, + help='Loglevel in %s, default : %s' % (['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], 'INFO')) + + args = parser.parse_args() + + if args.clean_output: + if os.path.exists(conf.DB_ROOT): shutil.rmtree(conf.DB_ROOT) + if os.path.exists(conf.DISPLAY_ROOT): shutil.rmtree(conf.DISPLAY_ROOT) + + loglevel = getattr(logging, args.loglevel.upper(), None) + if not isinstance(loglevel, int): + raise ValueError('Invalid log level: %s' % (args.loglevel)) + + iwla = IWLA(loglevel) + + required_conf = ['analyzed_filename', 'domain_name'] + if not validConfRequirements(required_conf, iwla, 'Main Conf'): + sys.exit(0) + + if args.stdin: + iwla.start(sys.stdin) + else: + filename = args.file or conf.analyzed_filename + if not os.path.exists(filename): + print 'No such file \'%s\'' % (filename) + sys.exit(-1) + with open(filename) as f: + iwla.start(f) diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo new file mode 100644 index 0000000000000000000000000000000000000000..360249b9be26cf63291f68baccb3bc9bf31d6867 GIT binary patch literal 2934 zcmZ{kO^g&p6vqn%#SxKD6%{EJ5X4?)_-2+5cXxIL++~;9fhaN2-kI9jhMw-Gx_Wje z#t;uA9yAdX4n_@LNZf<*LOei1Ool|G2M-)HhL~_sPF_s(Ac_9}-L*S|(MrGm)vKz0 z^O067U1?VelfD1HS<8 z1+Rd3#5Jp52k(Ra4R}BJJxDu0*zsH7Qs}oqe*dTCUm*AW8{~J3VTAfJko&IzSAiQr ze%EW~4_f^Y$WVqYkJ<4PAnl#B`h=aIv^)(mo(QC$Z-Nhk=Rodr9)wHcg4I8=`bCib zT(aX=K>B;l>R*H0_d5`exMBGdNPD-e{wv6H{|)4RcR>2VkLgzqUDVT>k>d zbw!ZpQv#WvV^()T?h}BtYe4!p17ZvDHrQBz{DO}|{{xe>yBtQBf$PAPU>sbhM`0vJhy2%c11|NfLh3v6oJTErp`5DLtDqW3rz_uOI1Hn;=1CTs~xp)G? zvwR-HwjNS|?1u2nSs&{lY3uWSSqi5EKXhxcpmxYJS!c|xtE^X6lS(U{DW_FSMpN32 z?PSx7(=Q?|`XcT5qA#galGup8rqZw?`rV*5?bXbb=x@oI+Y$p|5U3e14CJH^8={1v zlB!ZvV?t?kjO+Qa7z~VdgQ^mPGe+sa_2u#M@Lh`Bq{E5OY!*Xmf}#^ww*-Qq#Ntp0 zH;%XgC7n5v_yW?xD^TL)`C!Db8ygub6=c06s<}pq5m!^HQ+T(;NEjf7qoI*aPfe?u z>;!f+Y+|CBxj$Mp0unNmQSH^eK#ZCxo?v#U<0>_oK@J93pv1U}C?+#8Zd~KV#;eAn z)0LB<7UM~y!5AxH)Rj7FnQ`{!Ge)I5W7N}(g>a@48rK)c%ZJ4YCXqvF2X5-{l&Tu% zaLqXZw~?r#^rn3`H#S;v2DE~2Vc?W-LPfbPU)bRkwmF5pvaq|jWBZnY!3x$nWyOvD ze_6he&*ymRP6auReHRWC<#?DFx7MDO`{J~xUaU886?&>+;{a9%^#m8nsVKK$J(?RU z;wrs9RL+eY9vSR7UFgZ@aM_FsuuUt1yGG5Jt~L9eV%xjI&6|MAL@v!}C;?%>8d zgF!W{c|pA>_e^*u_mT>5osFtF{jH*mT6JY;tS4&8LeI|JD~?^jFvdbv^9;s!^%U}$ z%5(?O>8cvYwk^tRU*sW)rLSUX+OvLpmR{9W11>W~c4~^Z8JfW|E{)Ra>>3EudxoOy z8nbmOtFYQVp56e~Zxcn^Op7*bUq!v9?~$;jP@ZYkDr^+TE)Eb^SIblIzpHp_DoVUq z9N}mQj;Al&U#-~dlyG|%o1tozneHokE5=Pl+RIW$y zeTC9aP+Mc^?@#FbTDSyfTs5ZE#*(Xytbo*(O~Z5Ws<=rajE?^a~QlPtGq o, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: iwla\n" +"POT-Creation-Date: 2014-12-19 17:43+CET\n" +"PO-Revision-Date: 2014-12-19 17:43+0100\n" +"Last-Translator: Soutadé \n" +"Language-Team: iwla\n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: display.py:32 +msgid "April" +msgstr "Avril" + +#: display.py:32 +msgid "February" +msgstr "Février" + +#: display.py:32 +msgid "January" +msgstr "Janvier" + +#: display.py:32 +msgid "July" +msgstr "Juillet" + +#: display.py:32 +msgid "March" +msgstr "Mars" + +#: display.py:32 iwla.py:428 +msgid "June" +msgstr "Juin" + +#: display.py:32 iwla.py:428 +msgid "May" +msgstr "Mai" + +#: display.py:33 +msgid "August" +msgstr "Août" + +#: display.py:33 +msgid "December" +msgstr "Décembre" + +#: display.py:33 +msgid "November" +msgstr "Novembre" + +#: display.py:33 +msgid "October" +msgstr "Octobre" + +#: display.py:33 +msgid "September" +msgstr "Septembre" + +#: iwla.py:371 +msgid "Statistics" +msgstr "Statistiques" + +#: iwla.py:377 +msgid "By day" +msgstr "Par jour" + +#: iwla.py:377 +msgid "Day" +msgstr "Jour" + +#: iwla.py:377 iwla.py:430 +msgid "Not viewed Bandwidth" +msgstr "Traffic non vu" + +#: iwla.py:377 iwla.py:430 +msgid "Visits" +msgstr "Visites" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +msgid "Hits" +msgstr "Hits" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_visitors.py:72 +msgid "Pages" +msgstr "Pages" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/top_visitors.py:72 +msgid "Bandwidth" +msgstr "Bande passante" + +#: iwla.py:414 +msgid "Average" +msgstr "Moyenne" + +#: iwla.py:419 iwla.py:457 +msgid "Total" +msgstr "Total" + +#: iwla.py:428 +msgid "Apr" +msgstr "Avr" + +#: iwla.py:428 +msgid "Aug" +msgstr "Août" + +#: iwla.py:428 +msgid "Dec" +msgstr "Déc" + +#: iwla.py:428 +msgid "Feb" +msgstr "Fév" + +#: iwla.py:428 +msgid "Jan" +msgstr "Jan" + +#: iwla.py:428 +msgid "Jul" +msgstr "Jui" + +#: iwla.py:428 +msgid "Mar" +msgstr "Mars" + +#: iwla.py:428 +msgid "Nov" +msgstr "Nov" + +#: iwla.py:428 +msgid "Oct" +msgstr "Oct" + +#: iwla.py:428 +msgid "Sep" +msgstr "Sep" + +#: iwla.py:429 +msgid "Summary" +msgstr "Résumé" + +#: iwla.py:430 +msgid "Month" +msgstr "Mois" + +#: iwla.py:430 +msgid "Visitors" +msgstr "Visiteurs" + +#: iwla.py:430 iwla.py:440 +msgid "Details" +msgstr "Détails" + +#: iwla.py:465 +msgid "Statistics for" +msgstr "Statistiques pour" + +#: iwla.py:472 +msgid "Last update" +msgstr "Dernière mise à jour" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Host" +msgstr "Hôte" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Last seen" +msgstr "Dernière visite" + +#: plugins/display/all_visits.py:92 +msgid "All visits" +msgstr "Toutes les visites" + +#: plugins/display/all_visits.py:93 plugins/display/top_visitors.py:72 +msgid "Top visitors" +msgstr "Top visiteurs" + +#: plugins/display/referers.py:95 +msgid "Connexion from" +msgstr "Connexion depuis" + +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +msgid "Origin" +msgstr "Origine" + +#: plugins/display/referers.py:99 plugins/display/referers.py:156 +msgid "Search Engine" +msgstr "Moteur de recherche" + +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 +msgid "Others" +msgstr "Autres" + +#: plugins/display/referers.py:114 plugins/display/referers.py:167 +msgid "External URL" +msgstr "URL externe" + +#: plugins/display/referers.py:129 plugins/display/referers.py:178 +msgid "External URL (robot)" +msgstr "URL externe (robot)" + +#: plugins/display/referers.py:147 +msgid "Top Referers" +msgstr "Top Origines" + +#: plugins/display/referers.py:149 +msgid "All Referers" +msgstr "Toutes les origines" + +#: plugins/display/referers.py:200 plugins/display/referers.py:210 +msgid "Top key phrases" +msgstr "Top phrases clé" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Key phrase" +msgstr "Phrase clé" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Search" +msgstr "Recherche" + +#: plugins/display/referers.py:212 +msgid "All key phrases" +msgstr "Toutes les phrases clé" + +#: plugins/display/top_downloads.py:71 +msgid "Hit" +msgstr "Hit" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:91 +msgid "All Downloads" +msgstr "Tous les téléchargements" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:97 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "URI" +msgstr "URI" + +#: plugins/display/top_downloads.py:89 +msgid "Top Downloads" +msgstr "Top Téléchargements" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:91 +msgid "All Hits" +msgstr "Tous les hits" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "Entrance" +msgstr "Entrées" + +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 +msgid "All Pages" +msgstr "Toutes les pages" + +#: plugins/display/top_pages.py:88 +msgid "Top Pages" +msgstr "Top Pages" + +#~ msgid "Key Phrases" +#~ msgstr "Phrases clé" diff --git a/plugins/__init__.py b/plugins/__init__.py new file mode 100644 index 0000000..bd0daba --- /dev/null +++ b/plugins/__init__.py @@ -0,0 +1,2 @@ + +__all__ = ['pre_analysis', 'post_analysis', 'display'] diff --git a/plugins/display/__init__.py b/plugins/display/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/display/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py new file mode 100644 index 0000000..4dbc92c --- /dev/null +++ b/plugins/display/all_visits.py @@ -0,0 +1,99 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create All visits page + +Plugin requirements : + None + +Conf values needed : + display_visitor_ip* + +Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayAllVisits(IPlugin): + def __init__(self, iwla): + super(IWLADisplayAllVisits, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + display = self.iwla.getDisplay() + hits = self.iwla.getValidVisitors() + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) + + last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) + + title = createCurTitle(self.iwla, u'All visits') + + filename = 'all_visits.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Last seen'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Bandwidth'), self.iwla._(u'Last seen')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) + + for super_hit in last_access: + address = super_hit['remote_addr'] + if display_visitor_ip and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + + row = [ + address, + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] + table.appendRow(row) + page.appendBlock(table) + + display.addPage(page) + + index = self.iwla.getDisplayIndex() + link = '%s' % (filename, self.iwla._(u'All visits')) + block = index.getBlock(self.iwla._(u'Top visitors')) + if block: + block.setTitle('%s - %s' % (block.getTitle(), link)) + else: + block = display.createBlock(DisplayHTMLRawBlock) + block.setRawHTML(link) + index.appendBlock(block) diff --git a/plugins/display/referers.py b/plugins/display/referers.py new file mode 100644 index 0000000..bdd04a5 --- /dev/null +++ b/plugins/display/referers.py @@ -0,0 +1,225 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create Referers page + +Plugin requirements : + post_analysis/referers + +Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + +Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayReferers(IPlugin): + def __init__(self, iwla): + super(IWLADisplayReferers, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisReferers'] + self.max_referers = self.iwla.getConfValue('max_referers_displayed', 0) + self.create_all_referers = self.iwla.getConfValue('create_all_referers_page', True) + self.max_key_phrases = self.iwla.getConfValue('max_key_phrases_displayed', 0) + self.create_all_key_phrases = self.iwla.getConfValue('create_all_key_phrases_page', True) + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + referers = month_stats.get('referers', {}) + robots_referers = month_stats.get('robots_referers', {}) + search_engine_referers = month_stats.get('search_engine_referers', {}) + key_phrases = month_stats.get('key_phrases', {}) + + top_referers = [(k, referers[k]['pages']) for k in referers.keys()] + top_referers = sorted(top_referers, key=lambda t: t[1], reverse=True) + + top_robots_referers = [(k, robots_referers[k]['pages']) for k in robots_referers.keys()] + top_robots_referers = sorted(top_robots_referers, key=lambda t: t[1], reverse=True) + + top_search_engine_referers = [(k, search_engine_referers[k]['pages']) for k in search_engine_referers.keys()] + top_search_engine_referers = sorted(top_search_engine_referers, key=lambda t: t[1], reverse=True) + + top_key_phrases = key_phrases.items() + top_key_phrases = sorted(top_key_phrases, key=lambda t: t[1], reverse=True) + + cur_time = self.iwla.getCurTime() + index = self.iwla.getDisplayIndex() + + # All referers in a file + if self.create_all_referers: + title = createCurTitle(self.iwla, u'Connexion from') + + filename = 'referers.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Connexion from'), [self.iwla._(u'Origin'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + + total_search = [0]*3 + table.appendRow(['%s' % (self.iwla._(u'Search Engine')), '', '']) + new_list = self.max_referers and top_search_engine_referers[:self.max_referers] or top_search_engine_referers + for r,_ in new_list: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] += search_engine_referers[r]['pages'] + total_search[2] += search_engine_referers[r]['hits'] + table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + total_external = [0]*3 + table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) + new_list = self.max_referers and top_referers[:self.max_referers] or top_referers + for r,_ in new_list: + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] += referers[r]['pages'] + total_external[2] += referers[r]['hits'] + table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + total_robot = [0]*3 + table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) + new_list = self.max_referers and top_robots_referers[:self.max_referers] or top_robots_referers + for r,_ in new_list: + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] += robots_referers[r]['pages'] + total_robot[2] += robots_referers[r]['hits'] + table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top Referers') + if self.create_all_referers: + link = '%s' % (filename, self.iwla._(u'All Referers')) + title = '%s - %s' % (title, link) + + # Top referers in index + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Origin'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + + table.appendRow(['%s' % (self.iwla._(u'Search Engine')), '', '']) + for r,_ in top_search_engine_referers[:10]: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] -= search_engine_referers[r]['pages'] + total_search[2] -= search_engine_referers[r]['hits'] + table.appendRow(row) + if total_search[1] or total_search[2]: + total_search[0] = self.iwla._(u'Others') + table.appendRow(total_search) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) + for r,_ in top_referers[:10]: + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] -= referers[r]['pages'] + total_external[2] -= referers[r]['hits'] + table.appendRow(row) + if total_external[1] or total_external[2]: + total_external[0] = self.iwla._(u'Others') + table.appendRow(total_external) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) + for r,_ in top_robots_referers[:10]: + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] -= robots_referers[r]['pages'] + total_robot[2] -= robots_referers[r]['hits'] + table.appendRow(row) + if total_robot[1] or total_robot[2]: + total_robot[0] = self.iwla._(u'Others') + table.appendRow(total_robot) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + index.appendBlock(table) + + # All key phrases in a file + if self.create_all_key_phrases: + title = createCurTitle(self.iwla, u'Key Phrases') + + filename = 'key_phrases.html' + path = self.iwla.getCurDisplayPath(filename) + + total_search = [0]*2 + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table.setColsCSSClass(['', 'iwla_search']) + new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases + for phrase in new_list: + table.appendRow([phrase[0], phrase[1]]) + total_search[1] += phrase[1] + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top key phrases') + if self.create_all_key_phrases: + link = '%s' % (filename, self.iwla._(u'All key phrases')) + title = '%s - %s' % (title, link) + + # Top key phrases in index + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table.setColsCSSClass(['', 'iwla_search']) + for phrase in top_key_phrases[:10]: + table.appendRow([phrase[0], phrase[1]]) + total_search[1] -= phrase[1] + if total_search[1]: + total_search[0] = self.iwla._(u'Others') + table.appendRow(total_search) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py new file mode 100644 index 0000000..f5d4a60 --- /dev/null +++ b/plugins/display/top_downloads.py @@ -0,0 +1,106 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP downloads page + +Plugin requirements : + post_analysis/top_downloads + +Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + +Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopDownloads(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopDownloads, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopDownloads'] + self.max_downloads = self.iwla.getConfValue('max_downloads_displayed', 0) + self.create_all_downloads = self.iwla.getConfValue('create_all_downloads_page', True) + + def hook(self): + display = self.iwla.getDisplay() + top_downloads = self.iwla.getMonthStats()['top_downloads'] + top_downloads = sorted(top_downloads.items(), key=lambda t: t[1], reverse=True) + + # All in a file + if self.create_all_downloads: + filename = 'top_downloads.html' + path = self.iwla.getCurDisplayPath(filename) + title = createCurTitle(self.iwla, u'All Downloads') + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Downloads'), [self.iwla._(u'URI'), self.iwla._(u'Hit')]) + table.setColsCSSClass(['', 'iwla_hit']) + + total_entrance = [0]*2 + new_list = self.max_downloads and top_downloads[:self.max_downloads] or top_downloads + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] += entrance + if self.max_downloads: + others = 0 + for (uri, entrance) in top_downloads[self.max_downloads:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top Downloads') + if self.create_all_downloads: + link = '%s' % (filename, self.iwla._(u'All Downloads')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_hit']) + for (uri, entrance) in top_downloads[:10]: + table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] -= entrance + if total_entrance[1]: + total_entrance[0] = self.iwla._(u'Others') + table.appendRow(total_entrance) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py new file mode 100644 index 0000000..412b3fe --- /dev/null +++ b/plugins/display/top_hits.py @@ -0,0 +1,106 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP hits page + +Plugin requirements : + post_analysis/top_hits + +Conf values needed : + max_hits_displayed* + create_all_hits_page* + +Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopHits(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopHits, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopHits'] + self.max_hits = self.iwla.getConfValue('max_hits_displayed', 0) + self.create_all_hits = self.iwla.getConfValue('create_all_hits_page', True) + + def hook(self): + display = self.iwla.getDisplay() + top_hits = self.iwla.getMonthStats()['top_hits'] + top_hits = sorted(top_hits.items(), key=lambda t: t[1], reverse=True) + + # All in a file + if self.create_all_hits: + title = createCurTitle(self.iwla, u'All Hits') + filename = 'top_hits.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Hits'), [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 + new_list = self.max_hits and top_hits[:self.max_hits] or top_hits + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance + if self.max_hits: + others = 0 + for (uri, entrance) in top_hits[self.max_hits:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + page.appendBlock(table) + + display.addPage(page) + + title = 'Top Hits' + if self.create_all_hits: + link = '%s' % (filename, self.iwla._(u'All Hits')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + for (uri, entrance) in top_hits[:10]: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] -= entrance + if total_hits[1]: + total_hits[0] = self.iwla._(u'Others') + table.appendRow(total_hits) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py new file mode 100644 index 0000000..b44bf81 --- /dev/null +++ b/plugins/display/top_pages.py @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP pages page + +Plugin requirements : + post_analysis/top_pages + +Conf values needed : + max_pages_displayed* + create_all_pages_page* + +Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopPages(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopPages, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopPages'] + self.max_pages = self.iwla.getConfValue('max_pages_displayed', 0) + self.create_all_pages = self.iwla.getConfValue('create_all_pages_page', True) + + def hook(self): + display = self.iwla.getDisplay() + top_pages = self.iwla.getMonthStats()['top_pages'] + top_pages = sorted(top_pages.items(), key=lambda t: t[1], reverse=True) + + # All in a page + if self.create_all_pages: + title = createCurTitle(self.iwla, u'All Pages') + filename = 'top_pages.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Pages'), [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 + new_list = self.max_pages and top_pages[:self.max_pages] or top_pages + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance + if self.max_pages: + others = 0 + for (uri, entrance) in top_pages[self.max_pages:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top Pages') + if self.create_all_pages: + link = '%s' % (filename, self.iwla._(u'All Pages')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + for (uri, entrance) in top_pages[:10]: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] -= entrance + if total_hits[1]: + total_hits[0] = self.iwla._(u'Others') + table.appendRow(total_hits) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py new file mode 100644 index 0000000..b7d3b66 --- /dev/null +++ b/plugins/display/top_visitors.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP visitors block + +Plugin requirements : + None + +Conf values needed : + display_visitor_ip* + +Output files : + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopVisitors(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopVisitors, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + hits = self.iwla.getValidVisitors() + display = self.iwla.getDisplay() + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) + + total = [0]*5 + for super_hit in hits.values(): + total[1] += super_hit['viewed_pages'] + total[2] += super_hit['viewed_hits'] + total[3] += super_hit['bandwidth'] + + top_bandwidth = [(k,v['bandwidth']) for (k,v) in hits.items()] + top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) + top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] + + index = self.iwla.getDisplayIndex() + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top visitors'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Bandwidth'), self.iwla._(u'Last seen')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) + for super_hit in top_visitors: + address = super_hit['remote_addr'] + if display_visitor_ip and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + + row = [ + address, + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] + total[1] -= super_hit['viewed_pages'] + total[2] -= super_hit['viewed_hits'] + total[3] -= super_hit['bandwidth'] + table.appendRow(row) + if total[1] or total[2] or total[3]: + total[0] = self.iwla._(u'Others') + total[3] = bytesToStr(total[3]) + total[4] = '' + table.appendRow(total) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/post_analysis/__init__.py b/plugins/post_analysis/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/post_analysis/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py new file mode 100644 index 0000000..64ec66f --- /dev/null +++ b/plugins/post_analysis/referers.py @@ -0,0 +1,173 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re +import urllib + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +""" +Post analysis hook + +Extract referers and key phrases from requests + +Plugin requirements : + None + +Conf values needed : + domain_name + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + +Statistics deletion : + None +""" + +class IWLAPostAnalysisReferers(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisReferers, self).__init__(iwla) + self.API_VERSION = 1 + self.conf_requires = ['domain_name'] + + def _getSearchEngine(self, hashid): + for (k, e) in self.search_engines.items(): + for (h,h_re) in e['hashid']: + if hashid == h: + return k + return None + + def load(self): + domain_name = self.iwla.getConfValue('domain_name', '') + + if not domain_name: + print 'domain_name must not be empty !' + return False + + self.own_domain_re = re.compile(r'.*%s.*' % (domain_name)) + self.search_engines = {} + + for (hashid, name) in awstats_data.search_engines_hashid.items(): + hashid_re = re.compile(r'.*%s.*' % (hashid)) + if not name in self.search_engines.keys(): + self.search_engines[name] = { + 'hashid' : [(hashid, hashid_re)] + } + else: + self.search_engines[name]['hashid'].append((hashid, hashid_re)) + #print 'Hashid %s => %s' % (name, hashid) + + for (name, known_url) in awstats_data.search_engines_knwown_url.items(): + self.search_engines[name]['known_url'] = re.compile(known_url + '(?P.+)') + + for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): + not_engine_re = re.compile(r'.*%s.*' % (not_engine)) + key = self._getSearchEngine(engine) + if key: + self.search_engines[key]['not_search_engine'] = not_engine_re + + return True + + def _extractKeyPhrase(self, key_phrase_re, parameters, key_phrases): + if not parameters or not key_phrase_re: return + + for p in parameters.split('&'): + groups = key_phrase_re.match(p) + if groups: + key_phrase = groups.groupdict()['key_phrase'] + key_phrase = urllib.unquote_plus(key_phrase).decode('utf8') + if not key_phrase in key_phrases.keys(): + key_phrases[key_phrase] = 1 + else: + key_phrases[key_phrase] += 1 + break + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + referers = month_stats.get('referers', {}) + robots_referers = month_stats.get('robots_referers', {}) + search_engine_referers = month_stats.get('search_engine_referers', {}) + key_phrases = month_stats.get('key_phrases', {}) + + for (k, super_hit) in stats.items(): + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): break + if not r['http_referer']: continue + + uri = r['extract_referer']['extract_uri'] + if self.own_domain_re.match(uri): continue + + is_search_engine = False + for (name, engine) in self.search_engines.items(): + for (hashid, hashid_re) in engine['hashid']: + if not hashid_re.match(uri): continue + + not_engine = engine.get('not_search_engine', None) + # Try not engine + if not_engine and not_engine.match(uri): break + is_search_engine = True + uri = name + + parameters = r['extract_referer'].get('extract_parameters', None) + key_phrase_re = engine.get('known_url', None) + + self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) + break + + if is_search_engine: + dictionary = search_engine_referers + elif super_hit['robot']: + dictionary = robots_referers + # print '%s => %s' % (uri, super_hit['remote_ip']) + else: + dictionary = referers + if r['is_page']: + key = 'pages' + else: + key = 'hits' + if not uri in dictionary: dictionary[uri] = {'pages':0, 'hits':0} + dictionary[uri][key] += 1 + + month_stats['referers'] = referers + month_stats['robots_referers'] = robots_referers + month_stats['search_engine_referers'] = search_engine_referers + month_stats['key_phrases'] = key_phrases diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py new file mode 100644 index 0000000..c63965f --- /dev/null +++ b/plugins/post_analysis/reverse_dns.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import socket + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Replace IP by reverse DNS names + +Plugin requirements : + None + +Conf values needed : + reverse_dns_timeout* + +Output files : + None + +Statistics creation : + None + +Statistics update : +valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + +Statistics deletion : + None +""" + +class IWLAPostAnalysisReverseDNS(IPlugin): + DEFAULT_DNS_TIMEOUT = 0.5 + + def __init__(self, iwla): + super(IWLAPostAnalysisReverseDNS, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + timeout = self.iwla.getConfValue('reverse_dns_timeout', + IWLAPostAnalysisReverseDNS.DEFAULT_DNS_TIMEOUT) + socket.setdefaulttimeout(timeout) + return True + + def hook(self): + hits = self.iwla.getValidVisitors() + for (k, hit) in hits.items(): + if hit.get('dns_analysed', False): continue + try: + name, _, _ = socket.gethostbyaddr(k) + hit['remote_addr'] = name.lower() + hit['dns_name_replaced'] = True + except: + pass + finally: + hit['dns_analysed'] = True + diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py new file mode 100644 index 0000000..7b28c33 --- /dev/null +++ b/plugins/post_analysis/top_downloads.py @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count TOP downloads + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_downloads => + uri + +Statistics deletion : + None +""" + +class IWLAPostAnalysisTopDownloads(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopDownloads, self).__init__(iwla) + self.API_VERSION = 1 + self.conf_requires = ['multimedia_files', 'viewed_http_codes'] + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + multimedia_files = self.iwla.getConfValue('multimedia_files') + viewed_http_codes = self.iwla.getConfValue('viewed_http_codes') + + top_downloads = month_stats.get('top_downloads', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + r['is_page']: + continue + + uri = r['extract_request']['extract_uri'].lower() + + isMultimedia = False + for ext in multimedia_files: + if uri.endswith(ext): + isMultimedia = True + break + + if isMultimedia: continue + + uri = "%s%s" % (r.get('server_name', ''), + r['extract_request']['extract_uri']) + + if not uri in top_downloads.keys(): + top_downloads[uri] = 1 + else: + top_downloads[uri] += 1 + + month_stats['top_downloads'] = top_downloads diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py new file mode 100644 index 0000000..64446c7 --- /dev/null +++ b/plugins/post_analysis/top_hits.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count TOP hits + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_hits => + uri + +Statistics deletion : + None +""" + +class IWLAPostAnalysisTopHits(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopHits, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + top_hits = month_stats.get('top_hits', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + r['is_page']: + continue + + uri = r['extract_request']['extract_uri'].lower() + uri = "%s%s" % (r.get('server_name', ''), uri) + + if not uri in top_hits.keys(): + top_hits[uri] = 1 + else: + top_hits[uri] += 1 + + month_stats['top_hits'] = top_hits diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py new file mode 100644 index 0000000..a5d086c --- /dev/null +++ b/plugins/post_analysis/top_pages.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count TOP pages + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_pages => + uri + +Statistics deletion : + None +""" + +class IWLAPostAnalysisTopPages(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopPages, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.index_re = re.compile(r'/index.*') + return True + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + top_pages = month_stats.get('top_pages', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + not r['is_page']: + continue + + uri = r['extract_request']['extract_uri'] + if self.index_re.match(uri): + uri = '/' + + uri = "%s%s" % (r.get('server_name', ''), uri) + + if not uri in top_pages.keys(): + top_pages[uri] = 1 + else: + top_pages[uri] += 1 + + month_stats['top_pages'] = top_pages diff --git a/plugins/pre_analysis/__init__.py b/plugins/pre_analysis/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/pre_analysis/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py new file mode 100644 index 0000000..a3919c4 --- /dev/null +++ b/plugins/pre_analysis/page_to_hit.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Pre analysis hook +Change page into hit and hit into page into statistics + +Plugin requirements : + None + +Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + +Output files : + None + +Statistics creation : + None + +Statistics update : +visits : + remote_addr => + is_page + +Statistics deletion : + None +""" + +class IWLAPreAnalysisPageToHit(IPlugin): + + def __init__(self, iwla): + super(IWLAPreAnalysisPageToHit, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + # Page to hit + self.ph_regexps = self.iwla.getConfValue('page_to_hit_conf', []) + if not self.ph_regexps: return False + self.ph_regexps = map(lambda(r): re.compile(r), self.ph_regexps) + + # Hit to page + self.hp_regexps = self.iwla.getConfValue('hit_to_page_conf', []) + if not self.hp_regexps: return False + self.hp_regexps = map(lambda(r): re.compile(r), self.hp_regexps) + + return True + + def hook(self): + hits = self.iwla.getCurrentVisists() + + for (k, super_hit) in hits.items(): + if super_hit['robot']: continue + + for request in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(request): + break + + if not self.iwla.hasBeenViewed(request): + continue + + uri = request['extract_request']['extract_uri'] + + if request['is_page']: + # Page to hit + for regexp in self.ph_regexps: + if regexp.match(uri): + #print '%s is a hit' % (uri ) + request['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 + break + else: + # Hit to page + for regexp in self.hp_regexps: + if regexp.match(uri): + #print '%s is a page' % (uri ) + request['is_page'] = True + super_hit['viewed_pages'] += 1 + super_hit['viewed_hits'] -= 1 + break diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py new file mode 100644 index 0000000..662ce57 --- /dev/null +++ b/plugins/pre_analysis/robots.py @@ -0,0 +1,113 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +""" +Pre analysis hook + +Filter robots + +Plugin requirements : + None + +Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + +Output files : + None + +Statistics creation : + None + +Statistics update : +visits : + remote_addr => + robot + +Statistics deletion : + None +""" + +class IWLAPreAnalysisRobots(IPlugin): + def __init__(self, iwla): + super(IWLAPreAnalysisRobots, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.awstats_robots = map(lambda (x) : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots) + + return True + +# Basic rule to detect robots + def hook(self): + hits = self.iwla.getCurrentVisists() + for (k, super_hit) in hits.items(): + if super_hit['robot']: continue + + isRobot = False + referers = 0 + + first_page = super_hit['requests'][0] + if not self.iwla.isValidForCurrentAnalysis(first_page): continue + + for r in self.awstats_robots: + if r.match(first_page['http_user_agent']): + isRobot = True + break + + if isRobot: + super_hit['robot'] = 1 + continue + +# 1) no pages view --> robot + # if not super_hit['viewed_pages']: + # super_hit['robot'] = 1 + # continue + +# 2) pages without hit --> robot + if not super_hit['viewed_hits']: + super_hit['robot'] = 1 + continue + + for hit in super_hit['requests']: +# 3) /robots.txt read + if hit['extract_request']['http_uri'] == '/robots.txt': + isRobot = True + break + +# 4) Any referer for hits + if not hit['is_page'] and hit['http_referer']: + referers += 1 + + if isRobot: + super_hit['robot'] = 1 + continue + + if not super_hit['viewed_pages'] and \ + (super_hit['viewed_hits'] and not referers): + super_hit['robot'] = 1 + continue diff --git a/resources/css/iwla.css b/resources/css/iwla.css new file mode 100644 index 0000000..71b652b --- /dev/null +++ b/resources/css/iwla.css @@ -0,0 +1,87 @@ + +body +{ + font: 11px verdana, arial, helvetica, sans-serif; + background-color: #FFFFFF; +} + +.iwla_block +{ + display:block; + margin: 2em; +} + +.iwla_block_title { + font: 13px verdana, arial, helvetica, sans-serif; + font-weight: bold; + background-color: #CCCCDD; + text-align: center; + color: #000000; + width: 60%; +} + +a +{ + font: 11px verdana, arial, helvetica, sans-serif; + font-weight: normal; + text-decoration: none; +} + +.iwla_block_value +{ + border-width : 0.2em; + border-color : #CCCCDD; + border-style : solid; +} + +/* .iwla_block_value table tr th */ +th +{ + padding : 0.5em; + background : #ECECEC; + font-weight: normal; + white-space: nowrap; +} + +td +{ + text-align:center; + vertical-align:middle; +} + +.iwla_td_img +{ + vertical-align:bottom; +} + +td:first-child +{ + text-align:left; + /* width : 100%; */ +} + +.iwla_visitor { background : #FFAA66; } +.iwla_visit { background : #F4F090; } +.iwla_page { background : #4477DD; } +.iwla_hit { background : #66DDEE; } +.iwla_bandwidth { background : #2EA495; } +.iwla_search { background : #F4F090; } +.iwla_weekend { background : #ECECEC; } +.iwla_curday { font-weight: bold; } +.iwla_others { color: #668; } +.iwla_graph_table +{ + margin-left:auto; + margin-right:auto; +} + +table.iwla_graph_table + table.iwla_table +{ + margin-left:auto; + margin-right:auto; +} + +table.iwla_graph_table td +{ + text-align:center; +} diff --git a/resources/icon/vh.png b/resources/icon/vh.png new file mode 100644 index 0000000000000000000000000000000000000000..13e52f9ef9a675349c93b1eeeef2ea1388a3bdc6 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLoTn9*sC$qb+%OS+@4BLl<6e(pbstU$hcfKP}k$FXyY=dL+De_#Fo z|D5mtTb{o!zV|%&+P$D-=M1;*WmvkFVagPNwQD^ta>oF*2za_UhE&{2P6#RUeIHW` Yw7Z?@X!#7GUZ5OmdKI;Vst0F_-zU;qFB literal 0 HcmV?d00001 diff --git a/resources/icon/vk.png b/resources/icon/vk.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1bc63b7f1b1566abc0986fc6a8d5f0c70aff44 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLoi7I;J!Gca&{0AWU_H6}BFf-LEdzK#qG8~eHcB(eheDgizrt_%%<3>{$%3kp@Y z&aq#;NN>qh;i}1Cxn#wzK_`}!@!=$ Vv?lgUttn8B!PC{xWt~$(695VHJjDP2 literal 0 HcmV?d00001 diff --git a/resources/icon/vp.png b/resources/icon/vp.png new file mode 100644 index 0000000000000000000000000000000000000000..8ebf70216123ac0fd386005e511f20f42be2d5ca GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLo*8o|0J>k`33<#A+8)==M=V@SoV21sUuG2GF=Z-H zdhh`##981GS*8o|0J>k`RV~aA+DEChTJ%o^5SmQ z=V$Xizg_q8@#4pKXWYBqclm7diG6wdw)(G|<-c!TPZ!6Kid)GEA!WYr cV`^m>*!!5ylr{#t0p%DxUHx3vIVCg!0ItzYF#rGn literal 0 HcmV?d00001 diff --git a/tools/extract_doc.py b/tools/extract_doc.py new file mode 100755 index 0000000..eee534b --- /dev/null +++ b/tools/extract_doc.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python + +import sys + +filename = sys.argv[1] + +if filename.endswith('__init__.py'): + sys.exit(0) + +package_name = filename.replace('/', '.').replace('.py', '') +sys.stdout.write('%s' % (package_name)) +sys.stdout.write('\n') +# sys.stdout.write('\n\n') +sys.stdout.write('-' * len(package_name)) +sys.stdout.write('\n\n') + +sys.stderr.write('\tExtract doc from %s\n' % (filename)) + +with open(filename) as infile: + copy = False + for line in infile: + if line.strip() in ['"""', "'''"]: + if not copy: + copy = True + else: + break + elif copy: + sys.stdout.write(' %s' % (line)) + +sys.stdout.write('\n\n') diff --git a/tools/extract_docs.sh b/tools/extract_docs.sh new file mode 100755 index 0000000..e556330 --- /dev/null +++ b/tools/extract_docs.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +MODULES_TARGET="docs/modules.md" +MAIN_MD="docs/main.md" +TARGET_MD="docs/index.md" + +rm -f "${MODULES_TARGET}" + +echo "Generate doc from iwla.py" +python tools/extract_doc.py iwla.py > "${MODULES_TARGET}" + +echo "Generate plugins documentation" +find plugins -name '*.py' -exec python tools/extract_doc.py \{\} \; >> "${MODULES_TARGET}" + +echo "Generate ${TARGET_MD}" +cat "${MAIN_MD}" "${MODULES_TARGET}" > "${TARGET_MD}" diff --git a/tools/gettext.sh b/tools/gettext.sh new file mode 100755 index 0000000..81bafab --- /dev/null +++ b/tools/gettext.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +pygettext -a -d iwla -o iwla.pot -k gettext *.py plugins/pre_analysis/*.py plugins/post_analysis/*.py plugins/display/*.py diff --git a/tools/iwla_convert.pl b/tools/iwla_convert.pl new file mode 100755 index 0000000..b5c9587 --- /dev/null +++ b/tools/iwla_convert.pl @@ -0,0 +1,79 @@ +#!/usr/bin/perl + +my $awstats_lib_root = './'; +my @awstats_libs = ('search_engines.pm', 'robots.pm'); + +# my $awstats_lib_root = '/usr/share/awstats/lib/'; +# my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); + +foreach $lib (@awstats_libs) {require $awstats_lib_root . $lib;} + +sub dumpList { + my @list = @{$_[0]}; + my $FIC = $_[1]; + my $first = $_[2]; + + foreach $r (@list) + { + $r =~ s/\'/\\\'/g; + if ($first == 0) + { + print $FIC ", "; + } + else + { + $first = 0; + } + print $FIC "'$r'"; + } +} + +sub dumpHash { + my %hash = %{$_[0]}; + my $FIC = $_[1]; + my $first = $_[2]; + + while( my ($k,$v) = each(%hash) ) { + $k =~ s/\'/\\\'/g; + $v =~ s/\'/\\\'/g; + if ($first == 0) + { + print $FIC ", "; + } + else + { + $first = 0; + } + print $FIC "'$k' : '$v'"; + } +} + +# Robots +open($FIC,">", "awstats_data.py") or die $!; + +print $FIC "robots = ["; +dumpList(\@RobotsSearchIDOrder_list1, $FIC, 1); +dumpList(\@RobotsSearchIDOrder_list2, $FIC, 0); +print $FIC "]\n\n"; + +print $FIC "search_engines = ["; +dumpList(\@SearchEnginesSearchIDOrder_list1, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "search_engines_2 = ["; +dumpList(\@SearchEnginesSearchIDOrder_list2, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "not_search_engines_keys = {"; +dumpHash(\%NotSearchEnginesKeys, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "search_engines_hashid = {"; +dumpHash(\%SearchEnginesHashID, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "search_engines_knwown_url = {"; +dumpHash(\%SearchEnginesKnownUrl, $FIC, 1); +print $FIC "}\n\n"; + +close($FIC); From 765d0339282c079df04465b4ba7abdfafb0bd3db Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 23 Dec 2014 09:18:30 +0100 Subject: [PATCH 116/195] Update doc --- docs/index.md | 352 ++++++++++++++++++++++++------------------------ docs/main.md | 14 +- docs/modules.md | 338 +++++++++++++++++++++++----------------------- 3 files changed, 352 insertions(+), 352 deletions(-) diff --git a/docs/index.md b/docs/index.md index 1a3b36c..9fa98a3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). @@ -32,25 +32,25 @@ Main values to edit are : * **display_hooks** : List of display hooks * **locale** : Displayed locale (_en_ or _fr_) -Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type +Then, you can launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it, go into _output_ and type python -m SimpleHTTPServer 8000 Open your favorite web browser at _http://localhost:8000_. Enjoy ! -**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. +**Warning** : The order in hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. Interesting default configuration values ---------------------------------------- * **DB_ROOT** : Default database directory (default ./output_db) - * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **DISPLAY_ROOT** : Default HTML output directory (default _./output_) * **log_format** : Web server log format (nginx style). Default is apache log format * **time_format** : Time format used in log format * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) - * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **count_hit_only_visitors** : If False, don't count visitors that doesn't GET a page but resources only (images, rss...) * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) * **css_path** : CSS path (you can add yours) * **compress_output_files** : Files extensions to compress in gzip during display build @@ -64,7 +64,7 @@ As previously described, plugins acts like UNIX pipes : statistics are constantl * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms * **Display plugins** : They are in charge to produce HTML files from statistics. -To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. +To use plugins, just insert their file name (without _.py_ extension) in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. Statistics are stored in dictionaries : @@ -77,7 +77,7 @@ Statistics are stored in dictionaries : Create a Plugins ---------------- -To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). +To create a new plugin, it's necessary to subclass IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). @@ -175,34 +175,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -230,34 +202,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -343,151 +287,57 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_hits +------------------------ - Post analysis hook + Display hook - Count TOP downloads + Create TOP hits page Plugin requirements : - None + post_analysis/top_hits Conf values needed : - None + max_hits_displayed* + create_all_hits_page* Output files : - None + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.top_downloads +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - None + max_downloads_displayed* + create_all_downloads_page* Output files : - None + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : None - - -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages - hits - robots_referers => - pages - hits - search_engine_referers => - pages - hits - key_phrases => - phrase - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - -plugins.post_analysis.top_pages -------------------------------- - - Post analysis hook - - Count TOP pages - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_pages => - uri Statistics deletion : None @@ -550,3 +400,153 @@ plugins.pre_analysis.robots None +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + diff --git a/docs/main.md b/docs/main.md index 0b5b16e..7df8333 100644 --- a/docs/main.md +++ b/docs/main.md @@ -4,7 +4,7 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). @@ -32,25 +32,25 @@ Main values to edit are : * **display_hooks** : List of display hooks * **locale** : Displayed locale (_en_ or _fr_) -Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type +Then, you can launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it, go into _output_ and type python -m SimpleHTTPServer 8000 Open your favorite web browser at _http://localhost:8000_. Enjoy ! -**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. +**Warning** : The order in hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. Interesting default configuration values ---------------------------------------- * **DB_ROOT** : Default database directory (default ./output_db) - * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **DISPLAY_ROOT** : Default HTML output directory (default _./output_) * **log_format** : Web server log format (nginx style). Default is apache log format * **time_format** : Time format used in log format * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) - * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **count_hit_only_visitors** : If False, don't count visitors that doesn't GET a page but resources only (images, rss...) * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) * **css_path** : CSS path (you can add yours) * **compress_output_files** : Files extensions to compress in gzip during display build @@ -64,7 +64,7 @@ As previously described, plugins acts like UNIX pipes : statistics are constantl * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms * **Display plugins** : They are in charge to produce HTML files from statistics. -To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. +To use plugins, just insert their file name (without _.py_ extension) in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. Statistics are stored in dictionaries : @@ -77,7 +77,7 @@ Statistics are stored in dictionaries : Create a Plugins ---------------- -To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). +To create a new plugin, it's necessary to subclass IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). diff --git a/docs/modules.md b/docs/modules.md index 41167c3..5067afb 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -83,34 +83,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -138,34 +110,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -251,151 +195,57 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_hits +------------------------ - Post analysis hook + Display hook - Count TOP downloads + Create TOP hits page Plugin requirements : - None + post_analysis/top_hits Conf values needed : - None + max_hits_displayed* + create_all_hits_page* Output files : - None + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.top_downloads +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - None + max_downloads_displayed* + create_all_downloads_page* Output files : - None + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : None - - -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages - hits - robots_referers => - pages - hits - search_engine_referers => - pages - hits - key_phrases => - phrase - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - -plugins.post_analysis.top_pages -------------------------------- - - Post analysis hook - - Count TOP pages - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_pages => - uri Statistics deletion : None @@ -458,3 +308,153 @@ plugins.pre_analysis.robots None +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + From 088fb26a076f5b57533042e848433be1b8d2adef Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 19 Nov 2014 08:01:12 +0100 Subject: [PATCH 117/195] Initial commit --- LICENCE | 674 ++++++++++++++++++++ TODO | 5 + awstats_data.py | 12 + conf.py | 34 ++ default_conf.py | 61 ++ display.py | 387 ++++++++++++ docs/index.md | 552 +++++++++++++++++ docs/main.md | 92 +++ docs/modules.md | 460 ++++++++++++++ iplugin.py | 124 ++++ iwla.pot | 279 +++++++++ iwla.py | 810 ++++++++++++++++++++----- iwla_convert.pl | 34 -- iwla_get.sh | 20 + locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 0 -> 2934 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 283 +++++++++ plugins/__init__.py | 2 + plugins/display/__init__.py | 1 + plugins/display/all_visits.py | 99 +++ plugins/display/referers.py | 225 +++++++ plugins/display/top_downloads.py | 106 ++++ plugins/display/top_hits.py | 106 ++++ plugins/display/top_pages.py | 105 ++++ plugins/display/top_visitors.py | 97 +++ plugins/post_analysis/__init__.py | 1 + plugins/post_analysis/referers.py | 173 ++++++ plugins/post_analysis/reverse_dns.py | 78 +++ plugins/post_analysis/top_downloads.py | 94 +++ plugins/post_analysis/top_hits.py | 78 +++ plugins/post_analysis/top_pages.py | 87 +++ plugins/pre_analysis/__init__.py | 1 + plugins/pre_analysis/page_to_hit.py | 103 ++++ plugins/pre_analysis/robots.py | 113 ++++ resources/css/iwla.css | 87 +++ resources/icon/vh.png | Bin 0 -> 239 bytes resources/icon/vk.png | Bin 0 -> 236 bytes resources/icon/vp.png | Bin 0 -> 248 bytes resources/icon/vu.png | Bin 0 -> 239 bytes resources/icon/vv.png | Bin 0 -> 239 bytes robots.py | 2 - tools/extract_doc.py | 30 + tools/extract_docs.sh | 16 + tools/gettext.sh | 3 + tools/iwla_convert.pl | 79 +++ 44 files changed, 5342 insertions(+), 171 deletions(-) create mode 100644 LICENCE create mode 100644 TODO create mode 100644 awstats_data.py create mode 100644 conf.py create mode 100644 default_conf.py create mode 100644 display.py create mode 100644 docs/index.md create mode 100644 docs/main.md create mode 100644 docs/modules.md create mode 100644 iplugin.py create mode 100644 iwla.pot delete mode 100755 iwla_convert.pl create mode 100755 iwla_get.sh create mode 100644 locales/fr_FR/LC_MESSAGES/iwla.mo create mode 100644 locales/fr_FR/LC_MESSAGES/iwla.pot create mode 100644 plugins/__init__.py create mode 100644 plugins/display/__init__.py create mode 100644 plugins/display/all_visits.py create mode 100644 plugins/display/referers.py create mode 100644 plugins/display/top_downloads.py create mode 100644 plugins/display/top_hits.py create mode 100644 plugins/display/top_pages.py create mode 100644 plugins/display/top_visitors.py create mode 100644 plugins/post_analysis/__init__.py create mode 100644 plugins/post_analysis/referers.py create mode 100644 plugins/post_analysis/reverse_dns.py create mode 100644 plugins/post_analysis/top_downloads.py create mode 100644 plugins/post_analysis/top_hits.py create mode 100644 plugins/post_analysis/top_pages.py create mode 100644 plugins/pre_analysis/__init__.py create mode 100644 plugins/pre_analysis/page_to_hit.py create mode 100644 plugins/pre_analysis/robots.py create mode 100644 resources/css/iwla.css create mode 100644 resources/icon/vh.png create mode 100644 resources/icon/vk.png create mode 100644 resources/icon/vp.png create mode 100644 resources/icon/vu.png create mode 100644 resources/icon/vv.png delete mode 100644 robots.py create mode 100755 tools/extract_doc.py create mode 100755 tools/extract_docs.sh create mode 100755 tools/gettext.sh create mode 100755 tools/iwla_convert.pl diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENCE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/TODO b/TODO new file mode 100644 index 0000000..4999056 --- /dev/null +++ b/TODO @@ -0,0 +1,5 @@ +doc enhancement +Limit hits/pages/downloads by rate +Automatic tests +Free memory as soon as possible +Remove some IP from statistics diff --git a/awstats_data.py b/awstats_data.py new file mode 100644 index 0000000..8789384 --- /dev/null +++ b/awstats_data.py @@ -0,0 +1,12 @@ +robots = ['appie', 'architext', 'jeeves', 'bjaaland', 'contentmatch', 'ferret', 'googlebot', 'google\-sitemaps', 'gulliver', 'virus[_+ ]detector', 'harvest', 'htdig', 'linkwalker', 'lilina', 'lycos[_+ ]', 'moget', 'muscatferret', 'myweb', 'nomad', 'scooter', 'slurp', '^voyager\/', 'weblayers', 'antibot', 'bruinbot', 'digout4u', 'echo!', 'fast\-webcrawler', 'ia_archiver\-web\.archive\.org', 'ia_archiver', 'jennybot', 'mercator', 'netcraft', 'msnbot\-media', 'msnbot', 'petersnews', 'relevantnoise\.com', 'unlost_web_crawler', 'voila', 'webbase', 'webcollage', 'cfetch', 'zyborg', 'wisenutbot', '[^a]fish', 'abcdatos', 'acme\.spider', 'ahoythehomepagefinder', 'alkaline', 'anthill', 'arachnophilia', 'arale', 'araneo', 'aretha', 'ariadne', 'powermarks', 'arks', 'aspider', 'atn\.txt', 'atomz', 'auresys', 'backrub', 'bbot', 'bigbrother', 'blackwidow', 'blindekuh', 'bloodhound', 'borg\-bot', 'brightnet', 'bspider', 'cactvschemistryspider', 'calif[^r]', 'cassandra', 'cgireader', 'checkbot', 'christcrawler', 'churl', 'cienciaficcion', 'collective', 'combine', 'conceptbot', 'coolbot', 'core', 'cosmos', 'cruiser', 'cusco', 'cyberspyder', 'desertrealm', 'deweb', 'dienstspider', 'digger', 'diibot', 'direct_hit', 'dnabot', 'download_express', 'dragonbot', 'dwcp', 'e\-collector', 'ebiness', 'elfinbot', 'emacs', 'emcspider', 'esther', 'evliyacelebi', 'fastcrawler', 'feedcrawl', 'fdse', 'felix', 'fetchrover', 'fido', 'finnish', 'fireball', 'fouineur', 'francoroute', 'freecrawl', 'funnelweb', 'gama', 'gazz', 'gcreep', 'getbot', 'geturl', 'golem', 'gougou', 'grapnel', 'griffon', 'gromit', 'gulperbot', 'hambot', 'havindex', 'hometown', 'htmlgobble', 'hyperdecontextualizer', 'iajabot', 'iaskspider', 'hl_ftien_spider', 'sogou', 'iconoclast', 'ilse', 'imagelock', 'incywincy', 'informant', 'infoseek', 'infoseeksidewinder', 'infospider', 'inspectorwww', 'intelliagent', 'irobot', 'iron33', 'israelisearch', 'javabee', 'jbot', 'jcrawler', 'jobo', 'jobot', 'joebot', 'jubii', 'jumpstation', 'kapsi', 'katipo', 'kilroy', 'ko[_+ ]yappo[_+ ]robot', 'kummhttp', 'labelgrabber\.txt', 'larbin', 'legs', 'linkidator', 'linkscan', 'lockon', 'logo_gif', 'macworm', 'magpie', 'marvin', 'mattie', 'mediafox', 'merzscope', 'meshexplorer', 'mindcrawler', 'mnogosearch', 'momspider', 'monster', 'motor', 'muncher', 'mwdsearch', 'ndspider', 'nederland\.zoek', 'netcarta', 'netmechanic', 'netscoop', 'newscan\-online', 'nhse', 'northstar', 'nzexplorer', 'objectssearch', 'occam', 'octopus', 'openfind', 'orb_search', 'packrat', 'pageboy', 'parasite', 'patric', 'pegasus', 'perignator', 'perlcrawler', 'phantom', 'phpdig', 'piltdownman', 'pimptrain', 'pioneer', 'pitkow', 'pjspider', 'plumtreewebaccessor', 'poppi', 'portalb', 'psbot', 'python', 'raven', 'rbse', 'resumerobot', 'rhcs', 'road_runner', 'robbie', 'robi', 'robocrawl', 'robofox', 'robozilla', 'roverbot', 'rules', 'safetynetrobot', 'search\-info', 'search_au', 'searchprocess', 'senrigan', 'sgscout', 'shaggy', 'shaihulud', 'sift', 'simbot', 'site\-valet', 'sitetech', 'skymob', 'slcrawler', 'smartspider', 'snooper', 'solbot', 'speedy', 'spider[_+ ]monkey', 'spiderbot', 'spiderline', 'spiderman', 'spiderview', 'spry', 'sqworm', 'ssearcher', 'suke', 'sunrise', 'suntek', 'sven', 'tach_bw', 'tagyu_agent', 'tailrank', 'tarantula', 'tarspider', 'techbot', 'templeton', 'titan', 'titin', 'tkwww', 'tlspider', 'ucsd', 'udmsearch', 'universalfeedparser', 'urlck', 'valkyrie', 'verticrawl', 'victoria', 'visionsearch', 'voidbot', 'vwbot', 'w3index', 'w3m2', 'wallpaper', 'wanderer', 'wapspIRLider', 'webbandit', 'webcatcher', 'webcopy', 'webfetcher', 'webfoot', 'webinator', 'weblinker', 'webmirror', 'webmoose', 'webquest', 'webreader', 'webreaper', 'websnarf', 'webspider', 'webvac', 'webwalk', 'webwalker', 'webwatch', 'whatuseek', 'whowhere', 'wired\-digital', 'wmir', 'wolp', 'wombat', 'wordpress', 'worm', 'woozweb', 'wwwc', 'wz101', 'xget', '1\-more_scanner', 'accoona\-ai\-agent', 'activebookmark', 'adamm_bot', 'almaden', 'aipbot', 'aleadsoftbot', 'alpha_search_agent', 'allrati', 'aport', 'archive\.org_bot', 'argus', 'arianna\.libero\.it', 'aspseek', 'asterias', 'awbot', 'baiduspider', 'becomebot', 'bender', 'betabot', 'biglotron', 'bittorrent_bot', 'biz360[_+ ]spider', 'blogbridge[_+ ]service', 'bloglines', 'blogpulse', 'blogsearch', 'blogshares', 'blogslive', 'blogssay', 'bncf\.firenze\.sbn\.it\/raccolta\.txt', 'bobby', 'boitho\.com\-dc', 'bookmark\-manager', 'boris', 'bumblebee', 'candlelight[_+ ]favorites[_+ ]inspector', 'cbn00glebot', 'cerberian_drtrs', 'cfnetwork', 'cipinetbot', 'checkweb_link_validator', 'commons\-httpclient', 'computer_and_automation_research_institute_crawler', 'converamultimediacrawler', 'converacrawler', 'cscrawler', 'cse_html_validator_lite_online', 'cuasarbot', 'cursor', 'custo', 'datafountains\/dmoz_downloader', 'daviesbot', 'daypopbot', 'deepindex', 'dipsie\.bot', 'dnsgroup', 'domainchecker', 'domainsdb\.net', 'dulance', 'dumbot', 'dumm\.de\-bot', 'earthcom\.info', 'easydl', 'edgeio\-retriever', 'ets_v', 'exactseek', 'extreme[_+ ]picture[_+ ]finder', 'eventax', 'everbeecrawler', 'everest\-vulcan', 'ezresult', 'enteprise', 'facebook', 'fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de', 'fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de', 'matrix_s\.p\.a\._\-_fast_enterprise_crawler', 'fast_enterprise_crawler', 'fast\-search\-engine', 'favicon', 'favorg', 'favorites_sweeper', 'feedburner', 'feedfetcher\-google', 'feedflow', 'feedster', 'feedsky', 'feedvalidator', 'filmkamerabot', 'findlinks', 'findexa_crawler', 'fooky\.com\/ScorpionBot', 'g2crawler', 'gaisbot', 'geniebot', 'gigabot', 'girafabot', 'global_fetch', 'gnodspider', 'goforit\.com', 'goforitbot', 'gonzo', 'grub', 'gpu_p2p_crawler', 'henrythemiragorobot', 'heritrix', 'holmes', 'hoowwwer', 'hpprint', 'htmlparser', 'html[_+ ]link[_+ ]validator', 'httrack', 'hundesuche\.com\-bot', 'ichiro', 'iltrovatore\-setaccio', 'infobot', 'infociousbot', 'infomine', 'insurancobot', 'internet[_+ ]ninja', 'internetarchive', 'internetseer', 'internetsupervision', 'irlbot', 'isearch2006', 'iupui_research_bot', 'jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility', 'justview', 'kalambot', 'kamano\.de_newsfeedverzeichnis', 'kazoombot', 'kevin', 'keyoshid', 'kinjabot', 'kinja\-imagebot', 'knowitall', 'knowledge\.com', 'kouaa_krawler', 'krugle', 'ksibot', 'kurzor', 'lanshanbot', 'letscrawl\.com', 'libcrawl', 'linkbot', 'link_valet_online', 'metager\-linkchecker', 'linkchecker', 'livejournal\.com', 'lmspider', 'lwp\-request', 'lwp\-trivial', 'magpierss', 'mail\.ru', 'mapoftheinternet\.com', 'mediapartners\-google', 'megite', 'metaspinner', 'microsoft[_+ ]url[_+ ]control', 'mini\-reptile', 'minirank', 'missigua_locator', 'misterbot', 'miva', 'mizzu_labs', 'mj12bot', 'mojeekbot', 'msiecrawler', 'ms_search_4\.0_robot', 'msrabot', 'msrbot', 'mt::telegraph::agent', 'nagios', 'nasa_search', 'mydoyouhike', 'netluchs', 'netsprint', 'newsgatoronline', 'nicebot', 'nimblecrawler', 'noxtrumbot', 'npbot', 'nutchcvs', 'nutchosu\-vlib', 'nutch', 'ocelli', 'octora_beta_bot', 'omniexplorer[_+ ]bot', 'onet\.pl[_+ ]sa', 'onfolio', 'opentaggerbot', 'openwebspider', 'oracle_ultra_search', 'orbiter', 'yodaobot', 'qihoobot', 'passwordmaker\.org', 'pear_http_request_class', 'peerbot', 'perman', 'php[_+ ]version[_+ ]tracker', 'pictureofinternet', 'ping\.blo\.gs', 'plinki', 'pluckfeedcrawler', 'pogodak', 'pompos', 'popdexter', 'port_huron_labs', 'postfavorites', 'projectwf\-java\-test\-crawler', 'proodlebot', 'pyquery', 'rambler', 'redalert', 'rojo', 'rssimagesbot', 'ruffle', 'rufusbot', 'sandcrawler', 'sbider', 'schizozilla', 'scumbot', 'searchguild[_+ ]dmoz[_+ ]experiment', 'seekbot', 'sensis_web_crawler', 'seznambot', 'shim\-crawler', 'shoutcast', 'slysearch', 'snap\.com_beta_crawler', 'sohu\-search', 'sohu', 'snappy', 'sphere_scout', 'spip', 'sproose_crawler', 'steeler', 'steroid__download', 'suchfin\-bot', 'superbot', 'surveybot', 'susie', 'syndic8', 'syndicapi', 'synoobot', 'tcl_http_client_package', 'technoratibot', 'teragramcrawlersurf', 'test_crawler', 'testbot', 't\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e', 'topicblogs', 'turnitinbot', 'turtlescanner', 'turtle', 'tutorgigbot', 'twiceler', 'ubicrawler', 'ultraseek', 'unchaos_bot_hybrid_web_search_engine', 'unido\-bot', 'updated', 'ustc\-semantic\-group', 'vagabondo\-wap', 'vagabondo', 'vermut', 'versus_crawler_from_eda\.baykan@epfl\.ch', 'vespa_crawler', 'vortex', 'vse\/', 'w3c\-checklink', 'w3c[_+ ]css[_+ ]validator[_+ ]jfouffa', 'w3c_validator', 'watchmouse', 'wavefire', 'webclipping\.com', 'webcompass', 'webcrawl\.net', 'web_downloader', 'webdup', 'webfilter', 'webindexer', 'webminer', 'website[_+ ]monitoring[_+ ]bot', 'webvulncrawl', 'wells_search', 'wonderer', 'wume_crawler', 'wwweasel', 'xenu\'s_link_sleuth', 'xenu_link_sleuth', 'xirq', 'y!j', 'yacy', 'yahoo\-blogs', 'yahoo\-verticalcrawler', 'yahoofeedseeker', 'yahooseeker\-testing', 'yahooseeker', 'yahoo\-mmcrawler', 'yahoo!_mindset', 'yandex', 'flexum', 'yanga', 'yooglifetchagent', 'z\-add_link_checker', 'zealbot', 'zhuaxia', 'zspider', 'zeus', 'ng\/1\.', 'ng\/2\.', 'exabot', 'wget', 'libwww', 'java\/[0-9]'] + +search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] + +search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.'] + +not_search_engines_keys = {'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'altavista\.' : 'babelfish\.altavista\.', 'tiscali\.' : 'mail\.tiscali\.', 'yandex\.' : 'direct\.yandex\.', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.'} + +search_engines_hashid = {'search\.sli\.sympatico\.ca' : 'sympatico', 'mywebsearch\.com' : 'mywebsearch', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'findarticles\.com' : 'findarticles', 'wow\.pl' : 'wowpl', 'allesklar\.de' : 'allesklar', 'atomz\.' : 'atomz', 'bing\.' : 'bing', 'find\.dk' : 'finddk', 'google\.' : 'google', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'pogodak\.' : 'pogodak', 'ask\.jp' : 'askjp', '\.baidu\.com' : 'baidu', 'tango\.hu' : 'tango_hu', 'gotuneed\.com' : 'gotuneed', 'quick\.cz' : 'quick', 'mirago' : 'mirago', 'szukaj\.wp\.pl' : 'wp', 'mirago\.de' : 'miragode', 'mirago\.dk' : 'miragodk', 'katalog\.onet\.pl' : 'katalogonetpl', 'googlee\.' : 'google', 'orbis\.dk' : 'orbis', 'turtle\.ru' : 'turtle', 'zoznam\.sk' : 'zoznam', 'start\.shaw\.ca' : 'shawca', 'chello\.at' : 'chelloat', 'centraldatabase\.org' : 'centraldatabase', 'centrum\.cz' : 'centrum', 'kataweb\.it' : 'kataweb', '\.lbb\.org' : 'lbb', 'blingo\.com' : 'blingo', 'vivisimo\.com' : 'vivisimo', 'stumbleupon\.com' : 'stumbleupon', 'es\.ask.\com' : 'askes', 'interia\.pl' : 'interiapl', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'search\.alice\.it' : 'aliceit', 'shinyseek\.it' : 'shinyseek\.it', 'i-une\.com' : 'iune', 'dejanews\.' : 'dejanews', 'opasia\.dk' : 'opasia', 'chello\.cz' : 'chellocz', 'ya(ndex)?\.ru' : 'yandex', 'kartoo\.com' : 'kartoo', 'arianna\.libero\.it' : 'arianna', 'ofir\.dk' : 'ofir', 'search\.earthlink\.net' : 'earthlink', 'biglotron\.com' : 'biglotron', 'lapkereso\.hu' : 'lapkereso', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'dodaj\.pl' : 'dodajpl', 'mirago\.be' : 'miragobe', 'googlecom\.com' : 'google', 'steadysearch\.com' : 'steadysearch', 'redbox\.cz' : 'redbox', 'haku\.www\.fi' : 'haku', 'sapo\.pt' : 'sapo', 'sphere\.com' : 'sphere', 'danielsen\.com' : 'danielsen', 'alexa\.com' : 'alexa', 'mamma\.' : 'mamma', 'swik\.net' : 'swik', 'polska\.pl' : 'polskapl', 'groups\.google\.' : 'google_groups', 'metabot\.ru' : 'metabot', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'szukaj\.onet\.pl' : 'onetpl', 'aport\.ru' : 'aport', 'de\.ask.\com' : 'askde', 'splut\.' : 'splut', 'live\.com' : 'live', '216\.239\.5[0-9]\.104' : 'google_cache', 'mysearch\.' : 'mysearch', 'ukplus\.' : 'ukplus', 'najdi\.to' : 'najdi', 'overture\.com' : 'overture', 'iask\.com' : 'iask', 'nl\.ask.\com' : 'asknl', 'nbci\.com\/search' : 'nbci', 'search\.aol\.co' : 'aol', 'eniro\.se' : 'enirose', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'mirago\.ch' : 'miragoch', 'altavista\.' : 'altavista', 'chello\.hu' : 'chellohu', 'mozbot\.fr' : 'mozbot', 'northernlight\.' : 'northernlight', 'mirago\.co\.uk' : 'miragocouk', 'search[\w\-]+\.free\.fr' : 'free', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'copernic\.com' : 'copernic', 'heureka\.hu' : 'heureka', 'steady-search\.com' : 'steadysearch', 'teecno\.it' : 'teecnoit', 'voila\.' : 'voila', 'netstjernen\.dk' : 'netstjernen', 'keresolap\.hu' : 'keresolap_hu', 'yahoo\.' : 'yahoo', 'icerocket\.com' : 'icerocket', 'alltheweb\.com' : 'alltheweb', 'www\.search\.com' : 'search.com', 'digg\.com' : 'digg', 'tiscali\.' : 'tiscali', 'spotjockey\.' : 'spotjockey', 'a9\.com' : 'a9', '(brisbane|suche)\.t-online\.de' : 't-online', 'ifind\.freeserve' : 'freeserve', 'att\.net' : 'att', 'mirago\.it' : 'miragoit', 'index\.hu' : 'indexhu', '\.sogou\.com' : 'sogou', 'no\.mirago\.com' : 'miragono', 'ineffabile\.it' : 'ineffabile', 'netluchs\.de' : 'netluchs', 'toile\.com' : 'toile', 'search\..*\.\w+' : 'search', 'del\.icio\.us' : 'delicious', 'vizsla\.origo\.hu' : 'origo', 'netscape\.' : 'netscape', 'dogpile\.com' : 'dogpile', 'anzwers\.com\.au' : 'anzwers', '\.zhongsou\.com' : 'zhongsou', 'ctrouve\.' : 'ctrouve', 'gazeta\.pl' : 'gazetapl', 'recherche\.club-internet\.fr' : 'clubinternet', 'sok\.start\.no' : 'start', 'scroogle\.org' : 'scroogle', 'schoenerbrausen\.de' : 'schoenerbrausen', 'looksmart\.co\.uk' : 'looksmartuk', 'wwweasel\.de' : 'wwweasel', 'godado' : 'godado', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'jubii\.dk' : 'jubii', '212\.227\.33\.241' : 'metaspinner', 'mirago\.fr' : 'miragofr', 'sol\.dk' : 'sol', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'jumpy\.it' : 'jumpy\.it', 'francite\.' : 'francite', 'infoseek\.de' : 'infoseek', 'es\.mirago\.com' : 'miragoes', 'jyxo\.(cz|com)' : 'jyxo', 'hotbot\.' : 'hotbot', 'engine\.exe' : 'engine', '(^|\.)ask\.com' : 'ask', 'goliat\.hu' : 'goliat', 'wisenut\.com' : 'wisenut', 'mirago\.nl' : 'miragonl', 'base\.google\.' : 'google_base', 'search\.bluewin\.ch' : 'bluewin', 'lycos\.' : 'lycos', 'meinestadt\.de' : 'meinestadt', '4\-counter\.com' : 'google4counter', 'search\.alice\.it\.master' : 'aliceitmaster', 'teoma\.' : 'teoma', '(^|\.)ask\.co\.uk' : 'askuk', 'tyfon\.dk' : 'tyfon', 'froogle\.google\.' : 'google_froogle', 'ukdirectory\.' : 'ukdirectory', 'ledix\.net' : 'ledix', 'edderkoppen\.dk' : 'edderkoppen', 'recherche\.aol\.fr' : 'aolfr', 'google\.[\w.]+/products' : 'google_products', 'webmania\.hu' : 'webmania', 'searchy\.co\.uk' : 'searchy', 'fr\.ask.\com' : 'askfr', 'spray\.' : 'spray', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'eniro\.no' : 'eniro', 'goodsearch\.com' : 'goodsearch', 'kvasir\.' : 'kvasir', '\.accoona\.com' : 'accoona', '\.soso\.com' : 'soso', 'as\.starware\.com' : 'comettoolbar', 'virgilio\.it' : 'virgilio', 'o2\.pl' : 'o2pl', 'chello\.nl' : 'chellonl', 'chello\.be' : 'chellobe', 'icq\.com\/search' : 'icq', 'msn\.' : 'msn', 'fireball\.de' : 'fireball', 'sucheaol\.aol\.de' : 'aolde', 'uk\.ask.\com' : 'askuk', 'euroseek\.' : 'euroseek', 'gery\.pl' : 'gerypl', 'chello\.fr' : 'chellofr', 'netsprint\.pl' : 'netsprintpl', 'avantfind\.com' : 'avantfind', 'supereva\.com' : 'supereva', 'polymeta\.hu' : 'polymeta_hu', 'infospace\.com' : 'infospace', 'sify\.com' : 'sify', 'go2net\.com' : 'go2net', 'wahoo\.hu' : 'wahoo', 'suche\d?\.web\.de' : 'webde', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', '\.3721\.com' : '3721', 'ilse\.' : 'ilse', 'metacrawler\.' : 'metacrawler', 'sagool\.jp' : 'sagool', 'atlas\.cz' : 'atlas', 'vindex\.' : 'vindex', 'ixquick\.com' : 'ixquick', '66\.102\.[1-9]\.104' : 'google_cache', 'rambler\.ru' : 'rambler', 'answerbus\.com' : 'answerbus', 'evreka\.passagen\.se' : 'passagen', 'chello\.se' : 'chellose', 'clusty\.com' : 'clusty', 'search\.ch' : 'searchch', 'chello\.no' : 'chellono', 'searchalot\.com' : 'searchalot', 'questionanswering\.com' : 'questionanswering', 'seznam\.cz' : 'seznam', 'ukindex\.co\.uk' : 'ukindex', 'dmoz\.org' : 'dmoz', 'excite\.' : 'excite', 'chello\.pl' : 'chellopl', 'looksmart\.' : 'looksmart', '1klik\.dk' : '1klik', '\.vnet\.cn' : 'vnet', 'chello\.sk' : 'chellosk', '(^|\.)go\.com' : 'go', 'nusearch\.com' : 'nusearch', 'it\.ask.\com' : 'askit', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'search\.terra\.' : 'terra', 'webcrawler\.' : 'webcrawler', 'suchen\.abacho\.de' : 'abacho', 'szukacz\.pl' : 'szukaczpl', '66\.249\.93\.104' : 'google_cache', 'search\.internetto\.hu' : 'internetto', 'goggle\.co\.hu' : 'google', 'mirago\.se' : 'miragose', 'images\.google\.' : 'google_image', 'segnalo\.alice\.it' : 'segnalo', '\.163\.com' : 'netease', 'chello' : 'chellocom'} + +search_engines_knwown_url = {'dmoz' : 'search=', 'google' : '(p|q|as_p|as_q)=', 'searchalot' : 'q=', 'teoma' : 'q=', 'looksmartuk' : 'key=', 'polymeta_hu' : '', 'google_groups' : 'group\/', 'iune' : '(keywords|q)=', 'chellosk' : 'q1=', 'eniro' : 'q=', 'msn' : 'q=', 'webcrawler' : 'searchText=', 'mirago' : '(txtsearch|qry)=', 'enirose' : 'q=', 'miragobe' : '(txtsearch|qry)=', 'netease' : 'q=', 'netluchs' : 'query=', 'google_products' : '(p|q|as_p|as_q)=', 'jyxo' : '(s|q)=', 'origo' : '(q|search)=', 'ilse' : 'search_for=', 'chellocom' : 'q1=', 'goodsearch' : 'Keywords=', 'ledix' : 'q=', 'mozbot' : 'q=', 'chellocz' : 'q1=', 'webde' : 'su=', 'biglotron' : 'question=', 'metacrawler_de' : 'qry=', 'finddk' : 'words=', 'start' : 'q=', 'sagool' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'aliceit' : 'qs=', 'shinyseek\.it' : 'KEY=', 'onetpl' : 'qt=', 'clusty' : 'query=', 'chellonl' : 'q1=', 'miragode' : '(txtsearch|qry)=', 'miragose' : '(txtsearch|qry)=', 'o2pl' : 'qt=', 'goliat' : 'KERESES=', 'kvasir' : 'q=', 'askfr' : '(ask|q)=', 'infoseek' : 'qt=', 'yahoo_mindset' : 'p=', 'comettoolbar' : 'qry=', 'alltheweb' : 'q(|uery)=', 'miner' : 'q=', 'aol' : 'query=', 'rambler' : 'words=', 'scroogle' : 'Gw=', 'chellose' : 'q1=', 'ineffabile' : '', 'miragoit' : '(txtsearch|qry)=', 'yandex' : 'text=', 'segnalo' : '', 'dodajpl' : 'keyword=', 'avantfind' : 'keywords=', 'nusearch' : 'nusearch_terms=', 'bbc' : 'q=', 'supereva' : 'q=', 'atomz' : 'sp-q=', 'searchy' : 'search_term=', 'dogpile' : 'q(|kw)=', 'chellohu' : 'q1=', 'vnet' : 'kw=', '1klik' : 'query=', 't-online' : 'q=', 'hogapl' : 'qt=', 'stumbleupon' : '', 'soso' : 'q=', 'zhongsou' : '(word|w)=', 'a9' : 'a9\.com\/', 'centraldatabase' : 'query=', 'mamma' : 'query=', 'icerocket' : 'q=', 'ask' : '(ask|q)=', 'chellobe' : 'q1=', 'altavista' : 'q=', 'vindex' : 'in=', 'miragodk' : '(txtsearch|qry)=', 'chelloat' : 'q1=', 'digg' : 's=', 'metacrawler' : 'general=', 'nbci' : 'keyword=', 'chellono' : 'q1=', 'icq' : 'q=', 'arianna' : 'query=', 'miragocouk' : '(txtsearch|qry)=', '3721' : '(p|name)=', 'pogodak' : 'q=', 'ukdirectory' : 'k=', 'overture' : 'keywords=', 'heureka' : 'heureka=', 'teecnoit' : 'q=', 'miragoes' : '(txtsearch|qry)=', 'haku' : 'w=', 'go' : 'qt=', 'fireball' : 'q=', 'wisenut' : 'query=', 'sify' : 'keyword=', 'ixquick' : 'query=', 'anzwers' : 'search=', 'quick' : 'query=', 'jubii' : 'soegeord=', 'questionanswering' : '', 'asknl' : '(ask|q)=', 'askde' : '(ask|q)=', 'att' : 'qry=', 'terra' : 'query=', 'bing' : 'q=', 'wowpl' : 'q=', 'freeserve' : 'q=', 'atlas' : '(searchtext|q)=', 'askuk' : '(ask|q)=', 'godado' : 'Keywords=', 'northernlight' : 'qr=', 'answerbus' : '', 'search.com' : 'q=', 'google_image' : '(p|q|as_p|as_q)=', 'jumpy\.it' : 'searchWord=', 'gazetapl' : 'slowo=', 'yahoo' : 'p=', 'hotbot' : 'mt=', 'metabot' : 'st=', 'copernic' : 'web\/', 'kartoo' : '', 'metaspinner' : 'qry=', 'toile' : 'q=', 'aolde' : 'q=', 'blingo' : 'q=', 'askit' : '(ask|q)=', 'netscape' : 'search=', 'splut' : 'pattern=', 'looksmart' : 'key=', 'sphere' : 'q=', 'sol' : 'q=', 'miragono' : '(txtsearch|qry)=', 'kataweb' : 'q=', 'ofir' : 'querytext=', 'aliceitmaster' : 'qs=', 'miragofr' : '(txtsearch|qry)=', 'spray' : 'string=', 'seznam' : '(w|q)=', 'interiapl' : 'q=', 'euroseek' : 'query=', 'schoenerbrausen' : 'q=', 'centrum' : 'q=', 'netsprintpl' : 'q=', 'go2net' : 'general=', 'katalogonetpl' : 'qt=', 'ukindex' : 'stext=', 'shawca' : 'q=', 'szukaczpl' : 'q=', 'accoona' : 'qt=', 'live' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'iask' : '(w|k)=', 'earthlink' : 'q=', 'tiscali' : 'key=', 'askes' : '(ask|q)=', 'gotuneed' : '', 'clubinternet' : 'q=', 'redbox' : 'srch=', 'delicious' : 'all=', 'chellofr' : 'q1=', 'lycos' : 'query=', 'sympatico' : 'query=', 'vivisimo' : 'query=', 'bluewin' : 'qry=', 'mysearch' : 'searchfor=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ukplus' : 'search=', 'gerypl' : 'q=', 'keresolap_hu' : 'q=', 'abacho' : 'q=', 'engine' : 'p1=', 'opasia' : 'q=', 'wp' : 'szukaj=', 'steadysearch' : 'w=', 'chellopl' : 'q1=', 'voila' : '(kw|rdata)=', 'aport' : 'r=', 'internetto' : 'searchstr=', 'passagen' : 'q=', 'wwweasel' : 'q=', 'najdi' : 'dotaz=', 'alexa' : 'q=', 'baidu' : '(wd|word)=', 'spotjockey' : 'Search_Keyword=', 'virgilio' : 'qs=', 'orbis' : 'search_field=', 'tango_hu' : 'q=', 'askjp' : '(ask|q)=', 'bungeebonesdotcom' : 'query=', 'francite' : 'name=', 'searchch' : 'q=', 'google_froogle' : '(p|q|as_p|as_q)=', 'excite' : 'search=', 'infospace' : 'qkw=', 'polskapl' : 'qt=', 'swik' : 'swik\.net/', 'edderkoppen' : 'query=', 'mywebsearch' : 'searchfor=', 'danielsen' : 'q=', 'wahoo' : 'q=', 'sogou' : 'query=', 'miragonl' : '(txtsearch|qry)=', 'findarticles' : 'key='} + diff --git a/conf.py b/conf.py new file mode 100644 index 0000000..e26b953 --- /dev/null +++ b/conf.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- + +# Web server log +analyzed_filename = 'access.log' + +# Domain name to analyze +domain_name = 'soutade.fr' + +# Display visitor IP in addition to resolved names +display_visitor_ip = True + +# Hooks used +pre_analysis_hooks = ['page_to_hit', 'robots'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits']#, 'reverse_dns'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] + +# Reverse DNS timeout +reverse_dns_timeout = 0.2 + +# Count this addresses as hit +page_to_hit_conf = [r'^.+/logo[/]?$'] +## Count this addresses as page +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] + +# Because it's too long to build HTML when there is too much entries +max_hits_displayed = 100 +max_downloads_displayed = 100 + +# Compress these files after generation +compress_output_files = ['html', 'css', 'js'] + +# Display result in French +locale = 'fr' + diff --git a/default_conf.py b/default_conf.py new file mode 100644 index 0000000..dcc8190 --- /dev/null +++ b/default_conf.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- + +import os + +# Default configuration + +# Default database directory +DB_ROOT = './output_db' +# Default HTML output directory +DISPLAY_ROOT = './output' + +# Hooks directories (don't edit) +HOOKS_ROOT = 'plugins' +PRE_HOOK_DIRECTORY = HOOKS_ROOT + '.pre_analysis' +POST_HOOK_DIRECTORY = HOOKS_ROOT + '.post_analysis' +DISPLAY_HOOK_DIRECTORY = HOOKS_ROOT + '.display' +# Meta Database filename +META_PATH = os.path.join(DB_ROOT, 'meta.db') +# Database filename per month +DB_FILENAME = 'iwla.db' + +# Web server log format (nginx style). Default is apache log format +log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ + '"$request" $status $body_bytes_sent ' +\ + '"$http_referer" "$http_user_agent"' + +# Time format used in log format +time_format = '%d/%b/%Y:%H:%M:%S %z' + +# Hooks that are loaded at runtime (only set names without path and extensions) +pre_analysis_hooks = [] +post_analysis_hooks = [] +display_hooks = [] + +# Extensions that are considered as a HTML page (or result) in opposite to hits +pages_extensions = ['/', 'htm', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] +# HTTP codes that are cosidered OK +viewed_http_codes = [200, 304] + +# If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) +count_hit_only_visitors = True + +# Multimedia extensions (not accounted as downloaded files) +multimedia_files = ['png', 'jpg', 'jpeg', 'gif', 'ico', + 'css', 'js'] + +# Default resources path (will be symlinked in DISPLAY_OUTPUT) +resources_path = ['resources'] +# Icon path +icon_path = '%s/%s' % (os.path.basename(resources_path[0]), 'icon') +# CSS path (you can add yours) +css_path = ['%s/%s/%s' % (os.path.basename(resources_path[0]), 'css', 'iwla.css')] + +# Files extensions to compress in gzip during display build +compress_output_files = [] + +# Path to locales files +locales_path = './locales' + +# Default locale (english) +locale = 'en_EN' diff --git a/display.py b/display.py new file mode 100644 index 0000000..cb98693 --- /dev/null +++ b/display.py @@ -0,0 +1,387 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import os +import codecs +import time +import logging + +# +# Create output HTML files +# + +# Just for detection +def _(name): pass +_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July') +_('August'), _('September'), _('October'), _('November'), _('December') +del _ + +class DisplayHTMLRaw(object): + + def __init__(self, iwla, html=u''): + self.iwla = iwla + self.html = html + + def setRawHTML(self, html): + self.html = html + + def _buildHTML(self): + pass + + def _build(self, f, html): + if html: f.write(html) + + def build(self, f): + self._buildHTML() + self._build(f, self.html) + +class DisplayHTMLBlock(DisplayHTMLRaw): + + def __init__(self, iwla, title=''): + super(DisplayHTMLBlock, self).__init__(iwla, html='') + self.title = title + self.cssclass = u'iwla_block' + self.title_cssclass = u'iwla_block_title' + self.value_cssclass = u'iwla_block_value' + + def getTitle(self): + return self.title + + def setTitle(self, value): + self.title = unicode(value) + + def setCSSClass(self, cssclass): + self.cssclass = unicode(cssclass) + + def setTitleCSSClass(self, cssclass): + self.title_cssclass = unicode(cssclass) + + def setValueCSSClass(self, cssclass): + self.value_cssclass = unicode(cssclass) + + def _buildHTML(self): + html = u'
' % (self.cssclass) + if self.title: + html += u'
%s
' % (self.title_cssclass, self.title) + html += u'
%s
' % (self.value_cssclass, self.html) + html += u'
' + + self.html = html + +class DisplayHTMLBlockTable(DisplayHTMLBlock): + + def __init__(self, iwla, title, cols): + super(DisplayHTMLBlockTable, self).__init__(iwla=iwla, title=title) + self.cols = listToStr(cols) + self.rows = [] + self.cols_cssclasses = [u''] * len(cols) + self.rows_cssclasses = [] + self.table_css = u'iwla_table' + + def appendRow(self, row): + self.rows.append(listToStr(row)) + self.rows_cssclasses.append([u''] * len(row)) + + def getNbRows(self): + return len(self.rows) + + def getNbCols(self): + return len(self.cols) + + def getCellValue(self, row, col): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + return self.rows[row][col] + + def setCellValue(self, row, col, value): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + self.rows[row][col] = unicode(value) + + def setCellCSSClass(self, row, col, value): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + self.rows_cssclasses[row][col] = unicode(value) + + def getCellCSSClass(self, row, col): + if row < 0 or col < 0 or\ + row >= len(self.rows) or col >= len(self.cols): + raise ValueError('Invalid indices %d,%d' % (row, col)) + + return self.rows_cssclasses[row][col] + + def getColCSSClass(self, col): + if col < 0 or col >= len(self.cols): + raise ValueError('Invalid indice %d' % (col)) + + return self.cols_cssclasses[col] + + def setRowCSSClass(self, row, value): + if row < 0 or row >= len(self.rows): + raise ValueError('Invalid indice %d' % (row)) + + self.rows_cssclasses[row] = [unicode(value)] * len(self.rows_cssclasses[row]) + + def setColCSSClass(self, col, value): + if col < 0 or col >= len(self.cols): + raise ValueError('Invalid indice %d' % (col)) + + self.cols_cssclasses[col] = unicode(value) + + def setColsCSSClass(self, values): + if len(values) != len(self.cols): + raise ValueError('Invalid values size') + + self.cols_cssclasses = listToStr(values) + + def _buildHTML(self): + style = u'' + if self.table_css: style = u' class="%s"' % (self.table_css) + html = u'' % (style) + if self.cols: + html += u'' + for i in range (0, len(self.cols)): + title = self.cols[i] + style = self.getColCSSClass(i) + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, title) + html += u'' + for i in range(0, len(self.rows)): + row = self.rows[i] + html += u'' + for j in range(0, len(row)): + v = row[j] + style = self.getCellCSSClass(i, j) + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, v) + html += u'' + html += u'' + + self.html += html + + super(DisplayHTMLBlockTable, self)._buildHTML() + +class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): + + def __init__(self, iwla, title, cols, short_titles=None, nb_valid_rows=0, graph_cols=None): + super(DisplayHTMLBlockTableWithGraph, self).__init__(iwla=iwla, title=title, cols=cols) + self.short_titles = short_titles or [] + self.short_titles = listToStr(self.short_titles) + self.nb_valid_rows = nb_valid_rows + self.icon_path = self.iwla.getConfValue('icon_path', '/') + self.raw_rows = [] + self.maxes = [0] * len(cols) + self.table_graph_css = u'iwla_graph_table' + self.td_img_css = u'iwla_td_img' + self.graph_cols = graph_cols or [] + + def appendRow(self, row): + self.raw_rows.append(row) + super(DisplayHTMLBlockTableWithGraph, self).appendRow(row) + + def appendShortTitle(self, short_title): + self.short_titles.append(unicode(short_title)) + + def setShortTitle(self, short_titles): + self.short_titles = listToStr(short_titles) + + def setNbValidRows(self, nb_valid_rows): + self.nb_valid_rows = nb_valid_rows + + def _computeMax(self): + for i in range(0, self.nb_valid_rows): + row = self.raw_rows[i] + for j in range(1, len(row)): + if row[j] > self.maxes[j]: + self.maxes[j] = row[j] + + def _getIconFromStyle(self, style): + if style.startswith(u'iwla_page'): icon = u'vp.png' + elif style.startswith(u'iwla_hit'): icon = u'vh.png' + elif style.startswith(u'iwla_bandwidth'): icon = u'vk.png' + elif style.startswith(u'iwla_visitor'): icon = u'vu.png' + elif style.startswith(u'iwla_visit'): icon = u'vv.png' + else: return '' + + return u'/%s/%s' % (self.icon_path, icon) + + def _buildHTML(self): + self._computeMax() + + style = u'' + if self.table_graph_css: style = u' class="%s"' % (self.table_graph_css) + html = u'' % (style) + html += u'' + for i in range(0, self.nb_valid_rows): + row = self.rows[i] + css = u'' + if self.td_img_css: css=u' class="%s"' % (self.td_img_css) + html += u'' % (css) + for j in self.graph_cols: + style = self.getColCSSClass(j) + icon = self._getIconFromStyle(style) + if not icon: continue + if style: style = u' class="%s"' % (style) + alt = u'%s: %s' % (row[j], self.cols[j]) + if self.maxes[j]: + height = int((self.raw_rows[i][j] * 100) / self.maxes[j]) or 1 + else: + height = 1 + html += u'' % (style, icon, height, alt, alt) + html += u'' + html += u'' + html += u'' + for i in range(0, len(self.short_titles)): + style = self.getCellCSSClass(i, 0) + if style: style = u' class="%s"' % (style) + html += u'%s' % (style, self.short_titles[i]) + html += u'' + html += u'' + + self.html += html + + super(DisplayHTMLBlockTableWithGraph, self)._buildHTML() + +class DisplayHTMLPage(object): + + def __init__(self, iwla, title, filename, css_path): + self.iwla = iwla + self.title = unicode(title) + self.filename = filename + self.blocks = [] + self.css_path = listToStr(css_path) + self.logger = logging.getLogger(self.__class__.__name__) + + def getFilename(self): + return self.filename; + + def getBlock(self, title): + for b in self.blocks: + if title == b.getTitle(): + return b + return None + + def appendBlock(self, block): + self.blocks.append(block) + + def build(self, root): + filename = os.path.join(root, self.filename) + + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) + + self.logger.debug('Write %s' % (filename)) + + f = codecs.open(filename, 'w', 'utf-8') + f.write(u'') + f.write(u'') + f.write(u'') + f.write(u'') + for css in self.css_path: + f.write(u'' % (css)) + if self.title: + f.write(u'%s' % (self.title)) + f.write(u'') + for block in self.blocks: + block.build(f) + f.write(u'
Generated by IWLA %s
' % + ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) + f.write(u'') + f.close() + +class DisplayHTMLBuild(object): + + def __init__(self, iwla): + self.pages = [] + self.iwla = iwla + + def createPage(self, *args): + return DisplayHTMLPage(self.iwla, *args) + + def createBlock(self, _class, *args): + return _class(self.iwla, *args) + + def getPage(self, filename): + for page in self.pages: + if page.getFilename() == filename: + return page + return None + + def addPage(self, page): + self.pages.append(page) + + def build(self, root): + display_root = self.iwla.getConfValue('DISPLAY_ROOT', '') + if not os.path.exists(display_root): + os.makedirs(display_root) + for res_path in self.iwla.getResourcesPath(): + target = os.path.abspath(res_path) + link_name = os.path.join(display_root, res_path) + if not os.path.exists(link_name): + os.symlink(target, link_name) + + for page in self.pages: + page.build(root) + +# +# Global functions +# + +def bytesToStr(bytes): + suffixes = [u'', u' kB', u' MB', u' GB', u' TB'] + + for i in range(0, len(suffixes)): + if bytes < 1024: break + bytes /= 1024.0 + + if i: + return u'%.02f%s' % (bytes, suffixes[i]) + else: + return u'%d%s' % (bytes, suffixes[i]) + +def _toStr(v): + if type(v) != unicode: return unicode(v) + else: return v + +def listToStr(l): return map(lambda(v) : _toStr(v), l) + +def generateHTMLLink(url, name=None, max_length=100, prefix=u'http'): + url = unicode(url) + if not name: name = unicode(url) + if not url.startswith(prefix): url = u'%s://%s' % (prefix, url) + return u'%s' % (url, name[:max_length]) + +def createCurTitle(iwla, title): + title = iwla._(title) + month_name = time.strftime(u'%B', iwla.getCurTime()) + year = time.strftime(u'%Y', iwla.getCurTime()) + title += u' - %s %s' % (iwla._(month_name), year) + domain_name = iwla.getConfValue('domain_name', '') + if domain_name: + title += u' - %s' % (domain_name) + return title + diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 0000000..1a3b36c --- /dev/null +++ b/docs/index.md @@ -0,0 +1,552 @@ +iwla +==== + +Introduction +------------ + +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. + +Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). + +Usage +----- + + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + + -c : Clean output (database and HTML) before starting + -i : Read data from stdin instead of conf.analyzed_filename + -f : Read data from FILE instead of conf.analyzed_filename + -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + +Basic usage +----------- + +In addition to command line, iwla read parameters in default_conf.py. User can override default values using _conf.py_ file. Each module requires its own parameters. + +Main values to edit are : + + * **analyzed_filename** : web server log + * **domaine_name** : domain name to filter + * **pre_analysis_hooks** : List of pre analysis hooks + * **post_analysis_hooks** : List of post analysis hooks + * **display_hooks** : List of display hooks + * **locale** : Displayed locale (_en_ or _fr_) + +Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type + + python -m SimpleHTTPServer 8000 + +Open your favorite web browser at _http://localhost:8000_. Enjoy ! + +**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. + + +Interesting default configuration values +---------------------------------------- + + * **DB_ROOT** : Default database directory (default ./output_db) + * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **log_format** : Web server log format (nginx style). Default is apache log format + * **time_format** : Time format used in log format + * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits + * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) + * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) + * **css_path** : CSS path (you can add yours) + * **compress_output_files** : Files extensions to compress in gzip during display build + +Plugins +------- + +As previously described, plugins acts like UNIX pipes : statistics are constantly updated by each plugin to produce final result. We have three type of plugins : + + * **Pre analysis plugins** : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms + * **Display plugins** : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. + +Statistics are stored in dictionaries : + + * **month_stats** : Statistics of current analysed month + * **valid_visitor** : A subset of month_stats without robots + * **days_stats** : Statistics of current analysed day + * **visits** : All visitors with all of its requests + * **meta** : Final result of month statistics (by year) + +Create a Plugins +---------------- + +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). + +Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). + +The two functions to overload are _load(self)_ that must returns True or False if all is good (or not). It's called after _init_. The second is _hook(self)_ that is the body of plugins. + +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and bar graphs. + +Plugins +======= + +Optional configuration values ends with *. + +iwla +---- + + Main class IWLA + Parse Log, compute them, call plugins and produce output + For now, only HTTP log are valid + + Plugin requirements : + None + + Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + + Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + + meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + + days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + + valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.all_visits +-------------------------- + + Display hook + + Create All visits page + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers +------------------------ + + Display hook + + Create Referers page + + Plugin requirements : + post_analysis/referers + + Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + + Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page + + Statistics deletion : + None + + +plugins.pre_analysis.robots +--------------------------- + + Pre analysis hook + + Filter robots + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + robot + + Statistics deletion : + None + + diff --git a/docs/main.md b/docs/main.md new file mode 100644 index 0000000..0b5b16e --- /dev/null +++ b/docs/main.md @@ -0,0 +1,92 @@ +iwla +==== + +Introduction +------------ + +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. + +Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). + +Usage +----- + + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + + -c : Clean output (database and HTML) before starting + -i : Read data from stdin instead of conf.analyzed_filename + -f : Read data from FILE instead of conf.analyzed_filename + -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + +Basic usage +----------- + +In addition to command line, iwla read parameters in default_conf.py. User can override default values using _conf.py_ file. Each module requires its own parameters. + +Main values to edit are : + + * **analyzed_filename** : web server log + * **domaine_name** : domain name to filter + * **pre_analysis_hooks** : List of pre analysis hooks + * **post_analysis_hooks** : List of post analysis hooks + * **display_hooks** : List of display hooks + * **locale** : Displayed locale (_en_ or _fr_) + +Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type + + python -m SimpleHTTPServer 8000 + +Open your favorite web browser at _http://localhost:8000_. Enjoy ! + +**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. + + +Interesting default configuration values +---------------------------------------- + + * **DB_ROOT** : Default database directory (default ./output_db) + * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **log_format** : Web server log format (nginx style). Default is apache log format + * **time_format** : Time format used in log format + * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits + * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) + * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) + * **css_path** : CSS path (you can add yours) + * **compress_output_files** : Files extensions to compress in gzip during display build + +Plugins +------- + +As previously described, plugins acts like UNIX pipes : statistics are constantly updated by each plugin to produce final result. We have three type of plugins : + + * **Pre analysis plugins** : Called before generating days statistics. They are in charge to filter robots, crawlers, bad pages... + * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms + * **Display plugins** : They are in charge to produce HTML files from statistics. + +To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. + +Statistics are stored in dictionaries : + + * **month_stats** : Statistics of current analysed month + * **valid_visitor** : A subset of month_stats without robots + * **days_stats** : Statistics of current analysed day + * **visits** : All visitors with all of its requests + * **meta** : Final result of month statistics (by year) + +Create a Plugins +---------------- + +To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). + +Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). + +The two functions to overload are _load(self)_ that must returns True or False if all is good (or not). It's called after _init_. The second is _hook(self)_ that is the body of plugins. + +For display plugins, a lot of code has been wrote in _display.py_ that simplify the creation on HTML blocks, tables and bar graphs. + +Plugins +======= + +Optional configuration values ends with *. + diff --git a/docs/modules.md b/docs/modules.md new file mode 100644 index 0000000..41167c3 --- /dev/null +++ b/docs/modules.md @@ -0,0 +1,460 @@ +iwla +---- + + Main class IWLA + Parse Log, compute them, call plugins and produce output + For now, only HTTP log are valid + + Plugin requirements : + None + + Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* + + Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + + meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + + days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors + + visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page + + valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.all_visits +-------------------------- + + Display hook + + Create All visits page + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers +------------------------ + + Display hook + + Create Referers page + + Plugin requirements : + post_analysis/referers + + Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + + Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page + + Statistics deletion : + None + + +plugins.pre_analysis.robots +--------------------------- + + Pre analysis hook + + Filter robots + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + robot + + Statistics deletion : + None + + diff --git a/iplugin.py b/iplugin.py new file mode 100644 index 0000000..2664190 --- /dev/null +++ b/iplugin.py @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import importlib +import inspect +import logging + +# +# IWLA Plugin interface +# + +class IPlugin(object): + + def __init__(self, iwla): + self.iwla = iwla + self.requires = [] + self.conf_requires = [] + self.API_VERSION = 1 + self.ANALYSIS_CLASS = 'HTTP' + + def isValid(self, analysis_class, api_version): + if analysis_class != self.ANALYSIS_CLASS: return False + + # For now there is only version 1 + if self.API_VERSION != api_version: + return False + + return True + + def getRequirements(self): + return self.requires + + def getConfRequirements(self): + return self.conf_requires + + def load(self): + return True + + def hook(self): + pass + +def validConfRequirements(conf_requirements, iwla, plugin_path): + for r in conf_requirements: + if iwla.getConfValue(r, None) is None: + print '\'%s\' conf value required for %s' % (r, plugin_path) + return False + + return True + +def preloadPlugins(plugins, iwla): + cache_plugins = {} + + logger = logging.getLogger(__name__) + + logger.info("==> Preload plugins") + + for (root, plugins_filenames) in plugins: + for plugin_filename in plugins_filenames: + plugin_path = root + '.' + plugin_filename + try: + mod = importlib.import_module(plugin_path) + classes = [c for _,c in inspect.getmembers(mod)\ + if inspect.isclass(c) and \ + issubclass(c, IPlugin) and \ + c.__name__ != 'IPlugin' + ] + + if not classes: + logger.warning('No plugin defined in %s' % (plugin_path)) + continue + + plugin = classes[0](iwla) + plugin_name = plugin.__class__.__name__ + + if not plugin.isValid(iwla.ANALYSIS_CLASS, iwla.API_VERSION): + #print 'Plugin not valid %s' % (plugin_filename) + continue + + #print 'Load plugin %s' % (plugin_name) + + conf_requirements = plugin.getConfRequirements() + if not validConfRequirements(conf_requirements, iwla, plugin_path): + continue + + requirements = plugin.getRequirements() + + requirement_validated = False + for r in requirements: + for (_,p) in cache_plugins.items(): + if p.__class__.__name__ == r: + requirement_validated = True + break + if not requirement_validated: + logger.error('Missing requirements \'%s\' for plugin %s' % (r, plugin_path)) + break + if requirements and not requirement_validated: continue + + if not plugin.load(): + logger.error('Plugin %s load failed' % (plugin_path)) + continue + + logger.info('\tRegister %s' % (plugin_path)) + cache_plugins[plugin_path] = plugin + except Exception as e: + logger.exception('Error loading %s => %s' % (plugin_path, e)) + + return cache_plugins diff --git a/iwla.pot b/iwla.pot new file mode 100644 index 0000000..d8b1510 --- /dev/null +++ b/iwla.pot @@ -0,0 +1,279 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2014-12-19 17:46+CET\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" +"Generated-By: pygettext.py 1.5\n" + + +#: display.py:32 +msgid "April" +msgstr "" + +#: display.py:32 +msgid "February" +msgstr "" + +#: display.py:32 +msgid "January" +msgstr "" + +#: display.py:32 +msgid "July" +msgstr "" + +#: display.py:32 +msgid "March" +msgstr "" + +#: display.py:32 iwla.py:428 +msgid "June" +msgstr "" + +#: display.py:32 iwla.py:428 +msgid "May" +msgstr "" + +#: display.py:33 +msgid "August" +msgstr "" + +#: display.py:33 +msgid "December" +msgstr "" + +#: display.py:33 +msgid "November" +msgstr "" + +#: display.py:33 +msgid "October" +msgstr "" + +#: display.py:33 +msgid "September" +msgstr "" + +#: iwla.py:371 +msgid "Statistics" +msgstr "" + +#: iwla.py:377 +msgid "By day" +msgstr "" + +#: iwla.py:377 +msgid "Day" +msgstr "" + +#: iwla.py:377 iwla.py:430 +msgid "Not viewed Bandwidth" +msgstr "" + +#: iwla.py:377 iwla.py:430 +msgid "Visits" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +msgid "Hits" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_visitors.py:72 +msgid "Pages" +msgstr "" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/top_visitors.py:72 +msgid "Bandwidth" +msgstr "" + +#: iwla.py:414 +msgid "Average" +msgstr "" + +#: iwla.py:419 iwla.py:457 +msgid "Total" +msgstr "" + +#: iwla.py:428 +msgid "Apr" +msgstr "" + +#: iwla.py:428 +msgid "Aug" +msgstr "" + +#: iwla.py:428 +msgid "Dec" +msgstr "" + +#: iwla.py:428 +msgid "Feb" +msgstr "" + +#: iwla.py:428 +msgid "Jan" +msgstr "" + +#: iwla.py:428 +msgid "Jul" +msgstr "" + +#: iwla.py:428 +msgid "Mar" +msgstr "" + +#: iwla.py:428 +msgid "Nov" +msgstr "" + +#: iwla.py:428 +msgid "Oct" +msgstr "" + +#: iwla.py:428 +msgid "Sep" +msgstr "" + +#: iwla.py:429 +msgid "Summary" +msgstr "" + +#: iwla.py:430 +msgid "Month" +msgstr "" + +#: iwla.py:430 +msgid "Visitors" +msgstr "" + +#: iwla.py:430 iwla.py:440 +msgid "Details" +msgstr "" + +#: iwla.py:465 +msgid "Statistics for" +msgstr "" + +#: iwla.py:472 +msgid "Last update" +msgstr "" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Host" +msgstr "" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Last seen" +msgstr "" + +#: plugins/display/all_visits.py:92 +msgid "All visits" +msgstr "" + +#: plugins/display/all_visits.py:93 plugins/display/top_visitors.py:72 +msgid "Top visitors" +msgstr "" + +#: plugins/display/referers.py:95 +msgid "Connexion from" +msgstr "" + +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +msgid "Origin" +msgstr "" + +#: plugins/display/referers.py:99 plugins/display/referers.py:156 +msgid "Search Engine" +msgstr "" + +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 +msgid "Others" +msgstr "" + +#: plugins/display/referers.py:114 plugins/display/referers.py:167 +msgid "External URL" +msgstr "" + +#: plugins/display/referers.py:129 plugins/display/referers.py:178 +msgid "External URL (robot)" +msgstr "" + +#: plugins/display/referers.py:147 +msgid "Top Referers" +msgstr "" + +#: plugins/display/referers.py:149 +msgid "All Referers" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:210 +msgid "Top key phrases" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Key phrase" +msgstr "" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Search" +msgstr "" + +#: plugins/display/referers.py:212 +msgid "All key phrases" +msgstr "" + +#: plugins/display/top_downloads.py:71 +msgid "Hit" +msgstr "" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:91 +msgid "All Downloads" +msgstr "" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:97 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "URI" +msgstr "" + +#: plugins/display/top_downloads.py:89 +msgid "Top Downloads" +msgstr "" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:91 +msgid "All Hits" +msgstr "" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "Entrance" +msgstr "" + +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 +msgid "All Pages" +msgstr "" + +#: plugins/display/top_pages.py:88 +msgid "Top Pages" +msgstr "" + diff --git a/iwla.py b/iwla.py index 39fcafd..0c0f331 100755 --- a/iwla.py +++ b/iwla.py @@ -1,178 +1,718 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# import os +import shutil +import sys import re import time -import glob -import imp -from robots import awstats_robots; +import pickle +import gzip +import importlib +import argparse +import logging +import gettext +from calendar import monthrange +from datetime import date -print '==> Start' +import default_conf as conf +import conf as _ +conf.__dict__.update(_.__dict__) +del _ -current_visit = {} +from iplugin import * +from display import * -log_format = '$server_name:$server_port $remote_addr - $remote_user [$time_local] ' +\ - '"$request" $status $body_bytes_sent ' +\ - '"$http_referer" "$http_user_agent"'; +""" +Main class IWLA +Parse Log, compute them, call plugins and produce output +For now, only HTTP log are valid -log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', log_format); -log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', log_format_extracted) -http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') -#09/Nov/2014:06:35:16 +0100 -time_format = '%d/%b/%Y:%H:%M:%S +0100' -#print "Log format : " + log_format_extracted +Plugin requirements : + None -log_re = re.compile(log_format_extracted) -uri_re = re.compile(r'(?P[^\?]*)\?(?P.*)') -pages_extensions = ['/', 'html', 'xhtml', 'py', 'pl', 'rb', 'php'] -viewed_http_codes = [200] +Conf values needed : + analyzed_filename + domain_name + locales_path + compress_output_files* -cur_time = None +Output files : + DB_ROOT/meta.db + DB_ROOT/year/month/iwla.db + OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/month/index.html -print '==> Generating robot dictionary' +Statistics creation : -awstats_robots = map(lambda (x) : re.compile(x, re.IGNORECASE), awstats_robots) +meta : + last_time + start_analysis_time + stats => + year => + month => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors -def isPage(request): - for e in pages_extensions: - if request.endswith(e): - return True +month_stats : + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits - return False +days_stats : + day => + viewed_bandwidth + not_viewed_bandwidth + viewed_pages + viewed_hits + nb_visits + nb_visitors -def appendHit(hit): - super_hit = current_visit[hit['remote_addr']] - super_hit['pages'].append(hit) - super_hit['bandwith'] += int(hit['body_bytes_sent']) - - request = hit['extract_request'] +visits : + remote_addr => + remote_addr + remote_ip + viewed_pages + viewed_hits + not_viewed_pages + not_viewed_hits + bandwidth + last_access + requests => + [fields_from_format_log] + extract_request => + extract_uri + extract_parameters* + extract_referer* => + extract_uri + extract_parameters* + robot + hit_only + is_page - if 'extract_uri' in request.keys(): - uri = request['extract_uri'] - else: - uri = request['http_uri'] +valid_visitors: + month_stats without robot and hit only visitors (if not conf.count_hit_only_visitors) - hit['is_page'] = isPage(uri) +Statistics update : + None - # Don't count redirect status - if int(hit['status']) == 302: return +Statistics deletion : + None +""" - if super_hit['robot'] or\ - not int(hit['status']) in viewed_http_codes: - page_key = 'not_viewed_pages' - hit_key = 'not_viewed_hits' - else: - page_key = 'viewed_pages' - hit_key = 'viewed_hits' - - if hit['is_page']: - super_hit[page_key] += 1 - else: - super_hit[hit_key] += 1 - -def createGeneric(hit): - super_hit = current_visit[hit['remote_addr']] = {} - super_hit['viewed_pages'] = 0; - super_hit['viewed_hits'] = 0; - super_hit['not_viewed_pages'] = 0; - super_hit['not_viewed_hits'] = 0; - super_hit['bandwith'] = 0; - super_hit['pages'] = []; - - return super_hit -def createUser(hit, robot): - super_hit = createGeneric(hit) - super_hit['robot'] = robot; - appendHit(hit) +class IWLA(object): -def isRobot(hit): - for r in awstats_robots: - if r.match(hit['http_user_agent']): - return True - return False + ANALYSIS_CLASS = 'HTTP' + API_VERSION = 1 + IWLA_VERSION = '0.1' -def decode_http_request(hit): - if not 'request' in hit.keys(): return False + def __init__(self, logLevel): + self.meta_infos = {} + self.analyse_started = False + self.current_analysis = {} + self.cache_plugins = {} + self.display = DisplayHTMLBuild(self) + self.valid_visitors = None + + self.log_format_extracted = re.sub(r'([^\$\w])', r'\\\g<1>', conf.log_format) + self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted) + self.http_request_extracted = re.compile(r'(?P\S+) (?P\S+) (?P\S+)') + self.log_re = re.compile(self.log_format_extracted) + self.uri_re = re.compile(r'(?P[^\?#]+)(\?(?P[^#]+))?(#.*)?') + self.domain_name_re = re.compile(r'.*%s' % conf.domain_name) + self.plugins = [(conf.PRE_HOOK_DIRECTORY , conf.pre_analysis_hooks), + (conf.POST_HOOK_DIRECTORY , conf.post_analysis_hooks), + (conf.DISPLAY_HOOK_DIRECTORY , conf.display_hooks)] + + logging.basicConfig(format='%(name)s %(message)s', level=logLevel) + self.logger = logging.getLogger(self.__class__.__name__) + self.logger.info('==> Start') + try: + t = gettext.translation('iwla', localedir=conf.locales_path, languages=[conf.locale], codeset='utf8') + self.logger.info('\tUsing locale %s' % (conf.locale)) + except IOError: + t = gettext.NullTranslations() + self.logger.info('\tUsing default locale en_EN') + self._ = t.ugettext + + def getVersion(self): + return IWLA.IWLA_VERSION + + def getConfValue(self, key, default=None): + if not key in dir(conf): + return default + else: + return conf.__dict__[key] + + def _clearVisits(self): + self.current_analysis = { + 'days_stats' : {}, + 'month_stats' : {}, + 'visits' : {} + } + self.valid_visitors = None + return self.current_analysis + + def getDaysStats(self): + return self.current_analysis['days_stats'] + + def getMonthStats(self): + return self.current_analysis['month_stats'] + + def getCurrentVisists(self): + return self.current_analysis['visits'] + + def getValidVisitors(self): + return self.valid_visitors + + def getDisplay(self): + return self.display + + def getCurTime(self): + return self.meta_infos['last_time'] + + def getStartAnalysisTime(self): + return self.meta_infos['start_analysis_time'] + + def isValidForCurrentAnalysis(self, request): + cur_time = self.meta_infos['start_analysis_time'] + # Analyse not started + if not cur_time: return False + return (time.mktime(cur_time) < time.mktime(request['time_decoded'])) + + def hasBeenViewed(self, request): + return int(request['status']) in conf.viewed_http_codes + + def getCurDisplayPath(self, filename): + cur_time = self.meta_infos['last_time'] + return os.path.join(str(cur_time.tm_year), '%02d' % (cur_time.tm_mon), filename) + + def getResourcesPath(self): + return conf.resources_path + + def getCSSPath(self): + return conf.css_path + + def _clearMeta(self): + self.meta_infos = { + 'last_time' : None, + 'start_analysis_time' : None + } + return self.meta_infos + + def _clearDisplay(self): + self.display = DisplayHTMLBuild(self) + return self.display + + def getDBFilename(self, time): + return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % (time.tm_mon), conf.DB_FILENAME) + + def _serialize(self, obj, filename): + base = os.path.dirname(filename) + if not os.path.exists(base): + os.makedirs(base) + + # TODO : remove return + #return + + with open(filename + '.tmp', 'wb+') as f, gzip.open(filename, 'w') as fzip: + pickle.dump(obj, f) + f.seek(0) + fzip.write(f.read()) + os.remove(filename + '.tmp') + + def _deserialize(self, filename): + if not os.path.exists(filename): + return None + + with gzip.open(filename, 'r') as f: + return pickle.load(f) + return None + + def _callPlugins(self, target_root, *args): + self.logger.info('==> Call plugins (%s)' % (target_root)) + for (root, plugins) in self.plugins: + if root != target_root: continue + for p in plugins: + mod = self.cache_plugins.get(root + '.' + p, None) + if mod: + self.logger.info('\t%s' % (p)) + mod.hook(*args) + + def isPage(self, request): + for e in conf.pages_extensions: + if request.endswith(e): + return True - groups = http_request_extracted.match(hit['request']) - - if groups: - hit['extract_request'] = groups.groupdict() - uri_groups = uri_re.match(hit['extract_request']['http_uri']); - if uri_groups: - hit['extract_request']['extract_uri'] = uri_groups.group('extract_uri') - hit['extract_request']['extract_parameters'] = uri_groups.group('extract_parameters') - else: - print "Bad request extraction " + hit['request'] return False - referer_groups = uri_re.match(hit['http_referer']); - if referer_groups: - hit['extract_referer']['extract_uri'] = referer_groups.group('extract_uri') - hit['extract_referer']['extract_parameters'] = referer_groups.group('extract_parameters') - return True + def _appendHit(self, hit): + remote_addr = hit['remote_addr'] + + if not remote_addr: return -def decode_time(hit): - t = hit['time_local'] + if not remote_addr in self.current_analysis['visits'].keys(): + self._createVisitor(hit) + + super_hit = self.current_analysis['visits'][remote_addr] + super_hit['requests'].append(hit) + super_hit['bandwidth'] += int(hit['body_bytes_sent']) + super_hit['last_access'] = self.meta_infos['last_time'] - hit['time_decoded'] = time.strptime(t, time_format) + request = hit['extract_request'] + uri = request.get('extract_uri', request['http_uri']) -def newHit(hit): - global cur_time + hit['is_page'] = self.isPage(uri) - if not decode_http_request(hit): return + if super_hit['robot'] or\ + not self.hasBeenViewed(hit): + page_key = 'not_viewed_pages' + hit_key = 'not_viewed_hits' + else: + page_key = 'viewed_pages' + hit_key = 'viewed_hits' - for k in hit.keys(): - if hit[k] == '-': hit[k] = '' + if hit['is_page']: + super_hit[page_key] += 1 + else: + super_hit[hit_key] += 1 - decode_time(hit) + def _createVisitor(self, hit): + super_hit = self.current_analysis['visits'][hit['remote_addr']] = {} + super_hit['remote_addr'] = hit['remote_addr'] + super_hit['remote_ip'] = hit['remote_addr'] + super_hit['viewed_pages'] = 0 + super_hit['viewed_hits'] = 0 + super_hit['not_viewed_pages'] = 0 + super_hit['not_viewed_hits'] = 0 + super_hit['bandwidth'] = 0 + super_hit['last_access'] = self.meta_infos['last_time'] + super_hit['requests'] = [] + super_hit['robot'] = False + super_hit['hit_only'] = 0 - t = hit['time_decoded'] + def _decodeHTTPRequest(self, hit): + if not 'request' in hit.keys(): return False - current_visit['last_time'] = t + groups = self.http_request_extracted.match(hit['request']) - if cur_time == None: - cur_time = t - else: - if cur_time.tm_mday != t.tm_mday: + if groups: + hit['extract_request'] = groups.groupdict() + uri_groups = self.uri_re.match(hit['extract_request']['http_uri']) + if uri_groups: + d = uri_groups.groupdict() + hit['extract_request']['extract_uri'] = d['extract_uri'] + if 'extract_parameters' in d.keys(): + hit['extract_request']['extract_parameters'] = d['extract_parameters'] + else: + self.logger.warning("Bad request extraction %s" % (hit['request'])) return False - remote_addr = hit['remote_addr'] - if remote_addr in current_visit.keys(): - appendHit(hit) - else: - createUser(hit, isRobot(hit)) + if hit['http_referer']: + referer_groups = self.uri_re.match(hit['http_referer']) + if referer_groups: + hit['extract_referer'] = referer_groups.groupdict() + return True - return True + def _decodeTime(self, hit): + try: + hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format) + except ValueError, e: + if sys.version_info < (3, 2): + # Try without UTC value at the end (%z not recognized) + gmt_offset_str = hit['time_local'][-5:] + gmt_offset_hours = int(gmt_offset_str[1:3])*60*60 + gmt_offset_minutes = int(gmt_offset_str[3:5])*60 + gmt_offset = gmt_offset_hours + gmt_offset_minutes + hit['time_decoded'] = time.strptime(hit['time_local'][:-6], conf.time_format[:-3]) + if gmt_offset_str[0] == '+': + hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])+gmt_offset) + else: + hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])-gmt_offset) + else: + raise e + return hit['time_decoded'] -print '==> Analysing log' -f = open("access.log") -for l in f: - # print "line " + l; + def getDisplayIndex(self): + cur_time = self.meta_infos['last_time'] + filename = self.getCurDisplayPath('index.html') + + return self.display.getPage(filename) + + def _generateDisplayDaysStats(self): + cur_time = self.meta_infos['last_time'] + title = createCurTitle(self, self._('Statistics')) + filename = self.getCurDisplayPath('index.html') + self.logger.info('==> Generate display (%s)' % (filename)) + page = self.display.createPage(title, filename, conf.css_path) + + _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) + days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, self._('By day'), [self._('Day'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) + days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) + nb_visits = 0 + nb_days = 0 + for i in range(1, nb_month_days+1): + day = '%d
%s' % (i, time.strftime('%b', cur_time)) + full_day = '%02d %s %d' % (i, time.strftime('%b', cur_time), cur_time.tm_year) + if i in self.current_analysis['days_stats'].keys(): + stats = self.current_analysis['days_stats'][i] + row = [full_day, stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], + stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + nb_visits += stats['nb_visits'] + nb_days += 1 + else: + row = [full_day, 0, 0, 0, 0, 0] + days.appendRow(row) + days.setCellValue(i-1, 4, bytesToStr(row[4])) + days.setCellValue(i-1, 5, bytesToStr(row[5])) + days.appendShortTitle(day) + adate = date(cur_time.tm_year, cur_time.tm_mon, i) + week_day = adate.weekday() + if week_day == 5 or week_day == 6: + days.setRowCSSClass(i-1, 'iwla_weekend') + if adate == date.today(): + css = days.getCellCSSClass(i-1, 0) + if css: css = '%s %s' % (css, 'iwla_curday') + else: css = 'iwla_curday' + days.setCellCSSClass(i-1, 0, css) + + stats = self.current_analysis['month_stats'] + + row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']] + if nb_days: + average_row = map(lambda(v): int(v/nb_days), row) + else: + average_row = map(lambda(v): 0, row) + + average_row[0] = self._('Average') + average_row[4] = bytesToStr(average_row[4]) + average_row[5] = bytesToStr(average_row[5]) + days.appendRow(average_row) + + row[0] = self._('Total') + row[4] = bytesToStr(row[4]) + row[5] = bytesToStr(row[5]) + days.appendRow(row) + page.appendBlock(days) + self.display.addPage(page) + + def _generateDisplayMonthStats(self, page, year, month_stats): + cur_time = time.localtime() + months_name = ['', self._('Jan'), self._('Feb'), self._('Mar'), self._('Apr'), self._('May'), self._('June'), self._('Jul'), self._('Aug'), self._('Sep'), self._('Oct'), self._('Nov'), self._('Dec')] + title = '%s %d' % (self._('Summary'), year) + cols = [self._('Month'), self._('Visitors'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth'), self._('Details')] + graph_cols=range(1,7) + months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) + months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) + total = [0] * len(cols) + for i in range(1, 13): + month = '%s
%d' % (months_name[i], year) + full_month = '%s %d' % (months_name[i], year) + if i in month_stats.keys(): + stats = month_stats[i] + link = '%s' % (year, i, self._('Details')) + row = [full_month, stats['nb_visitors'], stats['nb_visits'], stats['viewed_pages'], stats['viewed_hits'], + stats['viewed_bandwidth'], stats['not_viewed_bandwidth'], link] + for j in graph_cols: + total[j] += row[j] + else: + row = [full_month, 0, 0, 0, 0, 0, 0, ''] + months.appendRow(row) + months.setCellValue(i-1, 5, bytesToStr(row[5])) + months.setCellValue(i-1, 6, bytesToStr(row[6])) + months.appendShortTitle(month) + if year == cur_time.tm_year and i == cur_time.tm_mon: + css = months.getCellCSSClass(i-1, 0) + if css: css = '%s %s' % (css, 'iwla_curday') + else: css = 'iwla_curday' + months.setCellCSSClass(i-1, 0, css) + + total[0] = self._('Total') + total[5] = bytesToStr(total[5]) + total[6] = bytesToStr(total[6]) + total[7] = u'' + months.appendRow(total) + page.appendBlock(months) + + def _generateDisplayWholeMonthStats(self): + title = '%s %s' % (self._('Statistics for'), conf.domain_name) + filename = 'index.html' + + self.logger.info('==> Generate main page (%s)' % (filename)) + + page = self.display.createPage(title, filename, conf.css_path) + + last_update = '%s %s
' % (self._('Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) + page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) + + for year in sorted(self.meta_infos['stats'].keys(), reverse=True): + self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) + + self.display.addPage(page) + + def _compressFile(self, build_time, root, filename): + path = os.path.join(root, filename) + gz_path = path + '.gz' + + self.logger.debug('Compress %s => %s' % (path, gz_path)) + + if not os.path.exists(gz_path) or\ + os.stat(path).st_mtime > build_time: + with open(path, 'rb') as f_in, gzip.open(gz_path, 'wb') as f_out: + f_out.write(f_in.read()) + + def _compressFiles(self, build_time, root): + if not conf.compress_output_files: return + for rootdir, subdirs, files in os.walk(root, followlinks=True): + for f in files: + for ext in conf.compress_output_files: + if f.endswith(ext): + self._compressFile(build_time, rootdir, f) + break + + def _generateDisplay(self): + self._generateDisplayDaysStats() + self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY) + self._generateDisplayWholeMonthStats() + build_time = time.localtime() + self.display.build(conf.DISPLAY_ROOT) + self._compressFiles(build_time, conf.DISPLAY_ROOT) + + def _createEmptyStats(self): + stats = {} + stats['viewed_bandwidth'] = 0 + stats['not_viewed_bandwidth'] = 0 + stats['viewed_pages'] = 0 + stats['viewed_hits'] = 0 + stats['nb_visits'] = 0 + + return stats + + def _generateMonthStats(self): + self._clearDisplay() + + visits = self.current_analysis['visits'] + + stats = self._createEmptyStats() + for (day, stat) in self.current_analysis['days_stats'].items(): + for k in stats.keys(): + stats[k] += stat[k] + + duplicated_stats = {k:v for (k,v) in stats.items()} + + cur_time = self.meta_infos['last_time'] + self.logger.info("== Stats for %d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon)) + self.logger.info(stats) + + if not 'month_stats' in self.current_analysis.keys(): + self.current_analysis['month_stats'] = stats + else: + for (k,v) in stats.items(): + self.current_analysis['month_stats'][k] = v + + self.valid_visitors = {} + for (k,v) in visits.items(): + if v['robot']: continue + if not (conf.count_hit_only_visitors or\ + v['viewed_pages']): + continue + self.valid_visitors[k] = v + + duplicated_stats['nb_visitors'] = stats['nb_visitors'] = len(self.valid_visitors.keys()) + + self._callPlugins(conf.POST_HOOK_DIRECTORY) + + path = self.getDBFilename(cur_time) + if os.path.exists(path): + os.remove(path) + + self.logger.info("==> Serialize to %s" % (path)) + self._serialize(self.current_analysis, path) + + # Save month stats + year = cur_time.tm_year + month = cur_time.tm_mon + if not 'stats' in self.meta_infos.keys(): + self.meta_infos['stats'] = {} + if not year in self.meta_infos['stats'].keys(): + self.meta_infos['stats'][year] = {} + self.meta_infos['stats'][year][month] = duplicated_stats + + self._generateDisplay() + + def _generateDayStats(self): + visits = self.current_analysis['visits'] + cur_time = self.meta_infos['last_time'] + + self._callPlugins(conf.PRE_HOOK_DIRECTORY) + + stats = self._createEmptyStats() + + for (k, super_hit) in visits.items(): + if super_hit['last_access'].tm_mday != cur_time.tm_mday: + continue + viewed_page = False + for hit in super_hit['requests'][::-1]: + if hit['time_decoded'].tm_mday != cur_time.tm_mday: + break + if super_hit['robot'] or\ + not self.hasBeenViewed(hit): + stats['not_viewed_bandwidth'] += int(hit['body_bytes_sent']) + continue + stats['viewed_bandwidth'] += int(hit['body_bytes_sent']) + if hit['is_page']: + stats['viewed_pages'] += 1 + viewed_pages = True + else: + stats['viewed_hits'] += 1 + if (conf.count_hit_only_visitors or\ + viewed_pages) and\ + not super_hit['robot']: + stats['nb_visits'] += 1 + + self.logger.info("== Stats for %d/%02d/%02d ==" % (cur_time.tm_year, cur_time.tm_mon, cur_time.tm_mday)) + self.logger.info(stats) + + self.current_analysis['days_stats'][cur_time.tm_mday] = stats + + def _newHit(self, hit): + if not self.domain_name_re.match(hit['server_name']): + return False + + t = self._decodeTime(hit) + + cur_time = self.meta_infos['last_time'] + + if cur_time == None: + self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() + self.analyse_started = True + else: + if time.mktime(t) <= time.mktime(cur_time): + return False + self.analyse_started = True + if cur_time.tm_mon != t.tm_mon: + self._generateMonthStats() + self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() + elif cur_time.tm_mday != t.tm_mday: + self._generateDayStats() + + self.meta_infos['last_time'] = t + + if not self.meta_infos['start_analysis_time']: + self.meta_infos['start_analysis_time'] = t + + if not self._decodeHTTPRequest(hit): return False + + for k in hit.keys(): + if hit[k] == '-' or hit[k] == '*': + hit[k] = '' + + self._appendHit(hit) + + return True + + def start(self, _file): + self.logger.info('==> Load previous database') + + self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() + if self.meta_infos['last_time']: + self.logger.info('Last time') + self.logger.info(self.meta_infos['last_time']) + self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() + else: + self._clearVisits() + + self.meta_infos['start_analysis_time'] = None + + self.cache_plugins = preloadPlugins(self.plugins, self) + + self.logger.info('==> Analysing log') + + for l in _file: + # print "line " + l + + groups = self.log_re.match(l) + + if groups: + self._newHit(groups.groupdict()) + else: + self.logger.warning("No match for %s" % (l)) + #break + + if self.analyse_started: + self._generateDayStats() + self._generateMonthStats() + del self.meta_infos['start_analysis_time'] + self._serialize(self.meta_infos, conf.META_PATH) + else: + self.logger.info('==> Analyse not started : nothing new') + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Intelligent Web Log Analyzer') + + parser.add_argument('-c', '--clean-output', dest='clean_output', action='store_true', + default=False, + help='Clean output before starting') + + parser.add_argument('-i', '--stdin', dest='stdin', action='store_true', + default=False, + help='Read data from stdin instead of conf.analyzed_filename') + + parser.add_argument('-f', '--file', dest='file', + help='Analyse this log file') + + parser.add_argument('-d', '--log-level', dest='loglevel', + default='INFO', type=str, + help='Loglevel in %s, default : %s' % (['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], 'INFO')) + + args = parser.parse_args() + + if args.clean_output: + if os.path.exists(conf.DB_ROOT): shutil.rmtree(conf.DB_ROOT) + if os.path.exists(conf.DISPLAY_ROOT): shutil.rmtree(conf.DISPLAY_ROOT) + + loglevel = getattr(logging, args.loglevel.upper(), None) + if not isinstance(loglevel, int): + raise ValueError('Invalid log level: %s' % (args.loglevel)) - groups = log_re.match(l) + iwla = IWLA(loglevel) - if groups: - if not newHit(groups.groupdict()): - break + required_conf = ['analyzed_filename', 'domain_name'] + if not validConfRequirements(required_conf, iwla, 'Main Conf'): + sys.exit(0) + + if args.stdin: + iwla.start(sys.stdin) else: - print "No match " + l -f.close(); - -print '==> Call plugins' -plugins = glob.glob('./hooks_pre/*.py') -plugins.sort() -for p in plugins: - print '\t%s' % (p) - mod = imp.load_source('hook', p) - mod.hook(current_visit) - -for ip in current_visit.keys(): - hit = current_visit[ip] - if hit['robot']: continue - print "%s =>" % (ip) - for k in hit.keys(): - if k != 'pages': - print "\t%s : %s" % (k, current_visit[ip][k]) + filename = args.file or conf.analyzed_filename + if not os.path.exists(filename): + print 'No such file \'%s\'' % (filename) + sys.exit(-1) + with open(filename) as f: + iwla.start(f) diff --git a/iwla_convert.pl b/iwla_convert.pl deleted file mode 100755 index a47140a..0000000 --- a/iwla_convert.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl - -my $awstats_lib_root = '/usr/share/awstats/lib/'; -my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); - -foreach $lib (@awstats_libs) {require $awstats_lib_root . $lib;} - -open($FIC,">", "robots.py") or die $!; - -print $FIC "awstats_robots = ["; -$first = 0; -foreach $r (@RobotsSearchIDOrder_list1) -{ - $r =~ s/\'/\\\'/g; - if ($first != 0) - { - print $FIC ", "; - } - else - { - $first = 1; - } - print $FIC "'.*$r.*'"; -} -foreach $r (@RobotsSearchIDOrder_list2) -{ - $r =~ s/\'/\\\'/g; - print $FIC ", '.*$r.*'"; -} -print $FIC "]\n\n"; - -close($FIC); - - diff --git a/iwla_get.sh b/iwla_get.sh new file mode 100755 index 0000000..eef3164 --- /dev/null +++ b/iwla_get.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +rm -f mega_log +for i in `seq 53 -1 2` ; do + [ ! -f "cybelle/soutade.fr_access.log.$i.gz" ] && continue + zcat "cybelle/soutade.fr_access.log.$i.gz" >> mega_log + echo "cybelle/soutade.fr_access.log.$i.gz" +done + +#cat "cybelle/soutade.fr_access.log.2" >> mega_log +echo "cybelle/soutade.fr_access.log.1" +cat "cybelle/soutade.fr_access.log.1" >> mega_log +# cat "cybelle/soutade.fr_access.log" >> mega_log +cat mega_log | ./iwla.py -i -c +# cat "cybelle/soutade.fr_access.log.1" | ./iwla.py -i +# cat "cybelle/soutade.fr_access.log" | ./iwla.py -i + +# TODO : reverse analysis +# -f option +# other when pages truncated diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo new file mode 100644 index 0000000000000000000000000000000000000000..360249b9be26cf63291f68baccb3bc9bf31d6867 GIT binary patch literal 2934 zcmZ{kO^g&p6vqn%#SxKD6%{EJ5X4?)_-2+5cXxIL++~;9fhaN2-kI9jhMw-Gx_Wje z#t;uA9yAdX4n_@LNZf<*LOei1Ool|G2M-)HhL~_sPF_s(Ac_9}-L*S|(MrGm)vKz0 z^O067U1?VelfD1HS<8 z1+Rd3#5Jp52k(Ra4R}BJJxDu0*zsH7Qs}oqe*dTCUm*AW8{~J3VTAfJko&IzSAiQr ze%EW~4_f^Y$WVqYkJ<4PAnl#B`h=aIv^)(mo(QC$Z-Nhk=Rodr9)wHcg4I8=`bCib zT(aX=K>B;l>R*H0_d5`exMBGdNPD-e{wv6H{|)4RcR>2VkLgzqUDVT>k>d zbw!ZpQv#WvV^()T?h}BtYe4!p17ZvDHrQBz{DO}|{{xe>yBtQBf$PAPU>sbhM`0vJhy2%c11|NfLh3v6oJTErp`5DLtDqW3rz_uOI1Hn;=1CTs~xp)G? zvwR-HwjNS|?1u2nSs&{lY3uWSSqi5EKXhxcpmxYJS!c|xtE^X6lS(U{DW_FSMpN32 z?PSx7(=Q?|`XcT5qA#galGup8rqZw?`rV*5?bXbb=x@oI+Y$p|5U3e14CJH^8={1v zlB!ZvV?t?kjO+Qa7z~VdgQ^mPGe+sa_2u#M@Lh`Bq{E5OY!*Xmf}#^ww*-Qq#Ntp0 zH;%XgC7n5v_yW?xD^TL)`C!Db8ygub6=c06s<}pq5m!^HQ+T(;NEjf7qoI*aPfe?u z>;!f+Y+|CBxj$Mp0unNmQSH^eK#ZCxo?v#U<0>_oK@J93pv1U}C?+#8Zd~KV#;eAn z)0LB<7UM~y!5AxH)Rj7FnQ`{!Ge)I5W7N}(g>a@48rK)c%ZJ4YCXqvF2X5-{l&Tu% zaLqXZw~?r#^rn3`H#S;v2DE~2Vc?W-LPfbPU)bRkwmF5pvaq|jWBZnY!3x$nWyOvD ze_6he&*ymRP6auReHRWC<#?DFx7MDO`{J~xUaU886?&>+;{a9%^#m8nsVKK$J(?RU z;wrs9RL+eY9vSR7UFgZ@aM_FsuuUt1yGG5Jt~L9eV%xjI&6|MAL@v!}C;?%>8d zgF!W{c|pA>_e^*u_mT>5osFtF{jH*mT6JY;tS4&8LeI|JD~?^jFvdbv^9;s!^%U}$ z%5(?O>8cvYwk^tRU*sW)rLSUX+OvLpmR{9W11>W~c4~^Z8JfW|E{)Ra>>3EudxoOy z8nbmOtFYQVp56e~Zxcn^Op7*bUq!v9?~$;jP@ZYkDr^+TE)Eb^SIblIzpHp_DoVUq z9N}mQj;Al&U#-~dlyG|%o1tozneHokE5=Pl+RIW$y zeTC9aP+Mc^?@#FbTDSyfTs5ZE#*(Xytbo*(O~Z5Ws<=rajE?^a~QlPtGq o, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: iwla\n" +"POT-Creation-Date: 2014-12-19 17:43+CET\n" +"PO-Revision-Date: 2014-12-19 17:43+0100\n" +"Last-Translator: Soutadé \n" +"Language-Team: iwla\n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: display.py:32 +msgid "April" +msgstr "Avril" + +#: display.py:32 +msgid "February" +msgstr "Février" + +#: display.py:32 +msgid "January" +msgstr "Janvier" + +#: display.py:32 +msgid "July" +msgstr "Juillet" + +#: display.py:32 +msgid "March" +msgstr "Mars" + +#: display.py:32 iwla.py:428 +msgid "June" +msgstr "Juin" + +#: display.py:32 iwla.py:428 +msgid "May" +msgstr "Mai" + +#: display.py:33 +msgid "August" +msgstr "Août" + +#: display.py:33 +msgid "December" +msgstr "Décembre" + +#: display.py:33 +msgid "November" +msgstr "Novembre" + +#: display.py:33 +msgid "October" +msgstr "Octobre" + +#: display.py:33 +msgid "September" +msgstr "Septembre" + +#: iwla.py:371 +msgid "Statistics" +msgstr "Statistiques" + +#: iwla.py:377 +msgid "By day" +msgstr "Par jour" + +#: iwla.py:377 +msgid "Day" +msgstr "Jour" + +#: iwla.py:377 iwla.py:430 +msgid "Not viewed Bandwidth" +msgstr "Traffic non vu" + +#: iwla.py:377 iwla.py:430 +msgid "Visits" +msgstr "Visites" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +msgid "Hits" +msgstr "Hits" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +#: plugins/display/top_visitors.py:72 +msgid "Pages" +msgstr "Pages" + +#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: plugins/display/top_visitors.py:72 +msgid "Bandwidth" +msgstr "Bande passante" + +#: iwla.py:414 +msgid "Average" +msgstr "Moyenne" + +#: iwla.py:419 iwla.py:457 +msgid "Total" +msgstr "Total" + +#: iwla.py:428 +msgid "Apr" +msgstr "Avr" + +#: iwla.py:428 +msgid "Aug" +msgstr "Août" + +#: iwla.py:428 +msgid "Dec" +msgstr "Déc" + +#: iwla.py:428 +msgid "Feb" +msgstr "Fév" + +#: iwla.py:428 +msgid "Jan" +msgstr "Jan" + +#: iwla.py:428 +msgid "Jul" +msgstr "Jui" + +#: iwla.py:428 +msgid "Mar" +msgstr "Mars" + +#: iwla.py:428 +msgid "Nov" +msgstr "Nov" + +#: iwla.py:428 +msgid "Oct" +msgstr "Oct" + +#: iwla.py:428 +msgid "Sep" +msgstr "Sep" + +#: iwla.py:429 +msgid "Summary" +msgstr "Résumé" + +#: iwla.py:430 +msgid "Month" +msgstr "Mois" + +#: iwla.py:430 +msgid "Visitors" +msgstr "Visiteurs" + +#: iwla.py:430 iwla.py:440 +msgid "Details" +msgstr "Détails" + +#: iwla.py:465 +msgid "Statistics for" +msgstr "Statistiques pour" + +#: iwla.py:472 +msgid "Last update" +msgstr "Dernière mise à jour" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Host" +msgstr "Hôte" + +#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +msgid "Last seen" +msgstr "Dernière visite" + +#: plugins/display/all_visits.py:92 +msgid "All visits" +msgstr "Toutes les visites" + +#: plugins/display/all_visits.py:93 plugins/display/top_visitors.py:72 +msgid "Top visitors" +msgstr "Top visiteurs" + +#: plugins/display/referers.py:95 +msgid "Connexion from" +msgstr "Connexion depuis" + +#: plugins/display/referers.py:95 plugins/display/referers.py:153 +msgid "Origin" +msgstr "Origine" + +#: plugins/display/referers.py:99 plugins/display/referers.py:156 +msgid "Search Engine" +msgstr "Moteur de recherche" + +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 +msgid "Others" +msgstr "Autres" + +#: plugins/display/referers.py:114 plugins/display/referers.py:167 +msgid "External URL" +msgstr "URL externe" + +#: plugins/display/referers.py:129 plugins/display/referers.py:178 +msgid "External URL (robot)" +msgstr "URL externe (robot)" + +#: plugins/display/referers.py:147 +msgid "Top Referers" +msgstr "Top Origines" + +#: plugins/display/referers.py:149 +msgid "All Referers" +msgstr "Toutes les origines" + +#: plugins/display/referers.py:200 plugins/display/referers.py:210 +msgid "Top key phrases" +msgstr "Top phrases clé" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Key phrase" +msgstr "Phrase clé" + +#: plugins/display/referers.py:200 plugins/display/referers.py:216 +msgid "Search" +msgstr "Recherche" + +#: plugins/display/referers.py:212 +msgid "All key phrases" +msgstr "Toutes les phrases clé" + +#: plugins/display/top_downloads.py:71 +msgid "Hit" +msgstr "Hit" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:91 +msgid "All Downloads" +msgstr "Tous les téléchargements" + +#: plugins/display/top_downloads.py:71 plugins/display/top_downloads.py:97 +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "URI" +msgstr "URI" + +#: plugins/display/top_downloads.py:89 +msgid "Top Downloads" +msgstr "Top Téléchargements" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:91 +msgid "All Hits" +msgstr "Tous les hits" + +#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 +msgid "Entrance" +msgstr "Entrées" + +#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 +msgid "All Pages" +msgstr "Toutes les pages" + +#: plugins/display/top_pages.py:88 +msgid "Top Pages" +msgstr "Top Pages" + +#~ msgid "Key Phrases" +#~ msgstr "Phrases clé" diff --git a/plugins/__init__.py b/plugins/__init__.py new file mode 100644 index 0000000..bd0daba --- /dev/null +++ b/plugins/__init__.py @@ -0,0 +1,2 @@ + +__all__ = ['pre_analysis', 'post_analysis', 'display'] diff --git a/plugins/display/__init__.py b/plugins/display/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/display/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py new file mode 100644 index 0000000..4dbc92c --- /dev/null +++ b/plugins/display/all_visits.py @@ -0,0 +1,99 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create All visits page + +Plugin requirements : + None + +Conf values needed : + display_visitor_ip* + +Output files : + OUTPUT_ROOT/year/month/all_visits.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayAllVisits(IPlugin): + def __init__(self, iwla): + super(IWLADisplayAllVisits, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + display = self.iwla.getDisplay() + hits = self.iwla.getValidVisitors() + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) + + last_access = sorted(hits.values(), key=lambda t: t['last_access'], reverse=True) + + title = createCurTitle(self.iwla, u'All visits') + + filename = 'all_visits.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Last seen'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Bandwidth'), self.iwla._(u'Last seen')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) + + for super_hit in last_access: + address = super_hit['remote_addr'] + if display_visitor_ip and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + + row = [ + address, + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] + table.appendRow(row) + page.appendBlock(table) + + display.addPage(page) + + index = self.iwla.getDisplayIndex() + link = '%s' % (filename, self.iwla._(u'All visits')) + block = index.getBlock(self.iwla._(u'Top visitors')) + if block: + block.setTitle('%s - %s' % (block.getTitle(), link)) + else: + block = display.createBlock(DisplayHTMLRawBlock) + block.setRawHTML(link) + index.appendBlock(block) diff --git a/plugins/display/referers.py b/plugins/display/referers.py new file mode 100644 index 0000000..bdd04a5 --- /dev/null +++ b/plugins/display/referers.py @@ -0,0 +1,225 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create Referers page + +Plugin requirements : + post_analysis/referers + +Conf values needed : + max_referers_displayed* + create_all_referers_page* + max_key_phrases_displayed* + create_all_key_phrases_page* + +Output files : + OUTPUT_ROOT/year/month/referers.html + OUTPUT_ROOT/year/month/key_phrases.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayReferers(IPlugin): + def __init__(self, iwla): + super(IWLADisplayReferers, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisReferers'] + self.max_referers = self.iwla.getConfValue('max_referers_displayed', 0) + self.create_all_referers = self.iwla.getConfValue('create_all_referers_page', True) + self.max_key_phrases = self.iwla.getConfValue('max_key_phrases_displayed', 0) + self.create_all_key_phrases = self.iwla.getConfValue('create_all_key_phrases_page', True) + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + referers = month_stats.get('referers', {}) + robots_referers = month_stats.get('robots_referers', {}) + search_engine_referers = month_stats.get('search_engine_referers', {}) + key_phrases = month_stats.get('key_phrases', {}) + + top_referers = [(k, referers[k]['pages']) for k in referers.keys()] + top_referers = sorted(top_referers, key=lambda t: t[1], reverse=True) + + top_robots_referers = [(k, robots_referers[k]['pages']) for k in robots_referers.keys()] + top_robots_referers = sorted(top_robots_referers, key=lambda t: t[1], reverse=True) + + top_search_engine_referers = [(k, search_engine_referers[k]['pages']) for k in search_engine_referers.keys()] + top_search_engine_referers = sorted(top_search_engine_referers, key=lambda t: t[1], reverse=True) + + top_key_phrases = key_phrases.items() + top_key_phrases = sorted(top_key_phrases, key=lambda t: t[1], reverse=True) + + cur_time = self.iwla.getCurTime() + index = self.iwla.getDisplayIndex() + + # All referers in a file + if self.create_all_referers: + title = createCurTitle(self.iwla, u'Connexion from') + + filename = 'referers.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Connexion from'), [self.iwla._(u'Origin'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + + total_search = [0]*3 + table.appendRow(['%s' % (self.iwla._(u'Search Engine')), '', '']) + new_list = self.max_referers and top_search_engine_referers[:self.max_referers] or top_search_engine_referers + for r,_ in new_list: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] += search_engine_referers[r]['pages'] + total_search[2] += search_engine_referers[r]['hits'] + table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + total_external = [0]*3 + table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) + new_list = self.max_referers and top_referers[:self.max_referers] or top_referers + for r,_ in new_list: + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] += referers[r]['pages'] + total_external[2] += referers[r]['hits'] + table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + total_robot = [0]*3 + table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) + new_list = self.max_referers and top_robots_referers[:self.max_referers] or top_robots_referers + for r,_ in new_list: + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] += robots_referers[r]['pages'] + total_robot[2] += robots_referers[r]['hits'] + table.appendRow(row) + if self.max_referers: + others = 0 + for (uri, entrance) in top_referers[self.max_referers:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top Referers') + if self.create_all_referers: + link = '%s' % (filename, self.iwla._(u'All Referers')) + title = '%s - %s' % (title, link) + + # Top referers in index + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Origin'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) + + table.appendRow(['%s' % (self.iwla._(u'Search Engine')), '', '']) + for r,_ in top_search_engine_referers[:10]: + row = [r, search_engine_referers[r]['pages'], search_engine_referers[r]['hits']] + total_search[1] -= search_engine_referers[r]['pages'] + total_search[2] -= search_engine_referers[r]['hits'] + table.appendRow(row) + if total_search[1] or total_search[2]: + total_search[0] = self.iwla._(u'Others') + table.appendRow(total_search) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + table.appendRow(['%s' % (self.iwla._(u'External URL')), '', '']) + for r,_ in top_referers[:10]: + row = [generateHTMLLink(r), referers[r]['pages'], referers[r]['hits']] + total_external[1] -= referers[r]['pages'] + total_external[2] -= referers[r]['hits'] + table.appendRow(row) + if total_external[1] or total_external[2]: + total_external[0] = self.iwla._(u'Others') + table.appendRow(total_external) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + table.appendRow(['%s' % (self.iwla._(u'External URL (robot)')), '', '']) + for r,_ in top_robots_referers[:10]: + row = [generateHTMLLink(r), robots_referers[r]['pages'], robots_referers[r]['hits']] + total_robot[1] -= robots_referers[r]['pages'] + total_robot[2] -= robots_referers[r]['hits'] + table.appendRow(row) + if total_robot[1] or total_robot[2]: + total_robot[0] = self.iwla._(u'Others') + table.appendRow(total_robot) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + index.appendBlock(table) + + # All key phrases in a file + if self.create_all_key_phrases: + title = createCurTitle(self.iwla, u'Key Phrases') + + filename = 'key_phrases.html' + path = self.iwla.getCurDisplayPath(filename) + + total_search = [0]*2 + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table.setColsCSSClass(['', 'iwla_search']) + new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases + for phrase in new_list: + table.appendRow([phrase[0], phrase[1]]) + total_search[1] += phrase[1] + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top key phrases') + if self.create_all_key_phrases: + link = '%s' % (filename, self.iwla._(u'All key phrases')) + title = '%s - %s' % (title, link) + + # Top key phrases in index + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table.setColsCSSClass(['', 'iwla_search']) + for phrase in top_key_phrases[:10]: + table.appendRow([phrase[0], phrase[1]]) + total_search[1] -= phrase[1] + if total_search[1]: + total_search[0] = self.iwla._(u'Others') + table.appendRow(total_search) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_downloads.py b/plugins/display/top_downloads.py new file mode 100644 index 0000000..f5d4a60 --- /dev/null +++ b/plugins/display/top_downloads.py @@ -0,0 +1,106 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP downloads page + +Plugin requirements : + post_analysis/top_downloads + +Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + +Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopDownloads(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopDownloads, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopDownloads'] + self.max_downloads = self.iwla.getConfValue('max_downloads_displayed', 0) + self.create_all_downloads = self.iwla.getConfValue('create_all_downloads_page', True) + + def hook(self): + display = self.iwla.getDisplay() + top_downloads = self.iwla.getMonthStats()['top_downloads'] + top_downloads = sorted(top_downloads.items(), key=lambda t: t[1], reverse=True) + + # All in a file + if self.create_all_downloads: + filename = 'top_downloads.html' + path = self.iwla.getCurDisplayPath(filename) + title = createCurTitle(self.iwla, u'All Downloads') + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Downloads'), [self.iwla._(u'URI'), self.iwla._(u'Hit')]) + table.setColsCSSClass(['', 'iwla_hit']) + + total_entrance = [0]*2 + new_list = self.max_downloads and top_downloads[:self.max_downloads] or top_downloads + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] += entrance + if self.max_downloads: + others = 0 + for (uri, entrance) in top_downloads[self.max_downloads:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top Downloads') + if self.create_all_downloads: + link = '%s' % (filename, self.iwla._(u'All Downloads')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_hit']) + for (uri, entrance) in top_downloads[:10]: + table.appendRow([generateHTMLLink(uri), entrance]) + total_entrance[1] -= entrance + if total_entrance[1]: + total_entrance[0] = self.iwla._(u'Others') + table.appendRow(total_entrance) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_hits.py b/plugins/display/top_hits.py new file mode 100644 index 0000000..412b3fe --- /dev/null +++ b/plugins/display/top_hits.py @@ -0,0 +1,106 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP hits page + +Plugin requirements : + post_analysis/top_hits + +Conf values needed : + max_hits_displayed* + create_all_hits_page* + +Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopHits(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopHits, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopHits'] + self.max_hits = self.iwla.getConfValue('max_hits_displayed', 0) + self.create_all_hits = self.iwla.getConfValue('create_all_hits_page', True) + + def hook(self): + display = self.iwla.getDisplay() + top_hits = self.iwla.getMonthStats()['top_hits'] + top_hits = sorted(top_hits.items(), key=lambda t: t[1], reverse=True) + + # All in a file + if self.create_all_hits: + title = createCurTitle(self.iwla, u'All Hits') + filename = 'top_hits.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Hits'), [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 + new_list = self.max_hits and top_hits[:self.max_hits] or top_hits + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance + if self.max_hits: + others = 0 + for (uri, entrance) in top_hits[self.max_hits:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + page.appendBlock(table) + + display.addPage(page) + + title = 'Top Hits' + if self.create_all_hits: + link = '%s' % (filename, self.iwla._(u'All Hits')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + for (uri, entrance) in top_hits[:10]: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] -= entrance + if total_hits[1]: + total_hits[0] = self.iwla._(u'Others') + table.appendRow(total_hits) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_pages.py b/plugins/display/top_pages.py new file mode 100644 index 0000000..b44bf81 --- /dev/null +++ b/plugins/display/top_pages.py @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP pages page + +Plugin requirements : + post_analysis/top_pages + +Conf values needed : + max_pages_displayed* + create_all_pages_page* + +Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopPages(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopPages, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisTopPages'] + self.max_pages = self.iwla.getConfValue('max_pages_displayed', 0) + self.create_all_pages = self.iwla.getConfValue('create_all_pages_page', True) + + def hook(self): + display = self.iwla.getDisplay() + top_pages = self.iwla.getMonthStats()['top_pages'] + top_pages = sorted(top_pages.items(), key=lambda t: t[1], reverse=True) + + # All in a page + if self.create_all_pages: + title = createCurTitle(self.iwla, u'All Pages') + filename = 'top_pages.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All Pages'), [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + total_hits = [0]*2 + new_list = self.max_pages and top_pages[:self.max_pages] or top_pages + for (uri, entrance) in new_list: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] += entrance + if self.max_pages: + others = 0 + for (uri, entrance) in top_pages[self.max_pages:]: + others += entrance + table.appendRow([self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + page.appendBlock(table) + + display.addPage(page) + + title = self.iwla._(u'Top Pages') + if self.create_all_pages: + link = '%s' % (filename, self.iwla._(u'All Pages')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'URI'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', 'iwla_hit']) + for (uri, entrance) in top_pages[:10]: + table.appendRow([generateHTMLLink(uri), entrance]) + total_hits[1] -= entrance + if total_hits[1]: + total_hits[0] = self.iwla._(u'Others') + table.appendRow(total_hits) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py new file mode 100644 index 0000000..b7d3b66 --- /dev/null +++ b/plugins/display/top_visitors.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import time + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Create TOP visitors block + +Plugin requirements : + None + +Conf values needed : + display_visitor_ip* + +Output files : + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopVisitors(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopVisitors, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + hits = self.iwla.getValidVisitors() + display = self.iwla.getDisplay() + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) + + total = [0]*5 + for super_hit in hits.values(): + total[1] += super_hit['viewed_pages'] + total[2] += super_hit['viewed_hits'] + total[3] += super_hit['bandwidth'] + + top_bandwidth = [(k,v['bandwidth']) for (k,v) in hits.items()] + top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True) + top_visitors = [hits[h[0]] for h in top_bandwidth[:10]] + + index = self.iwla.getDisplayIndex() + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top visitors'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Bandwidth'), self.iwla._(u'Last seen')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) + for super_hit in top_visitors: + address = super_hit['remote_addr'] + if display_visitor_ip and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + + row = [ + address, + super_hit['viewed_pages'], + super_hit['viewed_hits'], + bytesToStr(super_hit['bandwidth']), + time.asctime(super_hit['last_access']) + ] + total[1] -= super_hit['viewed_pages'] + total[2] -= super_hit['viewed_hits'] + total[3] -= super_hit['bandwidth'] + table.appendRow(row) + if total[1] or total[2] or total[3]: + total[0] = self.iwla._(u'Others') + total[3] = bytesToStr(total[3]) + total[4] = '' + table.appendRow(total) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/post_analysis/__init__.py b/plugins/post_analysis/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/post_analysis/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py new file mode 100644 index 0000000..64ec66f --- /dev/null +++ b/plugins/post_analysis/referers.py @@ -0,0 +1,173 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re +import urllib + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +""" +Post analysis hook + +Extract referers and key phrases from requests + +Plugin requirements : + None + +Conf values needed : + domain_name + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + +Statistics deletion : + None +""" + +class IWLAPostAnalysisReferers(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisReferers, self).__init__(iwla) + self.API_VERSION = 1 + self.conf_requires = ['domain_name'] + + def _getSearchEngine(self, hashid): + for (k, e) in self.search_engines.items(): + for (h,h_re) in e['hashid']: + if hashid == h: + return k + return None + + def load(self): + domain_name = self.iwla.getConfValue('domain_name', '') + + if not domain_name: + print 'domain_name must not be empty !' + return False + + self.own_domain_re = re.compile(r'.*%s.*' % (domain_name)) + self.search_engines = {} + + for (hashid, name) in awstats_data.search_engines_hashid.items(): + hashid_re = re.compile(r'.*%s.*' % (hashid)) + if not name in self.search_engines.keys(): + self.search_engines[name] = { + 'hashid' : [(hashid, hashid_re)] + } + else: + self.search_engines[name]['hashid'].append((hashid, hashid_re)) + #print 'Hashid %s => %s' % (name, hashid) + + for (name, known_url) in awstats_data.search_engines_knwown_url.items(): + self.search_engines[name]['known_url'] = re.compile(known_url + '(?P.+)') + + for (engine, not_engine) in awstats_data.not_search_engines_keys.items(): + not_engine_re = re.compile(r'.*%s.*' % (not_engine)) + key = self._getSearchEngine(engine) + if key: + self.search_engines[key]['not_search_engine'] = not_engine_re + + return True + + def _extractKeyPhrase(self, key_phrase_re, parameters, key_phrases): + if not parameters or not key_phrase_re: return + + for p in parameters.split('&'): + groups = key_phrase_re.match(p) + if groups: + key_phrase = groups.groupdict()['key_phrase'] + key_phrase = urllib.unquote_plus(key_phrase).decode('utf8') + if not key_phrase in key_phrases.keys(): + key_phrases[key_phrase] = 1 + else: + key_phrases[key_phrase] += 1 + break + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + referers = month_stats.get('referers', {}) + robots_referers = month_stats.get('robots_referers', {}) + search_engine_referers = month_stats.get('search_engine_referers', {}) + key_phrases = month_stats.get('key_phrases', {}) + + for (k, super_hit) in stats.items(): + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): break + if not r['http_referer']: continue + + uri = r['extract_referer']['extract_uri'] + if self.own_domain_re.match(uri): continue + + is_search_engine = False + for (name, engine) in self.search_engines.items(): + for (hashid, hashid_re) in engine['hashid']: + if not hashid_re.match(uri): continue + + not_engine = engine.get('not_search_engine', None) + # Try not engine + if not_engine and not_engine.match(uri): break + is_search_engine = True + uri = name + + parameters = r['extract_referer'].get('extract_parameters', None) + key_phrase_re = engine.get('known_url', None) + + self._extractKeyPhrase(key_phrase_re, parameters, key_phrases) + break + + if is_search_engine: + dictionary = search_engine_referers + elif super_hit['robot']: + dictionary = robots_referers + # print '%s => %s' % (uri, super_hit['remote_ip']) + else: + dictionary = referers + if r['is_page']: + key = 'pages' + else: + key = 'hits' + if not uri in dictionary: dictionary[uri] = {'pages':0, 'hits':0} + dictionary[uri][key] += 1 + + month_stats['referers'] = referers + month_stats['robots_referers'] = robots_referers + month_stats['search_engine_referers'] = search_engine_referers + month_stats['key_phrases'] = key_phrases diff --git a/plugins/post_analysis/reverse_dns.py b/plugins/post_analysis/reverse_dns.py new file mode 100644 index 0000000..c63965f --- /dev/null +++ b/plugins/post_analysis/reverse_dns.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import socket + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Replace IP by reverse DNS names + +Plugin requirements : + None + +Conf values needed : + reverse_dns_timeout* + +Output files : + None + +Statistics creation : + None + +Statistics update : +valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + +Statistics deletion : + None +""" + +class IWLAPostAnalysisReverseDNS(IPlugin): + DEFAULT_DNS_TIMEOUT = 0.5 + + def __init__(self, iwla): + super(IWLAPostAnalysisReverseDNS, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + timeout = self.iwla.getConfValue('reverse_dns_timeout', + IWLAPostAnalysisReverseDNS.DEFAULT_DNS_TIMEOUT) + socket.setdefaulttimeout(timeout) + return True + + def hook(self): + hits = self.iwla.getValidVisitors() + for (k, hit) in hits.items(): + if hit.get('dns_analysed', False): continue + try: + name, _, _ = socket.gethostbyaddr(k) + hit['remote_addr'] = name.lower() + hit['dns_name_replaced'] = True + except: + pass + finally: + hit['dns_analysed'] = True + diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py new file mode 100644 index 0000000..7b28c33 --- /dev/null +++ b/plugins/post_analysis/top_downloads.py @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count TOP downloads + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_downloads => + uri + +Statistics deletion : + None +""" + +class IWLAPostAnalysisTopDownloads(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopDownloads, self).__init__(iwla) + self.API_VERSION = 1 + self.conf_requires = ['multimedia_files', 'viewed_http_codes'] + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + multimedia_files = self.iwla.getConfValue('multimedia_files') + viewed_http_codes = self.iwla.getConfValue('viewed_http_codes') + + top_downloads = month_stats.get('top_downloads', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + r['is_page']: + continue + + uri = r['extract_request']['extract_uri'].lower() + + isMultimedia = False + for ext in multimedia_files: + if uri.endswith(ext): + isMultimedia = True + break + + if isMultimedia: continue + + uri = "%s%s" % (r.get('server_name', ''), + r['extract_request']['extract_uri']) + + if not uri in top_downloads.keys(): + top_downloads[uri] = 1 + else: + top_downloads[uri] += 1 + + month_stats['top_downloads'] = top_downloads diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py new file mode 100644 index 0000000..64446c7 --- /dev/null +++ b/plugins/post_analysis/top_hits.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count TOP hits + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_hits => + uri + +Statistics deletion : + None +""" + +class IWLAPostAnalysisTopHits(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopHits, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + top_hits = month_stats.get('top_hits', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + r['is_page']: + continue + + uri = r['extract_request']['extract_uri'].lower() + uri = "%s%s" % (r.get('server_name', ''), uri) + + if not uri in top_hits.keys(): + top_hits[uri] = 1 + else: + top_hits[uri] += 1 + + month_stats['top_hits'] = top_hits diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py new file mode 100644 index 0000000..a5d086c --- /dev/null +++ b/plugins/post_analysis/top_pages.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count TOP pages + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : +month_stats: + top_pages => + uri + +Statistics deletion : + None +""" + +class IWLAPostAnalysisTopPages(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisTopPages, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.index_re = re.compile(r'/index.*') + return True + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + top_pages = month_stats.get('top_pages', {}) + + for (k, super_hit) in stats.items(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + if not self.iwla.hasBeenViewed(r) or\ + not r['is_page']: + continue + + uri = r['extract_request']['extract_uri'] + if self.index_re.match(uri): + uri = '/' + + uri = "%s%s" % (r.get('server_name', ''), uri) + + if not uri in top_pages.keys(): + top_pages[uri] = 1 + else: + top_pages[uri] += 1 + + month_stats['top_pages'] = top_pages diff --git a/plugins/pre_analysis/__init__.py b/plugins/pre_analysis/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/plugins/pre_analysis/__init__.py @@ -0,0 +1 @@ +# diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py new file mode 100644 index 0000000..a3919c4 --- /dev/null +++ b/plugins/pre_analysis/page_to_hit.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Pre analysis hook +Change page into hit and hit into page into statistics + +Plugin requirements : + None + +Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + +Output files : + None + +Statistics creation : + None + +Statistics update : +visits : + remote_addr => + is_page + +Statistics deletion : + None +""" + +class IWLAPreAnalysisPageToHit(IPlugin): + + def __init__(self, iwla): + super(IWLAPreAnalysisPageToHit, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + # Page to hit + self.ph_regexps = self.iwla.getConfValue('page_to_hit_conf', []) + if not self.ph_regexps: return False + self.ph_regexps = map(lambda(r): re.compile(r), self.ph_regexps) + + # Hit to page + self.hp_regexps = self.iwla.getConfValue('hit_to_page_conf', []) + if not self.hp_regexps: return False + self.hp_regexps = map(lambda(r): re.compile(r), self.hp_regexps) + + return True + + def hook(self): + hits = self.iwla.getCurrentVisists() + + for (k, super_hit) in hits.items(): + if super_hit['robot']: continue + + for request in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(request): + break + + if not self.iwla.hasBeenViewed(request): + continue + + uri = request['extract_request']['extract_uri'] + + if request['is_page']: + # Page to hit + for regexp in self.ph_regexps: + if regexp.match(uri): + #print '%s is a hit' % (uri ) + request['is_page'] = False + super_hit['viewed_pages'] -= 1 + super_hit['viewed_hits'] += 1 + break + else: + # Hit to page + for regexp in self.hp_regexps: + if regexp.match(uri): + #print '%s is a page' % (uri ) + request['is_page'] = True + super_hit['viewed_pages'] += 1 + super_hit['viewed_hits'] -= 1 + break diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py new file mode 100644 index 0000000..662ce57 --- /dev/null +++ b/plugins/pre_analysis/robots.py @@ -0,0 +1,113 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +""" +Pre analysis hook + +Filter robots + +Plugin requirements : + None + +Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + +Output files : + None + +Statistics creation : + None + +Statistics update : +visits : + remote_addr => + robot + +Statistics deletion : + None +""" + +class IWLAPreAnalysisRobots(IPlugin): + def __init__(self, iwla): + super(IWLAPreAnalysisRobots, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.awstats_robots = map(lambda (x) : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots) + + return True + +# Basic rule to detect robots + def hook(self): + hits = self.iwla.getCurrentVisists() + for (k, super_hit) in hits.items(): + if super_hit['robot']: continue + + isRobot = False + referers = 0 + + first_page = super_hit['requests'][0] + if not self.iwla.isValidForCurrentAnalysis(first_page): continue + + for r in self.awstats_robots: + if r.match(first_page['http_user_agent']): + isRobot = True + break + + if isRobot: + super_hit['robot'] = 1 + continue + +# 1) no pages view --> robot + # if not super_hit['viewed_pages']: + # super_hit['robot'] = 1 + # continue + +# 2) pages without hit --> robot + if not super_hit['viewed_hits']: + super_hit['robot'] = 1 + continue + + for hit in super_hit['requests']: +# 3) /robots.txt read + if hit['extract_request']['http_uri'] == '/robots.txt': + isRobot = True + break + +# 4) Any referer for hits + if not hit['is_page'] and hit['http_referer']: + referers += 1 + + if isRobot: + super_hit['robot'] = 1 + continue + + if not super_hit['viewed_pages'] and \ + (super_hit['viewed_hits'] and not referers): + super_hit['robot'] = 1 + continue diff --git a/resources/css/iwla.css b/resources/css/iwla.css new file mode 100644 index 0000000..71b652b --- /dev/null +++ b/resources/css/iwla.css @@ -0,0 +1,87 @@ + +body +{ + font: 11px verdana, arial, helvetica, sans-serif; + background-color: #FFFFFF; +} + +.iwla_block +{ + display:block; + margin: 2em; +} + +.iwla_block_title { + font: 13px verdana, arial, helvetica, sans-serif; + font-weight: bold; + background-color: #CCCCDD; + text-align: center; + color: #000000; + width: 60%; +} + +a +{ + font: 11px verdana, arial, helvetica, sans-serif; + font-weight: normal; + text-decoration: none; +} + +.iwla_block_value +{ + border-width : 0.2em; + border-color : #CCCCDD; + border-style : solid; +} + +/* .iwla_block_value table tr th */ +th +{ + padding : 0.5em; + background : #ECECEC; + font-weight: normal; + white-space: nowrap; +} + +td +{ + text-align:center; + vertical-align:middle; +} + +.iwla_td_img +{ + vertical-align:bottom; +} + +td:first-child +{ + text-align:left; + /* width : 100%; */ +} + +.iwla_visitor { background : #FFAA66; } +.iwla_visit { background : #F4F090; } +.iwla_page { background : #4477DD; } +.iwla_hit { background : #66DDEE; } +.iwla_bandwidth { background : #2EA495; } +.iwla_search { background : #F4F090; } +.iwla_weekend { background : #ECECEC; } +.iwla_curday { font-weight: bold; } +.iwla_others { color: #668; } +.iwla_graph_table +{ + margin-left:auto; + margin-right:auto; +} + +table.iwla_graph_table + table.iwla_table +{ + margin-left:auto; + margin-right:auto; +} + +table.iwla_graph_table td +{ + text-align:center; +} diff --git a/resources/icon/vh.png b/resources/icon/vh.png new file mode 100644 index 0000000000000000000000000000000000000000..13e52f9ef9a675349c93b1eeeef2ea1388a3bdc6 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLoTn9*sC$qb+%OS+@4BLl<6e(pbstU$hcfKP}k$FXyY=dL+De_#Fo z|D5mtTb{o!zV|%&+P$D-=M1;*WmvkFVagPNwQD^ta>oF*2za_UhE&{2P6#RUeIHW` Yw7Z?@X!#7GUZ5OmdKI;Vst0F_-zU;qFB literal 0 HcmV?d00001 diff --git a/resources/icon/vk.png b/resources/icon/vk.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1bc63b7f1b1566abc0986fc6a8d5f0c70aff44 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLoi7I;J!Gca&{0AWU_H6}BFf-LEdzK#qG8~eHcB(eheDgizrt_%%<3>{$%3kp@Y z&aq#;NN>qh;i}1Cxn#wzK_`}!@!=$ Vv?lgUttn8B!PC{xWt~$(695VHJjDP2 literal 0 HcmV?d00001 diff --git a/resources/icon/vp.png b/resources/icon/vp.png new file mode 100644 index 0000000000000000000000000000000000000000..8ebf70216123ac0fd386005e511f20f42be2d5ca GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp@K+MR(3?#p^TbckV{Sw!R66d1S#FEVXJcW?V+*F3F z)KWbKLo*8o|0J>k`33<#A+8)==M=V@SoV21sUuG2GF=Z-H zdhh`##981GS*8o|0J>k`RV~aA+DEChTJ%o^5SmQ z=V$Xizg_q8@#4pKXWYBqclm7diG6wdw)(G|<-c!TPZ!6Kid)GEA!WYr cV`^m>*!!5ylr{#t0p%DxUHx3vIVCg!0ItzYF#rGn literal 0 HcmV?d00001 diff --git a/robots.py b/robots.py deleted file mode 100644 index 8373f65..0000000 --- a/robots.py +++ /dev/null @@ -1,2 +0,0 @@ -awstats_robots = ['.*appie.*', '.*architext.*', '.*jeeves.*', '.*bjaaland.*', '.*contentmatch.*', '.*ferret.*', '.*googlebot.*', '.*google\-sitemaps.*', '.*gulliver.*', '.*virus[_+ ]detector.*', '.*harvest.*', '.*htdig.*', '.*linkwalker.*', '.*lilina.*', '.*lycos[_+ ].*', '.*moget.*', '.*muscatferret.*', '.*myweb.*', '.*nomad.*', '.*scooter.*', '.*slurp.*', '.*^voyager\/.*', '.*weblayers.*', '.*antibot.*', '.*bruinbot.*', '.*digout4u.*', '.*echo!.*', '.*fast\-webcrawler.*', '.*ia_archiver\-web\.archive\.org.*', '.*ia_archiver.*', '.*jennybot.*', '.*mercator.*', '.*netcraft.*', '.*msnbot\-media.*', '.*msnbot.*', '.*petersnews.*', '.*relevantnoise\.com.*', '.*unlost_web_crawler.*', '.*voila.*', '.*webbase.*', '.*webcollage.*', '.*cfetch.*', '.*zyborg.*', '.*wisenutbot.*', '.*[^a]fish.*', '.*abcdatos.*', '.*acme\.spider.*', '.*ahoythehomepagefinder.*', '.*alkaline.*', '.*anthill.*', '.*arachnophilia.*', '.*arale.*', '.*araneo.*', '.*aretha.*', '.*ariadne.*', '.*powermarks.*', '.*arks.*', '.*aspider.*', '.*atn\.txt.*', '.*atomz.*', '.*auresys.*', '.*backrub.*', '.*bbot.*', '.*bigbrother.*', '.*blackwidow.*', '.*blindekuh.*', '.*bloodhound.*', '.*borg\-bot.*', '.*brightnet.*', '.*bspider.*', '.*cactvschemistryspider.*', '.*calif[^r].*', '.*cassandra.*', '.*cgireader.*', '.*checkbot.*', '.*christcrawler.*', '.*churl.*', '.*cienciaficcion.*', '.*collective.*', '.*combine.*', '.*conceptbot.*', '.*coolbot.*', '.*core.*', '.*cosmos.*', '.*cruiser.*', '.*cusco.*', '.*cyberspyder.*', '.*desertrealm.*', '.*deweb.*', '.*dienstspider.*', '.*digger.*', '.*diibot.*', '.*direct_hit.*', '.*dnabot.*', '.*download_express.*', '.*dragonbot.*', '.*dwcp.*', '.*e\-collector.*', '.*ebiness.*', '.*elfinbot.*', '.*emacs.*', '.*emcspider.*', '.*esther.*', '.*evliyacelebi.*', '.*fastcrawler.*', '.*feedcrawl.*', '.*fdse.*', '.*felix.*', '.*fetchrover.*', '.*fido.*', '.*finnish.*', '.*fireball.*', '.*fouineur.*', '.*francoroute.*', '.*freecrawl.*', '.*funnelweb.*', '.*gama.*', '.*gazz.*', '.*gcreep.*', '.*getbot.*', '.*geturl.*', '.*golem.*', '.*gougou.*', '.*grapnel.*', '.*griffon.*', '.*gromit.*', '.*gulperbot.*', '.*hambot.*', '.*havindex.*', '.*hometown.*', '.*htmlgobble.*', '.*hyperdecontextualizer.*', '.*iajabot.*', '.*iaskspider.*', '.*hl_ftien_spider.*', '.*sogou.*', '.*iconoclast.*', '.*ilse.*', '.*imagelock.*', '.*incywincy.*', '.*informant.*', '.*infoseek.*', '.*infoseeksidewinder.*', '.*infospider.*', '.*inspectorwww.*', '.*intelliagent.*', '.*irobot.*', '.*iron33.*', '.*israelisearch.*', '.*javabee.*', '.*jbot.*', '.*jcrawler.*', '.*jobo.*', '.*jobot.*', '.*joebot.*', '.*jubii.*', '.*jumpstation.*', '.*kapsi.*', '.*katipo.*', '.*kilroy.*', '.*ko[_+ ]yappo[_+ ]robot.*', '.*kummhttp.*', '.*labelgrabber\.txt.*', '.*larbin.*', '.*legs.*', '.*linkidator.*', '.*linkscan.*', '.*lockon.*', '.*logo_gif.*', '.*macworm.*', '.*magpie.*', '.*marvin.*', '.*mattie.*', '.*mediafox.*', '.*merzscope.*', '.*meshexplorer.*', '.*mindcrawler.*', '.*mnogosearch.*', '.*momspider.*', '.*monster.*', '.*motor.*', '.*muncher.*', '.*mwdsearch.*', '.*ndspider.*', '.*nederland\.zoek.*', '.*netcarta.*', '.*netmechanic.*', '.*netscoop.*', '.*newscan\-online.*', '.*nhse.*', '.*northstar.*', '.*nzexplorer.*', '.*objectssearch.*', '.*occam.*', '.*octopus.*', '.*openfind.*', '.*orb_search.*', '.*packrat.*', '.*pageboy.*', '.*parasite.*', '.*patric.*', '.*pegasus.*', '.*perignator.*', '.*perlcrawler.*', '.*phantom.*', '.*phpdig.*', '.*piltdownman.*', '.*pimptrain.*', '.*pioneer.*', '.*pitkow.*', '.*pjspider.*', '.*plumtreewebaccessor.*', '.*poppi.*', '.*portalb.*', '.*psbot.*', '.*python.*', '.*raven.*', '.*rbse.*', '.*resumerobot.*', '.*rhcs.*', '.*road_runner.*', '.*robbie.*', '.*robi.*', '.*robocrawl.*', '.*robofox.*', '.*robozilla.*', '.*roverbot.*', '.*rules.*', '.*safetynetrobot.*', '.*search\-info.*', '.*search_au.*', '.*searchprocess.*', '.*senrigan.*', '.*sgscout.*', '.*shaggy.*', '.*shaihulud.*', '.*sift.*', '.*simbot.*', '.*site\-valet.*', '.*sitetech.*', '.*skymob.*', '.*slcrawler.*', '.*smartspider.*', '.*snooper.*', '.*solbot.*', '.*speedy.*', '.*spider[_+ ]monkey.*', '.*spiderbot.*', '.*spiderline.*', '.*spiderman.*', '.*spiderview.*', '.*spry.*', '.*sqworm.*', '.*ssearcher.*', '.*suke.*', '.*sunrise.*', '.*suntek.*', '.*sven.*', '.*tach_bw.*', '.*tagyu_agent.*', '.*tailrank.*', '.*tarantula.*', '.*tarspider.*', '.*techbot.*', '.*templeton.*', '.*titan.*', '.*titin.*', '.*tkwww.*', '.*tlspider.*', '.*ucsd.*', '.*udmsearch.*', '.*universalfeedparser.*', '.*urlck.*', '.*valkyrie.*', '.*verticrawl.*', '.*victoria.*', '.*visionsearch.*', '.*voidbot.*', '.*vwbot.*', '.*w3index.*', '.*w3m2.*', '.*wallpaper.*', '.*wanderer.*', '.*wapspIRLider.*', '.*webbandit.*', '.*webcatcher.*', '.*webcopy.*', '.*webfetcher.*', '.*webfoot.*', '.*webinator.*', '.*weblinker.*', '.*webmirror.*', '.*webmoose.*', '.*webquest.*', '.*webreader.*', '.*webreaper.*', '.*websnarf.*', '.*webspider.*', '.*webvac.*', '.*webwalk.*', '.*webwalker.*', '.*webwatch.*', '.*whatuseek.*', '.*whowhere.*', '.*wired\-digital.*', '.*wmir.*', '.*wolp.*', '.*wombat.*', '.*wordpress.*', '.*worm.*', '.*woozweb.*', '.*wwwc.*', '.*wz101.*', '.*xget.*', '.*1\-more_scanner.*', '.*accoona\-ai\-agent.*', '.*activebookmark.*', '.*adamm_bot.*', '.*almaden.*', '.*aipbot.*', '.*aleadsoftbot.*', '.*alpha_search_agent.*', '.*allrati.*', '.*aport.*', '.*archive\.org_bot.*', '.*argus.*', '.*arianna\.libero\.it.*', '.*aspseek.*', '.*asterias.*', '.*awbot.*', '.*baiduspider.*', '.*becomebot.*', '.*bender.*', '.*betabot.*', '.*biglotron.*', '.*bittorrent_bot.*', '.*biz360[_+ ]spider.*', '.*blogbridge[_+ ]service.*', '.*bloglines.*', '.*blogpulse.*', '.*blogsearch.*', '.*blogshares.*', '.*blogslive.*', '.*blogssay.*', '.*bncf\.firenze\.sbn\.it\/raccolta\.txt.*', '.*bobby.*', '.*boitho\.com\-dc.*', '.*bookmark\-manager.*', '.*boris.*', '.*bumblebee.*', '.*candlelight[_+ ]favorites[_+ ]inspector.*', '.*cbn00glebot.*', '.*cerberian_drtrs.*', '.*cfnetwork.*', '.*cipinetbot.*', '.*checkweb_link_validator.*', '.*commons\-httpclient.*', '.*computer_and_automation_research_institute_crawler.*', '.*converamultimediacrawler.*', '.*converacrawler.*', '.*cscrawler.*', '.*cse_html_validator_lite_online.*', '.*cuasarbot.*', '.*cursor.*', '.*custo.*', '.*datafountains\/dmoz_downloader.*', '.*daviesbot.*', '.*daypopbot.*', '.*deepindex.*', '.*dipsie\.bot.*', '.*dnsgroup.*', '.*domainchecker.*', '.*domainsdb\.net.*', '.*dulance.*', '.*dumbot.*', '.*dumm\.de\-bot.*', '.*earthcom\.info.*', '.*easydl.*', '.*edgeio\-retriever.*', '.*ets_v.*', '.*exactseek.*', '.*extreme[_+ ]picture[_+ ]finder.*', '.*eventax.*', '.*everbeecrawler.*', '.*everest\-vulcan.*', '.*ezresult.*', '.*enteprise.*', '.*facebook.*', '.*fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de.*', '.*fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de.*', '.*matrix_s\.p\.a\._\-_fast_enterprise_crawler.*', '.*fast_enterprise_crawler.*', '.*fast\-search\-engine.*', '.*favicon.*', '.*favorg.*', '.*favorites_sweeper.*', '.*feedburner.*', '.*feedfetcher\-google.*', '.*feedflow.*', '.*feedster.*', '.*feedsky.*', '.*feedvalidator.*', '.*filmkamerabot.*', '.*findlinks.*', '.*findexa_crawler.*', '.*fooky\.com\/ScorpionBot.*', '.*g2crawler.*', '.*gaisbot.*', '.*geniebot.*', '.*gigabot.*', '.*girafabot.*', '.*global_fetch.*', '.*gnodspider.*', '.*goforit\.com.*', '.*goforitbot.*', '.*gonzo.*', '.*grub.*', '.*gpu_p2p_crawler.*', '.*henrythemiragorobot.*', '.*heritrix.*', '.*holmes.*', '.*hoowwwer.*', '.*hpprint.*', '.*htmlparser.*', '.*html[_+ ]link[_+ ]validator.*', '.*httrack.*', '.*hundesuche\.com\-bot.*', '.*ichiro.*', '.*iltrovatore\-setaccio.*', '.*infobot.*', '.*infociousbot.*', '.*infomine.*', '.*insurancobot.*', '.*internet[_+ ]ninja.*', '.*internetarchive.*', '.*internetseer.*', '.*internetsupervision.*', '.*irlbot.*', '.*isearch2006.*', '.*iupui_research_bot.*', '.*jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility.*', '.*justview.*', '.*kalambot.*', '.*kamano\.de_newsfeedverzeichnis.*', '.*kazoombot.*', '.*kevin.*', '.*keyoshid.*', '.*kinjabot.*', '.*kinja\-imagebot.*', '.*knowitall.*', '.*knowledge\.com.*', '.*kouaa_krawler.*', '.*krugle.*', '.*ksibot.*', '.*kurzor.*', '.*lanshanbot.*', '.*letscrawl\.com.*', '.*libcrawl.*', '.*linkbot.*', '.*link_valet_online.*', '.*metager\-linkchecker.*', '.*linkchecker.*', '.*livejournal\.com.*', '.*lmspider.*', '.*lwp\-request.*', '.*lwp\-trivial.*', '.*magpierss.*', '.*mail\.ru.*', '.*mapoftheinternet\.com.*', '.*mediapartners\-google.*', '.*megite.*', '.*metaspinner.*', '.*microsoft[_+ ]url[_+ ]control.*', '.*mini\-reptile.*', '.*minirank.*', '.*missigua_locator.*', '.*misterbot.*', '.*miva.*', '.*mizzu_labs.*', '.*mj12bot.*', '.*mojeekbot.*', '.*msiecrawler.*', '.*ms_search_4\.0_robot.*', '.*msrabot.*', '.*msrbot.*', '.*mt::telegraph::agent.*', '.*nagios.*', '.*nasa_search.*', '.*mydoyouhike.*', '.*netluchs.*', '.*netsprint.*', '.*newsgatoronline.*', '.*nicebot.*', '.*nimblecrawler.*', '.*noxtrumbot.*', '.*npbot.*', '.*nutchcvs.*', '.*nutchosu\-vlib.*', '.*nutch.*', '.*ocelli.*', '.*octora_beta_bot.*', '.*omniexplorer[_+ ]bot.*', '.*onet\.pl[_+ ]sa.*', '.*onfolio.*', '.*opentaggerbot.*', '.*openwebspider.*', '.*oracle_ultra_search.*', '.*orbiter.*', '.*yodaobot.*', '.*qihoobot.*', '.*passwordmaker\.org.*', '.*pear_http_request_class.*', '.*peerbot.*', '.*perman.*', '.*php[_+ ]version[_+ ]tracker.*', '.*pictureofinternet.*', '.*ping\.blo\.gs.*', '.*plinki.*', '.*pluckfeedcrawler.*', '.*pogodak.*', '.*pompos.*', '.*popdexter.*', '.*port_huron_labs.*', '.*postfavorites.*', '.*projectwf\-java\-test\-crawler.*', '.*proodlebot.*', '.*pyquery.*', '.*rambler.*', '.*redalert.*', '.*rojo.*', '.*rssimagesbot.*', '.*ruffle.*', '.*rufusbot.*', '.*sandcrawler.*', '.*sbider.*', '.*schizozilla.*', '.*scumbot.*', '.*searchguild[_+ ]dmoz[_+ ]experiment.*', '.*seekbot.*', '.*sensis_web_crawler.*', '.*seznambot.*', '.*shim\-crawler.*', '.*shoutcast.*', '.*slysearch.*', '.*snap\.com_beta_crawler.*', '.*sohu\-search.*', '.*sohu.*', '.*snappy.*', '.*sphere_scout.*', '.*spip.*', '.*sproose_crawler.*', '.*steeler.*', '.*steroid__download.*', '.*suchfin\-bot.*', '.*superbot.*', '.*surveybot.*', '.*susie.*', '.*syndic8.*', '.*syndicapi.*', '.*synoobot.*', '.*tcl_http_client_package.*', '.*technoratibot.*', '.*teragramcrawlersurf.*', '.*test_crawler.*', '.*testbot.*', '.*t\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e.*', '.*topicblogs.*', '.*turnitinbot.*', '.*turtlescanner.*', '.*turtle.*', '.*tutorgigbot.*', '.*twiceler.*', '.*ubicrawler.*', '.*ultraseek.*', '.*unchaos_bot_hybrid_web_search_engine.*', '.*unido\-bot.*', '.*updated.*', '.*ustc\-semantic\-group.*', '.*vagabondo\-wap.*', '.*vagabondo.*', '.*vermut.*', '.*versus_crawler_from_eda\.baykan@epfl\.ch.*', '.*vespa_crawler.*', '.*vortex.*', '.*vse\/.*', '.*w3c\-checklink.*', '.*w3c[_+ ]css[_+ ]validator[_+ ]jfouffa.*', '.*w3c_validator.*', '.*watchmouse.*', '.*wavefire.*', '.*webclipping\.com.*', '.*webcompass.*', '.*webcrawl\.net.*', '.*web_downloader.*', '.*webdup.*', '.*webfilter.*', '.*webindexer.*', '.*webminer.*', '.*website[_+ ]monitoring[_+ ]bot.*', '.*webvulncrawl.*', '.*wells_search.*', '.*wonderer.*', '.*wume_crawler.*', '.*wwweasel.*', '.*xenu\'s_link_sleuth.*', '.*xenu_link_sleuth.*', '.*xirq.*', '.*y!j.*', '.*yacy.*', '.*yahoo\-blogs.*', '.*yahoo\-verticalcrawler.*', '.*yahoofeedseeker.*', '.*yahooseeker\-testing.*', '.*yahooseeker.*', '.*yahoo\-mmcrawler.*', '.*yahoo!_mindset.*', '.*yandex.*', '.*flexum.*', '.*yanga.*', '.*yooglifetchagent.*', '.*z\-add_link_checker.*', '.*zealbot.*', '.*zhuaxia.*', '.*zspider.*', '.*zeus.*', '.*ng\/1\..*', '.*ng\/2\..*', '.*exabot.*', '.*wget.*', '.*libwww.*', '.*java\/[0-9].*'] - diff --git a/tools/extract_doc.py b/tools/extract_doc.py new file mode 100755 index 0000000..eee534b --- /dev/null +++ b/tools/extract_doc.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python + +import sys + +filename = sys.argv[1] + +if filename.endswith('__init__.py'): + sys.exit(0) + +package_name = filename.replace('/', '.').replace('.py', '') +sys.stdout.write('%s' % (package_name)) +sys.stdout.write('\n') +# sys.stdout.write('\n\n') +sys.stdout.write('-' * len(package_name)) +sys.stdout.write('\n\n') + +sys.stderr.write('\tExtract doc from %s\n' % (filename)) + +with open(filename) as infile: + copy = False + for line in infile: + if line.strip() in ['"""', "'''"]: + if not copy: + copy = True + else: + break + elif copy: + sys.stdout.write(' %s' % (line)) + +sys.stdout.write('\n\n') diff --git a/tools/extract_docs.sh b/tools/extract_docs.sh new file mode 100755 index 0000000..e556330 --- /dev/null +++ b/tools/extract_docs.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +MODULES_TARGET="docs/modules.md" +MAIN_MD="docs/main.md" +TARGET_MD="docs/index.md" + +rm -f "${MODULES_TARGET}" + +echo "Generate doc from iwla.py" +python tools/extract_doc.py iwla.py > "${MODULES_TARGET}" + +echo "Generate plugins documentation" +find plugins -name '*.py' -exec python tools/extract_doc.py \{\} \; >> "${MODULES_TARGET}" + +echo "Generate ${TARGET_MD}" +cat "${MAIN_MD}" "${MODULES_TARGET}" > "${TARGET_MD}" diff --git a/tools/gettext.sh b/tools/gettext.sh new file mode 100755 index 0000000..81bafab --- /dev/null +++ b/tools/gettext.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +pygettext -a -d iwla -o iwla.pot -k gettext *.py plugins/pre_analysis/*.py plugins/post_analysis/*.py plugins/display/*.py diff --git a/tools/iwla_convert.pl b/tools/iwla_convert.pl new file mode 100755 index 0000000..b5c9587 --- /dev/null +++ b/tools/iwla_convert.pl @@ -0,0 +1,79 @@ +#!/usr/bin/perl + +my $awstats_lib_root = './'; +my @awstats_libs = ('search_engines.pm', 'robots.pm'); + +# my $awstats_lib_root = '/usr/share/awstats/lib/'; +# my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); + +foreach $lib (@awstats_libs) {require $awstats_lib_root . $lib;} + +sub dumpList { + my @list = @{$_[0]}; + my $FIC = $_[1]; + my $first = $_[2]; + + foreach $r (@list) + { + $r =~ s/\'/\\\'/g; + if ($first == 0) + { + print $FIC ", "; + } + else + { + $first = 0; + } + print $FIC "'$r'"; + } +} + +sub dumpHash { + my %hash = %{$_[0]}; + my $FIC = $_[1]; + my $first = $_[2]; + + while( my ($k,$v) = each(%hash) ) { + $k =~ s/\'/\\\'/g; + $v =~ s/\'/\\\'/g; + if ($first == 0) + { + print $FIC ", "; + } + else + { + $first = 0; + } + print $FIC "'$k' : '$v'"; + } +} + +# Robots +open($FIC,">", "awstats_data.py") or die $!; + +print $FIC "robots = ["; +dumpList(\@RobotsSearchIDOrder_list1, $FIC, 1); +dumpList(\@RobotsSearchIDOrder_list2, $FIC, 0); +print $FIC "]\n\n"; + +print $FIC "search_engines = ["; +dumpList(\@SearchEnginesSearchIDOrder_list1, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "search_engines_2 = ["; +dumpList(\@SearchEnginesSearchIDOrder_list2, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "not_search_engines_keys = {"; +dumpHash(\%NotSearchEnginesKeys, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "search_engines_hashid = {"; +dumpHash(\%SearchEnginesHashID, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "search_engines_knwown_url = {"; +dumpHash(\%SearchEnginesKnownUrl, $FIC, 1); +print $FIC "}\n\n"; + +close($FIC); From 9e837fbf6adf81c77b1b6b17566c062d085f11c0 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 21 Dec 2014 15:36:39 +0100 Subject: [PATCH 118/195] First version of referers_diff --- conf.py | 2 +- docs/index.md | 182 ++++++++++++++++++------------- docs/modules.md | 182 ++++++++++++++++++------------- plugins/display/referers.py | 2 +- plugins/display/referers_diff.py | 84 ++++++++++++++ resources/css/iwla.css | 4 + 6 files changed, 298 insertions(+), 158 deletions(-) create mode 100644 plugins/display/referers_diff.py diff --git a/conf.py b/conf.py index e26b953..fd015b5 100644 --- a/conf.py +++ b/conf.py @@ -12,7 +12,7 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits']#, 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits', 'referers_diff'] # Reverse DNS timeout reverse_dns_timeout = 0.2 diff --git a/docs/index.md b/docs/index.md index 1a3b36c..aa927c0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -175,34 +175,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -230,34 +202,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -289,20 +233,50 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- +plugins.display.top_downloads +----------------------------- Display hook - Create TOP visitors block + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - display_visitor_ip* + max_downloads_displayed* + create_all_downloads_page* Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -343,43 +317,41 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_visitors +---------------------------- - Post analysis hook + Display hook - Count TOP downloads + Create TOP visitors block Plugin requirements : None Conf values needed : - None + display_visitor_ip* Output files : - None + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.referers_diff +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - None + display/referers Conf values needed : None @@ -391,9 +363,7 @@ plugins.post_analysis.top_hits None Statistics update : - month_stats: - top_hits => - uri + None Statistics deletion : None @@ -465,6 +435,62 @@ plugins.post_analysis.reverse_dns None +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + plugins.post_analysis.top_pages ------------------------------- diff --git a/docs/modules.md b/docs/modules.md index 41167c3..f530620 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -83,34 +83,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -138,34 +110,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -197,20 +141,50 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- +plugins.display.top_downloads +----------------------------- Display hook - Create TOP visitors block + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - display_visitor_ip* + max_downloads_displayed* + create_all_downloads_page* Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -251,43 +225,41 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_visitors +---------------------------- - Post analysis hook + Display hook - Count TOP downloads + Create TOP visitors block Plugin requirements : None Conf values needed : - None + display_visitor_ip* Output files : - None + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.referers_diff +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - None + display/referers Conf values needed : None @@ -299,9 +271,7 @@ plugins.post_analysis.top_hits None Statistics update : - month_stats: - top_hits => - uri + None Statistics deletion : None @@ -373,6 +343,62 @@ plugins.post_analysis.reverse_dns None +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + plugins.post_analysis.top_pages ------------------------------- diff --git a/plugins/display/referers.py b/plugins/display/referers.py index bdd04a5..777dc8a 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -197,7 +197,7 @@ class IWLADisplayReferers(IPlugin): total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: diff --git a/plugins/display/referers_diff.py b/plugins/display/referers_diff.py new file mode 100644 index 0000000..ddfd91b --- /dev/null +++ b/plugins/display/referers_diff.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Enlight new and updated key phrases in in all_key_phrases.html + +Plugin requirements : + display/referers + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayReferersDiff(IPlugin): + def __init__(self, iwla): + super(IWLADisplayReferersDiff, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLADisplayReferers'] + + def load(self): + if not self.iwla.getConfValue('create_all_key_phrases_page', True): + return False + month_stats = self.iwla.getMonthStats() + self.cur_key_phrases = {k:v for (k,v) in month_stats.get('key_phrases', {})} + return True + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + + filename = 'key_phrases.html' + path = self.iwla.getCurDisplayPath(filename) + page = display.getPage(path) + if not page: return + title = self.iwla._(u'All key phrases') + referers_block = page.getBlock(title) + + kp_diff = {} + for (k, v) in month_stats['key_phrases'].items(): + new_value = self.cur_key_phrases.get(k, 0) + if new_value: + if new_value != v: + kp_diff[k] = 'iwla_update' + else: + kp_diff[k] = 'iwla_new' + + for (idx, row) in enumerate(referers_block.rows): + if row[0] in kp_diff.keys(): + referers_block.setCellCSSClass(idx, 0, kp_diff[row[0]]) diff --git a/resources/css/iwla.css b/resources/css/iwla.css index 71b652b..fe4d5ab 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -69,6 +69,9 @@ td:first-child .iwla_weekend { background : #ECECEC; } .iwla_curday { font-weight: bold; } .iwla_others { color: #668; } +.iwla_update { background : orange; } +.iwla_new { background : green } + .iwla_graph_table { margin-left:auto; @@ -85,3 +88,4 @@ table.iwla_graph_table td { text-align:center; } + From 87612fb7862833ccd622c04260fb89461457f6ca Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 22 Dec 2014 09:38:20 +0100 Subject: [PATCH 119/195] Page title not translated in key_phrases.html --- plugins/display/referers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 777dc8a..b7a14fb 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -190,7 +190,7 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = createCurTitle(self.iwla, u'Key Phrases') + title = createCurTitle(self.iwla, u'All Key Phrases') filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) From f24fcbf287aac554a98c128d3030d7f9dc33e69b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 28 Dec 2014 11:35:47 +0100 Subject: [PATCH 120/195] Bug fixes in referers_diff --- plugins/display/referers_diff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/display/referers_diff.py b/plugins/display/referers_diff.py index ddfd91b..f90c94d 100644 --- a/plugins/display/referers_diff.py +++ b/plugins/display/referers_diff.py @@ -56,7 +56,7 @@ class IWLADisplayReferersDiff(IPlugin): if not self.iwla.getConfValue('create_all_key_phrases_page', True): return False month_stats = self.iwla.getMonthStats() - self.cur_key_phrases = {k:v for (k,v) in month_stats.get('key_phrases', {})} + self.cur_key_phrases = {k:v for (k,v) in month_stats.get('key_phrases', {}).items()} return True def hook(self): @@ -67,7 +67,7 @@ class IWLADisplayReferersDiff(IPlugin): path = self.iwla.getCurDisplayPath(filename) page = display.getPage(path) if not page: return - title = self.iwla._(u'All key phrases') + title = self.iwla._(u'Key phrases') referers_block = page.getBlock(title) kp_diff = {} From b5bb7f72c986007faa296d0f4ce77a366d020d4a Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 28 Dec 2014 18:07:07 +0100 Subject: [PATCH 121/195] Add .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e03b74e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*~ +*.pyc +*.gz \ No newline at end of file From a38597314ca279c6c40980a9186585a9a5e4899e Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 28 Dec 2014 18:07:57 +0100 Subject: [PATCH 122/195] Add generic interface istats_diff --- plugins/display/istats_diff.py | 98 ++++++++++++++++++++++++++++++++ plugins/display/referers.py | 2 +- plugins/display/referers_diff.py | 35 ++---------- 3 files changed, 105 insertions(+), 30 deletions(-) create mode 100644 plugins/display/istats_diff.py diff --git a/plugins/display/istats_diff.py b/plugins/display/istats_diff.py new file mode 100644 index 0000000..897d2c4 --- /dev/null +++ b/plugins/display/istats_diff.py @@ -0,0 +1,98 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * +import logging + +""" +Display hook itnerface + +Enlight new and updated statistics + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayStatsDiff(IPlugin): + def __init__(self, iwla): + super(IWLADisplayStatsDiff, self).__init__(iwla) + self.API_VERSION = 1 + self.month_stats_key = None + # Set >= if month_stats[self.month_stats_key] is a list or a tuple + self.stats_index = -1 + self.filename = None + self.block_name = None + self.logger = logging.getLogger(__name__) + + def load(self): + if not self.month_stats_key or not self.filename or\ + not self.block_name: + self.logger('Bad parametrization') + return False + month_stats = self.iwla.getMonthStats() + self.cur_stats = {k:v for (k,v) in month_stats.get(self.month_stats_key, {}).items()} + return True + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + + path = self.iwla.getCurDisplayPath(self.filename) + page = display.getPage(path) + if not page: return + title = self.iwla._(self.block_name) + block = page.getBlock(title) + if not block: + self.logger.error('Block %s not found' % (title)) + return + + stats_diff = {} + for (k, v) in month_stats[self.month_stats_key].items(): + new_value = self.cur_stats.get(k, 0) + if new_value: + if self.stats_index != -1: + if new_value[self.stats_index] != v[self.stats_index]: + stats_diff[k] = 'iwla_update' + else: + if new_value != v: + stats_diff[k] = 'iwla_update' + else: + stats_diff[k] = 'iwla_new' + + for (idx, row) in enumerate(block.rows): + if row[0] in stats_diff.keys(): + block.setCellCSSClass(idx, 0, stats_diff[row[0]]) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index b7a14fb..1c4847a 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -197,7 +197,7 @@ class IWLADisplayReferers(IPlugin): total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: diff --git a/plugins/display/referers_diff.py b/plugins/display/referers_diff.py index f90c94d..8e63ecb 100644 --- a/plugins/display/referers_diff.py +++ b/plugins/display/referers_diff.py @@ -19,7 +19,7 @@ # from iwla import IWLA -from iplugin import IPlugin +from istats_diff import IWLADisplayStatsDiff from display import * """ @@ -46,39 +46,16 @@ Statistics deletion : None """ -class IWLADisplayReferersDiff(IPlugin): +class IWLADisplayReferersDiff(IWLADisplayStatsDiff): def __init__(self, iwla): super(IWLADisplayReferersDiff, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLADisplayReferers'] + self.month_stats_key = 'key_phrases' + self.filename = 'key_phrases.html' + self.block_name = u'Key phrases' def load(self): if not self.iwla.getConfValue('create_all_key_phrases_page', True): return False - month_stats = self.iwla.getMonthStats() - self.cur_key_phrases = {k:v for (k,v) in month_stats.get('key_phrases', {}).items()} - return True - - def hook(self): - display = self.iwla.getDisplay() - month_stats = self.iwla.getMonthStats() - - filename = 'key_phrases.html' - path = self.iwla.getCurDisplayPath(filename) - page = display.getPage(path) - if not page: return - title = self.iwla._(u'Key phrases') - referers_block = page.getBlock(title) - - kp_diff = {} - for (k, v) in month_stats['key_phrases'].items(): - new_value = self.cur_key_phrases.get(k, 0) - if new_value: - if new_value != v: - kp_diff[k] = 'iwla_update' - else: - kp_diff[k] = 'iwla_new' - - for (idx, row) in enumerate(referers_block.rows): - if row[0] in kp_diff.keys(): - referers_block.setCellCSSClass(idx, 0, kp_diff[row[0]]) + return super(IWLADisplayReferersDiff, self).load() From 1d894b6bc02eae1f5dd44544ad5e908aa8739c11 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 28 Dec 2014 18:58:25 +0100 Subject: [PATCH 123/195] Forgot body tag --- display.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/display.py b/display.py index cb98693..7982028 100644 --- a/display.py +++ b/display.py @@ -305,7 +305,7 @@ class DisplayHTMLPage(object): f.write(u'' % (css)) if self.title: f.write(u'%s' % (self.title)) - f.write(u'') + f.write(u'') for block in self.blocks: block.build(f) f.write(u'
Generated by IWLA %s
' % From ac211e30ea8366c68ecf7c0b9906aa764b652d5d Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 29 Dec 2014 19:12:41 +0100 Subject: [PATCH 124/195] Add year statistics in month details --- display.py | 10 +++++++--- iwla.py | 16 ++++++++++++++++ resources/css/iwla.css | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/display.py b/display.py index 7982028..16c4593 100644 --- a/display.py +++ b/display.py @@ -52,6 +52,9 @@ class DisplayHTMLRaw(object): self._buildHTML() self._build(f, self.html) + def getTitle(self): + return '' + class DisplayHTMLBlock(DisplayHTMLRaw): def __init__(self, iwla, title=''): @@ -287,7 +290,7 @@ class DisplayHTMLPage(object): def appendBlock(self, block): self.blocks.append(block) - def build(self, root): + def build(self, root, displayVersion=True): filename = os.path.join(root, self.filename) base = os.path.dirname(filename) @@ -308,8 +311,9 @@ class DisplayHTMLPage(object): f.write(u'') for block in self.blocks: block.build(f) - f.write(u'
Generated by IWLA %s
' % - ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) + if displayVersion: + f.write(u'
Generated by IWLA %s
' % + ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) f.write(u'') f.close() diff --git a/iwla.py b/iwla.py index 0c0f331..3f50bac 100755 --- a/iwla.py +++ b/iwla.py @@ -59,6 +59,7 @@ Output files : DB_ROOT/meta.db DB_ROOT/year/month/iwla.db OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/_stats.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -371,6 +372,8 @@ class IWLA(object): filename = self.getCurDisplayPath('index.html') self.logger.info('==> Generate display (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) + link = DisplayHTMLRaw(self, '') + page.appendBlock(link) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, self._('By day'), [self._('Day'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) @@ -430,6 +433,8 @@ class IWLA(object): graph_cols=range(1,7) months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) + months_ = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols[:-1], None, 12, graph_cols[:-1]) + months_.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) total = [0] * len(cols) for i in range(1, 13): month = '%s
%d' % (months_name[i], year) @@ -447,11 +452,16 @@ class IWLA(object): months.setCellValue(i-1, 5, bytesToStr(row[5])) months.setCellValue(i-1, 6, bytesToStr(row[6])) months.appendShortTitle(month) + months_.appendRow(row[:-1]) + months_.setCellValue(i-1, 5, bytesToStr(row[5])) + months_.setCellValue(i-1, 6, bytesToStr(row[6])) + months_.appendShortTitle(month) if year == cur_time.tm_year and i == cur_time.tm_mon: css = months.getCellCSSClass(i-1, 0) if css: css = '%s %s' % (css, 'iwla_curday') else: css = 'iwla_curday' months.setCellCSSClass(i-1, 0, css) + months_.setCellCSSClass(i-1, 0, css) total[0] = self._('Total') total[5] = bytesToStr(total[5]) @@ -460,6 +470,12 @@ class IWLA(object): months.appendRow(total) page.appendBlock(months) + months_.appendRow(total[:-1]) + filename = '%d/_stats.html' % (year) + page_ = self.display.createPage(u'', filename, conf.css_path) + page_.appendBlock(months_) + page_.build(conf.DISPLAY_ROOT, False) + def _generateDisplayWholeMonthStats(self): title = '%s %s' % (self._('Statistics for'), conf.domain_name) filename = 'index.html' diff --git a/resources/css/iwla.css b/resources/css/iwla.css index fe4d5ab..add0e57 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -89,3 +89,4 @@ table.iwla_graph_table td text-align:center; } +iframe {outline:none; border:0px; width:100%; height:500px; display:block;} \ No newline at end of file From d2d37d9c90fac89a564ff15bb1c25bac8fb09f33 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 19 Nov 2014 08:01:12 +0100 Subject: [PATCH 125/195] Initial commit --- conf.py | 2 +- docs/index.md | 182 ++++++++++++++++-------------------- docs/modules.md | 182 ++++++++++++++++-------------------- plugins/display/referers.py | 4 +- resources/css/iwla.css | 5 - 5 files changed, 159 insertions(+), 216 deletions(-) diff --git a/conf.py b/conf.py index fd015b5..e26b953 100644 --- a/conf.py +++ b/conf.py @@ -12,7 +12,7 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits']#, 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits', 'referers_diff'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] # Reverse DNS timeout reverse_dns_timeout = 0.2 diff --git a/docs/index.md b/docs/index.md index aa927c0..1a3b36c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -175,6 +175,34 @@ iwla None +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.all_visits -------------------------- @@ -202,6 +230,34 @@ plugins.display.all_visits None +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.referers ------------------------ @@ -233,50 +289,20 @@ plugins.display.referers None -plugins.display.top_downloads ------------------------------ +plugins.display.top_visitors +---------------------------- Display hook - Create TOP downloads page + Create TOP visitors block Plugin requirements : - post_analysis/top_downloads + None Conf values needed : - max_downloads_displayed* - create_all_downloads_page* + display_visitor_ip* Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -317,41 +343,43 @@ plugins.display.top_pages None -plugins.display.top_visitors ----------------------------- +plugins.post_analysis.top_downloads +----------------------------------- - Display hook + Post analysis hook - Create TOP visitors block + Count TOP downloads Plugin requirements : None Conf values needed : - display_visitor_ip* + None Output files : - OUTPUT_ROOT/year/month/index.html + None Statistics creation : None Statistics update : - None + month_stats: + top_downloads => + uri Statistics deletion : None -plugins.display.referers_diff ------------------------------ +plugins.post_analysis.top_hits +------------------------------ - Display hook + Post analysis hook - Enlight new and updated key phrases in in all_key_phrases.html + Count TOP hits Plugin requirements : - display/referers + None Conf values needed : None @@ -363,7 +391,9 @@ plugins.display.referers_diff None Statistics update : - None + month_stats: + top_hits => + uri Statistics deletion : None @@ -435,62 +465,6 @@ plugins.post_analysis.reverse_dns None -plugins.post_analysis.top_downloads ------------------------------------ - - Post analysis hook - - Count TOP downloads - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_downloads => - uri - - Statistics deletion : - None - - -plugins.post_analysis.top_hits ------------------------------- - - Post analysis hook - - Count TOP hits - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : - None - - plugins.post_analysis.top_pages ------------------------------- diff --git a/docs/modules.md b/docs/modules.md index f530620..41167c3 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -83,6 +83,34 @@ iwla None +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.all_visits -------------------------- @@ -110,6 +138,34 @@ plugins.display.all_visits None +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.referers ------------------------ @@ -141,50 +197,20 @@ plugins.display.referers None -plugins.display.top_downloads ------------------------------ +plugins.display.top_visitors +---------------------------- Display hook - Create TOP downloads page + Create TOP visitors block Plugin requirements : - post_analysis/top_downloads + None Conf values needed : - max_downloads_displayed* - create_all_downloads_page* + display_visitor_ip* Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -225,41 +251,43 @@ plugins.display.top_pages None -plugins.display.top_visitors ----------------------------- +plugins.post_analysis.top_downloads +----------------------------------- - Display hook + Post analysis hook - Create TOP visitors block + Count TOP downloads Plugin requirements : None Conf values needed : - display_visitor_ip* + None Output files : - OUTPUT_ROOT/year/month/index.html + None Statistics creation : None Statistics update : - None + month_stats: + top_downloads => + uri Statistics deletion : None -plugins.display.referers_diff ------------------------------ +plugins.post_analysis.top_hits +------------------------------ - Display hook + Post analysis hook - Enlight new and updated key phrases in in all_key_phrases.html + Count TOP hits Plugin requirements : - display/referers + None Conf values needed : None @@ -271,7 +299,9 @@ plugins.display.referers_diff None Statistics update : - None + month_stats: + top_hits => + uri Statistics deletion : None @@ -343,62 +373,6 @@ plugins.post_analysis.reverse_dns None -plugins.post_analysis.top_downloads ------------------------------------ - - Post analysis hook - - Count TOP downloads - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_downloads => - uri - - Statistics deletion : - None - - -plugins.post_analysis.top_hits ------------------------------- - - Post analysis hook - - Count TOP hits - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : - None - - plugins.post_analysis.top_pages ------------------------------- diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 1c4847a..bdd04a5 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -190,14 +190,14 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = createCurTitle(self.iwla, u'All Key Phrases') + title = createCurTitle(self.iwla, u'Key Phrases') filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: diff --git a/resources/css/iwla.css b/resources/css/iwla.css index add0e57..71b652b 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -69,9 +69,6 @@ td:first-child .iwla_weekend { background : #ECECEC; } .iwla_curday { font-weight: bold; } .iwla_others { color: #668; } -.iwla_update { background : orange; } -.iwla_new { background : green } - .iwla_graph_table { margin-left:auto; @@ -88,5 +85,3 @@ table.iwla_graph_table td { text-align:center; } - -iframe {outline:none; border:0px; width:100%; height:500px; display:block;} \ No newline at end of file From 3dd4ddfaedc5c0b0437617d66308b58b37efdde1 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 23 Dec 2014 09:18:30 +0100 Subject: [PATCH 126/195] Update doc --- docs/index.md | 352 ++++++++++++++++++++++++------------------------ docs/main.md | 14 +- docs/modules.md | 338 +++++++++++++++++++++++----------------------- 3 files changed, 352 insertions(+), 352 deletions(-) diff --git a/docs/index.md b/docs/index.md index 1a3b36c..9fa98a3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). @@ -32,25 +32,25 @@ Main values to edit are : * **display_hooks** : List of display hooks * **locale** : Displayed locale (_en_ or _fr_) -Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type +Then, you can launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it, go into _output_ and type python -m SimpleHTTPServer 8000 Open your favorite web browser at _http://localhost:8000_. Enjoy ! -**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. +**Warning** : The order in hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. Interesting default configuration values ---------------------------------------- * **DB_ROOT** : Default database directory (default ./output_db) - * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **DISPLAY_ROOT** : Default HTML output directory (default _./output_) * **log_format** : Web server log format (nginx style). Default is apache log format * **time_format** : Time format used in log format * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) - * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **count_hit_only_visitors** : If False, don't count visitors that doesn't GET a page but resources only (images, rss...) * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) * **css_path** : CSS path (you can add yours) * **compress_output_files** : Files extensions to compress in gzip during display build @@ -64,7 +64,7 @@ As previously described, plugins acts like UNIX pipes : statistics are constantl * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms * **Display plugins** : They are in charge to produce HTML files from statistics. -To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. +To use plugins, just insert their file name (without _.py_ extension) in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. Statistics are stored in dictionaries : @@ -77,7 +77,7 @@ Statistics are stored in dictionaries : Create a Plugins ---------------- -To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). +To create a new plugin, it's necessary to subclass IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). @@ -175,34 +175,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -230,34 +202,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -343,151 +287,57 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_hits +------------------------ - Post analysis hook + Display hook - Count TOP downloads + Create TOP hits page Plugin requirements : - None + post_analysis/top_hits Conf values needed : - None + max_hits_displayed* + create_all_hits_page* Output files : - None + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.top_downloads +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - None + max_downloads_displayed* + create_all_downloads_page* Output files : - None + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : None - - -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages - hits - robots_referers => - pages - hits - search_engine_referers => - pages - hits - key_phrases => - phrase - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - -plugins.post_analysis.top_pages -------------------------------- - - Post analysis hook - - Count TOP pages - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_pages => - uri Statistics deletion : None @@ -550,3 +400,153 @@ plugins.pre_analysis.robots None +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + diff --git a/docs/main.md b/docs/main.md index 0b5b16e..7df8333 100644 --- a/docs/main.md +++ b/docs/main.md @@ -4,7 +4,7 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has be though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filters : modify statistics until final result. It's written in Python. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). @@ -32,25 +32,25 @@ Main values to edit are : * **display_hooks** : List of display hooks * **locale** : Displayed locale (_en_ or _fr_) -Then, you can then iwla. Output HTML files are created in _output_ directory by default. To quickly see it go in output and type +Then, you can launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it, go into _output_ and type python -m SimpleHTTPServer 8000 Open your favorite web browser at _http://localhost:8000_. Enjoy ! -**Warning** : The order is hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. +**Warning** : The order in hooks list is important : Some plugins may requires others plugins, and the order of display_hooks is the order of displayed blocks in final result. Interesting default configuration values ---------------------------------------- * **DB_ROOT** : Default database directory (default ./output_db) - * **DISPLAY_ROOT** : Default HTML output directory (default ./output) + * **DISPLAY_ROOT** : Default HTML output directory (default _./output_) * **log_format** : Web server log format (nginx style). Default is apache log format * **time_format** : Time format used in log format * **pages_extensions** : Extensions that are considered as a HTML page (or result) in opposit to hits * **viewed_http_codes** : HTTP codes that are cosidered OK (200, 304) - * **count_hit_only_visitors** : If False, doesn't cout visitors that doesn't GET a page but resources only (images, rss...) + * **count_hit_only_visitors** : If False, don't count visitors that doesn't GET a page but resources only (images, rss...) * **multimedia_files** : Multimedia extensions (not accounted as downloaded files) * **css_path** : CSS path (you can add yours) * **compress_output_files** : Files extensions to compress in gzip during display build @@ -64,7 +64,7 @@ As previously described, plugins acts like UNIX pipes : statistics are constantl * **Post analysis plugins** : Called after basic statistics computation. They are in charge to enlight them with their own algorithms * **Display plugins** : They are in charge to produce HTML files from statistics. -To use plugins, just insert their name in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. +To use plugins, just insert their file name (without _.py_ extension) in _pre_analysis_hooks_, _post_analysis_hooks_ and _display_hooks_ lists in conf.py. Statistics are stored in dictionaries : @@ -77,7 +77,7 @@ Statistics are stored in dictionaries : Create a Plugins ---------------- -To create a new plugin, it's necessary to create a derived class of IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). +To create a new plugin, it's necessary to subclass IPlugin (_iplugin.py) in the right directory (_plugins/xxx/yourPlugin.py_). Plugins can defines required configuration values (self.conf_requires) that must be set in conf.py (or can be optional). They can also defines required plugins (self.requires). diff --git a/docs/modules.md b/docs/modules.md index 41167c3..5067afb 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -83,34 +83,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -138,34 +110,6 @@ plugins.display.all_visits None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.referers ------------------------ @@ -251,151 +195,57 @@ plugins.display.top_pages None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.display.top_hits +------------------------ - Post analysis hook + Display hook - Count TOP downloads + Create TOP hits page Plugin requirements : - None + post_analysis/top_hits Conf values needed : - None + max_hits_displayed* + create_all_hits_page* Output files : - None + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_downloads => - uri + None Statistics deletion : None -plugins.post_analysis.top_hits ------------------------------- +plugins.display.top_downloads +----------------------------- - Post analysis hook + Display hook - Count TOP hits + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - None + max_downloads_displayed* + create_all_downloads_page* Output files : - None + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : None - - -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages - hits - robots_referers => - pages - hits - search_engine_referers => - pages - hits - key_phrases => - phrase - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - -plugins.post_analysis.top_pages -------------------------------- - - Post analysis hook - - Count TOP pages - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_pages => - uri Statistics deletion : None @@ -458,3 +308,153 @@ plugins.pre_analysis.robots None +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + From 5ed9bbbae8d7b5287ce6b02112fa1c443a2cb780 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 11:24:01 +0100 Subject: [PATCH 127/195] Add ChangeLog --- ChangeLog | 10 ++++++++++ iwla.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..47cd19c --- /dev/null +++ b/ChangeLog @@ -0,0 +1,10 @@ +v0.2 (31/12/2014) +** User ** + Add referers_diff display plugin + Add year statistics in month details + +** Dev ** + Add istats_diff interface + +** Bugs ** + Forgot tag diff --git a/iwla.py b/iwla.py index 3f50bac..0e56c96 100755 --- a/iwla.py +++ b/iwla.py @@ -130,7 +130,7 @@ class IWLA(object): ANALYSIS_CLASS = 'HTTP' API_VERSION = 1 - IWLA_VERSION = '0.1' + IWLA_VERSION = '0.2' def __init__(self, logLevel): self.meta_infos = {} From 8299a7d785c09ba1b668d96704f2bcef410014d4 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 14:09:12 +0100 Subject: [PATCH 128/195] Update doc --- docs/index.md | 209 ++++++++++++++++++++++++------------------- docs/modules.md | 209 ++++++++++++++++++++++++------------------- iwla.py | 2 +- tools/extract_doc.py | 7 ++ 4 files changed, 244 insertions(+), 183 deletions(-) diff --git a/docs/index.md b/docs/index.md index 9fa98a3..2ed12ff 100644 --- a/docs/index.md +++ b/docs/index.md @@ -110,6 +110,7 @@ iwla DB_ROOT/meta.db DB_ROOT/year/month/iwla.db OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/_stats.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -175,6 +176,32 @@ iwla None +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.all_visits -------------------------- @@ -233,32 +260,6 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- - - Display hook - - Create TOP visitors block - - Plugin requirements : - None - - Conf values needed : - display_visitor_ip* - - Output files : - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.top_pages ------------------------- @@ -287,34 +288,6 @@ plugins.display.top_pages None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.top_downloads ----------------------------- @@ -343,47 +316,46 @@ plugins.display.top_downloads None -plugins.pre_analysis.page_to_hit --------------------------------- +plugins.display.top_hits +------------------------ - Pre analysis hook - Change page into hit and hit into page into statistics + Display hook + + Create TOP hits page Plugin requirements : - None + post_analysis/top_hits Conf values needed : - page_to_hit_conf* - hit_to_page_conf* + max_hits_displayed* + create_all_hits_page* Output files : - None + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - visits : - remote_addr => - is_page + None Statistics deletion : None -plugins.pre_analysis.robots ---------------------------- +plugins.display.referers_diff +----------------------------- - Pre analysis hook + Display hook - Filter robots + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - None + display/referers Conf values needed : - page_to_hit_conf* - hit_to_page_conf* + None Output files : None @@ -392,9 +364,36 @@ plugins.pre_analysis.robots None Statistics update : - visits : - remote_addr => - robot + None + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed Statistics deletion : None @@ -465,18 +464,18 @@ plugins.post_analysis.top_pages None -plugins.post_analysis.reverse_dns ---------------------------------- +plugins.post_analysis.top_downloads +----------------------------------- Post analysis hook - Replace IP by reverse DNS names + Count TOP downloads Plugin requirements : None Conf values needed : - reverse_dns_timeout* + None Output files : None @@ -485,10 +484,9 @@ plugins.post_analysis.reverse_dns None Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed + month_stats: + top_downloads => + uri Statistics deletion : None @@ -522,18 +520,19 @@ plugins.post_analysis.top_hits None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.pre_analysis.robots +--------------------------- - Post analysis hook + Pre analysis hook - Count TOP downloads + Filter robots Plugin requirements : None Conf values needed : - None + page_to_hit_conf* + hit_to_page_conf* Output files : None @@ -542,9 +541,37 @@ plugins.post_analysis.top_downloads None Statistics update : - month_stats: - top_downloads => - uri + visits : + remote_addr => + robot + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page Statistics deletion : None diff --git a/docs/modules.md b/docs/modules.md index 5067afb..2a028ee 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -18,6 +18,7 @@ iwla DB_ROOT/meta.db DB_ROOT/year/month/iwla.db OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/_stats.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -83,6 +84,32 @@ iwla None +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.all_visits -------------------------- @@ -141,32 +168,6 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- - - Display hook - - Create TOP visitors block - - Plugin requirements : - None - - Conf values needed : - display_visitor_ip* - - Output files : - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.top_pages ------------------------- @@ -195,34 +196,6 @@ plugins.display.top_pages None -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.top_downloads ----------------------------- @@ -251,47 +224,46 @@ plugins.display.top_downloads None -plugins.pre_analysis.page_to_hit --------------------------------- +plugins.display.top_hits +------------------------ - Pre analysis hook - Change page into hit and hit into page into statistics + Display hook + + Create TOP hits page Plugin requirements : - None + post_analysis/top_hits Conf values needed : - page_to_hit_conf* - hit_to_page_conf* + max_hits_displayed* + create_all_hits_page* Output files : - None + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html Statistics creation : None Statistics update : - visits : - remote_addr => - is_page + None Statistics deletion : None -plugins.pre_analysis.robots ---------------------------- +plugins.display.referers_diff +----------------------------- - Pre analysis hook + Display hook - Filter robots + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - None + display/referers Conf values needed : - page_to_hit_conf* - hit_to_page_conf* + None Output files : None @@ -300,9 +272,36 @@ plugins.pre_analysis.robots None Statistics update : - visits : - remote_addr => - robot + None + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed Statistics deletion : None @@ -373,18 +372,18 @@ plugins.post_analysis.top_pages None -plugins.post_analysis.reverse_dns ---------------------------------- +plugins.post_analysis.top_downloads +----------------------------------- Post analysis hook - Replace IP by reverse DNS names + Count TOP downloads Plugin requirements : None Conf values needed : - reverse_dns_timeout* + None Output files : None @@ -393,10 +392,9 @@ plugins.post_analysis.reverse_dns None Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed + month_stats: + top_downloads => + uri Statistics deletion : None @@ -430,18 +428,19 @@ plugins.post_analysis.top_hits None -plugins.post_analysis.top_downloads ------------------------------------ +plugins.pre_analysis.robots +--------------------------- - Post analysis hook + Pre analysis hook - Count TOP downloads + Filter robots Plugin requirements : None Conf values needed : - None + page_to_hit_conf* + hit_to_page_conf* Output files : None @@ -450,9 +449,37 @@ plugins.post_analysis.top_downloads None Statistics update : - month_stats: - top_downloads => - uri + visits : + remote_addr => + robot + + Statistics deletion : + None + + +plugins.pre_analysis.page_to_hit +-------------------------------- + + Pre analysis hook + Change page into hit and hit into page into statistics + + Plugin requirements : + None + + Conf values needed : + page_to_hit_conf* + hit_to_page_conf* + + Output files : + None + + Statistics creation : + None + + Statistics update : + visits : + remote_addr => + is_page Statistics deletion : None diff --git a/iwla.py b/iwla.py index 0e56c96..493ab19 100755 --- a/iwla.py +++ b/iwla.py @@ -130,7 +130,7 @@ class IWLA(object): ANALYSIS_CLASS = 'HTTP' API_VERSION = 1 - IWLA_VERSION = '0.2' + IWLA_VERSION = '0.2-dev' def __init__(self, logLevel): self.meta_infos = {} diff --git a/tools/extract_doc.py b/tools/extract_doc.py index eee534b..46220eb 100755 --- a/tools/extract_doc.py +++ b/tools/extract_doc.py @@ -2,11 +2,18 @@ import sys +excludes = ['istats_diff.py'] + filename = sys.argv[1] if filename.endswith('__init__.py'): sys.exit(0) +for e in excludes: + if filename.endswith(e): + sys.stderr.write('\tSkip %s\n' % (filename)) + sys.exit(0) + package_name = filename.replace('/', '.').replace('.py', '') sys.stdout.write('%s' % (package_name)) sys.stdout.write('\n') From f1fb8cb674e5cb0931f79a051cc35df415d5daab Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 14:22:46 +0100 Subject: [PATCH 129/195] Merge with origin:dev --- .gitignore | 3 + ChangeLog | 10 ++++ conf.py | 2 +- display.py | 12 ++-- iwla.py | 18 +++++- plugins/display/istats_diff.py | 98 ++++++++++++++++++++++++++++++++ plugins/display/referers.py | 4 +- plugins/display/referers_diff.py | 35 ++---------- resources/css/iwla.css | 5 ++ tools/extract_doc.py | 7 +++ 10 files changed, 157 insertions(+), 37 deletions(-) create mode 100644 .gitignore create mode 100644 ChangeLog create mode 100644 plugins/display/istats_diff.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e03b74e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*~ +*.pyc +*.gz \ No newline at end of file diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..47cd19c --- /dev/null +++ b/ChangeLog @@ -0,0 +1,10 @@ +v0.2 (31/12/2014) +** User ** + Add referers_diff display plugin + Add year statistics in month details + +** Dev ** + Add istats_diff interface + +** Bugs ** + Forgot tag diff --git a/conf.py b/conf.py index db32eef..71f89a3 100644 --- a/conf.py +++ b/conf.py @@ -19,7 +19,7 @@ reverse_dns_timeout = 0.2 # Count this addresses as hit page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page -hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$'] # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 diff --git a/display.py b/display.py index cb98693..16c4593 100644 --- a/display.py +++ b/display.py @@ -52,6 +52,9 @@ class DisplayHTMLRaw(object): self._buildHTML() self._build(f, self.html) + def getTitle(self): + return '' + class DisplayHTMLBlock(DisplayHTMLRaw): def __init__(self, iwla, title=''): @@ -287,7 +290,7 @@ class DisplayHTMLPage(object): def appendBlock(self, block): self.blocks.append(block) - def build(self, root): + def build(self, root, displayVersion=True): filename = os.path.join(root, self.filename) base = os.path.dirname(filename) @@ -305,11 +308,12 @@ class DisplayHTMLPage(object): f.write(u'' % (css)) if self.title: f.write(u'%s' % (self.title)) - f.write(u'') + f.write(u'') for block in self.blocks: block.build(f) - f.write(u'
Generated by IWLA %s
' % - ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) + if displayVersion: + f.write(u'
Generated by IWLA %s
' % + ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) f.write(u'') f.close() diff --git a/iwla.py b/iwla.py index 0c0f331..493ab19 100755 --- a/iwla.py +++ b/iwla.py @@ -59,6 +59,7 @@ Output files : DB_ROOT/meta.db DB_ROOT/year/month/iwla.db OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/_stats.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -129,7 +130,7 @@ class IWLA(object): ANALYSIS_CLASS = 'HTTP' API_VERSION = 1 - IWLA_VERSION = '0.1' + IWLA_VERSION = '0.2-dev' def __init__(self, logLevel): self.meta_infos = {} @@ -371,6 +372,8 @@ class IWLA(object): filename = self.getCurDisplayPath('index.html') self.logger.info('==> Generate display (%s)' % (filename)) page = self.display.createPage(title, filename, conf.css_path) + link = DisplayHTMLRaw(self, '') + page.appendBlock(link) _, nb_month_days = monthrange(cur_time.tm_year, cur_time.tm_mon) days = self.display.createBlock(DisplayHTMLBlockTableWithGraph, self._('By day'), [self._('Day'), self._('Visits'), self._('Pages'), self._('Hits'), self._('Bandwidth'), self._('Not viewed Bandwidth')], None, nb_month_days, range(1,6)) @@ -430,6 +433,8 @@ class IWLA(object): graph_cols=range(1,7) months = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols, None, 12, graph_cols) months.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth', '']) + months_ = self.display.createBlock(DisplayHTMLBlockTableWithGraph, title, cols[:-1], None, 12, graph_cols[:-1]) + months_.setColsCSSClass(['', 'iwla_visitor', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) total = [0] * len(cols) for i in range(1, 13): month = '%s
%d' % (months_name[i], year) @@ -447,11 +452,16 @@ class IWLA(object): months.setCellValue(i-1, 5, bytesToStr(row[5])) months.setCellValue(i-1, 6, bytesToStr(row[6])) months.appendShortTitle(month) + months_.appendRow(row[:-1]) + months_.setCellValue(i-1, 5, bytesToStr(row[5])) + months_.setCellValue(i-1, 6, bytesToStr(row[6])) + months_.appendShortTitle(month) if year == cur_time.tm_year and i == cur_time.tm_mon: css = months.getCellCSSClass(i-1, 0) if css: css = '%s %s' % (css, 'iwla_curday') else: css = 'iwla_curday' months.setCellCSSClass(i-1, 0, css) + months_.setCellCSSClass(i-1, 0, css) total[0] = self._('Total') total[5] = bytesToStr(total[5]) @@ -460,6 +470,12 @@ class IWLA(object): months.appendRow(total) page.appendBlock(months) + months_.appendRow(total[:-1]) + filename = '%d/_stats.html' % (year) + page_ = self.display.createPage(u'', filename, conf.css_path) + page_.appendBlock(months_) + page_.build(conf.DISPLAY_ROOT, False) + def _generateDisplayWholeMonthStats(self): title = '%s %s' % (self._('Statistics for'), conf.domain_name) filename = 'index.html' diff --git a/plugins/display/istats_diff.py b/plugins/display/istats_diff.py new file mode 100644 index 0000000..897d2c4 --- /dev/null +++ b/plugins/display/istats_diff.py @@ -0,0 +1,98 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * +import logging + +""" +Display hook itnerface + +Enlight new and updated statistics + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayStatsDiff(IPlugin): + def __init__(self, iwla): + super(IWLADisplayStatsDiff, self).__init__(iwla) + self.API_VERSION = 1 + self.month_stats_key = None + # Set >= if month_stats[self.month_stats_key] is a list or a tuple + self.stats_index = -1 + self.filename = None + self.block_name = None + self.logger = logging.getLogger(__name__) + + def load(self): + if not self.month_stats_key or not self.filename or\ + not self.block_name: + self.logger('Bad parametrization') + return False + month_stats = self.iwla.getMonthStats() + self.cur_stats = {k:v for (k,v) in month_stats.get(self.month_stats_key, {}).items()} + return True + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + + path = self.iwla.getCurDisplayPath(self.filename) + page = display.getPage(path) + if not page: return + title = self.iwla._(self.block_name) + block = page.getBlock(title) + if not block: + self.logger.error('Block %s not found' % (title)) + return + + stats_diff = {} + for (k, v) in month_stats[self.month_stats_key].items(): + new_value = self.cur_stats.get(k, 0) + if new_value: + if self.stats_index != -1: + if new_value[self.stats_index] != v[self.stats_index]: + stats_diff[k] = 'iwla_update' + else: + if new_value != v: + stats_diff[k] = 'iwla_update' + else: + stats_diff[k] = 'iwla_new' + + for (idx, row) in enumerate(block.rows): + if row[0] in stats_diff.keys(): + block.setCellCSSClass(idx, 0, stats_diff[row[0]]) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index bdd04a5..1c4847a 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -190,14 +190,14 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = createCurTitle(self.iwla, u'Key Phrases') + title = createCurTitle(self.iwla, u'All Key Phrases') filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) total_search = [0]*2 page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Top key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Key phrases'), [self.iwla._(u'Key phrase'), self.iwla._(u'Search')]) table.setColsCSSClass(['', 'iwla_search']) new_list = self.max_key_phrases and top_key_phrases[:self.max_key_phrases] or top_key_phrases for phrase in new_list: diff --git a/plugins/display/referers_diff.py b/plugins/display/referers_diff.py index ddfd91b..8e63ecb 100644 --- a/plugins/display/referers_diff.py +++ b/plugins/display/referers_diff.py @@ -19,7 +19,7 @@ # from iwla import IWLA -from iplugin import IPlugin +from istats_diff import IWLADisplayStatsDiff from display import * """ @@ -46,39 +46,16 @@ Statistics deletion : None """ -class IWLADisplayReferersDiff(IPlugin): +class IWLADisplayReferersDiff(IWLADisplayStatsDiff): def __init__(self, iwla): super(IWLADisplayReferersDiff, self).__init__(iwla) self.API_VERSION = 1 self.requires = ['IWLADisplayReferers'] + self.month_stats_key = 'key_phrases' + self.filename = 'key_phrases.html' + self.block_name = u'Key phrases' def load(self): if not self.iwla.getConfValue('create_all_key_phrases_page', True): return False - month_stats = self.iwla.getMonthStats() - self.cur_key_phrases = {k:v for (k,v) in month_stats.get('key_phrases', {})} - return True - - def hook(self): - display = self.iwla.getDisplay() - month_stats = self.iwla.getMonthStats() - - filename = 'key_phrases.html' - path = self.iwla.getCurDisplayPath(filename) - page = display.getPage(path) - if not page: return - title = self.iwla._(u'All key phrases') - referers_block = page.getBlock(title) - - kp_diff = {} - for (k, v) in month_stats['key_phrases'].items(): - new_value = self.cur_key_phrases.get(k, 0) - if new_value: - if new_value != v: - kp_diff[k] = 'iwla_update' - else: - kp_diff[k] = 'iwla_new' - - for (idx, row) in enumerate(referers_block.rows): - if row[0] in kp_diff.keys(): - referers_block.setCellCSSClass(idx, 0, kp_diff[row[0]]) + return super(IWLADisplayReferersDiff, self).load() diff --git a/resources/css/iwla.css b/resources/css/iwla.css index 71b652b..add0e57 100644 --- a/resources/css/iwla.css +++ b/resources/css/iwla.css @@ -69,6 +69,9 @@ td:first-child .iwla_weekend { background : #ECECEC; } .iwla_curday { font-weight: bold; } .iwla_others { color: #668; } +.iwla_update { background : orange; } +.iwla_new { background : green } + .iwla_graph_table { margin-left:auto; @@ -85,3 +88,5 @@ table.iwla_graph_table td { text-align:center; } + +iframe {outline:none; border:0px; width:100%; height:500px; display:block;} \ No newline at end of file diff --git a/tools/extract_doc.py b/tools/extract_doc.py index eee534b..46220eb 100755 --- a/tools/extract_doc.py +++ b/tools/extract_doc.py @@ -2,11 +2,18 @@ import sys +excludes = ['istats_diff.py'] + filename = sys.argv[1] if filename.endswith('__init__.py'): sys.exit(0) +for e in excludes: + if filename.endswith(e): + sys.stderr.write('\tSkip %s\n' % (filename)) + sys.exit(0) + package_name = filename.replace('/', '.').replace('.py', '') sys.stdout.write('%s' % (package_name)) sys.stdout.write('\n') From 2b0fd9fb46e833ae62b5845bd2c1a07722841fcc Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 14:52:14 +0100 Subject: [PATCH 130/195] Generate index table in documentation --- docs/index.md | 424 +++++++++++++++++++++++------------------- docs/modules.md | 424 +++++++++++++++++++++++------------------- tools/extract_doc.py | 9 + tools/extract_docs.sh | 7 +- 4 files changed, 483 insertions(+), 381 deletions(-) diff --git a/docs/index.md b/docs/index.md index 9fa98a3..6b8c2b1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -90,6 +90,23 @@ Plugins Optional configuration values ends with *. + * iwla.py + * plugins/display/all_visits.py + * plugins/display/referers.py + * plugins/display/top_downloads.py + * plugins/display/top_hits.py + * plugins/display/top_pages.py + * plugins/display/top_visitors.py + * plugins/display/referers_diff.py + * plugins/post_analysis/referers.py + * plugins/post_analysis/reverse_dns.py + * plugins/post_analysis/top_downloads.py + * plugins/post_analysis/top_hits.py + * plugins/post_analysis/top_pages.py + * plugins/pre_analysis/page_to_hit.py + * plugins/pre_analysis/robots.py + + iwla ---- @@ -110,6 +127,7 @@ iwla DB_ROOT/meta.db DB_ROOT/year/month/iwla.db OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/_stats.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -233,48 +251,22 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- +plugins.display.top_downloads +----------------------------- Display hook - Create TOP visitors block + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - display_visitor_ip* + max_downloads_displayed* + create_all_downloads_page* Output files : - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_pages -------------------------- - - Display hook - - Create TOP pages page - - Plugin requirements : - post_analysis/top_pages - - Conf values needed : - max_pages_displayed* - create_all_pages_page* - - Output files : - OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/top_downloads.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -315,22 +307,22 @@ plugins.display.top_hits None -plugins.display.top_downloads ------------------------------ +plugins.display.top_pages +------------------------- Display hook - Create TOP downloads page + Create TOP pages page Plugin requirements : - post_analysis/top_downloads + post_analysis/top_pages Conf values needed : - max_downloads_displayed* - create_all_downloads_page* + max_pages_displayed* + create_all_pages_page* Output files : - OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/top_pages.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -343,6 +335,208 @@ plugins.display.top_downloads None +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers_diff +----------------------------- + + Display hook + + Enlight new and updated key phrases in in all_key_phrases.html + + Plugin requirements : + display/referers + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + plugins.pre_analysis.page_to_hit -------------------------------- @@ -400,153 +594,3 @@ plugins.pre_analysis.robots None -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages - hits - robots_referers => - pages - hits - search_engine_referers => - pages - hits - key_phrases => - phrase - - Statistics deletion : - None - - -plugins.post_analysis.top_pages -------------------------------- - - Post analysis hook - - Count TOP pages - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_pages => - uri - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - -plugins.post_analysis.top_hits ------------------------------- - - Post analysis hook - - Count TOP hits - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : - None - - -plugins.post_analysis.top_downloads ------------------------------------ - - Post analysis hook - - Count TOP downloads - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_downloads => - uri - - Statistics deletion : - None - - diff --git a/docs/modules.md b/docs/modules.md index 5067afb..7cf4999 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -1,3 +1,20 @@ + * iwla.py + * plugins/display/all_visits.py + * plugins/display/referers.py + * plugins/display/top_downloads.py + * plugins/display/top_hits.py + * plugins/display/top_pages.py + * plugins/display/top_visitors.py + * plugins/display/referers_diff.py + * plugins/post_analysis/referers.py + * plugins/post_analysis/reverse_dns.py + * plugins/post_analysis/top_downloads.py + * plugins/post_analysis/top_hits.py + * plugins/post_analysis/top_pages.py + * plugins/pre_analysis/page_to_hit.py + * plugins/pre_analysis/robots.py + + iwla ---- @@ -18,6 +35,7 @@ iwla DB_ROOT/meta.db DB_ROOT/year/month/iwla.db OUTPUT_ROOT/index.html + OUTPUT_ROOT/year/_stats.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -141,48 +159,22 @@ plugins.display.referers None -plugins.display.top_visitors ----------------------------- +plugins.display.top_downloads +----------------------------- Display hook - Create TOP visitors block + Create TOP downloads page Plugin requirements : - None + post_analysis/top_downloads Conf values needed : - display_visitor_ip* + max_downloads_displayed* + create_all_downloads_page* Output files : - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_pages -------------------------- - - Display hook - - Create TOP pages page - - Plugin requirements : - post_analysis/top_pages - - Conf values needed : - max_pages_displayed* - create_all_pages_page* - - Output files : - OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/top_downloads.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -223,22 +215,22 @@ plugins.display.top_hits None -plugins.display.top_downloads ------------------------------ +plugins.display.top_pages +------------------------- Display hook - Create TOP downloads page + Create TOP pages page Plugin requirements : - post_analysis/top_downloads + post_analysis/top_pages Conf values needed : - max_downloads_displayed* - create_all_downloads_page* + max_pages_displayed* + create_all_pages_page* Output files : - OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/top_pages.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -251,6 +243,208 @@ plugins.display.top_downloads None +plugins.display.top_visitors +---------------------------- + + Display hook + + Create TOP visitors block + + Plugin requirements : + None + + Conf values needed : + display_visitor_ip* + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.referers_diff +----------------------------- + + Display hook + + Enlight new and updated key phrases in in all_key_phrases.html + + Plugin requirements : + display/referers + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats : + referers => + pages + hits + robots_referers => + pages + hits + search_engine_referers => + pages + hits + key_phrases => + phrase + + Statistics deletion : + None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri + + Statistics deletion : + None + + +plugins.post_analysis.top_pages +------------------------------- + + Post analysis hook + + Count TOP pages + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_pages => + uri + + Statistics deletion : + None + + plugins.pre_analysis.page_to_hit -------------------------------- @@ -308,153 +502,3 @@ plugins.pre_analysis.robots None -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages - hits - robots_referers => - pages - hits - search_engine_referers => - pages - hits - key_phrases => - phrase - - Statistics deletion : - None - - -plugins.post_analysis.top_pages -------------------------------- - - Post analysis hook - - Count TOP pages - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_pages => - uri - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - -plugins.post_analysis.top_hits ------------------------------- - - Post analysis hook - - Count TOP hits - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : - None - - -plugins.post_analysis.top_downloads ------------------------------------ - - Post analysis hook - - Count TOP downloads - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_downloads => - uri - - Statistics deletion : - None - - diff --git a/tools/extract_doc.py b/tools/extract_doc.py index 46220eb..601b4cc 100755 --- a/tools/extract_doc.py +++ b/tools/extract_doc.py @@ -5,6 +5,11 @@ import sys excludes = ['istats_diff.py'] filename = sys.argv[1] +printName = False + +if filename == '-p': + filename = sys.argv[2] + printName = True if filename.endswith('__init__.py'): sys.exit(0) @@ -14,6 +19,10 @@ for e in excludes: sys.stderr.write('\tSkip %s\n' % (filename)) sys.exit(0) +if printName: + sys.stdout.write(' * %s\n' % (filename)) + sys.exit(0) + package_name = filename.replace('/', '.').replace('.py', '') sys.stdout.write('%s' % (package_name)) sys.stdout.write('\n') diff --git a/tools/extract_docs.sh b/tools/extract_docs.sh index e556330..007f21b 100755 --- a/tools/extract_docs.sh +++ b/tools/extract_docs.sh @@ -6,8 +6,13 @@ TARGET_MD="docs/index.md" rm -f "${MODULES_TARGET}" +echo "Generate plugins index" +python tools/extract_doc.py -p iwla.py > "${MODULES_TARGET}" +find plugins -name '*.py' -exec python tools/extract_doc.py -p \{\} \; >> "${MODULES_TARGET}" +echo "\n" >> "${MODULES_TARGET}" + echo "Generate doc from iwla.py" -python tools/extract_doc.py iwla.py > "${MODULES_TARGET}" +python tools/extract_doc.py iwla.py >> "${MODULES_TARGET}" echo "Generate plugins documentation" find plugins -name '*.py' -exec python tools/extract_doc.py \{\} \; >> "${MODULES_TARGET}" From 24c9807aa8d9dec5f7a2f4ad44d4782844df8cf5 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 17:59:28 +0100 Subject: [PATCH 131/195] Bug in UTC time computation --- iwla.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iwla.py b/iwla.py index 493ab19..1b2e72c 100755 --- a/iwla.py +++ b/iwla.py @@ -352,7 +352,7 @@ class IWLA(object): gmt_offset_minutes = int(gmt_offset_str[3:5])*60 gmt_offset = gmt_offset_hours + gmt_offset_minutes hit['time_decoded'] = time.strptime(hit['time_local'][:-6], conf.time_format[:-3]) - if gmt_offset_str[0] == '+': + if gmt_offset_str[0] == '-': hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])+gmt_offset) else: hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])-gmt_offset) From e7e988657ee7a8449622f771e0327a7a43ef1e8b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 18:00:10 +0100 Subject: [PATCH 132/195] Deactivate UTC time computation --- iwla.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iwla.py b/iwla.py index 1b2e72c..3d9fd73 100755 --- a/iwla.py +++ b/iwla.py @@ -352,10 +352,10 @@ class IWLA(object): gmt_offset_minutes = int(gmt_offset_str[3:5])*60 gmt_offset = gmt_offset_hours + gmt_offset_minutes hit['time_decoded'] = time.strptime(hit['time_local'][:-6], conf.time_format[:-3]) - if gmt_offset_str[0] == '-': - hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])+gmt_offset) - else: - hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])-gmt_offset) + # if gmt_offset_str[0] == '-': + # hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])+gmt_offset) + # else: + # hit['time_decoded'] = time.localtime(time.mktime(hit['time_decoded'])-gmt_offset) else: raise e return hit['time_decoded'] From cfe8510970fdde50e9b620340eebfc376b5ac1af Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 31 Dec 2014 18:01:08 +0100 Subject: [PATCH 133/195] Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 47cd19c..b59dfaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,3 +8,4 @@ v0.2 (31/12/2014) ** Bugs ** Forgot tag + Bad UTC time computation From b1cdb3024396faa9b8e6e07737280b1490d0b204 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 2 Jan 2015 19:27:57 +0100 Subject: [PATCH 134/195] Add analysis duration in result --- iwla.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index 3d9fd73..2a2431e 100755 --- a/iwla.py +++ b/iwla.py @@ -31,7 +31,7 @@ import argparse import logging import gettext from calendar import monthrange -from datetime import date +from datetime import date, datetime import default_conf as conf import conf as _ @@ -136,6 +136,7 @@ class IWLA(object): self.meta_infos = {} self.analyse_started = False self.current_analysis = {} + self.start_time = 0 self.cache_plugins = {} self.display = DisplayHTMLBuild(self) self.valid_visitors = None @@ -484,8 +485,15 @@ class IWLA(object): page = self.display.createPage(title, filename, conf.css_path) - last_update = '%s %s
' % (self._('Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) + last_update = u'%s %s
' % (self._(u'Last update'), time.strftime('%02d %b %Y %H:%M', time.localtime())) page.appendBlock(self.display.createBlock(DisplayHTMLRaw, last_update)) + duration = datetime.now() - self.start_time + duration = time.gmtime(duration.seconds) + time_analysis = u'%s ' % (self._('Time analysis')) + if duration.tm_hour: + time_analysis += u'%d %s, ' % (duration.tm_hour, self._(u'hours')) + time_analysis += u'%d %s and %d %s
' % (duration.tm_min, self._(u'minutes'), duration.tm_sec, self._(u'seconds')) + page.appendBlock(self.display.createBlock(DisplayHTMLRaw, time_analysis)) for year in sorted(self.meta_infos['stats'].keys(), reverse=True): self._generateDisplayMonthStats(page, year, self.meta_infos['stats'][year]) @@ -654,6 +662,8 @@ class IWLA(object): return True def start(self, _file): + self.start_time = datetime.now() + self.logger.info('==> Load previous database') self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() From a6ce8e1c6eba5436f043307e399d65298b14882f Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 2 Jan 2015 19:28:33 +0100 Subject: [PATCH 135/195] Update Chagelog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b59dfaf..91e3528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ -v0.2 (31/12/2014) +v0.2 (02/01/2015) ** User ** Add referers_diff display plugin Add year statistics in month details + Add analysis duration ** Dev ** Add istats_diff interface From bfba52af8fcd78deefb9cc1932ffcb4306d98d78 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 6 Jan 2015 08:08:09 +0100 Subject: [PATCH 136/195] Bug : hits/pages in the same second where not analyzed --- iwla.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index 2a2431e..0bd6278 100755 --- a/iwla.py +++ b/iwla.py @@ -267,10 +267,12 @@ class IWLA(object): mod.hook(*args) def isPage(self, request): + self.logger.debug("Is page %s" % (request)) for e in conf.pages_extensions: if request.endswith(e): + self.logger.debug("True") return True - + self.logger.debug("False") return False def _appendHit(self, hit): @@ -627,6 +629,7 @@ class IWLA(object): def _newHit(self, hit): if not self.domain_name_re.match(hit['server_name']): + self.logger.debug("Not in domain %s" % (hit)) return False t = self._decodeTime(hit) @@ -637,7 +640,9 @@ class IWLA(object): self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() self.analyse_started = True else: - if time.mktime(t) <= time.mktime(cur_time): + if not self.analyse_started and\ + time.mktime(t) <= time.mktime(cur_time): + self.logger.debug("Not in time") return False self.analyse_started = True if cur_time.tm_mon != t.tm_mon: From 496ecb42f5facc1f4ca08cbac35ec590715ddcf5 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 6 Jan 2015 08:08:42 +0100 Subject: [PATCH 137/195] Update ChangeLog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 91e3528..f34a539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2 (02/01/2015) +v0.2 (06/01/2015) ** User ** Add referers_diff display plugin Add year statistics in month details @@ -10,3 +10,4 @@ v0.2 (02/01/2015) ** Bugs ** Forgot tag Bad UTC time computation + Hits/pages in the same second where not analyzed From 72a76fc0f9503a59e927cb9c2923278c2d2c37dd Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 8 Jan 2015 20:57:56 +0100 Subject: [PATCH 138/195] Move icons into resources/icon/other --- display.py | 2 +- resources/icon/{ => other}/vh.png | Bin resources/icon/{ => other}/vk.png | Bin resources/icon/{ => other}/vp.png | Bin resources/icon/{ => other}/vu.png | Bin resources/icon/{ => other}/vv.png | Bin 6 files changed, 1 insertion(+), 1 deletion(-) rename resources/icon/{ => other}/vh.png (100%) rename resources/icon/{ => other}/vk.png (100%) rename resources/icon/{ => other}/vp.png (100%) rename resources/icon/{ => other}/vu.png (100%) rename resources/icon/{ => other}/vv.png (100%) diff --git a/display.py b/display.py index 16c4593..e70a8af 100644 --- a/display.py +++ b/display.py @@ -229,7 +229,7 @@ class DisplayHTMLBlockTableWithGraph(DisplayHTMLBlockTable): elif style.startswith(u'iwla_visit'): icon = u'vv.png' else: return '' - return u'/%s/%s' % (self.icon_path, icon) + return u'/%s/other/%s' % (self.icon_path, icon) def _buildHTML(self): self._computeMax() diff --git a/resources/icon/vh.png b/resources/icon/other/vh.png similarity index 100% rename from resources/icon/vh.png rename to resources/icon/other/vh.png diff --git a/resources/icon/vk.png b/resources/icon/other/vk.png similarity index 100% rename from resources/icon/vk.png rename to resources/icon/other/vk.png diff --git a/resources/icon/vp.png b/resources/icon/other/vp.png similarity index 100% rename from resources/icon/vp.png rename to resources/icon/other/vp.png diff --git a/resources/icon/vu.png b/resources/icon/other/vu.png similarity index 100% rename from resources/icon/vu.png rename to resources/icon/other/vu.png diff --git a/resources/icon/vv.png b/resources/icon/other/vv.png similarity index 100% rename from resources/icon/vv.png rename to resources/icon/other/vv.png From 9a1c23ec78a1ebd8b9fcccc7cc6d2f002623d6b6 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 8 Jan 2015 20:58:27 +0100 Subject: [PATCH 139/195] Update documentation of some plugins --- plugins/post_analysis/referers.py | 14 +++++++------- plugins/post_analysis/top_downloads.py | 2 +- plugins/post_analysis/top_hits.py | 2 +- plugins/post_analysis/top_pages.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/post_analysis/referers.py b/plugins/post_analysis/referers.py index 64ec66f..619963f 100644 --- a/plugins/post_analysis/referers.py +++ b/plugins/post_analysis/referers.py @@ -46,16 +46,16 @@ Statistics creation : Statistics update : month_stats : referers => - pages - hits + pages => count + hits => count robots_referers => - pages - hits + pages => count + hits => count search_engine_referers => - pages - hits + pages => count + hits => count key_phrases => - phrase + phrase => count Statistics deletion : None diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 7b28c33..8fb5b17 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -43,7 +43,7 @@ Statistics creation : Statistics update : month_stats: top_downloads => - uri + uri => count Statistics deletion : None diff --git a/plugins/post_analysis/top_hits.py b/plugins/post_analysis/top_hits.py index 64446c7..8006aa7 100644 --- a/plugins/post_analysis/top_hits.py +++ b/plugins/post_analysis/top_hits.py @@ -41,7 +41,7 @@ Statistics creation : Statistics update : month_stats: top_hits => - uri + uri => count Statistics deletion : None diff --git a/plugins/post_analysis/top_pages.py b/plugins/post_analysis/top_pages.py index a5d086c..37db81d 100644 --- a/plugins/post_analysis/top_pages.py +++ b/plugins/post_analysis/top_pages.py @@ -43,7 +43,7 @@ Statistics creation : Statistics update : month_stats: top_pages => - uri + uri => count Statistics deletion : None From a40f116c71df4135730f7fa9665c708a91bab30f Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 8 Jan 2015 20:59:11 +0100 Subject: [PATCH 140/195] Add Operating Systems post analysis and display --- awstats_data.py | 14 +++ conf.py | 4 +- plugins/display/operating_systems.py | 100 ++++++++++++++++ plugins/post_analysis/operating_systems.py | 126 +++++++++++++++++++++ tools/iwla_convert.pl | 32 +++++- 5 files changed, 271 insertions(+), 5 deletions(-) create mode 100644 plugins/display/operating_systems.py create mode 100644 plugins/post_analysis/operating_systems.py diff --git a/awstats_data.py b/awstats_data.py index 8789384..1c4a0d4 100644 --- a/awstats_data.py +++ b/awstats_data.py @@ -1,3 +1,5 @@ +#This file was automatically generated by iwla_convert.pl. Do not edit manually. + robots = ['appie', 'architext', 'jeeves', 'bjaaland', 'contentmatch', 'ferret', 'googlebot', 'google\-sitemaps', 'gulliver', 'virus[_+ ]detector', 'harvest', 'htdig', 'linkwalker', 'lilina', 'lycos[_+ ]', 'moget', 'muscatferret', 'myweb', 'nomad', 'scooter', 'slurp', '^voyager\/', 'weblayers', 'antibot', 'bruinbot', 'digout4u', 'echo!', 'fast\-webcrawler', 'ia_archiver\-web\.archive\.org', 'ia_archiver', 'jennybot', 'mercator', 'netcraft', 'msnbot\-media', 'msnbot', 'petersnews', 'relevantnoise\.com', 'unlost_web_crawler', 'voila', 'webbase', 'webcollage', 'cfetch', 'zyborg', 'wisenutbot', '[^a]fish', 'abcdatos', 'acme\.spider', 'ahoythehomepagefinder', 'alkaline', 'anthill', 'arachnophilia', 'arale', 'araneo', 'aretha', 'ariadne', 'powermarks', 'arks', 'aspider', 'atn\.txt', 'atomz', 'auresys', 'backrub', 'bbot', 'bigbrother', 'blackwidow', 'blindekuh', 'bloodhound', 'borg\-bot', 'brightnet', 'bspider', 'cactvschemistryspider', 'calif[^r]', 'cassandra', 'cgireader', 'checkbot', 'christcrawler', 'churl', 'cienciaficcion', 'collective', 'combine', 'conceptbot', 'coolbot', 'core', 'cosmos', 'cruiser', 'cusco', 'cyberspyder', 'desertrealm', 'deweb', 'dienstspider', 'digger', 'diibot', 'direct_hit', 'dnabot', 'download_express', 'dragonbot', 'dwcp', 'e\-collector', 'ebiness', 'elfinbot', 'emacs', 'emcspider', 'esther', 'evliyacelebi', 'fastcrawler', 'feedcrawl', 'fdse', 'felix', 'fetchrover', 'fido', 'finnish', 'fireball', 'fouineur', 'francoroute', 'freecrawl', 'funnelweb', 'gama', 'gazz', 'gcreep', 'getbot', 'geturl', 'golem', 'gougou', 'grapnel', 'griffon', 'gromit', 'gulperbot', 'hambot', 'havindex', 'hometown', 'htmlgobble', 'hyperdecontextualizer', 'iajabot', 'iaskspider', 'hl_ftien_spider', 'sogou', 'iconoclast', 'ilse', 'imagelock', 'incywincy', 'informant', 'infoseek', 'infoseeksidewinder', 'infospider', 'inspectorwww', 'intelliagent', 'irobot', 'iron33', 'israelisearch', 'javabee', 'jbot', 'jcrawler', 'jobo', 'jobot', 'joebot', 'jubii', 'jumpstation', 'kapsi', 'katipo', 'kilroy', 'ko[_+ ]yappo[_+ ]robot', 'kummhttp', 'labelgrabber\.txt', 'larbin', 'legs', 'linkidator', 'linkscan', 'lockon', 'logo_gif', 'macworm', 'magpie', 'marvin', 'mattie', 'mediafox', 'merzscope', 'meshexplorer', 'mindcrawler', 'mnogosearch', 'momspider', 'monster', 'motor', 'muncher', 'mwdsearch', 'ndspider', 'nederland\.zoek', 'netcarta', 'netmechanic', 'netscoop', 'newscan\-online', 'nhse', 'northstar', 'nzexplorer', 'objectssearch', 'occam', 'octopus', 'openfind', 'orb_search', 'packrat', 'pageboy', 'parasite', 'patric', 'pegasus', 'perignator', 'perlcrawler', 'phantom', 'phpdig', 'piltdownman', 'pimptrain', 'pioneer', 'pitkow', 'pjspider', 'plumtreewebaccessor', 'poppi', 'portalb', 'psbot', 'python', 'raven', 'rbse', 'resumerobot', 'rhcs', 'road_runner', 'robbie', 'robi', 'robocrawl', 'robofox', 'robozilla', 'roverbot', 'rules', 'safetynetrobot', 'search\-info', 'search_au', 'searchprocess', 'senrigan', 'sgscout', 'shaggy', 'shaihulud', 'sift', 'simbot', 'site\-valet', 'sitetech', 'skymob', 'slcrawler', 'smartspider', 'snooper', 'solbot', 'speedy', 'spider[_+ ]monkey', 'spiderbot', 'spiderline', 'spiderman', 'spiderview', 'spry', 'sqworm', 'ssearcher', 'suke', 'sunrise', 'suntek', 'sven', 'tach_bw', 'tagyu_agent', 'tailrank', 'tarantula', 'tarspider', 'techbot', 'templeton', 'titan', 'titin', 'tkwww', 'tlspider', 'ucsd', 'udmsearch', 'universalfeedparser', 'urlck', 'valkyrie', 'verticrawl', 'victoria', 'visionsearch', 'voidbot', 'vwbot', 'w3index', 'w3m2', 'wallpaper', 'wanderer', 'wapspIRLider', 'webbandit', 'webcatcher', 'webcopy', 'webfetcher', 'webfoot', 'webinator', 'weblinker', 'webmirror', 'webmoose', 'webquest', 'webreader', 'webreaper', 'websnarf', 'webspider', 'webvac', 'webwalk', 'webwalker', 'webwatch', 'whatuseek', 'whowhere', 'wired\-digital', 'wmir', 'wolp', 'wombat', 'wordpress', 'worm', 'woozweb', 'wwwc', 'wz101', 'xget', '1\-more_scanner', 'accoona\-ai\-agent', 'activebookmark', 'adamm_bot', 'almaden', 'aipbot', 'aleadsoftbot', 'alpha_search_agent', 'allrati', 'aport', 'archive\.org_bot', 'argus', 'arianna\.libero\.it', 'aspseek', 'asterias', 'awbot', 'baiduspider', 'becomebot', 'bender', 'betabot', 'biglotron', 'bittorrent_bot', 'biz360[_+ ]spider', 'blogbridge[_+ ]service', 'bloglines', 'blogpulse', 'blogsearch', 'blogshares', 'blogslive', 'blogssay', 'bncf\.firenze\.sbn\.it\/raccolta\.txt', 'bobby', 'boitho\.com\-dc', 'bookmark\-manager', 'boris', 'bumblebee', 'candlelight[_+ ]favorites[_+ ]inspector', 'cbn00glebot', 'cerberian_drtrs', 'cfnetwork', 'cipinetbot', 'checkweb_link_validator', 'commons\-httpclient', 'computer_and_automation_research_institute_crawler', 'converamultimediacrawler', 'converacrawler', 'cscrawler', 'cse_html_validator_lite_online', 'cuasarbot', 'cursor', 'custo', 'datafountains\/dmoz_downloader', 'daviesbot', 'daypopbot', 'deepindex', 'dipsie\.bot', 'dnsgroup', 'domainchecker', 'domainsdb\.net', 'dulance', 'dumbot', 'dumm\.de\-bot', 'earthcom\.info', 'easydl', 'edgeio\-retriever', 'ets_v', 'exactseek', 'extreme[_+ ]picture[_+ ]finder', 'eventax', 'everbeecrawler', 'everest\-vulcan', 'ezresult', 'enteprise', 'facebook', 'fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de', 'fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de', 'matrix_s\.p\.a\._\-_fast_enterprise_crawler', 'fast_enterprise_crawler', 'fast\-search\-engine', 'favicon', 'favorg', 'favorites_sweeper', 'feedburner', 'feedfetcher\-google', 'feedflow', 'feedster', 'feedsky', 'feedvalidator', 'filmkamerabot', 'findlinks', 'findexa_crawler', 'fooky\.com\/ScorpionBot', 'g2crawler', 'gaisbot', 'geniebot', 'gigabot', 'girafabot', 'global_fetch', 'gnodspider', 'goforit\.com', 'goforitbot', 'gonzo', 'grub', 'gpu_p2p_crawler', 'henrythemiragorobot', 'heritrix', 'holmes', 'hoowwwer', 'hpprint', 'htmlparser', 'html[_+ ]link[_+ ]validator', 'httrack', 'hundesuche\.com\-bot', 'ichiro', 'iltrovatore\-setaccio', 'infobot', 'infociousbot', 'infomine', 'insurancobot', 'internet[_+ ]ninja', 'internetarchive', 'internetseer', 'internetsupervision', 'irlbot', 'isearch2006', 'iupui_research_bot', 'jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility', 'justview', 'kalambot', 'kamano\.de_newsfeedverzeichnis', 'kazoombot', 'kevin', 'keyoshid', 'kinjabot', 'kinja\-imagebot', 'knowitall', 'knowledge\.com', 'kouaa_krawler', 'krugle', 'ksibot', 'kurzor', 'lanshanbot', 'letscrawl\.com', 'libcrawl', 'linkbot', 'link_valet_online', 'metager\-linkchecker', 'linkchecker', 'livejournal\.com', 'lmspider', 'lwp\-request', 'lwp\-trivial', 'magpierss', 'mail\.ru', 'mapoftheinternet\.com', 'mediapartners\-google', 'megite', 'metaspinner', 'microsoft[_+ ]url[_+ ]control', 'mini\-reptile', 'minirank', 'missigua_locator', 'misterbot', 'miva', 'mizzu_labs', 'mj12bot', 'mojeekbot', 'msiecrawler', 'ms_search_4\.0_robot', 'msrabot', 'msrbot', 'mt::telegraph::agent', 'nagios', 'nasa_search', 'mydoyouhike', 'netluchs', 'netsprint', 'newsgatoronline', 'nicebot', 'nimblecrawler', 'noxtrumbot', 'npbot', 'nutchcvs', 'nutchosu\-vlib', 'nutch', 'ocelli', 'octora_beta_bot', 'omniexplorer[_+ ]bot', 'onet\.pl[_+ ]sa', 'onfolio', 'opentaggerbot', 'openwebspider', 'oracle_ultra_search', 'orbiter', 'yodaobot', 'qihoobot', 'passwordmaker\.org', 'pear_http_request_class', 'peerbot', 'perman', 'php[_+ ]version[_+ ]tracker', 'pictureofinternet', 'ping\.blo\.gs', 'plinki', 'pluckfeedcrawler', 'pogodak', 'pompos', 'popdexter', 'port_huron_labs', 'postfavorites', 'projectwf\-java\-test\-crawler', 'proodlebot', 'pyquery', 'rambler', 'redalert', 'rojo', 'rssimagesbot', 'ruffle', 'rufusbot', 'sandcrawler', 'sbider', 'schizozilla', 'scumbot', 'searchguild[_+ ]dmoz[_+ ]experiment', 'seekbot', 'sensis_web_crawler', 'seznambot', 'shim\-crawler', 'shoutcast', 'slysearch', 'snap\.com_beta_crawler', 'sohu\-search', 'sohu', 'snappy', 'sphere_scout', 'spip', 'sproose_crawler', 'steeler', 'steroid__download', 'suchfin\-bot', 'superbot', 'surveybot', 'susie', 'syndic8', 'syndicapi', 'synoobot', 'tcl_http_client_package', 'technoratibot', 'teragramcrawlersurf', 'test_crawler', 'testbot', 't\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e', 'topicblogs', 'turnitinbot', 'turtlescanner', 'turtle', 'tutorgigbot', 'twiceler', 'ubicrawler', 'ultraseek', 'unchaos_bot_hybrid_web_search_engine', 'unido\-bot', 'updated', 'ustc\-semantic\-group', 'vagabondo\-wap', 'vagabondo', 'vermut', 'versus_crawler_from_eda\.baykan@epfl\.ch', 'vespa_crawler', 'vortex', 'vse\/', 'w3c\-checklink', 'w3c[_+ ]css[_+ ]validator[_+ ]jfouffa', 'w3c_validator', 'watchmouse', 'wavefire', 'webclipping\.com', 'webcompass', 'webcrawl\.net', 'web_downloader', 'webdup', 'webfilter', 'webindexer', 'webminer', 'website[_+ ]monitoring[_+ ]bot', 'webvulncrawl', 'wells_search', 'wonderer', 'wume_crawler', 'wwweasel', 'xenu\'s_link_sleuth', 'xenu_link_sleuth', 'xirq', 'y!j', 'yacy', 'yahoo\-blogs', 'yahoo\-verticalcrawler', 'yahoofeedseeker', 'yahooseeker\-testing', 'yahooseeker', 'yahoo\-mmcrawler', 'yahoo!_mindset', 'yandex', 'flexum', 'yanga', 'yooglifetchagent', 'z\-add_link_checker', 'zealbot', 'zhuaxia', 'zspider', 'zeus', 'ng\/1\.', 'ng\/2\.', 'exabot', 'wget', 'libwww', 'java\/[0-9]'] search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] @@ -10,3 +12,15 @@ search_engines_hashid = {'search\.sli\.sympatico\.ca' : 'sympatico', 'mywebsearc search_engines_knwown_url = {'dmoz' : 'search=', 'google' : '(p|q|as_p|as_q)=', 'searchalot' : 'q=', 'teoma' : 'q=', 'looksmartuk' : 'key=', 'polymeta_hu' : '', 'google_groups' : 'group\/', 'iune' : '(keywords|q)=', 'chellosk' : 'q1=', 'eniro' : 'q=', 'msn' : 'q=', 'webcrawler' : 'searchText=', 'mirago' : '(txtsearch|qry)=', 'enirose' : 'q=', 'miragobe' : '(txtsearch|qry)=', 'netease' : 'q=', 'netluchs' : 'query=', 'google_products' : '(p|q|as_p|as_q)=', 'jyxo' : '(s|q)=', 'origo' : '(q|search)=', 'ilse' : 'search_for=', 'chellocom' : 'q1=', 'goodsearch' : 'Keywords=', 'ledix' : 'q=', 'mozbot' : 'q=', 'chellocz' : 'q1=', 'webde' : 'su=', 'biglotron' : 'question=', 'metacrawler_de' : 'qry=', 'finddk' : 'words=', 'start' : 'q=', 'sagool' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'aliceit' : 'qs=', 'shinyseek\.it' : 'KEY=', 'onetpl' : 'qt=', 'clusty' : 'query=', 'chellonl' : 'q1=', 'miragode' : '(txtsearch|qry)=', 'miragose' : '(txtsearch|qry)=', 'o2pl' : 'qt=', 'goliat' : 'KERESES=', 'kvasir' : 'q=', 'askfr' : '(ask|q)=', 'infoseek' : 'qt=', 'yahoo_mindset' : 'p=', 'comettoolbar' : 'qry=', 'alltheweb' : 'q(|uery)=', 'miner' : 'q=', 'aol' : 'query=', 'rambler' : 'words=', 'scroogle' : 'Gw=', 'chellose' : 'q1=', 'ineffabile' : '', 'miragoit' : '(txtsearch|qry)=', 'yandex' : 'text=', 'segnalo' : '', 'dodajpl' : 'keyword=', 'avantfind' : 'keywords=', 'nusearch' : 'nusearch_terms=', 'bbc' : 'q=', 'supereva' : 'q=', 'atomz' : 'sp-q=', 'searchy' : 'search_term=', 'dogpile' : 'q(|kw)=', 'chellohu' : 'q1=', 'vnet' : 'kw=', '1klik' : 'query=', 't-online' : 'q=', 'hogapl' : 'qt=', 'stumbleupon' : '', 'soso' : 'q=', 'zhongsou' : '(word|w)=', 'a9' : 'a9\.com\/', 'centraldatabase' : 'query=', 'mamma' : 'query=', 'icerocket' : 'q=', 'ask' : '(ask|q)=', 'chellobe' : 'q1=', 'altavista' : 'q=', 'vindex' : 'in=', 'miragodk' : '(txtsearch|qry)=', 'chelloat' : 'q1=', 'digg' : 's=', 'metacrawler' : 'general=', 'nbci' : 'keyword=', 'chellono' : 'q1=', 'icq' : 'q=', 'arianna' : 'query=', 'miragocouk' : '(txtsearch|qry)=', '3721' : '(p|name)=', 'pogodak' : 'q=', 'ukdirectory' : 'k=', 'overture' : 'keywords=', 'heureka' : 'heureka=', 'teecnoit' : 'q=', 'miragoes' : '(txtsearch|qry)=', 'haku' : 'w=', 'go' : 'qt=', 'fireball' : 'q=', 'wisenut' : 'query=', 'sify' : 'keyword=', 'ixquick' : 'query=', 'anzwers' : 'search=', 'quick' : 'query=', 'jubii' : 'soegeord=', 'questionanswering' : '', 'asknl' : '(ask|q)=', 'askde' : '(ask|q)=', 'att' : 'qry=', 'terra' : 'query=', 'bing' : 'q=', 'wowpl' : 'q=', 'freeserve' : 'q=', 'atlas' : '(searchtext|q)=', 'askuk' : '(ask|q)=', 'godado' : 'Keywords=', 'northernlight' : 'qr=', 'answerbus' : '', 'search.com' : 'q=', 'google_image' : '(p|q|as_p|as_q)=', 'jumpy\.it' : 'searchWord=', 'gazetapl' : 'slowo=', 'yahoo' : 'p=', 'hotbot' : 'mt=', 'metabot' : 'st=', 'copernic' : 'web\/', 'kartoo' : '', 'metaspinner' : 'qry=', 'toile' : 'q=', 'aolde' : 'q=', 'blingo' : 'q=', 'askit' : '(ask|q)=', 'netscape' : 'search=', 'splut' : 'pattern=', 'looksmart' : 'key=', 'sphere' : 'q=', 'sol' : 'q=', 'miragono' : '(txtsearch|qry)=', 'kataweb' : 'q=', 'ofir' : 'querytext=', 'aliceitmaster' : 'qs=', 'miragofr' : '(txtsearch|qry)=', 'spray' : 'string=', 'seznam' : '(w|q)=', 'interiapl' : 'q=', 'euroseek' : 'query=', 'schoenerbrausen' : 'q=', 'centrum' : 'q=', 'netsprintpl' : 'q=', 'go2net' : 'general=', 'katalogonetpl' : 'qt=', 'ukindex' : 'stext=', 'shawca' : 'q=', 'szukaczpl' : 'q=', 'accoona' : 'qt=', 'live' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'iask' : '(w|k)=', 'earthlink' : 'q=', 'tiscali' : 'key=', 'askes' : '(ask|q)=', 'gotuneed' : '', 'clubinternet' : 'q=', 'redbox' : 'srch=', 'delicious' : 'all=', 'chellofr' : 'q1=', 'lycos' : 'query=', 'sympatico' : 'query=', 'vivisimo' : 'query=', 'bluewin' : 'qry=', 'mysearch' : 'searchfor=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ukplus' : 'search=', 'gerypl' : 'q=', 'keresolap_hu' : 'q=', 'abacho' : 'q=', 'engine' : 'p1=', 'opasia' : 'q=', 'wp' : 'szukaj=', 'steadysearch' : 'w=', 'chellopl' : 'q1=', 'voila' : '(kw|rdata)=', 'aport' : 'r=', 'internetto' : 'searchstr=', 'passagen' : 'q=', 'wwweasel' : 'q=', 'najdi' : 'dotaz=', 'alexa' : 'q=', 'baidu' : '(wd|word)=', 'spotjockey' : 'Search_Keyword=', 'virgilio' : 'qs=', 'orbis' : 'search_field=', 'tango_hu' : 'q=', 'askjp' : '(ask|q)=', 'bungeebonesdotcom' : 'query=', 'francite' : 'name=', 'searchch' : 'q=', 'google_froogle' : '(p|q|as_p|as_q)=', 'excite' : 'search=', 'infospace' : 'qkw=', 'polskapl' : 'qt=', 'swik' : 'swik\.net/', 'edderkoppen' : 'query=', 'mywebsearch' : 'searchfor=', 'danielsen' : 'q=', 'wahoo' : 'q=', 'sogou' : 'query=', 'miragonl' : '(txtsearch|qry)=', 'findarticles' : 'key='} +operating_systems = ['windows[_+ ]?2005', 'windows[_+ ]nt[_+ ]6\.0', 'windows[_+ ]?2008', 'windows[_+ ]nt[_+ ]6\.1', 'windows[_+ ]?vista', 'windows[_+ ]nt[_+ ]6', 'windows[_+ ]?2003', 'windows[_+ ]nt[_+ ]5\.2', 'windows[_+ ]xp', 'windows[_+ ]nt[_+ ]5\.1', 'windows[_+ ]me', 'win[_+ ]9x', 'windows[_+ ]?2000', 'windows[_+ ]nt[_+ ]5', 'winnt', 'windows[_+ \-]?nt', 'win32', 'win(.*)98', 'win(.*)95', 'win(.*)16', 'windows[_+ ]3', 'win(.*)ce', 'mac[_+ ]os[_+ ]x', 'mac[_+ ]?p', 'mac[_+ ]68', 'macweb', 'macintosh', 'linux(.*)android', 'linux(.*)asplinux', 'linux(.*)centos', 'linux(.*)debian', 'linux(.*)fedora', 'linux(.*)gentoo', 'linux(.*)mandr', 'linux(.*)momonga', 'linux(.*)pclinuxos', 'linux(.*)red[_+ ]hat', 'linux(.*)suse', 'linux(.*)ubuntu', 'linux(.*)vector', 'linux(.*)vine', 'linux(.*)white\sbox', 'linux(.*)zenwalk', 'linux', 'gnu.hurd', 'bsdi', 'gnu.kfreebsd', 'freebsd', 'openbsd', 'netbsd', 'dragonfly', 'aix', 'sunos', 'irix', 'osf', 'hp\-ux', 'unix', 'x11', 'gnome\-vfs', 'beos', 'os/2', 'amiga', 'atari', 'vms', 'commodore', 'qnx', 'inferno', 'palmos', 'syllable', 'blackberry', 'cp/m', 'crayos', 'dreamcast', 'iphone[_+ ]os', 'risc[_+ ]?os', 'symbian', 'webtv', 'playstation', 'xbox', 'wii', 'vienna', 'newsfire', 'applesyndication', 'akregator', 'plagger', 'syndirella', 'j2me', 'java', 'microsoft', 'msie[_+ ]', 'ms[_+ ]frontpage', 'windows'] + +operating_systems_hashid = {'crayos' : 'crayos', 'linux(.*)white\sbox' : 'linuxwhitebox', 'windows[_+ \-]?nt' : 'winnt', 'windows[_+ ]?2003' : 'win2003', 'mac[_+ ]?p' : 'macintosh', 'netbsd' : 'bsdnetbsd', 'win[_+ ]9x' : 'winme', 'vms' : 'vms', 'gnome\-vfs' : 'unix', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'dragonflybsd' : 'bsddflybsd', 'wii' : 'wii', 'linux(.*)vector' : 'linuxvector', 'microsoft' : 'winunknown', 'plagger' : 'unix', 'amiga' : 'amigaos', 'windows[_+ ]me' : 'winme', 'irix' : 'irix', 'linux(.*)android' : 'linuxandroid', 'linux(.*)suse' : 'linuxsuse', 'java' : 'java', 'win(.*)ce' : 'wince', 'cp/m' : 'cp/m', 'windows[_+ ]3' : 'win16', 'win(.*)98' : 'win98', 'windows' : 'winunknown', 'os/2' : 'os/2', 'syndirella' : 'winxp', 'osf' : 'osf', 'macweb' : 'macintosh', 'linux(.*)centos' : 'linuxcentos', 'gnu.hurd' : 'gnu', 'dreamcast' : 'dreamcast', 'linux' : 'linux', 'win(.*)16' : 'win16', 'freebsd' : 'bsdfreebsd', 'windows[_+ ]xp' : 'winxp', 'blackberry' : 'blackberry', 'macintosh' : 'macintosh', 'symbian' : 'symbian', 'linux(.*)debian' : 'linuxdebian', 'windows[_+ ]?2005' : 'winlong', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'x11' : 'unix', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'j2me' : 'j2me', 'sunos' : 'sunos', 'linux(.*)vine' : 'linuxvine', 'mac[_+ ]os[_+ ]x' : 'macosx', 'unix' : 'unix', 'windows[_+ ]?2000' : 'win2000', 'inferno' : 'inferno', 'aix' : 'aix', 'akregator' : 'linux', 'atari' : 'atari', 'linux(.*)asplinux' : 'linuxasplinux', 'linux(.*)ubuntu' : 'linuxubuntu', 'win(.*)95' : 'win95', 'xbox' : 'winxbox', 'applesyndication' : 'macosx', 'risc[_+ ]?os' : 'riscos', 'playstation' : 'psp', 'winnt' : 'winnt', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'palmos' : 'palmos', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'syllable' : 'syllable', 'commodore' : 'commodore', 'vienna' : 'macosx', 'linux(.*)gentoo' : 'linuxgentoo', 'hp\-ux' : 'hp\-ux', 'linux(.*)fedora' : 'linuxfedora', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'openbsd' : 'bsdopenbsd', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'mac[_+ ]68' : 'macintosh', 'windows[_+ ]?vista' : 'winvista', 'newsfire' : 'macosx', 'windows[_+ ]?2008' : 'win2008', 'linux(.*)mandr' : 'linuxmandr', 'gnu.kfreebsd' : 'bsdkfreebsd', 'bsdi' : 'bsdi', 'win32' : 'winnt', 'webtv' : 'webtv', 'linux(.*)momonga' : 'linuxmomonga', 'msie[_+ ]' : 'winunknown', 'qnx' : 'qnx', 'iphone[_+ ]os' : 'ios', 'linux(.*)zenwalk' : 'linuxzenwalk', 'beos' : 'beos', 'ms[_+ ]frontpage' : 'winunknown'} + +operating_systems_family = {'mac' : 'Macintosh', 'linux' : 'Linux', 'bsd' : 'BSD', 'win' : 'Windows'} + +browsers = ['elinks', 'firebird', 'go!zilla', 'icab', 'links', 'lynx', 'omniweb', '22acidownload', 'abrowse', 'aol\-iweng', 'amaya', 'amigavoyager', 'arora', 'aweb', 'charon', 'donzilla', 'seamonkey', 'flock', 'minefield', 'bonecho', 'granparadiso', 'songbird', 'strata', 'sylera', 'kazehakase', 'prism', 'icecat', 'iceape', 'iceweasel', 'w3clinemode', 'bpftp', 'camino', 'chimera', 'cyberdog', 'dillo', 'xchaos_arachne', 'doris', 'dreamcast', 'xbox', 'downloadagent', 'ecatch', 'emailsiphon', 'encompass', 'epiphany', 'friendlyspider', 'fresco', 'galeon', 'flashget', 'freshdownload', 'getright', 'leechget', 'netants', 'headdump', 'hotjava', 'ibrowse', 'intergo', 'k\-meleon', 'k\-ninja', 'linemodebrowser', 'lotus\-notes', 'macweb', 'multizilla', 'ncsa_mosaic', 'netcaptor', 'netpositive', 'nutscrape', 'msfrontpageexpress', 'contiki', 'emacs\-w3', 'phoenix', 'shiira', 'tzgeturl', 'viking', 'webfetcher', 'webexplorer', 'webmirror', 'webvcr', 'qnx\svoyager', 'teleport', 'webcapture', 'webcopier', 'real', 'winamp', 'windows\-media\-player', 'audion', 'freeamp', 'itunes', 'jetaudio', 'mint_audio', 'mpg123', 'mplayer', 'nsplayer', 'qts', 'quicktime', 'sonique', 'uplayer', 'xaudio', 'xine', 'xmms', 'gstreamer', 'abilon', 'aggrevator', 'aiderss', 'akregator', 'applesyndication', 'betanews_reader', 'blogbridge', 'cyndicate', 'feeddemon', 'feedreader', 'feedtools', 'greatnews', 'gregarius', 'hatena_rss', 'jetbrains_omea', 'liferea', 'netnewswire', 'newsfire', 'newsgator', 'newzcrawler', 'plagger', 'pluck', 'potu', 'pubsub\-rss\-reader', 'pulpfiction', 'rssbandit', 'rssreader', 'rssowl', 'rss\sxpress', 'rssxpress', 'sage', 'sharpreader', 'shrook', 'straw', 'syndirella', 'vienna', 'wizz\srss\snews\sreader', 'alcatel', 'lg\-', 'mot\-', 'nokia', 'panasonic', 'philips', 'sagem', 'samsung', 'sie\-', 'sec\-', 'sonyericsson', 'ericsson', 'mmef', 'mspie', 'vodafone', 'wapalizer', 'wapsilon', 'wap', 'webcollage', 'up\.', 'android', 'blackberry', 'cnf2', 'docomo', 'ipcheck', 'iphone', 'portalmmm', 'webtv', 'democracy', 'cjb\.net', 'ossproxy', 'smallproxy', 'adobeair', 'apt', 'analogx_proxy', 'gnome\-vfs', 'neon', 'curl', 'csscheck', 'httrack', 'fdm', 'javaws', 'wget', 'fget', 'chilkat', 'webdownloader\sfor\sx', 'w3m', 'wdg_validator', 'w3c_validator', 'jigsaw', 'webreaper', 'webzip', 'staroffice', 'gnus', 'nikto', 'download\smaster', 'microsoft\-webdav\-miniredir', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav', 'POE\-Component\-Client\-HTTP', 'mozilla', 'libwww', 'lwp', 'WebSec'] + +browsers_hashid = {'jetbrains_omea' : 'Omea (RSS Reader)', 'aol\-iweng' : 'AOL-Iweng', 'webcapture' : 'Acrobat Webcapture', 'winamp' : 'WinAmp (media player)', 'chrome' : 'Google Chrome', 'analogx_proxy' : 'AnalogX Proxy', 'sylera' : 'Sylera', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'xchaos_arachne' : 'Arachne', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'lynx' : 'Lynx', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'emailsiphon' : 'EmailSiphon', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'javaws' : 'Java Web Start', 'ecatch' : 'eCatch', 'aggrevator' : 'Aggrevator (RSS Reader)', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'qts' : 'QuickTime (media player)', 'linemodebrowser' : 'W3C Line Mode Browser', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'xine' : 'Xine, a free multimedia player (media player)', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'flock' : 'Flock', 'audion' : 'Audion (media player)', 'icecat' : 'GNU IceCat', 'webfetcher' : 'WebFetcher', 'flashget' : 'FlashGet', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'friendlyspider' : 'FriendlySpider', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'ipcheck' : 'Supervision IP Check (phone)', 'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'svn' : 'Subversion client', 'lwp' : 'LibWWW-perl', 'plagger' : 'Plagger (RSS Reader)', 'shrook' : 'Shrook (RSS Reader)', 'mplayer' : 'The Movie Player (media player)', 'nsplayer' : 'NetShow Player (media player)', 'mint_audio' : 'Mint Audio (media player)', 'fget' : 'FGet', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'rssreader' : 'RssReader (RSS Reader)', 'download\smaster' : 'Download Master', 'itunes' : 'Apple iTunes (media player)', 'arora' : 'Arora', 'contiki' : 'Contiki', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'nutscrape' : 'Nutscrape', 'fdm' : 'FDM Free Download Manager', 'prism' : 'Prism', 'safari' : 'Safari', 'encompass' : 'Encompass', 'feedreader' : 'FeedReader (RSS Reader)', 'newsgator' : 'NewsGator (RSS Reader)', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'android' : 'Android browser (PDA/Phone browser)', 'strata' : 'Strata', 'teleport' : 'TelePort Pro', 'songbird' : 'Songbird', 'syndirella' : 'Syndirella (RSS Reader)', 'epiphany' : 'Epiphany', 'minefield' : 'Minefield (Firefox 3.0 development)', 'ncsa_mosaic' : 'NCSA Mosaic', 'links' : 'Links', 'macweb' : 'MacWeb', 'iphone' : 'IPhone (PDA/Phone browser)', 'cjb\.net' : 'CJB.NET Proxy', 'bpftp' : 'BPFTP', 'netcaptor' : 'NetCaptor', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'dreamcast' : 'Dreamcast', 'straw' : 'Straw (RSS Reader)', 'windows\-media\-player' : 'Windows Media Player (media player)', 'philips' : 'Philips Browser (PDA/Phone browser)', 'netpositive' : 'NetPositive', 'doris' : 'Doris (for Symbian)', 'gstreamer' : 'GStreamer (media library)', 'intergo' : 'InterGO', 'shiira' : 'Shiira', 'gregarius' : 'Gregarius (RSS Reader)', 'potu' : 'Potu (RSS Reader)', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'smallproxy' : 'SmallProxy', 'galeon' : 'Galeon', 'iceweasel' : 'Iceweasel', 'leechget' : 'LeechGet', 'opera' : 'Opera', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'samsung' : 'Samsung (PDA/Phone browser)', 'charon' : 'Charon', 'democracy' : 'Democracy', 'freshdownload' : 'FreshDownload', 'freeamp' : 'FreeAmp (media player)', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'elinks' : 'ELinks', 'multizilla' : 'MultiZilla', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'nikto' : 'Nikto Web Scanner', 'mpg123' : 'mpg123 (media player)', 'gnus' : 'Gnus Network User Services', 'firefox' : 'Firefox', 'msie' : 'MS Internet Explorer', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'akregator' : 'Akregator (RSS Reader)', 'hatena_rss' : 'Hatena (RSS Reader)', 'iceape' : 'GNU IceApe', 'viking' : 'Viking', 'k\-ninja' : 'K-Ninja', 'ibrowse' : 'iBrowse', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'apt' : 'Debian APT', 'curl' : 'Curl', 'xbox' : 'XBoX', 'aweb' : 'AWeb', 'WebSec' : 'Web Secretary', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'qnx\svoyager' : 'QNX Voyager', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'go!zilla' : 'Go!Zilla', 'cyndicate' : 'Cyndicate (RSS Reader)', 'wget' : 'Wget', 'jetaudio' : 'JetAudio (media player)', 'sharpreader' : 'SharpReader (RSS Reader)', 'w3c_validator' : 'W3C Validator', 'netscape' : 'Netscape', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'feeddemon' : 'FeedDemon (RSS Reader)', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'aiderss' : 'AideRSS (RSS Reader)', 'lg\-' : 'LG (PDA/Phone browser)', 'webzip' : 'WebZIP', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'webreaper' : 'WebReaper', 'k\-meleon' : 'K-Meleon', 'pluck' : 'Pluck (RSS Reader)', 'msfrontpageexpress' : 'MS FrontPage Express', 'fresco' : 'ANT Fresco', 'httrack' : 'HTTrack', 'real' : 'Real player or compatible (media player)', 'quicktime' : 'QuickTime (media player)', 'konqueror' : 'Konqueror', 'jigsaw' : 'W3C Validator', 'sie\-' : 'SIE (PDA/Phone browser)', 'mozilla' : 'Mozilla', '22acidownload' : '22AciDownload', 'netants' : 'NetAnts', 'csscheck' : 'WDG CSS Validator', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'sagem' : 'Sagem (PDA/Phone browser)', 'xmms' : 'XMMS (media player)', 'rssxpress' : 'RSSXpress (RSS Reader)', 'wdg_validator' : 'WDG HTML Validator', 'amigavoyager' : 'AmigaVoyager', 'vienna' : 'Vienna (RSS Reader)', 'feedtools' : 'FeedTools (RSS Reader)', 'camino' : 'Camino', 'blogbridge' : 'BlogBridge (RSS Reader)', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'hotjava' : 'Sun HotJava', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'w3m' : 'w3m', 'dillo' : 'Dillo', 'liferea' : 'Liferea (RSS Reader)', 'getright' : 'GetRight', 'kazehakase' : 'Kazehakase', 'lotus\-notes' : 'Lotus Notes web client', 'tzgeturl' : 'TzGetURL', 'sage' : 'Sage (RSS Reader)', 'webcopier' : 'WebCopier', 'phoenix' : 'Phoenix', 'abrowse' : 'ABrowse', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'w3clinemode' : 'W3CLineMode', 'chimera' : 'Chimera (Old Camino)', 'headdump' : 'HeadDump', 'abilon' : 'Abilon (RSS Reader)', 'downloadagent' : 'DownloadAgent', 'cyberdog' : 'Cyberdog', 'rssowl' : 'RSSOwl (RSS Reader)', 'newsfire' : 'NewsFire (RSS Reader)', 'webdownloader\sfor\sx' : 'Downloader for X', 'sonique' : 'Sonique (media player)', 'webmirror' : 'WebMirror', 'webexplorer' : 'IBM-WebExplorer', 'chilkat' : 'Chilkat', 'ossproxy' : 'OSSProxy', 'libwww' : 'LibWWW', 'adobeair' : 'AdobeAir', 'uplayer' : 'Ultra Player (media player)', 'amaya' : 'Amaya', 'webtv' : 'WebTV browser', 'neon' : 'Neon HTTP and WebDAV client library', 'greatnews' : 'GreatNews (RSS Reader)', 'seamonkey' : 'SeaMonkey', 'omniweb' : 'OmniWeb', 'donzilla' : 'Donzilla', 'webvcr' : 'WebVCR', 'icab' : 'iCab', 'firebird' : 'Firebird (Old Firefox)', 'staroffice' : 'StarOffice', 'emacs\-w3' : 'Emacs/w3s'} + +browsers_icons = {'jetbrains_omea' : 'rss', 'webcapture' : 'adobe', 'winamp' : 'mediaplayer', 'chrome' : 'chrome', 'analogx_proxy' : 'analogx', 'sylera' : 'mozilla', 'rss\sxpress' : 'rss', 'mspie' : 'pdaphone', 'lynx' : 'lynx', 'alcatel' : 'pdaphone', 'javaws' : 'java', 'ecatch' : 'ecatch', 'aggrevator' : 'rss', 'mmef' : 'pdaphone', 'qts' : 'mediaplayer', 'wizz\srss\snews\sreader' : 'wizz', 'xine' : 'mediaplayer', 'gnome\-vfs' : 'gnome', 'flock' : 'flock', 'audion' : 'mediaplayer', 'icecat' : 'icecat', 'flashget' : 'flashget', 'docomo' : 'pdaphone', 'avantbrowser' : 'avant', 'wapalizer' : 'pdaphone', 'wapsilon' : 'pdaphone', 'svn' : 'subversion', 'plagger' : 'rss', 'shrook' : 'rss', 'mplayer' : 'mediaplayer', 'nsplayer' : 'netshow', 'mint_audio' : 'mediaplayer', 'panasonic' : 'pdaphone', 'rssreader' : 'rss', 'itunes' : 'mediaplayer', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'mot\-' : 'pdaphone', 'prism' : 'mozilla', 'safari' : 'safari', 'encompass' : 'encompass', 'feedreader' : 'rss', 'newsgator' : 'rss', 'microsoft\-webdav\-miniredir' : 'frontpage', 'android' : 'android', 'teleport' : 'teleport', 'strata' : 'mozilla', 'songbird' : 'mozilla', 'syndirella' : 'rss', 'epiphany' : 'epiphany', 'minefield' : 'firefox', 'ncsa_mosaic' : 'ncsa_mosaic', 'macweb' : 'macweb', 'iphone' : 'pdaphone', 'cjb\.net' : 'cjbnet', 'bpftp' : 'bpftp', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'dreamcast' : 'dreamcast', 'straw' : 'rss', 'windows\-media\-player' : 'mplayer', 'philips' : 'pdaphone', 'netpositive' : 'netpositive', 'doris' : 'doris', 'gregarius' : 'rss', 'potu' : 'rss', 'blackberry' : 'pdaphone', 'galeon' : 'galeon', 'iceweasel' : 'iceweasel', 'leechget' : 'leechget', 'opera' : 'opera', 'pubsub\-rss\-reader' : 'rss', 'vodafone' : 'pdaphone', 'rssbandit' : 'rss', 'samsung' : 'pdaphone', 'freshdownload' : 'freshdownload', 'freeamp' : 'mediaplayer', 'nokia' : 'pdaphone', 'multizilla' : 'multizilla', 'ericsson' : 'pdaphone', 'mpg123' : 'mediaplayer', 'gnus' : 'gnus', 'firefox' : 'firefox', 'msie' : 'msie', 'betanews_reader' : 'rss', 'akregator' : 'rss', 'hatena_rss' : 'rss', 'iceape' : 'mozilla', 'ibrowse' : 'ibrowse', 'sonyericsson' : 'pdaphone', 'portalmmm' : 'pdaphone', 'apt' : 'apt', 'xbox' : 'winxbox', 'aweb' : 'aweb', 'applesyndication' : 'rss', 'netnewswire' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'go!zilla' : 'gozilla', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'jetaudio' : 'mediaplayer', 'sharpreader' : 'rss', 'netscape' : 'netscape', 'webcollage' : 'pdaphone', 'feeddemon' : 'rss', 'wap' : 'pdaphone', 'aiderss' : 'rss', 'lg\-' : 'pdaphone', 'webzip' : 'webzip', 'pulpfiction' : 'rss', 'webreaper' : 'webreaper', 'pluck' : 'rss', 'k\-meleon' : 'kmeleon', 'msfrontpageexpress' : 'fpexpress', 'fresco' : 'fresco', 'httrack' : 'httrack', 'real' : 'real', 'konqueror' : 'konqueror', 'sie\-' : 'pdaphone', 'mozilla' : 'mozilla', 'sagem' : 'pdaphone', 'newzcrawler' : 'rss', 'rssxpress' : 'rss', 'xmms' : 'mediaplayer', 'vienna' : 'rss', 'amigavoyager' : 'amigavoyager', 'feedtools' : 'rss', 'camino' : 'chimera', 'blogbridge' : 'rss', 'bonecho' : 'firefox', 'granparadiso' : 'firefox', 'hotjava' : 'hotjava', 'up\.' : 'pdaphone', 'dillo' : 'dillo', 'liferea' : 'rss', 'getright' : 'getright', 'kazehakase' : 'mozilla', 'lotus\-notes' : 'lotusnotes', 'sage' : 'rss', 'webcopier' : 'webcopier', 'phoenix' : 'phoenix', 'sec\-' : 'pdaphone', 'xaudio' : 'mediaplayer', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'chimera' : 'chimera', 'abilon' : 'abilon', 'rssowl' : 'rss', 'cyberdog' : 'cyberdog', 'newsfire' : 'rss', 'sonique' : 'mediaplayer', 'adobeair' : 'adobe', 'uplayer' : 'mediaplayer', 'amaya' : 'amaya', 'webtv' : 'webtv', 'neon' : 'neon', 'greatnews' : 'rss', 'seamonkey' : 'seamonkey', 'omniweb' : 'omniweb', 'donzilla' : 'mozilla', 'icab' : 'icab', 'firebird' : 'phoenix', 'staroffice' : 'staroffice'} + diff --git a/conf.py b/conf.py index 71f89a3..aeb6ad1 100644 --- a/conf.py +++ b/conf.py @@ -10,8 +10,8 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers'] #, 'reverse_dns'] +display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers'] # Reverse DNS timeout reverse_dns_timeout = 0.2 diff --git a/plugins/display/operating_systems.py b/plugins/display/operating_systems.py new file mode 100644 index 0000000..47ddd87 --- /dev/null +++ b/plugins/display/operating_systems.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +import awstats_data + +""" +Display hook + +Add operating systems statistics + +Plugin requirements : + post_analysis/operating_systems + +Conf values needed : + create_families_page* + +Output files : + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopOperatingSystems(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTopOperatingSystems, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisOperatingSystems'] + + def load(self): + self.icon_path = self.iwla.getConfValue('icon_path', '/') + self.create_families_pages = self.iwla.getConfValue('create_families_pages_page', True) + self.icon_names = {v:k for (k, v) in awstats_data.operating_systems_family.items()} + + return True + + def hook(self): + display = self.iwla.getDisplay() + os_families = self.iwla.getMonthStats()['os_families'] + os_families = sorted(os_families.items(), key=lambda t: t[1], reverse=True) + operating_systems = self.iwla.getMonthStats()['operating_systems'] + operating_systems = sorted(operating_systems.items(), key=lambda t: t[1], reverse=True) + + # All in a page + if self.create_families_pages: + title = createCurTitle(self.iwla, u'All Operating Systems') + filename = 'operating_systems.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Operating Systems'), ['', self.iwla._(u'Operating System'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', '', 'iwla_hit']) + for (os_name, entrance) in operating_systems: + icon = '' % (self.icon_path, os_name) + table.appendRow([icon, os_name, entrance]) + page.appendBlock(table) + + display.addPage(page) + + # Families in index + title = self.iwla._(u'Operating Systems') + if self.create_families_pages: + link = '%s' % (filename, self.iwla._(u'Details')) + title = '%s - %s' % (title, link) + + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, ['', self.iwla._(u'Operating System'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', '', 'iwla_hit']) + for (family, entrance) in os_families: + icon = '' % (self.icon_path, self.icon_names[family]) + table.appendRow([icon, family, entrance]) + index.appendBlock(table) diff --git a/plugins/post_analysis/operating_systems.py b/plugins/post_analysis/operating_systems.py new file mode 100644 index 0000000..4fc1f73 --- /dev/null +++ b/plugins/post_analysis/operating_systems.py @@ -0,0 +1,126 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +""" +Post analysis hook + +Detect operating systems from requests + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : +visits : + remote_addr => + operating_system + +month_stats : + operating_systems => + operating_system => count + + os_families => + family => count + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLAPostAnalysisOperatingSystems(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisOperatingSystems, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.operating_systems = [] + self.os_family = {} + + for hashid in awstats_data.operating_systems: + hashid_re = re.compile(r'.*%s.*' % (hashid), re.IGNORECASE) + + if hashid in awstats_data.operating_systems_hashid.keys(): + self.operating_systems.append((hashid_re, awstats_data.operating_systems_hashid[hashid])) + + for (name, family) in awstats_data.operating_systems_family.items(): + name_re = re.compile(r'.*%s.*' % (name)) + self.os_family[name_re] = family + + return True + + def hook(self): + stats = self.iwla.getValidVisitors() + month_stats = self.iwla.getMonthStats() + + operating_systems = month_stats.get('operating_systems', {}) + + os_stats = {} + family_stats = {} + + for (k, super_hit) in stats.items(): + if not 'operating_system' in super_hit: + for r in super_hit['requests'][::-1]: + user_agent = r['http_user_agent'] + if not user_agent: continue + + os_name = 'unknown' + for (hashid_re, operating_system) in self.operating_systems: + if hashid_re.match(user_agent): + os_name = operating_system + break + super_hit['operating_system'] = os_name + break + else: + os_name = super_hit['operating_system'] + + os_family = '' + if os_name != 'unknown': + for (name_re, family) in self.os_family.items(): + if name_re.match(os_name): + os_family = family + break + + if not os_name in os_stats.keys(): + os_stats[os_name] = 1 + else: + os_stats[os_name] += 1 + + if os_family: + if not os_family in family_stats.keys(): + family_stats[os_family] = 1 + else: + family_stats[os_family] += 1 + + month_stats['operating_systems'] = os_stats + month_stats['os_families'] = family_stats diff --git a/tools/iwla_convert.pl b/tools/iwla_convert.pl index b5c9587..970ce4d 100755 --- a/tools/iwla_convert.pl +++ b/tools/iwla_convert.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -my $awstats_lib_root = './'; -my @awstats_libs = ('search_engines.pm', 'robots.pm'); +my $awstats_lib_root = '/usr/share/awstats/lib/'; +# my $awstats_lib_root = './'; +my @awstats_libs = ('search_engines.pm', 'robots.pm', 'operating_systems.pm', 'browsers.pm'); -# my $awstats_lib_root = '/usr/share/awstats/lib/'; # my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); foreach $lib (@awstats_libs) {require $awstats_lib_root . $lib;} @@ -51,6 +51,8 @@ sub dumpHash { # Robots open($FIC,">", "awstats_data.py") or die $!; +print $FIC "#This file was automatically generated by iwla_convert.pl. Do not edit manually.\n\n"; + print $FIC "robots = ["; dumpList(\@RobotsSearchIDOrder_list1, $FIC, 1); dumpList(\@RobotsSearchIDOrder_list2, $FIC, 0); @@ -76,4 +78,28 @@ print $FIC "search_engines_knwown_url = {"; dumpHash(\%SearchEnginesKnownUrl, $FIC, 1); print $FIC "}\n\n"; +print $FIC "operating_systems = ["; +dumpList(\@OSSearchIDOrder, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "operating_systems_hashid = {"; +dumpHash(\%OSHashID, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "operating_systems_family = {"; +dumpHash(\%OSFamily, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "browsers = ["; +dumpList(\@BrowsersSearchIDOrder, $FIC, 1); +print $FIC "]\n\n"; + +print $FIC "browsers_hashid = {"; +dumpHash(\%BrowsersHashIDLib, $FIC, 1); +print $FIC "}\n\n"; + +print $FIC "browsers_icons = {"; +dumpHash(\%BrowsersHashIcon, $FIC, 1); +print $FIC "}\n\n"; + close($FIC); From 2baf4173fdfe044319252a618aa47dfda6cb3159 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 8 Jan 2015 21:01:33 +0100 Subject: [PATCH 141/195] Add Browsers post analysis and display --- plugins/display/browsers.py | 124 ++++++++++++++++++++++++++++++ plugins/post_analysis/browsers.py | 103 +++++++++++++++++++++++++ 2 files changed, 227 insertions(+) create mode 100644 plugins/display/browsers.py create mode 100644 plugins/post_analysis/browsers.py diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py new file mode 100644 index 0000000..95b70cd --- /dev/null +++ b/plugins/display/browsers.py @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +import awstats_data + +""" +Display hook + +Create browsers page + +Plugin requirements : + post_analysis/browsers + +Conf values needed : + max_browsers_displayed* + create_browsers_page* + +Output files : + OUTPUT_ROOT/year/month/browsers.html + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayBrowsers(IPlugin): + def __init__(self, iwla): + super(IWLADisplayBrowsers, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisBrowsers'] + + def load(self): + self.icon_path = self.iwla.getConfValue('icon_path', '/') + self.max_browsers = self.iwla.getConfValue('max_browsers_displayed', 0) + self.create_browsers = self.iwla.getConfValue('create_browsers_page', True) + self.icon_names = {v:k for (k, v) in awstats_data.browsers_hashid.items()} + + return True + + def hook(self): + display = self.iwla.getDisplay() + browsers = self.iwla.getMonthStats()['browsers'] + browsers = sorted(browsers.items(), key=lambda t: t[1], reverse=True) + + # All in a file + if self.create_browsers: + title = createCurTitle(self.iwla, u'Browsers') + filename = 'browsers.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Browsers'), ['', self.iwla._(u'Browser'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', '', 'iwla_hit']) + total_browsers = [0]*3 + new_list = self.max_browsers and browsers[:self.max_browsers] or browsers + for (browser, entrance) in new_list: + if browser != 'unknown': + icon = '' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + else: + icon = '' % (self.icon_path) + browser = 'Unknown' + table.appendRow([icon, browser, entrance]) + total_browsers[1] += entrance + if self.max_browsers: + others = 0 + for (browser, entrance) in browsers[self.max_browsers:]: + others += entrance + table.appendRow(['', self.iwla._(u'Others'), others]) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + + page.appendBlock(table) + + display.addPage(page) + + title = 'Top Browsers' + if self.create_browsers: + link = '%s' % (filename, self.iwla._(u'All Browsers')) + title = '%s - %s' % (title, link) + + # Top in index + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, ['', self.iwla._(u'Browser'), self.iwla._(u'Entrance')]) + table.setColsCSSClass(['', '', 'iwla_hit']) + for (browser, entrance) in browsers[:10]: + if browser != 'unknown': + icon = '' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + else: + icon = '' % (self.icon_path) + browser = 'Unknown' + table.appendRow([icon, browser, entrance]) + total_browsers[1] -= entrance + if total_browsers[1]: + total_browsers[0] = self.iwla._(u'Others') + table.appendRow(total_browsers) + table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + index.appendBlock(table) diff --git a/plugins/post_analysis/browsers.py b/plugins/post_analysis/browsers.py new file mode 100644 index 0000000..2bb7b37 --- /dev/null +++ b/plugins/post_analysis/browsers.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +import awstats_data + +""" +Post analysis hook + +Detect browser information from requests + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : +visits : + remote_addr => + browser + +month_stats : + browsers => + browser => count + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLAPostAnalysisBrowsers(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisBrowsers, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + self.browsers = [] + + for hashid in awstats_data.browsers: + hashid_re = re.compile(r'.*%s.*' % (hashid), re.IGNORECASE) + + if hashid in awstats_data.browsers_hashid.keys(): + self.browsers.append((hashid_re, awstats_data.browsers_hashid[hashid])) + + return True + + def hook(self): + stats = self.iwla.getValidVisitors() + month_stats = self.iwla.getMonthStats() + + browsers = month_stats.get('browsers', {}) + + browsers_stats = {} + + for (k, super_hit) in stats.items(): + if not 'browser' in super_hit: + for r in super_hit['requests'][::-1]: + user_agent = r['http_user_agent'] + if not user_agent: continue + + browser_name = 'unknown' + for (hashid_re, browser) in self.browsers: + if hashid_re.match(user_agent): + browser_name = browser + break + super_hit['browser'] = browser_name + break + else: + browser_name = super_hit['browser'] + + if not browser_name in browsers_stats.keys(): + browsers_stats[browser_name] = 1 + else: + browsers_stats[browser_name] += 1 + + month_stats['browsers'] = browsers_stats From 7bfbac1f52137331b8f3b2c3dd52f6f533eafc60 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 8 Jan 2015 21:02:01 +0100 Subject: [PATCH 142/195] Add operating systems and browsers icons --- resources/icon/browser/abilon.png | Bin 0 -> 557 bytes resources/icon/browser/adobe.png | Bin 0 -> 340 bytes resources/icon/browser/akregator.png | Bin 0 -> 554 bytes resources/icon/browser/alcatel.png | Bin 0 -> 351 bytes resources/icon/browser/amaya.png | Bin 0 -> 316 bytes resources/icon/browser/amigavoyager.png | Bin 0 -> 288 bytes resources/icon/browser/analogx.png | Bin 0 -> 655 bytes resources/icon/browser/android.png | Bin 0 -> 230 bytes resources/icon/browser/apt.png | Bin 0 -> 315 bytes resources/icon/browser/avant.png | Bin 0 -> 770 bytes resources/icon/browser/aweb.png | Bin 0 -> 607 bytes resources/icon/browser/bpftp.png | Bin 0 -> 714 bytes resources/icon/browser/bytel.png | Bin 0 -> 505 bytes resources/icon/browser/chimera.png | Bin 0 -> 288 bytes resources/icon/browser/chrome.png | Bin 0 -> 760 bytes resources/icon/browser/cyberdog.png | Bin 0 -> 689 bytes resources/icon/browser/da.png | Bin 0 -> 265 bytes resources/icon/browser/dillo.png | Bin 0 -> 768 bytes resources/icon/browser/doris.png | Bin 0 -> 724 bytes resources/icon/browser/dreamcast.png | Bin 0 -> 303 bytes resources/icon/browser/ecatch.png | Bin 0 -> 707 bytes resources/icon/browser/encompass.png | Bin 0 -> 757 bytes resources/icon/browser/epiphany.png | Bin 0 -> 631 bytes resources/icon/browser/ericsson.png | Bin 0 -> 1049 bytes resources/icon/browser/feeddemon.png | Bin 0 -> 677 bytes resources/icon/browser/feedreader.png | Bin 0 -> 552 bytes resources/icon/browser/firefox.png | Bin 0 -> 824 bytes resources/icon/browser/flashget.png | Bin 0 -> 488 bytes resources/icon/browser/flock.png | Bin 0 -> 420 bytes resources/icon/browser/fpexpress.png | Bin 0 -> 420 bytes resources/icon/browser/fresco.png | Bin 0 -> 708 bytes resources/icon/browser/freshdownload.png | Bin 0 -> 623 bytes resources/icon/browser/frontpage.png | Bin 0 -> 662 bytes resources/icon/browser/galeon.png | Bin 0 -> 288 bytes resources/icon/browser/getright.png | Bin 0 -> 278 bytes resources/icon/browser/gnome.png | Bin 0 -> 710 bytes resources/icon/browser/gnus.png | Bin 0 -> 930 bytes resources/icon/browser/gozilla.png | Bin 0 -> 269 bytes resources/icon/browser/hotjava.png | Bin 0 -> 791 bytes resources/icon/browser/httrack.png | Bin 0 -> 894 bytes resources/icon/browser/ibrowse.png | Bin 0 -> 269 bytes resources/icon/browser/icab.png | Bin 0 -> 314 bytes resources/icon/browser/icecat.png | Bin 0 -> 421 bytes resources/icon/browser/iceweasel.png | Bin 0 -> 419 bytes resources/icon/browser/java.png | Bin 0 -> 288 bytes resources/icon/browser/jetbrains_omea.png | Bin 0 -> 676 bytes resources/icon/browser/kmeleon.png | Bin 0 -> 288 bytes resources/icon/browser/konqueror.png | Bin 0 -> 285 bytes resources/icon/browser/leechget.png | Bin 0 -> 682 bytes resources/icon/browser/lg.png | Bin 0 -> 541 bytes resources/icon/browser/lotusnotes.png | Bin 0 -> 344 bytes resources/icon/browser/lynx.png | Bin 0 -> 288 bytes resources/icon/browser/macweb.png | Bin 0 -> 662 bytes resources/icon/browser/mediaplayer.png | Bin 0 -> 370 bytes resources/icon/browser/motorola.png | Bin 0 -> 655 bytes resources/icon/browser/mozilla.png | Bin 0 -> 289 bytes resources/icon/browser/mplayer.png | Bin 0 -> 689 bytes resources/icon/browser/msie.png | Bin 0 -> 314 bytes resources/icon/browser/msie_large.png | Bin 0 -> 475 bytes resources/icon/browser/multizilla.png | Bin 0 -> 289 bytes resources/icon/browser/ncsa_mosaic.png | Bin 0 -> 790 bytes resources/icon/browser/neon.png | Bin 0 -> 328 bytes resources/icon/browser/netnewswire.png | Bin 0 -> 667 bytes resources/icon/browser/netpositive.png | Bin 0 -> 372 bytes resources/icon/browser/netscape.png | Bin 0 -> 208 bytes resources/icon/browser/netscape_large.png | Bin 0 -> 440 bytes resources/icon/browser/netshow.png | Bin 0 -> 636 bytes resources/icon/browser/newsfire.png | Bin 0 -> 646 bytes resources/icon/browser/newsgator.png | Bin 0 -> 550 bytes resources/icon/browser/newzcrawler.png | Bin 0 -> 980 bytes resources/icon/browser/nokia.png | Bin 0 -> 397 bytes resources/icon/browser/notavailable.png | Bin 0 -> 241 bytes resources/icon/browser/omniweb.png | Bin 0 -> 355 bytes resources/icon/browser/opera.png | Bin 0 -> 284 bytes resources/icon/browser/panasonic.png | Bin 0 -> 302 bytes resources/icon/browser/pdaphone.png | Bin 0 -> 351 bytes resources/icon/browser/philips.png | Bin 0 -> 686 bytes resources/icon/browser/phoenix.png | Bin 0 -> 514 bytes resources/icon/browser/pluck.png | Bin 0 -> 662 bytes resources/icon/browser/pulpfiction.png | Bin 0 -> 689 bytes resources/icon/browser/real.png | Bin 0 -> 1406 bytes resources/icon/browser/rss.png | Bin 0 -> 403 bytes resources/icon/browser/rssbandit.png | Bin 0 -> 642 bytes resources/icon/browser/rssowl.png | Bin 0 -> 674 bytes resources/icon/browser/rssreader.png | Bin 0 -> 1053 bytes resources/icon/browser/rssxpress.png | Bin 0 -> 659 bytes resources/icon/browser/safari.png | Bin 0 -> 324 bytes resources/icon/browser/sagem.png | Bin 0 -> 600 bytes resources/icon/browser/samsung.png | Bin 0 -> 371 bytes resources/icon/browser/seamonkey.png | Bin 0 -> 429 bytes resources/icon/browser/sharp.png | Bin 0 -> 299 bytes resources/icon/browser/sharpreader.png | Bin 0 -> 651 bytes resources/icon/browser/shrook.png | Bin 0 -> 600 bytes resources/icon/browser/siemens.png | Bin 0 -> 277 bytes resources/icon/browser/sony.png | Bin 0 -> 1049 bytes resources/icon/browser/staroffice.png | Bin 0 -> 269 bytes resources/icon/browser/subversion.png | Bin 0 -> 916 bytes resources/icon/browser/teleport.png | Bin 0 -> 228 bytes resources/icon/browser/trium.png | Bin 0 -> 424 bytes resources/icon/browser/unknown.png | Bin 0 -> 218 bytes resources/icon/browser/w3c.png | Bin 0 -> 580 bytes resources/icon/browser/webcopier.png | Bin 0 -> 281 bytes resources/icon/browser/webreaper.png | Bin 0 -> 676 bytes resources/icon/browser/webtv.png | Bin 0 -> 319 bytes resources/icon/browser/webzip.png | Bin 0 -> 257 bytes resources/icon/browser/winxbox.png | Bin 0 -> 661 bytes resources/icon/browser/wizz.png | Bin 0 -> 684 bytes resources/icon/os/aix.png | Bin 0 -> 330 bytes resources/icon/os/amigaos.png | Bin 0 -> 342 bytes resources/icon/os/apple.png | Bin 0 -> 318 bytes resources/icon/os/atari.png | Bin 0 -> 347 bytes resources/icon/os/beos.png | Bin 0 -> 275 bytes resources/icon/os/blackberry.png | Bin 0 -> 351 bytes resources/icon/os/bsd.png | Bin 0 -> 253 bytes resources/icon/os/bsddflybsd.png | Bin 0 -> 329 bytes resources/icon/os/bsdfreebsd.png | Bin 0 -> 329 bytes resources/icon/os/bsdi.png | Bin 0 -> 253 bytes resources/icon/os/bsdkfreebsd.png | Bin 0 -> 329 bytes resources/icon/os/bsdnetbsd.png | Bin 0 -> 329 bytes resources/icon/os/bsdopenbsd.png | Bin 0 -> 358 bytes resources/icon/os/commodore.png | Bin 0 -> 842 bytes resources/icon/os/cpm.png | Bin 0 -> 191 bytes resources/icon/os/debian.png | Bin 0 -> 315 bytes resources/icon/os/digital.png | Bin 0 -> 262 bytes resources/icon/os/dos.png | Bin 0 -> 300 bytes resources/icon/os/dreamcast.png | Bin 0 -> 322 bytes resources/icon/os/freebsd.png | Bin 0 -> 329 bytes resources/icon/os/gnu.png | Bin 0 -> 313 bytes resources/icon/os/hpux.png | Bin 0 -> 338 bytes resources/icon/os/ibm.png | Bin 0 -> 238 bytes resources/icon/os/imode.png | Bin 0 -> 272 bytes resources/icon/os/inferno.png | Bin 0 -> 552 bytes resources/icon/os/ios.png | Bin 0 -> 486 bytes resources/icon/os/iphone.png | Bin 0 -> 486 bytes resources/icon/os/irix.png | Bin 0 -> 317 bytes resources/icon/os/j2me.png | Bin 0 -> 552 bytes resources/icon/os/java.png | Bin 0 -> 288 bytes resources/icon/os/kfreebsd.png | Bin 0 -> 329 bytes resources/icon/os/linux.png | Bin 0 -> 320 bytes resources/icon/os/linuxandroid.png | Bin 0 -> 230 bytes resources/icon/os/linuxasplinux.png | Bin 0 -> 320 bytes resources/icon/os/linuxcentos.png | Bin 0 -> 641 bytes resources/icon/os/linuxdebian.png | Bin 0 -> 623 bytes resources/icon/os/linuxfedora.png | Bin 0 -> 504 bytes resources/icon/os/linuxgentoo.png | Bin 0 -> 693 bytes resources/icon/os/linuxmandr.png | Bin 0 -> 450 bytes resources/icon/os/linuxpclinuxos.png | Bin 0 -> 320 bytes resources/icon/os/linuxredhat.png | Bin 0 -> 565 bytes resources/icon/os/linuxsuse.png | Bin 0 -> 434 bytes resources/icon/os/linuxubuntu.png | Bin 0 -> 628 bytes resources/icon/os/linuxvine.png | Bin 0 -> 320 bytes resources/icon/os/linuxzenwalk.png | Bin 0 -> 320 bytes resources/icon/os/mac.png | Bin 0 -> 282 bytes resources/icon/os/macintosh.png | Bin 0 -> 282 bytes resources/icon/os/macosx.png | Bin 0 -> 329 bytes resources/icon/os/netbsd.png | Bin 0 -> 329 bytes resources/icon/os/netware.png | Bin 0 -> 292 bytes resources/icon/os/next.png | Bin 0 -> 292 bytes resources/icon/os/openbsd.png | Bin 0 -> 358 bytes resources/icon/os/os2.png | Bin 0 -> 321 bytes resources/icon/os/osf.png | Bin 0 -> 299 bytes resources/icon/os/palmos.png | Bin 0 -> 351 bytes resources/icon/os/psp.png | Bin 0 -> 404 bytes resources/icon/os/qnx.png | Bin 0 -> 249 bytes resources/icon/os/riscos.png | Bin 0 -> 273 bytes resources/icon/os/sco.png | Bin 0 -> 252 bytes resources/icon/os/sunos.png | Bin 0 -> 210 bytes resources/icon/os/syllable.png | Bin 0 -> 552 bytes resources/icon/os/symbian.png | Bin 0 -> 298 bytes resources/icon/os/unix.png | Bin 0 -> 302 bytes resources/icon/os/unknown.png | Bin 0 -> 218 bytes resources/icon/os/vms.png | Bin 0 -> 301 bytes resources/icon/os/webtv.png | Bin 0 -> 319 bytes resources/icon/os/wii.png | Bin 0 -> 552 bytes resources/icon/os/win.png | Bin 0 -> 334 bytes resources/icon/os/win16.png | Bin 0 -> 334 bytes resources/icon/os/win2000.png | Bin 0 -> 334 bytes resources/icon/os/win2003.png | Bin 0 -> 318 bytes resources/icon/os/win2008.png | Bin 0 -> 318 bytes resources/icon/os/win7.png | Bin 0 -> 729 bytes resources/icon/os/win95.png | Bin 0 -> 334 bytes resources/icon/os/win98.png | Bin 0 -> 334 bytes resources/icon/os/wince.png | Bin 0 -> 334 bytes resources/icon/os/winlong.png | Bin 0 -> 729 bytes resources/icon/os/winme.png | Bin 0 -> 334 bytes resources/icon/os/winnt.png | Bin 0 -> 334 bytes resources/icon/os/winunknown.png | Bin 0 -> 334 bytes resources/icon/os/winvista.png | Bin 0 -> 318 bytes resources/icon/os/winxbox.png | Bin 0 -> 661 bytes resources/icon/os/winxp.png | Bin 0 -> 318 bytes 190 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/icon/browser/abilon.png create mode 100644 resources/icon/browser/adobe.png create mode 100644 resources/icon/browser/akregator.png create mode 100644 resources/icon/browser/alcatel.png create mode 100644 resources/icon/browser/amaya.png create mode 100644 resources/icon/browser/amigavoyager.png create mode 100644 resources/icon/browser/analogx.png create mode 100644 resources/icon/browser/android.png create mode 100644 resources/icon/browser/apt.png create mode 100644 resources/icon/browser/avant.png create mode 100644 resources/icon/browser/aweb.png create mode 100644 resources/icon/browser/bpftp.png create mode 100644 resources/icon/browser/bytel.png create mode 100644 resources/icon/browser/chimera.png create mode 100644 resources/icon/browser/chrome.png create mode 100644 resources/icon/browser/cyberdog.png create mode 100644 resources/icon/browser/da.png create mode 100644 resources/icon/browser/dillo.png create mode 100644 resources/icon/browser/doris.png create mode 100644 resources/icon/browser/dreamcast.png create mode 100644 resources/icon/browser/ecatch.png create mode 100644 resources/icon/browser/encompass.png create mode 100644 resources/icon/browser/epiphany.png create mode 100644 resources/icon/browser/ericsson.png create mode 100644 resources/icon/browser/feeddemon.png create mode 100644 resources/icon/browser/feedreader.png create mode 100644 resources/icon/browser/firefox.png create mode 100644 resources/icon/browser/flashget.png create mode 100644 resources/icon/browser/flock.png create mode 100644 resources/icon/browser/fpexpress.png create mode 100644 resources/icon/browser/fresco.png create mode 100644 resources/icon/browser/freshdownload.png create mode 100644 resources/icon/browser/frontpage.png create mode 100644 resources/icon/browser/galeon.png create mode 100644 resources/icon/browser/getright.png create mode 100644 resources/icon/browser/gnome.png create mode 100644 resources/icon/browser/gnus.png create mode 100644 resources/icon/browser/gozilla.png create mode 100644 resources/icon/browser/hotjava.png create mode 100644 resources/icon/browser/httrack.png create mode 100644 resources/icon/browser/ibrowse.png create mode 100644 resources/icon/browser/icab.png create mode 100644 resources/icon/browser/icecat.png create mode 100644 resources/icon/browser/iceweasel.png create mode 100644 resources/icon/browser/java.png create mode 100644 resources/icon/browser/jetbrains_omea.png create mode 100644 resources/icon/browser/kmeleon.png create mode 100644 resources/icon/browser/konqueror.png create mode 100644 resources/icon/browser/leechget.png create mode 100644 resources/icon/browser/lg.png create mode 100644 resources/icon/browser/lotusnotes.png create mode 100644 resources/icon/browser/lynx.png create mode 100644 resources/icon/browser/macweb.png create mode 100644 resources/icon/browser/mediaplayer.png create mode 100644 resources/icon/browser/motorola.png create mode 100644 resources/icon/browser/mozilla.png create mode 100644 resources/icon/browser/mplayer.png create mode 100644 resources/icon/browser/msie.png create mode 100644 resources/icon/browser/msie_large.png create mode 100644 resources/icon/browser/multizilla.png create mode 100644 resources/icon/browser/ncsa_mosaic.png create mode 100644 resources/icon/browser/neon.png create mode 100644 resources/icon/browser/netnewswire.png create mode 100644 resources/icon/browser/netpositive.png create mode 100644 resources/icon/browser/netscape.png create mode 100644 resources/icon/browser/netscape_large.png create mode 100644 resources/icon/browser/netshow.png create mode 100644 resources/icon/browser/newsfire.png create mode 100644 resources/icon/browser/newsgator.png create mode 100644 resources/icon/browser/newzcrawler.png create mode 100644 resources/icon/browser/nokia.png create mode 100644 resources/icon/browser/notavailable.png create mode 100644 resources/icon/browser/omniweb.png create mode 100644 resources/icon/browser/opera.png create mode 100644 resources/icon/browser/panasonic.png create mode 100644 resources/icon/browser/pdaphone.png create mode 100644 resources/icon/browser/philips.png create mode 100644 resources/icon/browser/phoenix.png create mode 100644 resources/icon/browser/pluck.png create mode 100644 resources/icon/browser/pulpfiction.png create mode 100644 resources/icon/browser/real.png create mode 100644 resources/icon/browser/rss.png create mode 100644 resources/icon/browser/rssbandit.png create mode 100644 resources/icon/browser/rssowl.png create mode 100644 resources/icon/browser/rssreader.png create mode 100644 resources/icon/browser/rssxpress.png create mode 100644 resources/icon/browser/safari.png create mode 100644 resources/icon/browser/sagem.png create mode 100644 resources/icon/browser/samsung.png create mode 100644 resources/icon/browser/seamonkey.png create mode 100644 resources/icon/browser/sharp.png create mode 100644 resources/icon/browser/sharpreader.png create mode 100644 resources/icon/browser/shrook.png create mode 100644 resources/icon/browser/siemens.png create mode 100644 resources/icon/browser/sony.png create mode 100644 resources/icon/browser/staroffice.png create mode 100644 resources/icon/browser/subversion.png create mode 100644 resources/icon/browser/teleport.png create mode 100644 resources/icon/browser/trium.png create mode 100644 resources/icon/browser/unknown.png create mode 100644 resources/icon/browser/w3c.png create mode 100644 resources/icon/browser/webcopier.png create mode 100644 resources/icon/browser/webreaper.png create mode 100644 resources/icon/browser/webtv.png create mode 100644 resources/icon/browser/webzip.png create mode 100644 resources/icon/browser/winxbox.png create mode 100644 resources/icon/browser/wizz.png create mode 100644 resources/icon/os/aix.png create mode 100644 resources/icon/os/amigaos.png create mode 100644 resources/icon/os/apple.png create mode 100644 resources/icon/os/atari.png create mode 100644 resources/icon/os/beos.png create mode 100644 resources/icon/os/blackberry.png create mode 100644 resources/icon/os/bsd.png create mode 100644 resources/icon/os/bsddflybsd.png create mode 100644 resources/icon/os/bsdfreebsd.png create mode 100644 resources/icon/os/bsdi.png create mode 100644 resources/icon/os/bsdkfreebsd.png create mode 100644 resources/icon/os/bsdnetbsd.png create mode 100644 resources/icon/os/bsdopenbsd.png create mode 100644 resources/icon/os/commodore.png create mode 100644 resources/icon/os/cpm.png create mode 100644 resources/icon/os/debian.png create mode 100644 resources/icon/os/digital.png create mode 100644 resources/icon/os/dos.png create mode 100644 resources/icon/os/dreamcast.png create mode 100644 resources/icon/os/freebsd.png create mode 100644 resources/icon/os/gnu.png create mode 100644 resources/icon/os/hpux.png create mode 100644 resources/icon/os/ibm.png create mode 100644 resources/icon/os/imode.png create mode 100644 resources/icon/os/inferno.png create mode 100644 resources/icon/os/ios.png create mode 100644 resources/icon/os/iphone.png create mode 100644 resources/icon/os/irix.png create mode 100644 resources/icon/os/j2me.png create mode 100644 resources/icon/os/java.png create mode 100644 resources/icon/os/kfreebsd.png create mode 100644 resources/icon/os/linux.png create mode 100644 resources/icon/os/linuxandroid.png create mode 100644 resources/icon/os/linuxasplinux.png create mode 100644 resources/icon/os/linuxcentos.png create mode 100644 resources/icon/os/linuxdebian.png create mode 100644 resources/icon/os/linuxfedora.png create mode 100644 resources/icon/os/linuxgentoo.png create mode 100644 resources/icon/os/linuxmandr.png create mode 100644 resources/icon/os/linuxpclinuxos.png create mode 100644 resources/icon/os/linuxredhat.png create mode 100644 resources/icon/os/linuxsuse.png create mode 100644 resources/icon/os/linuxubuntu.png create mode 100644 resources/icon/os/linuxvine.png create mode 100644 resources/icon/os/linuxzenwalk.png create mode 100644 resources/icon/os/mac.png create mode 100644 resources/icon/os/macintosh.png create mode 100644 resources/icon/os/macosx.png create mode 100644 resources/icon/os/netbsd.png create mode 100644 resources/icon/os/netware.png create mode 100644 resources/icon/os/next.png create mode 100644 resources/icon/os/openbsd.png create mode 100644 resources/icon/os/os2.png create mode 100644 resources/icon/os/osf.png create mode 100644 resources/icon/os/palmos.png create mode 100644 resources/icon/os/psp.png create mode 100644 resources/icon/os/qnx.png create mode 100644 resources/icon/os/riscos.png create mode 100644 resources/icon/os/sco.png create mode 100644 resources/icon/os/sunos.png create mode 100644 resources/icon/os/syllable.png create mode 100644 resources/icon/os/symbian.png create mode 100644 resources/icon/os/unix.png create mode 100644 resources/icon/os/unknown.png create mode 100644 resources/icon/os/vms.png create mode 100644 resources/icon/os/webtv.png create mode 100644 resources/icon/os/wii.png create mode 100644 resources/icon/os/win.png create mode 100644 resources/icon/os/win16.png create mode 100644 resources/icon/os/win2000.png create mode 100644 resources/icon/os/win2003.png create mode 100644 resources/icon/os/win2008.png create mode 100644 resources/icon/os/win7.png create mode 100644 resources/icon/os/win95.png create mode 100644 resources/icon/os/win98.png create mode 100644 resources/icon/os/wince.png create mode 100644 resources/icon/os/winlong.png create mode 100644 resources/icon/os/winme.png create mode 100644 resources/icon/os/winnt.png create mode 100644 resources/icon/os/winunknown.png create mode 100644 resources/icon/os/winvista.png create mode 100644 resources/icon/os/winxbox.png create mode 100644 resources/icon/os/winxp.png diff --git a/resources/icon/browser/abilon.png b/resources/icon/browser/abilon.png new file mode 100644 index 0000000000000000000000000000000000000000..0581c91b575e7541acc4abaeac6a36b66c10ed52 GIT binary patch literal 557 zcmV+|0@D47P)qKx2TTUV99|@Nh65qZI)mQroHw$hg%aO)CZj5dg4n zUZ0(og^t2F_B<%5?Q6|I=xb-QSowpH0R$0=aIYI`WM+6wZ*x*X&w0+wuI8pT8lft-M5@tFQ{}Br&aSu;ZEBC8b0d#j08{n%1Nh%R?UCo0aP5X(00000NkvXXu0mjfO6>R~ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/adobe.png b/resources/icon/browser/adobe.png new file mode 100644 index 0000000000000000000000000000000000000000..0830fac87d5c3ac669f151888e9355b38fcfe2f9 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~dL^zACC){ui6xo&c?uz!xv2~( znYnrj#)b;HiABWSQnR^mS#w%*@DW%zvol zG!syWv%n*=n1Mkk280Nn{1`4FY^ZT(2=O++$$4#=&qy zK;W*n)|2pvH`Ntyr%(F4aqH*ZJO4bq{QJqX|Igq5|NQy?_y0g}_0p6VK)t!1E{-7; zw~{@)PyhOFqublqc<|l-aD|f!6aN2a??{XK|9`$RbF;!}pbp`Nn!f+$|MkTZ5;pve z=L(zg|9s_t{t27rJ1k>ne*J%a&o+lvng9D+3;x_^F?svHe1U}XzyJU1d%yipVVL!) d{`$}V3^Ey}-MNeJE(Ti6;OXk;vd$@?2>|qxi}C;f literal 0 HcmV?d00001 diff --git a/resources/icon/browser/akregator.png b/resources/icon/browser/akregator.png new file mode 100644 index 0000000000000000000000000000000000000000..aa321e9e4bbfd7017bf7049559937a8a81ce2990 GIT binary patch literal 554 zcmV+_0@eMAP)rC#ad0w8JOp9VoL`)HL zmuUyw19zGno$Tmi7Cu9HyDsa&AQ_L%>FL*|X|$_+&5#zX+g;&B`QY_UF^YpfkDeS| zTwG75S*sNe1_`s$)8c)gd*lW#m{e+5=F6mG!J3&44)*K1p3gI5Ql*$aeLlCPW%zcR zM#JuUW&4BP)m0Y9(PXj*2oY@_=iav4jm7kXoo;(PzPFRamzRstD4oxLSZe_|=S75w zxN&G41hiZhB4SJ$hQZm{Jc`;I9y4w7=;1J#%`TmDWmyrC_x|v3Kg;fnNjKij008&< sNvjoF>-zoVe_S#q_5Pn%L_`F@Ukcand+yJKIRF3v07*qoM6N<$f_8oYOaK4? literal 0 HcmV?d00001 diff --git a/resources/icon/browser/alcatel.png b/resources/icon/browser/alcatel.png new file mode 100644 index 0000000000000000000000000000000000000000..706f61dff00110d25a20d17c41cc1c5a3780744a GIT binary patch literal 351 zcmV-l0igbgP)YY;P?0qeu{-4 zeu9;e*u+8%E5y8F7elfrn`CAzmPAN`DBfzg91g<_RMjk}YOvJO3TKR}VKFNTELl}m zfyxP0gKszKJR+jZtU9{799^6jch_uGc(wot^AHiNbwnFmyY}J6#d{V+)-3>x$K&aA z>YNi104yS8M)$XyM`yFok6Nu(mSqqGB7#<{)oeDs_hA?oMG?nw_o=(Rlf1n=AM77? z9y>{r^m@HUqd{d^Mp5Lwuh;8YmgRXqd>@{k91jLQeNEFe1<>#Jt+i;k+mp#82m$~i xLPXU7pjwQXiD=ESeu!h{U!s4ou6ykN(JyYhn{)*zmEZsX002ovPDHLkV1jPIk)Qwo literal 0 HcmV?d00001 diff --git a/resources/icon/browser/amaya.png b/resources/icon/browser/amaya.png new file mode 100644 index 0000000000000000000000000000000000000000..4bfb97dbcc729e1213483f76fb8d4f54cf0f668d GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFxcVx71fD8yOd z5n0T@z*hpojM*xiuK@*F(j9#r85lP9bN@+X1@a97d_r6qEEyQ885s65F#KmwWMELV z1PNFI$!Z2C28Lv?WD8WD;s5{t^O@Ku0rmEKx;TbZ+>$-3$j4+T((+JKWe-huA`wZPKN@z)32Re?NMQuI!h&NS%G|m0G|+77CA;Py(k$=)f71%iKscc z^?RMRK8kw&e~JjpS_Xz=3=H=e7|v-5+%pvT?ag zMve1Z12627_o$ECTWxOdQG5LrZ$j;y&2J8VX_x$y@T;Er$esUx0;E_N#05QCSY2%& Q1Fc~2boFyt=akR{079m0kN^Mx literal 0 HcmV?d00001 diff --git a/resources/icon/browser/analogx.png b/resources/icon/browser/analogx.png new file mode 100644 index 0000000000000000000000000000000000000000..654d58136b9991af0f6945a1ef7c625cc0977d46 GIT binary patch literal 655 zcmV;A0&x9_P)dWi%HwG6fSphuC2?L9O zwQt*=2iI>K5==y)T;a@s_ut?3T{@|2tWX4Ut!yE)2vR!JMRwNR6;{hhHhcC zyQc#){U@9CrI+a3R2PZ=9{(B%QEhA6yqoLm?j5~$hsH1&8M{A|o8Q{AyC%J*YU4HOr*=4;j-oR1O#VcSOS^8Jo=m zp8YjPL1}IPZKy6;6}v0VeG%h~>9WanK^DT9#<@LGP$k4sbt=qw?_(&qlX6LS+9eqBGVuaGDuu&oaf=Lv|9$vn+ zKi%bp0(>DsY0%PO=Je;cBaeoc^Z%>}3)gwAojg5oW^a2(;01&kpoNxL2P#lX+hznI pggk|a7D^iyMF>@Vk5~k0^&d-Y9?BXX!5#nr002ovPDHLkV1hhnA1VL< literal 0 HcmV?d00001 diff --git a/resources/icon/browser/android.png b/resources/icon/browser/android.png new file mode 100644 index 0000000000000000000000000000000000000000..d12f8cbae4bcbdd4718914788c4ee7047bf0198a GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD3@F4| z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O_~u2Ka=y{{R1f+5wg62UMo)mz!}w z_5c5WZ@=7{eh?_4I{kpsvk#|Dnm3&QDrPJR@(X5gcy=QV$g%cxaSW-rHT8@o-vI@Y zBLT^q4*uomx!CR@B2qcm^wNRVn<}n+nmYZS#VeDZUgaZt#ee5-uqj`uKQs27NhTx1 V1)ea5%|K%qJYD@<);T3K0RYzmQl0<+ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/apt.png b/resources/icon/browser/apt.png new file mode 100644 index 0000000000000000000000000000000000000000..29a66ede37acae2d1b4fff51bd07de6c276c1e37 GIT binary patch literal 315 zcmV-B0mS}^P)6@_Xp|$I#x$LOA?zF@2xybX&)%4HU_0!$=+~fG*=lJ63`swZa?eYBb_5S|; z<@YkY00009a7bBm000XT000XT0n*)m`~Uy|bxA})RCwA&i`fpsFc1S5C>uh0(Q<^6 zwj}fa|Hy(6_{AfQEkN8?+RY%~MVm%9gK^kKbF^}kd$qul3VIYBA)Tk0E{NLc@*WLd z4uxWBr5(j(s1r<~h|3Aaue+)qI_wT=7zyJUK%V=#bDk;th5I~GTb^8vz z6l7!g|M%~o-+%u8|Mw59kdg5}BNHKo%jX3H`2qj{ z^6~f=83;Q*9R2-{sQ#%2?PR&g@uWQiIs`rKl7(AzfG-Wy#wVx zeg2`UCZ?$;-rIEK{hJ@0+-xi?%#4f-00G4G7wASthA-cKs%r@(W@?{3`*KpxmE%XA zdibfurR)CzI_vL0CT1oe00DMrDu zy1#z?{qyH9(4znW1hk*!&tFDP9ySp%E?HTAb8F$FM;@O#{#rzoU0#ttEMDivmDdmN z|6^oi1PA~t0M!2k0|pBI0}2QX`x6uk^7HwnrQhS>`3njS@9+GMhRO{K1MTek3JVYe z0|f$zg_TQ$iS37g&<}3z|8L)ZW#FT{_5e^2cN#OunRM@@v*S-0R#}x z`#gNYicD-DmMnku_|d=5-$l9kS-E(4csV(kSU>*e`~r09Uj}YYEmA4bW1s*1W9H>$XJ=<&=K=bafrW{YgO!_!;omPF?vH%G00M~d+Oz*tcK-kJjFIgt z!{6TwzkV_N`v(jU1{R=E?->}s{r}Fz@JIJoek3zM009%n|C?|Bt-St=i;3~aZ-yT~ z8UFoc`1_v$7;3!ph57gl4Gehr`41mC!u|KYx1v-ptBMOF=@m|NMD#|30^X03*!5j7&_@N=iUiZQ8y2&D*ySaex3~0ml1(W@ck+Yjz%Z0}bbKBdNj*gtEsjyK|R@c`T`1%0Bz?T95 zD*)901Oo*B92OiZ1C0RhVE_&S7!~vO>iw>;I#W@t6B7sW_6N4R!*U}4@%GRH04o60 z{{%}*Q2F`>u)3k(sm4A00Qva<)h0%2ceD%#1?B7S{P4#l(dYYy0Gh(90*DbFSTknM zT~b@c{pCAnV6cg)0jH$o`)%vk7Oga4WH`sbFi%(lAb>zh_wRpj`0$hT3=4LiA78)! zXsWMwu(MyYXV3HFtEC=%XJF&H$;2#cZ4D4Wpuj3AIn2Otec{4euU`H7_U$($?4G@N zS5#8JV%>pj_g_AF@%;6x*8l+o3M@`eRt5&~Z{L2FmL8UsJ-=kh^?(08 zGZr`7hr#}j`1pAN0tggaKY#vVV0dxl$o+fwc;3GK^XSn#CMNlpueh0*7`}h|{^SYg z^XHF#{LlmlAdpfoFBvYbM;|}3NlUZ%`u@+&HU9kh$DcnS5C8keSXcMe+FFyBmlq&_ w7%`Iz5PbXgEiUdFkg;Zs0Rsaxod5(F0LvvF;3iHxHvj+t07*qoM6N<$f*>LA)_yqtg4T-b@?kF6z=ckVwiL6*$^=KEIO%|exM0YbGNUz!}!d}q1Cm{`nbQGl2i&7Au-P0VF}}ORuzez`pziAt%m(%kZB<00000NkvXXu0mjfN1W=A literal 0 HcmV?d00001 diff --git a/resources/icon/browser/chimera.png b/resources/icon/browser/chimera.png new file mode 100644 index 0000000000000000000000000000000000000000..c93232f34b540ae513b68d5f97cc3de056d59356 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~1_3@Hu0UEsR8&z>QCCw}*T_!T zZN5b1X&;|}+@jjhnw_oFx31rIaQBhBw{AW9^zkzX2ZL(v!VaJw#*!evUYh7ML)4Eakt zaVvSpfq;8&&K)>i(73RoJ(RISuRfY_S@r#SY?st6?(MyK_s;Qx+rQ7Qn|b=X;ho!- z)mblYmGi7FYkPOwYWLj6gT^^`SD)nJ;jzE;$wP#@f literal 0 HcmV?d00001 diff --git a/resources/icon/browser/chrome.png b/resources/icon/browser/chrome.png new file mode 100644 index 0000000000000000000000000000000000000000..84dc2de78a6a485354e8ca781f3878f16350ea7a GIT binary patch literal 760 zcmWksU1$_n6uvR0nPg2_5`QMa;!a|~r5bl*f*onWj7c?v31PB=4hZTPC5-WJRtTL| zG|q!?6y~ATP9MY({FxWc1&w+kqEiU%MZ{dtsP{z~G?Duf7-!GnJ0Iupormvm zejXa!-ca9C4*+QB-_fh3{AC3~bz0Y5nw?9jqujT2T@co`D_!Zv38E++PDg)el2EOMMAX;y9+15n4$X`Ht^|$cZ8w zBZxvj!Vym+Nvyy&JUxn(go+7~Vj@$lqX1%zdBS5Jn}I1hdFbm2OEpqLvN6t5q@cj& zJPt@8!hF^hWvF<*#hI4SVnVYC5g3*tq(&IAnCXEo`I3S(JG33g8D&5*0m_dUzA6{r>o2_nivmb!w-whhzKVWe6iv>aN@$3iw%6~+^v`mSfwqD)jZ zG&HR1OjZ~Wh#+tjh8`rcOaLH2z>*YuZsj}?VlJeP#h@Jr9%pny`?K;8Rb_2(7;Js} z>`>a=>F@0+jXyW`omp~1Jone+<(pUU{Bvp5)Wvn{A8+iK-ne0|YJO%@=dGL8$@!0& ztt|&$7;~?h8ZTZL*4k&p@g>))&rNJo9!#~hUb)=7uy^*wci*DPpMDI>i;KHq(_yTaS2%AZ{EVf$MD?~#LVUcX+k z{Ess$KXlH2$O!dyzn=f)?Ckw}Q;%_UfBMnW>Qh~9O`9@JZRcyi7eTB3?^v)ibpiVO L279k7`zAgEI2LO7 literal 0 HcmV?d00001 diff --git a/resources/icon/browser/cyberdog.png b/resources/icon/browser/cyberdog.png new file mode 100644 index 0000000000000000000000000000000000000000..b94533af0be1ad604b24c9223b1fa19752daa5ff GIT binary patch literal 689 zcmV;i0#5yjP)ZU z{PpqG*+X08lr&82JOKiT1*qrv@nhZH-GYKbSFc~IiO^;H|K>X*ucAYokdo4iCrlsi zocwrd)!iF60RjLk0M!2i%F4>Jv$LwHsh^*oxUr)U3kTru{}c)X3<3G?@9yvN`dMjv z7!MBI;Nb!QD*)901i87nR#sL92M6Ne;n>5j6$1SV4h#DH0QltC?EDtt z0*LYdzyClV?%lgjL{w1V?djLo4}Sd1`TWTvEi{AhDQ8sqg&@}=GASO^q zFfbSynJ6e}zTr@~^Nm}ApViF9R>d~#%<+?tUw+c_NCK++`=0?IfEfOR!Qa3CzJLGy z@8AF4&eoF$HvjqY;mNb-+L|^(0;ZOh-Y;G}1qLWU05L%VnTd&!gM)>U@&D)V|9&tF zzIgNP*N-m?7EQ9XRr~knBO?Py89)Fr0*!=43Xt*l!-p?lzkdDo>(|ep-wz!+WNYhq z_3Bjz2RjiF5r6;!D*p#p`2Rl>7Z(>Wq~E{)aPQs&OG`^>Y4NvjU%q+s2B-iafSCR> z{6)k&<9{|bHgj|H^XJb2ZPV7)dHndvw{PD?Ma6)!00G1ZOfG1t1P*{sV`M})4j{k) Xa!Lw31aAM{00000NkvXXu0mjf6!J?+ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/da.png b/resources/icon/browser/da.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fa7bf9b3609edbe0040609e54c5f6c22220c3b GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~1_3@Ht{=HMzHH*S*gyS+AJ4_h zO-BwM{`QmS@k_S{+IkO@v#(Uy99+HTftSn0(yGtjwU3`%J=bDU0#GkwNswPKgTu2M zX&_FLx4R2N2dk_Hki%Kv5n0T@z%2yAjF;}#{Q(NHmw5WRvR`EsU=R|Qs9eJi6bkZm zaSW-rm7I`}aO1;s8)l9V{~xkles0&W@<0Cpk@MCDXaB#y%P8>o{oUQBJUpu<&+V=L z-nV-(yULM^7a1>|IDe7x;(g|2JN)N7V?RBQiMz=02}6~J#3Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+AuIMP4aYc45_%4^ym9~d1Yl~X6D1& zm!H4Cx8mzNbM5&i_WJgpk3aukvE!!8($>aJ|NsAI*J9vMI93m2Reb;V@9%GQ|F}@0 z3BQk@I&tLt^mvD^e)lPp|KBd3_Wx5-(3u_|hph~ZM?QSNe*X02Yt^^gKmHa;`KGh2 zuqZVlLA1<^d*$r%H*cn%kH5e7*Pmza_wRQ&&B(-{&2Z&EMuUOaE0o>-}|?1 zo7Ud_+Bt2bHvj!Sb-yOX`#gBvZO*_5b`T2(11lRd%ilkLfWH3w_6hTscOm?244e$S z5>lN1j(xj(<=3y@&t5<0`2lm#`47*2G5u!c;AG+E|IaPT$jQUN!|?n2uS@ryyn1w> zm4#VYScs2NfayQf%Ph*=av%SG{{Q`*IQw4_wjUopeLj2j&g$LAw{6}0mqRc##D$Ud z_e1tqIy~~wF#7)Y=f#hgw@%!$cK7iY&mS-_aeU{I{Qm7913PP|li9Sw92SvZ?^(Vo zawtPIurM;PNO0)Msb7@6e%{71^xNAP-+%p)-AB`~BLZ)hk8&CAKf)Fcufr=jV4|F#O}pdcdOQ)6du2 v@7MqP_y6~=dykW|x7k+z`C=~tbRdJIu7<-bPbL9i5@zsp^>bP0l+XkK8_r+| literal 0 HcmV?d00001 diff --git a/resources/icon/browser/doris.png b/resources/icon/browser/doris.png new file mode 100644 index 0000000000000000000000000000000000000000..ace3c9b9c480686299c485575817d75d5d0b6bc0 GIT binary patch literal 724 zcmV;_0xSKAP) zQK>N~5m2K+P4s4rkznF4@u>0Q#b`Wu^&loj;}$Q1AqH(}B-AJs+R_DErrT`qJ--j% zet18-k=AP(!C>mBcwFX1{vV;*t0ztQ~saG%fPmYTpH_@Bl!K%O^X4F|oLg8)hpi345 zJz^{xBom{^M>?WIQn;UtU27Lls{#@w;^fhyk2)HaS4m& zkz-znL;xC=O&PV-h!hzl`z0*7+1hFWr835YXUXSFtXd^Ra0p0%Hr~y*8k!Dmr$F2s z@Be6Of68sLXP7(1eQl|CetNE>*#Y17jg1s<)m@ZfIjnZzuq6{AJ+>O$V&YewX z|9CpL_UOraK^}m!bA(GGKQ{~d0xj>CW>cuuDxF>zIU#Tk%eCCo7ys7Oi}dUuko}~% zmkWo2w5Qw0v_L38g!=YY)-+)U2^q{+a!m%+@!$bB;QT+CoDrZzgCtY{0000D=f@`6nlxMuPggyW=2LmalI0I51&U>cv7h@-A}f$@5a1Ky`v3obui~XaKvcans(Niy z%i3fh>e!myvo(9d-qIO|Tb7>cS$nQ$?X?*@Z>>D}Dzg8-J5VoUNswPKgTu2MX+Tb? zr;B4q#jWIo159C-rTPpPmn+TP<|3Pr@L=Vgol)CaHI78@-=qDcO`rMj`cG1m)$ir< z@aWw?J?(hKQuzdds;_&rc7FQG+O{Qqq1Lt84ZG^omYiJ^!&_P`5c!xvL{%;wBn)UyeoIe=y^@XPxTxMeg+xDMf<;7~^_w62qb|0)o!nA~82OlfF@c;8as4kwhMf`&x*q`oh>4Nm z|9b|`YmA&5|6Xoll0DBT#KriJf%!kk-5fwu85!owF|hq(F#HG*KrBEp*Z(hU{(mlK zQc3yuQvLt07r%f0f6vD7|3AZhZibUW4B|f-f}S!k@Bsu6i}9cLo&O%>GbtTr6jovQ zoW<}w2IxMIwnUCORk!HSr-Ths!9!3ZbN+3sK}# z^cqyqLvP)TZj@OBnW&`B#WJT&-Nmz=v$LIZcCP=^%02vkUw#iCzAwK!hg+Hoh++Z& zP~d5Hx8~CFZ;WVe-`)EDRxb2Cu7fTBo{j9m2I9H9sIRfJudVlF-^H#AKH%!^_4-OY zXS;fQt-h}A{`22`djUXid)%(}OTWB|rZwoyS7i1kgS>$>&%hMNQT zs_UD8X{`~1gf5GtDheefL$Z;eKt~lt!!QE3*blUKt^#E44~646L139Q^?PTc6K+L!bWoZstDwdBNt4WTFtu|%#`s}34l0x5ZJjyZXs_H89l@Sw~2~*efwxPCY_-{{RH%cmWA72gq zj9cc))vX-FGx8+s@bceFej>-oKm-p2$7e7wANk%&ZYJ01(m5{>PS?xPPtH>&<5( z8)ou6>8;JRC^U8g0JD@rDYY4nq^G$y!jVwKGJ-2<$=dC!EmEdtL{y4|5Cu7z zzoYTK;kOS*jMBVA9W6D{m_7StnMffbGYdonU_`voa7HDpSbQ)0fL32sZhZRMdHq4p z-NBumh_j^(1OkXi%tt(KT@$Y-XTpE}g?{{cGxd4#+j?U~X>CP0GXerSA7Ex8mQuVJ zpL+CcY;|)hX`eWIy5!2Gb15mQ%!G)Ji5yMXHZ$7^Yi#nv^z1w{GqY04f&bUCJ9haz R&@})6002ovPDHLkV1n?(9o7H< literal 0 HcmV?d00001 diff --git a/resources/icon/browser/ericsson.png b/resources/icon/browser/ericsson.png new file mode 100644 index 0000000000000000000000000000000000000000..8c182c5a8730f4679e836a1726183adfe8f43812 GIT binary patch literal 1049 zcmeH@;Y$;79LAUaYGPYNirnJrg)ESmRCq+u-Y7R}d5X;`T1Uh@6=H_iIdmL?;}V)< z!5Wk7=b&}%g&ccfhm|ZL-HW`Y#5#q^=?gm-$*~tUr0j^c|DqRt;rTxBy!!BY+}3*C zSb4fqr_&kjH*iO>Pn1$oUi@{Dt*<&=xvq_H+Q3Z|#0jd84#Xk1$pJ4WZAiF}lJbf> z=oS`|mOeZjf?yg4E|gsgNI3;`qH10x5)?JfqF%gks1Xw+I}s4p1R*M*A(D&ph9C~3 zP~B9Z2$dZL?X+kI8YwcsfdZdZ-j=}w4BWL84hlq&O0P+9fj7_7l$T-r0T_XXnA1H= zv!Sp#Mk#wLXhp#oCT+@Ch@kyUaw%nq5~#}>UgW@Sb78+g&av8|#wP?W#`77T3^D19 z6bM3emZa{}Yy$GzytE-({gj-Sl8Y%~$Q_PwV446fi=2}|r&-MxoU?2o1}%Pq^wENt zGDj#rE>s5z7~{AMr{okygur12K3v{bfCn>__%&yQmPCo46R>$V<7HulvqUMi#B2s* zRys(BMM3+c1wycB{{Q`J20p(Tj})2ow7tcqUpMFt##7IXV7EAZu;Y!+5!h3wFYE2U z)L-9wa`Ht|&N`-Mo_A-7kEYbH=ayLW?Z<^D7n?oDh6dEw7SnMhJo7sA^pi=kHFcGR zK=`QIb0*6oBmsYJRZlvoWfP-mh$6ov--`Pq-OKH^hgpQ%aksojM!#U~zqqPlWXOdy zbTwn>(&T#WXvQQS*B&*Pko0nW!9b4JT+L0LNA9dlRPQxcjFYc+zYnagoK2;wj(Dii kcMHT|WAdD|y1TYJsMB3*yqxYR`(0adZnw4KiKctLzmdr_cmMzZ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/feeddemon.png b/resources/icon/browser/feeddemon.png new file mode 100644 index 0000000000000000000000000000000000000000..a8402008ba0451194ebc5cb1863e3f44b603b11e GIT binary patch literal 677 zcmV;W0$TlvP)JvJquOABQYcJk((_#WhSx(>Zn9o7>#x-rm>$-@)te`~!?J zN~xjijIlo}D{o$V6jfu4X}TVhq~Jx*RhVSqcoG6 zg}WIArFmhxxK^FWe>gjCy?CL@?M4W}Kp-&gPu9Cjoj9|Tk;93-4JkE|7Q9)a%gV|3 z1D}0U;aL3F^fczHPjE#CZ79bh)okGl@-0wPrX(YpgT!t(5+U;P!OY}TYflgIMzTAy z7LyU>tQs`Ql$2FgVnbmnwOWwit`#OH&v$hmuBk@Zq!bLTFQ<*gXf}~m7K5A1QnI_g z&<<1f0$x+~rJCA`=2O%#(AhfY>PF;uTppd@isw{&p&%oM7}^vx(cn^d%9}M%M+d6rBJW1eRtrhZZM1xvf9Ow%gx1!fRoeB zj*`DJPk7Poux~5`8k4@8eVvp-1R($bYMMp}S(u-@_59(n>o_j+|<_51pqJ%17i#T008_4ccVFC7czJc00000 LNkvXXu0mjfPK`c# literal 0 HcmV?d00001 diff --git a/resources/icon/browser/feedreader.png b/resources/icon/browser/feedreader.png new file mode 100644 index 0000000000000000000000000000000000000000..72928c62f2c528daa1161b5580369dd63a7fee34 GIT binary patch literal 552 zcmV+@0@wYCP)|2>W@eVs zAN=U6ors7OPxu#50D$j%-@6?mX68Wp#kF#wPy_%XLPS&`eZSptqxtWAp=jGS07xla zrxgUUR9agt6qy-`$aPv57w7Ah+qv8d04Ql81OUwEGuLs3!@<_}LxG6>{%Ml15E?TB z03sqH006*fblE&6^LBT4^pqw9>dai-ypyr4cMLhHQHJ=@y10G;-S6t(2H1t zP_zmqs1TQBnRP#AhTVN9_;fsJOcjbC?>Ms{tB~Fim+Yj{&*&p6~mfFoW?56 zm*%cNowg?X`tZwxuK@r80GvL54~MxYO!#_EHjPWE-RVzKy*m>^BqVOEm73N{Vad;1 zcMYpFK@^4jGxZ(h%RfHC^{Zpp`{kW6rm!13BHGS)JOm@ELDFTov>mHbddz05-!oJD z2KHyJZO={-sd(%w-2Y?wkkuJ~Aa=&OqnT|8_n6Q^Dp<3H+Pe}6X<@5aRfw4!sEKlZ zVc&tjuRj)VO7e=P1f0tH2 z9?vW~><26#uRHWUu7=*%G}DA%0bC1=Q8XaIOBfI}6+$78;MGe6 zZUwQZMtZuEZ{-W;bL*3jmuK?t>e;|+0i+BxY@ob}ARI-INCRRF2spqS$aH1i3=e0Y zN%QmJ;ImJ=oz=zlT-CCZpcW8#K&uWAA0R3~WS~iqi1GU9=-`d-uYB{HG&S`TPM#bo z6gU2@Z*Hs{vh9sH=du9q0-OWB3^WQbI+;6q{OH4r7mweZnOSH^w{PFY*x2Xn#EGF- zio)KAA`MY$hXtVlO(nk3>Dm1s881$KG5GWN_{gn=g{AV@vu8eB1prEYNRlGV%{|LJ zf4($OELy#k25K^ySU-5McRrUJTDEPwolbWF0R97rfKx-qiExep0000P)-u=-v8x=*3tuJ5-wMem82sTy{5V5oo z6p2{4i4X-98>77v5d@z=13o|sgH;42AqE?XU?;NKyE9|)Z`Q-dVT!{!GbboUNa&u& z$>aF*7cs)#L$Hw&R#wpOgDDf>D_2fkpU+Y_(o#wT`>unv$N)e1ufKIfAtL@^7y{uacTK%G{ z(`6mS6(3frlXBy=xn5Vp_jNJ2uwUJ&vVr2rd)Y{;1FP|~0t9HXGyJ%(7-a{=k$01j z)edYy5&vT`K*&1O8GcB`k#m($sRk2RfpI+7^a!EWvCP>@h)v=#K`}xG>=1(C98er! eG;4r>QT+o~%OC#4LpHkr0000i+nU#S}NLW$Xu&~k5DJT)BP6Xsp6u<%$l@SE`ofTP%kr`;EVd2Gx|8Fty01agl zWENzwXGo7Wyf@?CwAHJt-rjom!rgoMvijIg)g@sG1&$SYhiU8}3u-s4Gs z;CmkZX%9=cTBPpClv)Y=D!I5zhYp|38{6Kmaje)ev4X4X6}?ko7|VKmf6b3d+Jcuirn07z|Mt z=dAAJ;RN9#+XfIoAh*5#@I+KV2FL*F|MKAplJV1kf|%L>0*C?VClLV|APwT17~mlYR1MJpB;iIvR6{ht^#BAA z6IuX3y!Raz+(6H4-M$xyki!iifEfQH1qe_b4>&M@01_BzaR3nk2q5(MS-E^6u2_Z} z0T4jw>0r^`n-Fb4SHabx#ScILq3D4}3othK?bwG^0}ucN5W3rd(kpwifVKhIKy8>B zfB+zXu%uDAZ9vVy5X0045I_vL5)<)43VUbI9x+gMt`l>!710rpvEC{ScKq_4L=L_sf7iiGASr3CcO6!^32D%)Zs=){Qv?30*FbR zg@OCm4;59>d$%4x_{*ol{@>olcy?Kaxr!p&i)X^_e&?CEcJDs`G!-BK04o60{{j#Q z0y`rW9|-&g2LQj;+zbQ+c4b)i(8bx|;vXg)JrMvX`Rmru&;I`Y0st!j)c*n>6A)%I!tD1$6$e5A^~mM(4gvfsDk}T?`vL$f0M!2iEhi>97Y^y+ z;UEnRD;OLf3j*)+@73Py!TAZv2^<^L$Pxkm@ALBq2L}R(iGh(Z#n;telIQTXyN`eV z;}aA6dEv+jPK8UKSl-;eYRvlS^ZWOz%IZM30t65XI3Ae2JUtAaJlT2R;D1)2CqKxu zKKp*;P7wE(uWT%PzpfO&!mh2Y4G=(#&@_Mw{(t-O?e}j+R`!n{J~gebKKXoQyhb%Z q05SY01ipX$*)qTB`1zv%0R{kABPKV#v-UXv0000Al05hN5K%XOS|T8D~Jv)iC_J29z6m)RR*ftMUCZ~Z2WfOApHnQr&`klEPY z(uTwxq|EwVWugd60ex_5c)&K2ZWnX|#^Cyo`Lyk5zSR2nNKpku?lQp{t+e*CMMyf5Px%X^wb`9$nCz~BHaneo>I*8LW^u@~0*3&nl zMT<$?n5ecb9?UKUm(GvIMqeA|_iyunQOLDIbecdaT3A14 zrmhHI7)?CTP9vgmG~k+$Y$NiQR+ZGHLT_?)5_*6;!n8vM_#bL)FWu1q`@sMJ002ov JPDHLkV1h2u9fbe@ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/frontpage.png b/resources/icon/browser/frontpage.png new file mode 100644 index 0000000000000000000000000000000000000000..fdb32123ba82901f4289a250e364fcbc7cf3f337 GIT binary patch literal 662 zcmV;H0%`q;P)6)f<001;i*sTimJ@J)woJQDc4DYscWl= zq0w2ZEw!@LBUAEg?2p%#`Kayl&N5Gl-x-TD8C-z!yj;7gYFApiJx<%*TgSTJ{oG#S ze))FT=gzF%Q#26_OB588MAy{D6T5xxoPlrS?VW>LtL}hcSDEj@)4u8*1pojdKxD{L zLe+BCr}wlsbaW0*O)pk#b9wSJ&s=?RxW@nN`4^?$prn}vhYVd;Qj7p{vNJB7-G~1Y zj1P~@2K-KEo}Fnrp@LX9HkX%pDoVXcO@{ygLI@x-(#(;im_;!OB1a-CJs(C$Vdafb wWbJQc1yq9I00969Fb>58#=r$k2ImIrKZLLTK(lUfZ2$lO07*qoM6N<$f*hMFqyPW_ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/galeon.png b/resources/icon/browser/galeon.png new file mode 100644 index 0000000000000000000000000000000000000000..92d0a221f6d948db814ed7f4e593b379fd00fe80 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!hY85xaCvQmW8fkK=G z9+AZi3|t>Tn9*sC$qb+%OS+@4BLl<6e(pbstU$g&fKP}k4-b!^l#-H`p|yjhkz1%$ zOhr~!LRshJDQmZ`T0Vd4#yR^B?>%?!+_h`hzJI^=|Ns9bXH%(+CH9k)Y+n{f8BO>%Q=s-t!%O?a z-;eC8Vsl>b<2cu15p{*XTW!v=__XVr6*641boFyt=akR{0R5$NWdHyG literal 0 HcmV?d00001 diff --git a/resources/icon/browser/getright.png b/resources/icon/browser/getright.png new file mode 100644 index 0000000000000000000000000000000000000000..cb70df8779d64e75a1641c700a324c31fe73edc5 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!gsm_+$xwGT&vWH<{v zB8wRqxP?HN@zUM8KR`j2bVpxD28NCO+pS3eFy>|1^vhKV07G_$P z1;6-v>ZZTo$wtrGV}C!o1y$bJb;IGi;z3@eTGyhJas5|;mNIy{`njxgN@xNA*Un>r literal 0 HcmV?d00001 diff --git a/resources/icon/browser/gnome.png b/resources/icon/browser/gnome.png new file mode 100644 index 0000000000000000000000000000000000000000..0b388b6daded40d60d24811c6053b4487fa45443 GIT binary patch literal 710 zcmV;%0y+JOP)%tT}V@57zgnGd){-7 z=bUYNHn-VqE@vobbLF%}g7ahZi?nW4`j9Y7f-WM0F1+!oi@=MngrG|=0xztr2rV+n zi_$VIERD*vOrnM}bsuNF-K0#|bM-v%{NVW@$PlLNY%s?vMkF{e|h=l z*yt$Z(m}4(##^j5iSj}&$I-KaK;RJNc@IbF4UXf++-`SQM|-;g0QhvsQCh01Y9JPi z=^GmxeO|A3eD>|T4~((X7PFazLg9+4s;VIXe>ecx>nc-;n2-+D0EL0#r2(06@y{T=kY`|P0L$Z{kbqSJaQo(kLM?oNnVyDynOX$ z(plgdQ55CZ_F6mum`tWfiKY#_cs+A@Y5ChZJ(;us;3+R4p{LkZBJmf590ahk3rBKGw0E8Ef0MzYTmLzD!`yaOL zVzsF@xRee_dNKcbk@Vjh+-EWxPbHFir%{pJZfE|KucWBI((ijf2-(aC0e~@v`%fng s?>{Z(7-U%}_ZG*Fl$AyZA&K<9f3_&X8O;#3L;wH)07*qoM6N<$g3f735&!@I literal 0 HcmV?d00001 diff --git a/resources/icon/browser/gnus.png b/resources/icon/browser/gnus.png new file mode 100644 index 0000000000000000000000000000000000000000..ddb59a75403d3cf9addc45e00c0c9de614e2f5e1 GIT binary patch literal 930 zcmWksNo*Sh6rHp|=|boM4iyq=)B{2SB&5QH8&x720aaD?!ii0&S2l?|ttx?vC?Z=E zr)grxaqKv;9mla9FL9E_j^lN_jP3Eh?;dA1&y4Mlb9nDb@ACAX-kYoAV_o3H=ZiOs#K@foN_JmS9C-*O+rBlAgt@}l0eA|R;e1#KZ zQM!k#I|A!1I9P#^dY>Dks%$HnX(cF*Jk1?pU=4#M1m+-^@|~!Q)1J_32d#>O9fxB( zxfMGvezX}|R7OM_k%csPPH9~V+$D$<0W()*c?kK7C#IM>+Y1;At2rXc^0d@5x9XXt zc~T!yiapb0r@i8ua%K;fUH@%|W%ji7IBjV%^;cL2Kx(2DOpri`P8da%4q6~3w zSLf!nuFf_ArR~&m6AD}SVz6srfS{p8L6d~W5wUqlC=Z$&ma0sE4i78`%vxYh>YtT( zr%8@*WUQKyG*$~X=~|txL@MZE%D5E}!(c?{A0!OQz;XZ#DCmWrAosuU^>k)jYr?nl z?TpkrZ^%m{V8dWP4AwX}aIo7+)iJq+vKD!Gem(d+3;s29Hqi_pB=t)4Wv}1eK$p6G zp+x1Z@f}NC%Xc|{(aCi?GT(x)c(NB$=ZF-;)2p62cm9~>sok7-*)`Sf5RR;^0ogia z-24vbl)f`~`Q@MPeElneTz&H#L&&`7`oJ9dZSt#$k?_!47e4&BtT|2&tnVksKYMTq z`yujZm}ft#M{n&|tuXrd_h&ZEHy4lo8v5eKu(LTtUSn?NMQuI!gsm_+#$S=Okw0EIXU zJR*x37`TN%nDNrxx<5ccmUKs7M+SzC{oH>NS%G|m0G|+7Al(4Q4PdGP$ZG(B0|yTL z2a5k^_z$LlG>`=Z)$$vU0L2qLT^vIyZpoh5$a~m<$2oA_0j+|mp)m!F%+G!GE~GN8 zmdKI;Vst07sWyu>b%7 literal 0 HcmV?d00001 diff --git a/resources/icon/browser/hotjava.png b/resources/icon/browser/hotjava.png new file mode 100644 index 0000000000000000000000000000000000000000..6bd83dadf5a1fd928febb4eaa477acb4b42dce51 GIT binary patch literal 791 zcmV+y1L*vTP)32g1b0j?>uj{`G+9J3i@Mo{&Ni3n!-)iYcOT{Tn-^!6-1*-^p%AjI1e&gh1U3_NBJ^yC z^7?I>VyQr4sEpu4E8c_<6h9Q~GjFZmJV40G7vqWN`n@qOC==~R%x<(*iA%q~GZ_po4 ze!6UV`tTUNT)TM#pHXASP?T?XZ{*N{1h>W}_~YUzg_SDNu*3Yq5*{;*Cbc8l;Lz7+ zyoQeL4KSC@BU%RinXLG0N*TYV`usvtvtg;EO?Wg#|z(H8IVt zhmUF0G}h})lKTcYb^I_Na(Ue4B^pgZshkDTLKX@|I-?fGJUQd7eKV-4YB0DHeU42A#ye{cAGxpeRO|9j^dwzRcWx2?SwYIyGUf3L(AW8<_r+phip z|9?)Ugi`eG|Nmz)M1FrisoHqv|L2~H|IeiLZ2Q0U{C}YPN5NW>DSF}(2X+=X@PxCl^qkx* bt}f0n?NMQuI!iCrNr2*AI7}p2MTc( zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvI6-A0X`wF48?01s@Do+FXbrTC{VoA zFl~xr&tA)^2UeN~+{-MTcKpHnBPU;f{r&&_`~Tm+|NsAgjrxq`K)nf`E{-7;w~`YW znCAWe-?(H4W6Qeu1I6+#;i4sH*e~+%$o+0K`CZh;ArSkydtvf38@9GD@j9~Gt0g6N z?Au)SpY4)adt`O}Irc33)LXkh+fCTtv$9yv#s0({6NMAM|I0HNF=!n1Gx2&2w2Q&h L)z4*}Q$iB};U#9h literal 0 HcmV?d00001 diff --git a/resources/icon/browser/icab.png b/resources/icon/browser/icab.png new file mode 100644 index 0000000000000000000000000000000000000000..c30ade7aecfb5de775cb3e4915b6459ceab91d93 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~dL^zACC){ui6xo&c?uz!xv2~( znYnrj#)b;HiABWSQnR^mS#w%*@EBYq72) z@Dfmnv%n*=n1Mkk280Nn{1`4FY^ZT$9S{OC~H_HY0P& zlI0h6*5BJ2^zuZ(|8v>ZbN1G+JUVCV-kzPemTujJV3*k1epaH>=`b+ z{n@$G_LQ8Q@FrpI6A^{iVuP4unNFC7xi0_E^;pU;GjjWqW4)87Om+5fK4UXs=|YDI zoI#DdU-@4?X?9ol>AC3>8ugD{Ssw7|_Pc;(^O$xoXsBz@k<(o8>RrN|lYUbbjZ~k= da2FoXI-#XUC}lC9Ssx*J{$JQbz=BxuSc X*7N&5u3q0Y<8+Qh^`#yetN%9v)|hJI literal 0 HcmV?d00001 diff --git a/resources/icon/browser/java.png b/resources/icon/browser/java.png new file mode 100644 index 0000000000000000000000000000000000000000..5d9ce9fdb12411840067c54161a93e71bcbd994b GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|NsC0`2KrZ?&3W&w)alj zap}_I|DV5q|Nj5`lb8R2BvAU`so&RbeV@7NKaltO{oBYpJArx`OM?7@862M7NCR@x zJY5_^DsCkwB+S^5&de_w`VUi>ctgQ$n-u|X0f5fNGw49yWM)cM8kKD@imx$W+I_nve5{U9NPQi>3Y zMUy|it*0{0avf5P8K61s;B=3BWW4vJPauRqP19MHnVLJUW_7-Var0L;ix=acASNT(7s7pnq&PQT3WLlj6(o zhj-8n!MK zM~KcGYsJJ9LRqb|gaEATO>8_W*;$aAcF(L;ujX}+$1DxHRt+^wkdaaf0APIqv4xeq zZFH&o7Sb!Yv~M*e95oqI^gACCImu|gl93J^P7CYt^4ptAsjT-5Tn?OT2LMzw(9(dM zuE+nSmpAqtYo?;IH!#%ASkX|m(lW3JLaep4YPn%IGm4aDNIkZ?ot4YYhAwvT;}b!2 z_Pm=A0vXuhb}}scb$v7$D3mnC;lKILzxltMxY1n^Th%9&V~%W89&c$dX$?NMQuI!hYIE7WjTwYBS1qyK% zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvI6-A0X`wF)_hFXu0oA04CUV1!c!RR zrb-vjww^sAOEwj z{sRgd|Ea%c_1kvBzs*T)zbzGP7au+P@!jwLJi2{)>yAGCFS%{!4hsXr>&AcPsVOX3 zqH^@Z|GUX*s@(-`|NrmPp1oAk_|O0UF}i1&e2m*WJDFd`JN2A&DEwc6hbmm72G|21E$vbbOIH#mw5WRvR`77;8PPe+;}AgD8yOd5n0T@z%2yA zjF;}#{Q(NHq&xaLGB9lH=l+w(3gk-%_=LFr|NsBYnKLtI&NMbQPD@Jza)B~4XQnYQ z7+d|AG!MvOED7=pW^j0R11QGe?djqeQgO?)&r|4t0|%4fl_&r8`z$8!yV2^+Im2UB zETh|&Wiw9oZRGNu(ePsrSNn;iZocs7I4i3cd>OT(mrt%vcoe?aYWg3>(znbd&l#IK TexH*98q476>gTe~DWM4fP&Z&x literal 0 HcmV?d00001 diff --git a/resources/icon/browser/leechget.png b/resources/icon/browser/leechget.png new file mode 100644 index 0000000000000000000000000000000000000000..76b752d03cf1f230891eecf59705fe6710abf3e8 GIT binary patch literal 682 zcmV;b0#*HqP)eo-`6Uc{3*d2OhjYB3=l_XEHuMm$r!j7urXS;cI(%E{(ex!W!(TA z!|cV@67Qyz-{0L7L}oiHcJh7wtk6hGe2GFPNI;>e89G^dGd(rf5xMRwU#vD-VbaZq zn;ctrL}g(b6S9MeQaYf`h)S=m1fM?{JzvdBDLpEc6|%)BXiM3A`lXC4zfxb@TKlhf z258kp&3v5b8K~vh0?tYlv;l~HdoakL$&)Bh@iVhN*H>IPa>+{v=Re~}to@wJ*hm9n zEfbn1r4R-aUiI6kxuW+lS8y(dW1pfk^r}B(k_-fCtb;Ox6h;&HQs{y?HRKb;hQ`!J zoH>}ULpzx?dF zcM710Al7A;ul#|%w?EX5zxFWArlZ&DDWQdTKndgR@bdUb_r1Y3QD_8VzqYZf#dVN1 z1&h+;F;sYb)!Kj`xW`~j#Z@edg!~UjZuIf|SZgD*?I}3>0 z*Am8=UY`bZsA~y8TuNz|A`lXLI{tPg@CsW&_t{6BweA3J^OhP87>FqU0p__Ub8J|| QM*si-07*qoM6N<$f^c>(eEXsqp!W|2fdW0HZf)P_JXgiz&9YA|yV%=kzHS7pYdcQD$|OY|a2Pq6jk%4_R2q zm>J)H(2}*iJ?eFP{f;_TGu+kLsZt402=w%@@y&(?BTG}tW%l>2Sfs0q5J*#IW=Im! zlv0Vk-*lW*Z!fA=CHdT(=kwwDvrsO3d%Hj_Ej~7;i3t@7zP_#yOj2W2&Cc?4LcQlW zUbIYt2Ufqbv%~bX_4gBk9ep58$z-&>&EzCYOVp}lvs}Gq^mS#w%*M$iqOWt-ArmOX zS>O>_%)r3)0fZTy)|kuy3bLd-`Z_W&Z0zU$lgJ9>8wB`-xK7Cyn2|5>KA+)xKllGm z*8fYmes2}{zg6OBt@iJEy8jPI|KF{(cR}(0m0riT_Wb|<|48L?FQ8t5k|4ieAQu@h zJW!661j_Y$x;TbZ++u8DsQ%CJk%5ijJcByJ(F%qi_ZdEXVAz(xu*87jl>oz!u*wGv zEGkI}48J4G1Q`Acod3Y^vMk~QLtAO|0fv+y7Y2sXAT0(4$30i|5RlbL`l;|Ac@?OsEi0 zFI!2FUocoL!{+@<_5(#sJY5_^DsClnv@)~>u&HsJ)nHk=uqH9}P0frdMOBkpCp|qq pg;^6PGOo}HiH!90x{wu?&ThAD_9KFRT#`2Nh zR7Heg*U<|MPv0{#7->o{n5aoG{Qe7a48u==0Ac}YVq#=sxOn#^!^^kt7;fHw$H2|> zgW>m|zYK@({$P0c_5s7Iw;vh)e&A$Klki{=6clFo_wU~ifB*t&WMnvV`vt?-&mS20 zfEte9c*VfW_K(3pnvX$%{XfHlw|^NdWqvTIO3N^O{K>@d@a_wSA3uLG00a=zy=Na7 znEw4>P#5Q9c>Rl;;qT8+42FDf8C(tJ7_NWeVc-WE#?Q^e@c6eN!?g#`8UFnI${@(W z$N&&PEPwz0X3&roW#HoEWYA##%;2iZ#$ctV!N4V^%y9AEeFjlhMg~p+5e5TUZU#*i zIR;iXc5t8o1Q3g~FgF7y7dOM7zkeB&CHNRZyd4=tg@qZ`AHUD=5 z8d~Z=4NM^a0VC@_13&<={QUWgfs>Pq0p!=e|Nb+Gib*hVurV_*14G$Gmxsa2OpifZ z&ye9S&|t78C;$i`MqrZrfR^MSDFA3HBQQ>xm|4JV5JmzY0Ro5xJrTf@6cZy*Bgkq0 wp$Q2!{s96Ar0FfTWCya~Kc)t_jQ{}#0B|#}cbB0wZ~y=R07*qoM6N<$f?oX_(*OVf literal 0 HcmV?d00001 diff --git a/resources/icon/browser/mediaplayer.png b/resources/icon/browser/mediaplayer.png new file mode 100644 index 0000000000000000000000000000000000000000..0536ebfd992fb69ea5ccbc4be62d92a166d317b1 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~`X#OrCC){ui6xo&c?uz!xv2~( znYnrjMkWerFUyL63lHeO=ivGcz)pFlO}@ z90Ce)7I;J!GcX9nfG}gm5wlL9AWOQVuOkD)#(wTUiL5}rL4Z$)tEMJjV4!Jxd;FX^ zQ}*nUIC`{x_wH@CZy){n)9dHYjql&zdj9F!$v^)8U+?(u|9_tU|LsGsuwGX6diwvn(VzeCR+arM=R5p; zg65_9+vlc7%({8%+s||LZK{I7EZvQ-rnzi26w5bDyP;v!`qOyAf8PtCzdmO!_;+6E t)%^aq?6Z;;VtB3q?M-#dolq%I%^)sdUwUP&VKUHW22WQ%mvv4FO#nsepHu(< literal 0 HcmV?d00001 diff --git a/resources/icon/browser/motorola.png b/resources/icon/browser/motorola.png new file mode 100644 index 0000000000000000000000000000000000000000..72604c9c6bfacc9e4291101ec07cad8c3a3d1be0 GIT binary patch literal 655 zcmV;A0&x9_P)Vp^jN z>cR_2q?_m>*i{tTMG)N?3PDFith|Y$C`?cxJ4r1@S)^tjNU~NQ=G^fJDD(uy0Uo{aJ$cdb8{ zVn%&M-tL_RS?(0eR7j|v!LXQK_&qrrWrq!MqcKn@NHzqD*g*|-9-F4^t;$2pfYUbd zd09*^{Ea0nFq6}EXiwpIc+Ojp8rbhmb?I*+^GEj;0{~$ymJm4^Np>BGCCdHTPsV5K z4qp#-kDNVTaU}Gxrsd|$LNw2lj*W!VPNK|{RhXMfn`Y&Xt$j~FQJQObVyXLHIP!HF zy8Zt1sTyB4ts6d1h7dxuHu_ldQZzolw9XC*VC2;z*)-VYm+ya8*AuMEwkAIrhG{8v z;Pk-Q(2V9zQ{;p;+3{y(^GrD>#^k8)C8yq@x2@sf(FtKU1 z1WRsr9(3qBF|$%E1SL$fdtjpP@yFSvwM~w@eeSP1CkE7#by8i002ovPDHLkV1oR@Chq_M literal 0 HcmV?d00001 diff --git a/resources/icon/browser/mozilla.png b/resources/icon/browser/mozilla.png new file mode 100644 index 0000000000000000000000000000000000000000..6008a31ae14466af14778c8172fbbd35f20e13ba GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!hYIE7Ut768wB`-xT*>WyUWU?ONqC!b1oC) zJ;cR!kAvX@Gebm>Uv+NIvT4&!9X$B_-lO-=o_+uR{r~^}CQr6=1ND}8x;TbZ+)DoO z|NWVr<^TU1|FKq8+4<{VecSb3wUa%+{~6y&DC0DH^Y8qHgHcJ3gf{gjHbzCv$ehLA zykvK@w9|9tYg(1cIwUf i-}vSK|MGK8nG8m@rdRd3{zU=pXYh3Ob6Mw<&;$VIB62bS literal 0 HcmV?d00001 diff --git a/resources/icon/browser/mplayer.png b/resources/icon/browser/mplayer.png new file mode 100644 index 0000000000000000000000000000000000000000..1eb7839550b93ea0cb5ed298e09217b61be4a4f0 GIT binary patch literal 689 zcmV;i0#5yjP)(_rTqc^{{8^}{{aF5`NFgLy{ZJ*+u#Y~mR0W#^%@TX zCp#xyJS|xM{`~;~0s;X0`2hj~_MeFRc~}Y3$O`xK4hsGdBlql@)RBP3i>kx=y#*=m1`+uK5mo>HH4Fa4#K!^v{bFWeVrE}4FFp6)ksb^R1_S`t z-wXs;AJ(hbAo2M2oy8L_Ob2afUqVGoKtMtV1_k{0f(bL-{6{Qmt90oB{t?y}QCV`6Cp1Ox?NMQuI!hY85xZ=1uFgi1BEyX zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NS%G|m0G|+7+py_+;RiHhA3EedkLY<_ zGwu3><##H#e&4wF{K;!?H=h1}?)HzDA3uKo{{Q=b5IF2@sR7h0P!i-93>H8T3=foJ zC4q8ly&!Cc;&>(hT6UbE!QqoDI2LIX0MZrSpcM_#1Grn%>Lqsih)lTOvPt+(T8 raYReoLiXc1|wXRj` z9yu_G34rA)fV^jU`3!tuu2|^0w0A(D0Om59M&#zb%PTK`#1E1bp4xk@Yu&r@@^=S7 zT+QIS8OzH1%FF8#Kx#W}udPa9@OWNR_Yh>u%)42u6d0J=%gdjDxRWohTJqpg-ZNB~FB0|3dNb=WOl RaB%?NMQuI!hYIE7Vsc6Mas1BEyX zJR*x37`TN%nDNrxx<5ccmUKs7M+SzC{oH>NS%G|m0G|+7RRLjlS($Vx@iunOWrDni zxY+J-FnnNUhzRnl&dpgiZQ7}W2cO@2^#0ki@87@w|Nr0Q$#!m_-V#q2$B>F!$v^(T zKeMy^|9|5@)~YHyfBma(yWXpIvgh|d<2wmuoMvzSoxgA}D(R8XrvAjnsE8Svv)G%L z?2eXPTrGH*&G502Gq3uBnw`ZPT2&4=UHj6qZt8D|H1p|fZzopr04q6idjJ3c literal 0 HcmV?d00001 diff --git a/resources/icon/browser/ncsa_mosaic.png b/resources/icon/browser/ncsa_mosaic.png new file mode 100644 index 0000000000000000000000000000000000000000..0236f08b143f7b41b9a58b1e1f67f6b61101bae7 GIT binary patch literal 790 zcmXw1SxggA6n$^{rX5=bC>5y`0)A*pF%iUs8i}=9L=q(g{lMS`TKzIaL*f#m;1-pb zU|gdJe)vIRf-G?(Dk3UHkU~%qDqsbJ3PSg3XXeeb3Vz&saz9Sa$+_o3eqIi%j8_5x z*xXH)f-pw@9fk_;YD4R}FrWkGEoJ~7*fQyhKg0Lpvh2dLt)=_RjuaoZ0`tDo5^Hkq z!Qunf0&DTUV~4t|SpZP=xfb)bqr)H-d?2v3^@$(=LIj3^5|R1*90h5HQDDpv;zqQ5 zpl8zMlNndXQvV2u<9LK*B1Zka?xDee>z5=5K}-~K1-(EC1=08N)q7o1W`t^*I)ApZ z($9^ViZaWC!N8?vLsd~-B2J^xPn@WQb9-$!fLUViTsF-LDIDNr?bphN0#aC`t^4{1gNhi$a?q zPJ6t=PS`W>**l?KNMb&WNo_AUE~w;rhGOckUOqiOWvVWE;`7mqwY$<+mY?7_Xa9J? zY%fv9O}S>9mIYS4Q5L9iz2XcYe!d9UZ&d>ZYFR>+d&r zb+=@d`<&fz8!P7WM3RIFkwYLzA|ItzA3wg<;h374;leM_CCCLafH4TTd5DGoc~a8w zr|-|7xt1ED4JiqM0Hux7EsB*yEKUCi&d!Rqj?glFWJDC0ClJEFef#Z=4UbRwMut2H zArS*CVu*-JrjjFN%8J-5lSCsr+=y#uJKM8w+?Z{;e!a2zmN7#$ZcjQXWu&En4cOFo km(AK9a#YTw0k>_*N0&WubGXi_@% literal 0 HcmV?d00001 diff --git a/resources/icon/browser/neon.png b/resources/icon/browser/neon.png new file mode 100644 index 0000000000000000000000000000000000000000..d404c266570f8f0528f80664096de9408b1f33d2 GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oArNM~bhqvgP>{XE z)7O>#8lwm!yTHyl0d+v3=bkQ(AsXkeUfSrz>?p!|!Fad#CY1?J8#YH+*DKtJx*c)j zM%Ucl{}1N>P;Q#)>Q(O`Fk7UlDbwV)PTEN}&ww|3KBTo-zvnC8q2Fo6Vz;Yl*X{Ub zvF0NZOGULd9Jo6vGUeNn2b|{f_dHZ6j4F!w(%)rurv2e2o+nn?hw8YhS3Y0nxVN2Oxtf(5H2-GG+T=ygXK&#$=(N%?fgtP)eOyBpIcL2r39X z1c4o*Yw0PFE*W^}*2OL**-41JL_Z)1jD(oymi$!O|)pnCAau^QzNV_XmjVT=I~w5^%h6{DfG`LJg# zQk;36NhkBb_b#3$_pZ0}oCw&qO*tZ^eCpLgxT?MLcvC{Ng7YP{+ST0Pc1h~@ZSSq| zMQwde6h(rFU+0&HpKf0nx)fW911gFv70gOJRoqP`{q2fbQT^=G!x0|^!0C4(ZBvMb z5=3%&y}*H)CZiMpNFjHi)T#>+9{e&*%VzpVB=2wt%fU3Wt*-w1jy_pdc_C*|iixen zX84yL4`)l~s8Pu88;ZI0OJ zjZ>qy2WOx4`5SA2xChR(Qbf3ObHH7dtdvD=>HB(8`?-3y(<4eocV zIoT_WjXh{N;*()}_H(M!U*{FS?QRD3Ot!B(S_w^zPbs$0GWlr8UDreyV~8LKeCqkj z$rn2&Z=+5XQC5Z32JubF<`a*f1Oi>0bAta9Py*|b)%PEkHnxm%nRz_2|7aal;=?0% zIp>5B@()C`ZRT)@002+{umEZRfN?<11c4Gl{sQQMJi*aSBzyn>002ovPDHLkV1j5L BJe~jm literal 0 HcmV?d00001 diff --git a/resources/icon/browser/netpositive.png b/resources/icon/browser/netpositive.png new file mode 100644 index 0000000000000000000000000000000000000000..9c53455b4b6bf2a4738b98fb02df9b4b45ebfbb1 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD+?O3yPT;)SYZC1qyK% zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6398(-RmJfZYEK(;4)ED%u%<>i(aY&;ZnHpg)0uLI1>g zh7%0;fofMUfK0r>Ag>@lLCFv#!dMdI7tG-B>_!@p)9dNt7*cUd_gthdY2MTc( zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-$0X`wFK)SxZ{{R2~3=G}>b2LhU ze0NV5$B>F!y*-Y62OKz<9RK})&h*ag#zUs>l8`*zgp w9Xq^<{j0&8*!5B$luDT$yXTy~n*2N7c6}eCw*Yf9C(uX+Pgg&ebxsLQ0EP)ervLx| literal 0 HcmV?d00001 diff --git a/resources/icon/browser/netscape_large.png b/resources/icon/browser/netscape_large.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd913abf14eb2fdae4718ba26b030e871bdba45 GIT binary patch literal 440 zcmV;p0Z0CcP)$j|!^0-xW5$X`G{@Be@Q{=Iwm z4oE`y@7}+IfcNhq{70R$-o5)IIYaN=MKJ&EMNT~+G3nmBS782|S8Ppp&%K)S=G{Xe zpXbe;ON|+O?p~U6_slI2|IVFTO>Nz0Zq2!K7o?x*%$ZX?J2Lj1>N$G`#LofoPfzPU zHT(3LgFrs_nccg3cCSd>HG9vQjUfK%-MhMX?@E)Ny=V6+AU_*Ob?@H2EOYkm-C%hj z)vctYB_XwY_bwoxagloA^w7}IVB>P76+nKvX|TjZRTm&|4K)PvS%I``hzl45f%ynP i4L&m(pAjwmQ2_wYv7xtP1OdhX0000$hL=3#H3Y3g5hBPKHp+|Q&`|>q(j1aOT9Sw~_k&C^Xg0Ju1_xE&I7=6y) ze|+)q@L*;yZcRmBt~`&b*)3z>%5N|Xz@}kr8(eU&b`x&hJ z91Sf^Cp+4&F(zaH07OJYv9|eUV_wzbhuB9p$<*^lpE|Zz#v_}{-`Bn@EG)>frJ%sZ zIR^mY)wZ`g+^<@aS@L$t!^e0rfT-WT!}|Jc@%Vmw`~8iLbwuQxi{1C`dS9f!zIkFU zUrg;fRbMs0{3(mw>-A|`tgWpfE6Y(@TEaOOXS{((5LP$bM|*o}Ckdhga(mzobtY2^pEeDa#D5m&OqQxjdDX7XSb` zHxU2c0RW?;Ln9;aYHFO46rY<5_xC?-YN|I39RQJth{!NV*LB9k;o-Nk>!T&y{rx6Ec)l6``6aigTYW)*||t$r?9Z_ztqeOP18&!(}_8qPD_$x82TS| WxC`xD@l-+p0000DImVc`)((`@uMlDWwP@+qPS+ zmMqIG%SKT|2noY548ua9plMnh$8bCzBZRK6ue;rDCX;D28Yd?W&+`(ZFrUvC3I*Ty zi^by1%nYQIdS0*7`7H=StyVicJQR3-UcIwCX&4UX^ZAX94VGmM!$5Hyce{UNS+3P; z`}?0&RTWZcgAAqg#&I0WvVQ*f zE~XVj0VN5oYB85Ziz%uyP;}rIKi$VY%d#damFo8PyIa?ZCd60Sep&NT1{NPh91HF+ zdT=j3@Usbqy0;!$TU$*glN6#kCAsU*ani(nFd}CVIbdOW_`$oMQzQVPAP8u7cGfVA ztII1<;8Q8}efuHT9@7J={Th92%>{gRQW7q&+U0T?5<)P>uh-YVHJi&zx|mkP@Gcwm zdyMELQlp?(Z+tD4N}qOj!Duw1l%AiTS1J_%z|@rXWZ`M?+4IMXi@EGH0H9i}UR+#I zN&%&m5JD*pf?#uVQ`dD>QBsnWQ50R*x3;!|AozD6r4#@_2w@lo05BK~j*gBxolY*7 gTUlA*dH%ot1)v=#`Q5N>YybcN07*qoM6N<$f&#f9j{pDw literal 0 HcmV?d00001 diff --git a/resources/icon/browser/newsgator.png b/resources/icon/browser/newsgator.png new file mode 100644 index 0000000000000000000000000000000000000000..51e24fe56c66d06eed50e1c87e42faba311a60cf GIT binary patch literal 550 zcmV+>0@?kEP)v-$>oIpY;L}v z{y?%+N{26AXlZQ)NE%4UU9ph6B$p)B>y13mo7`-9loymo(F9;~QEL^|*FxV-S}E?W zYw4wRoIvLpbaWfQLh{AuoFC`LJa_kXxD(e`ENLtLF4?nF6x7nLuJahYm&B>jusCTB zrJ$oZfdoJS=3v}b^_}vWgkL9F3M%Bs1~_mROlSe1wPqZd@YwLVhlzedg?aZS$Pr|# z6>WTB@2FWx-Uuy6{p1b*HDg;p#3)Ny&p-0b<*>gc6Sfu4UbEqeU`esNs<&6d_gS_F z)jejX&AQI%>>b~8FhNHeKEKe^Xt6f0*CSzNmWN6Z6otVts@Qi+;`HtC=_yKJLKX5f zu|~m^sLLa~{3r~KQ62?|78jn_!Z>$ofKx6Skob{43_Y;ktMtg`8(>we(-<;yXYE}*=fS;m ze{SW>oH?^0Ba|WP`TO_Jo+LSGTL$QK{oix$*M+-({xdMNoC{(|`_ItQ@@c)r&Fe?f z($Y2_e0*l6@&Erz1qB70I*&00KRa{g46psRj0xB4=k5#+4i5Sc^u_=7^`CBD-DhlU zJgYAK-o1O_2Tks{%7-P)Y-nI$jQjZL`P=a7mCv3{Gj?pLn6b5J){pjC#UCYlmGw!f9c*tc^e*vkX_r( z{a&+XO<{h@i)S}yp84O>y1%e=OaG>qPdBxtd20M)WCBLPC>W>^IR9U^31~NaiKnkC z`&AxB9vz-j-->qvg=#!q978JRgq}0xI&8qh8X&(YCjEa28W|iJr(!PM z-CHHPe99C5s)X0tZ?`Y`&k_^)Lfo&2!~T%mJ`p31@B3c5E6pq0P!hVBWBz0PYj>{1 zO@6F!qH^`D>l-aY64t(yIm#(=j63({y@Rdki?`OzYrGiq`tP%e`bQ1j8$EumdKI;Vst0GoU;761SM literal 0 HcmV?d00001 diff --git a/resources/icon/browser/nokia.png b/resources/icon/browser/nokia.png new file mode 100644 index 0000000000000000000000000000000000000000..3147b9851ab49f07162641023b6eb49fbcfbab68 GIT binary patch literal 397 zcmV;80doF{P)Mg%kcaHWFI|s$>jfhCk8)LdS$yF+!ovrop z+l%F(A@cXl^D8sEpU|Xoc~fmS+`EE>)MnxOY;pInI1yD8MJPTw#0#@pCapg{+q#a2 zCwny$d@(zC{jihMYOUe99=C1(tLh}lHeO=ivGcz*kYHOJZ z@BoE43p^r=85o3OK$tP(h*>94kR{#G*O7r?V?XzwL{=c*AiyWYRmf(xT-pVj>hqb6 zJHwZ~$=?3HdFzX&3%}RyIJf4+%NY-TZGG_L(xcC>UVr%f{rCU>|F=D}P6z6(_H=O! zskp^hz|jAn;s5^|7QO$0^bd?NMQuI!hXnFM6ma(Dha4iw@n z@Q5sCVBi)4Va7{$>;3=*S<)SS9T^xl_H+M9WCijK0(?STr^(26yEt!EQaf#HTbi4@ zq@w&}1{{RZT zyZif}@t^hOR0$glsUr!;P{m~l_& zP|hxKjdvTHPaaY>=smd9`NTHYHC+pj9zIyt9?g5$SKR&U{6nuL{=F*@G-8|iyWISQ a9K(}Lv)L_Cw%$Oi89ZJ6T-G@yGywqEVS1_n literal 0 HcmV?d00001 diff --git a/resources/icon/browser/panasonic.png b/resources/icon/browser/panasonic.png new file mode 100644 index 0000000000000000000000000000000000000000..329958ba82d86cc5aabcae586f401dc2adc50251 GIT binary patch literal 302 zcmV+}0nz@6P)5PmhMxXFIxkI^5r^W=;9tq^Y%r&YC1Kz0|%G z^&n4vy#9Rw??dN1b_pZ_1iB6YT{w{c{jD|7FQYqW8|_dk07*qoM6N<$f(tu@ A=>Px# literal 0 HcmV?d00001 diff --git a/resources/icon/browser/pdaphone.png b/resources/icon/browser/pdaphone.png new file mode 100644 index 0000000000000000000000000000000000000000..4f4f68dcfe6c0fe10702b471a739e812a2718b3a GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~dL^zACC){ui6xo&c?uz!xv30U zsik@fM&=56`DH-bz`$6+(9+7p$jaD2LEFI4z~K5!xk#W+_7YEDSN6-?(n30dPo_$~ z0Sa*zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|Ns9#bLmQAdTLuw z*Z1$=i>oUp&6xG*(WA}VcP?77cI)1~z5yXx#-`g396osL-23hz3Xvr+TO%0AGE;KSSe2bBt!zL_n1LO!#S3j3^P6Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy2XskIMF-Uk2Mh@a00TIi0006RNkl0{aoNVQs;N?V3U7cNv(niNc`KrtY#ZhV9oSDN^5_y@RR zv35JKEU*kP4Cn?J2Apx>BgOgW zuM?b61E#Fu3`*}Q54Y621;tmW-+0=*o^K>~)!DbIZ(SM5A@E~xP!$iQ^}XNn`k_S5 z=U>zppXL0g+V)T7*;kQ}p|nPvPO2YY;;9Ng!yZKa587V7>CQA@N{30xJ-kL!sXB?h zONgKoQSJ6Cd9GBunrmEJX^pQbC#NaDvVw?noI1Lw5fmua7WSpYw$KyPU;?{lwXrps z@QdBl?yT+w+UPQ0&m7dx%{O7fgpdV3?2J-Aob9R+I_qdoD;x^RvV5;3xl@R2%~zy5 z1?57zMO5$d@c=sbEzhF1@m-wWl$WdGn;+upMSvWH?jQdpNDVLR6D0bz&e{m z+5H;$Owwc^q1(cyGo-~z>iH*)rAlpZ9?{QY!-kEsz;7nX^4QBd+`?p82d8tJVy+_3 zy%Qhp$c(?^FdVr|CW!lH+N)I|P*hIG(LlTv-x5;0Lhgg;x{t^!Rawqp!WOLpR&PuT zZOGXJDYc`f-YdbP(l>)3Ks`3xQCV7HTLeQ8!#H+C%>KuEPt1gyn0WRG^=use4_3W7 U)z*H?*Z=?k07*qoM6N<$g53)>UjP6A literal 0 HcmV?d00001 diff --git a/resources/icon/browser/phoenix.png b/resources/icon/browser/phoenix.png new file mode 100644 index 0000000000000000000000000000000000000000..d133ef2071f15c15bd2483c825d2b6800b2901ba GIT binary patch literal 514 zcmV+d0{#7oP)mEitfLjNO4V1}{&aZ%M9m@IU|1B2xg3_@zWbV_nbgT_oK6xp#5h1e? zA%`_jG8PgGa(#OXw_%|LSGg&rah;Yom~gBro`6GWD7RsG?@I23%i|8oVqXA{88e0| z*EXYLt#{itb1VADp9h*LKU#2gY`1YzhYMaZWB)9D-9ZcK1n0xd%r4Sx+W_4DY>jrz z7^*bl0RV1FX=>jTu8%sNMSyzcoN~VDhrheGHCfw^m_pByvAjG0B%*F(FwA-{r~^~07*qoM6N<$ Ef}ow#*Z=?k literal 0 HcmV?d00001 diff --git a/resources/icon/browser/pluck.png b/resources/icon/browser/pluck.png new file mode 100644 index 0000000000000000000000000000000000000000..ef375044f5beaec43b58bedbd743d5475bec5c9e GIT binary patch literal 662 zcmV;H0%`q;P)0^=YLMd3c@(KtQG$AEK3>Aa;=*b`$ z6BDB}As$rl4|u7j=*^>&c+kX%7-f?hFQyvB6QB{Xnj)2;2!)oq+je(_c4o(eXTM+Y zK}sorkb__)qb+5&3d9t7?5hz!&&P_z0>^QZBuSFQ7=uMZ5ujsJOZVn9y+BK>xVmD; z-GKAz@NiDkOll&GPWSf*gM%0&?*7YuPszbw2*RvCiY*ZDpbZr_<@s z^&5(!D4C4U*LJ9*&4Mui002;8LyxDI67P#HtJz$EVLTo`(t9+ON(W9HpOhyN$3-F$ z(X}%T#euFCb$#Vz`01=-@9@|;x7+P3FJsKCaJimGB8Pi=E?vHoRWc*D$B$im_;%T7 z*yXh78%`_5qA2?P{#Yy~%ksp;6H2Mq+gx8$U0E{wDV`Ymy1?`Nww~+S--rnz;c$2{ zk$4r2{wtra80qsvLI^^L5Gu>^;^H^P%&IE)h4begJbRJV ww=rMZ+OqeUZx3S(GR7#S2qEx)l$rp7zstcJx6%mPzyJUM07*qoM6N<$g7_FUhX4Qo literal 0 HcmV?d00001 diff --git a/resources/icon/browser/pulpfiction.png b/resources/icon/browser/pulpfiction.png new file mode 100644 index 0000000000000000000000000000000000000000..b915740f2f46f475be77acf3a47b50e89bae6b13 GIT binary patch literal 689 zcmV;i0#5yjP)(_rTqc_|Nj600P5=L&dkLN3Iz)Q0PyPR+1AtKo9iF&G;o@AUd1Coag)(b2r80S^pkY;{*r zUH$$21L)!0e9~Bnx?DGHr|Nj2~1O@~E{sNyu23HB$|$?*mZ4j>*S_v`Z~ zAr}D&4gmoH|Nj00|Nj673>NSC{TmJn4)y^YBrOaV9pvU1rPT=K_zD8~An@kn`1bV$ z1qA{D0Ra;kAoA?-2NnwX0te5;z4!6z+uGHrw#9~!w-6dr4h#{stf$)9*aQFo02LJw zyu}+71|ta?0^Z=@*Vfh=A0ni)oyNh=?Ct9f4-Mhy?zVq?1poj4_4D%U^#t9{*a!sw zEjUIA2m&b_^(@x8{{gNKF$0RaK|{QmIf+&VZp9xplm=d=<4&KLFY z`N{zc{QVUN`8YF7CpSzuJUs;d{rnvsA2TT^{IYxD=QAl2`11uR=L0X=?)c#I^#u+O zabtG_0s#B_`vm>{{tgTb8Ywo|*G4xlSo#+=5E&OG5CACs00H{_3J3!L0ssB|{sjdE X;l&K`DBuQ(00000NkvXXu0mjfq~szM literal 0 HcmV?d00001 diff --git a/resources/icon/browser/real.png b/resources/icon/browser/real.png new file mode 100644 index 0000000000000000000000000000000000000000..9ca3fbf536e7f96f26f3cd16c721054568a89123 GIT binary patch literal 1406 zcmd^8;cJz36n^fu=FmG^U+gx6E=I^eXm$uJg}cebt#Zyc!(2n=wN76GD-*IiyjLAz zQ6UVOKe(k|7Wm;+#GpwoBgOUMS6`Hv1e*$*k+C%-@50-T&+q*Y`rHrh``*Jj=Q+>w zoZtINPxt1=rOitLG-d z1}Gf?{xQCP2llrDfAj+{4g-(x9X{=@1GVURW&0)z$D27bH4`(0$b0k7yqXvD2ubJ7 zIdf`G%pugOH+80JDy9gn;!T{1nurOAWbg)OP=k<301nW^Vl%4|=7i(CSMSApgt3gA z^G>}J?+{opsm`l<6|V@SSS!wpdJ!)mN49!65A_faP9br1*2qaUQnZrVZpBteB_O)!!sOO}!c z2NRpn#6oZ`q#5&wDuR*J$FYn=R6t)Tmn@i6h=M-SX&OLYET_>_ODpLIX|kJkkP`({ zAz2fQq}fSYrJc- z920lKwiCgDa-tzDKcN*AB$EhDEN+SBQ4>eS<+vpi6$)|G8@Id=$7A;Eq!r5662d4d zTU3Y(V>a?jrBIF|7WYP1C$C1mQ9KrpjEoEp4)Puo=f9q#^T+zwGxtH%{c7?p{BIt( zv%YT?kgDnGXy5)}IX^Ity1f_dxz^Twr4vY9sk@Rp_^woUFW#HBVs=TkRH~V>qE&{z zJaqid-Lv1O(=7V&ug~XmE5A#3{(a3hoIH@KIXb=mn04R3UtHY!WbXLv`D&^mduqkk zbIs}MpO+>kp2&=5zOSuo>bbf4^2;C3T`K-m+?HRs`~#ZW)_i6+cAl91xBuo_J^9hf z+_O)&VeNaZ)d%;!+FE+;(?hqOzx(L&T_xlPDwRrZ=BYJ(#mRkAo$lX*hU|*^nW?FD zH|(O`)`jsU->l4*Ue9FKWfl)k&*a}+7+>~&x(%sEN~_Yjo!P$ndcxEU6(@EN@Lw%{ YeyMBoj;Y_?2$!d8Q+LOijs1ro0+ChrTL1t6 literal 0 HcmV?d00001 diff --git a/resources/icon/browser/rss.png b/resources/icon/browser/rss.png new file mode 100644 index 0000000000000000000000000000000000000000..7a139eabe6469bff80ba01012dd00bce09e7fcda GIT binary patch literal 403 zcmV;E0c`$>P)bw51}BV#i4)6b4V_8@aB?tn!=iv@YA%CGG>I_VQX z&|tS$-2Byn&sMv!+P#K=2D#f^FZ|ipa?=HIJR*YUNDc`G(n5<|*NN6YdF``4=!nXj x2>_0Q3+58ZbH0^6bb%Y4(GdiZPS6hs{0A$;oK-ss0vG@Q002ovPDHLkV1njttNZ`} literal 0 HcmV?d00001 diff --git a/resources/icon/browser/rssbandit.png b/resources/icon/browser/rssbandit.png new file mode 100644 index 0000000000000000000000000000000000000000..e70b987b1443e3aac7db122dd6e309555dcf1a57 GIT binary patch literal 642 zcmV-|0)737P)cQrFzOWn2di`t}9dGI2XXkU1X zP9;%?E>RG4Ewktn5*>rcLx%`LvOqzJ5Ftzv6Z4B$P1i)+W_QMUGxOg6-=!ZvMnqaG zA|g`$)(B;v552mOZb|q{w|3{A`t}MDA!bsrbu* zMlWOgcEqT>5o@?ksJWEVw(axX=Vqp7E2~S6B#TMo#CV63W!a1yEec`pceMFgN!>+= zL?ZqDkEg!R5*OJ`cVcoURcFbZ+}Ex9YD|pYG!-lprGB`fy?HKIdML1K&}o88^5YSAjyRzM5)(WST`Bkr-(X zhLinTSR8<0O<Wj|W&i*H literal 0 HcmV?d00001 diff --git a/resources/icon/browser/rssowl.png b/resources/icon/browser/rssowl.png new file mode 100644 index 0000000000000000000000000000000000000000..6185d264643e0caf6021866f2b122c2ff83d049c GIT binary patch literal 674 zcmV;T0$u%yP)CGo(&dVxVHDL$S5{hN%S%nSm8~|n+?m_X&UgO3^n3gf zL<9h)s$5!{cYgZ8@W3YP)(m}m^{%~Aff)b*01*fQf`}Spl;hmf6Cr%V+rDswQNX);I6y?*26KD0@p;Ra;wR<;VWcE}wTAWQ(%L$msl>2(JI$0>Y1O!MvZ$zN)w?({bdCbRTif+mBq@ppOTI}>uFK(YedF$& zKeKmkk7ekMKL27O@^j{?g91QsX`b+4&hGUpQQIQMcHz_hVk1Bk{GCAnF0 zEdKEBctLcft489#K7VumEv;OCRo!a)jyf3gz%B z65i6(bl~U-eR?(m0%{r}GNvLTBF0kkN^l7g5&sV&Y8petf6O8`o5J}G#Q*>R07*qo IM6N<$f~Frd@c;k- literal 0 HcmV?d00001 diff --git a/resources/icon/browser/rssreader.png b/resources/icon/browser/rssreader.png new file mode 100644 index 0000000000000000000000000000000000000000..fc8deb47c9b653dc2a020051148fb5492a41683a GIT binary patch literal 1053 zcmV+&1mgRNP)n1nE-p7%i|s%!NI{DDG)1|>$>fR88mlFXrXC}yrQI}rpfR|W1V?> zdzia~gQe1UxHz-xd1bXr9fuB7bE=xX<*V0`irhJP)EwIQyV%&+Bp;~?Bx>sX*q*`Z zQ=uY$pUsZ2+fk`)WTzs*{@|eig>&Mx)VuH3paw3qk-HWZ+tZEPG z>gqjy06bZhReHz%@~ch8`f|crF;Qw5efl4yL2J$klGTQmx#DJpx$a?5xXbfxjlZDC&g4!pj;-}uMD#^Jo^{-Wqv8iF)mf3x=g>xr_hilKqnbc#5x^2_*Cm%jH~dPs|m zj-kW(ikq`)GYZ&W)>1ZKb`?>~D`5H&c+-`FS_3Cr4Fl zc&M(-%*;)h(~V+8$>hgaH2`SSlC918EK{=3^RK7aq><3MF^Nc8fs&2R>8{>>DS6p1 z##Y9**=3D@w64@0mJV=mk72dyEQrLw&+|^Ha8hJ)QE;bsOGSsR9#51_KYv*(M~0`@ zC0MK5Yf59M!KFS|FNdq)ZPfRntga6!ZjRjfdYPnknb<>2UROAEWQfm2XTFoS=eyv) zpyl7o5M@LAmz_7Q@ zqH%O`RE-^Mkkf9Hp(8}En8sFiqfKIAg5&%DLVK;3y6K?B$E~ieEKqP$zejh7sG2!% zoXH~?W2Kprfs3=`j!_`QE@6tB+oLlY%#u=p7MriB4)8 zp7A7m=*oa?2HskdgOrR>*-SJkRTSzifTYtRnB0c)Hd?t5XjVZ;YZAxuUvvjo1M^FhhbQj@Tc+( X#v5#1>n?LP00000NkvXXu0mjf6v!tL literal 0 HcmV?d00001 diff --git a/resources/icon/browser/rssxpress.png b/resources/icon/browser/rssxpress.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c4e02a26fe567897ab061c8f6c8bb4fe47d3d1 GIT binary patch literal 659 zcmV;E0&M+>P)z#}VH=Mz#)biTDB*@05+s^<)fj_v zG|`I}ym;{D$)hI|6OSe&nwWSpCW3`Z{%jPWmOxrkuQzp@ zY*lf@D?gk`j2;_;O~+cwmU#TABJ!{A7pmJE7%1CjfH7uWW3;V**9NUYdG2}!oj7;V zQPM~heL|&3G(9k!>WW%>`H^&tanK0&kbq=OnYfl@zIzXYWPePKu*U($>CMUs~rZW3zp}f8{g+M-SKQLkAb>c(+U;Wr$7W`wb~-; zW)pBA%aZTxZLTcexH?^_H}*lt>F5xI@FfMQgJ7p|f z8pM!b-ST}Ywkr-Ue#({p=2b;mezWxP<i4SLIB&hAOD{FA($930674Ram0g>n1BDgbarYYU;^ZvQ_2J+K;V6O_jY!% twb0N4-$Nng=0NVwg)~f^@(Gs^_zx)XO!T@z(cb_7002ovPDHLkV1m_WCYb;L literal 0 HcmV?d00001 diff --git a/resources/icon/browser/safari.png b/resources/icon/browser/safari.png new file mode 100644 index 0000000000000000000000000000000000000000..683f2ea2bf72347f9e8ceea793bec2c6b651587b GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!hY85wm|&-U4J1BEyX zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NS%G|m0G|-o*o4Hux^)eOh3#FF3};*o zS$MT<=Kh*3Hy5WIcw>hGNByQq~NU1x1C@#bz_iObky9akFHYnc@~6>Sf8WX-cSjXf-#(C+$*~ z@Jsv*f0_2woL0Ec@P7mI%n95e^Cu}=|NsBm&gkVYqu)n?&S3C#^>bP0l+XkK__v5e literal 0 HcmV?d00001 diff --git a/resources/icon/browser/sagem.png b/resources/icon/browser/sagem.png new file mode 100644 index 0000000000000000000000000000000000000000..4b05c8173e27994bd2a9b24567cf54416d9508d7 GIT binary patch literal 600 zcmV-e0;m0nP){|k00In2L_t(|oF&LlNK{c6hVl13_uM-=hDs=r2@0X1wMfW7+yreZ7X?uU zMPv{}kc)z%rL>Bmf&??#yD$T*MT(@fkisY=C#BJ%45w6vwE5HAd(Zc^aQFNkiYlN` zfB*UUK5 zz6B(V)p}qQi^rIT6SF`1M?WuTa#iI_B!akzf2CYwUCq_*{Rf+CV<(KGwSokFk3WvS zp6}^yZ)vQ`=QRw&iliiyL27P&@MZe!k>C?Hk|I-bMEHE`%lY^!`Sn2cVy<_Q0mN~-JNZ_N`~UX z02U#~XEQG*)7Q_p^`2;9>>O2$XBSs~JsSQpy||)uz6Oyv6~CjY=E}*|riR**2%U2z zofB&X@B#U~Q7lDqvdnDXR&HPci6W&XRRw^mibimjhQ=d6K%Eok=y^0$Kq(?56;O2q mR2Yj>0}IcnAw>+0P=Wt_LMQvi-i|x~0000y! literal 0 HcmV?d00001 diff --git a/resources/icon/browser/samsung.png b/resources/icon/browser/samsung.png new file mode 100644 index 0000000000000000000000000000000000000000..8d14913ac8f948c445b56a9cf76956551985068b GIT binary patch literal 371 zcmV-(0gV2MP)V?~00AdSL_t(|oQ+XUOF~f)Ju}`OmKtW7wMa||{0Gsd7A^aMZCXbEp;enO z3>U2;5Xl0m;N?eP_r0fgro}5Qp+{#{!IwcQ=O_#cCj4JV-?6xVWxdzG&M)&>`s_gBqs z&mY^s238%286bE@{kOn5p)i`9o;Umb(Pk;@rl?g5#&GX>m`7n_nKeTq@rqebv6K+kGOusJ^`~SJ{CiD$0Vi+^_yp;}p78oh RKOg`A002ovPDHLkV1mZ5o@D?4 literal 0 HcmV?d00001 diff --git a/resources/icon/browser/seamonkey.png b/resources/icon/browser/seamonkey.png new file mode 100644 index 0000000000000000000000000000000000000000..7242ed2e4566d26b7cc01186c68b5d2f6d80712b GIT binary patch literal 429 zcmex=8LvS(un% zQjE+@tZae|EQ&(HhKWi>frX7gWuoZ18CXENuxIF=USANio!?O>)_(704&BAvadk(SpUZq+Yp`Rx+3If>oKkl#v(8r( zIeXu9laa)VEa*isJFQn}YYJ^rx$<88Yx0zrQwpORjMY+t$Ku l(hIJBQ52BqdOYVpgMHk&6-!br8azr~tNfmlSXuS|CIIPgXVCxv literal 0 HcmV?d00001 diff --git a/resources/icon/browser/sharp.png b/resources/icon/browser/sharp.png new file mode 100644 index 0000000000000000000000000000000000000000..ee552bdee29169bd0496fed8642ffc3c90412271 GIT binary patch literal 299 zcmV+`0o4A9P)E`gi|>s9007@fL_t(|oVAfLOT%CghTr>|w$yxdOa!Yag@QVWol5EGPjxSDDsI71 z7pJZ%IB2nrX%pgi-_E(SAV$#y|xC6d(XZ z^<4wcelvgMvS>w7?`*(X-Z_f5$&0<2>>d)bp_CQ4Y)5h6om<`Bxil50{ppxjS?eS& zo|5eT+OIQIKm4&im|d8|0Wov&ws6aLvNjxFy3a4a`RudUD7`g1ulYUSF|X}MVms1h#-U>+GF9=V1th|okXwCah#l&b7$txz2|%_`mKMc z6d{6CiZiB^{1jac&luZ(lm1Grv$g3=XA5IoO2s)tA|)kp&L)g(|KMa~ZUb^#SnZ?L zDJX27Y&-Pu_Kl8~W+^3FwsZ*=Ud*1oKgGQMaz0_FH$t7KbL(@vMl`h$srIOmp@FXU z7IdV_7p=B|$&HM5yd#uOXBeo;sw&4aFe zDwvzGncY+}KKo;P;k#sdrPmw#v-aZ6dqxBwCzilW{EmDnnfZjVkT-r6b1ApCMz}l( zs1$*weGW$jB5cLupp?&Br)j+YP>>qxt7_}H5EZ_?DjGz>8Y+=85_by~A?1q(I?`g$+)UOe}Ipi&AEl_DbIoB_b}?0h1b l^4He1hMECDN`(lFv48nlIlB)}Z$JP5002ovPDHLkV1k-(F2Dc) literal 0 HcmV?d00001 diff --git a/resources/icon/browser/shrook.png b/resources/icon/browser/shrook.png new file mode 100644 index 0000000000000000000000000000000000000000..193cb337106ada775fa55afe71a0494d34ff7932 GIT binary patch literal 600 zcmV-e0;m0nP)7*8A8wV6A;DA0ul*rgi1HY+DtQJCz+oBqAmOoS04h{5`VuIZ{RQ`P15~jmGuG)hCY%rK>>@ZhzcLq(sJ; zswn1oCMe|U>yN$FTeNcJJWU5bswv|y-n`ZfYxC3Yw`!FkasV(L`=~S@fNBI`RBPyQ zAT?7-U~;DL@a4MV9{p)HiHH%ArR#RjSCO^5z3ulOVqvyi|DaNdW4X9|`Tm1DxokFy zB9;=NqD(uc?D|13ES6WCe8KaAljGx{+eJj7YPoDKiXw&tK$N>Mp`0}|%TlsawdUE_ zbiuR?<*YFyOWgDD%qz007BJL_t(|oVAfLYr;?zh0l2}FGSFis6$;k3Uv_wK>u&)Z|E;59mH9e zA_}ny*uXRLAg4n}=Va)a4wrBE?!APn1$oUi@{Dt*<&=xvq_H+Q3Z|#0jd84#Xk1$pJ4WZAiF}lJbf> z=oS`|mOeZjf?yg4E|gsgNI3;`qH10x5)?JfqF%gks1Xw+I}s4p1R*M*A(D&ph9C~3 zP~B9Z2$dZL?X+kI8YwcsfdZdZ-j=}w4BWL84hlq&O0P+9fj7_7l$T-r0T_XXnA1H= zv!Sp#Mk#wLXhp#oCT+@Ch@kyUaw%nq5~#}>UgW@Sb78+g&av8|#wP?W#`77T3^D19 z6bM3emZa{}Yy$GzytE-({gj-Sl8Y%~$Q_PwV446fi=2}|r&-MxoU?2o1}%Pq^wENt zGDj#rE>s5z7~{AMr{okygur12K3v{bfCn>__%&yQmPCo46R>$V<7HulvqUMi#B2s* zRys(BMM3+c1wycB{{Q`J20p(Tj})2ow7tcqUpMFt##7IXV7EAZu;Y!+5!h3wFYE2U z)L-9wa`Ht|&N`-Mo_A-7kEYbH=ayLW?Z<^D7n?oDh6dEw7SnMhJo7sA^pi=kHFcGR zK=`QIb0*6oBmsYJRZlvoWfP-mh$6ov--`Pq-OKH^hgpQ%aksojM!#U~zqqPlWXOdy zbTwn>(&T#WXvQQS*B&*Pko0nW!9b4JT+L0LNA9dlRPQxcjFYc+zYnagoK2;wj(Dii kcMHT|WAdD|y1TYJsMB3*yqxYR`(0adZnw4KiKctLzmdr_cmMzZ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/staroffice.png b/resources/icon/browser/staroffice.png new file mode 100644 index 0000000000000000000000000000000000000000..b9d7778a4ecd0c0dfb44cc281f9c0bcb97d055a9 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!hY85wouxtpHs1PXB$ zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvI6-A0X`wF3=Ay{EiG_-?AWpY4FCUw zF_6Lpli8nv^d@+^IEGZ*Qa$6y)nLHGazIr3nPgDZ2T4npH_TBl+*$hNRz117Y}V-w z+|m};>I!DoebqLwRV_`|T-oR_$yxB2s7l_}gQ4$Tbl;yA>{O_^C%0{};eoOx%;CXb fU-h5eHcS8UF8Rej?lm0*+Qs1M>gTe~DWM4fOvY@% literal 0 HcmV?d00001 diff --git a/resources/icon/browser/subversion.png b/resources/icon/browser/subversion.png new file mode 100644 index 0000000000000000000000000000000000000000..d73249539adaa4def588168561f55bb876956d9d GIT binary patch literal 916 zcmWlXUrZVY0LIUCT5D>b)})zl%hD`cvUSTe+ryU4Xr|fLG)uE(=}VI~d)XdLwq&nr zTia^8bN0Lu3eua2y97fA4?;4m?l(9C-5Q;O=nr;rqVi_wprQzWY}$ zf7RXfW)}be-NQoz-?j4GD|Mb~`8!YJX#jZ5e&w61gGutp9i}#RlM5T+hYEO9>^wO+ zsj^(^fN_VY^__%dEjTd`Hk-}DQ7wq)x7>u>5T2AnMTQOHg-tLuuMgdwcV~-LFP7EW zanZ7WeAX3B7ioqSn#~5sC&(k4Z(m`IOfEpT=Uh)-?x{?e86uEaj?9(o4L)D0!e~~z z9eb?u{w8XTjwx>{(H%%vBX?KDw93tg=V?h2;liOJN{VZyT1U5R|B`_K#49`I%YkQ z!=){3!;uIj3RZ7sT;gIId^lNHwc&p#U<;ffC`J$j``-SNIqJi*xnh;$1&k;@cJ+I!jkm6!S>w!F#M8Iee|wzejbNW@~XMx$XECZEq6jYgG9#q&Ht5IUVsuh-)^Zn0RLPNz&J zGn>s)sZ?!_-jRY&)O&|?h0K@Nckl@*Xt&!P4u?{yG#Cu@QLT8)PA?-M2%1bLtyU|S z%eB_{3nMBwL{Nf$wi5VL37bGdp-@m1C0a%vDm>$}PUR*FLC|rvfu?ADzob^HjjohG zmV;p!3{o(9I5F==qPZzK1coT9)ymfSRa;!~Z$!Kju)wW7D`qIYXhI_?TDODaDQFe0jAqeB=5caIUYf;{w;)(-Zyh`_9_?J<+c(owB!2 z+5(qGKS_-g&VC`ecrTUezPU1H7y{tW7Jokj^`h;5=fuqqe(vbG_SSn3o>?8_>mPmk n=sfyUM{nQTKaA$j_cQH4f;gKCUmTfg)d9nUmj^Wc*T??{g6)0? literal 0 HcmV?d00001 diff --git a/resources/icon/browser/teleport.png b/resources/icon/browser/teleport.png new file mode 100644 index 0000000000000000000000000000000000000000..dceba90acb30d9126f3fb25ebeece7d029c6e0ae GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!gsm_?a*m1+|~@|*=8 zk;M!Q+(IDCcF!$v^lRc{qM8Ua-Js!at1z2M%bQ{~+(dD9Iz=xMYC>b4OZAfu2(7*$9A4tt?GTPR;|Is;zJOGWK#ABxyfcN)4a{+4a1=H zpsEk1X-bk91dMYIPl1O}!x*K-n%(`a^ S?=A}f00009@-wJ*GtA^z!@C!#p25@A&t;ucLK6T! Ca66Cy literal 0 HcmV?d00001 diff --git a/resources/icon/browser/w3c.png b/resources/icon/browser/w3c.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e90d9794b9a728cf14504fda4fb71cc9fe2ad3 GIT binary patch literal 580 zcmV-K0=xZ*P)-loHOlBuNx#rJ$6O|00czUy8362KSqnVySOiRi)cl zuGD8j@x|!ZHy?9aooqK7g7-s;qAGVn@AOje#b*HN zOvdN)JziM&^VV*5KPQA>jI~??5K2j_Kq(afB~%D-0Y-@=F#w!%O6gx#|HW^CLJEJ= SEE8P-0000?NMQuI!hY85woOisE8qfkK=G z9+AZi3|t>Tn9*sC$qb+%OS+@4BLl<6e(pbstU$g&fKP}kkY-?LVPN0-Odwnd^ZrKmVWfmL0{jCd)p*E yAFmBxE5&y;Xj7xq+xr)Jpa0z-bSg+Su$=LVugYfk9v*R!Q$1b%T-G@yGywp{fpGr- literal 0 HcmV?d00001 diff --git a/resources/icon/browser/webreaper.png b/resources/icon/browser/webreaper.png new file mode 100644 index 0000000000000000000000000000000000000000..c8069131c3c2c8caa54553eb30253fde960c8c4f GIT binary patch literal 676 zcmV;V0$crwP)Oaii2J*y*(MX5RDQcl=Pw zpqz7r5Hn3(Po~LoXM0CzFnFfCY`5pYazdMrt=esl9CrpJsjlhCq(PNcMN6oiUH;sC zd(Ty!Jyu#8PpFJ@&gqM1H=~Mz5h51RLKty6oL1S|*6zDne)36uy}YtK{NW=4Na%V* z>8FN<0hI91q1KTa|En8{h65eG;n>WnQp!z@5CIS)zMeV%Vw1x@+cW4X z83=81%l99*Oiq1?sjAg#7e)Hu-lfIw(+l&Xf~VrjY}$^HSeI#a8N-$16N?Cp$xkx` zlku^UxT+QuRJvWZR7%HD(TnJ{Kc9bO^LkFAu^1&-kR=NS6p2O}8m<==9d2t2WMpi_ z7xrJ?GY1uah3;Di$NMvP=47uZNzM^v^z^BU{Ji{>u9g&5IfZq2yZc0OUZZWPaa;PG zH^Ju!SpYa80tYBQdc+@iSzYZN2)#}s4Kr-y7kYLbDr;$dDBwA^t|ujP zOIB6^qzoF@5}fn8+FAgRC98;uB#4qA5-b3~*hJ{z(~G};NB#j{ZZKMhTG(9x0000< KMNUMnLSTZ*<0#4i literal 0 HcmV?d00001 diff --git a/resources/icon/browser/webtv.png b/resources/icon/browser/webtv.png new file mode 100644 index 0000000000000000000000000000000000000000..07dc45892a8a81f062e01405eeac0f3ac8eeca60 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD+>i@$qZwaJuJe0EIXU zJR*x37`TN%nDNrxx<5ccmUKs7M+SzC{oH>NS%Lhh0G|-o|Ns93nNChlii(O$mo9B- zX_+!*tD)gq28Mgd$xD-yljqEtqo_Eiy1JTy;s4&fd+*(2h>EHX3R(;Gn*81&#T%{D`{EN$JLSunHXCq6RH>2gBXPbrRyk_M+H$zbyXeWcGtDnm{ Hr-UW|-A{GP literal 0 HcmV?d00001 diff --git a/resources/icon/browser/webzip.png b/resources/icon/browser/webzip.png new file mode 100644 index 0000000000000000000000000000000000000000..e79bd252d7c81dc8f2aa4603a6083124d7067a75 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!gsm_+$Rg5)1A2MTc( zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wFK)L~p8^BZpkk`;~;J|@~ zhKBz@@&63}!4!}NvVg!}Sj`hC9^&cZ7*cU7`3FBEPr)umkGdD>KjJ^^U;N+M*7Dd? e+cVGl$*@$?`?4kXro}+>89ZJ6T-G@yGywo~6;|Q^ literal 0 HcmV?d00001 diff --git a/resources/icon/browser/winxbox.png b/resources/icon/browser/winxbox.png new file mode 100644 index 0000000000000000000000000000000000000000..85087e4afbe697bcd79f6382a85a1157f2fa682f GIT binary patch literal 661 zcmV;G0&4w0006sNkl~qoicmFjRZ z+)w)(bC;)sV^ft+9>!PRCcwgwCN5nqTT8Y)+bNlN7jC`T9BQ!|Ch7WW==FB<`4P*I z1fdIptz24P$z|g_G>D4GRxYAqh1BS{HFzw%_px*C!S{dZf}>2q!d1$3nZL#IU196& zaevU~RMxx0b%(QykwT_F`eHGaaRdsQ@LVYN;5fp`8-_v29>Z;~u`O*s`euD2Zg_cu zL#}YxRX$JXN~+p3viM{+L;hFKYu4YF=IOv5$jtwJxt-fJ;lPuC02?$g8k~(C`kJk~ zbFU#}YSra58$CL|6Q220Uvny;3ouC-x^<#Au>8B`OQP}0Sap$)m@GkNage8`E0
LbST=l-R&w!YK0pKVP@Xv`!GV%^V!BPCycc07(YSwWNL7CH}hH*a4{ zZX`%~E|3ERdqgB$UyeN09Wn3TZ(mqV;^IV0z-EI2fB+GQKmY+G!3+|nUQ`y6(=)xK v8AJsWa2+oXC_n)KpddgVKpJdfhqe9xt1!`iJOF8-00000NkvXXu0mjfjHDpk literal 0 HcmV?d00001 diff --git a/resources/icon/browser/wizz.png b/resources/icon/browser/wizz.png new file mode 100644 index 0000000000000000000000000000000000000000..f79d1d70d1da4509f8051683dc0c575f94c95ecc GIT binary patch literal 684 zcmV;d0#p5oP)cL0zrH6XzFKA=yrOVn{wKiXxGeuK`ykXc7(d7UYk%V*c!1>Ot-w()|HakCW zGE%+^?WL1qY%%Wh1@Z@nn`_C@(b3daYGZxn+2mwPvxm~K8uAAtk;v2;=WT8#04Z=h zV|Vn2`}|k@8>!X7@F3IFD9M<7`TT{|VQsQCK%kG@9`3%@Rryy=#A0Tf0UC(d@=w}i zZ0~Gy*ctFWIaibFX4-7Bm^p!~i=xSBqUm$eDF-x-wpcV-#gYOEME%)IbG%q)*+QY% z)f=)~%~Fk%1fDUv7{-x5DhTWufUwouK@C{EuRpvIc)>)|5+>WaLvJJRD13H*?6FX( zLx{h<|9E(GGBG(pRdr){T!E0gSx+8)I_Y+>J%?< zW-C2CzfjoQ)e%AzlvUZ=>3%i-6x1cG)N^a=bL&Y`0@QiC4MK8eHtO-Tbhtgay)=Pq zo9P{~nip7}XW4XiC(qYPHIX88J(2jO6CiXolul>NHfHF~Ju4!rI#pExaJM`de-g<2 zZ3|ukOVOF>A5jgE2pR28Mw8`WFn~oqncN5u-6&To6fzX@hczriMb`lUs;2h$_d!TP z16o{)#aEI&12>}!%c;~hGSK?uj;mjeMpl}n}L-&O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc;BRz+pH=BC18PxOi`mqJ&e6=9J|Bnha5j$x8(+ z|1&TYCwsjw=6LTU5M-IXwAhe~@z4gK-f~YD$B>F!$q5MsB6qaTA2@J8N#m5(kH*I5 z&s-cG9V^+sg=*ic7ZFLZ*qXKUz_9?wwn*)8TMjSolnB%0tE>l20^34+SNG+F1gAx8 z%?jO`5TVo&$GIrn%VVvOiC^jpfhlt|Wu}}tAfTa!fdd*EOH@*r7O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xE}lef6bgVUJ?@L{-3+IX0IUwL%o-mp&>)Ep~U}l z=e8y%&tYJAX6W_*|Fe4n0`HPLr=+_C0QEAK1o;IsI6S+N2IQ1^x;TbZ+)7SJn4zS4 zhJi)x^ZjaF#!LTe`)=$hN=UFQzMg(_9ZOrJ|GRnB8dnb~lsO>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc>kD|NXUVQ>OeE;P^fz`P|w$?~5(ZtyQf44;0$l z^Php?f3nm6?-EW+oszc(t-ZFkr(EPVP%mRikY6x^!?PP{Ku(;ei(^Q|t>lD+ga`Xi zGqBZsKX8TpAHRIVmD{`j-@nId^zQEN@89k+v&}PhC}?2xGd{=C#L2@Wv%4`totgQ$ zmcWby2O{{GczJjdGcz+a9g2_i^!D~Pm@M8jshEM8A*)NHKlS`yZJzopr E0B5;#_y7O^ literal 0 HcmV?d00001 diff --git a/resources/icon/os/atari.png b/resources/icon/os/atari.png new file mode 100644 index 0000000000000000000000000000000000000000..d51836b413e66e5b70ffab59b05a0b55c969e034 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~`X#OrCC){ui6xo&c?uz!xv31f zsYQAUhL#FxFUx=oBLf3tAkWIsz{J)dx@v7EBj?8VId(EYxf=< zpb%$)M`SSr1Gf+eGhVt|_XjA*lJ4m1$iT3%pZiZDE0Avx;1lASmX>zw)~&5uw{~}T zdwF@CJ9lp7%9WOumYSNH&!0d4{{6e5q2d4k{|_EKC?Fv4{{8!_KW4-L^%i@&IEGZ* zN{%RgR_*$9W-w3sfiIE@wucvsxU4t)UJ%E;gx{><#?d*67NUPIB$r**WP4a%uGRO= z(CAIE&Et)34`iEP&N4l@+>g~*W^S5Vg<0UVM9a%+)0EYY@hHuk_b!;{jKrDQcdUZu i^hiofm34|_Im3`qZD3OM>q-I8dInEdKbLh*2~7a1fqcpU literal 0 HcmV?d00001 diff --git a/resources/icon/os/beos.png b/resources/icon/os/beos.png new file mode 100644 index 0000000000000000000000000000000000000000..bab61ff4abd6c479670d2c273fecda3147fea721 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6!lvI6-A0X`wF|Ns9#bLmQAdTLuw z*Z1$=i>oUp&6xG*(WA}VcP?77cI)1~z5yXx#-`g396osL-23hz3Xvr+TO%0AGE;KSSe2bBt!zL_n1LO!#S3j3^P6?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|Ns97NqN{Z80#^pDKiKN zsJb~ZSXve?nlWeVMwX()wR`tkPH1M};8?nLX;f_Nnzc=bfEpM}g8YIR9G=}s19F@_ zT^vIyZY3uiU}RBjaI8DF%GJxOTk^>>ouVMqoku3z-5hb$^Lop|&Dk5LP28pAJS%A8 o=1oNk&674x+%&ORAx0kPrT7FVdQ&MBb@0Kzs=8~^|S literal 0 HcmV?d00001 diff --git a/resources/icon/os/bsddflybsd.png b/resources/icon/os/bsddflybsd.png new file mode 100644 index 0000000000000000000000000000000000000000..3b598628732352b340b31b29299a3d205105e9db GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/bsdfreebsd.png b/resources/icon/os/bsdfreebsd.png new file mode 100644 index 0000000000000000000000000000000000000000..3b598628732352b340b31b29299a3d205105e9db GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/bsdi.png b/resources/icon/os/bsdi.png new file mode 100644 index 0000000000000000000000000000000000000000..6bd3d29e19f28c02a928ec233b0fb5d5222e205f GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|Ns97NqN{Z80#^pDKiKN zsJb~ZSXve?nlWeVMwX()wR`tkPH1M};8?nLX;f_Nnzc=bfEpM}g8YIR9G=}s19F@_ zT^vIyZY3uiU}RBjaI8DF%GJxOTk^>>ouVMqoku3z-5hb$^Lop|&Dk5LP28pAJS%A8 o=1oNk&674x+%&ORAx0kPrT7FVdQ&MBb@0Kzs=8~^|S literal 0 HcmV?d00001 diff --git a/resources/icon/os/bsdkfreebsd.png b/resources/icon/os/bsdkfreebsd.png new file mode 100644 index 0000000000000000000000000000000000000000..3b598628732352b340b31b29299a3d205105e9db GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/bsdnetbsd.png b/resources/icon/os/bsdnetbsd.png new file mode 100644 index 0000000000000000000000000000000000000000..3b598628732352b340b31b29299a3d205105e9db GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/bsdopenbsd.png b/resources/icon/os/bsdopenbsd.png new file mode 100644 index 0000000000000000000000000000000000000000..7d672e5d884c0294602a40adc2b6153c3d5308d8 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O_~e1o(uwGBEtVv~6>7adCENs68*Q z00To514A_j$6g_!DGUtD^%U;O%kRxhw)FD)arV&R^|^=7_p}1_GL{7S1v5B2yO9Ru zlzX~3hE&{2PDq&W>-#@OW@cvpVWpGrvVxStdM^*;-9^PSnp(nV!?csAX7J}9A7D{CvOQxXyuw=SQ)6wD$aVSVfJsaPO= s<5X}=bK^6koh@w|44G_-$qK9taf?;*f7(9C1UiAi)78&qol`;+0Iywmwg3PC literal 0 HcmV?d00001 diff --git a/resources/icon/os/commodore.png b/resources/icon/os/commodore.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd71bd055f7bd41613f7d549ed14ac8ccfc9358 GIT binary patch literal 842 zcmY+CL1@%a5Qe8p>DpRZw1-tZ1QFevq0hsDJw)l!ENV?_54+$Ypgb1!uwcod`|8{VmfDvm-3DWy_MYt76G2O%`huu^J#CXz&oNE0!h zIOa6vEaN=qpvCdXknLV596>inJ?Q_uN^)AN|SBmVE z*tOVqxaILmn-i2xv>?t>Err4+&y)lSct}gqN+@GV4G{GJQERCOh*H8&T9al{#tNl{ zgomYKlE_6-Nm7$yp`j8^B%&JQA0$}_6NVT>B3ekqgXVwnf`v2%m1a#0EMy@J|At=? z_Fx0zfLO3nCQLyC!H+#E8;?f2(R6fNKnyIn(dNGzm<6-MT`=QHeoF#0$PA)U2o8mO z8b}fYAfo~DKmfr&heE(XIYO0A(>zJ?FwCGCh`nCg?`LtG2SL*9roJCLPSkEE8yi`@ z9Uko_mdz8Jxk7)1an3^T5jVC(byidhUnp=5}YH8 zwbRv+4?`1V4_9wqUxjO~Hhp}d@bSD)OApr0JeI-o`?dRC#MsZ$5z>#^CAd=d#Wzp$Pz6+&dKj literal 0 HcmV?d00001 diff --git a/resources/icon/os/debian.png b/resources/icon/os/debian.png new file mode 100644 index 0000000000000000000000000000000000000000..29a66ede37acae2d1b4fff51bd07de6c276c1e37 GIT binary patch literal 315 zcmV-B0mS}^P)6@_Xp|$I#x$LOA?zF@2xybX&)%4HU_0!$=+~fG*=lJ63`swZa?eYBb_5S|; z<@YkY00009a7bBm000XT000XT0n*)m`~Uy|bxA})RCwA&i`fpsFc1S5C>uh0(Q<^6 zwj}fa|Hy(6_{AfQEkN8?+RY%~MVm%9gK^kKbF^}kd$qul3VIYBA)Tk0E{NLc@*WLd z4uxWBr5(j(s1r<~h?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wFKza^?;T!>{IUJVfTIS4Q zuw1Jdv{cb=sf5$^pyEfH51lHX@bTuo%TrcuwM{>k-IKo4=_61NV@Z%-FoVOh8)-m} zkEe@cNX4z>gaeE$tfH)q4UPrN7X2u8EM$9_+UB&?O_gW=xqX(Kvfl}{JudWerlN+?*cpF@C|k=>P#3IZhaK*3E#!H1ZXaUr>mdKI;Vst05XhP A2LJ#7 literal 0 HcmV?d00001 diff --git a/resources/icon/os/dos.png b/resources/icon/os/dos.png new file mode 100644 index 0000000000000000000000000000000000000000..ce04e4d0ff5135c771c3db09254bed108caa6ed0 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6>vvw4Lvzo?Wj7aI$AsCDe~*>mN98W~H1{DK)Ap4~_Ta!Ng2 z978H@CGXhNaDK-7bIfe3nbvK6e=pK7!nS_vwsU!m&39LA?U&!bDrv*!sNdJ#{nTzV z-hTd_ZSgaa<^>Dfy`P=YQMemus9Pe{eBs@)wGVBVOSXua=NgoqWxC|&Af>TyLE+&m qD|{AM74~nK>9B9ortZurEe6-kdTl26;w6C&VDNPHb6Mw<&;$UZ5o^@| literal 0 HcmV?d00001 diff --git a/resources/icon/os/dreamcast.png b/resources/icon/os/dreamcast.png new file mode 100644 index 0000000000000000000000000000000000000000..573d5427f857a6a7f67296d053d1b7ce87ea48f5 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^{6H+g!VDy>D=f@`6nlxMuPggyW=2MBZg-~XPCy~f z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{=c*AiyWY)vI`EQ2ElR`nAa|Yg0S7 z=1$yOJmpy9q7yx9&-JXmHf8IzIeQ;1J@$OFKdYV8!1RorNp1IVXI) zyZc7wE~^P2m6tr)5v+US$y_zPXYUV|-7T>1&#`6@o9^#(xNY8gpd%POUHx3vIVCg! E00#AmSpWb4 literal 0 HcmV?d00001 diff --git a/resources/icon/os/freebsd.png b/resources/icon/os/freebsd.png new file mode 100644 index 0000000000000000000000000000000000000000..3b598628732352b340b31b29299a3d205105e9db GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/gnu.png b/resources/icon/os/gnu.png new file mode 100644 index 0000000000000000000000000000000000000000..8469ec6f3309495e3b454831d4c6ea3a5289f5fe GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!hY85z|j@;PTt019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvI6-A0X`wFZg$48VSWWsUWM7wo!Mc{ z^{I1e5?8jTH`G@yoYAs#QsLGWy<3;gIl6WE_wVoj|Nn2OE*lBdD^L>T7YyVg1BM66 zv64W!0#6smkcwN$KQ2rC{NL}YaX9yP$38x8<+juF)r|~}m>cK(J$2wj!kse)ff=5m zQ42MkSB7?7U34X(?flDkp{K9>khD`x)jh5CO>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xO!PGHB{W|WVm+DlxxM=d#AKqi}G5#ckA>2-~YdV z|Nq>v_sLOPTdI#;yY~J0z3*$6-g~)uRy|NJV@Z%-FoVOh8)-mJk*AAeNX4yW0g;d( zArX-j0g)eJn>__Re*dd8v=5x%_@*t}{Wy~&+fTcx^W*KgjXr!$fA4?u=!p%*-!@LT ztZr_UqGznlvBD?i!B)H62WHbJI#ygQdjB|>RgxvFWMjDq!&%S#XLI;W+yhRkSa7E3 b9g$?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|NsB*={dG{@4e^Gzn?qz zeCyVG#l?Grg4VXQ9P{#88x^&7%9L}-$y=8$z2@Y!bk3Y}^|Mq1fO;8Ag8YIR9G=}s z19D6}T^vIyZY3uuFtCWSPJJrLB6;bm*0MF9YY#s-R;09Wb-M11yqK%pV)3(dnZwi{ d$#|TwV2}*p^Q>PZzYwUO!PC{xWt~$(695iKQ*!_S literal 0 HcmV?d00001 diff --git a/resources/icon/os/imode.png b/resources/icon/os/imode.png new file mode 100644 index 0000000000000000000000000000000000000000..4c68317bd4e2ca0a07ee757c228f4ae58283a2f2 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~VkNE-CC){ui6xo&c?uz!xv2~W zhWdsk`Ub|67czGORj`+M`ns}TX5-+O&~hl_zXKHFEbxddW?Nn{1`4FY^ZTp5<`WmtNQVeMXyrF%Kn?iEc(?Xod(Pd#{Q!Bb`+IY0}W&F MboFyt=akR{0MfBvTL1t6 literal 0 HcmV?d00001 diff --git a/resources/icon/os/inferno.png b/resources/icon/os/inferno.png new file mode 100644 index 0000000000000000000000000000000000000000..72928c62f2c528daa1161b5580369dd63a7fee34 GIT binary patch literal 552 zcmV+@0@wYCP)|2>W@eVs zAN=U6ors7OPxu#50D$j%-@6?mX68Wp#kF#wPy_%XLPS&`eZSptqxtWAp=jGS07xla zrxgUUR9agt6qy-`$aPv57w7Ah+qv8d04Ql81OUwEGuLs3!@<_}LxG6>{%Ml15E?TB z03sqH006*fblE&6^LBT4^pqw9>dai-ypyr4@P)WdLnuaxNe=AYpI&bRaS?F)$!8GCDIkIx{&SD=;xIFn0nK+W-In2XskI zMF-jl1PUwy8q3Bj00009a7bBm000W`000W`0Ya=am;e9(1ZP1_K>z@;j|==^1poj6 zJV``BRCwBBuA=rZErB`!0^YuR&&|aJ zL_h{aykM21Nt~q6F5>J9p(|q?Hupfeetkn^z#A2J`?63p0w+?R)kG`FQzx zxa~f05Xjws_((%pF*7rBOla`o<0qirg18kJC|7UX1R@{<;?TW^jsV?#@yb@P)WdLnuaxNe=AYpI&bRaS?F)$!8GCDIkIx{&SD=;xIFn0nK+W-In2XskI zMF-jl1PUwy8q3Bj00009a7bBm000W`000W`0Ya=am;e9(1ZP1_K>z@;j|==^1poj6 zJV``BRCwBBuA=rZErB`!0^YuR&&|aJ zL_h{aykM21Nt~q6F5>J9p(|q?Hupfeetkn^z#A2J`?63p0w+?R)kG`FQzx zxa~f05Xjws_((%pF*7rBOla`o<0qirg18kJC|7UX1R@{<;?TW^jsV?#@ybO>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>O9%LbxE}j|Z0oUeLB&(fUAvdvGUxg8_y7O@@0qi7>Ds+> z7Vqx^Dq}1O@(X5gcy=QV$SLx4aSW-rC3@DI&(%PJ?Lt2Hlp|Y0X8dl=yj|2>W@eVs zAN=U6ors7OPxu#50D$j%-@6?mX68Wp#kF#wPy_%XLPS&`eZSptqxtWAp=jGS07xla zrxgUUR9agt6qy-`$aPv57w7Ah+qv8d04Ql81OUwEGuLs3!@<_}LxG6>{%Ml15E?TB z03sqH006*fblE&6^LBT4^pqw9>dai-ypyr4?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|NsC0`2KrZ?&3W&w)alj zap}_I|DV5q|Nj5`lb8R2BvAU`so&RbeV@7NKaltO{oBYpJArx`OM?7@862M7NCR@x zJY5_^DsCkwB+S^5&dezhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/linux.png b/resources/icon/os/linux.png new file mode 100644 index 0000000000000000000000000000000000000000..33dace828f4e5e9e396dacf631494dcd5358e9e8 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~QYEetB`&GO$wiq3C7Jno48Dme zsS4$pB^e6tp1uKJLku?qRk4?N`ns}TVrCMMGnin?c?T%OS>O>_%)r3)0fZTy)|kuy z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc>kD|J<>?@Apb9Ef(nMsouJF%A7egs4K%IV_?)XP{B)${Vdm@u z3`}#3)f+PZ>3>$(@+;KfY~U|uAM14|YZ#VD)W46bWK{W+_I+BW!>sb}FV}u<{L+1S zcRy36-qLw@kLw#67-&v?BNiUTuq4z-jWLr=aq@*HOl%CN8RW#BliC7-b}@Lm`njxg HN@xNAjD>Q7 literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxandroid.png b/resources/icon/os/linuxandroid.png new file mode 100644 index 0000000000000000000000000000000000000000..07d266f75a9d5282f128ace2b89d376b31bba52a GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUDO>_%)r3)0fZTy)|kuy z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc>kD|J<>?@Apb9Ef(nMsouJF%A7egs4K%IV_?)XP{B)${Vdm@u z3`}#3)f+PZ>3>$(@+;KfY~U|uAM14|YZ#VD)W46bWK{W+_I+BW!>sb}FV}u<{L+1S zcRy36-qLw@kLw#67-&v?BNiUTuq4z-jWLr=aq@*HOl%CN8RW#BliC7-b}@Lm`njxg HN@xNAjD>Q7 literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxcentos.png b/resources/icon/os/linuxcentos.png new file mode 100644 index 0000000000000000000000000000000000000000..c2541d14c703b0c9a42aa9f5a4848ced24de481e GIT binary patch literal 641 zcmV-{0)G98P)%T~ zRMHnk_Z`=>whO050D!~cL^Dfmg>u&7i;tUEcRwOeN>F~NSbQ;Cm)%NR!gFhu z-LP7(<+UPrvc4ab)1%SQjbow%06=(x&YQg`7t62>I3YWlNOh45eqDVSNzDms>I5={ zEm-P3(9`3v51s)p@CbeL!uxI+|3b05xm>{kfaC9ZZa5gxJx7X@68+SXv))yPcmYFVKBX;F^5*B0sZT2y8tQ@EV8GQ|F#AbVjH!&6}S zI5zCh6>vY)b-K1`J2er5BTaEG- zInZ^(*w~ll1UW&?Zg56xS}WEVDwb bQIP)!^T=oi(>Au^00000NkvXXu0mjfO*J4h literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxdebian.png b/resources/icon/os/linuxdebian.png new file mode 100644 index 0000000000000000000000000000000000000000..97d82145784237608be8079084aa06fa4469bfb7 GIT binary patch literal 623 zcmV-#0+9WQP)beJ>bp<(?;p5+n|F%DKD`?$tsda{W`8~`B7 z9R-I*5MnjuoC5#=N-08iyXw+uPZg_|;;y%Baeq?A$=$K;kn_guUN&LubNDW%{8 z0QaMOPsBBT9ZDS0Id4A$fZ3Zvrups%MphzCsZLmiq*}F|q2#2zReugZ8v_7LHg#CE zNi1G(u5kiD__4d3^Ll&Lr|QQHf#Ew4NKCS}mS_fox7*_O2E&yNvAQRyF z(url2N8QQ?fHE~R$!8*CtNz&Vf|qH}&dm>GmtuFfja<20;-g!(Pnt_7-xDG*?n=Ij z<(uJK&#T}MC`g@dM%`YQK(X>Z`83Bmyo#2Q-~Ibrlq4?F(Bl%DoBs!7inp^HmFIbU z*5FYd>~e44FUCJq@~Z&wrMa7pheGv9mUL8T6;4gxwTFKKe*)ZGD>!8fd%;x~T^wA* z$)$UPVzAc5Sc4Q&e;~&Gna|;ipCmoYy8abTh{2EhJ(dzn6QjAm<{@4pDpkP2$<*K5g)hhj2Fp1E{(6)Qj5pyF204AGn8j#80}XHODBz|14MT)k4ohZyfYW`>jSQJ^xu uJGJG^&*uxJsllZd=|YRG%l@tPwe}Zs3tg^#L#x980000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iON2 z6frHIENBM+00K2hL_t(2Q*Dr4OB4YZg`e5k57)KT#9cE>5iO-Kky2*%^0d+>e>l#a0q@;Jtb|=Y7v(NK(5kVgR0NfbVxC zNk*g5(dz0Bh9m*Jd$UVAGXqf+X=&+L+h6u1Nl21aY4v=yYD=4+EK@)|*FfQOIna$1AK0)$<9=gUWJ z1-|4uQla2$adGX^31FYLkqkz13H~SsP&sKbbTx_RC3yF?h3kgB<^Hb4_3;dz7qPPP zn$gh|Yaa}3yNlubfnL2_=IOHs3}#at96+rG$v(das8$Wg<0bz+81?EAh= zCX>c*g73rEy&cjihlPb{;^j)2Vkx9%Tf~hs9zVH<88-ngxdT`gpD+SNCe3CHrygM# z5&3+K$;l+9Y5c8eNYYQsqtk&K6IlQ{9k6}`RI3g8Qo}fBCaxQj9qckYYm(2$i31dm z%9KhD3+*{3Ze~d&Vn}iNk|wRdWoT#^FbM*ajg5%$@$TiTlK8e;z&j6_o10?bN`kNp z^*T5XG<`6DZq&dzEBB0UJ)qeL8Of!ICwk?h5H2oyBjB)LQ9dql`_?e?3o{r&(9-7m z5&8TSnE~@R0MWb%sGL+Om5StZ{mkE)Vr(q;FPvJ)hDWkYOk87XdXoPB bH2>2t{=sX+KY#bA00000NkvXXu0mjfROm0r literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxmandr.png b/resources/icon/os/linuxmandr.png new file mode 100644 index 0000000000000000000000000000000000000000..5dcf361ff4f73b73da1907468c12a18b1b516321 GIT binary patch literal 450 zcmV;z0X_bSP)AE=%_!N%P`L^*9c_}HV-s1pP|s$aHnrRIVo z5G2^}Ejs=VZX2EUk>$BbW1i>izUguOYLoW06;7J>Pzr}y$7Yqx(*q0yghX4Qo07*qoM6N<$g3W!$^#A|> literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxpclinuxos.png b/resources/icon/os/linuxpclinuxos.png new file mode 100644 index 0000000000000000000000000000000000000000..33dace828f4e5e9e396dacf631494dcd5358e9e8 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~QYEetB`&GO$wiq3C7Jno48Dme zsS4$pB^e6tp1uKJLku?qRk4?N`ns}TVrCMMGnin?c?T%OS>O>_%)r3)0fZTy)|kuy z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc>kD|J<>?@Apb9Ef(nMsouJF%A7egs4K%IV_?)XP{B)${Vdm@u z3`}#3)f+PZ>3>$(@+;KfY~U|uAM14|YZ#VD)W46bWK{W+_I+BW!>sb}FV}u<{L+1S zcRy36-qLw@kLw#67-&v?BNiUTuq4z-jWLr=aq@*HOl%CN8RW#BliC7-b}@Lm`njxg HN@xNAjD>Q7 literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxredhat.png b/resources/icon/os/linuxredhat.png new file mode 100644 index 0000000000000000000000000000000000000000..00e6095c7be752394ac11345b3498db63b9d4b95 GIT binary patch literal 565 zcmV-50?Pe~P)2%y(F?pn*OI3~*>kF4cmCc~*D z;U!SxHZ43&19Vm6EIb&g>m1p0us zwHz43S7XQl=Os=67oDTeS^z3hL~zd-27u2%**S*NlnZIfS-=Ac5C9|IGvpk5#t=)G zbx;=A0iIgRyCC4edu~eHkN_~iPvDKUyaiUB!?m*6hhdu12MkLTCGrwqfU6yofDCX( z;Ut)_?I_}$gzE^u16>@&0*{TsCcweS2#xu9HYX>k^z=}(mg7MB*BIcF zF}%v<2(C>`(CY4HAPgzZ&GBSuiT4W&T-w>;WIhi-oFwem>r|RemYrj>-Nt;_+S2Qd z4XV{D)6>)Z*xzTlTxM@~m#$2PAPDdh&lVSXzPd`?`@@?h$$PIxqoF8@^c(NJW@cve zqFmPY_O|X%O=+}P)MyxLGz=90IOix73P*yN7$2utDzUz{Mzvn&!R#!h!NJ3dq)u7? zpjNA~va-VI{(i>C#>jX6{;x5PW16iNg+hVAxj*|~MB?j&RN;GI00000NkvXXu0mjf Dyr~GL literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxsuse.png b/resources/icon/os/linuxsuse.png new file mode 100644 index 0000000000000000000000000000000000000000..26cb28a6dc3493d38755d81a75786eb42d5c313a GIT binary patch literal 434 zcmV;j0ZsmiP)U4qE_n+sx?@f4-8C0-Wa48t(;`BdAX?KcRc-q1lsL`t8g*}uZ| zond(H9%IQ#GUf~l#cAsYE4f!3)<06oY+@VFNE>;^6S)C=a9y-8O*d$w2}#;0us*#* zVYE!Xw8(Y)lG4}$S}X?e1Y6xMuiw4p#q(wI*)56%lapGX_g_D=UA<@j*D*o}HWoa# zt7`*jCUmOhdG@{^QOstkII~qSf cwy|WIKUl(uyBRV(e*gdg07*qoM6N<$f^Vz5d;kCd literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxubuntu.png b/resources/icon/os/linuxubuntu.png new file mode 100644 index 0000000000000000000000000000000000000000..7454e0987911475b77a5977dcfec36f04b32a2cf GIT binary patch literal 628 zcmV-)0*n2LP)sBBGd%>;-w1A+pnwoam;e*^9`d1aAA?6vqUji1 zNR>{GDf#|E`D@GNu9Rq||GK1kgKD3Z6lG5umHvwtg+a_a*7(yBU4Ux$2RP`I*OZ`$Tdt+`0^Cl_ZKk)fWOUQ z?t*0-H&J@C0i`L%TGBV2guxstuLb6r^Y8F{4TXGy;t?pyVKXHdWBCo&uU0g=8Odk> O0000O>_%)r3)0fZTy)|kuy z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc>kD|J<>?@Apb9Ef(nMsouJF%A7egs4K%IV_?)XP{B)${Vdm@u z3`}#3)f+PZ>3>$(@+;KfY~U|uAM14|YZ#VD)W46bWK{W+_I+BW!>sb}FV}u<{L+1S zcRy36-qLw@kLw#67-&v?BNiUTuq4z-jWLr=aq@*HOl%CN8RW#BliC7-b}@Lm`njxg HN@xNAjD>Q7 literal 0 HcmV?d00001 diff --git a/resources/icon/os/linuxzenwalk.png b/resources/icon/os/linuxzenwalk.png new file mode 100644 index 0000000000000000000000000000000000000000..33dace828f4e5e9e396dacf631494dcd5358e9e8 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~QYEetB`&GO$wiq3C7Jno48Dme zsS4$pB^e6tp1uKJLku?qRk4?N`ns}TVrCMMGnin?c?T%OS>O>_%)r3)0fZTy)|kuy z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xc>kD|J<>?@Apb9Ef(nMsouJF%A7egs4K%IV_?)XP{B)${Vdm@u z3`}#3)f+PZ>3>$(@+;KfY~U|uAM14|YZ#VD)W46bWK{W+_I+BW!>sb}FV}u<{L+1S zcRy36-qLw@kLw#67-&v?BNiUTuq4z-jWLr=aq@*HOl%CN8RW#BliC7-b}@Lm`njxg HN@xNAjD>Q7 literal 0 HcmV?d00001 diff --git a/resources/icon/os/mac.png b/resources/icon/os/mac.png new file mode 100644 index 0000000000000000000000000000000000000000..03f56f402b358da99276239b173783c6ceda025d GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6;90X`wF2M!!KcI~;MVUSnxl;oDZ zhF&dBUO`*Wy^qQ+){L4XA)z^E>$&Wny-U|_Wxc>92h_z_666=m;PC858jzFb>Eakt zaVt3?A>n}sgU~rWy|C7&PkGeN*-33Wep)gnCU#o52~(#3^)I*HI^24G;bYN+J>8dG z1>Qb-wDejWhmd{F6plykvt(Z9-8z@>$g=d(qP)Tdd%A;_BldP@TLs7p7-$(7Ffc@a WR^0mY%$F#jjSQZyelF{r5}E*eT4rDX literal 0 HcmV?d00001 diff --git a/resources/icon/os/macintosh.png b/resources/icon/os/macintosh.png new file mode 100644 index 0000000000000000000000000000000000000000..03f56f402b358da99276239b173783c6ceda025d GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6;90X`wF2M!!KcI~;MVUSnxl;oDZ zhF&dBUO`*Wy^qQ+){L4XA)z^E>$&Wny-U|_Wxc>92h_z_666=m;PC858jzFb>Eakt zaVt3?A>n}sgU~rWy|C7&PkGeN*-33Wep)gnCU#o52~(#3^)I*HI^24G;bYN+J>8dG z1>Qb-wDejWhmd{F6plykvt(Z9-8z@>$g=d(qP)Tdd%A;_BldP@TLs7p7-$(7Ffc@a WR^0mY%$F#jjSQZyelF{r5}E*eT4rDX literal 0 HcmV?d00001 diff --git a/resources/icon/os/macosx.png b/resources/icon/os/macosx.png new file mode 100644 index 0000000000000000000000000000000000000000..777f35057c6ba959bd664254921745decfc01581 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~`X#OrCC){ui6xo&c?uz!xv2~} zrFnV^h6W00FUyMb6pRcEj1>$`tPCuy3``ZY4GawodhLDWfLhs0Jbhi+FEerRa_H>8 z#WWWv#981GS2f98_(Ul_x%0)@85yAfA_WL?>~FaIA67<;1f`9qNj^v zNX4z>6L0qXaQN_urL9FM*X-UtleR5q)^keFXMEZ6o9Atg!mhe7XQ>H(kAH09@p-;- ziDSlZqmGJB^BLzhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1^2Ka=y{{R2~!s!cBGV>$!ZKHjY zmQI^@eC5XX@83HrX>ZfXIaQ%!7>RCV89yLNBu-X-kf=|GK)B|(0{3=Yq3qyagx zo-U3d6}OTT5;T&|6eln=JrLh5>QHiQ<`-^-S&r(Ld3=uNSg9~9()P>eVYzrFebNDw z<1d>ND*K)>2UIb4Xa$>v=_Diwga(@N%{>wDO6|&`uFPpAawY;0g;_}(D)XW46| RV?c`-JYD@<);T3K0RYt*b=m*` literal 0 HcmV?d00001 diff --git a/resources/icon/os/netware.png b/resources/icon/os/netware.png new file mode 100644 index 0000000000000000000000000000000000000000..79b5c101a84c6c0a5f21a2aa0cdd497dcff41971 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF#~1`|FtBapQ98)Pc8-DJ z1Rvj42BwP)GS})Ww=#%c)3f{k=le_vF!$q52R zC8@$sk_v=UN>&DcPp-ILeIxbV)N-Epzw~FG`Tx1&VZitM&H3Bq(m3AT`@iyAvH^4P z_ujkt<_63!tMBeEH!_e|voB=h|9Ps+&tH}8{#QGPXX?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|NsBbNR3ypRgx4C3iFhj zGh+rD8_V9kdpTN!LK$Lu%-MWo_?9WzOzko`x0mDEwQCJlC!PcKGL{7S1v5B2yO9Ru zWO=$chE&{2P5^=}=?sj=cJm*+@@}^tD-X|_+hu#p1Q{-^zV_qZ96ph_+`YwVT+Gbf z;Zf1cA{m({2e?Ondcwe#wzP*YRdvChiLRR_DKazf-Z-gilja2(Lub{;3<_s+7RfM} eg>z;|F*EEqBG&9yzhJ5~ZUv6p!Iy0Ty3;^WuUp050(8z{tC z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O_~e1o(uwGBEtVv~6>7adCENs68*Q z00To514A_j$6g_!DGUtD^%U;O%kRxhw)FD)arV&R^|^=7_p}1_GL{7S1v5B2yO9Ru zlzX~3hE&{2PDq&W>-#@OW@cvpVWpGrvVxStdM^*;-9^PSnp(nV!?csAX7J}9A7D{CvOQxXyuw=SQ)6wD$aVSVfJsaPO= s<5X}=bK^6koh@w|44G_-$qK9taf?;*f7(9C1UiAi)78&qol`;+0Iywmwg3PC literal 0 HcmV?d00001 diff --git a/resources/icon/os/os2.png b/resources/icon/os/os2.png new file mode 100644 index 0000000000000000000000000000000000000000..4dcb67581c7ea2dc74e1e934a2a48a0637a623c9 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuU;dIZ{019yy zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF$NnGt{`>dAgXb13Sn%li z>ucBUojZ5#{rm5MiOY^%dp~E*rNoxY`;R|(`R2=|TkoI0|1W2=@*hwyV@Z%-FoVOh z8)-mJkf)1dNX4z>gaZt3CaQBcgm~OsC3{z1qUBI_ZCJ_sBm=WcJ2f`#YCd=)BK`W! z>#{tjRw-)lD%)Zdvcl5KYi&?Mf~lXNh)!Wbf`Cz2P*CClR)&;z(b)?ww`>NQ&fw|l K=d#Wzp$Pzx)O*eV literal 0 HcmV?d00001 diff --git a/resources/icon/os/osf.png b/resources/icon/os/osf.png new file mode 100644 index 0000000000000000000000000000000000000000..18836fcb326020ae5d69e75550a2572067dd9b1b GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|NsAgc<mdKI;Vst0KFn@$N&HU literal 0 HcmV?d00001 diff --git a/resources/icon/os/palmos.png b/resources/icon/os/palmos.png new file mode 100644 index 0000000000000000000000000000000000000000..4f4f68dcfe6c0fe10702b471a739e812a2718b3a GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~dL^zACC){ui6xo&c?uz!xv30U zsik@fM&=56`DH-bz`$6+(9+7p$jaD2LEFI4z~K5!xk#W+_7YEDSN6-?(n30dPo_$~ z0Sa*zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|Ns9#bLmQAdTLuw z*Z1$=i>oUp&6xG*(WA}VcP?77cI)1~z5yXx#-`g396osL-23hz3Xvr+TO%0AGE;KSSe2bBt!zL_n1LO!#S3j3^P62x}oOgf#;Yem94r_;%CoZW86FpR3Inx@e-{atMkMKRCw&1O^AwP6@d z`14h5x7*!r7XT1KMN#~x{!x}?UDsdKkBb1%@AoN+dfS@k`QdQb@AqX{Hpz0iq-k1` zB;WUWo^Q2U-9Pwk4cgQfFwy)t5sE1aU5q^7KWj&>%SbwZMWOOU|<*q zK@e%0Mo}aP!fZBMEEc!h&GWqb{XQHHi8M_SLZ0VcE*F+%lO%CnSCXVSj)NfR^?LL9 yT$W{?=ZTLi$K%nmtjFU)QIw)6qtU3D1OQK}GK|9vlSs4x0000?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6eI_ruSTk_)# pA50GOEvQOWPhL?NMQuIv}M`1mz-INftKfI^%F z9+AZi4BSE>%y{W;-5;PJOS+@4BLl<6e(pbstU$g&fKQ0)|Ns9N>|KyHE$#XH=hyCC zE8bUp;N^iSYp19rt1vh*FnBRAWiTzcw?KHgu)=MH=ii@upJM`QWne4`@(X5gcy=QV z$O-p!aSW-rm7I`}uxt7O2Burz=QV0fyBR&dDPvjW?|Zcjmt;17+h@(Nto%MV!$sM> z<&GwkCuM1P%*lSX<}R1QzcVv8%Q#4Br)_IEE0~|$zz}Y#(HuCFks?NMQuIv}M`1m!orz`*H1`2T& zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6)8AMoW%cY4FB&j z{D05Hpw{vKnBxC)is!fK{yZnNe2%?cdJ2zQ&BQ(*L(?C#fEpP~g8YIR9G=}s19DtF zT^vIyZY3uiVBB)*YIn({JVTAC)5GJuPqSTGyZQcJz0?4$RdvPB?u97GZhii4>tuzW redm^_v89TOi(d~BXLIB@kgCJba87)B!+lL-pn(jYu6{1-oD!M<)D&5D literal 0 HcmV?d00001 diff --git a/resources/icon/os/sunos.png b/resources/icon/os/sunos.png new file mode 100644 index 0000000000000000000000000000000000000000..e37e602598517a7a77eb459e3b271b133ca9b094 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuIv}M`1mz-INftKfI^%F z9+AZi4BSE>%y{W;-5;PJOS+@4BLl<6e(pbstRO`JJ|V9E|Nmcl?t4_!-gmnjbb*45 zB|(0{3=Yq3qyahho-U3d6}Mb_4)QV>a4=2elyJOTe|2>W@eVs zAN=U6ors7OPxu#50D$j%-@6?mX68Wp#kF#wPy_%XLPS&`eZSptqxtWAp=jGS07xla zrxgUUR9agt6qy-`$aPv57w7Ah+qv8d04Ql81OUwEGuLs3!@<_}LxG6>{%Ml15E?TB z03sqH006*fblE&6^LBT4^pqw9>dai-ypyr4?NMQuI!h&rG<={ZNS%G|m0G|-o|NsAg|NcK}*4}&X zzfaqLg&}#0Y4b+K>ZRX-692#df4=ws_vinQ75|^Y@PDh*|9eY5ST30b)XP{B)${;Xw)m^SbW>v!35$F*v(Z>QH(}+XWp(fmxb93{LINFP0UA i*!j#;Nn{1`4FY^ZT!AzP2ZyGnrlFysrKRPZIdhgSUAlJd+P!=C9y@mI z+_`htu3dZo{{8pw-~WTbX3LCaKs^E_L4Lsy5je^4Ksi9@-wJ*GtA^z!@C!#p25@A&t;ucLK6T! Ca66Cy literal 0 HcmV?d00001 diff --git a/resources/icon/os/vms.png b/resources/icon/os/vms.png new file mode 100644 index 0000000000000000000000000000000000000000..58568f607ec61554315d763d6300517470fe4ff6 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~nkB9gB`&GO$wiq3C7Jno4DOj} zPNkVSDXB#Y270CnNtFtbWvRsq0h#HgsU>zhJ5~ZUv6p!Iy0Ty3;^WuU;dIZ{019yy zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-A0X`wF|NsBb&(Ht<{rld%dwY6% z&Ye4V>(;HPsHnAT*H%|o&zUpl*s){p-@muFw-*o)c>eskf5x?HpkBt3AirP+hi5m^ zfE+td7srr_TgeFrSbW$7W|baiTOmw?7?b{4ZCZ07X nAI%Np>Ez*23kYtJ*ucnOqstZg?`eZQ&?E*=S3j3^P6i@$qZwaJuJe0EIXU zJR*x37`TN%nDNrxx<5ccmUKs7M+SzC{oH>NS%Lhh0G|-o|Ns93nNChlii(O$mo9B- zX_+!*tD)gq28Mgd$xD-yljqEtqo_Eiy1JTy;s4&fd+*(2h>EHX3R(;Gn*81&#T%{D`{EN$JLSunHXCq6RH>2gBXPbrRyk_M+H$zbyXeWcGtDnm{ Hr-UW|-A{GP literal 0 HcmV?d00001 diff --git a/resources/icon/os/wii.png b/resources/icon/os/wii.png new file mode 100644 index 0000000000000000000000000000000000000000..9d44c99ff20206dd4e21b29c5b930ecbd95c5c4a GIT binary patch literal 552 zcmV+@0@wYCP)b7eypZn}_2Wd+d8z zM0~p=oyCzpcw zo1<|<0RS-=3@$D%gb=s4Kd!F6I;Bz=-hKY^X*!#AIzOk=d8gA=N+V*y z^SsN;%kg;J@ApTep_CuH-5wJ+4iDGMXm_vXRvgPJFthM|-*KFNzbB=v)oPQ;_s|6n{0_xE1_fY#a=ljlTCX=>6mMWWo8?E3l!K-gCC@o9c`_O4z(7z~HK z-k@Bm=0=~MzOPg&0)TAWK7M;rE|-;3uY#BL`T+yiJTC|Wt59e(nx5ymt}B?4h!T^g zCO1SIrMCYOagtG*nk*wC+O{GhqCjHED03Ve5rM&E`DUX5kn$Xu0Z;${BAV3P{|Un| qR5}3wM9A|jiq@;uI?o6Yndu*d5H5{6ZQmCF0000O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9?NMQuI!gM*#)JT`R+mmZ_ib zbicnt>HelD)50AEGmh^(dFjoIbKhUz`}O1V|Nr0r|Np(luuRuwVUoeo13>Y3L z$4Ua_N}1|EPcd?j}%=@gH5?(wO4+x`*?>2f07I`n#c|bMb^pdWT_ttzkYXw$=YxBhyVYtKYwrUe|ZKaPUA}#JT<+54q)(f^>bP0l+XkKwhfAh literal 0 HcmV?d00001 diff --git a/resources/icon/os/win2008.png b/resources/icon/os/win2008.png new file mode 100644 index 0000000000000000000000000000000000000000..247caed0a5827a4720b6ba4293269cbbcfacc4f4 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!gM*#)JT`R+mmZ_ib zbicnt>HelD)50AEGmh^(dFjoIbKhUz`}O1V|Nr0r|Np(luuRuwVUoeo13>Y3L z$4Ua_N}1|EPcd?j}%=@gH5?(wO4+x`*?>2f07I`n#c|bMb^pdWT_ttzkYXw$=YxBhyVYtKYwrUe|ZKaPUA}#JT<+54q)(f^>bP0l+XkKwhfAh literal 0 HcmV?d00001 diff --git a/resources/icon/os/win7.png b/resources/icon/os/win7.png new file mode 100644 index 0000000000000000000000000000000000000000..8001539c7123fcc36be379382afd9d107332299d GIT binary patch literal 729 zcmWmBe@GK?6aes>X^CMN6_`N`OAs>ZkFY<|aH7~k#dJauK~C3%N~wet3Z(u~%ZLiC z5W*Cb3>6I&$(&8mCc5c<-EKeJ-RRlUFU=M9$)zIcwb(3O?5?PMotC* z0GY~bWwla2vY+V(q?+I7Mx~ajRa7YeU}E)hT2DZFpKL3?*;dzjukC5WV-28aYE^6G z%7+bFO|7P(spHXKO%VXdUe;8q$^}7S;@qAT9Jh@H$k-lA#s9_QyeL8l;YM(p70lbj zh|bJ$oR5mZIJxW&uXw_Al(7=KEX%IC{0PNHq6~;rgUepqw$F``6dlzWK{g>s&g%7Z zg6P1=_j5Lr2XpuWyIdm9Cmncj!br>*>`oXPT6T{tfx&oU#_XqPX5NY!Jw$Mq*I5v~ z#nZRonOL!NJRgYhtRSvJ#3sBm`o|2R0XP(kGBGENCq!`z4R4~jkd;K8?;vX^iY(&IL&)6*!RR-GZ^PxYBjgtym`qAD#8-G_zjQN~vP_|Bht$m_GC;Ou zGU?<6^7T(k0G^VX_4dQX#>_WcYg+B7R(&vCE}zNIwbYM|7Y(dkxq3+6nVmzPDBevQ z>*xj5*<;USDP4mK3%F=2F_d=I-}zm5bf0Vu9eWqbMa#1Fv-b=3iRaAOx}yAYr|Q=9 z@Z@QUusu~%iS@=jL1k?}o&%(GE#7#oKX*H?x2juT+&M3k$iRb?=WS08|G4D3t|3oJ zL{X@ptgYC{Gdeymd>xdCyrogCJU^{%XlVx0O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9X^CMN6_`N`OAs>ZkFY<|aH7~k#dJauK~C3%N~wet3Z(u~%ZLiC z5W*Cb3>6I&$(&8mCc5c<-EKeJ-RRlUFU=M9$)zIcwb(3O?5?PMotC* z0GY~bWwla2vY+V(q?+I7Mx~ajRa7YeU}E)hT2DZFpKL3?*;dzjukC5WV-28aYE^6G z%7+bFO|7P(spHXKO%VXdUe;8q$^}7S;@qAT9Jh@H$k-lA#s9_QyeL8l;YM(p70lbj zh|bJ$oR5mZIJxW&uXw_Al(7=KEX%IC{0PNHq6~;rgUepqw$F``6dlzWK{g>s&g%7Z zg6P1=_j5Lr2XpuWyIdm9Cmncj!br>*>`oXPT6T{tfx&oU#_XqPX5NY!Jw$Mq*I5v~ z#nZRonOL!NJRgYhtRSvJ#3sBm`o|2R0XP(kGBGENCq!`z4R4~jkd;K8?;vX^iY(&IL&)6*!RR-GZ^PxYBjgtym`qAD#8-G_zjQN~vP_|Bht$m_GC;Ou zGU?<6^7T(k0G^VX_4dQX#>_WcYg+B7R(&vCE}zNIwbYM|7Y(dkxq3+6nVmzPDBevQ z>*xj5*<;USDP4mK3%F=2F_d=I-}zm5bf0Vu9eWqbMa#1Fv-b=3iRaAOx}yAYr|Q=9 z@Z@QUusu~%iS@=jL1k?}o&%(GE#7#oKX*H?x2juT+&M3k$iRb?=WS08|G4D3t|3oJ zL{X@ptgYC{Gdeymd>xdCyrogCJU^{%XlVx0O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9O>_%)r1c1j3A$?$-SQ z3bLd-`Z_W&Z0zU$lgJ9>8wB`-xPJft{nnZ&O+&+|pdbMOi6BeEt=H~lAA2tmm24;> z5GBDO(7v-g-}2tIV-M{GlFu2||4i`&>SZhm@(X5gcy=QV$jS3`aSW-rm7Ku9?NMQuI!gM*#)JT`R+mmZ_ib zbicnt>HelD)50AEGmh^(dFjoIbKhUz`}O1V|Nr0r|Np(luuRuwVUoeo13>Y3L z$4Ua_N}1|EPcd?j}%=@gH5?(wO4+x`*?>2f07I`n#c|bMb^pdWT_ttzkYXw$=YxBhyVYtKYwrUe|ZKaPUA}#JT<+54q)(f^>bP0l+XkKwhfAh literal 0 HcmV?d00001 diff --git a/resources/icon/os/winxbox.png b/resources/icon/os/winxbox.png new file mode 100644 index 0000000000000000000000000000000000000000..85087e4afbe697bcd79f6382a85a1157f2fa682f GIT binary patch literal 661 zcmV;G0&4w0006sNkl~qoicmFjRZ z+)w)(bC;)sV^ft+9>!PRCcwgwCN5nqTT8Y)+bNlN7jC`T9BQ!|Ch7WW==FB<`4P*I z1fdIptz24P$z|g_G>D4GRxYAqh1BS{HFzw%_px*C!S{dZf}>2q!d1$3nZL#IU196& zaevU~RMxx0b%(QykwT_F`eHGaaRdsQ@LVYN;5fp`8-_v29>Z;~u`O*s`euD2Zg_cu zL#}YxRX$JXN~+p3viM{+L;hFKYu4YF=IOv5$jtwJxt-fJ;lPuC02?$g8k~(C`kJk~ zbFU#}YSra58$CL|6Q220Uvny;3ouC-x^<#Au>8B`OQP}0Sap$)m@GkNage8`E0
LbST=l-R&w!YK0pKVP@Xv`!GV%^V!BPCycc07(YSwWNL7CH}hH*a4{ zZX`%~E|3ERdqgB$UyeN09Wn3TZ(mqV;^IV0z-EI2fB+GQKmY+G!3+|nUQ`y6(=)xK v8AJsWa2+oXC_n)KpddgVKpJdfhqe9xt1!`iJOF8-00000NkvXXu0mjfjHDpk literal 0 HcmV?d00001 diff --git a/resources/icon/os/winxp.png b/resources/icon/os/winxp.png new file mode 100644 index 0000000000000000000000000000000000000000..247caed0a5827a4720b6ba4293269cbbcfacc4f4 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!gM*#)JT`R+mmZ_ib zbicnt>HelD)50AEGmh^(dFjoIbKhUz`}O1V|Nr0r|Np(luuRuwVUoeo13>Y3L z$4Ua_N}1|EPcd?j}%=@gH5?(wO4+x`*?>2f07I`n#c|bMb^pdWT_ttzkYXw$=YxBhyVYtKYwrUe|ZKaPUA}#JT<+54q)(f^>bP0l+XkKwhfAh literal 0 HcmV?d00001 From b139e5776518422749b230eb0dfa82afe5bf0ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 8 Jan 2015 21:08:03 +0100 Subject: [PATCH 143/195] Update FR translations --- iwla.pot | 138 ++++++++++++++++++---------- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 2934 -> 3390 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 142 +++++++++++++++++++---------- 3 files changed, 186 insertions(+), 94 deletions(-) diff --git a/iwla.pot b/iwla.pot index d8b1510..42b3001 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-12-19 17:46+CET\n" +"POT-Creation-Date: 2015-01-08 21:05+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,11 +35,11 @@ msgstr "" msgid "March" msgstr "" -#: display.py:32 iwla.py:428 +#: display.py:32 iwla.py:433 msgid "June" msgstr "" -#: display.py:32 iwla.py:428 +#: display.py:32 iwla.py:433 msgid "May" msgstr "" @@ -63,115 +63,131 @@ msgstr "" msgid "September" msgstr "" -#: iwla.py:371 +#: iwla.py:374 msgid "Statistics" msgstr "" -#: iwla.py:377 +#: iwla.py:382 msgid "By day" msgstr "" -#: iwla.py:377 +#: iwla.py:382 msgid "Day" msgstr "" -#: iwla.py:377 iwla.py:430 +#: iwla.py:382 iwla.py:435 msgid "Not viewed Bandwidth" msgstr "" -#: iwla.py:377 iwla.py:430 +#: iwla.py:382 iwla.py:435 msgid "Visits" msgstr "" -#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 msgid "Hits" msgstr "" -#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_visitors.py:72 msgid "Pages" msgstr "" -#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "" -#: iwla.py:414 +#: iwla.py:419 msgid "Average" msgstr "" -#: iwla.py:419 iwla.py:457 +#: iwla.py:424 iwla.py:469 msgid "Total" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Apr" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Aug" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Dec" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Feb" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Jan" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Jul" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Mar" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Nov" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Oct" msgstr "" -#: iwla.py:428 +#: iwla.py:433 msgid "Sep" msgstr "" -#: iwla.py:429 +#: iwla.py:434 msgid "Summary" msgstr "" -#: iwla.py:430 +#: iwla.py:435 msgid "Month" msgstr "" -#: iwla.py:430 +#: iwla.py:435 msgid "Visitors" msgstr "" -#: iwla.py:430 iwla.py:440 +#: iwla.py:435 iwla.py:447 plugins/display/operating_systems.py:90 msgid "Details" msgstr "" -#: iwla.py:465 +#: iwla.py:483 msgid "Statistics for" msgstr "" -#: iwla.py:472 +#: iwla.py:490 msgid "Last update" msgstr "" +#: iwla.py:494 +msgid "Time analysis" +msgstr "" + +#: iwla.py:496 +msgid "hours" +msgstr "" + +#: iwla.py:497 +msgid "minutes" +msgstr "" + +#: iwla.py:497 +msgid "seconds" +msgstr "" + #: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 msgid "Host" msgstr "" @@ -188,6 +204,47 @@ msgstr "" msgid "Top visitors" msgstr "" +#: plugins/display/browsers.py:79 +msgid "Browsers" +msgstr "" + +#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +msgid "Browser" +msgstr "" + +#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +#: plugins/display/operating_systems.py:78 +#: plugins/display/operating_systems.py:95 plugins/display/top_hits.py:71 +#: plugins/display/top_hits.py:97 plugins/display/top_pages.py:71 +#: plugins/display/top_pages.py:96 +msgid "Entrance" +msgstr "" + +#: plugins/display/browsers.py:95 plugins/display/browsers.py:121 +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 +msgid "Others" +msgstr "" + +#: plugins/display/browsers.py:104 +msgid "All Browsers" +msgstr "" + +#: plugins/display/operating_systems.py:78 +#: plugins/display/operating_systems.py:88 +msgid "Operating Systems" +msgstr "" + +#: plugins/display/operating_systems.py:78 +#: plugins/display/operating_systems.py:95 +msgid "Operating System" +msgstr "" + #: plugins/display/referers.py:95 msgid "Connexion from" msgstr "" @@ -200,16 +257,6 @@ msgstr "" msgid "Search Engine" msgstr "" -#: plugins/display/referers.py:110 plugins/display/referers.py:125 -#: plugins/display/referers.py:140 plugins/display/referers.py:163 -#: plugins/display/referers.py:174 plugins/display/referers.py:185 -#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 -#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 -#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 -#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 -msgid "Others" -msgstr "" - #: plugins/display/referers.py:114 plugins/display/referers.py:167 msgid "External URL" msgstr "" @@ -226,8 +273,8 @@ msgstr "" msgid "All Referers" msgstr "" -#: plugins/display/referers.py:200 plugins/display/referers.py:210 -msgid "Top key phrases" +#: plugins/display/referers.py:200 +msgid "Key phrases" msgstr "" #: plugins/display/referers.py:200 plugins/display/referers.py:216 @@ -238,6 +285,10 @@ msgstr "" msgid "Search" msgstr "" +#: plugins/display/referers.py:210 +msgid "Top key phrases" +msgstr "" + #: plugins/display/referers.py:212 msgid "All key phrases" msgstr "" @@ -264,11 +315,6 @@ msgstr "" msgid "All Hits" msgstr "" -#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 -#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 -msgid "Entrance" -msgstr "" - #: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 msgid "All Pages" msgstr "" diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index 360249b9be26cf63291f68baccb3bc9bf31d6867..74cd2701d3aa3da56f08b3f76ef704c15727f6a2 100644 GIT binary patch literal 3390 zcmZ{lQH&%-8OKXF#aqP_P6gD{0)Yk2*_%08*jtYCc6WB~_Po8_?9QRQc92nERoB$_eN|t7^VZD=o;9>(I%5L((g8YJ{bR;_5;owC@D%(wJP!}Ti~jv3 zcnCd$6YvRmJ^Ts$DEyh%e-3%fvvfDW=b-j^(d)m0+W$9@$Gk@ODfoM+{r>Fv2GqJY zq4xQ!*WZQm_dWO-cz~Ds-EC0ok9hrVs1Wb-Jm%-`hdgG+>!+dCH9eQ1;=2Gp0Uw3( z-+4WOviCixxWDi9A9?*rD8HWe^DjdAb=B)HLmu-A-KXI-coY01BqZ|}&v&5qf7k2( zfV!W5L)kybrt<4XD1UE(I>$R8OH2c5{Rz)Au)I&G^ScDg`}Fz~Q1+gL+W%?DW1gXt zU(Z3ke*tR$9nY6x?<2;%3KjPx&U_x8gtGrls5l)w3$Vn+QQpY@iDF4(RM07{DBf6Vu#LPvJ zozIf(++}&GG?VQ(N`g+Moehg>uoiS(HClI@F56xGxEtDZD+_Y}auDX_FVf7+rCAu6 zxqesD&kHj*a2dOp`5^9Whn-@}c*DEQ&HT`If}vSR;@DjYlh|%%NzXKyYPz<>^)9=N zK@o&eZWiMr3*xpji&qMl#X)2*uAl#aV(-b4%SmysS#p;pSwF~zhNvXDIh)|uxgeI5 zZ_f22gAD0nXTGr)-PkZU=YzbkxpQ$f>ZhHcaAqaQB<(Hwp;<{{0=$qEb`ZL4*RlIi zUq}YL7*wIGwhMzK3TrjxfQm5g+KpjexZZzF7V z!=(~-(aswM`{qU1&c}v!GvQ6Y*VB=-!k)7MM>x#G+_aL^?k9q@%9KWX_b+Aq{-u}q zpWs?6DT2scTwgYiC?zyi4sx@V^ig_Y+%HI)+_jUKWLwLU$6ULpEq7{<5E^$sYs2j* zm{?nF)fO^`|4CeHa?rE(c)c-Qt2b)(8GF1jTc1928ngnrbJ#Q>>1=eUi4;azW2~v^zITc3xUqpIBL5 zS=@KJF;$-+e+w65W|-n`;jR?N(kKYyhirQ*$Z}Uae6h7uo7rC{clfGmi*Y;YkN~rG z=5km}oN=)-!gXr%!&#dSyROh?Q|Zt)rlu#pRr3oJ##-V!VZrm)q&*HgdU*gF)EEg05t5vKZ||qaC^0bv@!3d$pynhJ{>R`TMji3u6;WnV?+k z*qkpAw#}~N^JTKAa15vxgR)vAqu){}%6=soI?6y(muI-PP0woDLcN0%xSb=K}I|HK;f_)Emg#gkN4}xXlG!S=(3RSX}^GsevMDQ zg7Bqh6pm05MUKkS=UZJX%VQOMHO?!giLr2WHFMQhgI9YKy)bun^n4W&MI~2dQ5RBJ z^nGT*=4RNoF(q=)S2gh!h1m8g3S-rg(N(_e&ZN7NMoFkTki>iQ`G;Rr^~F)Li;PpL zzWR07rraPHSE|^Kv)SI!O?40Jqn*6pBMqAUjC0pc(PUM29I27o q*8j-8@#^CpRDPwq|2(^i<;#yx<`2}La;_{uxV42w{(h(i@!~&tncf=! literal 2934 zcmZ{kO^g&p6vqn%#SxKD6%{EJ5X4?)_-2+5cXxIL++~;9fhaN2-kI9jhMw-Gx_Wje z#t;uA9yAdX4n_@LNZf<*LOei1Ool|G2M-)HhL~_sPF_s(Ac_9}-L*S|(MrGm)vKz0 z^O067U1?VelfD1HS<8 z1+Rd3#5Jp52k(Ra4R}BJJxDu0*zsH7Qs}oqe*dTCUm*AW8{~J3VTAfJko&IzSAiQr ze%EW~4_f^Y$WVqYkJ<4PAnl#B`h=aIv^)(mo(QC$Z-Nhk=Rodr9)wHcg4I8=`bCib zT(aX=K>B;l>R*H0_d5`exMBGdNPD-e{wv6H{|)4RcR>2VkLgzqUDVT>k>d zbw!ZpQv#WvV^()T?h}BtYe4!p17ZvDHrQBz{DO}|{{xe>yBtQBf$PAPU>sbhM`0vJhy2%c11|NfLh3v6oJTErp`5DLtDqW3rz_uOI1Hn;=1CTs~xp)G? zvwR-HwjNS|?1u2nSs&{lY3uWSSqi5EKXhxcpmxYJS!c|xtE^X6lS(U{DW_FSMpN32 z?PSx7(=Q?|`XcT5qA#galGup8rqZw?`rV*5?bXbb=x@oI+Y$p|5U3e14CJH^8={1v zlB!ZvV?t?kjO+Qa7z~VdgQ^mPGe+sa_2u#M@Lh`Bq{E5OY!*Xmf}#^ww*-Qq#Ntp0 zH;%XgC7n5v_yW?xD^TL)`C!Db8ygub6=c06s<}pq5m!^HQ+T(;NEjf7qoI*aPfe?u z>;!f+Y+|CBxj$Mp0unNmQSH^eK#ZCxo?v#U<0>_oK@J93pv1U}C?+#8Zd~KV#;eAn z)0LB<7UM~y!5AxH)Rj7FnQ`{!Ge)I5W7N}(g>a@48rK)c%ZJ4YCXqvF2X5-{l&Tu% zaLqXZw~?r#^rn3`H#S;v2DE~2Vc?W-LPfbPU)bRkwmF5pvaq|jWBZnY!3x$nWyOvD ze_6he&*ymRP6auReHRWC<#?DFx7MDO`{J~xUaU886?&>+;{a9%^#m8nsVKK$J(?RU z;wrs9RL+eY9vSR7UFgZ@aM_FsuuUt1yGG5Jt~L9eV%xjI&6|MAL@v!}C;?%>8d zgF!W{c|pA>_e^*u_mT>5osFtF{jH*mT6JY;tS4&8LeI|JD~?^jFvdbv^9;s!^%U}$ z%5(?O>8cvYwk^tRU*sW)rLSUX+OvLpmR{9W11>W~c4~^Z8JfW|E{)Ra>>3EudxoOy z8nbmOtFYQVp56e~Zxcn^Op7*bUq!v9?~$;jP@ZYkDr^+TE)Eb^SIblIzpHp_DoVUq z9N}mQj;Al&U#-~dlyG|%o1tozneHokE5=Pl+RIW$y zeTC9aP+Mc^?@#FbTDSyfTs5ZE#*(Xytbo*(O~Z5Ws<=rajE?^a~QlPtGq o\n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -37,11 +37,11 @@ msgstr "Juillet" msgid "March" msgstr "Mars" -#: display.py:32 iwla.py:428 +#: display.py:32 iwla.py:433 msgid "June" msgstr "Juin" -#: display.py:32 iwla.py:428 +#: display.py:32 iwla.py:433 msgid "May" msgstr "Mai" @@ -65,115 +65,131 @@ msgstr "Octobre" msgid "September" msgstr "Septembre" -#: iwla.py:371 +#: iwla.py:374 msgid "Statistics" msgstr "Statistiques" -#: iwla.py:377 +#: iwla.py:382 msgid "By day" msgstr "Par jour" -#: iwla.py:377 +#: iwla.py:382 msgid "Day" msgstr "Jour" -#: iwla.py:377 iwla.py:430 +#: iwla.py:382 iwla.py:435 msgid "Not viewed Bandwidth" msgstr "Traffic non vu" -#: iwla.py:377 iwla.py:430 +#: iwla.py:382 iwla.py:435 msgid "Visits" msgstr "Visites" -#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 msgid "Hits" msgstr "Hits" -#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_visitors.py:72 msgid "Pages" msgstr "Pages" -#: iwla.py:377 iwla.py:430 plugins/display/all_visits.py:70 +#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "Bande passante" -#: iwla.py:414 +#: iwla.py:419 msgid "Average" msgstr "Moyenne" -#: iwla.py:419 iwla.py:457 +#: iwla.py:424 iwla.py:469 msgid "Total" msgstr "Total" -#: iwla.py:428 +#: iwla.py:433 msgid "Apr" msgstr "Avr" -#: iwla.py:428 +#: iwla.py:433 msgid "Aug" msgstr "Août" -#: iwla.py:428 +#: iwla.py:433 msgid "Dec" msgstr "Déc" -#: iwla.py:428 +#: iwla.py:433 msgid "Feb" msgstr "Fév" -#: iwla.py:428 +#: iwla.py:433 msgid "Jan" msgstr "Jan" -#: iwla.py:428 +#: iwla.py:433 msgid "Jul" msgstr "Jui" -#: iwla.py:428 +#: iwla.py:433 msgid "Mar" msgstr "Mars" -#: iwla.py:428 +#: iwla.py:433 msgid "Nov" msgstr "Nov" -#: iwla.py:428 +#: iwla.py:433 msgid "Oct" msgstr "Oct" -#: iwla.py:428 +#: iwla.py:433 msgid "Sep" msgstr "Sep" -#: iwla.py:429 +#: iwla.py:434 msgid "Summary" msgstr "Résumé" -#: iwla.py:430 +#: iwla.py:435 msgid "Month" msgstr "Mois" -#: iwla.py:430 +#: iwla.py:435 msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:430 iwla.py:440 +#: iwla.py:435 iwla.py:447 plugins/display/operating_systems.py:90 msgid "Details" msgstr "Détails" -#: iwla.py:465 +#: iwla.py:483 msgid "Statistics for" msgstr "Statistiques pour" -#: iwla.py:472 +#: iwla.py:490 msgid "Last update" msgstr "Dernière mise à jour" +#: iwla.py:494 +msgid "Time analysis" +msgstr "Durée de l'analyse" + +#: iwla.py:496 +msgid "hours" +msgstr "heures " + +#: iwla.py:497 +msgid "minutes" +msgstr "minutes" + +#: iwla.py:497 +msgid "seconds" +msgstr "secondes" + #: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 msgid "Host" msgstr "Hôte" @@ -190,6 +206,47 @@ msgstr "Toutes les visites" msgid "Top visitors" msgstr "Top visiteurs" +#: plugins/display/browsers.py:79 +msgid "Browsers" +msgstr "Navigateurs" + +#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +msgid "Browser" +msgstr "Navigateur" + +#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +#: plugins/display/operating_systems.py:78 +#: plugins/display/operating_systems.py:95 plugins/display/top_hits.py:71 +#: plugins/display/top_hits.py:97 plugins/display/top_pages.py:71 +#: plugins/display/top_pages.py:96 +msgid "Entrance" +msgstr "Entrées" + +#: plugins/display/browsers.py:95 plugins/display/browsers.py:121 +#: plugins/display/referers.py:110 plugins/display/referers.py:125 +#: plugins/display/referers.py:140 plugins/display/referers.py:163 +#: plugins/display/referers.py:174 plugins/display/referers.py:185 +#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 +#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 +#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 +#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 +msgid "Others" +msgstr "Autres" + +#: plugins/display/browsers.py:104 +msgid "All Browsers" +msgstr "Tous les navigateurs" + +#: plugins/display/operating_systems.py:78 +#: plugins/display/operating_systems.py:88 +msgid "Operating Systems" +msgstr "Systèmes d'exploitation" + +#: plugins/display/operating_systems.py:78 +#: plugins/display/operating_systems.py:95 +msgid "Operating System" +msgstr "Système d'exploitation" + #: plugins/display/referers.py:95 msgid "Connexion from" msgstr "Connexion depuis" @@ -202,16 +259,6 @@ msgstr "Origine" msgid "Search Engine" msgstr "Moteur de recherche" -#: plugins/display/referers.py:110 plugins/display/referers.py:125 -#: plugins/display/referers.py:140 plugins/display/referers.py:163 -#: plugins/display/referers.py:174 plugins/display/referers.py:185 -#: plugins/display/referers.py:222 plugins/display/top_downloads.py:83 -#: plugins/display/top_downloads.py:103 plugins/display/top_hits.py:82 -#: plugins/display/top_hits.py:103 plugins/display/top_pages.py:82 -#: plugins/display/top_pages.py:102 plugins/display/top_visitors.py:92 -msgid "Others" -msgstr "Autres" - #: plugins/display/referers.py:114 plugins/display/referers.py:167 msgid "External URL" msgstr "URL externe" @@ -228,9 +275,9 @@ msgstr "Top Origines" msgid "All Referers" msgstr "Toutes les origines" -#: plugins/display/referers.py:200 plugins/display/referers.py:210 -msgid "Top key phrases" -msgstr "Top phrases clé" +#: plugins/display/referers.py:200 +msgid "Key phrases" +msgstr "Phrases clé" #: plugins/display/referers.py:200 plugins/display/referers.py:216 msgid "Key phrase" @@ -240,6 +287,10 @@ msgstr "Phrase clé" msgid "Search" msgstr "Recherche" +#: plugins/display/referers.py:210 +msgid "Top key phrases" +msgstr "Top phrases clé" + #: plugins/display/referers.py:212 msgid "All key phrases" msgstr "Toutes les phrases clé" @@ -266,11 +317,6 @@ msgstr "Top Téléchargements" msgid "All Hits" msgstr "Tous les hits" -#: plugins/display/top_hits.py:71 plugins/display/top_hits.py:97 -#: plugins/display/top_pages.py:71 plugins/display/top_pages.py:96 -msgid "Entrance" -msgstr "Entrées" - #: plugins/display/top_pages.py:71 plugins/display/top_pages.py:90 msgid "All Pages" msgstr "Toutes les pages" From ce1aa2d7c67d2372fb6a5264b5e1415525703446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 8 Jan 2015 21:08:30 +0100 Subject: [PATCH 144/195] Update documentation --- docs/index.md | 389 ++++++++++++++++++++++++++++++++---------------- docs/modules.md | 389 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 514 insertions(+), 264 deletions(-) diff --git a/docs/index.md b/docs/index.md index 6b8c2b1..357218c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -91,17 +91,21 @@ Plugins Optional configuration values ends with *. * iwla.py - * plugins/display/all_visits.py - * plugins/display/referers.py * plugins/display/top_downloads.py + * plugins/display/all_visits.py * plugins/display/top_hits.py - * plugins/display/top_pages.py + * plugins/display/browsers.py + * plugins/display/referers.py + * plugins/display/operating_systems.py * plugins/display/top_visitors.py * plugins/display/referers_diff.py - * plugins/post_analysis/referers.py - * plugins/post_analysis/reverse_dns.py + * plugins/display/top_pages.py * plugins/post_analysis/top_downloads.py * plugins/post_analysis/top_hits.py + * plugins/post_analysis/browsers.py + * plugins/post_analysis/referers.py + * plugins/post_analysis/operating_systems.py + * plugins/post_analysis/reverse_dns.py * plugins/post_analysis/top_pages.py * plugins/pre_analysis/page_to_hit.py * plugins/pre_analysis/robots.py @@ -193,6 +197,34 @@ iwla None +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.all_visits -------------------------- @@ -220,6 +252,62 @@ plugins.display.all_visits None +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.browsers +------------------------ + + Display hook + + Create browsers page + + Plugin requirements : + post_analysis/browsers + + Conf values needed : + max_browsers_displayed* + create_browsers_page* + + Output files : + OUTPUT_ROOT/year/month/browsers.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.referers ------------------------ @@ -251,78 +339,20 @@ plugins.display.referers None -plugins.display.top_downloads ------------------------------ +plugins.display.operating_systems +--------------------------------- Display hook - Create TOP downloads page + Add operating systems statistics Plugin requirements : - post_analysis/top_downloads + post_analysis/operating_systems Conf values needed : - max_downloads_displayed* - create_all_downloads_page* + create_families_page* Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_pages -------------------------- - - Display hook - - Create TOP pages page - - Plugin requirements : - post_analysis/top_pages - - Conf values needed : - max_pages_displayed* - create_all_pages_page* - - Output files : - OUTPUT_ROOT/year/month/top_pages.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -387,6 +417,122 @@ plugins.display.referers_diff None +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri => count + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri => count + + Statistics deletion : + None + + +plugins.post_analysis.browsers +------------------------------ + + Post analysis hook + + Detect browser information from requests + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + visits : + remote_addr => + browser + + month_stats : + browsers => + browser => count + + Statistics update : + None + + Statistics deletion : + None + + plugins.post_analysis.referers ------------------------------ @@ -409,16 +555,51 @@ plugins.post_analysis.referers Statistics update : month_stats : referers => - pages - hits + pages => count + hits => count robots_referers => - pages - hits + pages => count + hits => count search_engine_referers => - pages - hits + pages => count + hits => count key_phrases => - phrase + phrase => count + + Statistics deletion : + None + + +plugins.post_analysis.operating_systems +--------------------------------------- + + Post analysis hook + + Detect operating systems from requests + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + visits : + remote_addr => + operating_system + + month_stats : + operating_systems => + operating_system => count + + os_families => + family => count + + Statistics update : + None Statistics deletion : None @@ -453,62 +634,6 @@ plugins.post_analysis.reverse_dns None -plugins.post_analysis.top_downloads ------------------------------------ - - Post analysis hook - - Count TOP downloads - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_downloads => - uri - - Statistics deletion : - None - - -plugins.post_analysis.top_hits ------------------------------- - - Post analysis hook - - Count TOP hits - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : - None - - plugins.post_analysis.top_pages ------------------------------- @@ -531,7 +656,7 @@ plugins.post_analysis.top_pages Statistics update : month_stats: top_pages => - uri + uri => count Statistics deletion : None diff --git a/docs/modules.md b/docs/modules.md index 7cf4999..c948786 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -1,15 +1,19 @@ * iwla.py - * plugins/display/all_visits.py - * plugins/display/referers.py * plugins/display/top_downloads.py + * plugins/display/all_visits.py * plugins/display/top_hits.py - * plugins/display/top_pages.py + * plugins/display/browsers.py + * plugins/display/referers.py + * plugins/display/operating_systems.py * plugins/display/top_visitors.py * plugins/display/referers_diff.py - * plugins/post_analysis/referers.py - * plugins/post_analysis/reverse_dns.py + * plugins/display/top_pages.py * plugins/post_analysis/top_downloads.py * plugins/post_analysis/top_hits.py + * plugins/post_analysis/browsers.py + * plugins/post_analysis/referers.py + * plugins/post_analysis/operating_systems.py + * plugins/post_analysis/reverse_dns.py * plugins/post_analysis/top_pages.py * plugins/pre_analysis/page_to_hit.py * plugins/pre_analysis/robots.py @@ -101,6 +105,34 @@ iwla None +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.all_visits -------------------------- @@ -128,6 +160,62 @@ plugins.display.all_visits None +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.browsers +------------------------ + + Display hook + + Create browsers page + + Plugin requirements : + post_analysis/browsers + + Conf values needed : + max_browsers_displayed* + create_browsers_page* + + Output files : + OUTPUT_ROOT/year/month/browsers.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.referers ------------------------ @@ -159,78 +247,20 @@ plugins.display.referers None -plugins.display.top_downloads ------------------------------ +plugins.display.operating_systems +--------------------------------- Display hook - Create TOP downloads page + Add operating systems statistics Plugin requirements : - post_analysis/top_downloads + post_analysis/operating_systems Conf values needed : - max_downloads_displayed* - create_all_downloads_page* + create_families_page* Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_hits ------------------------- - - Display hook - - Create TOP hits page - - Plugin requirements : - post_analysis/top_hits - - Conf values needed : - max_hits_displayed* - create_all_hits_page* - - Output files : - OUTPUT_ROOT/year/month/top_hits.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - -plugins.display.top_pages -------------------------- - - Display hook - - Create TOP pages page - - Plugin requirements : - post_analysis/top_pages - - Conf values needed : - max_pages_displayed* - create_all_pages_page* - - Output files : - OUTPUT_ROOT/year/month/top_pages.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -295,6 +325,122 @@ plugins.display.referers_diff None +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.top_downloads +----------------------------------- + + Post analysis hook + + Count TOP downloads + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_downloads => + uri => count + + Statistics deletion : + None + + +plugins.post_analysis.top_hits +------------------------------ + + Post analysis hook + + Count TOP hits + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + month_stats: + top_hits => + uri => count + + Statistics deletion : + None + + +plugins.post_analysis.browsers +------------------------------ + + Post analysis hook + + Detect browser information from requests + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + visits : + remote_addr => + browser + + month_stats : + browsers => + browser => count + + Statistics update : + None + + Statistics deletion : + None + + plugins.post_analysis.referers ------------------------------ @@ -317,16 +463,51 @@ plugins.post_analysis.referers Statistics update : month_stats : referers => - pages - hits + pages => count + hits => count robots_referers => - pages - hits + pages => count + hits => count search_engine_referers => - pages - hits + pages => count + hits => count key_phrases => - phrase + phrase => count + + Statistics deletion : + None + + +plugins.post_analysis.operating_systems +--------------------------------------- + + Post analysis hook + + Detect operating systems from requests + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + visits : + remote_addr => + operating_system + + month_stats : + operating_systems => + operating_system => count + + os_families => + family => count + + Statistics update : + None Statistics deletion : None @@ -361,62 +542,6 @@ plugins.post_analysis.reverse_dns None -plugins.post_analysis.top_downloads ------------------------------------ - - Post analysis hook - - Count TOP downloads - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_downloads => - uri - - Statistics deletion : - None - - -plugins.post_analysis.top_hits ------------------------------- - - Post analysis hook - - Count TOP hits - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats: - top_hits => - uri - - Statistics deletion : - None - - plugins.post_analysis.top_pages ------------------------------- @@ -439,7 +564,7 @@ plugins.post_analysis.top_pages Statistics update : month_stats: top_pages => - uri + uri => count Statistics deletion : None From a85be4465e2df239675dfcfa72973c2321adde96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 8 Jan 2015 21:17:46 +0100 Subject: [PATCH 145/195] Update conf.pt --- conf.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.py b/conf.py index aeb6ad1..6e57326 100644 --- a/conf.py +++ b/conf.py @@ -1,25 +1,25 @@ # Web server log -analyzed_filename = '/var/log/apache2/soutade.fr_access.log' +analyzed_filename = '/var/log/apache2/access.log' # Domain name to analyze domain_name = 'soutade.fr' # Display visitor IP in addition to resolved names -display_visitor_ip = True +#display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers'] #, 'reverse_dns'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'reverse_dns'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers'] # Reverse DNS timeout reverse_dns_timeout = 0.2 # Count this addresses as hit -page_to_hit_conf = [r'^.+/logo[/]?$'] +#page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page -hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$'] +#hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$'] # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 @@ -27,5 +27,5 @@ max_downloads_displayed = 100 compress_output_files = ['html', 'css', 'js'] -locale = 'fr' +#locale = 'fr' From a67ed82c7497807b81068ca5a28a1cc3119d9492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 8 Jan 2015 21:17:55 +0100 Subject: [PATCH 146/195] Update ChangeLog --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f34a539..c102e05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,10 @@ -v0.2 (06/01/2015) +v0.2 (08/01/2015) ** User ** Add referers_diff display plugin Add year statistics in month details Add analysis duration + Add browsers detection + Add operating systems detection ** Dev ** Add istats_diff interface From 588b3179d572b6a76fd7f4a5b121b9a9d6bc814a Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 11 Jan 2015 18:05:09 +0100 Subject: [PATCH 147/195] Generate display before serialization (avoid errors when generation raise exception and database partially saved (months but not meta)) --- iwla.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index 0bd6278..ca68ad0 100755 --- a/iwla.py +++ b/iwla.py @@ -578,6 +578,8 @@ class IWLA(object): if os.path.exists(path): os.remove(path) + self._generateDisplay() + self.logger.info("==> Serialize to %s" % (path)) self._serialize(self.current_analysis, path) @@ -590,7 +592,8 @@ class IWLA(object): self.meta_infos['stats'][year] = {} self.meta_infos['stats'][year][month] = duplicated_stats - self._generateDisplay() + self.logger.info("==> Serialize to %s" % (conf.META_PATH)) + self._serialize(self.meta_infos, conf.META_PATH) def _generateDayStats(self): visits = self.current_analysis['visits'] @@ -700,7 +703,6 @@ class IWLA(object): self._generateDayStats() self._generateMonthStats() del self.meta_infos['start_analysis_time'] - self._serialize(self.meta_infos, conf.META_PATH) else: self.logger.info('==> Analyse not started : nothing new') From 00ad08a201a2f45666e02af7edaa6a606cc3a4fb Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 11 Jan 2015 18:06:18 +0100 Subject: [PATCH 148/195] Add try/catch in browsers display plugin in case of an icon doesn't exists) --- plugins/display/browsers.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py index 95b70cd..767b568 100644 --- a/plugins/display/browsers.py +++ b/plugins/display/browsers.py @@ -82,12 +82,15 @@ class IWLADisplayBrowsers(IPlugin): new_list = self.max_browsers and browsers[:self.max_browsers] or browsers for (browser, entrance) in new_list: if browser != 'unknown': - icon = '' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + try: + icon = '' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + except: + icon = '' % (self.icon_path) else: icon = '' % (self.icon_path) browser = 'Unknown' table.appendRow([icon, browser, entrance]) - total_browsers[1] += entrance + total_browsers[2] += entrance if self.max_browsers: others = 0 for (browser, entrance) in browsers[self.max_browsers:]: @@ -111,14 +114,18 @@ class IWLADisplayBrowsers(IPlugin): table.setColsCSSClass(['', '', 'iwla_hit']) for (browser, entrance) in browsers[:10]: if browser != 'unknown': - icon = '' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + try: + icon = '' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + except: + icon = '' % (self.icon_path) else: icon = '' % (self.icon_path) browser = 'Unknown' table.appendRow([icon, browser, entrance]) - total_browsers[1] -= entrance - if total_browsers[1]: - total_browsers[0] = self.iwla._(u'Others') + total_browsers[2] -= entrance + if total_browsers[2]: + total_browsers[0] = u'' + total_browsers[1] = self.iwla._(u'Others') table.appendRow(total_browsers) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') index.appendBlock(table) From 4c74a14037f69c14188d239ee7e90ab9f2429825 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 11 Jan 2015 18:06:44 +0100 Subject: [PATCH 149/195] Filter robot with *bot* and *crawl* re --- plugins/display/referers.py | 2 +- plugins/pre_analysis/robots.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/display/referers.py b/plugins/display/referers.py index 1c4847a..1c0b52d 100644 --- a/plugins/display/referers.py +++ b/plugins/display/referers.py @@ -190,7 +190,7 @@ class IWLADisplayReferers(IPlugin): # All key phrases in a file if self.create_all_key_phrases: - title = createCurTitle(self.iwla, u'All Key Phrases') + title = createCurTitle(self.iwla, self.iwla._(u'All Key Phrases')) filename = 'key_phrases.html' path = self.iwla.getCurDisplayPath(filename) diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 662ce57..f4ea99d 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -59,7 +59,8 @@ class IWLAPreAnalysisRobots(IPlugin): def load(self): self.awstats_robots = map(lambda (x) : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots) - + self.robot_re = re.compile(r'.*bot.*', re.IGNORECASE) + self.crawl_re = re.compile(r'.*crawl.*', re.IGNORECASE) return True # Basic rule to detect robots @@ -72,7 +73,11 @@ class IWLAPreAnalysisRobots(IPlugin): referers = 0 first_page = super_hit['requests'][0] - if not self.iwla.isValidForCurrentAnalysis(first_page): continue + + if self.robot_re.match(first_page['http_user_agent']) or\ + self.crawl_re.match(first_page['http_user_agent']): + super_hit['robot'] = 1 + continue for r in self.awstats_robots: if r.match(first_page['http_user_agent']): From 75b11c2e979d532cdf987a4879332aac238372aa Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:52:35 +0100 Subject: [PATCH 150/195] Add isMultimediaFile() and generate after serialization --- iwla.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index ca68ad0..0647e24 100755 --- a/iwla.py +++ b/iwla.py @@ -275,6 +275,15 @@ class IWLA(object): self.logger.debug("False") return False + def isMultimediaFile(self, request): + self.logger.debug("Is multimedia %s" % (request)) + for e in conf.multimedia_files: + if request.endswith(e): + self.logger.debug("True") + return True + self.logger.debug("False") + return False + def _appendHit(self, hit): remote_addr = hit['remote_addr'] @@ -578,8 +587,6 @@ class IWLA(object): if os.path.exists(path): os.remove(path) - self._generateDisplay() - self.logger.info("==> Serialize to %s" % (path)) self._serialize(self.current_analysis, path) @@ -595,6 +602,8 @@ class IWLA(object): self.logger.info("==> Serialize to %s" % (conf.META_PATH)) self._serialize(self.meta_infos, conf.META_PATH) + self._generateDisplay() + def _generateDayStats(self): visits = self.current_analysis['visits'] cur_time = self.meta_infos['last_time'] From 3fb1b897eaa39d917137b545c795f98a35325774 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:53:50 +0100 Subject: [PATCH 151/195] Remove one s in operating systems plugin --- plugins/display/operating_systems.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/display/operating_systems.py b/plugins/display/operating_systems.py index 47ddd87..0b4324f 100644 --- a/plugins/display/operating_systems.py +++ b/plugins/display/operating_systems.py @@ -56,7 +56,7 @@ class IWLADisplayTopOperatingSystems(IPlugin): def load(self): self.icon_path = self.iwla.getConfValue('icon_path', '/') - self.create_families_pages = self.iwla.getConfValue('create_families_pages_page', True) + self.create_families_page = self.iwla.getConfValue('create_families_page_page', True) self.icon_names = {v:k for (k, v) in awstats_data.operating_systems_family.items()} return True @@ -69,7 +69,7 @@ class IWLADisplayTopOperatingSystems(IPlugin): operating_systems = sorted(operating_systems.items(), key=lambda t: t[1], reverse=True) # All in a page - if self.create_families_pages: + if self.create_families_page: title = createCurTitle(self.iwla, u'All Operating Systems') filename = 'operating_systems.html' path = self.iwla.getCurDisplayPath(filename) @@ -86,7 +86,7 @@ class IWLADisplayTopOperatingSystems(IPlugin): # Families in index title = self.iwla._(u'Operating Systems') - if self.create_families_pages: + if self.create_families_page: link = '%s' % (filename, self.iwla._(u'Details')) title = '%s - %s' % (title, link) @@ -97,4 +97,5 @@ class IWLADisplayTopOperatingSystems(IPlugin): for (family, entrance) in os_families: icon = '' % (self.icon_path, self.icon_names[family]) table.appendRow([icon, family, entrance]) + table.computeRatio(2) index.appendBlock(table) From 9d3f7c05a4a4a1a5756e500df2cb306bf7aac790 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:54:22 +0100 Subject: [PATCH 152/195] Optimize top_downloads post analysis plugin --- plugins/post_analysis/top_downloads.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 8fb5b17..2f5c136 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -53,19 +53,14 @@ class IWLAPostAnalysisTopDownloads(IPlugin): def __init__(self, iwla): super(IWLAPostAnalysisTopDownloads, self).__init__(iwla) self.API_VERSION = 1 - self.conf_requires = ['multimedia_files', 'viewed_http_codes'] def hook(self): - stats = self.iwla.getCurrentVisists() + stats = self.iwla.getValidVisitors() month_stats = self.iwla.getMonthStats() - multimedia_files = self.iwla.getConfValue('multimedia_files') - viewed_http_codes = self.iwla.getConfValue('viewed_http_codes') - top_downloads = month_stats.get('top_downloads', {}) for (k, super_hit) in stats.items(): - if super_hit['robot']: continue for r in super_hit['requests'][::-1]: if not self.iwla.isValidForCurrentAnalysis(r): break @@ -75,13 +70,8 @@ class IWLAPostAnalysisTopDownloads(IPlugin): uri = r['extract_request']['extract_uri'].lower() - isMultimedia = False - for ext in multimedia_files: - if uri.endswith(ext): - isMultimedia = True - break - - if isMultimedia: continue + if self.iwla.isMultimediaFile(uri): + continue uri = "%s%s" % (r.get('server_name', ''), r['extract_request']['extract_uri']) From 1d9bf71b4b2df090038a52bd3e39c3785d14d60b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:54:57 +0100 Subject: [PATCH 153/195] Set arguments of page_to_hit facultative --- plugins/pre_analysis/page_to_hit.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index a3919c4..77772bb 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -58,12 +58,10 @@ class IWLAPreAnalysisPageToHit(IPlugin): def load(self): # Page to hit self.ph_regexps = self.iwla.getConfValue('page_to_hit_conf', []) - if not self.ph_regexps: return False self.ph_regexps = map(lambda(r): re.compile(r), self.ph_regexps) # Hit to page self.hp_regexps = self.iwla.getConfValue('hit_to_page_conf', []) - if not self.hp_regexps: return False self.hp_regexps = map(lambda(r): re.compile(r), self.hp_regexps) return True From 616b0d80527bc0c3ab2bb799c7c8fb3e66be3afa Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:55:46 +0100 Subject: [PATCH 154/195] Add computeRatio method to display. Enable it in browsers display plugin --- display.py | 29 +++++++++++++++++++++++++++++ plugins/display/browsers.py | 1 + 2 files changed, 30 insertions(+) diff --git a/display.py b/display.py index e70a8af..6be75df 100644 --- a/display.py +++ b/display.py @@ -102,6 +102,21 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.rows.append(listToStr(row)) self.rows_cssclasses.append([u''] * len(row)) + def insertCol(self, col_number, col_title='', col_css_class=''): + self.cols.insert(col_number, col_title) + for r in self.rows: + r.insert(col_number, u'') + for r in self.rows_cssclasses: + v = r[0] + # If all cells have the same CSS class, set it + for cur_value in r: + if v != cur_value: + v = None + break + v = v or u'' + r.insert(col_number, v) + self.cols_cssclasses.insert(col_number, col_css_class) + def getNbRows(self): return len(self.rows) @@ -160,6 +175,20 @@ class DisplayHTMLBlockTable(DisplayHTMLBlock): self.cols_cssclasses = listToStr(values) + def computeRatio(self, column, column_insertion=None): + if column_insertion is None: + column_insertion = column+1 + + total = 0 + for r in self.rows: + if r[column]: + total += int(r[column]) + + self.insertCol(column_insertion, self.iwla._('Ratio'), u'iwla_hit') + for (index, r) in enumerate(self.rows): + val = r[column] and int(r[column]) or 0 + self.setCellValue(index, column_insertion, '%.1f%%' % (float(val*100)/float(total))) + def _buildHTML(self): style = u'' if self.table_css: style = u' class="%s"' % (self.table_css) diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py index 767b568..e82641a 100644 --- a/plugins/display/browsers.py +++ b/plugins/display/browsers.py @@ -128,4 +128,5 @@ class IWLADisplayBrowsers(IPlugin): total_browsers[1] = self.iwla._(u'Others') table.appendRow(total_browsers) table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others') + table.computeRatio(2) index.appendBlock(table) From 511ca4939798a6ae11f455053bb1aaa67fe7aa2f Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:57:26 +0100 Subject: [PATCH 155/195] Add track users plugin --- plugins/display/track_users.py | 112 +++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 plugins/display/track_users.py diff --git a/plugins/display/track_users.py b/plugins/display/track_users.py new file mode 100644 index 0000000..8a27fa8 --- /dev/null +++ b/plugins/display/track_users.py @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +import awstats_data + +""" +Display hook + +Track users + +Plugin requirements : + None + +Conf values needed : + tracked_ip + create_tracked_page* + +Output files : + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/tracked_users.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTrackUsers(IPlugin): + def __init__(self, iwla): + super(IWLADisplayTrackUsers, self).__init__(iwla) + self.API_VERSION = 1 + self.conf_requires = ['tracked_ip'] + + def load(self): + self.create_tracked_page = self.iwla.getConfValue('create_tracked_page', True) + self.tracked_ip = self.iwla.getConfValue('tracked_ip', []) + + return True + + def hook(self): + display = self.iwla.getDisplay() + hits = self.iwla.getCurrentVisists() + + # All in a page + if self.create_tracked_page: + title = createCurTitle(self.iwla, u'Tracked users') + filename = 'tracked_users.html' + path = self.iwla.getCurDisplayPath(filename) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Tracked users'), [self.iwla._(u'Page'), self.iwla._(u'Last Access')]) + for ip in self.tracked_ip: + if not ip in hits.keys(): continue + if 'dns_name_replaced' in hits[ip].keys(): + ip_title = '%s [%s]' % (ip, hits[ip][remote_addr]) + else: + ip_title = '%s' % (ip) + table.appendRow([ip_title, '']) + for r in hits[ip]['requests'][::-1]: + uri = r['extract_request']['extract_uri'].lower() + if not self.iwla.isPage(uri) or\ + self.iwla.isMultimediaFile(uri) or\ + not self.iwla.hasBeenViewed(r): + continue + + uri = "%s%s" % (r.get('server_name', ''), + r['extract_request']['extract_uri']) + table.appendRow([generateHTMLLink(uri), time.asctime(r['time_decoded'])]) + page.appendBlock(table) + + display.addPage(page) + + # Last access in index + title = self.iwla._(u'Tracked users') + if self.create_tracked_page: + link = '%s' % (filename, self.iwla._(u'Details')) + title = '%s - %s' % (title, link) + + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'IP'), self.iwla._(u'Last Access')]) + for ip in self.tracked_ip: + if not ip in hits.keys(): continue + if 'dns_name_replaced' in hits[ip].keys(): + ip = '%s [%s]' % (ip, hits[ip][remote_addr]) + table.appendRow([ip, time.asctime(hits[ip]['last_access'])]) + index.appendBlock(table) From 49d21cf4b4f84e6273edbf97aa13fdfcdcd628cc Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 13 Jan 2015 18:57:51 +0100 Subject: [PATCH 156/195] Update .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e03b74e..d4a3073 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *~ *.pyc -*.gz \ No newline at end of file +*.gz +output +output_db From 803dd1392c477e1b8946e1c0ffc89be506ec6d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 13 Jan 2015 18:58:56 +0100 Subject: [PATCH 157/195] Update Chagelog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c102e05..12e18c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ -v0.2 (08/01/2015) +v0.2 (13/01/2015) ** User ** Add referers_diff display plugin Add year statistics in month details Add analysis duration Add browsers detection Add operating systems detection + Add track users plugin ** Dev ** Add istats_diff interface From 4e8a593699e8d086c28bb194a55d7e2e27bcd9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 13 Jan 2015 19:02:12 +0100 Subject: [PATCH 158/195] Update doc and translations --- docs/index.md | 29 +++++++++ docs/modules.md | 29 +++++++++ iwla.pot | 99 +++++++++++++++++----------- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 3390 -> 3665 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 101 ++++++++++++++++++----------- 5 files changed, 183 insertions(+), 75 deletions(-) diff --git a/docs/index.md b/docs/index.md index 357218c..65e6934 100644 --- a/docs/index.md +++ b/docs/index.md @@ -94,6 +94,7 @@ Optional configuration values ends with *. * plugins/display/top_downloads.py * plugins/display/all_visits.py * plugins/display/top_hits.py + * plugins/display/track_users.py * plugins/display/browsers.py * plugins/display/referers.py * plugins/display/operating_systems.py @@ -280,6 +281,34 @@ plugins.display.top_hits None +plugins.display.track_users +--------------------------- + + Display hook + + Track users + + Plugin requirements : + None + + Conf values needed : + tracked_ip + create_tracked_page* + + Output files : + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/tracked_users.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.browsers ------------------------ diff --git a/docs/modules.md b/docs/modules.md index c948786..4fbcd31 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -2,6 +2,7 @@ * plugins/display/top_downloads.py * plugins/display/all_visits.py * plugins/display/top_hits.py + * plugins/display/track_users.py * plugins/display/browsers.py * plugins/display/referers.py * plugins/display/operating_systems.py @@ -188,6 +189,34 @@ plugins.display.top_hits None +plugins.display.track_users +--------------------------- + + Display hook + + Track users + + Plugin requirements : + None + + Conf values needed : + tracked_ip + create_tracked_page* + + Output files : + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/tracked_users.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.browsers ------------------------ diff --git a/iwla.pot b/iwla.pot index 42b3001..849752b 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-01-08 21:05+CET\n" +"POT-Creation-Date: 2015-01-13 18:59+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,11 +35,11 @@ msgstr "" msgid "March" msgstr "" -#: display.py:32 iwla.py:433 +#: display.py:32 iwla.py:442 msgid "June" msgstr "" -#: display.py:32 iwla.py:433 +#: display.py:32 iwla.py:442 msgid "May" msgstr "" @@ -63,128 +63,133 @@ msgstr "" msgid "September" msgstr "" -#: iwla.py:374 +#: display.py:187 +msgid "Ratio" +msgstr "" + +#: iwla.py:383 msgid "Statistics" msgstr "" -#: iwla.py:382 +#: iwla.py:391 msgid "By day" msgstr "" -#: iwla.py:382 +#: iwla.py:391 msgid "Day" msgstr "" -#: iwla.py:382 iwla.py:435 +#: iwla.py:391 iwla.py:444 msgid "Not viewed Bandwidth" msgstr "" -#: iwla.py:382 iwla.py:435 +#: iwla.py:391 iwla.py:444 msgid "Visits" msgstr "" -#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 +#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 msgid "Hits" msgstr "" -#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 +#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_visitors.py:72 msgid "Pages" msgstr "" -#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 +#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "" -#: iwla.py:419 +#: iwla.py:428 msgid "Average" msgstr "" -#: iwla.py:424 iwla.py:469 +#: iwla.py:433 iwla.py:478 msgid "Total" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Apr" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Aug" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Dec" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Feb" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Jan" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Jul" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Mar" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Nov" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Oct" msgstr "" -#: iwla.py:433 +#: iwla.py:442 msgid "Sep" msgstr "" -#: iwla.py:434 +#: iwla.py:443 msgid "Summary" msgstr "" -#: iwla.py:435 +#: iwla.py:444 msgid "Month" msgstr "" -#: iwla.py:435 +#: iwla.py:444 msgid "Visitors" msgstr "" -#: iwla.py:435 iwla.py:447 plugins/display/operating_systems.py:90 +#: iwla.py:444 iwla.py:456 plugins/display/operating_systems.py:90 +#: plugins/display/track_users.py:101 msgid "Details" msgstr "" -#: iwla.py:483 +#: iwla.py:492 msgid "Statistics for" msgstr "" -#: iwla.py:490 +#: iwla.py:499 msgid "Last update" msgstr "" -#: iwla.py:494 +#: iwla.py:503 msgid "Time analysis" msgstr "" -#: iwla.py:496 +#: iwla.py:505 msgid "hours" msgstr "" -#: iwla.py:497 +#: iwla.py:506 msgid "minutes" msgstr "" -#: iwla.py:497 +#: iwla.py:506 msgid "seconds" msgstr "" @@ -208,11 +213,11 @@ msgstr "" msgid "Browsers" msgstr "" -#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +#: plugins/display/browsers.py:79 plugins/display/browsers.py:113 msgid "Browser" msgstr "" -#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +#: plugins/display/browsers.py:79 plugins/display/browsers.py:113 #: plugins/display/operating_systems.py:78 #: plugins/display/operating_systems.py:95 plugins/display/top_hits.py:71 #: plugins/display/top_hits.py:97 plugins/display/top_pages.py:71 @@ -220,7 +225,7 @@ msgstr "" msgid "Entrance" msgstr "" -#: plugins/display/browsers.py:95 plugins/display/browsers.py:121 +#: plugins/display/browsers.py:98 plugins/display/browsers.py:128 #: plugins/display/referers.py:110 plugins/display/referers.py:125 #: plugins/display/referers.py:140 plugins/display/referers.py:163 #: plugins/display/referers.py:174 plugins/display/referers.py:185 @@ -231,7 +236,7 @@ msgstr "" msgid "Others" msgstr "" -#: plugins/display/browsers.py:104 +#: plugins/display/browsers.py:107 msgid "All Browsers" msgstr "" @@ -273,6 +278,10 @@ msgstr "" msgid "All Referers" msgstr "" +#: plugins/display/referers.py:193 +msgid "All Key Phrases" +msgstr "" + #: plugins/display/referers.py:200 msgid "Key phrases" msgstr "" @@ -323,3 +332,19 @@ msgstr "" msgid "Top Pages" msgstr "" +#: plugins/display/track_users.py:76 +msgid "Page" +msgstr "" + +#: plugins/display/track_users.py:76 plugins/display/track_users.py:99 +msgid "Tracked users" +msgstr "" + +#: plugins/display/track_users.py:76 plugins/display/track_users.py:106 +msgid "Last Access" +msgstr "" + +#: plugins/display/track_users.py:106 +msgid "IP" +msgstr "" + diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index 74cd2701d3aa3da56f08b3f76ef704c15727f6a2..21759d03effc811136b4a55e11cd492470fa02ad 100644 GIT binary patch literal 3665 zcmZ{lYm8(?6~{|m0mt>RfZz)#7TIOp?V%fX*V*1(*m*LuyYsMT2KlgR?sV78T(__-*(O_yc$yd=b72{tCVg z{t3$NAAWw{wZ@E~-w59VZ-ZL$4zC}9n3@XYXO7cpoikpaf!b#Q%I;(Eo$wP->vcS@ zK-uMxpLx{lpMvt|bMQv^6{z>V?w^0t>)(Ou} z9_pNbgl~s`^ORFM&wi-+o1peT2o;AzUO(pbDwLlm{rm;U&n$ZVA;{9^5_~so!2>Xd ziqB)7pM~=8aj1R1?D?dB{xsA*ehtc>=b-%jF4Q@G1Qq8Oq4xV7l>IB7|AMl=mQL|K z0F?)~dVLgX-_uav49y>dy3gZK`<#Y4&p9anW}xEKfQrW@sQtTsK7%Z29)-&1Pebkh1eE>L@ICNZ zsC9l0W&aY?d0&S7%s=V0?=>7o_WPmsISBRMAt-;Vo@1Wpp!S=Eq@9^Tw2t1n4N(qG zA$KAR$OYssajzWmJOg!xlgM#DcOF&|<)YesC5khi z@Z(u{%8&1c(|)XYtLdD&lY5X4Agb%dok6uZ=o1gR_arC`I48gAVsJ8xgctUF}Z z3)5nSZeqr}N!T{y`GzD8SrE2UGaY3~5H+2dzM8ot3fgwHaq(4(y(@{=;_Qf-achz!50bv& zl#QW@&3qhj-i0``z0hsBmfZ`&Lfqp)uRPgeGc!o6Q!aLiR~AMacDbKsuJeBrsaZ_I zjW9Bc*`_W;cT{w#Y4BofmR;dM2|FEO>zM3HSWufRXIQ3L*i46pc0J}v-svbGGI2V0RGH!i>h_*$ z?L?(otJLnbwXyn%Q%5JKSFo!zoSb=Gvs3kI?P#@Dt&Zr1D|i{D?Etsxb~(}(MviOrTjgk4e`RP5UYopZ>@;q}9+w{A* zo4Kpm-Q9K&MyG9aGe}aGon2j-sf_K}$sNAF%5>C>TVzJvj;)2+$OA4?s<>8VqF=Y& z{)Wr6*l4$JYojMd9;$c)9b+kWtuSN$f_je=gd z!4A5T-N|gQ-5zYq)eYC-97B&b^>ty$)fMmi8eyBf@T&QutPB~(MMiVsLvwHRa*u-!8=bVX{k)HUpROsapmWQV{bgs2~%eWPnM^oGNmd{>O!iMzU(AeUk{r$qU`o^ zl_X!5IPY#*Vyt2`c!rwLI_$1?+i|E05=Xo9>1!X9MauCvkR?QFs7fsrNf%|RTMgHw zh#`2RJhLrllij(Yq9qr6(Ylhe-mqf3x~#@vJIy;J+Eku!Ia;ZGxU67~yz1JO*Gb&r zLgqbI5_Wg~-gZ*gS2F)4sFbZ{VLMFAkHhkZbR}nhlE9a=!m_AoIJ=3)C-IuH#)JO> Dm!ulA delta 1674 zcmYk6OGs5w6o!}iygo~NsA-yJmZ@FMcV$+Z3XwR7Xp#g;gNg#dpn^+54=a>7I1`F8 zD3CzJK*$``Bq+ifNGai00S;&kVHmnon zp<~O;j>54xIxL)EmI|w28f=D1a6b&egZ{n;X5gQM$?yV(+RDj2jW;1l@@Hy0iZ=G{c^X4H7*+=)kLM8kYu7q*C)OR^h^Yh)`2;+!v zWzh$-t^T40(yYP#7N}yhIy<3ucmSrr!%!ROb^kO}!1GW$kGOx?{Q;=NhBQum8|6Wn zJ0l-LN=`+HCU9y-V2sTi{mi!~?K~f9VyQC>Y1T-m#M+?dABLKD1S+xPK7Il!!81PI50%(C_b<7B1!|qa2oE$1 z=v4CCP#KQF)o>bW;v452RKNxI7om3i$;W>{CHC9>SQb?RiBJ{IfZ4Fr$0IE~=xg9;kqQK7JO`>>`~m@$pBQb@drh42(0 z1L}h;sEqTSCC&<{K(&y&Wc*LrR)lL+NY=3gYlO{6mv@Vg3A%jRq^u3C)$dup;SNOkZ$6X(Z?h9Z3o|6joO?g_#m6_~+D5 eybm3WndnT3j|sX{yMu|;n|#ro_9Q4yulx%Y\n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -37,11 +37,11 @@ msgstr "Juillet" msgid "March" msgstr "Mars" -#: display.py:32 iwla.py:433 +#: display.py:32 iwla.py:442 msgid "June" msgstr "Juin" -#: display.py:32 iwla.py:433 +#: display.py:32 iwla.py:442 msgid "May" msgstr "Mai" @@ -65,128 +65,133 @@ msgstr "Octobre" msgid "September" msgstr "Septembre" -#: iwla.py:374 +#: display.py:187 +msgid "Ratio" +msgstr "Pourcentage" + +#: iwla.py:383 msgid "Statistics" msgstr "Statistiques" -#: iwla.py:382 +#: iwla.py:391 msgid "By day" msgstr "Par jour" -#: iwla.py:382 +#: iwla.py:391 msgid "Day" msgstr "Jour" -#: iwla.py:382 iwla.py:435 +#: iwla.py:391 iwla.py:444 msgid "Not viewed Bandwidth" msgstr "Traffic non vu" -#: iwla.py:382 iwla.py:435 +#: iwla.py:391 iwla.py:444 msgid "Visits" msgstr "Visites" -#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 +#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 msgid "Hits" msgstr "Hits" -#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 +#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 #: plugins/display/referers.py:95 plugins/display/referers.py:153 #: plugins/display/top_visitors.py:72 msgid "Pages" msgstr "Pages" -#: iwla.py:382 iwla.py:435 plugins/display/all_visits.py:70 +#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "Bande passante" -#: iwla.py:419 +#: iwla.py:428 msgid "Average" msgstr "Moyenne" -#: iwla.py:424 iwla.py:469 +#: iwla.py:433 iwla.py:478 msgid "Total" msgstr "Total" -#: iwla.py:433 +#: iwla.py:442 msgid "Apr" msgstr "Avr" -#: iwla.py:433 +#: iwla.py:442 msgid "Aug" msgstr "Août" -#: iwla.py:433 +#: iwla.py:442 msgid "Dec" msgstr "Déc" -#: iwla.py:433 +#: iwla.py:442 msgid "Feb" msgstr "Fév" -#: iwla.py:433 +#: iwla.py:442 msgid "Jan" msgstr "Jan" -#: iwla.py:433 +#: iwla.py:442 msgid "Jul" msgstr "Jui" -#: iwla.py:433 +#: iwla.py:442 msgid "Mar" msgstr "Mars" -#: iwla.py:433 +#: iwla.py:442 msgid "Nov" msgstr "Nov" -#: iwla.py:433 +#: iwla.py:442 msgid "Oct" msgstr "Oct" -#: iwla.py:433 +#: iwla.py:442 msgid "Sep" msgstr "Sep" -#: iwla.py:434 +#: iwla.py:443 msgid "Summary" msgstr "Résumé" -#: iwla.py:435 +#: iwla.py:444 msgid "Month" msgstr "Mois" -#: iwla.py:435 +#: iwla.py:444 msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:435 iwla.py:447 plugins/display/operating_systems.py:90 +#: iwla.py:444 iwla.py:456 plugins/display/operating_systems.py:90 +#: plugins/display/track_users.py:101 msgid "Details" msgstr "Détails" -#: iwla.py:483 +#: iwla.py:492 msgid "Statistics for" msgstr "Statistiques pour" -#: iwla.py:490 +#: iwla.py:499 msgid "Last update" msgstr "Dernière mise à jour" -#: iwla.py:494 +#: iwla.py:503 msgid "Time analysis" msgstr "Durée de l'analyse" -#: iwla.py:496 +#: iwla.py:505 msgid "hours" msgstr "heures " -#: iwla.py:497 +#: iwla.py:506 msgid "minutes" msgstr "minutes" -#: iwla.py:497 +#: iwla.py:506 msgid "seconds" msgstr "secondes" @@ -210,11 +215,11 @@ msgstr "Top visiteurs" msgid "Browsers" msgstr "Navigateurs" -#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +#: plugins/display/browsers.py:79 plugins/display/browsers.py:113 msgid "Browser" msgstr "Navigateur" -#: plugins/display/browsers.py:79 plugins/display/browsers.py:110 +#: plugins/display/browsers.py:79 plugins/display/browsers.py:113 #: plugins/display/operating_systems.py:78 #: plugins/display/operating_systems.py:95 plugins/display/top_hits.py:71 #: plugins/display/top_hits.py:97 plugins/display/top_pages.py:71 @@ -222,7 +227,7 @@ msgstr "Navigateur" msgid "Entrance" msgstr "Entrées" -#: plugins/display/browsers.py:95 plugins/display/browsers.py:121 +#: plugins/display/browsers.py:98 plugins/display/browsers.py:128 #: plugins/display/referers.py:110 plugins/display/referers.py:125 #: plugins/display/referers.py:140 plugins/display/referers.py:163 #: plugins/display/referers.py:174 plugins/display/referers.py:185 @@ -233,7 +238,7 @@ msgstr "Entrées" msgid "Others" msgstr "Autres" -#: plugins/display/browsers.py:104 +#: plugins/display/browsers.py:107 msgid "All Browsers" msgstr "Tous les navigateurs" @@ -275,6 +280,10 @@ msgstr "Top Origines" msgid "All Referers" msgstr "Toutes les origines" +#: plugins/display/referers.py:193 +msgid "All Key Phrases" +msgstr "Toutes les phrases clé" + #: plugins/display/referers.py:200 msgid "Key phrases" msgstr "Phrases clé" @@ -325,5 +334,21 @@ msgstr "Toutes les pages" msgid "Top Pages" msgstr "Top Pages" +#: plugins/display/track_users.py:76 +msgid "Page" +msgstr "Page" + +#: plugins/display/track_users.py:76 plugins/display/track_users.py:99 +msgid "Tracked users" +msgstr "Utilisateurs traqués" + +#: plugins/display/track_users.py:76 plugins/display/track_users.py:106 +msgid "Last Access" +msgstr "Dernière visite" + +#: plugins/display/track_users.py:106 +msgid "IP" +msgstr "IP" + #~ msgid "Key Phrases" #~ msgstr "Phrases clé" From e67723e58ed9f4a3cc478a7218cf29db71df36ad Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 14 Jan 2015 20:19:19 +0100 Subject: [PATCH 159/195] Fix some bugs in track_users --- plugins/display/track_users.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/display/track_users.py b/plugins/display/track_users.py index 8a27fa8..d0fe2f1 100644 --- a/plugins/display/track_users.py +++ b/plugins/display/track_users.py @@ -77,7 +77,7 @@ class IWLADisplayTrackUsers(IPlugin): for ip in self.tracked_ip: if not ip in hits.keys(): continue if 'dns_name_replaced' in hits[ip].keys(): - ip_title = '%s [%s]' % (ip, hits[ip][remote_addr]) + ip_title = '%s [%s]' % (hits[ip]['remote_addr'], ip) else: ip_title = '%s' % (ip) table.appendRow([ip_title, '']) @@ -107,6 +107,8 @@ class IWLADisplayTrackUsers(IPlugin): for ip in self.tracked_ip: if not ip in hits.keys(): continue if 'dns_name_replaced' in hits[ip].keys(): - ip = '%s [%s]' % (ip, hits[ip][remote_addr]) - table.appendRow([ip, time.asctime(hits[ip]['last_access'])]) + ip_title = '%s [%s]' % (hits[ip]['remote_addr'], ip) + else: + ip_title = ip + table.appendRow([ip_title, time.asctime(hits[ip]['last_access'])]) index.appendBlock(table) From f3fbf8b727e6aa34136be676259f725daf433d92 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sat, 7 Feb 2015 15:28:24 +0100 Subject: [PATCH 160/195] Add pages and hits to track_users --- plugins/display/track_users.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/display/track_users.py b/plugins/display/track_users.py index d0fe2f1..a20e0ad 100644 --- a/plugins/display/track_users.py +++ b/plugins/display/track_users.py @@ -65,6 +65,7 @@ class IWLADisplayTrackUsers(IPlugin): def hook(self): display = self.iwla.getDisplay() hits = self.iwla.getCurrentVisists() + stats = {} # All in a page if self.create_tracked_page: @@ -81,16 +82,21 @@ class IWLADisplayTrackUsers(IPlugin): else: ip_title = '%s' % (ip) table.appendRow([ip_title, '']) + nb_hits = 0 + nb_pages = 0 for r in hits[ip]['requests'][::-1]: uri = r['extract_request']['extract_uri'].lower() + if not self.iwla.hasBeenViewed(r): continue if not self.iwla.isPage(uri) or\ - self.iwla.isMultimediaFile(uri) or\ - not self.iwla.hasBeenViewed(r): + self.iwla.isMultimediaFile(uri): + nb_hits += 1 continue + nb_pages += 1 uri = "%s%s" % (r.get('server_name', ''), r['extract_request']['extract_uri']) table.appendRow([generateHTMLLink(uri), time.asctime(r['time_decoded'])]) + stats[ip] = (nb_pages, nb_hits) page.appendBlock(table) display.addPage(page) @@ -103,12 +109,12 @@ class IWLADisplayTrackUsers(IPlugin): index = self.iwla.getDisplayIndex() - table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'IP'), self.iwla._(u'Last Access')]) + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'IP'), self.iwla._(u'Last Access'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) for ip in self.tracked_ip: if not ip in hits.keys(): continue if 'dns_name_replaced' in hits[ip].keys(): ip_title = '%s [%s]' % (hits[ip]['remote_addr'], ip) else: ip_title = ip - table.appendRow([ip_title, time.asctime(hits[ip]['last_access'])]) + table.appendRow([ip_title, time.asctime(hits[ip]['last_access']), stats[ip][0], stats[ip][1]]) index.appendBlock(table) From bcdb68b0d410dab5add4128b04150af27f03f45e Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 8 Feb 2015 10:07:50 +0100 Subject: [PATCH 161/195] Bad indentation in browsers display plugin --- plugins/display/browsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py index e82641a..52d4f13 100644 --- a/plugins/display/browsers.py +++ b/plugins/display/browsers.py @@ -88,7 +88,7 @@ class IWLADisplayBrowsers(IPlugin): icon = '' % (self.icon_path) else: icon = '' % (self.icon_path) - browser = 'Unknown' + browser = 'Unknown' table.appendRow([icon, browser, entrance]) total_browsers[2] += entrance if self.max_browsers: From e0f9260802db8835239efaa73b72f75118a79937 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Tue, 17 Feb 2015 19:11:04 +0100 Subject: [PATCH 162/195] Add Feeds plugin --- iplugin.py | 2 +- plugins/display/feeds.py | 99 ++++++++++++++++++++++++++ plugins/post_analysis/feeds.py | 81 +++++++++++++++++++++ plugins/post_analysis/top_downloads.py | 2 - 4 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 plugins/display/feeds.py create mode 100644 plugins/post_analysis/feeds.py diff --git a/iplugin.py b/iplugin.py index 2664190..7f57135 100644 --- a/iplugin.py +++ b/iplugin.py @@ -103,7 +103,7 @@ def preloadPlugins(plugins, iwla): requirement_validated = False for r in requirements: - for (_,p) in cache_plugins.items(): + for p in cache_plugins.values(): if p.__class__.__name__ == r: requirement_validated = True break diff --git a/plugins/display/feeds.py b/plugins/display/feeds.py new file mode 100644 index 0000000..3466fd9 --- /dev/null +++ b/plugins/display/feeds.py @@ -0,0 +1,99 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +import awstats_data + +""" +Display hook + +Display feeds parsers + +Plugin requirements : + None + +Conf values needed : + create_all_feeds_page* + +Output files : + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/all_feeds.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayFeeds(IPlugin): + def __init__(self, iwla): + super(IWLADisplayFeeds, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisFeeds'] + + def load(self): + self.create_all_feeds_page = self.iwla.getConfValue('create_all_feeds_page', True) + + return True + + def hook(self): + display = self.iwla.getDisplay() + hits = self.iwla.getCurrentVisists() + nb_feeds_parsers = 0 + + # All in a page + if self.create_all_feeds_page: + title = createCurTitle(self.iwla, u'All Feeds parsers') + filename = 'all_feeds.html' + path = self.iwla.getCurDisplayPath(filename) + display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) + + page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All feeds parsers'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + for super_hit in hits.values(): + if not super_hit['feed_parser']: continue + nb_feeds_parsers += 1 + address = super_hit['remote_addr'] + if display_visitor_ip and\ + super_hit.get('dns_name_replaced', False): + address = '%s [%s]' % (address, super_hit['remote_ip']) + table.appendRow([address, super_hit['viewed_pages'], super_hit['viewed_hits']]) + page.appendBlock(table) + + display.addPage(page) + + # Found in index + title = self.iwla._(u'Feeds parsers') + if self.create_all_feeds_page: + link = '%s' % (filename, self.iwla._(u'Details')) + title = '%s - %s' % (title, link) + + index = self.iwla.getDisplayIndex() + + table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Found')]) + table.appendRow([nb_feeds_parsers]) + index.appendBlock(table) diff --git a/plugins/post_analysis/feeds.py b/plugins/post_analysis/feeds.py new file mode 100644 index 0000000..96884d8 --- /dev/null +++ b/plugins/post_analysis/feeds.py @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +import re + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + +Plugin requirements : + None + +Conf values needed : + feeds + +Output files : + None + +Statistics creation : + remote_addr => + feed_parser + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLAPostAnalysisFeeds(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisFeeds, self).__init__(iwla) + self.API_VERSION = 1 + + def load(self): + feeds = self.iwla.getConfValue('feeds', None) + + if feeds is None: return False + + self.feeds_re = [] + for f in feeds: + self.feeds_re.append(re.compile(r'.*%s.*' % (f))) + + return True + + def hook(self): + hits = self.iwla.getCurrentVisists() + for hit in hits.values(): + if not hit.get('feed_parser', None) is None: continue + isFeedParser = False + uri = hit['requests'][0]['extract_request']['extract_uri'].lower() + for regexp in self.feeds_re: + if regexp.match(uri): + # Robot that views pages -> bot + if hit['robot']: + if hit['viewed_pages']: continue + isFeedParser = True + break + hit['feed_parser'] = isFeedParser + diff --git a/plugins/post_analysis/top_downloads.py b/plugins/post_analysis/top_downloads.py index 2f5c136..3d82e55 100644 --- a/plugins/post_analysis/top_downloads.py +++ b/plugins/post_analysis/top_downloads.py @@ -18,8 +18,6 @@ # along with iwla. If not, see . # -import re - from iwla import IWLA from iplugin import IPlugin From efb5ddf7617130842001bcefc9762a395d806508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 17 Feb 2015 19:33:21 +0100 Subject: [PATCH 163/195] Update doc & locales --- docs/index.md | 56 +++++++++++++++++++++++++++++ docs/modules.md | 56 +++++++++++++++++++++++++++++ iwla.pot | 39 +++++++++++++------- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 3665 -> 3802 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 41 ++++++++++++++------- 5 files changed, 167 insertions(+), 25 deletions(-) diff --git a/docs/index.md b/docs/index.md index 65e6934..941675c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -95,6 +95,7 @@ Optional configuration values ends with *. * plugins/display/all_visits.py * plugins/display/top_hits.py * plugins/display/track_users.py + * plugins/display/feeds.py * plugins/display/browsers.py * plugins/display/referers.py * plugins/display/operating_systems.py @@ -103,6 +104,7 @@ Optional configuration values ends with *. * plugins/display/top_pages.py * plugins/post_analysis/top_downloads.py * plugins/post_analysis/top_hits.py + * plugins/post_analysis/feeds.py * plugins/post_analysis/browsers.py * plugins/post_analysis/referers.py * plugins/post_analysis/operating_systems.py @@ -309,6 +311,33 @@ plugins.display.track_users None +plugins.display.feeds +--------------------- + + Display hook + + Display feeds parsers + + Plugin requirements : + None + + Conf values needed : + create_all_feeds_page* + + Output files : + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/all_feeds.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.browsers ------------------------ @@ -530,6 +559,33 @@ plugins.post_analysis.top_hits None +plugins.post_analysis.feeds +--------------------------- + + Post analysis hook + + Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + + Plugin requirements : + None + + Conf values needed : + feeds + + Output files : + None + + Statistics creation : + remote_addr => + feed_parser + + Statistics update : + None + + Statistics deletion : + None + + plugins.post_analysis.browsers ------------------------------ diff --git a/docs/modules.md b/docs/modules.md index 4fbcd31..44d4d52 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -3,6 +3,7 @@ * plugins/display/all_visits.py * plugins/display/top_hits.py * plugins/display/track_users.py + * plugins/display/feeds.py * plugins/display/browsers.py * plugins/display/referers.py * plugins/display/operating_systems.py @@ -11,6 +12,7 @@ * plugins/display/top_pages.py * plugins/post_analysis/top_downloads.py * plugins/post_analysis/top_hits.py + * plugins/post_analysis/feeds.py * plugins/post_analysis/browsers.py * plugins/post_analysis/referers.py * plugins/post_analysis/operating_systems.py @@ -217,6 +219,33 @@ plugins.display.track_users None +plugins.display.feeds +--------------------- + + Display hook + + Display feeds parsers + + Plugin requirements : + None + + Conf values needed : + create_all_feeds_page* + + Output files : + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/all_feeds.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + plugins.display.browsers ------------------------ @@ -438,6 +467,33 @@ plugins.post_analysis.top_hits None +plugins.post_analysis.feeds +--------------------------- + + Post analysis hook + + Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + + Plugin requirements : + None + + Conf values needed : + feeds + + Output files : + None + + Statistics creation : + remote_addr => + feed_parser + + Statistics update : + None + + Statistics deletion : + None + + plugins.post_analysis.browsers ------------------------------ diff --git a/iwla.pot b/iwla.pot index 849752b..fb23cd8 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-01-13 18:59+CET\n" +"POT-Creation-Date: 2015-02-17 19:31+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -88,14 +88,16 @@ msgid "Visits" msgstr "" #: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/referers.py:95 plugins/display/referers.py:153 -#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 +#: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 msgid "Hits" msgstr "" #: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/referers.py:95 plugins/display/referers.py:153 -#: plugins/display/top_visitors.py:72 +#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 +#: plugins/display/track_users.py:112 msgid "Pages" msgstr "" @@ -164,8 +166,8 @@ msgstr "" msgid "Visitors" msgstr "" -#: iwla.py:444 iwla.py:456 plugins/display/operating_systems.py:90 -#: plugins/display/track_users.py:101 +#: iwla.py:444 iwla.py:456 plugins/display/feeds.py:92 +#: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 msgid "Details" msgstr "" @@ -193,7 +195,8 @@ msgstr "" msgid "seconds" msgstr "" -#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +#: plugins/display/all_visits.py:70 plugins/display/feeds.py:76 +#: plugins/display/top_visitors.py:72 msgid "Host" msgstr "" @@ -240,6 +243,18 @@ msgstr "" msgid "All Browsers" msgstr "" +#: plugins/display/feeds.py:76 +msgid "All feeds parsers" +msgstr "" + +#: plugins/display/feeds.py:90 +msgid "Feeds parsers" +msgstr "" + +#: plugins/display/feeds.py:97 +msgid "Found" +msgstr "" + #: plugins/display/operating_systems.py:78 #: plugins/display/operating_systems.py:88 msgid "Operating Systems" @@ -332,19 +347,19 @@ msgstr "" msgid "Top Pages" msgstr "" -#: plugins/display/track_users.py:76 +#: plugins/display/track_users.py:77 msgid "Page" msgstr "" -#: plugins/display/track_users.py:76 plugins/display/track_users.py:99 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:105 msgid "Tracked users" msgstr "" -#: plugins/display/track_users.py:76 plugins/display/track_users.py:106 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:112 msgid "Last Access" msgstr "" -#: plugins/display/track_users.py:106 +#: plugins/display/track_users.py:112 msgid "IP" msgstr "" diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index 21759d03effc811136b4a55e11cd492470fa02ad..bfbe86013311fa4451bec7daaf447166a36ce335 100644 GIT binary patch literal 3802 zcmai#Ym6jS6~`~K2+pEB4Xx9}?X3e>uP`SJfio$C@7%dcyo#;=FFp!M7X35~hUk5?c| zP1Wm%pynU(oPs*{QMen{JRg8M-)XOBQ1(6nW&dHXKjQVzLHYft@85#_%oAS!A(S6a z!pq^$pyK~)sCd2X`9~=K{sv{|AD*xJ@m)BjIP8Y<=Q=1qZ{VeK?1hT^IF!9fsQL4r z_d|Zh@lw2FsQftV_0K}t{W8?LuR+;)0^)-CE|kAdLd|;y%FZu5pNH)WjCm0%9Cu0cHPMsB_;46^BvC zQgaB(?^!5&i%{`>(6a$?)r3&pu+sPjAr<=^vAar-?~d|rmK|4-ll zZz%sS#tG&5RZ#YChMK=0>b|F;_W20Z{5sTmJCH5RC!y?q9%}w$PpE-iPRJ?m?70dS(%QugVqW zksd;CK3KGjxgCxpClJ+xcOiR_3FJe_&4?c5fbPvqwpw;7i8oT0q=hmQZ$zy)Xq4Kq zFe@APx}IHLPlD8y`f||pt(seN$@c0s=NhT)1j%5(Gc4>3E$oJAv1cbSlbs}NnaR8< z$;V8$r)Z$5G@q!#J{QN!&Iwbj`TB#I;Ykghm#G zt<=m$SrSBbXJ$7umqbC!o~)fXPqDWo@u@hw)y%n5k|Yn39*yC1%*A=sFvLQVnqx7( z&M%weK_n>_9M4+@>G6u3QMAfK4>ePBB1khkS+Bd)w^Qe$vN!KEg3OtPAd%G9dH2jh z91(-XIJ4c*ZMcTr3Cv>LWuRN0cB!5jB-Y87I>aywqo!TyrI~BLt|K)|N!Sb{vy`pt z+H{k}D>XG1#%9G84wSI75px}#9SIxC$V$e{Gz;tLP}8o(jO6XM0=OEsoecgsVsDlaGTX;;rG^Nq@VoSD3tu;E547+GFgtxP9Q=Z-2f+`xn#AFCdyjEz^S zciQTqiQB9Dre{}~SE)HU^G4Ig_l;G@#zu6*6}*hnR)AX*b|ucUpwZv5hts0v?rFBk z%+Y$>zMI)mGbj9&RTs3qN85c9WcGt|wULGSh1ngatD|EhP^^Aujw*vHrnag z>ga)y4_EvI9b-9mjWDDCj?wBEL#1BfbV=P!mu4qyX_vdoQ`>T>je>62#DcD5(3$nO zTKz4#+H`HsF*LNUuZxLXU9sNR4O?fydHqH48JZXu8O?MPNO4Z-$nmJxc$hSCo-bs@|ZN?SH*IIz=p1CDSXUkf{hH!P;6_ zw-Hslo2z>H3PunH6^yp(R{tF3qp{a*c3N?$ViQM${`9p2Wj%BJi)0Dm8!BkaMSez^ zN?gs=sdot8C?##f*<{c+RNv%+uWt|K>^H2~j&88l-%9f~VV=p!G8}cbwYMyGjuh!!^%)tbFZk|2uAHxi5PDqfym6nT4$|Ex#kn|Jg%1_Q?!i{fe1I`NP?DG`^nK IR6qv)3+;PBJ^%m! literal 3665 zcmZ{lYm8(?6~{|m0mt>RfZz)#7TIOp?V%fX*V*1(*m*LuyYsMT2KlgR?sV78T(__-*(O_yc$yd=b72{tCVg z{t3$NAAWw{wZ@E~-w59VZ-ZL$4zC}9n3@XYXO7cpoikpaf!b#Q%I;(Eo$wP->vcS@ zK-uMxpLx{lpMvt|bMQv^6{z>V?w^0t>)(Ou} z9_pNbgl~s`^ORFM&wi-+o1peT2o;AzUO(pbDwLlm{rm;U&n$ZVA;{9^5_~so!2>Xd ziqB)7pM~=8aj1R1?D?dB{xsA*ehtc>=b-%jF4Q@G1Qq8Oq4xV7l>IB7|AMl=mQL|K z0F?)~dVLgX-_uav49y>dy3gZK`<#Y4&p9anW}xEKfQrW@sQtTsK7%Z29)-&1Pebkh1eE>L@ICNZ zsC9l0W&aY?d0&S7%s=V0?=>7o_WPmsISBRMAt-;Vo@1Wpp!S=Eq@9^Tw2t1n4N(qG zA$KAR$OYssajzWmJOg!xlgM#DcOF&|<)YesC5khi z@Z(u{%8&1c(|)XYtLdD&lY5X4Agb%dok6uZ=o1gR_arC`I48gAVsJ8xgctUF}Z z3)5nSZeqr}N!T{y`GzD8SrE2UGaY3~5H+2dzM8ot3fgwHaq(4(y(@{=;_Qf-achz!50bv& zl#QW@&3qhj-i0``z0hsBmfZ`&Lfqp)uRPgeGc!o6Q!aLiR~AMacDbKsuJeBrsaZ_I zjW9Bc*`_W;cT{w#Y4BofmR;dM2|FEO>zM3HSWufRXIQ3L*i46pc0J}v-svbGGI2V0RGH!i>h_*$ z?L?(otJLnbwXyn%Q%5JKSFo!zoSb=Gvs3kI?P#@Dt&Zr1D|i{D?Etsxb~(}(MviOrTjgk4e`RP5UYopZ>@;q}9+w{A* zo4Kpm-Q9K&MyG9aGe}aGon2j-sf_K}$sNAF%5>C>TVzJvj;)2+$OA4?s<>8VqF=Y& z{)Wr6*l4$JYojMd9;$c)9b+kWtuSN$f_je=gd z!4A5T-N|gQ-5zYq)eYC-97B&b^>ty$)fMmi8eyBf@T&QutPB~(MMiVsLvwHRa*u-!8=bVX{k)HUpROsapmWQV{bgs2~%eWPnM^oGNmd{>O!iMzU(AeUk{r$qU`o^ zl_X!5IPY#*Vyt2`c!rwLI_$1?+i|E05=Xo9>1!X9MauCvkR?QFs7fsrNf%|RTMgHw zh#`2RJhLrllij(Yq9qr6(Ylhe-mqf3x~#@vJIy;J+Eku!Ia;ZGxU67~yz1JO*Gb&r zLgqbI5_Wg~-gZ*gS2F)4sFbZ{VLMFAkHhkZbR}nhlE9a=!m_AoIJ=3)C-IuH#)JO> Dm!ulA diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot index 3fd53cb..d2ef0c9 100644 --- a/locales/fr_FR/LC_MESSAGES/iwla.pot +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: iwla\n" -"POT-Creation-Date: 2015-01-13 18:59+CET\n" -"PO-Revision-Date: 2015-01-13 19:01+0100\n" +"POT-Creation-Date: 2015-02-17 19:31+CET\n" +"PO-Revision-Date: 2015-02-17 19:32+0100\n" "Last-Translator: Soutadé \n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -90,14 +90,16 @@ msgid "Visits" msgstr "Visites" #: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/referers.py:95 plugins/display/referers.py:153 -#: plugins/display/top_downloads.py:97 plugins/display/top_visitors.py:72 +#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 +#: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 msgid "Hits" msgstr "Hits" #: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/referers.py:95 plugins/display/referers.py:153 -#: plugins/display/top_visitors.py:72 +#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 +#: plugins/display/track_users.py:112 msgid "Pages" msgstr "Pages" @@ -166,8 +168,8 @@ msgstr "Mois" msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:444 iwla.py:456 plugins/display/operating_systems.py:90 -#: plugins/display/track_users.py:101 +#: iwla.py:444 iwla.py:456 plugins/display/feeds.py:92 +#: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 msgid "Details" msgstr "Détails" @@ -195,7 +197,8 @@ msgstr "minutes" msgid "seconds" msgstr "secondes" -#: plugins/display/all_visits.py:70 plugins/display/top_visitors.py:72 +#: plugins/display/all_visits.py:70 plugins/display/feeds.py:76 +#: plugins/display/top_visitors.py:72 msgid "Host" msgstr "Hôte" @@ -242,6 +245,18 @@ msgstr "Autres" msgid "All Browsers" msgstr "Tous les navigateurs" +#: plugins/display/feeds.py:76 +msgid "All feeds parsers" +msgstr "Tous les agrégateurs" + +#: plugins/display/feeds.py:90 +msgid "Feeds parsers" +msgstr "Agrégateurs" + +#: plugins/display/feeds.py:97 +msgid "Found" +msgstr "Trouvé" + #: plugins/display/operating_systems.py:78 #: plugins/display/operating_systems.py:88 msgid "Operating Systems" @@ -334,19 +349,19 @@ msgstr "Toutes les pages" msgid "Top Pages" msgstr "Top Pages" -#: plugins/display/track_users.py:76 +#: plugins/display/track_users.py:77 msgid "Page" msgstr "Page" -#: plugins/display/track_users.py:76 plugins/display/track_users.py:99 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:105 msgid "Tracked users" msgstr "Utilisateurs traqués" -#: plugins/display/track_users.py:76 plugins/display/track_users.py:106 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:112 msgid "Last Access" msgstr "Dernière visite" -#: plugins/display/track_users.py:106 +#: plugins/display/track_users.py:112 msgid "IP" msgstr "IP" From cfbd35d818bd495076ce11b416dd84bbb2396803 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 18 Feb 2015 20:32:04 +0100 Subject: [PATCH 164/195] Merge one hit only parsers in feeds parsers detection --- plugins/display/feeds.py | 7 +++++-- plugins/post_analysis/feeds.py | 28 +++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/plugins/display/feeds.py b/plugins/display/feeds.py index 3466fd9..9e65c17 100644 --- a/plugins/display/feeds.py +++ b/plugins/display/feeds.py @@ -67,7 +67,7 @@ class IWLADisplayFeeds(IPlugin): # All in a page if self.create_all_feeds_page: - title = createCurTitle(self.iwla, u'All Feeds parsers') + title = createCurTitle(self.iwla, self.iwla._(u'All Feeds parsers')) filename = 'all_feeds.html' path = self.iwla.getCurDisplayPath(filename) display_visitor_ip = self.iwla.getConfValue('display_visitor_ip', False) @@ -81,7 +81,10 @@ class IWLADisplayFeeds(IPlugin): if display_visitor_ip and\ super_hit.get('dns_name_replaced', False): address = '%s [%s]' % (address, super_hit['remote_ip']) - table.appendRow([address, super_hit['viewed_pages'], super_hit['viewed_hits']]) + if super_hit['robot']: + table.appendRow([address, super_hit['not_viewed_pages'], super_hit['not_viewed_hits']]) + else: + table.appendRow([address, super_hit['viewed_pages'], super_hit['viewed_hits']]) page.appendBlock(table) display.addPage(page) diff --git a/plugins/post_analysis/feeds.py b/plugins/post_analysis/feeds.py index 96884d8..2d4987c 100644 --- a/plugins/post_analysis/feeds.py +++ b/plugins/post_analysis/feeds.py @@ -27,6 +27,8 @@ from iplugin import IPlugin Post analysis hook Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) +If there is ony one hit per day to a feed, merge feeds parsers with the same user agent +as it must be the same person with a different IP address. Plugin requirements : None @@ -64,18 +66,34 @@ class IWLAPostAnalysisFeeds(IPlugin): return True + def mergeOneHitOnlyFeedsParsers(self, isFeedParser, one_hit_only, hit): + if isFeedParser and (hit['viewed_hits'] + hit['not_viewed_hits']) == 1: + user_agent = hit['requests'][0]['http_user_agent'].lower() + if one_hit_only.get(user_agent, None) is None: + one_hit_only[user_agent] = (hit) + else: + isFeedParser = False + hit['feed_parser'] = isFeedParser + def hook(self): hits = self.iwla.getCurrentVisists() + one_hit_only = {} for hit in hits.values(): - if not hit.get('feed_parser', None) is None: continue + isFeedParser = hit.get('feed_parser', None) + + if isFeedParser == True: + self.mergeOneHitOnlyFeedsParsers(one_hit_only, hit) + + if not isFeedParser is None: continue + isFeedParser = False uri = hit['requests'][0]['extract_request']['extract_uri'].lower() for regexp in self.feeds_re: if regexp.match(uri): + isFeedParser = True # Robot that views pages -> bot if hit['robot']: - if hit['viewed_pages']: continue - isFeedParser = True + if hit['viewed_pages']: + isFeedParser = False break - hit['feed_parser'] = isFeedParser - + self.mergeOneHitOnlyFeedsParsers(isFeedParser, one_hit_only, hit) From f5b0c35bad6ad6f32808d2bdfbea85ce66fd1471 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 18 Feb 2015 20:56:03 +0100 Subject: [PATCH 165/195] Add a star for merged feeds parsers --- plugins/display/feeds.py | 8 +++++--- plugins/post_analysis/feeds.py | 25 +++++++++++++++++++------ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/plugins/display/feeds.py b/plugins/display/feeds.py index 9e65c17..5132094 100644 --- a/plugins/display/feeds.py +++ b/plugins/display/feeds.py @@ -21,8 +21,7 @@ from iwla import IWLA from iplugin import IPlugin from display import * - -import awstats_data +from plugins.post_analysis.feeds import IWLAPostAnalysisFeeds """ Display hook @@ -81,12 +80,15 @@ class IWLADisplayFeeds(IPlugin): if display_visitor_ip and\ super_hit.get('dns_name_replaced', False): address = '%s [%s]' % (address, super_hit['remote_ip']) + if super_hit['feed_parser'] == IWLAPostAnalysisFeeds.MERGED_FEED_PARSER: + address += '*' if super_hit['robot']: table.appendRow([address, super_hit['not_viewed_pages'], super_hit['not_viewed_hits']]) else: table.appendRow([address, super_hit['viewed_pages'], super_hit['viewed_hits']]) page.appendBlock(table) - + note = DisplayHTMLRaw(self.iwla, ('*%s' % (self.iwla._('Merged feeds parsers')))) + page.appendBlock(note) display.addPage(page) # Found in index diff --git a/plugins/post_analysis/feeds.py b/plugins/post_analysis/feeds.py index 2d4987c..36e7847 100644 --- a/plugins/post_analysis/feeds.py +++ b/plugins/post_analysis/feeds.py @@ -35,6 +35,7 @@ Plugin requirements : Conf values needed : feeds + merge_one_hit_only_feeds_parsers* Output files : None @@ -51,12 +52,18 @@ Statistics deletion : """ class IWLAPostAnalysisFeeds(IPlugin): + NOT_A_FEED_PARSER = 0 + FEED_PARSER = 1 + MERGED_FEED_PARSER = 2 + def __init__(self, iwla): super(IWLAPostAnalysisFeeds, self).__init__(iwla) self.API_VERSION = 1 + self.conf_requires = ['feeds'] def load(self): feeds = self.iwla.getConfValue('feeds', None) + self.merge_one_hit_only_feeds_parsers = self.iwla.getConfValue('merge_one_hit_only_feeds_parsers', True) if feeds is None: return False @@ -70,9 +77,11 @@ class IWLAPostAnalysisFeeds(IPlugin): if isFeedParser and (hit['viewed_hits'] + hit['not_viewed_hits']) == 1: user_agent = hit['requests'][0]['http_user_agent'].lower() if one_hit_only.get(user_agent, None) is None: + # Merged + isFeedParser = self.MERGED_FEED_PARSER one_hit_only[user_agent] = (hit) else: - isFeedParser = False + isFeedParser = self.NOT_A_FEED_PARSER hit['feed_parser'] = isFeedParser def hook(self): @@ -81,19 +90,23 @@ class IWLAPostAnalysisFeeds(IPlugin): for hit in hits.values(): isFeedParser = hit.get('feed_parser', None) - if isFeedParser == True: + if isFeedParser == self.FEED_PARSER and\ + self.merge_one_hit_only_feeds_parsers: self.mergeOneHitOnlyFeedsParsers(one_hit_only, hit) if not isFeedParser is None: continue - isFeedParser = False + isFeedParser = self.NOT_A_FEED_PARSER uri = hit['requests'][0]['extract_request']['extract_uri'].lower() for regexp in self.feeds_re: if regexp.match(uri): - isFeedParser = True + isFeedParser = self.FEED_PARSER # Robot that views pages -> bot if hit['robot']: if hit['viewed_pages']: - isFeedParser = False + isFeedParser = self.NOT_A_FEED_PARSER break - self.mergeOneHitOnlyFeedsParsers(isFeedParser, one_hit_only, hit) + if self.merge_one_hit_only_feeds_parsers: + self.mergeOneHitOnlyFeedsParsers(isFeedParser, one_hit_only, hit) + else: + hit['feed_parser'] = isFeedParser From 1f6154107cb04f5448b6abc149de085ecbe5f4a7 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Feb 2015 20:13:55 +0100 Subject: [PATCH 166/195] Forgot one parameter in feeds plugin --- plugins/post_analysis/feeds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/post_analysis/feeds.py b/plugins/post_analysis/feeds.py index 36e7847..8476881 100644 --- a/plugins/post_analysis/feeds.py +++ b/plugins/post_analysis/feeds.py @@ -92,7 +92,7 @@ class IWLAPostAnalysisFeeds(IPlugin): if isFeedParser == self.FEED_PARSER and\ self.merge_one_hit_only_feeds_parsers: - self.mergeOneHitOnlyFeedsParsers(one_hit_only, hit) + self.mergeOneHitOnlyFeedsParsers(isFeedParser, one_hit_only, hit) if not isFeedParser is None: continue From bca4b8661edcce0122de4b585a84f875a740380f Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 19 Feb 2015 20:15:03 +0100 Subject: [PATCH 167/195] We can now use _append suffix un conf.py to append a value to a default configuration instead of reapeating whole configuration --- iwla.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/iwla.py b/iwla.py index 0647e24..a3d3bdc 100755 --- a/iwla.py +++ b/iwla.py @@ -34,9 +34,7 @@ from calendar import monthrange from datetime import date, datetime import default_conf as conf -import conf as _ -conf.__dict__.update(_.__dict__) -del _ +import conf as user_conf from iplugin import * from display import * @@ -735,6 +733,23 @@ if __name__ == '__main__': args = parser.parse_args() + # Load user conf + for (k,v) in user_conf.__dict__.items(): + if k.endswith('_append'): + new_k = k[:-7] + if new_k in dir(conf): + if type(conf.__dict__[new_k]) == list: + if type(v) == list: + conf.__dict__[new_k] += v + else: + conf.__dict__[new_k].append(v) + else: + self.logger.error("%s is not a list" % (new_k)) + else: + self.logger.error("%s doesn't exists in default conf" % (new_k)) + else: + conf.__dict__.update({k:v}) + if args.clean_output: if os.path.exists(conf.DB_ROOT): shutil.rmtree(conf.DB_ROOT) if os.path.exists(conf.DISPLAY_ROOT): shutil.rmtree(conf.DISPLAY_ROOT) From b63421642c50cff8b3bb8c0382931e68d0dbc25d Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 19 Feb 2015 20:19:42 +0100 Subject: [PATCH 168/195] Fix a little mistake in previous commit --- iwla.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iwla.py b/iwla.py index a3d3bdc..60572ca 100755 --- a/iwla.py +++ b/iwla.py @@ -744,9 +744,9 @@ if __name__ == '__main__': else: conf.__dict__[new_k].append(v) else: - self.logger.error("%s is not a list" % (new_k)) + print("Error %s is not a list" % (new_k)) else: - self.logger.error("%s doesn't exists in default conf" % (new_k)) + print("Error %s doesn't exists in default conf" % (new_k)) else: conf.__dict__.update({k:v}) From ad3f3467f47f1ab1b55675be8a6a1b2f2dd3ac3d Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 19 Feb 2015 20:23:13 +0100 Subject: [PATCH 169/195] Update conf.py --- conf.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/conf.py b/conf.py index 6e57326..d6bfc58 100644 --- a/conf.py +++ b/conf.py @@ -6,26 +6,36 @@ analyzed_filename = '/var/log/apache2/access.log' domain_name = 'soutade.fr' # Display visitor IP in addition to resolved names -#display_visitor_ip = True +display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'reverse_dns'] -display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'feeds', 'reverse_dns'] +display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds'] # Reverse DNS timeout reverse_dns_timeout = 0.2 # Count this addresses as hit -#page_to_hit_conf = [r'^.+/logo[/]?$'] +page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page -#hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$'] +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/1$'] # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 max_downloads_displayed = 100 +# Compressed files compress_output_files = ['html', 'css', 'js'] -#locale = 'fr' +# Locale in French +locale = 'fr' +# Tracked IP +tracked_ip = ['192.168.0.1'] + +# Feed url +feeds = [r'^.*/atom.xml$', r'^.*/rss.xml$'] + +# Consider xml files as multimedia (append to current list) +multimedia_files_append = ['xml'] From 7ca5022d3e6ff4fcdd0544f75e91d72d7ba1b74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 19 Feb 2015 20:29:08 +0100 Subject: [PATCH 170/195] Update documentation and translation --- ChangeLog | 4 +- docs/index.md | 3 + docs/modules.md | 3 + iwla.pot | 84 +++++++++++++++------------- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 3802 -> 3935 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 86 ++++++++++++++++------------- 6 files changed, 102 insertions(+), 78 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12e18c4..3ed3367 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2 (13/01/2015) +v0.2 (19/02/2015) ** User ** Add referers_diff display plugin Add year statistics in month details @@ -6,6 +6,8 @@ v0.2 (13/01/2015) Add browsers detection Add operating systems detection Add track users plugin + Add feeds plugin + Add _append feature to conf.py ** Dev ** Add istats_diff interface diff --git a/docs/index.md b/docs/index.md index 941675c..26b1acd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -565,12 +565,15 @@ plugins.post_analysis.feeds Post analysis hook Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + If there is ony one hit per day to a feed, merge feeds parsers with the same user agent + as it must be the same person with a different IP address. Plugin requirements : None Conf values needed : feeds + merge_one_hit_only_feeds_parsers* Output files : None diff --git a/docs/modules.md b/docs/modules.md index 44d4d52..6c413b8 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -473,12 +473,15 @@ plugins.post_analysis.feeds Post analysis hook Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + If there is ony one hit per day to a feed, merge feeds parsers with the same user agent + as it must be the same person with a different IP address. Plugin requirements : None Conf values needed : feeds + merge_one_hit_only_feeds_parsers* Output files : None diff --git a/iwla.pot b/iwla.pot index fb23cd8..7d0e09a 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-02-17 19:31+CET\n" +"POT-Creation-Date: 2015-02-19 20:27+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,11 +35,11 @@ msgstr "" msgid "March" msgstr "" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "June" msgstr "" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "May" msgstr "" @@ -67,135 +67,135 @@ msgstr "" msgid "Ratio" msgstr "" -#: iwla.py:383 +#: iwla.py:381 msgid "Statistics" msgstr "" -#: iwla.py:391 +#: iwla.py:389 msgid "By day" msgstr "" -#: iwla.py:391 +#: iwla.py:389 msgid "Day" msgstr "" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Not viewed Bandwidth" msgstr "" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Visits" msgstr "" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 #: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 msgid "Hits" msgstr "" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 #: plugins/display/track_users.py:112 msgid "Pages" msgstr "" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "" -#: iwla.py:428 +#: iwla.py:426 msgid "Average" msgstr "" -#: iwla.py:433 iwla.py:478 +#: iwla.py:431 iwla.py:476 msgid "Total" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Apr" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Aug" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Dec" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Feb" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Jan" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Jul" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Mar" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Nov" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Oct" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Sep" msgstr "" -#: iwla.py:443 +#: iwla.py:441 msgid "Summary" msgstr "" -#: iwla.py:444 +#: iwla.py:442 msgid "Month" msgstr "" -#: iwla.py:444 +#: iwla.py:442 msgid "Visitors" msgstr "" -#: iwla.py:444 iwla.py:456 plugins/display/feeds.py:92 +#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:97 #: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 msgid "Details" msgstr "" -#: iwla.py:492 +#: iwla.py:490 msgid "Statistics for" msgstr "" -#: iwla.py:499 +#: iwla.py:497 msgid "Last update" msgstr "" -#: iwla.py:503 +#: iwla.py:501 msgid "Time analysis" msgstr "" -#: iwla.py:505 +#: iwla.py:503 msgid "hours" msgstr "" -#: iwla.py:506 +#: iwla.py:504 msgid "minutes" msgstr "" -#: iwla.py:506 +#: iwla.py:504 msgid "seconds" msgstr "" -#: plugins/display/all_visits.py:70 plugins/display/feeds.py:76 +#: plugins/display/all_visits.py:70 plugins/display/feeds.py:75 #: plugins/display/top_visitors.py:72 msgid "Host" msgstr "" @@ -243,15 +243,23 @@ msgstr "" msgid "All Browsers" msgstr "" -#: plugins/display/feeds.py:76 +#: plugins/display/feeds.py:69 +msgid "All Feeds parsers" +msgstr "" + +#: plugins/display/feeds.py:75 msgid "All feeds parsers" msgstr "" #: plugins/display/feeds.py:90 +msgid "Merged feeds parsers" +msgstr "" + +#: plugins/display/feeds.py:95 msgid "Feeds parsers" msgstr "" -#: plugins/display/feeds.py:97 +#: plugins/display/feeds.py:102 msgid "Found" msgstr "" diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index bfbe86013311fa4451bec7daaf447166a36ce335..1f7966243c2003388b6a00e2888541cde1ebe64d 100644 GIT binary patch literal 3935 zcmai#TWnlM8OJ9ON@^&OP-xRanQ&>+hIQ@Gw27O9`kL5@FWBp}QW52Ncf3C7?m3%t zS!aa^66#B(s^S48sv?mmRI3OCDwRH96zy0_p5 z;9sHk`?u%YQ0sP4(KG{4{e4uj>uz{EJOuUKNyyKPQt5m%Pugb>F`RW$!Qi_@8|LZ+>2z z&@{WDzP}C1p1trxa6i;N+z;iq6Q1KxcFsWQoA+Gy^G`teV+Cs8HsohADxK#tl>eWB z()Vqs^;bN90Qs3$spR+9q2lD%zW)}K-s@1`{R>LZZZ_9>_CVRY7i!&|P z(@^Js7Gi>V0iwcu56b=@L+QH;<>zajzl0ps{03^>?>+wl_5I(W?E4SYcl$Vm*4+Ua zG8RgI1J=e+g>+%TV|J2Gl-pLaqNZ)Vco&G11&YuuAXk zQ0wo4(lZ40-Gfl}p7NaXoP*ML9ul7B0P--RqWwONoK(jb?e%%&5b`PH3?h4!j}?y( zBA-O0OXYzQW*UCMx8+BbVMIB65xE-~L5?9RW5_J>IpheUB0J^d)5sJukEonQ29ZY) zon3xeKva$*lgNZRz6`-R-6BYjYkpOWey_!<(%&*p1GEy ze4JYGp|T%YLOzS=u2mExn`MTEV)s7e1Tv1?j~qvoEAB-U6S`NGQ^;u1GUg%p8MQ~7 zO*@vv>#0l9qB9Y%N6k2>m%SZxr9$=3XtFe|6dx~^SVOM=vu{e__6TZ?YhC7b)L z-n7G0eAw>$uoI@mp6$epwv(`FM)QUwPct*xaS8jHu^_6ihxKgDcw;x2nz62}2VFBB zN0GY}#*tl3;+C0UXu{PbuC?M48d(rFQ!^Q5Nf6bXnY@&_Bnp~#dGXwijy;sbD{*$8 znQ|+VBoC4w|)7##fi#tqoN*B!6 zGK0i&$9x;dW?|H@OWibct(yi?GoOTwFf#Mmn(k89TU4o8s!33L3P0pU)GjYhoAZh>EhrkPS&MTztuV?nf;M%vI3nT~lK6tFWtHiAne**#=O(AV~2-^ zhlU1p?G>zy(q@2JBX%jyv!LGFuqV=@+Rc6jjUz~dFaK*v~!T|LYge`s)ch^ew) z;dDvOjhAXiY^j&K%2V5Psf~h8*g%7>WNR?%Z8UouGPU7aoTG0lXe7Ojn?6|6L*#QV zwAj_B7+YhT9pgow>RT8WaZVU)>Aq3H|J$+%KPA5oDXdeZu()@X>{ZmWao3TXiX7(1 zrD+;)GiGk<)O}68v&3G&UwsL!?%Fx8V@9JB_@tu+x- zwcbX@Oi?8vFLZQ=E0Z|y;H>Sm)_WO4xAPk5B_W-Kl4jFoVr0rcfzr=qJ1sjC7!mef zOkDXsvG$z@T4CyJ?@D=e@?EN=rz+fGqg~DQxT4+$bForJ60EL^oQ2IWEnl7GFY#h7pKj&KVr7vmF?Nj}uj+<;$;5vFywYGU delta 1845 zcmZvdOKeS16o%KO+&+{l>eV;(uDZ9VRy~TUdK5JfA~nFEq#-F`P!3TBB505h5;2f? zH6k~NiYSpFk(5Y?M{3j#5b+ow;_>~pIA^X+xc-g~XR_CEK%&3u&+w5P@$H>?_^ zqsu+a>R@RvZrG>ZW_{pim<)fzc-SXw)(;MX2`~?;Ujgh7OZ|NnOvJB&Jz*`>)OG*- z!0Kr*r)`H^wu_r4-0%JosDLM+`kjS+;d!VDZ#Zv3^}7SP?4kQlpb~ot2f|LMaX-7> z2WEe0Xl3z?R%U5X9nxVO%y#BMieuyaeLiHUMcglj>OaFd2WsUNFbP&WYoHdmQ9ki) zD-8wQ4V6Hn`v=@V1eN(Qe|`aSS+o1sp%Q6N*UrhMI6291QnDRpJyJ058Kqu+`r`hpG4< zRe!BCM7qkXmov%PA1Z;tP%F=Zs>DRd999gKcsW$SDyR~#b*_ixYPC@P>YWWx>x1Ft}>e*+cL~~FX%0yYH7!{zoNS6B#U3bN|Dx^Ih zfo7s^(|^J;G!IQhqfxi1LJ_3WXQTOO5n6~QqmgI~(&xMc$@Iy}bYNu@wg3M!m3us5 zi)}X20g{y?eYZLTnQ> mb;j=ug^RKy#U+K2qZ<>my&a7;CC&@Q-Y2~b#oi?E4gCceB8eve diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot index d2ef0c9..182d246 100644 --- a/locales/fr_FR/LC_MESSAGES/iwla.pot +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: iwla\n" -"POT-Creation-Date: 2015-02-17 19:31+CET\n" -"PO-Revision-Date: 2015-02-17 19:32+0100\n" +"POT-Creation-Date: 2015-02-19 20:27+CET\n" +"PO-Revision-Date: 2015-02-19 20:28+0100\n" "Last-Translator: Soutadé \n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -37,11 +37,11 @@ msgstr "Juillet" msgid "March" msgstr "Mars" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "June" msgstr "Juin" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "May" msgstr "Mai" @@ -69,135 +69,135 @@ msgstr "Septembre" msgid "Ratio" msgstr "Pourcentage" -#: iwla.py:383 +#: iwla.py:381 msgid "Statistics" msgstr "Statistiques" -#: iwla.py:391 +#: iwla.py:389 msgid "By day" msgstr "Par jour" -#: iwla.py:391 +#: iwla.py:389 msgid "Day" msgstr "Jour" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Not viewed Bandwidth" msgstr "Traffic non vu" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Visits" msgstr "Visites" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 #: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 msgid "Hits" msgstr "Hits" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 #: plugins/display/track_users.py:112 msgid "Pages" msgstr "Pages" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "Bande passante" -#: iwla.py:428 +#: iwla.py:426 msgid "Average" msgstr "Moyenne" -#: iwla.py:433 iwla.py:478 +#: iwla.py:431 iwla.py:476 msgid "Total" msgstr "Total" -#: iwla.py:442 +#: iwla.py:440 msgid "Apr" msgstr "Avr" -#: iwla.py:442 +#: iwla.py:440 msgid "Aug" msgstr "Août" -#: iwla.py:442 +#: iwla.py:440 msgid "Dec" msgstr "Déc" -#: iwla.py:442 +#: iwla.py:440 msgid "Feb" msgstr "Fév" -#: iwla.py:442 +#: iwla.py:440 msgid "Jan" msgstr "Jan" -#: iwla.py:442 +#: iwla.py:440 msgid "Jul" msgstr "Jui" -#: iwla.py:442 +#: iwla.py:440 msgid "Mar" msgstr "Mars" -#: iwla.py:442 +#: iwla.py:440 msgid "Nov" msgstr "Nov" -#: iwla.py:442 +#: iwla.py:440 msgid "Oct" msgstr "Oct" -#: iwla.py:442 +#: iwla.py:440 msgid "Sep" msgstr "Sep" -#: iwla.py:443 +#: iwla.py:441 msgid "Summary" msgstr "Résumé" -#: iwla.py:444 +#: iwla.py:442 msgid "Month" msgstr "Mois" -#: iwla.py:444 +#: iwla.py:442 msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:444 iwla.py:456 plugins/display/feeds.py:92 +#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:97 #: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 msgid "Details" msgstr "Détails" -#: iwla.py:492 +#: iwla.py:490 msgid "Statistics for" msgstr "Statistiques pour" -#: iwla.py:499 +#: iwla.py:497 msgid "Last update" msgstr "Dernière mise à jour" -#: iwla.py:503 +#: iwla.py:501 msgid "Time analysis" msgstr "Durée de l'analyse" -#: iwla.py:505 +#: iwla.py:503 msgid "hours" msgstr "heures " -#: iwla.py:506 +#: iwla.py:504 msgid "minutes" msgstr "minutes" -#: iwla.py:506 +#: iwla.py:504 msgid "seconds" msgstr "secondes" -#: plugins/display/all_visits.py:70 plugins/display/feeds.py:76 +#: plugins/display/all_visits.py:70 plugins/display/feeds.py:75 #: plugins/display/top_visitors.py:72 msgid "Host" msgstr "Hôte" @@ -245,15 +245,23 @@ msgstr "Autres" msgid "All Browsers" msgstr "Tous les navigateurs" -#: plugins/display/feeds.py:76 +#: plugins/display/feeds.py:69 +msgid "All Feeds parsers" +msgstr "Tous les agrégateurs" + +#: plugins/display/feeds.py:75 msgid "All feeds parsers" msgstr "Tous les agrégateurs" #: plugins/display/feeds.py:90 +msgid "Merged feeds parsers" +msgstr "Agrégateurs fusionnés" + +#: plugins/display/feeds.py:95 msgid "Feeds parsers" msgstr "Agrégateurs" -#: plugins/display/feeds.py:97 +#: plugins/display/feeds.py:102 msgid "Found" msgstr "Trouvé" From 9d9e42f66d6567caa07cfaf6b5b11b330f77b80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 19 Feb 2015 20:36:37 +0100 Subject: [PATCH 171/195] Forgot to document _append feature --- docs/index.md | 6 ++++++ docs/main.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docs/index.md b/docs/index.md index 26b1acd..20ff9f0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -32,6 +32,12 @@ Main values to edit are : * **display_hooks** : List of display hooks * **locale** : Displayed locale (_en_ or _fr_) +You can also append an element to an existing default configuration list by using "_append" suffix. Example : + multimedia_files_append = ['xml'] +or + multimedia_files_append = 'xml' +Will append 'xml' to current multimedia_files list + Then, you can launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it, go into _output_ and type python -m SimpleHTTPServer 8000 diff --git a/docs/main.md b/docs/main.md index 7df8333..6338ed7 100644 --- a/docs/main.md +++ b/docs/main.md @@ -32,6 +32,12 @@ Main values to edit are : * **display_hooks** : List of display hooks * **locale** : Displayed locale (_en_ or _fr_) +You can also append an element to an existing default configuration list by using "_append" suffix. Example : + multimedia_files_append = ['xml'] +or + multimedia_files_append = 'xml' +Will append 'xml' to current multimedia_files list + Then, you can launch iwla. Output HTML files are created in _output_ directory by default. To quickly see it, go into _output_ and type python -m SimpleHTTPServer 8000 From ab1167c621d99cfb022c932613b279c0ae5f397e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 2 Mar 2015 18:26:42 +0100 Subject: [PATCH 172/195] Forgot to generate last day of a month... --- iwla.py | 1 + 1 file changed, 1 insertion(+) diff --git a/iwla.py b/iwla.py index 60572ca..4378a02 100755 --- a/iwla.py +++ b/iwla.py @@ -656,6 +656,7 @@ class IWLA(object): return False self.analyse_started = True if cur_time.tm_mon != t.tm_mon: + self._generateDayStats() self._generateMonthStats() self.current_analysis = self._deserialize(self.getDBFilename(t)) or self._clearVisits() elif cur_time.tm_mday != t.tm_mday: From 6949235fc450c1dd3fdf3b142826c66e71660a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 2 Mar 2015 18:32:15 +0100 Subject: [PATCH 173/195] Some CSS classes where not set --- plugins/display/feeds.py | 1 + plugins/display/track_users.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/display/feeds.py b/plugins/display/feeds.py index 5132094..eebee06 100644 --- a/plugins/display/feeds.py +++ b/plugins/display/feeds.py @@ -73,6 +73,7 @@ class IWLADisplayFeeds(IPlugin): page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'All feeds parsers'), [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit']) for super_hit in hits.values(): if not super_hit['feed_parser']: continue nb_feeds_parsers += 1 diff --git a/plugins/display/track_users.py b/plugins/display/track_users.py index a20e0ad..53b7b9d 100644 --- a/plugins/display/track_users.py +++ b/plugins/display/track_users.py @@ -74,7 +74,8 @@ class IWLADisplayTrackUsers(IPlugin): path = self.iwla.getCurDisplayPath(filename) page = display.createPage(title, path, self.iwla.getConfValue('css_path', [])) - table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Tracked users'), [self.iwla._(u'Page'), self.iwla._(u'Last Access')]) + table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Tracked users'), [self.iwla._(u'Pages'), self.iwla._(u'Last Access')]) + table.setColsCSSClass(['iwla_page', '']) for ip in self.tracked_ip: if not ip in hits.keys(): continue if 'dns_name_replaced' in hits[ip].keys(): @@ -110,6 +111,7 @@ class IWLADisplayTrackUsers(IPlugin): index = self.iwla.getDisplayIndex() table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'IP'), self.iwla._(u'Last Access'), self.iwla._(u'Pages'), self.iwla._(u'Hits')]) + table.setColsCSSClass(['', '', 'iwla_page', 'iwla_hit']) for ip in self.tracked_ip: if not ip in hits.keys(): continue if 'dns_name_replaced' in hits[ip].keys(): From b563609b2482e15322c4a5af79d8f2e3f62f2a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 2 Mar 2015 18:33:18 +0100 Subject: [PATCH 174/195] Update Locales --- ChangeLog | 1 + iwla.pot | 26 ++++++++++-------------- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 3935 -> 3909 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 31 ++++++++++++++--------------- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ed3367..c1a7849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,3 +16,4 @@ v0.2 (19/02/2015) Forgot tag Bad UTC time computation Hits/pages in the same second where not analyzed + Last day of month was skipped diff --git a/iwla.pot b/iwla.pot index 7d0e09a..7997683 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-02-19 20:27+CET\n" +"POT-Creation-Date: 2015-03-02 18:32+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,14 +90,14 @@ msgstr "" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 -#: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 +#: plugins/display/top_visitors.py:72 plugins/display/track_users.py:113 msgid "Hits" msgstr "" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 -#: plugins/display/track_users.py:112 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:113 msgid "Pages" msgstr "" @@ -166,8 +166,8 @@ msgstr "" msgid "Visitors" msgstr "" -#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:97 -#: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 +#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:98 +#: plugins/display/operating_systems.py:90 plugins/display/track_users.py:108 msgid "Details" msgstr "" @@ -251,15 +251,15 @@ msgstr "" msgid "All feeds parsers" msgstr "" -#: plugins/display/feeds.py:90 +#: plugins/display/feeds.py:91 msgid "Merged feeds parsers" msgstr "" -#: plugins/display/feeds.py:95 +#: plugins/display/feeds.py:96 msgid "Feeds parsers" msgstr "" -#: plugins/display/feeds.py:102 +#: plugins/display/feeds.py:103 msgid "Found" msgstr "" @@ -355,19 +355,15 @@ msgstr "" msgid "Top Pages" msgstr "" -#: plugins/display/track_users.py:77 -msgid "Page" -msgstr "" - -#: plugins/display/track_users.py:77 plugins/display/track_users.py:105 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:106 msgid "Tracked users" msgstr "" -#: plugins/display/track_users.py:77 plugins/display/track_users.py:112 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:113 msgid "Last Access" msgstr "" -#: plugins/display/track_users.py:112 +#: plugins/display/track_users.py:113 msgid "IP" msgstr "" diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index 1f7966243c2003388b6a00e2888541cde1ebe64d..8c3c04d70fa46754308944dbe8e34af684234de6 100644 GIT binary patch delta 1638 zcmYk+OGs2v9LMo9jx#pnBgY=TN(Ge))J!d6G&9R*K1vrM7817TK}8{is|kvN+9;P6 zl@cv7BIspg3yX{*=;5Z?G*q-pNGftA34MR?FS^|S{ha4L|8wRtpYxvQ#Xe;uUT|F9 z#0uhmf^)~PEx>~-J;}Kgj9@C}VFXKX5!T{jY{C%kLXF>x8h6C{Phyz*5c=^lvP8^X zv4(3Hq~iv1yE{De!iQFWidyg`YTR2)!w;wz&X}{PaX*pU&09TzMkSVvOEC-mtnW%G zaJzLpw8JQB^UbIicVHrRnY)lfa=Wd+54BLg)eoV@A2kP1J0HYkJZ%nPi1powHH@Ja zyoXBQfz>Bb89%Z1_g0Tv{}1GLb5>tKCFJAy(lLbkDRNLJS7KITObbOR$U5t2M4d!C zDxqHFc6~gwlLM%uA3!a13N`+`c@eqYbsjqMyQpvEvDK$h>%~Kyzb1a6K?{9H?c^6K z)897G&#GD|WJd6?&$(>W$(-d}b8rNg;RNcvZ!i<%sFV1GOE8hFG%hQJ^Vfhf8ZxjE zl}HaN!#!rdc>tBjQPc^XKyq+rkaxRb)CNXT3yz__g$Z*K*^`?>je8Zd!aLLpKB6+5 zK}}q+{sgu|(Iul2$U-GrfErhXN_Y+G<6LX~6{ztWtX^yNdeppFD+MjwiCUl+mHB>i z5SLRwhnjHJ9782=6Lo^Ot^Eb+WL{f;9JSNWR{x4h=o>OG=H@75(U8I{brhq1`%=`7 zs!$0=QAgK^I-wn?1om0`e$)nzqrUbSYT;qj_)DnY{1)mx&oD)Qd(#xO<2aIw`-WP0 z9yLLqt`=I3nwW!1w8$(mt56Hpcs+sKVhaB*&8j6<6NN+*p;WuQi-G(=Go>Bgqd;c% zPD;5%l-Nk<+CsE>vw_TpMoJAt2cfH#C?l!~<*7Y%61vtC+lZ~I*j0}0UQ4h#dov}H zb*rrBFWbG*V4<(en+oPeT4>bozJ{nF>b==ueqa-&y75TTriAhCP^vFnSz2CEux?|t WvcfwUUin{jd^kMmAMZ*__5A@{#fO#v delta 1678 zcmYk+Sx8iI6vy%Zq%%2_Sx(lZ6KX^|6Qd+aP^Z(DqhlQ^TlS9GG zGmfK$m_+oCaIOnCcsX$tk8~~@C*x?GgSl9RSs2GL*ouDKfy(bfv!?a#CYq%)=R& zL48-vfIqj0lUCS>TKsy{i#K8>wwpVUO>(>J{vK4J{Wd>@%1@fdP%H1jQFz+yML+f3 z6}!-fDtI5&z$2RvpgMkH*FV_&i`~~YF?5-z=SQO&%EhsmkNPQQp?0pyti_}{ZDgQ= z&E{H5XhZEtJL<)Ikw4eXNh?aAeu5rU!Lz9RUh^9A=lVHm>mQ-MmFG5p?`Qv2c$f=% z@CT|;CU4h@vQQo8qVgu93Kg2uaJPq#6177Y*xv%Yf#Y!i_1kK)JIxp_m`sbn{2+u=E+tDdTGeosUmeh4WC~N&%`+6!qLZRKqpq5;Kk}xGvS;4Nt9R^!LzH3y2xS6k-{n z$}OoLZ;`iw(W=x{Zzz8?qcBlHloL7@6Dv}K-cbEgMoWlhLPrxZho~gfr`E8N&{0Oz z6Lp%{5yf~a=BvzK$cSd$bmISGdFq63if2vghA*7k$PNAeGl?pqHZ|xg^42g~l=h6Q z9+8gugPxMoNJ*@?G+I$Qe|BwsOJHSlWcBs~9s4`>bVlm7bZ@WVUP)Ob`Y)|KeK^pc Kk)E3q^!x!DzK%Qq diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot index 182d246..6126a9b 100644 --- a/locales/fr_FR/LC_MESSAGES/iwla.pot +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: iwla\n" -"POT-Creation-Date: 2015-02-19 20:27+CET\n" -"PO-Revision-Date: 2015-02-19 20:28+0100\n" +"POT-Creation-Date: 2015-03-02 18:32+CET\n" +"PO-Revision-Date: 2015-03-02 18:32+0100\n" "Last-Translator: Soutadé \n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -92,14 +92,14 @@ msgstr "Visites" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 -#: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 +#: plugins/display/top_visitors.py:72 plugins/display/track_users.py:113 msgid "Hits" msgstr "Hits" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 -#: plugins/display/track_users.py:112 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:113 msgid "Pages" msgstr "Pages" @@ -168,8 +168,8 @@ msgstr "Mois" msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:97 -#: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 +#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:98 +#: plugins/display/operating_systems.py:90 plugins/display/track_users.py:108 msgid "Details" msgstr "Détails" @@ -253,15 +253,15 @@ msgstr "Tous les agrégateurs" msgid "All feeds parsers" msgstr "Tous les agrégateurs" -#: plugins/display/feeds.py:90 +#: plugins/display/feeds.py:91 msgid "Merged feeds parsers" msgstr "Agrégateurs fusionnés" -#: plugins/display/feeds.py:95 +#: plugins/display/feeds.py:96 msgid "Feeds parsers" msgstr "Agrégateurs" -#: plugins/display/feeds.py:102 +#: plugins/display/feeds.py:103 msgid "Found" msgstr "Trouvé" @@ -357,21 +357,20 @@ msgstr "Toutes les pages" msgid "Top Pages" msgstr "Top Pages" -#: plugins/display/track_users.py:77 -msgid "Page" -msgstr "Page" - -#: plugins/display/track_users.py:77 plugins/display/track_users.py:105 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:106 msgid "Tracked users" msgstr "Utilisateurs traqués" -#: plugins/display/track_users.py:77 plugins/display/track_users.py:112 +#: plugins/display/track_users.py:77 plugins/display/track_users.py:113 msgid "Last Access" msgstr "Dernière visite" -#: plugins/display/track_users.py:112 +#: plugins/display/track_users.py:113 msgid "IP" msgstr "IP" +#~ msgid "Page" +#~ msgstr "Page" + #~ msgid "Key Phrases" #~ msgstr "Phrases clé" From f853ad808e19ba07452c0578ebb3177becf5f2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 2 Mar 2015 19:44:10 +0100 Subject: [PATCH 175/195] Add hours_stats plugin --- plugins/display/hours_stats.py | 88 +++++++++++++++++++++++++ plugins/post_analysis/hours_stats.py | 96 ++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 plugins/display/hours_stats.py create mode 100644 plugins/post_analysis/hours_stats.py diff --git a/plugins/display/hours_stats.py b/plugins/display/hours_stats.py new file mode 100644 index 0000000..68dfaac --- /dev/null +++ b/plugins/display/hours_stats.py @@ -0,0 +1,88 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin +from display import * + +""" +Display hook + +Display statistics by hour/week day + +Plugin requirements : + post_analysis/hours_stats + +Conf values needed : + None + +Output files : + OUTPUT_ROOT/year/month/index.html + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayHoursStats(IPlugin): + def __init__(self, iwla): + super(IWLADisplayHoursStats, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLAPostAnalysisHoursStats'] + + def hook(self): + display = self.iwla.getDisplay() + month_stats = self.iwla.getMonthStats() + + hours_stats = month_stats.get('hours_stats', {}) + if not hours_stats: + for i in range(0, 24): + hours_stats[i] = {'pages':0, 'hits':0, 'bandwidth':0} + days_stats = month_stats.get('days_stats', {}) + if not days_stats: + for i in range(0, 7): + days_stats[i] = {'pages':0, 'hits':0, 'bandwidth':0} + + index = self.iwla.getDisplayIndex() + + # By Day + title = self.iwla._(u'By day') + days = [self.iwla._('Mon'), self.iwla._('Tue'), self.iwla._('Wed'), self.iwla._('Thu'), self.iwla._('Fri'), self.iwla._('Sat'), self.iwla._('Sun')] + table = display.createBlock(DisplayHTMLBlockTableWithGraph, title, [self.iwla._('Day'), self.iwla._('Pages'), self.iwla._('Hits'), self.iwla._('Bandwidth')], days, 7, range(1,4)) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth']) + for i in range(0,7): + table.appendRow([days[i], days_stats[i]['pages'], days_stats[i]['hits'], days_stats[i]['bandwidth']]) + table.setCellValue(i, 3, bytesToStr(days_stats[i]['bandwidth'])) + index.appendBlock(table) + + # By Hours + title = self.iwla._(u'By Hours') + hours = ['%02d' % i for i in range(0, 24)] + table = display.createBlock(DisplayHTMLBlockTableWithGraph, title, [self.iwla._('Hours'), self.iwla._('Pages'), self.iwla._('Hits'), self.iwla._('Bandwidth')], hours, 24, range(1,4)) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth']) + for i in range(0,24): + table.appendRow([hours[i], hours_stats[i]['pages'], hours_stats[i]['hits'], hours_stats[i]['bandwidth']]) + table.setCellValue(i, 3, bytesToStr(hours_stats[i]['bandwidth'])) + index.appendBlock(table) diff --git a/plugins/post_analysis/hours_stats.py b/plugins/post_analysis/hours_stats.py new file mode 100644 index 0000000..a45dbdd --- /dev/null +++ b/plugins/post_analysis/hours_stats.py @@ -0,0 +1,96 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from iplugin import IPlugin + +""" +Post analysis hook + +Count pages, hits and bandwidth by hour/week day + +Plugin requirements : + None + +Conf values needed : + None + +Output files : + None + +Statistics creation : +month_stats: + hours_stats => + 00 .. 23 => + pages + hits + bandwidth + + days_stats => + 0 .. 6 => + pages + hits + bandwidth + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLAPostAnalysisHoursStats(IPlugin): + def __init__(self, iwla): + super(IWLAPostAnalysisHoursStats, self).__init__(iwla) + self.API_VERSION = 1 + + def hook(self): + stats = self.iwla.getCurrentVisists() + month_stats = self.iwla.getMonthStats() + + hours_stats = month_stats.get('hours_stats', {}) + if not hours_stats: + for i in range(0, 24): + hours_stats[i] = {'pages':0, 'hits':0, 'bandwidth':0} + days_stats = month_stats.get('days_stats', {}) + if not days_stats: + for i in range(0, 7): + days_stats[i] = {'pages':0, 'hits':0, 'bandwidth':0} + + for super_hit in stats.values(): + if super_hit['robot']: continue + for r in super_hit['requests'][::-1]: + if not self.iwla.isValidForCurrentAnalysis(r): + break + + if not self.iwla.hasBeenViewed(r): continue + + key = r['is_page'] and 'pages' or 'hits' + + t = r['time_decoded'] + + hours_stats[t.tm_hour][key] += 1 + hours_stats[t.tm_hour]['bandwidth'] += int(r['body_bytes_sent']) + + days_stats[t.tm_wday][key] += 1 + days_stats[t.tm_wday]['bandwidth'] += int(r['body_bytes_sent']) + + month_stats['hours_stats'] = hours_stats + month_stats['days_stats'] = days_stats From 1c3fc1c06d19ba9d3f8ee46e58907cd7fa993953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Mon, 2 Mar 2015 19:46:08 +0100 Subject: [PATCH 176/195] Update locales --- ChangeLog | 3 +- conf.py | 4 +- iwla.pot | 61 +++++++++++++++++++++++----- locales/fr_FR/LC_MESSAGES/iwla.mo | Bin 3909 -> 4198 bytes locales/fr_FR/LC_MESSAGES/iwla.pot | 63 +++++++++++++++++++++++------ plugins/display/feeds.py | 2 +- 6 files changed, 106 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1a7849..b08797e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2 (19/02/2015) +v0.2 (02/03/2015) ** User ** Add referers_diff display plugin Add year statistics in month details @@ -8,6 +8,7 @@ v0.2 (19/02/2015) Add track users plugin Add feeds plugin Add _append feature to conf.py + Add hours_stats plugin ** Dev ** Add istats_diff interface diff --git a/conf.py b/conf.py index d6bfc58..9db8439 100644 --- a/conf.py +++ b/conf.py @@ -10,8 +10,8 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] -post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'feeds', 'reverse_dns'] -display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds'] +post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'reverse_dns'] +display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats'] # Reverse DNS timeout reverse_dns_timeout = 0.2 diff --git a/iwla.pot b/iwla.pot index 7997683..478a75a 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-03-02 18:32+CET\n" +"POT-Creation-Date: 2015-03-02 19:44+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -71,14 +71,6 @@ msgstr "" msgid "Statistics" msgstr "" -#: iwla.py:389 -msgid "By day" -msgstr "" - -#: iwla.py:389 -msgid "Day" -msgstr "" - #: iwla.py:389 iwla.py:442 msgid "Not viewed Bandwidth" msgstr "" @@ -88,24 +80,35 @@ msgid "Visits" msgstr "" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:75 plugins/display/referers.py:95 +#: plugins/display/feeds.py:75 plugins/display/hours_stats.py:73 +#: plugins/display/hours_stats.py:83 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 #: plugins/display/top_visitors.py:72 plugins/display/track_users.py:113 msgid "Hits" msgstr "" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:75 plugins/display/referers.py:95 +#: plugins/display/feeds.py:75 plugins/display/hours_stats.py:73 +#: plugins/display/hours_stats.py:83 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 #: plugins/display/track_users.py:77 plugins/display/track_users.py:113 msgid "Pages" msgstr "" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/hours_stats.py:73 plugins/display/hours_stats.py:83 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "" +#: iwla.py:389 plugins/display/hours_stats.py:71 +msgid "By day" +msgstr "" + +#: iwla.py:389 plugins/display/hours_stats.py:73 +msgid "Day" +msgstr "" + #: iwla.py:426 msgid "Average" msgstr "" @@ -263,6 +266,42 @@ msgstr "" msgid "Found" msgstr "" +#: plugins/display/hours_stats.py:72 +msgid "Fri" +msgstr "" + +#: plugins/display/hours_stats.py:72 +msgid "Mon" +msgstr "" + +#: plugins/display/hours_stats.py:72 +msgid "Sat" +msgstr "" + +#: plugins/display/hours_stats.py:72 +msgid "Sun" +msgstr "" + +#: plugins/display/hours_stats.py:72 +msgid "Thu" +msgstr "" + +#: plugins/display/hours_stats.py:72 +msgid "Tue" +msgstr "" + +#: plugins/display/hours_stats.py:72 +msgid "Wed" +msgstr "" + +#: plugins/display/hours_stats.py:81 +msgid "By Hours" +msgstr "" + +#: plugins/display/hours_stats.py:83 +msgid "Hours" +msgstr "" + #: plugins/display/operating_systems.py:78 #: plugins/display/operating_systems.py:88 msgid "Operating Systems" diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index 8c3c04d70fa46754308944dbe8e34af684234de6..a37799c04601c042239e671b57792d4032084cea 100644 GIT binary patch literal 4198 zcmai#TWnlc6^3_9TBrjQQYeH=bK26TAsxrgJ(D)Audy9FHug9PP*feyY>!VebI#;k z#u;9?^{En~6d@kM144bM+lL|%BnT29Mgk!aAj$)UP$3@LB6vatR8b+m|D0`m+)%MK z>wJ6d>)LCtz2?Oo+rDZjk02jHUcb?p&%kRp@uB?gt;W0^z5w3=UxM$3ufn&%oB7-d zZ-uwOT~OoqK#e=>`X^u?`Z@R(ScTf6?(`$o`z0W%Ramdd+>3A7x{8R9q z@L8yJuR8t!@-si?qxF97^yi`My9VC_{{l7dKd%2qHq|+|L)o_zs(+W`-EbTFZpZtf z#tlMTXO2LPFGKBn!s+8s^QIhUq5M&S+u@^*7a%{g>h#Y+t@lN!eZK7UuR+;=+3DYM z{a0N3RoDJ2$kEL6PQM0a*Pr0K;44t~^cs{uw_}vJ1Lo&<+y!OFJ+6Nbl%ED%`w7Sr zW*G7_(|mLvYfk?jls!Lzn)eH+^?vX8BGftm z3}ydcUHjjm=KT}Oj@KQx;q>MW>;>h=PqXO<;FsWg;WJSC{0P1e{u0VxFTva3zo5o# zXOQ~uggf9dD7&Vi_MLM)G<8PqW`2&=lFGJ1yx9iuYm~L)?vg39rd+%_(3u^qmQ1@4xe;jK5 zLry>G^ixpt7ohAo2en@f>KqpxKM!w5{|eOjXB?k{TK@`^U%%`0U%UR_LVo52*ZvCB z`Tyqhe?Zyw8r1w72%`7Holx!jq0Uo=I^PhKohPC8U4ZiISt$Scu03<@9jNns0qWg6 z0k!`(q2@p9_#D*yZ$rh&PodWRBh>ttq5SbG*anb`;al$Fb^jX#em{%2$7$UAon1IiJ3$y$Q_7^{5*ghN4TDiawoMt$b-ly zkWobCBr=}YHb1AReiWH@O&@psAY4GsI(@gJa*)a*qW7SpIOr{khhserN2wn`K8Xyw zcIBYF3^f|wa2%~BHcpI`(P%YnM1HN%#;vU-UdxX+`X_?4=sIOP-rP#;C$`Y%{JN{n z+hrTCueW^N3Ky8z>Y3OMl6=ipY=&BK&@e+;U6LiK8EV^@beaBx?-HM>rBjW z$D4>Utfx}*J7y#bLwhNRLT@>anr4)yQCpSR=8}!6q<+vy%vhMlept0;>{4pu&~JE) z^V3@t@4h%%iqbu1+%8Gt%#S-%dR;OeWns;X$AQ5ylEh3z7+#n(IcKK)P?Arb${Ggg z@CmJv0}DU&R1-7pC#g47t=h!Z6KlhwHEY%U)S4MTmQ+{xcFc^8>$c`?_47;=8U%lx zj#953*j0vXI`MSWrlVarWVV_bB$9JxTlhN-!n(K6NmARqt|2kAaZnFJGn=mHii=yH zXHH}m{M0Pi+^_=PSjbRIV@tw%+G8PQbdm84_JY-h-#0f~DUHNdz6eXB+*H}y zKQMTxG;p9au-_XzRz7%e@5oq%aiw`Hquy-Tp}hlx0|R}Egc8<>XVS(!P^6ROHxNX}DAN zTAjL0wOD_v;|=y7>N{6*19XhJ$ku|C_QU;y19TO7iPObZJ5p?0_KJPEvn=r%Ht|Bg z9n{%DPko~??XEStYcjQNo1CMk%df}Xwd*FV=!G(!3(Z$`iO8$6%$D{%oAnHg@~|fi zHuiqw2LEr#JPeg0+a$Vnp6H_P_sMbjcP8ps5?7w-EEzXRd~U{^-Z*tnRnIQ=R&WK& zsd^sQ^(4NUZDl-|DYcH`p8Uh(i>+##>94!Se6pU$O_2ii5H{+Y$*;TCHsgHafX6$u z#jA0Ywej1O&3e*b_X>7T6vk~PKypw_-U}p+hE2uL6n`Lv_ltT`D5KaDbf1oG@p>`* z%^R9QV!iG+3NMft6JECfK5AiV7U)qA-H1oDf7DX^d zk?qy27jLxnq)l1i(&ojCg?bgQrF)*|SXqhN~mzS>I HmCpYHCQF9< literal 3909 zcmai#TWnlc6^3`yaEVi(DNxb?WdkW`XvVQ~BTUl}UlY6Wg|X9u3W`oIFLd_C=T$j^MAkM{eqZ~p>H->;$O{T{v<{t0To z7d-y~HSgb$pLxZ%chM=k_QJQp{ZQ*Fke?alqw`gv?79FoJ`Z=pn&+bs7nx7^@yk$p z>b`vyYJTjQL7lq?_rlM5J^^*Ur+oVcl)fKA>Hm>$KL=&+&wT$MeS5=?{|oXnFZ=eZ zQ1;x$=6Aw9Q1@^E%5O(Jk3;FHdY<$B(@=hxgR`h_Ct*i!@J-#lpP<3()&rzx@QPwM+|lTHHZo3 zbC9jglTh}54NBh)s5p4m^Et?o%+I0b{l@bTQ0xB;W#0=>>t6NayEqJ0vlmMLekeOF z)VzaG_8x|c%cFk$7}WezzJ1oW$D!8ELg`(A+W#>qyH`DX@NU{)fSUhJ&l^zszXRpJ z@A>{;LHXsketZM!oPYK0zeCycBGkH<;eL1ri`0J~)V)`r&T|6FzABX8rlI_^2&KQ_ z`&XgtPoU!bQ&4)Jgqr^qsQdmd)IPt2n*Ti1c{d=Ym=~e+z5+F0K`T9XL#;aiW#>W9 zBc3Oq^qql(rFk#%Aw)&{9V}|wAMJG(xgU8yavqUAONip|1oA#ax>SyqFc;vWugiZb zqlj|$N0E0TRpd0HGKO44jw8nq71^n~oJOXQc|>Iv8AcvNbawe=0Z}=LOd=C%_%Z_L zd|ke?zW#vcd!X+2UPNz1?{u?NsC)#$UFOhcr{}|-ies*!DDUR0xKOzVsUb%Y-L;Bh zWV6grQOq7j&LHE+2ayjW$`Kzx6cf5vm4}dXs!&cL_o*`0YT5B5UQ1n)7LCbxEo#L< zqijt(*GO$ANVdi=gjqTCu}(1U)kmN0GZ8#*tk~;#eaSHcPHBsDz!0nC9s0NZ3pJFJ;V3v#_2HRP9R4NZxMC zq03?0*?1}?{0&@#(OP``=`@*-d_)n?2i z3NKA4DydnGa~kb1$}{3Mb@ezR*cX%daaYeOGmXk49G5t%+HkEE3@t7!S0)mtb4Qg) zZlr3Djf|eGj2y3w9J8aRtH+N$Ffp~vyh_c_Em}W%hR=?xtY1CZKFqrM}~L{nTt@< z>tJr?u4hL(tssmZwDnazDkfYlS3b?_z613V(c1WM*ped(GiBqc7@X=bvIF}t=dvAca^8MPYP|!^J>$fae)f;3v7h3G&5r&eMGZ`hix4La zwshaD;Qwt|grD+Wm+aLovRB;y35l!t&c!`PS}M|)BaNnMz|ENXty2$F^~4hUIQ|;Q zWewNKc^$Lrox~@_hZmMO)wVNQe;pf0WR~k8tGU7Yc0TK`cg-}PB;!pH`^4JU?r4Xpv;A+BM<>;# z%6IyNJ8ZNoxgJ;4UuP^<%1DBhm9TCja(*{gn)9g+=WL}q>Pm3^r%5)AL+*N~6^BYq zakSN+-aJqyKF5Dhmf+Sh5iJ&h9A)}9s<}Ej5y23}u5CD*Z1oK!LTUGj@LJARgALo! zrPer3-p2EjIgyQx&bAJfSZXA^u{WLJDY#2n}P4MqkmmWkC(Er6{h8b cv-}ZW%jM3kG+E3n@+8Kt(&9nglqwncFG%cN82|tP diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot index 6126a9b..09e7e94 100644 --- a/locales/fr_FR/LC_MESSAGES/iwla.pot +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: iwla\n" -"POT-Creation-Date: 2015-03-02 18:32+CET\n" -"PO-Revision-Date: 2015-03-02 18:32+0100\n" +"POT-Creation-Date: 2015-03-02 19:44+CET\n" +"PO-Revision-Date: 2015-03-02 19:45+0100\n" "Last-Translator: Soutadé \n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -73,14 +73,6 @@ msgstr "Pourcentage" msgid "Statistics" msgstr "Statistiques" -#: iwla.py:389 -msgid "By day" -msgstr "Par jour" - -#: iwla.py:389 -msgid "Day" -msgstr "Jour" - #: iwla.py:389 iwla.py:442 msgid "Not viewed Bandwidth" msgstr "Traffic non vu" @@ -90,24 +82,35 @@ msgid "Visits" msgstr "Visites" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:75 plugins/display/referers.py:95 +#: plugins/display/feeds.py:75 plugins/display/hours_stats.py:73 +#: plugins/display/hours_stats.py:83 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 #: plugins/display/top_visitors.py:72 plugins/display/track_users.py:113 msgid "Hits" msgstr "Hits" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:75 plugins/display/referers.py:95 +#: plugins/display/feeds.py:75 plugins/display/hours_stats.py:73 +#: plugins/display/hours_stats.py:83 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 #: plugins/display/track_users.py:77 plugins/display/track_users.py:113 msgid "Pages" msgstr "Pages" #: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/hours_stats.py:73 plugins/display/hours_stats.py:83 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "Bande passante" +#: iwla.py:389 plugins/display/hours_stats.py:71 +msgid "By day" +msgstr "Par jour" + +#: iwla.py:389 plugins/display/hours_stats.py:73 +msgid "Day" +msgstr "Jour" + #: iwla.py:426 msgid "Average" msgstr "Moyenne" @@ -265,6 +268,42 @@ msgstr "Agrégateurs" msgid "Found" msgstr "Trouvé" +#: plugins/display/hours_stats.py:72 +msgid "Fri" +msgstr "Jeu" + +#: plugins/display/hours_stats.py:72 +msgid "Mon" +msgstr "Lun" + +#: plugins/display/hours_stats.py:72 +msgid "Sat" +msgstr "Sam" + +#: plugins/display/hours_stats.py:72 +msgid "Sun" +msgstr "Dim" + +#: plugins/display/hours_stats.py:72 +msgid "Thu" +msgstr "Jeu" + +#: plugins/display/hours_stats.py:72 +msgid "Tue" +msgstr "Mar" + +#: plugins/display/hours_stats.py:72 +msgid "Wed" +msgstr "Mer" + +#: plugins/display/hours_stats.py:81 +msgid "By Hours" +msgstr "Par heures" + +#: plugins/display/hours_stats.py:83 +msgid "Hours" +msgstr "Heures" + #: plugins/display/operating_systems.py:78 #: plugins/display/operating_systems.py:88 msgid "Operating Systems" diff --git a/plugins/display/feeds.py b/plugins/display/feeds.py index eebee06..f8b6e1f 100644 --- a/plugins/display/feeds.py +++ b/plugins/display/feeds.py @@ -29,7 +29,7 @@ Display hook Display feeds parsers Plugin requirements : - None + post_analysis/feeds Conf values needed : create_all_feeds_page* From 2ed7551049bc5d9de7bdffc76eed229e78b4c5c1 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sun, 15 Mar 2015 10:31:28 +0100 Subject: [PATCH 177/195] Add GET/POST checks before accepting request --- iwla.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/iwla.py b/iwla.py index 4378a02..7bb08bc 100755 --- a/iwla.py +++ b/iwla.py @@ -104,6 +104,9 @@ visits : requests => [fields_from_format_log] extract_request => + http_method + http_uri + http_version extract_uri extract_parameters* extract_referer* => @@ -669,6 +672,9 @@ class IWLA(object): if not self._decodeHTTPRequest(hit): return False + if hit['extract_request']['http_method'] not in ['GET', 'POST']: + return False + for k in hit.keys(): if hit[k] == '-' or hit[k] == '*': hit[k] = '' From df78a3f4cbefd3ec26375a6bd4605a6f149fc729 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 6 Apr 2015 17:52:31 +0200 Subject: [PATCH 178/195] [pre_analysis/robots] Don't checks for /robots.txt request, but endswith /robots.txt for robot detection --- plugins/pre_analysis/robots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index f4ea99d..0c4bb96 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -100,7 +100,7 @@ class IWLAPreAnalysisRobots(IPlugin): for hit in super_hit['requests']: # 3) /robots.txt read - if hit['extract_request']['http_uri'] == '/robots.txt': + if hit['extract_request']['http_uri'].endswith('/robots.txt'): isRobot = True break From ee184f86b5afda1a0258c7311108c8d9eaa01f51 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 6 Apr 2015 17:54:44 +0200 Subject: [PATCH 179/195] Add has_subclasses checks for iplugins (prevent for loading parent class) --- iplugin.py | 8 +++++++- plugins/display/feeds.py | 5 +++-- plugins/display/istats_diff.py | 2 +- plugins/display/referers_diff.py | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/iplugin.py b/iplugin.py index 7f57135..a745a53 100644 --- a/iplugin.py +++ b/iplugin.py @@ -79,13 +79,19 @@ def preloadPlugins(plugins, iwla): classes = [c for _,c in inspect.getmembers(mod)\ if inspect.isclass(c) and \ issubclass(c, IPlugin) and \ - c.__name__ != 'IPlugin' + c.__name__ != 'IPlugin' and \ + not c.__subclasses__() ] if not classes: logger.warning('No plugin defined in %s' % (plugin_path)) continue + if len(classes) > 1: + logger.warning('More than one class found in %s, loading may fail. Selecting %s' % (plugin_path, classes[0])) + print classes + continue + plugin = classes[0](iwla) plugin_name = plugin.__class__.__name__ diff --git a/plugins/display/feeds.py b/plugins/display/feeds.py index f8b6e1f..bcd7194 100644 --- a/plugins/display/feeds.py +++ b/plugins/display/feeds.py @@ -21,7 +21,6 @@ from iwla import IWLA from iplugin import IPlugin from display import * -from plugins.post_analysis.feeds import IWLAPostAnalysisFeeds """ Display hook @@ -60,6 +59,8 @@ class IWLADisplayFeeds(IPlugin): return True def hook(self): + from plugins.post_analysis.feeds import IWLAPostAnalysisFeeds + display = self.iwla.getDisplay() hits = self.iwla.getCurrentVisists() nb_feeds_parsers = 0 @@ -88,7 +89,7 @@ class IWLADisplayFeeds(IPlugin): else: table.appendRow([address, super_hit['viewed_pages'], super_hit['viewed_hits']]) page.appendBlock(table) - note = DisplayHTMLRaw(self.iwla, ('*%s' % (self.iwla._('Merged feeds parsers')))) + note = DisplayHTMLRaw(self.iwla, ('*%s' % (self.iwla._(u'Merged feeds parsers')))) page.appendBlock(note) display.addPage(page) diff --git a/plugins/display/istats_diff.py b/plugins/display/istats_diff.py index 897d2c4..333de6d 100644 --- a/plugins/display/istats_diff.py +++ b/plugins/display/istats_diff.py @@ -24,7 +24,7 @@ from display import * import logging """ -Display hook itnerface +Display hook interface Enlight new and updated statistics diff --git a/plugins/display/referers_diff.py b/plugins/display/referers_diff.py index 8e63ecb..2ff505a 100644 --- a/plugins/display/referers_diff.py +++ b/plugins/display/referers_diff.py @@ -53,7 +53,7 @@ class IWLADisplayReferersDiff(IWLADisplayStatsDiff): self.requires = ['IWLADisplayReferers'] self.month_stats_key = 'key_phrases' self.filename = 'key_phrases.html' - self.block_name = u'Key phrases' + self.block_name = self.iwla._(u'Key phrases') def load(self): if not self.iwla.getConfValue('create_all_key_phrases_page', True): From 651a7b95669e6ba8244abf6d42e7fc021d980dd1 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 6 Apr 2015 17:55:11 +0200 Subject: [PATCH 180/195] Add display/top_downloads_diff plugin --- plugins/display/top_downloads_diff.py | 61 +++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 plugins/display/top_downloads_diff.py diff --git a/plugins/display/top_downloads_diff.py b/plugins/display/top_downloads_diff.py new file mode 100644 index 0000000..85b927c --- /dev/null +++ b/plugins/display/top_downloads_diff.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# +# Copyright Grégory Soutadé 2015 + +# This file is part of iwla + +# iwla is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# iwla 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 iwla. If not, see . +# + +from iwla import IWLA +from istats_diff import IWLADisplayStatsDiff +from display import * + +""" +Display hook + +Enlight new and updated downloads in in top_downloads.html + +Plugin requirements : + display/top_downloads + +Conf values needed : + None + +Output files : + None + +Statistics creation : + None + +Statistics update : + None + +Statistics deletion : + None +""" + +class IWLADisplayTopDownloadsDiff(IWLADisplayStatsDiff): + def __init__(self, iwla): + super(IWLADisplayTopDownloadsDiff, self).__init__(iwla) + self.API_VERSION = 1 + self.requires = ['IWLADisplayTopDownloads'] + self.month_stats_key = u'top_downloads' + self.filename = u'top_downloads.html' + self.block_name = self.iwla._(u'All Downloads') + + def load(self): + if not self.iwla.getConfValue('create_all_downloads_page', True): + return False + return super(IWLADisplayTopDownloadsDiff, self).load() From 157868dc3eee5ec842fbc65b5794c1e50d31f349 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 8 Apr 2015 14:04:59 +0200 Subject: [PATCH 181/195] Update istats_diff, the key used in hashtable can be changed (using uri() for example) --- conf.py | 4 ++-- plugins/display/browsers.py | 4 ++-- plugins/display/istats_diff.py | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conf.py b/conf.py index 9db8439..ca01691 100644 --- a/conf.py +++ b/conf.py @@ -11,13 +11,13 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'reverse_dns'] -display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats'] +display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'top_downloads_diff'] # Reverse DNS timeout reverse_dns_timeout = 0.2 # Count this addresses as hit -page_to_hit_conf = [r'^.+/logo[/]?$'] +page_to_hit_conf = [r'^.+/logo[/]?$', r'^.+/search[/]?.*$'] # Count this addresses as page hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/1$'] diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py index 52d4f13..3d1202d 100644 --- a/plugins/display/browsers.py +++ b/plugins/display/browsers.py @@ -102,7 +102,7 @@ class IWLADisplayBrowsers(IPlugin): display.addPage(page) - title = 'Top Browsers' + title = self.iwla._(u'Top Browsers') if self.create_browsers: link = '%s' % (filename, self.iwla._(u'All Browsers')) title = '%s - %s' % (title, link) @@ -120,7 +120,7 @@ class IWLADisplayBrowsers(IPlugin): icon = '' % (self.icon_path) else: icon = '' % (self.icon_path) - browser = 'Unknown' + browser = self.iwla._(u'Unknown') table.appendRow([icon, browser, entrance]) total_browsers[2] -= entrance if total_browsers[2]: diff --git a/plugins/display/istats_diff.py b/plugins/display/istats_diff.py index 333de6d..c5d50ca 100644 --- a/plugins/display/istats_diff.py +++ b/plugins/display/istats_diff.py @@ -73,7 +73,9 @@ class IWLADisplayStatsDiff(IPlugin): path = self.iwla.getCurDisplayPath(self.filename) page = display.getPage(path) - if not page: return + if not page: + self.logger.error('No page for %s' % (path)) + return title = self.iwla._(self.block_name) block = page.getBlock(title) if not block: @@ -94,5 +96,6 @@ class IWLADisplayStatsDiff(IPlugin): stats_diff[k] = 'iwla_new' for (idx, row) in enumerate(block.rows): - if row[0] in stats_diff.keys(): - block.setCellCSSClass(idx, 0, stats_diff[row[0]]) + for k in stats_diff.keys(): + if k in row[0]: + block.setCellCSSClass(idx, 0, stats_diff[k]) From 389679cdb432031e304a221e5fab063f23501993 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 8 Apr 2015 14:06:03 +0200 Subject: [PATCH 182/195] Conf.py --- conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.py b/conf.py index 9db8439..b40e810 100644 --- a/conf.py +++ b/conf.py @@ -1,6 +1,6 @@ # Web server log -analyzed_filename = '/var/log/apache2/access.log' +analyzed_filename = '/var/log/apache2/soutade.fr_access.log' # Domain name to analyze domain_name = 'soutade.fr' @@ -11,7 +11,7 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'reverse_dns'] -display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats'] +display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'top_downloads_diff'] # Reverse DNS timeout reverse_dns_timeout = 0.2 @@ -19,7 +19,7 @@ reverse_dns_timeout = 0.2 # Count this addresses as hit page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page -hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/1$'] +hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/.+$'] # Because it's too long to build HTML when there is too much entries max_hits_displayed = 100 @@ -32,7 +32,7 @@ compress_output_files = ['html', 'css', 'js'] locale = 'fr' # Tracked IP -tracked_ip = ['192.168.0.1'] +tracked_ip = ['82.232.68.211'] # Feed url feeds = [r'^.*/atom.xml$', r'^.*/rss.xml$'] From 62be78845a7d4e1defbfa3c6ce54b91e4743cf5a Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 13 May 2015 18:13:18 +0200 Subject: [PATCH 183/195] Add debug traces in robots plugin --- plugins/pre_analysis/robots.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 0c4bb96..41c744e 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -19,6 +19,7 @@ # import re +import logging from iwla import IWLA from iplugin import IPlugin @@ -61,13 +62,20 @@ class IWLAPreAnalysisRobots(IPlugin): self.awstats_robots = map(lambda (x) : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots) self.robot_re = re.compile(r'.*bot.*', re.IGNORECASE) self.crawl_re = re.compile(r'.*crawl.*', re.IGNORECASE) + self.logger = logging.getLogger(self.__class__.__name__) return True + def _setRobot(self, k, super_hit): + self.logger.debug('%s is a robot' % (k)) + super_hit['robot'] = 1 + # Basic rule to detect robots def hook(self): hits = self.iwla.getCurrentVisists() for (k, super_hit) in hits.items(): - if super_hit['robot']: continue + if super_hit['robot']: + self.logger.debug('%s is a robot' % (k)) + continue isRobot = False referers = 0 @@ -76,7 +84,7 @@ class IWLAPreAnalysisRobots(IPlugin): if self.robot_re.match(first_page['http_user_agent']) or\ self.crawl_re.match(first_page['http_user_agent']): - super_hit['robot'] = 1 + self._setRobot(k, super_hit) continue for r in self.awstats_robots: @@ -85,7 +93,7 @@ class IWLAPreAnalysisRobots(IPlugin): break if isRobot: - super_hit['robot'] = 1 + self._setRobot(k, super_hit) continue # 1) no pages view --> robot @@ -95,13 +103,13 @@ class IWLAPreAnalysisRobots(IPlugin): # 2) pages without hit --> robot if not super_hit['viewed_hits']: - super_hit['robot'] = 1 + self._setRobot(k, super_hit) continue for hit in super_hit['requests']: # 3) /robots.txt read if hit['extract_request']['http_uri'].endswith('/robots.txt'): - isRobot = True + self._setRobot(k, super_hit) break # 4) Any referer for hits @@ -109,10 +117,10 @@ class IWLAPreAnalysisRobots(IPlugin): referers += 1 if isRobot: - super_hit['robot'] = 1 + self._setRobot(k, super_hit) continue if not super_hit['viewed_pages'] and \ (super_hit['viewed_hits'] and not referers): - super_hit['robot'] = 1 + self._setRobot(k, super_hit) continue From 86fc5f2189c07bf34c7d7e1a4885bf68c4609d07 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 14 May 2015 09:54:25 +0200 Subject: [PATCH 184/195] Add FileIter to iwla, allowing to specify multiple files to analyse --- iwla.py | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/iwla.py b/iwla.py index 7bb08bc..fd5b2ab 100755 --- a/iwla.py +++ b/iwla.py @@ -720,6 +720,38 @@ class IWLA(object): else: self.logger.info('==> Analyse not started : nothing new') + +class FileIter(object): + def __init__(self, filenames): + self.filenames = [f for f in filenames.split(',') if f] + for f in self.filenames: + if not os.path.exists(f): + print 'No such file \'%s\'' % (f) + sys.exit(-1) + self.cur_file = None + self._openNextFile() + + def __iter__(self): + return self + + def __next__(self): + return self.next() + + def _openNextFile(self): + if self.cur_file: + self.cur_file.close() + self.cur_file = None + if not self.filenames: + raise StopIteration() + self.cur_file = open(self.filenames.pop(0)) + + def next(self): + l = self.cur_file.readline() + if not l: + self._openNextFile() + l = self.cur_file.readline() + return l[:-1] + if __name__ == '__main__': parser = argparse.ArgumentParser(description='Intelligent Web Log Analyzer') @@ -775,8 +807,4 @@ if __name__ == '__main__': iwla.start(sys.stdin) else: filename = args.file or conf.analyzed_filename - if not os.path.exists(filename): - print 'No such file \'%s\'' % (filename) - sys.exit(-1) - with open(filename) as f: - iwla.start(f) + iwla.start(FileIter(filename)) From 4cb3b21ca5a648b717e6e6f8dc261b774af0ca8b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 22 May 2015 07:51:11 +0200 Subject: [PATCH 185/195] Add reset feature Allow to open .gz file transparently Import debug in robots.py --- iwla.py | 42 ++++++++++++++++++++++++++--- plugins/pre_analysis/page_to_hit.py | 6 +++-- plugins/pre_analysis/robots.py | 10 ++++++- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/iwla.py b/iwla.py index fd5b2ab..5e00640 100755 --- a/iwla.py +++ b/iwla.py @@ -683,13 +683,40 @@ class IWLA(object): return True - def start(self, _file): + def _reset(self): + reset_time = time.strptime(self.args.reset, '%m/%Y') + + self.logger.info('Reset time') + self.logger.info(reset_time) + + self.meta_infos['last_time'] = reset_time + + cur_time = time.localtime() + year = reset_time.tm_year + while year < cur_time.tm_year: + db_path = os.path.join(conf.DB_ROOT, str(year)) + if os.path.exists(db_path): shutil.rmtree(db_path) + output_path = os.path.join(conf.DISPLAY_ROOT, str(year)) + if os.path.exists(output_path): shutil.rmtree(output_path) + year += 1 + month = reset_time.tm_mon + while month <= cur_time.tm_mon: + db_path = os.path.join(conf.DB_ROOT, str(year), '%02d' % (month)) + if os.path.exists(db_path): shutil.rmtree(db_path) + output_path = os.path.join(conf.DISPLAY_ROOT, str(year), '%02d' % (month)) + if os.path.exists(output_path): shutil.rmtree(output_path) + month += 1 + + def start(self, _file, args): + self.args = args self.start_time = datetime.now() self.logger.info('==> Load previous database') self.meta_infos = self._deserialize(conf.META_PATH) or self._clearMeta() if self.meta_infos['last_time']: + if args.reset: + self._reset() self.logger.info('Last time') self.logger.info(self.meta_infos['last_time']) self.current_analysis = self._deserialize(self.getDBFilename(self.meta_infos['last_time'])) or self._clearVisits() @@ -743,7 +770,11 @@ class FileIter(object): self.cur_file = None if not self.filenames: raise StopIteration() - self.cur_file = open(self.filenames.pop(0)) + filename = self.filenames.pop(0) + if filename.endswith('gz'): + self.cur_file = gzip.open(filename, 'r') + else: + self.cur_file = open(filename) def next(self): l = self.cur_file.readline() @@ -770,6 +801,9 @@ if __name__ == '__main__': default='INFO', type=str, help='Loglevel in %s, default : %s' % (['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], 'INFO')) + parser.add_argument('-r', '--reset', dest='reset', + help='Reset analysis to a specific date (month/year)') + args = parser.parse_args() # Load user conf @@ -804,7 +838,7 @@ if __name__ == '__main__': sys.exit(0) if args.stdin: - iwla.start(sys.stdin) + iwla.start(sys.stdin, args) else: filename = args.file or conf.analyzed_filename - iwla.start(FileIter(filename)) + iwla.start(FileIter(filename), args) diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 77772bb..282f53f 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -19,6 +19,7 @@ # import re +import logging from iwla import IWLA from iplugin import IPlugin @@ -64,6 +65,7 @@ class IWLAPreAnalysisPageToHit(IPlugin): self.hp_regexps = self.iwla.getConfValue('hit_to_page_conf', []) self.hp_regexps = map(lambda(r): re.compile(r), self.hp_regexps) + self.logger = logging.getLogger(self.__class__.__name__) return True def hook(self): @@ -85,7 +87,7 @@ class IWLAPreAnalysisPageToHit(IPlugin): # Page to hit for regexp in self.ph_regexps: if regexp.match(uri): - #print '%s is a hit' % (uri ) + self.logger.debug('%s changed from page to hit' % (uri)) request['is_page'] = False super_hit['viewed_pages'] -= 1 super_hit['viewed_hits'] += 1 @@ -94,7 +96,7 @@ class IWLAPreAnalysisPageToHit(IPlugin): # Hit to page for regexp in self.hp_regexps: if regexp.match(uri): - #print '%s is a page' % (uri ) + self.logger.debug('%s changed from hit to page' % (uri)) request['is_page'] = True super_hit['viewed_pages'] += 1 super_hit['viewed_hits'] -= 1 diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index 41c744e..d84087d 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -20,6 +20,7 @@ import re import logging +import inspect from iwla import IWLA from iplugin import IPlugin @@ -66,7 +67,11 @@ class IWLAPreAnalysisRobots(IPlugin): return True def _setRobot(self, k, super_hit): - self.logger.debug('%s is a robot' % (k)) + callerframerecord = inspect.stack()[1] + frame = callerframerecord[0] + info = inspect.getframeinfo(frame) + + self.logger.debug('%s is a robot (caller %s:%d)' % (k, info.function, info.lineno)) super_hit['robot'] = 1 # Basic rule to detect robots @@ -84,6 +89,7 @@ class IWLAPreAnalysisRobots(IPlugin): if self.robot_re.match(first_page['http_user_agent']) or\ self.crawl_re.match(first_page['http_user_agent']): + self.logger.debug(first_page['http_user_agent']) self._setRobot(k, super_hit) continue @@ -93,6 +99,7 @@ class IWLAPreAnalysisRobots(IPlugin): break if isRobot: + self.logger.debug(first_page['http_user_agent']) self._setRobot(k, super_hit) continue @@ -103,6 +110,7 @@ class IWLAPreAnalysisRobots(IPlugin): # 2) pages without hit --> robot if not super_hit['viewed_hits']: + self.logger.debug(super_hit) self._setRobot(k, super_hit) continue From b74d4c868b18ff5d4f30ec23a5aca8dc6470c30c Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 22 May 2015 08:15:47 +0200 Subject: [PATCH 186/195] Update awstats_data --- awstats_data.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/awstats_data.py b/awstats_data.py index 1c4a0d4..7557469 100644 --- a/awstats_data.py +++ b/awstats_data.py @@ -1,26 +1,26 @@ #This file was automatically generated by iwla_convert.pl. Do not edit manually. -robots = ['appie', 'architext', 'jeeves', 'bjaaland', 'contentmatch', 'ferret', 'googlebot', 'google\-sitemaps', 'gulliver', 'virus[_+ ]detector', 'harvest', 'htdig', 'linkwalker', 'lilina', 'lycos[_+ ]', 'moget', 'muscatferret', 'myweb', 'nomad', 'scooter', 'slurp', '^voyager\/', 'weblayers', 'antibot', 'bruinbot', 'digout4u', 'echo!', 'fast\-webcrawler', 'ia_archiver\-web\.archive\.org', 'ia_archiver', 'jennybot', 'mercator', 'netcraft', 'msnbot\-media', 'msnbot', 'petersnews', 'relevantnoise\.com', 'unlost_web_crawler', 'voila', 'webbase', 'webcollage', 'cfetch', 'zyborg', 'wisenutbot', '[^a]fish', 'abcdatos', 'acme\.spider', 'ahoythehomepagefinder', 'alkaline', 'anthill', 'arachnophilia', 'arale', 'araneo', 'aretha', 'ariadne', 'powermarks', 'arks', 'aspider', 'atn\.txt', 'atomz', 'auresys', 'backrub', 'bbot', 'bigbrother', 'blackwidow', 'blindekuh', 'bloodhound', 'borg\-bot', 'brightnet', 'bspider', 'cactvschemistryspider', 'calif[^r]', 'cassandra', 'cgireader', 'checkbot', 'christcrawler', 'churl', 'cienciaficcion', 'collective', 'combine', 'conceptbot', 'coolbot', 'core', 'cosmos', 'cruiser', 'cusco', 'cyberspyder', 'desertrealm', 'deweb', 'dienstspider', 'digger', 'diibot', 'direct_hit', 'dnabot', 'download_express', 'dragonbot', 'dwcp', 'e\-collector', 'ebiness', 'elfinbot', 'emacs', 'emcspider', 'esther', 'evliyacelebi', 'fastcrawler', 'feedcrawl', 'fdse', 'felix', 'fetchrover', 'fido', 'finnish', 'fireball', 'fouineur', 'francoroute', 'freecrawl', 'funnelweb', 'gama', 'gazz', 'gcreep', 'getbot', 'geturl', 'golem', 'gougou', 'grapnel', 'griffon', 'gromit', 'gulperbot', 'hambot', 'havindex', 'hometown', 'htmlgobble', 'hyperdecontextualizer', 'iajabot', 'iaskspider', 'hl_ftien_spider', 'sogou', 'iconoclast', 'ilse', 'imagelock', 'incywincy', 'informant', 'infoseek', 'infoseeksidewinder', 'infospider', 'inspectorwww', 'intelliagent', 'irobot', 'iron33', 'israelisearch', 'javabee', 'jbot', 'jcrawler', 'jobo', 'jobot', 'joebot', 'jubii', 'jumpstation', 'kapsi', 'katipo', 'kilroy', 'ko[_+ ]yappo[_+ ]robot', 'kummhttp', 'labelgrabber\.txt', 'larbin', 'legs', 'linkidator', 'linkscan', 'lockon', 'logo_gif', 'macworm', 'magpie', 'marvin', 'mattie', 'mediafox', 'merzscope', 'meshexplorer', 'mindcrawler', 'mnogosearch', 'momspider', 'monster', 'motor', 'muncher', 'mwdsearch', 'ndspider', 'nederland\.zoek', 'netcarta', 'netmechanic', 'netscoop', 'newscan\-online', 'nhse', 'northstar', 'nzexplorer', 'objectssearch', 'occam', 'octopus', 'openfind', 'orb_search', 'packrat', 'pageboy', 'parasite', 'patric', 'pegasus', 'perignator', 'perlcrawler', 'phantom', 'phpdig', 'piltdownman', 'pimptrain', 'pioneer', 'pitkow', 'pjspider', 'plumtreewebaccessor', 'poppi', 'portalb', 'psbot', 'python', 'raven', 'rbse', 'resumerobot', 'rhcs', 'road_runner', 'robbie', 'robi', 'robocrawl', 'robofox', 'robozilla', 'roverbot', 'rules', 'safetynetrobot', 'search\-info', 'search_au', 'searchprocess', 'senrigan', 'sgscout', 'shaggy', 'shaihulud', 'sift', 'simbot', 'site\-valet', 'sitetech', 'skymob', 'slcrawler', 'smartspider', 'snooper', 'solbot', 'speedy', 'spider[_+ ]monkey', 'spiderbot', 'spiderline', 'spiderman', 'spiderview', 'spry', 'sqworm', 'ssearcher', 'suke', 'sunrise', 'suntek', 'sven', 'tach_bw', 'tagyu_agent', 'tailrank', 'tarantula', 'tarspider', 'techbot', 'templeton', 'titan', 'titin', 'tkwww', 'tlspider', 'ucsd', 'udmsearch', 'universalfeedparser', 'urlck', 'valkyrie', 'verticrawl', 'victoria', 'visionsearch', 'voidbot', 'vwbot', 'w3index', 'w3m2', 'wallpaper', 'wanderer', 'wapspIRLider', 'webbandit', 'webcatcher', 'webcopy', 'webfetcher', 'webfoot', 'webinator', 'weblinker', 'webmirror', 'webmoose', 'webquest', 'webreader', 'webreaper', 'websnarf', 'webspider', 'webvac', 'webwalk', 'webwalker', 'webwatch', 'whatuseek', 'whowhere', 'wired\-digital', 'wmir', 'wolp', 'wombat', 'wordpress', 'worm', 'woozweb', 'wwwc', 'wz101', 'xget', '1\-more_scanner', 'accoona\-ai\-agent', 'activebookmark', 'adamm_bot', 'almaden', 'aipbot', 'aleadsoftbot', 'alpha_search_agent', 'allrati', 'aport', 'archive\.org_bot', 'argus', 'arianna\.libero\.it', 'aspseek', 'asterias', 'awbot', 'baiduspider', 'becomebot', 'bender', 'betabot', 'biglotron', 'bittorrent_bot', 'biz360[_+ ]spider', 'blogbridge[_+ ]service', 'bloglines', 'blogpulse', 'blogsearch', 'blogshares', 'blogslive', 'blogssay', 'bncf\.firenze\.sbn\.it\/raccolta\.txt', 'bobby', 'boitho\.com\-dc', 'bookmark\-manager', 'boris', 'bumblebee', 'candlelight[_+ ]favorites[_+ ]inspector', 'cbn00glebot', 'cerberian_drtrs', 'cfnetwork', 'cipinetbot', 'checkweb_link_validator', 'commons\-httpclient', 'computer_and_automation_research_institute_crawler', 'converamultimediacrawler', 'converacrawler', 'cscrawler', 'cse_html_validator_lite_online', 'cuasarbot', 'cursor', 'custo', 'datafountains\/dmoz_downloader', 'daviesbot', 'daypopbot', 'deepindex', 'dipsie\.bot', 'dnsgroup', 'domainchecker', 'domainsdb\.net', 'dulance', 'dumbot', 'dumm\.de\-bot', 'earthcom\.info', 'easydl', 'edgeio\-retriever', 'ets_v', 'exactseek', 'extreme[_+ ]picture[_+ ]finder', 'eventax', 'everbeecrawler', 'everest\-vulcan', 'ezresult', 'enteprise', 'facebook', 'fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de', 'fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de', 'matrix_s\.p\.a\._\-_fast_enterprise_crawler', 'fast_enterprise_crawler', 'fast\-search\-engine', 'favicon', 'favorg', 'favorites_sweeper', 'feedburner', 'feedfetcher\-google', 'feedflow', 'feedster', 'feedsky', 'feedvalidator', 'filmkamerabot', 'findlinks', 'findexa_crawler', 'fooky\.com\/ScorpionBot', 'g2crawler', 'gaisbot', 'geniebot', 'gigabot', 'girafabot', 'global_fetch', 'gnodspider', 'goforit\.com', 'goforitbot', 'gonzo', 'grub', 'gpu_p2p_crawler', 'henrythemiragorobot', 'heritrix', 'holmes', 'hoowwwer', 'hpprint', 'htmlparser', 'html[_+ ]link[_+ ]validator', 'httrack', 'hundesuche\.com\-bot', 'ichiro', 'iltrovatore\-setaccio', 'infobot', 'infociousbot', 'infomine', 'insurancobot', 'internet[_+ ]ninja', 'internetarchive', 'internetseer', 'internetsupervision', 'irlbot', 'isearch2006', 'iupui_research_bot', 'jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility', 'justview', 'kalambot', 'kamano\.de_newsfeedverzeichnis', 'kazoombot', 'kevin', 'keyoshid', 'kinjabot', 'kinja\-imagebot', 'knowitall', 'knowledge\.com', 'kouaa_krawler', 'krugle', 'ksibot', 'kurzor', 'lanshanbot', 'letscrawl\.com', 'libcrawl', 'linkbot', 'link_valet_online', 'metager\-linkchecker', 'linkchecker', 'livejournal\.com', 'lmspider', 'lwp\-request', 'lwp\-trivial', 'magpierss', 'mail\.ru', 'mapoftheinternet\.com', 'mediapartners\-google', 'megite', 'metaspinner', 'microsoft[_+ ]url[_+ ]control', 'mini\-reptile', 'minirank', 'missigua_locator', 'misterbot', 'miva', 'mizzu_labs', 'mj12bot', 'mojeekbot', 'msiecrawler', 'ms_search_4\.0_robot', 'msrabot', 'msrbot', 'mt::telegraph::agent', 'nagios', 'nasa_search', 'mydoyouhike', 'netluchs', 'netsprint', 'newsgatoronline', 'nicebot', 'nimblecrawler', 'noxtrumbot', 'npbot', 'nutchcvs', 'nutchosu\-vlib', 'nutch', 'ocelli', 'octora_beta_bot', 'omniexplorer[_+ ]bot', 'onet\.pl[_+ ]sa', 'onfolio', 'opentaggerbot', 'openwebspider', 'oracle_ultra_search', 'orbiter', 'yodaobot', 'qihoobot', 'passwordmaker\.org', 'pear_http_request_class', 'peerbot', 'perman', 'php[_+ ]version[_+ ]tracker', 'pictureofinternet', 'ping\.blo\.gs', 'plinki', 'pluckfeedcrawler', 'pogodak', 'pompos', 'popdexter', 'port_huron_labs', 'postfavorites', 'projectwf\-java\-test\-crawler', 'proodlebot', 'pyquery', 'rambler', 'redalert', 'rojo', 'rssimagesbot', 'ruffle', 'rufusbot', 'sandcrawler', 'sbider', 'schizozilla', 'scumbot', 'searchguild[_+ ]dmoz[_+ ]experiment', 'seekbot', 'sensis_web_crawler', 'seznambot', 'shim\-crawler', 'shoutcast', 'slysearch', 'snap\.com_beta_crawler', 'sohu\-search', 'sohu', 'snappy', 'sphere_scout', 'spip', 'sproose_crawler', 'steeler', 'steroid__download', 'suchfin\-bot', 'superbot', 'surveybot', 'susie', 'syndic8', 'syndicapi', 'synoobot', 'tcl_http_client_package', 'technoratibot', 'teragramcrawlersurf', 'test_crawler', 'testbot', 't\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e', 'topicblogs', 'turnitinbot', 'turtlescanner', 'turtle', 'tutorgigbot', 'twiceler', 'ubicrawler', 'ultraseek', 'unchaos_bot_hybrid_web_search_engine', 'unido\-bot', 'updated', 'ustc\-semantic\-group', 'vagabondo\-wap', 'vagabondo', 'vermut', 'versus_crawler_from_eda\.baykan@epfl\.ch', 'vespa_crawler', 'vortex', 'vse\/', 'w3c\-checklink', 'w3c[_+ ]css[_+ ]validator[_+ ]jfouffa', 'w3c_validator', 'watchmouse', 'wavefire', 'webclipping\.com', 'webcompass', 'webcrawl\.net', 'web_downloader', 'webdup', 'webfilter', 'webindexer', 'webminer', 'website[_+ ]monitoring[_+ ]bot', 'webvulncrawl', 'wells_search', 'wonderer', 'wume_crawler', 'wwweasel', 'xenu\'s_link_sleuth', 'xenu_link_sleuth', 'xirq', 'y!j', 'yacy', 'yahoo\-blogs', 'yahoo\-verticalcrawler', 'yahoofeedseeker', 'yahooseeker\-testing', 'yahooseeker', 'yahoo\-mmcrawler', 'yahoo!_mindset', 'yandex', 'flexum', 'yanga', 'yooglifetchagent', 'z\-add_link_checker', 'zealbot', 'zhuaxia', 'zspider', 'zeus', 'ng\/1\.', 'ng\/2\.', 'exabot', 'wget', 'libwww', 'java\/[0-9]'] +robots = ['appie', 'architext', 'bingpreview', 'bjaaland', 'contentmatch', 'ferret', 'googlebot', 'google\-sitemaps', 'google[_+ ]web[_+ ]preview', 'gulliver', 'virus[_+ ]detector', 'harvest', 'htdig', 'jeeves', 'linkwalker', 'lilina', 'lycos[_+ ]', 'moget', 'muscatferret', 'myweb', 'nomad', 'scooter', 'slurp', '^voyager\/', 'weblayers', 'antibot', 'bruinbot', 'digout4u', 'echo!', 'fast\-webcrawler', 'ia_archiver\-web\.archive\.org', 'ia_archiver', 'jennybot', 'mercator', 'netcraft', 'msnbot\-media', 'msnbot', 'petersnews', 'relevantnoise\.com', 'unlost_web_crawler', 'voila', 'webbase', 'webcollage', 'cfetch', 'zyborg', 'wisenutbot', '[^a]fish', 'abcdatos', 'acme\.spider', 'ahoythehomepagefinder', 'alkaline', 'anthill', 'arachnophilia', 'arale', 'araneo', 'aretha', 'ariadne', 'powermarks', 'arks', 'aspider', 'atn\.txt', 'atomz', 'auresys', 'backrub', 'bbot', 'bigbrother', 'blackwidow', 'blindekuh', 'bloodhound', 'borg\-bot', 'brightnet', 'bspider', 'cactvschemistryspider', 'calif[^r]', 'cassandra', 'cgireader', 'checkbot', 'christcrawler', 'churl', 'cienciaficcion', 'collective', 'combine', 'conceptbot', 'coolbot', 'core', 'cosmos', 'cruiser', 'cusco', 'cyberspyder', 'desertrealm', 'deweb', 'dienstspider', 'digger', 'diibot', 'direct_hit', 'dnabot', 'download_express', 'dragonbot', 'dwcp', 'e\-collector', 'ebiness', 'elfinbot', 'emacs', 'emcspider', 'esther', 'evliyacelebi', 'fastcrawler', 'feedcrawl', 'fdse', 'felix', 'fetchrover', 'fido', 'finnish', 'fireball', 'fouineur', 'francoroute', 'freecrawl', 'funnelweb', 'gama', 'gazz', 'gcreep', 'getbot', 'geturl', 'golem', 'gougou', 'grapnel', 'griffon', 'gromit', 'gulperbot', 'hambot', 'havindex', 'hometown', 'htmlgobble', 'hyperdecontextualizer', 'iajabot', 'iaskspider', 'hl_ftien_spider', 'sogou', 'iconoclast', 'ilse', 'imagelock', 'incywincy', 'informant', 'infoseek', 'infoseeksidewinder', 'infospider', 'inspectorwww', 'intelliagent', 'irobot', 'iron33', 'israelisearch', 'javabee', 'jbot', 'jcrawler', 'jobo', 'jobot', 'joebot', 'jubii', 'jumpstation', 'kapsi', 'katipo', 'kilroy', 'ko[_+ ]yappo[_+ ]robot', 'kummhttp', 'labelgrabber\.txt', 'larbin', 'legs', 'linkidator', 'linkscan', 'lockon', 'logo_gif', 'macworm', 'magpie', 'marvin', 'mattie', 'mediafox', 'merzscope', 'meshexplorer', 'mindcrawler', 'mnogosearch', 'momspider', 'monster', 'motor', 'muncher', 'mwdsearch', 'ndspider', 'nederland\.zoek', 'netcarta', 'netmechanic', 'netscoop', 'newscan\-online', 'nhse', 'northstar', 'nzexplorer', 'objectssearch', 'occam', 'octopus', 'openfind', 'orb_search', 'packrat', 'pageboy', 'parasite', 'patric', 'pegasus', 'perignator', 'perlcrawler', 'phantom', 'phpdig', 'piltdownman', 'pimptrain', 'pioneer', 'pitkow', 'pjspider', 'plumtreewebaccessor', 'poppi', 'portalb', 'psbot', 'python', 'raven', 'rbse', 'resumerobot', 'rhcs', 'road_runner', 'robbie', 'robi', 'robocrawl', 'robofox', 'robozilla', 'roverbot', 'rules', 'safetynetrobot', 'search\-info', 'search_au', 'searchprocess', 'senrigan', 'sgscout', 'shaggy', 'shaihulud', 'sift', 'simbot', 'site\-valet', 'sitetech', 'skymob', 'slcrawler', 'smartspider', 'snooper', 'solbot', 'speedy', 'spider[_+ ]monkey', 'spiderbot', 'spiderline', 'spiderman', 'spiderview', 'spry', 'sqworm', 'ssearcher', 'suke', 'sunrise', 'suntek', 'sven', 'tach_bw', 'tagyu_agent', 'tailrank', 'tarantula', 'tarspider', 'techbot', 'templeton', 'titan', 'titin', 'tkwww', 'tlspider', 'ucsd', 'udmsearch', 'universalfeedparser', 'urlck', 'valkyrie', 'verticrawl', 'victoria', 'visionsearch', 'voidbot', 'vwbot', 'w3index', 'w3m2', 'wallpaper', 'wanderer', 'wapspIRLider', 'webbandit', 'webcatcher', 'webcopy', 'webfetcher', 'webfoot', 'webinator', 'weblinker', 'webmirror', 'webmoose', 'webquest', 'webreader', 'webreaper', 'websnarf', 'webspider', 'webvac', 'webwalk', 'webwalker', 'webwatch', 'whatuseek', 'whowhere', 'wired\-digital', 'wmir', 'wolp', 'wombat', 'wordpress', 'worm', 'woozweb', 'wwwc', 'wz101', 'xget', '1\-more_scanner', 'accoona\-ai\-agent', 'activebookmark', 'adamm_bot', 'almaden', 'aipbot', 'aleadsoftbot', 'alpha_search_agent', 'allrati', 'aport', 'archive\.org_bot', 'argus', 'arianna\.libero\.it', 'aspseek', 'asterias', 'awbot', 'baiduspider', 'becomebot', 'bender', 'betabot', 'biglotron', 'bittorrent_bot', 'biz360[_+ ]spider', 'blogbridge[_+ ]service', 'bloglines', 'blogpulse', 'blogsearch', 'blogshares', 'blogslive', 'blogssay', 'bncf\.firenze\.sbn\.it\/raccolta\.txt', 'bobby', 'boitho\.com\-dc', 'bookmark\-manager', 'boris', 'bumblebee', 'candlelight[_+ ]favorites[_+ ]inspector', 'cbn00glebot', 'cerberian_drtrs', 'cfnetwork', 'cipinetbot', 'checkweb_link_validator', 'commons\-httpclient', 'computer_and_automation_research_institute_crawler', 'converamultimediacrawler', 'converacrawler', 'cscrawler', 'cse_html_validator_lite_online', 'cuasarbot', 'cursor', 'custo', 'datafountains\/dmoz_downloader', 'daviesbot', 'daypopbot', 'deepindex', 'dipsie\.bot', 'dnsgroup', 'domainchecker', 'domainsdb\.net', 'dulance', 'dumbot', 'dumm\.de\-bot', 'earthcom\.info', 'easydl', 'edgeio\-retriever', 'ets_v', 'exactseek', 'extreme[_+ ]picture[_+ ]finder', 'eventax', 'everbeecrawler', 'everest\-vulcan', 'ezresult', 'enteprise', 'facebook', 'fast_enterprise_crawler.*crawleradmin\.t\-info@telekom\.de', 'fast_enterprise_crawler.*t\-info_bi_cluster_crawleradmin\.t\-info@telekom\.de', 'matrix_s\.p\.a\._\-_fast_enterprise_crawler', 'fast_enterprise_crawler', 'fast\-search\-engine', 'favicon', 'favorg', 'favorites_sweeper', 'feedburner', 'feedfetcher\-google', 'feedflow', 'feedster', 'feedsky', 'feedvalidator', 'filmkamerabot', 'findlinks', 'findexa_crawler', 'fooky\.com\/ScorpionBot', 'g2crawler', 'gaisbot', 'geniebot', 'gigabot', 'girafabot', 'global_fetch', 'gnodspider', 'goforit\.com', 'goforitbot', 'gonzo', 'grub', 'gpu_p2p_crawler', 'henrythemiragorobot', 'heritrix', 'holmes', 'hoowwwer', 'hpprint', 'htmlparser', 'html[_+ ]link[_+ ]validator', 'httrack', 'hundesuche\.com\-bot', 'ichiro', 'iltrovatore\-setaccio', 'infobot', 'infociousbot', 'infomine', 'insurancobot', 'internet[_+ ]ninja', 'internetarchive', 'internetseer', 'internetsupervision', 'irlbot', 'isearch2006', 'iupui_research_bot', 'jrtwine[_+ ]software[_+ ]check[_+ ]favorites[_+ ]utility', 'justview', 'kalambot', 'kamano\.de_newsfeedverzeichnis', 'kazoombot', 'kevin', 'keyoshid', 'kinjabot', 'kinja\-imagebot', 'knowitall', 'knowledge\.com', 'kouaa_krawler', 'krugle', 'ksibot', 'kurzor', 'lanshanbot', 'letscrawl\.com', 'libcrawl', 'linkbot', 'link_valet_online', 'metager\-linkchecker', 'linkchecker', 'livejournal\.com', 'lmspider', 'lwp\-request', 'lwp\-trivial', 'magpierss', 'mail\.ru', 'mapoftheinternet\.com', 'mediapartners\-google', 'megite', 'metaspinner', 'microsoft[_+ ]url[_+ ]control', 'mini\-reptile', 'minirank', 'missigua_locator', 'misterbot', 'miva', 'mizzu_labs', 'mj12bot', 'mojeekbot', 'msiecrawler', 'ms_search_4\.0_robot', 'msrabot', 'msrbot', 'mt::telegraph::agent', 'nagios', 'nasa_search', 'mydoyouhike', 'netluchs', 'netsprint', 'newsgatoronline', 'nicebot', 'nimblecrawler', 'noxtrumbot', 'npbot', 'nutchcvs', 'nutchosu\-vlib', 'nutch', 'ocelli', 'octora_beta_bot', 'omniexplorer[_+ ]bot', 'onet\.pl[_+ ]sa', 'onfolio', 'opentaggerbot', 'openwebspider', 'oracle_ultra_search', 'orbiter', 'yodaobot', 'qihoobot', 'passwordmaker\.org', 'pear_http_request_class', 'peerbot', 'perman', 'php[_+ ]version[_+ ]tracker', 'pictureofinternet', 'ping\.blo\.gs', 'plinki', 'pluckfeedcrawler', 'pogodak', 'pompos', 'popdexter', 'port_huron_labs', 'postfavorites', 'projectwf\-java\-test\-crawler', 'proodlebot', 'pyquery', 'rambler', 'redalert', 'rojo', 'rssimagesbot', 'ruffle', 'rufusbot', 'sandcrawler', 'sbider', 'schizozilla', 'scumbot', 'searchguild[_+ ]dmoz[_+ ]experiment', 'seekbot', 'sensis_web_crawler', 'seznambot', 'shim\-crawler', 'shoutcast', 'slysearch', 'snap\.com_beta_crawler', 'sohu\-search', 'sohu', 'snappy', 'sphere_scout', 'spip', 'sproose_crawler', 'steeler', 'steroid__download', 'suchfin\-bot', 'superbot', 'surveybot', 'susie', 'syndic8', 'syndicapi', 'synoobot', 'tcl_http_client_package', 'technoratibot', 'teragramcrawlersurf', 'test_crawler', 'testbot', 't\-h\-u\-n\-d\-e\-r\-s\-t\-o\-n\-e', 'topicblogs', 'turnitinbot', 'turtlescanner', 'turtle', 'tutorgigbot', 'twiceler', 'ubicrawler', 'ultraseek', 'unchaos_bot_hybrid_web_search_engine', 'unido\-bot', 'updated', 'ustc\-semantic\-group', 'vagabondo\-wap', 'vagabondo', 'vermut', 'versus_crawler_from_eda\.baykan@epfl\.ch', 'vespa_crawler', 'vortex', 'vse\/', 'w3c\-checklink', 'w3c[_+ ]css[_+ ]validator[_+ ]jfouffa', 'w3c_validator', 'watchmouse', 'wavefire', 'webclipping\.com', 'webcompass', 'webcrawl\.net', 'web_downloader', 'webdup', 'webfilter', 'webindexer', 'webminer', 'website[_+ ]monitoring[_+ ]bot', 'webvulncrawl', 'wells_search', 'wonderer', 'wume_crawler', 'wwweasel', 'xenu\'s_link_sleuth', 'xenu_link_sleuth', 'xirq', 'y!j', 'yacy', 'yahoo\-blogs', 'yahoo\-verticalcrawler', 'yahoofeedseeker', 'yahooseeker\-testing', 'yahooseeker', 'yahoo\-mmcrawler', 'yahoo!_mindset', 'yandex', 'flexum', 'yanga', 'yooglifetchagent', 'z\-add_link_checker', 'zealbot', 'zhuaxia', 'zspider', 'zeus', 'ng\/1\.', 'ng\/2\.', 'exabot', '^[1-3]$', 'alltop', 'applesyndication', 'asynchttpclient', 'bingbot', 'blogged_crawl', 'bloglovin', 'butterfly', 'buzztracker', 'carpathia', 'catbot', 'chattertrap', 'check_http', 'coldfusion', 'covario', 'daylifefeedfetcher', 'discobot', 'dlvr\.it', 'dreamwidth', 'drupal', 'ezoom', 'feedmyinbox', 'feedroll\.com', 'feedzira', 'fever\/', 'freenews', 'geohasher', 'hanrss', 'inagist', 'jacobin club', 'jakarta', 'js\-kit', 'largesmall crawler', 'linkedinbot', 'longurl', 'metauri', 'microsoft\-webdav\-miniredir', '^motorola$', 'movabletype', '^mozilla\/3\.0 \(compatible$', '^mozilla\/4\.0$', '^mozilla\/4\.0 \(compatible;\)$', '^mozilla\/5\.0$', '^mozilla\/5\.0 \(compatible;$', '^mozilla\/5\.0 \(en\-us\)$', '^mozilla\/5\.0 firefox\/3\.0\.5$', '^msie', 'netnewswire', ' netseer ', 'netvibes', 'newrelicpinger', 'newsfox', 'nextgensearchbot', 'ning', 'pingdom', 'pita', 'postpost', 'postrank', 'printfulbot', 'protopage', 'proximic', 'quipply', 'r6\_', 'ratingburner', 'regator', 'rome client', 'rpt\-httpclient', 'rssgraffiti', 'sage\+\+', 'scoutjet', 'simplepie', 'sitebot', 'summify\.com', 'superfeedr', 'synthesio', 'teoma', 'topblogsinfo', 'topix\.net', 'trapit', 'trileet', 'tweetedtimes', 'twisted pagegetter', 'twitterbot', 'twitterfeed', 'unwindfetchor', 'wazzup', 'windows\-rss\-platform', 'wiumi', 'xydo', 'yahoo! slurp', 'yahoo pipes', 'yahoo\-newscrawler', 'yahoocachesystem', 'yahooexternalcache', 'yahoo! searchmonkey', 'yahooysmcm', 'yammer', 'yandexbot', 'yeti', 'yie8', 'youdao', 'yourls', 'zemanta', 'zend_http_client', 'wget', 'libwww', '^java\/[0-9]'] search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] -search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.'] +search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'claro-search\.com', 'www1\.search-results\.com', 'www\.holasearch\.com', 'search\.conduit\.com', 'static\.flipora\.com', '(?:www[12]?|mixidj)\.delta-search\.com', 'start\.iminent\.com', 'www\.searchmobileonline\.com', 'int\.search-results\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'isearch\.avg\.com', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'search\.fbdownloader\.com', 'search\.babylon\.com', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'o2suche\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'suche\.gmx\.net', 'ecosia\.org', 'de\.aolsearch\.com', 'suche\.aol\.de', 'www\.startxxl\.com', 'www\.benefind\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'search\.genieo\.com', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.'] -not_search_engines_keys = {'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'altavista\.' : 'babelfish\.altavista\.', 'tiscali\.' : 'mail\.tiscali\.', 'yandex\.' : 'direct\.yandex\.', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.'} +not_search_engines_keys = {'tiscali\.' : 'mail\.tiscali\.', 'yandex\.' : 'direct\.yandex\.', 'altavista\.' : 'babelfish\.altavista\.', 'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.'} -search_engines_hashid = {'search\.sli\.sympatico\.ca' : 'sympatico', 'mywebsearch\.com' : 'mywebsearch', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'findarticles\.com' : 'findarticles', 'wow\.pl' : 'wowpl', 'allesklar\.de' : 'allesklar', 'atomz\.' : 'atomz', 'bing\.' : 'bing', 'find\.dk' : 'finddk', 'google\.' : 'google', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'pogodak\.' : 'pogodak', 'ask\.jp' : 'askjp', '\.baidu\.com' : 'baidu', 'tango\.hu' : 'tango_hu', 'gotuneed\.com' : 'gotuneed', 'quick\.cz' : 'quick', 'mirago' : 'mirago', 'szukaj\.wp\.pl' : 'wp', 'mirago\.de' : 'miragode', 'mirago\.dk' : 'miragodk', 'katalog\.onet\.pl' : 'katalogonetpl', 'googlee\.' : 'google', 'orbis\.dk' : 'orbis', 'turtle\.ru' : 'turtle', 'zoznam\.sk' : 'zoznam', 'start\.shaw\.ca' : 'shawca', 'chello\.at' : 'chelloat', 'centraldatabase\.org' : 'centraldatabase', 'centrum\.cz' : 'centrum', 'kataweb\.it' : 'kataweb', '\.lbb\.org' : 'lbb', 'blingo\.com' : 'blingo', 'vivisimo\.com' : 'vivisimo', 'stumbleupon\.com' : 'stumbleupon', 'es\.ask.\com' : 'askes', 'interia\.pl' : 'interiapl', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'search\.alice\.it' : 'aliceit', 'shinyseek\.it' : 'shinyseek\.it', 'i-une\.com' : 'iune', 'dejanews\.' : 'dejanews', 'opasia\.dk' : 'opasia', 'chello\.cz' : 'chellocz', 'ya(ndex)?\.ru' : 'yandex', 'kartoo\.com' : 'kartoo', 'arianna\.libero\.it' : 'arianna', 'ofir\.dk' : 'ofir', 'search\.earthlink\.net' : 'earthlink', 'biglotron\.com' : 'biglotron', 'lapkereso\.hu' : 'lapkereso', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'dodaj\.pl' : 'dodajpl', 'mirago\.be' : 'miragobe', 'googlecom\.com' : 'google', 'steadysearch\.com' : 'steadysearch', 'redbox\.cz' : 'redbox', 'haku\.www\.fi' : 'haku', 'sapo\.pt' : 'sapo', 'sphere\.com' : 'sphere', 'danielsen\.com' : 'danielsen', 'alexa\.com' : 'alexa', 'mamma\.' : 'mamma', 'swik\.net' : 'swik', 'polska\.pl' : 'polskapl', 'groups\.google\.' : 'google_groups', 'metabot\.ru' : 'metabot', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'szukaj\.onet\.pl' : 'onetpl', 'aport\.ru' : 'aport', 'de\.ask.\com' : 'askde', 'splut\.' : 'splut', 'live\.com' : 'live', '216\.239\.5[0-9]\.104' : 'google_cache', 'mysearch\.' : 'mysearch', 'ukplus\.' : 'ukplus', 'najdi\.to' : 'najdi', 'overture\.com' : 'overture', 'iask\.com' : 'iask', 'nl\.ask.\com' : 'asknl', 'nbci\.com\/search' : 'nbci', 'search\.aol\.co' : 'aol', 'eniro\.se' : 'enirose', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'mirago\.ch' : 'miragoch', 'altavista\.' : 'altavista', 'chello\.hu' : 'chellohu', 'mozbot\.fr' : 'mozbot', 'northernlight\.' : 'northernlight', 'mirago\.co\.uk' : 'miragocouk', 'search[\w\-]+\.free\.fr' : 'free', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'copernic\.com' : 'copernic', 'heureka\.hu' : 'heureka', 'steady-search\.com' : 'steadysearch', 'teecno\.it' : 'teecnoit', 'voila\.' : 'voila', 'netstjernen\.dk' : 'netstjernen', 'keresolap\.hu' : 'keresolap_hu', 'yahoo\.' : 'yahoo', 'icerocket\.com' : 'icerocket', 'alltheweb\.com' : 'alltheweb', 'www\.search\.com' : 'search.com', 'digg\.com' : 'digg', 'tiscali\.' : 'tiscali', 'spotjockey\.' : 'spotjockey', 'a9\.com' : 'a9', '(brisbane|suche)\.t-online\.de' : 't-online', 'ifind\.freeserve' : 'freeserve', 'att\.net' : 'att', 'mirago\.it' : 'miragoit', 'index\.hu' : 'indexhu', '\.sogou\.com' : 'sogou', 'no\.mirago\.com' : 'miragono', 'ineffabile\.it' : 'ineffabile', 'netluchs\.de' : 'netluchs', 'toile\.com' : 'toile', 'search\..*\.\w+' : 'search', 'del\.icio\.us' : 'delicious', 'vizsla\.origo\.hu' : 'origo', 'netscape\.' : 'netscape', 'dogpile\.com' : 'dogpile', 'anzwers\.com\.au' : 'anzwers', '\.zhongsou\.com' : 'zhongsou', 'ctrouve\.' : 'ctrouve', 'gazeta\.pl' : 'gazetapl', 'recherche\.club-internet\.fr' : 'clubinternet', 'sok\.start\.no' : 'start', 'scroogle\.org' : 'scroogle', 'schoenerbrausen\.de' : 'schoenerbrausen', 'looksmart\.co\.uk' : 'looksmartuk', 'wwweasel\.de' : 'wwweasel', 'godado' : 'godado', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'jubii\.dk' : 'jubii', '212\.227\.33\.241' : 'metaspinner', 'mirago\.fr' : 'miragofr', 'sol\.dk' : 'sol', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'jumpy\.it' : 'jumpy\.it', 'francite\.' : 'francite', 'infoseek\.de' : 'infoseek', 'es\.mirago\.com' : 'miragoes', 'jyxo\.(cz|com)' : 'jyxo', 'hotbot\.' : 'hotbot', 'engine\.exe' : 'engine', '(^|\.)ask\.com' : 'ask', 'goliat\.hu' : 'goliat', 'wisenut\.com' : 'wisenut', 'mirago\.nl' : 'miragonl', 'base\.google\.' : 'google_base', 'search\.bluewin\.ch' : 'bluewin', 'lycos\.' : 'lycos', 'meinestadt\.de' : 'meinestadt', '4\-counter\.com' : 'google4counter', 'search\.alice\.it\.master' : 'aliceitmaster', 'teoma\.' : 'teoma', '(^|\.)ask\.co\.uk' : 'askuk', 'tyfon\.dk' : 'tyfon', 'froogle\.google\.' : 'google_froogle', 'ukdirectory\.' : 'ukdirectory', 'ledix\.net' : 'ledix', 'edderkoppen\.dk' : 'edderkoppen', 'recherche\.aol\.fr' : 'aolfr', 'google\.[\w.]+/products' : 'google_products', 'webmania\.hu' : 'webmania', 'searchy\.co\.uk' : 'searchy', 'fr\.ask.\com' : 'askfr', 'spray\.' : 'spray', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'eniro\.no' : 'eniro', 'goodsearch\.com' : 'goodsearch', 'kvasir\.' : 'kvasir', '\.accoona\.com' : 'accoona', '\.soso\.com' : 'soso', 'as\.starware\.com' : 'comettoolbar', 'virgilio\.it' : 'virgilio', 'o2\.pl' : 'o2pl', 'chello\.nl' : 'chellonl', 'chello\.be' : 'chellobe', 'icq\.com\/search' : 'icq', 'msn\.' : 'msn', 'fireball\.de' : 'fireball', 'sucheaol\.aol\.de' : 'aolde', 'uk\.ask.\com' : 'askuk', 'euroseek\.' : 'euroseek', 'gery\.pl' : 'gerypl', 'chello\.fr' : 'chellofr', 'netsprint\.pl' : 'netsprintpl', 'avantfind\.com' : 'avantfind', 'supereva\.com' : 'supereva', 'polymeta\.hu' : 'polymeta_hu', 'infospace\.com' : 'infospace', 'sify\.com' : 'sify', 'go2net\.com' : 'go2net', 'wahoo\.hu' : 'wahoo', 'suche\d?\.web\.de' : 'webde', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', '\.3721\.com' : '3721', 'ilse\.' : 'ilse', 'metacrawler\.' : 'metacrawler', 'sagool\.jp' : 'sagool', 'atlas\.cz' : 'atlas', 'vindex\.' : 'vindex', 'ixquick\.com' : 'ixquick', '66\.102\.[1-9]\.104' : 'google_cache', 'rambler\.ru' : 'rambler', 'answerbus\.com' : 'answerbus', 'evreka\.passagen\.se' : 'passagen', 'chello\.se' : 'chellose', 'clusty\.com' : 'clusty', 'search\.ch' : 'searchch', 'chello\.no' : 'chellono', 'searchalot\.com' : 'searchalot', 'questionanswering\.com' : 'questionanswering', 'seznam\.cz' : 'seznam', 'ukindex\.co\.uk' : 'ukindex', 'dmoz\.org' : 'dmoz', 'excite\.' : 'excite', 'chello\.pl' : 'chellopl', 'looksmart\.' : 'looksmart', '1klik\.dk' : '1klik', '\.vnet\.cn' : 'vnet', 'chello\.sk' : 'chellosk', '(^|\.)go\.com' : 'go', 'nusearch\.com' : 'nusearch', 'it\.ask.\com' : 'askit', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'search\.terra\.' : 'terra', 'webcrawler\.' : 'webcrawler', 'suchen\.abacho\.de' : 'abacho', 'szukacz\.pl' : 'szukaczpl', '66\.249\.93\.104' : 'google_cache', 'search\.internetto\.hu' : 'internetto', 'goggle\.co\.hu' : 'google', 'mirago\.se' : 'miragose', 'images\.google\.' : 'google_image', 'segnalo\.alice\.it' : 'segnalo', '\.163\.com' : 'netease', 'chello' : 'chellocom'} +search_engines_hashid = {'live\.com' : 'live', 'lapkereso\.hu' : 'lapkereso', 'goodsearch\.com' : 'goodsearch', 'dogpile\.com' : 'dogpile', 'biglotron\.com' : 'biglotron', 'search\.internetto\.hu' : 'internetto', '66\.102\.[1-9]\.104' : 'google_cache', 'gery\.pl' : 'gerypl', 'search\.aol\.co' : 'aol', 'chello\.no' : 'chellono', '(^|\.)ask\.co\.uk' : 'askuk', 'ofir\.dk' : 'ofir', 'claro-search\.com' : 'clarosearch', 'chello\.nl' : 'chellonl', '\.soso\.com' : 'soso', 'gazeta\.pl' : 'gazetapl', 'danielsen\.com' : 'danielsen', 'rambler\.ru' : 'rambler', 'es\.ask.\com' : 'askes', 'mirago\.fr' : 'miragofr', 'search[\w\-]+\.free\.fr' : 'free', 'recherche\.aol\.fr' : 'aolfr', 'findarticles\.com' : 'findarticles', 'ask\.jp' : 'askjp', 'nl\.ask.\com' : 'asknl', 'base\.google\.' : 'google_base', 'ixquick\.com' : 'ixquick', 'search\..*\.\w+' : 'search', 'euroseek\.' : 'euroseek', 'o2\.pl' : 'o2pl', 'mirago' : 'mirago', 'overture\.com' : 'overture', 'teecno\.it' : 'teecnoit', 'att\.net' : 'att', 'find\.dk' : 'finddk', 'szukaj\.onet\.pl' : 'onetpl', 'vindex\.' : 'vindex', 'search\.alice\.it\.master' : 'aliceitmaster', 'clusty\.com' : 'clusty', 'static\.flipora\.com' : 'flipora', 'googlee\.' : 'google', 'metabot\.ru' : 'metabot', 'mirago\.co\.uk' : 'miragocouk', 'segnalo\.alice\.it' : 'segnalo', 'steady-search\.com' : 'steadysearch', 'ukindex\.co\.uk' : 'ukindex', '(^|\.)go\.com' : 'go', 'ukdirectory\.' : 'ukdirectory', 'voila\.' : 'voila', 'netluchs\.de' : 'netluchs', 'metacrawler\.' : 'metacrawler', 'engine\.exe' : 'engine', 'suche\d?\.web\.de' : 'webde', 'search\.ch' : 'searchch', 'search\.fbdownloader\.com' : 'fbdownloader', 'meinestadt\.de' : 'meinestadt', 'wow\.pl' : 'wowpl', 'alexa\.com' : 'alexa', 'francite\.' : 'francite', 'kartoo\.com' : 'kartoo', 'mirago\.nl' : 'miragonl', 'rechercher\.libertysurf\.fr' : 'libertysurf', '66\.249\.93\.104' : 'google_cache', 'excite\.' : 'excite', 'mirago\.it' : 'miragoit', 'redbox\.cz' : 'redbox', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'mirago\.ch' : 'miragoch', 'tyfon\.dk' : 'tyfon', 'looksmart\.' : 'looksmart', 'ilse\.' : 'ilse', 'ineffabile\.it' : 'ineffabile', 'eniro\.se' : 'enirose', 'looksmart\.co\.uk' : 'looksmartuk', 'vizsla\.origo\.hu' : 'origo', 'google\.' : 'google', 'stumbleupon\.com' : 'stumbleupon', 'www\.holasearch\.com' : 'holasearch', 'webcrawler\.' : 'webcrawler', 'mozbot\.fr' : 'mozbot', 'vivisimo\.com' : 'vivisimo', 'virgilio\.it' : 'virgilio', 'jyxo\.(cz|com)' : 'jyxo', 'iask\.com' : 'iask', 'avantfind\.com' : 'avantfind', 'suchen\.abacho\.de' : 'abacho', 'mywebsearch\.com' : 'mywebsearch', 'zoznam\.sk' : 'zoznam', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', 'jubii\.dk' : 'jubii', 'katalog\.onet\.pl' : 'katalogonetpl', 'opasia\.dk' : 'opasia', 'godado' : 'godado', 'search\.genieo\.com' : 'genieo', 'bungeebonesdotcom' : 'bungeebonesdotcom', '216\.239\.(35|37|39|51)\.100' : 'google_cache', '(^|\.)ask\.com' : 'ask', 'anzwers\.com\.au' : 'anzwers', 'goliat\.hu' : 'goliat', 'mamma\.' : 'mamma', 'it\.ask.\com' : 'askit', 'search\.earthlink\.net' : 'earthlink', '\.lbb\.org' : 'lbb', 'aport\.ru' : 'aport', 'www\.search\.com' : 'search.com', 'jumpy\.it' : 'jumpy\.it', 'quick\.cz' : 'quick', 'webmania\.hu' : 'webmania', 'ya(ndex)?\.ru' : 'yandex', 'suche\.aol\.de' : 'aolsuche', 'start\.shaw\.ca' : 'shawca', 'lycos\.' : 'lycos', 'sol\.dk' : 'sol', 'dodaj\.pl' : 'dodajpl', 'go2net\.com' : 'go2net', 'start\.iminent\.com' : 'iminent', 'ledix\.net' : 'ledix', '\.3721\.com' : '3721', 'alltheweb\.com' : 'alltheweb', 'blingo\.com' : 'blingo', 'search\.babylon\.com' : 'babylon', 'as\.starware\.com' : 'comettoolbar', 'mysearch\.' : 'mysearch', 'googlecom\.com' : 'google', '\.zhongsou\.com' : 'zhongsou', 'questionanswering\.com' : 'questionanswering', 'wwweasel\.de' : 'wwweasel', '212\.227\.33\.241' : 'metaspinner', 'orbis\.dk' : 'orbis', 'netsprint\.pl' : 'netsprintpl', 'del\.icio\.us' : 'delicious', 'tiscali\.' : 'tiscali', 'chello\.sk' : 'chellosk', '\.163\.com' : 'netease', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'nusearch\.com' : 'nusearch', 'netstjernen\.dk' : 'netstjernen', 'centraldatabase\.org' : 'centraldatabase', 'copernic\.com' : 'copernic', 'arianna\.libero\.it' : 'arianna', 'msn\.' : 'msn', '1klik\.dk' : '1klik', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'yahoo\.' : 'yahoo', 'digg\.com' : 'digg', 'searchy\.co\.uk' : 'searchy', 'www1\.search-results\.com' : 'searchresults', 'heureka\.hu' : 'heureka', 'kvasir\.' : 'kvasir', 'ecosia\.org' : 'ecosiasearch', 'sphere\.com' : 'sphere', 'turtle\.ru' : 'turtle', 'wisenut\.com' : 'wisenut', 'index\.hu' : 'indexhu', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'www\.benefind\.de' : 'benefind', 'google\.[\w.]+/products' : 'google_products', 'keresolap\.hu' : 'keresolap_hu', 'ctrouve\.' : 'ctrouve', 'sify\.com' : 'sify', 'szukaj\.wp\.pl' : 'wp', 'icq\.com\/search' : 'icq', 'chello\.be' : 'chellobe', 'icerocket\.com' : 'icerocket', 'northernlight\.' : 'northernlight', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'mirago\.se' : 'miragose', 'dmoz\.org' : 'dmoz', 'dejanews\.' : 'dejanews', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'polska\.pl' : 'polskapl', 'chello\.hu' : 'chellohu', '\.baidu\.com' : 'baidu', 'steadysearch\.com' : 'steadysearch', 'hotbot\.' : 'hotbot', 'sagool\.jp' : 'sagool', 'centrum\.cz' : 'centrum', 'de\.ask.\com' : 'askde', 'swik\.net' : 'swik', '(brisbane|suche)\.t-online\.de' : 't-online', '\.accoona\.com' : 'accoona', 'i-une\.com' : 'iune', 'www\.searchmobileonline\.com' : 'searchmobileonline', 'infoseek\.de' : 'infoseek', 'groups\.google\.' : 'google_groups', 'atlas\.cz' : 'atlas', 'najdi\.to' : 'najdi', 'fr\.ask.\com' : 'askfr', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'searchalot\.com' : 'searchalot', 'search\.conduit\.com' : 'conduit', 'spray\.' : 'spray', 'interia\.pl' : 'interiapl', 'spotjockey\.' : 'spotjockey', 'chello\.at' : 'chelloat', 'infospace\.com' : 'infospace', '(?:www[12]?|mixidj)\.delta-search\.com' : 'delta-search', 'chello' : 'chellocom', 'chello\.cz' : 'chellocz', 'mirago\.de' : 'miragode', '216\.239\.5[0-9]\.104' : 'google_cache', '4\-counter\.com' : 'google4counter', 'pogodak\.' : 'pogodak', 'uk\.ask.\com' : 'askuk', 'sok\.start\.no' : 'start', 'ifind\.freeserve' : 'freeserve', 'eniro\.no' : 'eniro', 'isearch\.avg\.com' : 'avgsearch', 'netscape\.' : 'netscape', 'sapo\.pt' : 'sapo', 'bing\.' : 'bing', 'search\.alice\.it' : 'aliceit', 'polymeta\.hu' : 'polymeta_hu', 'gotuneed\.com' : 'gotuneed', 'a9\.com' : 'a9', 'answerbus\.com' : 'answerbus', 'int\.search-results\.com' : 'nortonsavesearch', 'atomz\.' : 'atomz', 'sucheaol\.aol\.de' : 'aolde', 'allesklar\.de' : 'allesklar', 'es\.mirago\.com' : 'miragoes', 'szukacz\.pl' : 'szukaczpl', 'chello\.pl' : 'chellopl', 'de\.aolsearch\.com' : 'aolsearch', 'mirago\.be' : 'miragobe', '\.sogou\.com' : 'sogou', 'suche\.gmx\.net' : 'gmxsuche', '\.vnet\.cn' : 'vnet', 'toile\.com' : 'toile', 'search\.sli\.sympatico\.ca' : 'sympatico', 'search\.bluewin\.ch' : 'bluewin', 'o2suche\.aol\.de' : 'o2aolde', 'scroogle\.org' : 'scroogle', 'no\.mirago\.com' : 'miragono', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'search\.terra\.' : 'terra', 'seznam\.cz' : 'seznam', 'chello\.fr' : 'chellofr', 'wahoo\.hu' : 'wahoo', 'splut\.' : 'splut', 'kataweb\.it' : 'kataweb', 'teoma\.' : 'teoma', 'www\.startxxl\.com' : 'startxxl', 'ukplus\.' : 'ukplus', 'mirago\.dk' : 'miragodk', 'goggle\.co\.hu' : 'google', 'haku\.www\.fi' : 'haku', 'schoenerbrausen\.de' : 'schoenerbrausen', 'altavista\.' : 'altavista', 'nbci\.com\/search' : 'nbci', 'edderkoppen\.dk' : 'edderkoppen', 'chello\.se' : 'chellose', 'tango\.hu' : 'tango_hu', 'recherche\.club-internet\.fr' : 'clubinternet', 'supereva\.com' : 'supereva', 'fireball\.de' : 'fireball', 'froogle\.google\.' : 'google_froogle', 'images\.google\.' : 'google_image', 'evreka\.passagen\.se' : 'passagen', 'shinyseek\.it' : 'shinyseek\.it'} -search_engines_knwown_url = {'dmoz' : 'search=', 'google' : '(p|q|as_p|as_q)=', 'searchalot' : 'q=', 'teoma' : 'q=', 'looksmartuk' : 'key=', 'polymeta_hu' : '', 'google_groups' : 'group\/', 'iune' : '(keywords|q)=', 'chellosk' : 'q1=', 'eniro' : 'q=', 'msn' : 'q=', 'webcrawler' : 'searchText=', 'mirago' : '(txtsearch|qry)=', 'enirose' : 'q=', 'miragobe' : '(txtsearch|qry)=', 'netease' : 'q=', 'netluchs' : 'query=', 'google_products' : '(p|q|as_p|as_q)=', 'jyxo' : '(s|q)=', 'origo' : '(q|search)=', 'ilse' : 'search_for=', 'chellocom' : 'q1=', 'goodsearch' : 'Keywords=', 'ledix' : 'q=', 'mozbot' : 'q=', 'chellocz' : 'q1=', 'webde' : 'su=', 'biglotron' : 'question=', 'metacrawler_de' : 'qry=', 'finddk' : 'words=', 'start' : 'q=', 'sagool' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'aliceit' : 'qs=', 'shinyseek\.it' : 'KEY=', 'onetpl' : 'qt=', 'clusty' : 'query=', 'chellonl' : 'q1=', 'miragode' : '(txtsearch|qry)=', 'miragose' : '(txtsearch|qry)=', 'o2pl' : 'qt=', 'goliat' : 'KERESES=', 'kvasir' : 'q=', 'askfr' : '(ask|q)=', 'infoseek' : 'qt=', 'yahoo_mindset' : 'p=', 'comettoolbar' : 'qry=', 'alltheweb' : 'q(|uery)=', 'miner' : 'q=', 'aol' : 'query=', 'rambler' : 'words=', 'scroogle' : 'Gw=', 'chellose' : 'q1=', 'ineffabile' : '', 'miragoit' : '(txtsearch|qry)=', 'yandex' : 'text=', 'segnalo' : '', 'dodajpl' : 'keyword=', 'avantfind' : 'keywords=', 'nusearch' : 'nusearch_terms=', 'bbc' : 'q=', 'supereva' : 'q=', 'atomz' : 'sp-q=', 'searchy' : 'search_term=', 'dogpile' : 'q(|kw)=', 'chellohu' : 'q1=', 'vnet' : 'kw=', '1klik' : 'query=', 't-online' : 'q=', 'hogapl' : 'qt=', 'stumbleupon' : '', 'soso' : 'q=', 'zhongsou' : '(word|w)=', 'a9' : 'a9\.com\/', 'centraldatabase' : 'query=', 'mamma' : 'query=', 'icerocket' : 'q=', 'ask' : '(ask|q)=', 'chellobe' : 'q1=', 'altavista' : 'q=', 'vindex' : 'in=', 'miragodk' : '(txtsearch|qry)=', 'chelloat' : 'q1=', 'digg' : 's=', 'metacrawler' : 'general=', 'nbci' : 'keyword=', 'chellono' : 'q1=', 'icq' : 'q=', 'arianna' : 'query=', 'miragocouk' : '(txtsearch|qry)=', '3721' : '(p|name)=', 'pogodak' : 'q=', 'ukdirectory' : 'k=', 'overture' : 'keywords=', 'heureka' : 'heureka=', 'teecnoit' : 'q=', 'miragoes' : '(txtsearch|qry)=', 'haku' : 'w=', 'go' : 'qt=', 'fireball' : 'q=', 'wisenut' : 'query=', 'sify' : 'keyword=', 'ixquick' : 'query=', 'anzwers' : 'search=', 'quick' : 'query=', 'jubii' : 'soegeord=', 'questionanswering' : '', 'asknl' : '(ask|q)=', 'askde' : '(ask|q)=', 'att' : 'qry=', 'terra' : 'query=', 'bing' : 'q=', 'wowpl' : 'q=', 'freeserve' : 'q=', 'atlas' : '(searchtext|q)=', 'askuk' : '(ask|q)=', 'godado' : 'Keywords=', 'northernlight' : 'qr=', 'answerbus' : '', 'search.com' : 'q=', 'google_image' : '(p|q|as_p|as_q)=', 'jumpy\.it' : 'searchWord=', 'gazetapl' : 'slowo=', 'yahoo' : 'p=', 'hotbot' : 'mt=', 'metabot' : 'st=', 'copernic' : 'web\/', 'kartoo' : '', 'metaspinner' : 'qry=', 'toile' : 'q=', 'aolde' : 'q=', 'blingo' : 'q=', 'askit' : '(ask|q)=', 'netscape' : 'search=', 'splut' : 'pattern=', 'looksmart' : 'key=', 'sphere' : 'q=', 'sol' : 'q=', 'miragono' : '(txtsearch|qry)=', 'kataweb' : 'q=', 'ofir' : 'querytext=', 'aliceitmaster' : 'qs=', 'miragofr' : '(txtsearch|qry)=', 'spray' : 'string=', 'seznam' : '(w|q)=', 'interiapl' : 'q=', 'euroseek' : 'query=', 'schoenerbrausen' : 'q=', 'centrum' : 'q=', 'netsprintpl' : 'q=', 'go2net' : 'general=', 'katalogonetpl' : 'qt=', 'ukindex' : 'stext=', 'shawca' : 'q=', 'szukaczpl' : 'q=', 'accoona' : 'qt=', 'live' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'iask' : '(w|k)=', 'earthlink' : 'q=', 'tiscali' : 'key=', 'askes' : '(ask|q)=', 'gotuneed' : '', 'clubinternet' : 'q=', 'redbox' : 'srch=', 'delicious' : 'all=', 'chellofr' : 'q1=', 'lycos' : 'query=', 'sympatico' : 'query=', 'vivisimo' : 'query=', 'bluewin' : 'qry=', 'mysearch' : 'searchfor=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ukplus' : 'search=', 'gerypl' : 'q=', 'keresolap_hu' : 'q=', 'abacho' : 'q=', 'engine' : 'p1=', 'opasia' : 'q=', 'wp' : 'szukaj=', 'steadysearch' : 'w=', 'chellopl' : 'q1=', 'voila' : '(kw|rdata)=', 'aport' : 'r=', 'internetto' : 'searchstr=', 'passagen' : 'q=', 'wwweasel' : 'q=', 'najdi' : 'dotaz=', 'alexa' : 'q=', 'baidu' : '(wd|word)=', 'spotjockey' : 'Search_Keyword=', 'virgilio' : 'qs=', 'orbis' : 'search_field=', 'tango_hu' : 'q=', 'askjp' : '(ask|q)=', 'bungeebonesdotcom' : 'query=', 'francite' : 'name=', 'searchch' : 'q=', 'google_froogle' : '(p|q|as_p|as_q)=', 'excite' : 'search=', 'infospace' : 'qkw=', 'polskapl' : 'qt=', 'swik' : 'swik\.net/', 'edderkoppen' : 'query=', 'mywebsearch' : 'searchfor=', 'danielsen' : 'q=', 'wahoo' : 'q=', 'sogou' : 'query=', 'miragonl' : '(txtsearch|qry)=', 'findarticles' : 'key='} +search_engines_knwown_url = {'mysearch' : 'searchfor=', 'webde' : 'su=', 'chellose' : 'q1=', 'teecnoit' : 'q=', 'chellopl' : 'q1=', 'engine' : 'p1=', 'abacho' : 'q=', 'toile' : 'q=', 'internetto' : 'searchstr=', 'searchalot' : 'q=', 'teoma' : 'q=', 'rambler' : 'words=', 'att' : 'qry=', 'questionanswering' : '', 'netsprintpl' : 'q=', 'clarosearch' : 'q=', 'yahoo_mindset' : 'p=', 'interiapl' : 'q=', 'chellonl' : 'q1=', 'iask' : '(w|k)=', 'freeserve' : 'q=', 'swik' : 'swik\.net/', 'avgsearch' : 'q=', 'start' : 'q=', 'yahoo' : 'p=', 'netease' : 'q=', 'mirago' : '(txtsearch|qry)=', 'eniro' : 'q=', 'excite' : 'search=', 'searchch' : 'q=', 'findarticles' : 'key=', 'icerocket' : 'q=', 'a9' : 'a9\.com\/', 'miragose' : '(txtsearch|qry)=', 'miragoes' : '(txtsearch|qry)=', 'live' : 'q=', 'miragoit' : '(txtsearch|qry)=', 'enirose' : 'q=', 'fbdownloader' : 'q=', 'katalogonetpl' : 'qt=', 'voila' : '(kw|rdata)=', 'ixquick' : 'query=', 'iminent' : 'q=', 'passagen' : 'q=', 'copernic' : 'web\/', 'startxxl' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'vivisimo' : 'query=', 'wisenut' : 'query=', 'delta-search' : 'q=', 'quick' : 'query=', 'miragobe' : '(txtsearch|qry)=', 'baidu' : '(wd|word)=', 'tango_hu' : 'q=', 'supereva' : 'q=', 'jumpy\.it' : 'searchWord=', 'benefind' : 'q=', 'arianna' : 'query=', 'miragode' : '(txtsearch|qry)=', 'earthlink' : 'q=', 'finddk' : 'words=', 'search.com' : 'q=', 'seznam' : '(w|q)=', 'nusearch' : 'nusearch_terms=', 'ukdirectory' : 'k=', 'chellono' : 'q1=', 'ineffabile' : '', 'looksmart' : 'key=', 'metaspinner' : 'qry=', 'hotbot' : 'mt=', 'mywebsearch' : 'searchfor=', 'polymeta_hu' : '', 'steadysearch' : 'w=', 'sagool' : 'q=', 'francite' : 'name=', 'accoona' : 'qt=', 'nbci' : 'keyword=', 'soso' : 'q=', 'euroseek' : 'query=', 'iune' : '(keywords|q)=', 'spray' : 'string=', 'comettoolbar' : 'qry=', 'edderkoppen' : 'query=', 'gotuneed' : '', 'chellocz' : 'q1=', 'vnet' : 'kw=', 'kartoo' : '', 'askfr' : '(ask|q)=', 'chellohu' : 'q1=', 'metabot' : 'st=', 'lycos' : 'query=', 'bbc' : 'q=', 'shawca' : 'q=', 'jyxo' : '(s|q)=', 'netscape' : 'search=', 'godado' : 'Keywords=', 'wowpl' : 'q=', 'clubinternet' : 'q=', 'najdi' : 'dotaz=', 'bungeebonesdotcom' : 'query=', 'ecosiasearch' : 'q=', 'redbox' : 'srch=', 'ukplus' : 'search=', 'polskapl' : 'qt=', 'aol' : 'query=', 'origo' : '(q|search)=', 'yandex' : 'text=', 't-online' : 'q=', 'miragodk' : '(txtsearch|qry)=', '1klik' : 'query=', 'chellobe' : 'q1=', 'askes' : '(ask|q)=', 'go2net' : 'general=', 'atomz' : 'sp-q=', 'stumbleupon' : '', 'answerbus' : '', 'miragofr' : '(txtsearch|qry)=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'sify' : 'keyword=', '3721' : '(p|name)=', 'zhongsou' : '(word|w)=', 'gerypl' : 'q=', 'delicious' : 'all=', 'opasia' : 'q=', 'go' : 'qt=', 'segnalo' : '', 'askde' : '(ask|q)=', 'asknl' : '(ask|q)=', 'netluchs' : 'query=', 'flipora' : 'q=', 'haku' : 'w=', 'aolsearch' : 'q=', 'onetpl' : 'qt=', 'holasearch' : 'q=', 'schoenerbrausen' : 'q=', 'chellofr' : 'q1=', 'google_froogle' : '(p|q|as_p|as_q)=', 'miragocouk' : '(txtsearch|qry)=', 'dodajpl' : 'keyword=', 'aport' : 'r=', 'kataweb' : 'q=', 'anzwers' : 'search=', 'centraldatabase' : 'query=', 'szukaczpl' : 'q=', 'northernlight' : 'qr=', 'alltheweb' : 'q(|uery)=', 'infoseek' : 'qt=', 'msn' : 'q=', 'digg' : 's=', 'virgilio' : 'qs=', 'google_products' : '(p|q|as_p|as_q)=', 'danielsen' : 'q=', 'miner' : 'q=', 'ofir' : 'querytext=', 'sympatico' : 'query=', 'searchmobileonline' : 'q=', 'metacrawler' : 'general=', 'sol' : 'q=', 'altavista' : 'q=', 'miragono' : '(txtsearch|qry)=', 'sphere' : 'q=', 'looksmartuk' : 'key=', 'aolsuche' : 'q=', 'fireball' : 'q=', 'askjp' : '(ask|q)=', 'nortonsavesearch' : 'q=', 'genieo' : 'q=', 'dmoz' : 'search=', 'searchy' : 'search_term=', 'chellocom' : 'q1=', 'infospace' : 'qkw=', 'centrum' : 'q=', 'alexa' : 'q=', 'goodsearch' : 'Keywords=', 'ukindex' : 'stext=', 'conduit' : 'q=', 'wwweasel' : 'q=', 'dogpile' : 'q(|kw)=', 'overture' : 'keywords=', 'google_image' : '(p|q|as_p|as_q)=', 'google' : '(p|q|as_p|as_q)=', 'o2aolde' : 'q=', 'keresolap_hu' : 'q=', 'icq' : 'q=', 'spotjockey' : 'Search_Keyword=', 'bing' : 'q=', 'shinyseek\.it' : 'KEY=', 'orbis' : 'search_field=', 'goliat' : 'KERESES=', 'ilse' : 'search_for=', 'google_groups' : 'group\/', 'chelloat' : 'q1=', 'metacrawler_de' : 'qry=', 'searchresults' : 'q=', 'askit' : '(ask|q)=', 'miragonl' : '(txtsearch|qry)=', 'scroogle' : 'Gw=', 'terra' : 'query=', 'jubii' : 'soegeord=', 'wp' : 'szukaj=', 'chellosk' : 'q1=', 'babylon' : 'q=', 'vindex' : 'in=', 'aolde' : 'q=', 'sogou' : 'query=', 'aliceit' : 'qs=', 'kvasir' : 'q=', 'aliceitmaster' : 'qs=', 'o2pl' : 'qt=', 'biglotron' : 'question=', 'blingo' : 'q=', 'avantfind' : 'keywords=', 'mozbot' : 'q=', 'splut' : 'pattern=', 'atlas' : '(searchtext|q)=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ledix' : 'q=', 'bluewin' : 'qry=', 'clusty' : 'query=', 'pogodak' : 'q=', 'webcrawler' : 'searchText=', 'hogapl' : 'qt=', 'wahoo' : 'q=', 'gmxsuche' : 'q=', 'ask' : '(ask|q)=', 'gazetapl' : 'slowo=', 'heureka' : 'heureka=', 'tiscali' : 'key=', 'askuk' : '(ask|q)=', 'mamma' : 'query='} -operating_systems = ['windows[_+ ]?2005', 'windows[_+ ]nt[_+ ]6\.0', 'windows[_+ ]?2008', 'windows[_+ ]nt[_+ ]6\.1', 'windows[_+ ]?vista', 'windows[_+ ]nt[_+ ]6', 'windows[_+ ]?2003', 'windows[_+ ]nt[_+ ]5\.2', 'windows[_+ ]xp', 'windows[_+ ]nt[_+ ]5\.1', 'windows[_+ ]me', 'win[_+ ]9x', 'windows[_+ ]?2000', 'windows[_+ ]nt[_+ ]5', 'winnt', 'windows[_+ \-]?nt', 'win32', 'win(.*)98', 'win(.*)95', 'win(.*)16', 'windows[_+ ]3', 'win(.*)ce', 'mac[_+ ]os[_+ ]x', 'mac[_+ ]?p', 'mac[_+ ]68', 'macweb', 'macintosh', 'linux(.*)android', 'linux(.*)asplinux', 'linux(.*)centos', 'linux(.*)debian', 'linux(.*)fedora', 'linux(.*)gentoo', 'linux(.*)mandr', 'linux(.*)momonga', 'linux(.*)pclinuxos', 'linux(.*)red[_+ ]hat', 'linux(.*)suse', 'linux(.*)ubuntu', 'linux(.*)vector', 'linux(.*)vine', 'linux(.*)white\sbox', 'linux(.*)zenwalk', 'linux', 'gnu.hurd', 'bsdi', 'gnu.kfreebsd', 'freebsd', 'openbsd', 'netbsd', 'dragonfly', 'aix', 'sunos', 'irix', 'osf', 'hp\-ux', 'unix', 'x11', 'gnome\-vfs', 'beos', 'os/2', 'amiga', 'atari', 'vms', 'commodore', 'qnx', 'inferno', 'palmos', 'syllable', 'blackberry', 'cp/m', 'crayos', 'dreamcast', 'iphone[_+ ]os', 'risc[_+ ]?os', 'symbian', 'webtv', 'playstation', 'xbox', 'wii', 'vienna', 'newsfire', 'applesyndication', 'akregator', 'plagger', 'syndirella', 'j2me', 'java', 'microsoft', 'msie[_+ ]', 'ms[_+ ]frontpage', 'windows'] +operating_systems = ['windows[_+ ]?2005', 'windows[_+ ]nt[_+ ]6\.0', 'windows[_+ ]?2008', 'windows[_+ ]nt[_+ ]6\.1', 'windows[_+ ]?2012', 'windows[_+ ]nt[_+ ]6\.2', 'windows[_+ ]?vista', 'windows[_+ ]nt[_+ ]6', 'windows[_+ ]?2003', 'windows[_+ ]nt[_+ ]5\.2', 'windows[_+ ]xp', 'windows[_+ ]nt[_+ ]5\.1', 'windows[_+ ]me', 'win[_+ ]9x', 'windows[_+ ]?2000', 'windows[_+ ]nt[_+ ]5', 'winnt', 'windows[_+ \-]?nt', 'win32', 'win(.*)98', 'win(.*)95', 'win(.*)16', 'windows[_+ ]3', 'win(.*)ce', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4', 'mac[_+ ]os[_+ ]x', 'mac[_+ ]?p', 'mac[_+ ]68', 'macweb', 'macintosh', 'linux(.*)android', 'linux(.*)asplinux', 'linux(.*)centos', 'linux(.*)debian', 'linux(.*)fedora', 'linux(.*)gentoo', 'linux(.*)mandr', 'linux(.*)momonga', 'linux(.*)pclinuxos', 'linux(.*)red[_+ ]hat', 'linux(.*)suse', 'linux(.*)ubuntu', 'linux(.*)vector', 'linux(.*)vine', 'linux(.*)white\sbox', 'linux(.*)zenwalk', 'linux', 'gnu.hurd', 'bsdi', 'gnu.kfreebsd', 'freebsd', 'openbsd', 'netbsd', 'dragonfly', 'aix', 'sunos', 'irix', 'osf', 'hp\-ux', 'unix', 'x11', 'gnome\-vfs', 'beos', 'os/2', 'amiga', 'atari', 'vms', 'commodore', 'qnx', 'inferno', 'palmos', 'syllable', 'blackberry', 'cp/m', 'crayos', 'dreamcast', 'iphone[_+ ]os', 'risc[_+ ]?os', 'symbian', 'webtv', 'playstation', 'xbox', 'wii', 'vienna', 'newsfire', 'applesyndication', 'akregator', 'plagger', 'syndirella', 'j2me', 'java', 'microsoft', 'msie[_+ ]', 'ms[_+ ]frontpage', 'windows'] -operating_systems_hashid = {'crayos' : 'crayos', 'linux(.*)white\sbox' : 'linuxwhitebox', 'windows[_+ \-]?nt' : 'winnt', 'windows[_+ ]?2003' : 'win2003', 'mac[_+ ]?p' : 'macintosh', 'netbsd' : 'bsdnetbsd', 'win[_+ ]9x' : 'winme', 'vms' : 'vms', 'gnome\-vfs' : 'unix', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'dragonflybsd' : 'bsddflybsd', 'wii' : 'wii', 'linux(.*)vector' : 'linuxvector', 'microsoft' : 'winunknown', 'plagger' : 'unix', 'amiga' : 'amigaos', 'windows[_+ ]me' : 'winme', 'irix' : 'irix', 'linux(.*)android' : 'linuxandroid', 'linux(.*)suse' : 'linuxsuse', 'java' : 'java', 'win(.*)ce' : 'wince', 'cp/m' : 'cp/m', 'windows[_+ ]3' : 'win16', 'win(.*)98' : 'win98', 'windows' : 'winunknown', 'os/2' : 'os/2', 'syndirella' : 'winxp', 'osf' : 'osf', 'macweb' : 'macintosh', 'linux(.*)centos' : 'linuxcentos', 'gnu.hurd' : 'gnu', 'dreamcast' : 'dreamcast', 'linux' : 'linux', 'win(.*)16' : 'win16', 'freebsd' : 'bsdfreebsd', 'windows[_+ ]xp' : 'winxp', 'blackberry' : 'blackberry', 'macintosh' : 'macintosh', 'symbian' : 'symbian', 'linux(.*)debian' : 'linuxdebian', 'windows[_+ ]?2005' : 'winlong', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'x11' : 'unix', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'j2me' : 'j2me', 'sunos' : 'sunos', 'linux(.*)vine' : 'linuxvine', 'mac[_+ ]os[_+ ]x' : 'macosx', 'unix' : 'unix', 'windows[_+ ]?2000' : 'win2000', 'inferno' : 'inferno', 'aix' : 'aix', 'akregator' : 'linux', 'atari' : 'atari', 'linux(.*)asplinux' : 'linuxasplinux', 'linux(.*)ubuntu' : 'linuxubuntu', 'win(.*)95' : 'win95', 'xbox' : 'winxbox', 'applesyndication' : 'macosx', 'risc[_+ ]?os' : 'riscos', 'playstation' : 'psp', 'winnt' : 'winnt', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'palmos' : 'palmos', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'syllable' : 'syllable', 'commodore' : 'commodore', 'vienna' : 'macosx', 'linux(.*)gentoo' : 'linuxgentoo', 'hp\-ux' : 'hp\-ux', 'linux(.*)fedora' : 'linuxfedora', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'openbsd' : 'bsdopenbsd', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'mac[_+ ]68' : 'macintosh', 'windows[_+ ]?vista' : 'winvista', 'newsfire' : 'macosx', 'windows[_+ ]?2008' : 'win2008', 'linux(.*)mandr' : 'linuxmandr', 'gnu.kfreebsd' : 'bsdkfreebsd', 'bsdi' : 'bsdi', 'win32' : 'winnt', 'webtv' : 'webtv', 'linux(.*)momonga' : 'linuxmomonga', 'msie[_+ ]' : 'winunknown', 'qnx' : 'qnx', 'iphone[_+ ]os' : 'ios', 'linux(.*)zenwalk' : 'linuxzenwalk', 'beos' : 'beos', 'ms[_+ ]frontpage' : 'winunknown'} +operating_systems_hashid = {'msie[_+ ]' : 'winunknown', 'gnu.hurd' : 'gnu', 'osf' : 'osf', 'windows[_+ ]?vista' : 'winvista', 'unix' : 'unix', 'windows[_+ ]3' : 'win16', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'windows[_+ \-]?nt' : 'winnt', 'iphone[_+ ]os' : 'ios', 'linux(.*)vine' : 'linuxvine', 'vms' : 'vms', 'wii' : 'wii', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7' : 'macosx7', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6' : 'macosx6', 'ms[_+ ]frontpage' : 'winunknown', 'netbsd' : 'bsdnetbsd', 'linux(.*)fedora' : 'linuxfedora', 'playstation' : 'psp', 'dreamcast' : 'dreamcast', 'linux(.*)ubuntu' : 'linuxubuntu', 'win(.*)16' : 'win16', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8' : 'macosx8', 'beos' : 'beos', 'dragonflybsd' : 'bsddflybsd', 'linux(.*)zenwalk' : 'linuxzenwalk', 'symbian' : 'symbian', 'gnome\-vfs' : 'unix', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'linux(.*)android' : 'linuxandroid', 'hp\-ux' : 'hp\-ux', 'irix' : 'irix', 'windows[_+ ]?2005' : 'winlong', 'webtv' : 'webtv', 'windows[_+ ]?2000' : 'win2000', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'win(.*)ce' : 'wince', 'macweb' : 'macintosh', 'linux(.*)white\sbox' : 'linuxwhitebox', 'atari' : 'atari', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'xbox' : 'winxbox', 'linux(.*)asplinux' : 'linuxasplinux', 'win(.*)95' : 'win95', 'bsdi' : 'bsdi', 'windows[_+ ]?2003' : 'win2003', 'crayos' : 'crayos', 'aix' : 'aix', 'win[_+ ]9x' : 'winme', 'windows[_+ ]?2008' : 'win2008', 'syllable' : 'syllable', 'vienna' : 'macosx', 'commodore' : 'commodore', 'winnt' : 'winnt', 'plagger' : 'unix', 'linux' : 'linux', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5' : 'macosx5', 'newsfire' : 'macosx', 'linux(.*)vector' : 'linuxvector', 'mac[_+ ]68' : 'macintosh', 'mac[_+ ]?p' : 'macintosh', 'risc[_+ ]?os' : 'riscos', 'macintosh' : 'macintosh', 'windows[_+ ]?2012' : 'win2012', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'akregator' : 'linux', 'linux(.*)debian' : 'linuxdebian', 'sunos' : 'sunos', 'java' : 'java', 'syndirella' : 'winxp', 'linux(.*)suse' : 'linuxsuse', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9' : 'macosx9', 'microsoft' : 'winunknown', 'win(.*)98' : 'win98', 'x11' : 'unix', 'windows[_+ ]me' : 'winme', 'linux(.*)mandr' : 'linuxmandr', 'qnx' : 'qnx', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4' : 'macosx4', 'linux(.*)momonga' : 'linuxmomonga', 'cp/m' : 'cp/m', 'win32' : 'winnt', 'blackberry' : 'blackberry', 'applesyndication' : 'macosx', 'os/2' : 'os/2', 'windows[_+ ]xp' : 'winxp', 'mac[_+ ]os[_+ ]x' : 'macosx', 'linux(.*)gentoo' : 'linuxgentoo', 'inferno' : 'inferno', 'j2me' : 'j2me', 'gnu.kfreebsd' : 'bsdkfreebsd', 'windows[_+ ]nt[_+ ]6\.2' : 'win8', 'amiga' : 'amigaos', 'openbsd' : 'bsdopenbsd', 'windows' : 'winunknown', 'palmos' : 'palmos', 'freebsd' : 'bsdfreebsd', 'linux(.*)centos' : 'linuxcentos'} -operating_systems_family = {'mac' : 'Macintosh', 'linux' : 'Linux', 'bsd' : 'BSD', 'win' : 'Windows'} +operating_systems_family = {'mac' : 'Macintosh', 'linux' : 'Linux', 'win' : 'Windows', 'bsd' : 'BSD'} -browsers = ['elinks', 'firebird', 'go!zilla', 'icab', 'links', 'lynx', 'omniweb', '22acidownload', 'abrowse', 'aol\-iweng', 'amaya', 'amigavoyager', 'arora', 'aweb', 'charon', 'donzilla', 'seamonkey', 'flock', 'minefield', 'bonecho', 'granparadiso', 'songbird', 'strata', 'sylera', 'kazehakase', 'prism', 'icecat', 'iceape', 'iceweasel', 'w3clinemode', 'bpftp', 'camino', 'chimera', 'cyberdog', 'dillo', 'xchaos_arachne', 'doris', 'dreamcast', 'xbox', 'downloadagent', 'ecatch', 'emailsiphon', 'encompass', 'epiphany', 'friendlyspider', 'fresco', 'galeon', 'flashget', 'freshdownload', 'getright', 'leechget', 'netants', 'headdump', 'hotjava', 'ibrowse', 'intergo', 'k\-meleon', 'k\-ninja', 'linemodebrowser', 'lotus\-notes', 'macweb', 'multizilla', 'ncsa_mosaic', 'netcaptor', 'netpositive', 'nutscrape', 'msfrontpageexpress', 'contiki', 'emacs\-w3', 'phoenix', 'shiira', 'tzgeturl', 'viking', 'webfetcher', 'webexplorer', 'webmirror', 'webvcr', 'qnx\svoyager', 'teleport', 'webcapture', 'webcopier', 'real', 'winamp', 'windows\-media\-player', 'audion', 'freeamp', 'itunes', 'jetaudio', 'mint_audio', 'mpg123', 'mplayer', 'nsplayer', 'qts', 'quicktime', 'sonique', 'uplayer', 'xaudio', 'xine', 'xmms', 'gstreamer', 'abilon', 'aggrevator', 'aiderss', 'akregator', 'applesyndication', 'betanews_reader', 'blogbridge', 'cyndicate', 'feeddemon', 'feedreader', 'feedtools', 'greatnews', 'gregarius', 'hatena_rss', 'jetbrains_omea', 'liferea', 'netnewswire', 'newsfire', 'newsgator', 'newzcrawler', 'plagger', 'pluck', 'potu', 'pubsub\-rss\-reader', 'pulpfiction', 'rssbandit', 'rssreader', 'rssowl', 'rss\sxpress', 'rssxpress', 'sage', 'sharpreader', 'shrook', 'straw', 'syndirella', 'vienna', 'wizz\srss\snews\sreader', 'alcatel', 'lg\-', 'mot\-', 'nokia', 'panasonic', 'philips', 'sagem', 'samsung', 'sie\-', 'sec\-', 'sonyericsson', 'ericsson', 'mmef', 'mspie', 'vodafone', 'wapalizer', 'wapsilon', 'wap', 'webcollage', 'up\.', 'android', 'blackberry', 'cnf2', 'docomo', 'ipcheck', 'iphone', 'portalmmm', 'webtv', 'democracy', 'cjb\.net', 'ossproxy', 'smallproxy', 'adobeair', 'apt', 'analogx_proxy', 'gnome\-vfs', 'neon', 'curl', 'csscheck', 'httrack', 'fdm', 'javaws', 'wget', 'fget', 'chilkat', 'webdownloader\sfor\sx', 'w3m', 'wdg_validator', 'w3c_validator', 'jigsaw', 'webreaper', 'webzip', 'staroffice', 'gnus', 'nikto', 'download\smaster', 'microsoft\-webdav\-miniredir', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav', 'POE\-Component\-Client\-HTTP', 'mozilla', 'libwww', 'lwp', 'WebSec'] +browsers = ['elinks', 'firebird', 'go!zilla', 'icab', 'links', 'lynx', 'omniweb', '22acidownload', 'abrowse', 'aol\-iweng', 'amaya', 'amigavoyager', 'arora', 'aweb', 'charon', 'donzilla', 'seamonkey', 'flock', 'minefield', 'bonecho', 'granparadiso', 'songbird', 'strata', 'sylera', 'kazehakase', 'prism', 'icecat', 'iceape', 'iceweasel', 'w3clinemode', 'bpftp', 'camino', 'chimera', 'cyberdog', 'dillo', 'xchaos_arachne', 'doris', 'dreamcast', 'xbox', 'downloadagent', 'ecatch', 'emailsiphon', 'encompass', 'epiphany', 'friendlyspider', 'fresco', 'galeon', 'flashget', 'freshdownload', 'getright', 'leechget', 'netants', 'headdump', 'hotjava', 'ibrowse', 'intergo', 'k\-meleon', 'k\-ninja', 'linemodebrowser', 'lotus\-notes', 'macweb', 'multizilla', 'ncsa_mosaic', 'netcaptor', 'netpositive', 'nutscrape', 'msfrontpageexpress', 'contiki', 'emacs\-w3', 'phoenix', 'shiira', 'tzgeturl', 'viking', 'webfetcher', 'webexplorer', 'webmirror', 'webvcr', 'qnx\svoyager', 'cloudflare', 'grabber', 'teleport', 'webcapture', 'webcopier', 'real', 'winamp', 'windows\-media\-player', 'audion', 'freeamp', 'itunes', 'jetaudio', 'mint_audio', 'mpg123', 'mplayer', 'nsplayer', 'qts', 'quicktime', 'sonique', 'uplayer', 'xaudio', 'xine', 'xmms', 'gstreamer', 'abilon', 'aggrevator', 'aiderss', 'akregator', 'applesyndication', 'betanews_reader', 'blogbridge', 'cyndicate', 'feeddemon', 'feedreader', 'feedtools', 'greatnews', 'gregarius', 'hatena_rss', 'jetbrains_omea', 'liferea', 'netnewswire', 'newsfire', 'newsgator', 'newzcrawler', 'plagger', 'pluck', 'potu', 'pubsub\-rss\-reader', 'pulpfiction', 'rssbandit', 'rssreader', 'rssowl', 'rss\sxpress', 'rssxpress', 'sage', 'sharpreader', 'shrook', 'straw', 'syndirella', 'vienna', 'wizz\srss\snews\sreader', 'alcatel', 'lg\-', 'mot\-', 'nokia', 'panasonic', 'philips', 'sagem', 'samsung', 'sie\-', 'sec\-', 'sonyericsson', 'ericsson', 'mmef', 'mspie', 'vodafone', 'wapalizer', 'wapsilon', 'wap', 'webcollage', 'up\.', 'android', 'blackberry', 'cnf2', 'docomo', 'ipcheck', 'iphone', 'portalmmm', 'webtv', 'democracy', 'cjb\.net', 'ossproxy', 'smallproxy', 'adobeair', 'apt', 'analogx_proxy', 'gnome\-vfs', 'neon', 'curl', 'csscheck', 'httrack', 'fdm', 'javaws', 'wget', 'fget', 'chilkat', 'webdownloader\sfor\sx', 'w3m', 'wdg_validator', 'w3c_validator', 'jigsaw', 'webreaper', 'webzip', 'staroffice', 'gnus', 'nikto', 'download\smaster', 'microsoft\-webdav\-miniredir', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav', 'POE\-Component\-Client\-HTTP', 'mozilla', 'libwww', 'lwp', 'WebSec'] -browsers_hashid = {'jetbrains_omea' : 'Omea (RSS Reader)', 'aol\-iweng' : 'AOL-Iweng', 'webcapture' : 'Acrobat Webcapture', 'winamp' : 'WinAmp (media player)', 'chrome' : 'Google Chrome', 'analogx_proxy' : 'AnalogX Proxy', 'sylera' : 'Sylera', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'xchaos_arachne' : 'Arachne', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'lynx' : 'Lynx', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'emailsiphon' : 'EmailSiphon', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'javaws' : 'Java Web Start', 'ecatch' : 'eCatch', 'aggrevator' : 'Aggrevator (RSS Reader)', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'qts' : 'QuickTime (media player)', 'linemodebrowser' : 'W3C Line Mode Browser', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'xine' : 'Xine, a free multimedia player (media player)', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'flock' : 'Flock', 'audion' : 'Audion (media player)', 'icecat' : 'GNU IceCat', 'webfetcher' : 'WebFetcher', 'flashget' : 'FlashGet', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'friendlyspider' : 'FriendlySpider', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'ipcheck' : 'Supervision IP Check (phone)', 'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'svn' : 'Subversion client', 'lwp' : 'LibWWW-perl', 'plagger' : 'Plagger (RSS Reader)', 'shrook' : 'Shrook (RSS Reader)', 'mplayer' : 'The Movie Player (media player)', 'nsplayer' : 'NetShow Player (media player)', 'mint_audio' : 'Mint Audio (media player)', 'fget' : 'FGet', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'rssreader' : 'RssReader (RSS Reader)', 'download\smaster' : 'Download Master', 'itunes' : 'Apple iTunes (media player)', 'arora' : 'Arora', 'contiki' : 'Contiki', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'nutscrape' : 'Nutscrape', 'fdm' : 'FDM Free Download Manager', 'prism' : 'Prism', 'safari' : 'Safari', 'encompass' : 'Encompass', 'feedreader' : 'FeedReader (RSS Reader)', 'newsgator' : 'NewsGator (RSS Reader)', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'android' : 'Android browser (PDA/Phone browser)', 'strata' : 'Strata', 'teleport' : 'TelePort Pro', 'songbird' : 'Songbird', 'syndirella' : 'Syndirella (RSS Reader)', 'epiphany' : 'Epiphany', 'minefield' : 'Minefield (Firefox 3.0 development)', 'ncsa_mosaic' : 'NCSA Mosaic', 'links' : 'Links', 'macweb' : 'MacWeb', 'iphone' : 'IPhone (PDA/Phone browser)', 'cjb\.net' : 'CJB.NET Proxy', 'bpftp' : 'BPFTP', 'netcaptor' : 'NetCaptor', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'dreamcast' : 'Dreamcast', 'straw' : 'Straw (RSS Reader)', 'windows\-media\-player' : 'Windows Media Player (media player)', 'philips' : 'Philips Browser (PDA/Phone browser)', 'netpositive' : 'NetPositive', 'doris' : 'Doris (for Symbian)', 'gstreamer' : 'GStreamer (media library)', 'intergo' : 'InterGO', 'shiira' : 'Shiira', 'gregarius' : 'Gregarius (RSS Reader)', 'potu' : 'Potu (RSS Reader)', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'smallproxy' : 'SmallProxy', 'galeon' : 'Galeon', 'iceweasel' : 'Iceweasel', 'leechget' : 'LeechGet', 'opera' : 'Opera', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'samsung' : 'Samsung (PDA/Phone browser)', 'charon' : 'Charon', 'democracy' : 'Democracy', 'freshdownload' : 'FreshDownload', 'freeamp' : 'FreeAmp (media player)', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'elinks' : 'ELinks', 'multizilla' : 'MultiZilla', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'nikto' : 'Nikto Web Scanner', 'mpg123' : 'mpg123 (media player)', 'gnus' : 'Gnus Network User Services', 'firefox' : 'Firefox', 'msie' : 'MS Internet Explorer', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'akregator' : 'Akregator (RSS Reader)', 'hatena_rss' : 'Hatena (RSS Reader)', 'iceape' : 'GNU IceApe', 'viking' : 'Viking', 'k\-ninja' : 'K-Ninja', 'ibrowse' : 'iBrowse', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'apt' : 'Debian APT', 'curl' : 'Curl', 'xbox' : 'XBoX', 'aweb' : 'AWeb', 'WebSec' : 'Web Secretary', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'qnx\svoyager' : 'QNX Voyager', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'go!zilla' : 'Go!Zilla', 'cyndicate' : 'Cyndicate (RSS Reader)', 'wget' : 'Wget', 'jetaudio' : 'JetAudio (media player)', 'sharpreader' : 'SharpReader (RSS Reader)', 'w3c_validator' : 'W3C Validator', 'netscape' : 'Netscape', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'feeddemon' : 'FeedDemon (RSS Reader)', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'aiderss' : 'AideRSS (RSS Reader)', 'lg\-' : 'LG (PDA/Phone browser)', 'webzip' : 'WebZIP', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'webreaper' : 'WebReaper', 'k\-meleon' : 'K-Meleon', 'pluck' : 'Pluck (RSS Reader)', 'msfrontpageexpress' : 'MS FrontPage Express', 'fresco' : 'ANT Fresco', 'httrack' : 'HTTrack', 'real' : 'Real player or compatible (media player)', 'quicktime' : 'QuickTime (media player)', 'konqueror' : 'Konqueror', 'jigsaw' : 'W3C Validator', 'sie\-' : 'SIE (PDA/Phone browser)', 'mozilla' : 'Mozilla', '22acidownload' : '22AciDownload', 'netants' : 'NetAnts', 'csscheck' : 'WDG CSS Validator', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'sagem' : 'Sagem (PDA/Phone browser)', 'xmms' : 'XMMS (media player)', 'rssxpress' : 'RSSXpress (RSS Reader)', 'wdg_validator' : 'WDG HTML Validator', 'amigavoyager' : 'AmigaVoyager', 'vienna' : 'Vienna (RSS Reader)', 'feedtools' : 'FeedTools (RSS Reader)', 'camino' : 'Camino', 'blogbridge' : 'BlogBridge (RSS Reader)', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'hotjava' : 'Sun HotJava', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'w3m' : 'w3m', 'dillo' : 'Dillo', 'liferea' : 'Liferea (RSS Reader)', 'getright' : 'GetRight', 'kazehakase' : 'Kazehakase', 'lotus\-notes' : 'Lotus Notes web client', 'tzgeturl' : 'TzGetURL', 'sage' : 'Sage (RSS Reader)', 'webcopier' : 'WebCopier', 'phoenix' : 'Phoenix', 'abrowse' : 'ABrowse', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'w3clinemode' : 'W3CLineMode', 'chimera' : 'Chimera (Old Camino)', 'headdump' : 'HeadDump', 'abilon' : 'Abilon (RSS Reader)', 'downloadagent' : 'DownloadAgent', 'cyberdog' : 'Cyberdog', 'rssowl' : 'RSSOwl (RSS Reader)', 'newsfire' : 'NewsFire (RSS Reader)', 'webdownloader\sfor\sx' : 'Downloader for X', 'sonique' : 'Sonique (media player)', 'webmirror' : 'WebMirror', 'webexplorer' : 'IBM-WebExplorer', 'chilkat' : 'Chilkat', 'ossproxy' : 'OSSProxy', 'libwww' : 'LibWWW', 'adobeair' : 'AdobeAir', 'uplayer' : 'Ultra Player (media player)', 'amaya' : 'Amaya', 'webtv' : 'WebTV browser', 'neon' : 'Neon HTTP and WebDAV client library', 'greatnews' : 'GreatNews (RSS Reader)', 'seamonkey' : 'SeaMonkey', 'omniweb' : 'OmniWeb', 'donzilla' : 'Donzilla', 'webvcr' : 'WebVCR', 'icab' : 'iCab', 'firebird' : 'Firebird (Old Firefox)', 'staroffice' : 'StarOffice', 'emacs\-w3' : 'Emacs/w3s'} +browsers_hashid = {'nsplayer' : 'NetShow Player (media player)', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'donzilla' : 'Donzilla', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'rssxpress' : 'RSSXpress (RSS Reader)', 'flock' : 'Flock', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'contiki' : 'Contiki', 'galeon' : 'Galeon', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'aiderss' : 'AideRSS (RSS Reader)', 'jigsaw' : 'W3C Validator', 'webexplorer' : 'IBM-WebExplorer', 'blogbridge' : 'BlogBridge (RSS Reader)', 'windows\-media\-player' : 'Windows Media Player (media player)', 'chrome' : 'Google Chrome', 'webtv' : 'WebTV browser', 'iceape' : 'GNU IceApe', 'httrack' : 'HTTrack', 'mint_audio' : 'Mint Audio (media player)', 'flashget' : 'FlashGet', 'ecatch' : 'eCatch', 'newsgator' : 'NewsGator (RSS Reader)', 'analogx_proxy' : 'AnalogX Proxy', 'freeamp' : 'FreeAmp (media player)', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'macweb' : 'MacWeb', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'icecat' : 'GNU IceCat', 'arora' : 'Arora', 'webcapture' : 'Acrobat Webcapture', 'go!zilla' : 'Go!Zilla', 'liferea' : 'Liferea (RSS Reader)', 'philips' : 'Philips Browser (PDA/Phone browser)', 'pluck' : 'Pluck (RSS Reader)', 'ibrowse' : 'iBrowse', 'xbox' : 'XBoX', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'w3c_validator' : 'W3C Validator', 'real' : 'Real player or compatible (media player)', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'msie' : 'MS Internet Explorer', 'samsung' : 'Samsung (PDA/Phone browser)', 'links' : 'Links', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'democracy' : 'Democracy', 'freshdownload' : 'FreshDownload', 'webfetcher' : 'WebFetcher', 'qnx\svoyager' : 'QNX Voyager', 'netscape' : 'Netscape', 'encompass' : 'Encompass', 'sonique' : 'Sonique (media player)', 'cjb\.net' : 'CJB.NET Proxy', 'vienna' : 'Vienna (RSS Reader)', 'firebird' : 'Firebird (Old Firefox)', 'potu' : 'Potu (RSS Reader)', 'javaws' : 'Java Web Start', 'w3m' : 'w3m', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'ncsa_mosaic' : 'NCSA Mosaic', 'lotus\-notes' : 'Lotus Notes web client', 'iceweasel' : 'Iceweasel', 'amaya' : 'Amaya', 'feedtools' : 'FeedTools (RSS Reader)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'feeddemon' : 'FeedDemon (RSS Reader)', 'netants' : 'NetAnts', 'xine' : 'Xine, a free multimedia player (media player)', 'gregarius' : 'Gregarius (RSS Reader)', 'hatena_rss' : 'Hatena (RSS Reader)', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'straw' : 'Straw (RSS Reader)', 'webreaper' : 'WebReaper', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'wget' : 'Wget', 'grabber' : 'Grabber', 'gstreamer' : 'GStreamer (media library)', 'aggrevator' : 'Aggrevator (RSS Reader)', 'iphone' : 'IPhone (PDA/Phone browser)', 'aweb' : 'AWeb', 'firefox' : 'Firefox', 'staroffice' : 'StarOffice', 'ossproxy' : 'OSSProxy', 'lg\-' : 'LG (PDA/Phone browser)', 'adobeair' : 'AdobeAir', 'w3clinemode' : 'W3CLineMode', 'gnus' : 'Gnus Network User Services', 'mozilla' : 'Mozilla', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'download\smaster' : 'Download Master', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'dreamcast' : 'Dreamcast', 'getright' : 'GetRight', 'svn' : 'Subversion client', 'camino' : 'Camino', 'msfrontpageexpress' : 'MS FrontPage Express', 'intergo' : 'InterGO', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'WebSec' : 'Web Secretary', 'mplayer' : 'The Movie Player (media player)', 'mpg123' : 'mpg123 (media player)', 'shiira' : 'Shiira', 'quicktime' : 'QuickTime (media player)', 'smallproxy' : 'SmallProxy', 'bpftp' : 'BPFTP', 'webvcr' : 'WebVCR', 'webzip' : 'WebZIP', 'csscheck' : 'WDG CSS Validator', 'netcaptor' : 'NetCaptor', 'doris' : 'Doris (for Symbian)', 'uplayer' : 'Ultra Player (media player)', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)', 'headdump' : 'HeadDump', 'abilon' : 'Abilon (RSS Reader)', 'opera' : 'Opera', 'neon' : 'Neon HTTP and WebDAV client library', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'sylera' : 'Sylera', 'sie\-' : 'SIE (PDA/Phone browser)', 'webmirror' : 'WebMirror', 'ipcheck' : 'Supervision IP Check (phone)', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'wdg_validator' : 'WDG HTML Validator', 'friendlyspider' : 'FriendlySpider', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'amigavoyager' : 'AmigaVoyager', 'safari' : 'Safari', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'chimera' : 'Chimera (Old Camino)', 'curl' : 'Curl', 'konqueror' : 'Konqueror', 'audion' : 'Audion (media player)', 'nikto' : 'Nikto Web Scanner', 'tzgeturl' : 'TzGetURL', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'dillo' : 'Dillo', 'qts' : 'QuickTime (media player)', 'emacs\-w3' : 'Emacs/w3s', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'lynx' : 'Lynx', 'cyndicate' : 'Cyndicate (RSS Reader)', 'itunes' : 'Apple iTunes (media player)', 'winamp' : 'WinAmp (media player)', 'phoenix' : 'Phoenix', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'kazehakase' : 'Kazehakase', 'multizilla' : 'MultiZilla', 'hotjava' : 'Sun HotJava', 'greatnews' : 'GreatNews (RSS Reader)', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'linemodebrowser' : 'W3C Line Mode Browser', 'lwp' : 'LibWWW-perl', 'seamonkey' : 'SeaMonkey', 'jetaudio' : 'JetAudio (media player)', 'sagem' : 'Sagem (PDA/Phone browser)', 'omniweb' : 'OmniWeb', 'emailsiphon' : 'EmailSiphon', 'newsfire' : 'NewsFire (RSS Reader)', 'chilkat' : 'Chilkat', 'aol\-iweng' : 'AOL-Iweng', 'rssreader' : 'RssReader (RSS Reader)', 'minefield' : 'Minefield (Firefox 3.0 development)', '22acidownload' : '22AciDownload', 'downloadagent' : 'DownloadAgent', 'android' : 'Android browser (PDA/Phone browser)', 'plagger' : 'Plagger (RSS Reader)', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'fdm' : 'FDM Free Download Manager', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'cyberdog' : 'Cyberdog', 'webcopier' : 'WebCopier', 'abrowse' : 'ABrowse', 'strata' : 'Strata', 'leechget' : 'LeechGet', 'prism' : 'Prism', 'charon' : 'Charon', 'cloudflare' : 'CloudFlare', 'teleport' : 'TelePort Pro', 'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'sage' : 'Sage (RSS Reader)', 'xchaos_arachne' : 'Arachne', 'elinks' : 'ELinks', 'epiphany' : 'Epiphany', 'jetbrains_omea' : 'Omea (RSS Reader)', 'nutscrape' : 'Nutscrape', 'icab' : 'iCab', 'webdownloader\sfor\sx' : 'Downloader for X', 'sharpreader' : 'SharpReader (RSS Reader)', 'xmms' : 'XMMS (media player)', 'k\-ninja' : 'K-Ninja', 'apt' : 'Debian APT', 'rssowl' : 'RSSOwl (RSS Reader)', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'shrook' : 'Shrook (RSS Reader)', 'k\-meleon' : 'K-Meleon', 'fget' : 'FGet', 'libwww' : 'LibWWW', 'songbird' : 'Songbird', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'netpositive' : 'NetPositive', 'akregator' : 'Akregator (RSS Reader)', 'feedreader' : 'FeedReader (RSS Reader)', 'fresco' : 'ANT Fresco', 'syndirella' : 'Syndirella (RSS Reader)', 'viking' : 'Viking'} -browsers_icons = {'jetbrains_omea' : 'rss', 'webcapture' : 'adobe', 'winamp' : 'mediaplayer', 'chrome' : 'chrome', 'analogx_proxy' : 'analogx', 'sylera' : 'mozilla', 'rss\sxpress' : 'rss', 'mspie' : 'pdaphone', 'lynx' : 'lynx', 'alcatel' : 'pdaphone', 'javaws' : 'java', 'ecatch' : 'ecatch', 'aggrevator' : 'rss', 'mmef' : 'pdaphone', 'qts' : 'mediaplayer', 'wizz\srss\snews\sreader' : 'wizz', 'xine' : 'mediaplayer', 'gnome\-vfs' : 'gnome', 'flock' : 'flock', 'audion' : 'mediaplayer', 'icecat' : 'icecat', 'flashget' : 'flashget', 'docomo' : 'pdaphone', 'avantbrowser' : 'avant', 'wapalizer' : 'pdaphone', 'wapsilon' : 'pdaphone', 'svn' : 'subversion', 'plagger' : 'rss', 'shrook' : 'rss', 'mplayer' : 'mediaplayer', 'nsplayer' : 'netshow', 'mint_audio' : 'mediaplayer', 'panasonic' : 'pdaphone', 'rssreader' : 'rss', 'itunes' : 'mediaplayer', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'mot\-' : 'pdaphone', 'prism' : 'mozilla', 'safari' : 'safari', 'encompass' : 'encompass', 'feedreader' : 'rss', 'newsgator' : 'rss', 'microsoft\-webdav\-miniredir' : 'frontpage', 'android' : 'android', 'teleport' : 'teleport', 'strata' : 'mozilla', 'songbird' : 'mozilla', 'syndirella' : 'rss', 'epiphany' : 'epiphany', 'minefield' : 'firefox', 'ncsa_mosaic' : 'ncsa_mosaic', 'macweb' : 'macweb', 'iphone' : 'pdaphone', 'cjb\.net' : 'cjbnet', 'bpftp' : 'bpftp', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'dreamcast' : 'dreamcast', 'straw' : 'rss', 'windows\-media\-player' : 'mplayer', 'philips' : 'pdaphone', 'netpositive' : 'netpositive', 'doris' : 'doris', 'gregarius' : 'rss', 'potu' : 'rss', 'blackberry' : 'pdaphone', 'galeon' : 'galeon', 'iceweasel' : 'iceweasel', 'leechget' : 'leechget', 'opera' : 'opera', 'pubsub\-rss\-reader' : 'rss', 'vodafone' : 'pdaphone', 'rssbandit' : 'rss', 'samsung' : 'pdaphone', 'freshdownload' : 'freshdownload', 'freeamp' : 'mediaplayer', 'nokia' : 'pdaphone', 'multizilla' : 'multizilla', 'ericsson' : 'pdaphone', 'mpg123' : 'mediaplayer', 'gnus' : 'gnus', 'firefox' : 'firefox', 'msie' : 'msie', 'betanews_reader' : 'rss', 'akregator' : 'rss', 'hatena_rss' : 'rss', 'iceape' : 'mozilla', 'ibrowse' : 'ibrowse', 'sonyericsson' : 'pdaphone', 'portalmmm' : 'pdaphone', 'apt' : 'apt', 'xbox' : 'winxbox', 'aweb' : 'aweb', 'applesyndication' : 'rss', 'netnewswire' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'go!zilla' : 'gozilla', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'jetaudio' : 'mediaplayer', 'sharpreader' : 'rss', 'netscape' : 'netscape', 'webcollage' : 'pdaphone', 'feeddemon' : 'rss', 'wap' : 'pdaphone', 'aiderss' : 'rss', 'lg\-' : 'pdaphone', 'webzip' : 'webzip', 'pulpfiction' : 'rss', 'webreaper' : 'webreaper', 'pluck' : 'rss', 'k\-meleon' : 'kmeleon', 'msfrontpageexpress' : 'fpexpress', 'fresco' : 'fresco', 'httrack' : 'httrack', 'real' : 'real', 'konqueror' : 'konqueror', 'sie\-' : 'pdaphone', 'mozilla' : 'mozilla', 'sagem' : 'pdaphone', 'newzcrawler' : 'rss', 'rssxpress' : 'rss', 'xmms' : 'mediaplayer', 'vienna' : 'rss', 'amigavoyager' : 'amigavoyager', 'feedtools' : 'rss', 'camino' : 'chimera', 'blogbridge' : 'rss', 'bonecho' : 'firefox', 'granparadiso' : 'firefox', 'hotjava' : 'hotjava', 'up\.' : 'pdaphone', 'dillo' : 'dillo', 'liferea' : 'rss', 'getright' : 'getright', 'kazehakase' : 'mozilla', 'lotus\-notes' : 'lotusnotes', 'sage' : 'rss', 'webcopier' : 'webcopier', 'phoenix' : 'phoenix', 'sec\-' : 'pdaphone', 'xaudio' : 'mediaplayer', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'chimera' : 'chimera', 'abilon' : 'abilon', 'rssowl' : 'rss', 'cyberdog' : 'cyberdog', 'newsfire' : 'rss', 'sonique' : 'mediaplayer', 'adobeair' : 'adobe', 'uplayer' : 'mediaplayer', 'amaya' : 'amaya', 'webtv' : 'webtv', 'neon' : 'neon', 'greatnews' : 'rss', 'seamonkey' : 'seamonkey', 'omniweb' : 'omniweb', 'donzilla' : 'mozilla', 'icab' : 'icab', 'firebird' : 'phoenix', 'staroffice' : 'staroffice'} +browsers_icons = {'gregarius' : 'rss', 'hatena_rss' : 'rss', 'feeddemon' : 'rss', 'feedtools' : 'rss', 'granparadiso' : 'firefox', 'xine' : 'mediaplayer', 'mmef' : 'pdaphone', 'ncsa_mosaic' : 'ncsa_mosaic', 'iceweasel' : 'iceweasel', 'amaya' : 'amaya', 'lotus\-notes' : 'lotusnotes', 'javaws' : 'java', 'aggrevator' : 'rss', 'aweb' : 'aweb', 'iphone' : 'pdaphone', 'grabber' : 'grabber', 'rss\sxpress' : 'rss', 'webreaper' : 'webreaper', 'straw' : 'rss', 'sec\-' : 'pdaphone', 'getright' : 'getright', 'svn' : 'subversion', 'camino' : 'chimera', 'wizz\srss\snews\sreader' : 'wizz', 'vodafone' : 'pdaphone', 'dreamcast' : 'dreamcast', 'adobeair' : 'adobe', 'mozilla' : 'mozilla', 'gnus' : 'gnus', 'firefox' : 'firefox', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'lg\-' : 'pdaphone', 'staroffice' : 'staroffice', 'bpftp' : 'bpftp', 'webzip' : 'webzip', 'doris' : 'doris', 'uplayer' : 'mediaplayer', 'mplayer' : 'mediaplayer', 'mpg123' : 'mediaplayer', 'rssbandit' : 'rss', 'msfrontpageexpress' : 'fpexpress', 'portalmmm' : 'pdaphone', 'mspie' : 'pdaphone', 'galeon' : 'galeon', 'aiderss' : 'rss', 'microsoft\-webdav\-miniredir' : 'frontpage', 'flock' : 'flock', 'nsplayer' : 'netshow', 'donzilla' : 'mozilla', 'gnome\-vfs' : 'gnome', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'rssxpress' : 'rss', 'xaudio' : 'mediaplayer', 'analogx_proxy' : 'analogx', 'alcatel' : 'pdaphone', 'freeamp' : 'mediaplayer', 'macweb' : 'macweb', 'nokia' : 'pdaphone', 'newsgator' : 'rss', 'ecatch' : 'ecatch', 'httrack' : 'httrack', 'iceape' : 'mozilla', 'flashget' : 'flashget', 'mint_audio' : 'mediaplayer', 'chrome' : 'chrome', 'blogbridge' : 'rss', 'windows\-media\-player' : 'mplayer', 'webtv' : 'webtv', 'samsung' : 'pdaphone', 'msie' : 'msie', 'pluck' : 'rss', 'philips' : 'pdaphone', 'liferea' : 'rss', 'xbox' : 'winxbox', 'webcollage' : 'pdaphone', 'real' : 'real', 'ibrowse' : 'ibrowse', 'webcapture' : 'adobe', 'icecat' : 'icecat', 'go!zilla' : 'gozilla', 'firebird' : 'phoenix', 'potu' : 'rss', 'encompass' : 'encompass', 'netscape' : 'netscape', 'cjb\.net' : 'cjbnet', 'vienna' : 'rss', 'sonique' : 'mediaplayer', 'docomo' : 'pdaphone', 'freshdownload' : 'freshdownload', 'strata' : 'mozilla', 'panasonic' : 'pdaphone', 'cyberdog' : 'cyberdog', 'webcopier' : 'webcopier', 'plagger' : 'rss', 'mot\-' : 'pdaphone', 'android' : 'android', 'newsfire' : 'rss', 'minefield' : 'firefox', 'rssreader' : 'rss', 'icab' : 'icab', 'jetbrains_omea' : 'rss', 'epiphany' : 'epiphany', 'wapsilon' : 'pdaphone', 'sage' : 'rss', 'leechget' : 'leechget', 'teleport' : 'teleport', 'prism' : 'mozilla', 'k\-meleon' : 'kmeleon', 'apt' : 'apt', 'rssowl' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'shrook' : 'rss', 'newzcrawler' : 'rss', 'sharpreader' : 'rss', 'xmms' : 'mediaplayer', 'fresco' : 'fresco', 'syndirella' : 'rss', 'netpositive' : 'netpositive', 'akregator' : 'rss', 'feedreader' : 'rss', 'songbird' : 'mozilla', 'pulpfiction' : 'rss', 'sie\-' : 'pdaphone', 'netnewswire' : 'rss', 'sylera' : 'mozilla', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'neon' : 'neon', 'opera' : 'opera', 'sonyericsson' : 'pdaphone', 'ericsson' : 'pdaphone', 'pubsub\-rss\-reader' : 'rss', 'abilon' : 'abilon', 'chimera' : 'chimera', 'konqueror' : 'konqueror', 'amigavoyager' : 'amigavoyager', 'safari' : 'safari', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'wapalizer' : 'pdaphone', 'up\.' : 'pdaphone', 'itunes' : 'mediaplayer', 'winamp' : 'mediaplayer', 'applesyndication' : 'rss', 'phoenix' : 'phoenix', 'wap' : 'pdaphone', 'bonecho' : 'firefox', 'lynx' : 'lynx', 'dillo' : 'dillo', 'qts' : 'mediaplayer', 'blackberry' : 'pdaphone', 'audion' : 'mediaplayer', 'omniweb' : 'omniweb', 'seamonkey' : 'seamonkey', 'jetaudio' : 'mediaplayer', 'sagem' : 'pdaphone', 'avantbrowser' : 'avant', 'greatnews' : 'rss', 'hotjava' : 'hotjava', 'betanews_reader' : 'rss', 'kazehakase' : 'mozilla', 'multizilla' : 'multizilla'} From f3fc24e45ebf1d549c27d1ae1f88975457db9bc3 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 23 May 2015 08:53:06 +0200 Subject: [PATCH 187/195] Forgot default value for reset option --- iwla.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iwla.py b/iwla.py index 5e00640..ac7fca6 100755 --- a/iwla.py +++ b/iwla.py @@ -801,7 +801,8 @@ if __name__ == '__main__': default='INFO', type=str, help='Loglevel in %s, default : %s' % (['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], 'INFO')) - parser.add_argument('-r', '--reset', dest='reset', + parser.add_argument('-r', '--reset', dest='reset', action='store_true', + default=False, help='Reset analysis to a specific date (month/year)') args = parser.parse_args() From 79b58f2e1c37a54a3d747748890a5923d5ade6cf Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Sat, 23 May 2015 16:38:39 +0200 Subject: [PATCH 188/195] Add -z option (don't compress) --- iwla.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/iwla.py b/iwla.py index ac7fca6..7eb0940 100755 --- a/iwla.py +++ b/iwla.py @@ -235,15 +235,18 @@ class IWLA(object): def getDBFilename(self, time): return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % (time.tm_mon), conf.DB_FILENAME) + def _openDB(self, filename, prot='r'): + if self.args.dont_compress: + return open(filename, prot) + else: + return gzip.open(filename, prot) + def _serialize(self, obj, filename): base = os.path.dirname(filename) if not os.path.exists(base): os.makedirs(base) - # TODO : remove return - #return - - with open(filename + '.tmp', 'wb+') as f, gzip.open(filename, 'w') as fzip: + with open(filename + '.tmp', 'wb+') as f, self._openDB(filename, 'w') as fzip: pickle.dump(obj, f) f.seek(0) fzip.write(f.read()) @@ -253,7 +256,7 @@ class IWLA(object): if not os.path.exists(filename): return None - with gzip.open(filename, 'r') as f: + with self._openDB(filename) as f: return pickle.load(f) return None @@ -805,6 +808,10 @@ if __name__ == '__main__': default=False, help='Reset analysis to a specific date (month/year)') + parser.add_argument('-z', '--dont-compress', dest='dont_compress', action='store_true', + default=False, + help='Don\'t compress databases (bigger but faster)') + args = parser.parse_args() # Load user conf From 4e71380293ba864540a203a96cc9f77b82f9b8d7 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Fri, 12 Jun 2015 17:56:27 +0200 Subject: [PATCH 189/195] Add own search engines file --- awstats_data.py | 16 ++++++++-------- tools/iwla_convert.pl | 4 ++++ tools/own_search_engines.pm | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 tools/own_search_engines.pm diff --git a/awstats_data.py b/awstats_data.py index 7557469..78ee578 100644 --- a/awstats_data.py +++ b/awstats_data.py @@ -4,23 +4,23 @@ robots = ['appie', 'architext', 'bingpreview', 'bjaaland', 'contentmatch', 'ferr search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] -search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'claro-search\.com', 'www1\.search-results\.com', 'www\.holasearch\.com', 'search\.conduit\.com', 'static\.flipora\.com', '(?:www[12]?|mixidj)\.delta-search\.com', 'start\.iminent\.com', 'www\.searchmobileonline\.com', 'int\.search-results\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'isearch\.avg\.com', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'search\.fbdownloader\.com', 'search\.babylon\.com', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'o2suche\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'suche\.gmx\.net', 'ecosia\.org', 'de\.aolsearch\.com', 'suche\.aol\.de', 'www\.startxxl\.com', 'www\.benefind\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'search\.genieo\.com', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.'] +search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'claro-search\.com', 'www1\.search-results\.com', 'www\.holasearch\.com', 'search\.conduit\.com', 'static\.flipora\.com', '(?:www[12]?|mixidj)\.delta-search\.com', 'start\.iminent\.com', 'www\.searchmobileonline\.com', 'int\.search-results\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'isearch\.avg\.com', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'search\.fbdownloader\.com', 'search\.babylon\.com', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'o2suche\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'suche\.gmx\.net', 'ecosia\.org', 'de\.aolsearch\.com', 'suche\.aol\.de', 'www\.startxxl\.com', 'www\.benefind\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'search\.genieo\.com', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.', 'jwss\.cc', 'lemoteur\.orange\.fr', 'windowssearch\.com', 'qwant\.com', 'wow\.com', 'searches\.omiga-plus\.com', 'buenosearch\.com'] -not_search_engines_keys = {'tiscali\.' : 'mail\.tiscali\.', 'yandex\.' : 'direct\.yandex\.', 'altavista\.' : 'babelfish\.altavista\.', 'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.'} +not_search_engines_keys = {'altavista\.' : 'babelfish\.altavista\.', 'tiscali\.' : 'mail\.tiscali\.', 'msn\.' : 'hotmail\.msn\.', 'yandex\.' : 'direct\.yandex\.', 'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'google\.' : 'translate\.google\.'} -search_engines_hashid = {'live\.com' : 'live', 'lapkereso\.hu' : 'lapkereso', 'goodsearch\.com' : 'goodsearch', 'dogpile\.com' : 'dogpile', 'biglotron\.com' : 'biglotron', 'search\.internetto\.hu' : 'internetto', '66\.102\.[1-9]\.104' : 'google_cache', 'gery\.pl' : 'gerypl', 'search\.aol\.co' : 'aol', 'chello\.no' : 'chellono', '(^|\.)ask\.co\.uk' : 'askuk', 'ofir\.dk' : 'ofir', 'claro-search\.com' : 'clarosearch', 'chello\.nl' : 'chellonl', '\.soso\.com' : 'soso', 'gazeta\.pl' : 'gazetapl', 'danielsen\.com' : 'danielsen', 'rambler\.ru' : 'rambler', 'es\.ask.\com' : 'askes', 'mirago\.fr' : 'miragofr', 'search[\w\-]+\.free\.fr' : 'free', 'recherche\.aol\.fr' : 'aolfr', 'findarticles\.com' : 'findarticles', 'ask\.jp' : 'askjp', 'nl\.ask.\com' : 'asknl', 'base\.google\.' : 'google_base', 'ixquick\.com' : 'ixquick', 'search\..*\.\w+' : 'search', 'euroseek\.' : 'euroseek', 'o2\.pl' : 'o2pl', 'mirago' : 'mirago', 'overture\.com' : 'overture', 'teecno\.it' : 'teecnoit', 'att\.net' : 'att', 'find\.dk' : 'finddk', 'szukaj\.onet\.pl' : 'onetpl', 'vindex\.' : 'vindex', 'search\.alice\.it\.master' : 'aliceitmaster', 'clusty\.com' : 'clusty', 'static\.flipora\.com' : 'flipora', 'googlee\.' : 'google', 'metabot\.ru' : 'metabot', 'mirago\.co\.uk' : 'miragocouk', 'segnalo\.alice\.it' : 'segnalo', 'steady-search\.com' : 'steadysearch', 'ukindex\.co\.uk' : 'ukindex', '(^|\.)go\.com' : 'go', 'ukdirectory\.' : 'ukdirectory', 'voila\.' : 'voila', 'netluchs\.de' : 'netluchs', 'metacrawler\.' : 'metacrawler', 'engine\.exe' : 'engine', 'suche\d?\.web\.de' : 'webde', 'search\.ch' : 'searchch', 'search\.fbdownloader\.com' : 'fbdownloader', 'meinestadt\.de' : 'meinestadt', 'wow\.pl' : 'wowpl', 'alexa\.com' : 'alexa', 'francite\.' : 'francite', 'kartoo\.com' : 'kartoo', 'mirago\.nl' : 'miragonl', 'rechercher\.libertysurf\.fr' : 'libertysurf', '66\.249\.93\.104' : 'google_cache', 'excite\.' : 'excite', 'mirago\.it' : 'miragoit', 'redbox\.cz' : 'redbox', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'mirago\.ch' : 'miragoch', 'tyfon\.dk' : 'tyfon', 'looksmart\.' : 'looksmart', 'ilse\.' : 'ilse', 'ineffabile\.it' : 'ineffabile', 'eniro\.se' : 'enirose', 'looksmart\.co\.uk' : 'looksmartuk', 'vizsla\.origo\.hu' : 'origo', 'google\.' : 'google', 'stumbleupon\.com' : 'stumbleupon', 'www\.holasearch\.com' : 'holasearch', 'webcrawler\.' : 'webcrawler', 'mozbot\.fr' : 'mozbot', 'vivisimo\.com' : 'vivisimo', 'virgilio\.it' : 'virgilio', 'jyxo\.(cz|com)' : 'jyxo', 'iask\.com' : 'iask', 'avantfind\.com' : 'avantfind', 'suchen\.abacho\.de' : 'abacho', 'mywebsearch\.com' : 'mywebsearch', 'zoznam\.sk' : 'zoznam', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', 'jubii\.dk' : 'jubii', 'katalog\.onet\.pl' : 'katalogonetpl', 'opasia\.dk' : 'opasia', 'godado' : 'godado', 'search\.genieo\.com' : 'genieo', 'bungeebonesdotcom' : 'bungeebonesdotcom', '216\.239\.(35|37|39|51)\.100' : 'google_cache', '(^|\.)ask\.com' : 'ask', 'anzwers\.com\.au' : 'anzwers', 'goliat\.hu' : 'goliat', 'mamma\.' : 'mamma', 'it\.ask.\com' : 'askit', 'search\.earthlink\.net' : 'earthlink', '\.lbb\.org' : 'lbb', 'aport\.ru' : 'aport', 'www\.search\.com' : 'search.com', 'jumpy\.it' : 'jumpy\.it', 'quick\.cz' : 'quick', 'webmania\.hu' : 'webmania', 'ya(ndex)?\.ru' : 'yandex', 'suche\.aol\.de' : 'aolsuche', 'start\.shaw\.ca' : 'shawca', 'lycos\.' : 'lycos', 'sol\.dk' : 'sol', 'dodaj\.pl' : 'dodajpl', 'go2net\.com' : 'go2net', 'start\.iminent\.com' : 'iminent', 'ledix\.net' : 'ledix', '\.3721\.com' : '3721', 'alltheweb\.com' : 'alltheweb', 'blingo\.com' : 'blingo', 'search\.babylon\.com' : 'babylon', 'as\.starware\.com' : 'comettoolbar', 'mysearch\.' : 'mysearch', 'googlecom\.com' : 'google', '\.zhongsou\.com' : 'zhongsou', 'questionanswering\.com' : 'questionanswering', 'wwweasel\.de' : 'wwweasel', '212\.227\.33\.241' : 'metaspinner', 'orbis\.dk' : 'orbis', 'netsprint\.pl' : 'netsprintpl', 'del\.icio\.us' : 'delicious', 'tiscali\.' : 'tiscali', 'chello\.sk' : 'chellosk', '\.163\.com' : 'netease', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'nusearch\.com' : 'nusearch', 'netstjernen\.dk' : 'netstjernen', 'centraldatabase\.org' : 'centraldatabase', 'copernic\.com' : 'copernic', 'arianna\.libero\.it' : 'arianna', 'msn\.' : 'msn', '1klik\.dk' : '1klik', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'yahoo\.' : 'yahoo', 'digg\.com' : 'digg', 'searchy\.co\.uk' : 'searchy', 'www1\.search-results\.com' : 'searchresults', 'heureka\.hu' : 'heureka', 'kvasir\.' : 'kvasir', 'ecosia\.org' : 'ecosiasearch', 'sphere\.com' : 'sphere', 'turtle\.ru' : 'turtle', 'wisenut\.com' : 'wisenut', 'index\.hu' : 'indexhu', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'www\.benefind\.de' : 'benefind', 'google\.[\w.]+/products' : 'google_products', 'keresolap\.hu' : 'keresolap_hu', 'ctrouve\.' : 'ctrouve', 'sify\.com' : 'sify', 'szukaj\.wp\.pl' : 'wp', 'icq\.com\/search' : 'icq', 'chello\.be' : 'chellobe', 'icerocket\.com' : 'icerocket', 'northernlight\.' : 'northernlight', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'mirago\.se' : 'miragose', 'dmoz\.org' : 'dmoz', 'dejanews\.' : 'dejanews', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'polska\.pl' : 'polskapl', 'chello\.hu' : 'chellohu', '\.baidu\.com' : 'baidu', 'steadysearch\.com' : 'steadysearch', 'hotbot\.' : 'hotbot', 'sagool\.jp' : 'sagool', 'centrum\.cz' : 'centrum', 'de\.ask.\com' : 'askde', 'swik\.net' : 'swik', '(brisbane|suche)\.t-online\.de' : 't-online', '\.accoona\.com' : 'accoona', 'i-une\.com' : 'iune', 'www\.searchmobileonline\.com' : 'searchmobileonline', 'infoseek\.de' : 'infoseek', 'groups\.google\.' : 'google_groups', 'atlas\.cz' : 'atlas', 'najdi\.to' : 'najdi', 'fr\.ask.\com' : 'askfr', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'searchalot\.com' : 'searchalot', 'search\.conduit\.com' : 'conduit', 'spray\.' : 'spray', 'interia\.pl' : 'interiapl', 'spotjockey\.' : 'spotjockey', 'chello\.at' : 'chelloat', 'infospace\.com' : 'infospace', '(?:www[12]?|mixidj)\.delta-search\.com' : 'delta-search', 'chello' : 'chellocom', 'chello\.cz' : 'chellocz', 'mirago\.de' : 'miragode', '216\.239\.5[0-9]\.104' : 'google_cache', '4\-counter\.com' : 'google4counter', 'pogodak\.' : 'pogodak', 'uk\.ask.\com' : 'askuk', 'sok\.start\.no' : 'start', 'ifind\.freeserve' : 'freeserve', 'eniro\.no' : 'eniro', 'isearch\.avg\.com' : 'avgsearch', 'netscape\.' : 'netscape', 'sapo\.pt' : 'sapo', 'bing\.' : 'bing', 'search\.alice\.it' : 'aliceit', 'polymeta\.hu' : 'polymeta_hu', 'gotuneed\.com' : 'gotuneed', 'a9\.com' : 'a9', 'answerbus\.com' : 'answerbus', 'int\.search-results\.com' : 'nortonsavesearch', 'atomz\.' : 'atomz', 'sucheaol\.aol\.de' : 'aolde', 'allesklar\.de' : 'allesklar', 'es\.mirago\.com' : 'miragoes', 'szukacz\.pl' : 'szukaczpl', 'chello\.pl' : 'chellopl', 'de\.aolsearch\.com' : 'aolsearch', 'mirago\.be' : 'miragobe', '\.sogou\.com' : 'sogou', 'suche\.gmx\.net' : 'gmxsuche', '\.vnet\.cn' : 'vnet', 'toile\.com' : 'toile', 'search\.sli\.sympatico\.ca' : 'sympatico', 'search\.bluewin\.ch' : 'bluewin', 'o2suche\.aol\.de' : 'o2aolde', 'scroogle\.org' : 'scroogle', 'no\.mirago\.com' : 'miragono', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'search\.terra\.' : 'terra', 'seznam\.cz' : 'seznam', 'chello\.fr' : 'chellofr', 'wahoo\.hu' : 'wahoo', 'splut\.' : 'splut', 'kataweb\.it' : 'kataweb', 'teoma\.' : 'teoma', 'www\.startxxl\.com' : 'startxxl', 'ukplus\.' : 'ukplus', 'mirago\.dk' : 'miragodk', 'goggle\.co\.hu' : 'google', 'haku\.www\.fi' : 'haku', 'schoenerbrausen\.de' : 'schoenerbrausen', 'altavista\.' : 'altavista', 'nbci\.com\/search' : 'nbci', 'edderkoppen\.dk' : 'edderkoppen', 'chello\.se' : 'chellose', 'tango\.hu' : 'tango_hu', 'recherche\.club-internet\.fr' : 'clubinternet', 'supereva\.com' : 'supereva', 'fireball\.de' : 'fireball', 'froogle\.google\.' : 'google_froogle', 'images\.google\.' : 'google_image', 'evreka\.passagen\.se' : 'passagen', 'shinyseek\.it' : 'shinyseek\.it'} +search_engines_hashid = {'centrum\.cz' : 'centrum', 'polska\.pl' : 'polskapl', 'opasia\.dk' : 'opasia', 'mirago' : 'mirago', 'start\.iminent\.com' : 'iminent', 'search\.internetto\.hu' : 'internetto', 'searchy\.co\.uk' : 'searchy', 'nusearch\.com' : 'nusearch', 'searchalot\.com' : 'searchalot', 'dejanews\.' : 'dejanews', 'static\.flipora\.com' : 'flipora', 'tango\.hu' : 'tango_hu', 'msn\.' : 'msn', 'chello' : 'chellocom', 'www\.startxxl\.com' : 'startxxl', 'lapkereso\.hu' : 'lapkereso', 'netstjernen\.dk' : 'netstjernen', 'dodaj\.pl' : 'dodajpl', 'godado' : 'godado', 'looksmart\.' : 'looksmart', 'digg\.com' : 'digg', '\.163\.com' : 'netease', 'vizsla\.origo\.hu' : 'origo', 'swik\.net' : 'swik', 'as\.starware\.com' : 'comettoolbar', 'ask\.jp' : 'askjp', 'netsprint\.pl' : 'netsprintpl', 'de\.ask.\com' : 'askde', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'toile\.com' : 'toile', 'recherche\.club-internet\.fr' : 'clubinternet', 'sok\.start\.no' : 'start', '\.soso\.com' : 'soso', 'kvasir\.' : 'kvasir', 'teoma\.' : 'teoma', 'find\.dk' : 'finddk', 'vivisimo\.com' : 'vivisimo', 'search\.bluewin\.ch' : 'bluewin', 'es\.ask.\com' : 'askes', '\.zhongsou\.com' : 'zhongsou', 'mirago\.se' : 'miragose', 'sapo\.pt' : 'sapo', '\.baidu\.com' : 'baidu', 'segnalo\.alice\.it' : 'segnalo', 'kartoo\.com' : 'kartoo', 'avantfind\.com' : 'avantfind', 'search\.earthlink\.net' : 'earthlink', 'jubii\.dk' : 'jubii', 'clusty\.com' : 'clusty', 'eniro\.no' : 'eniro', 'chello\.hu' : 'chellohu', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'meinestadt\.de' : 'meinestadt', 'altavista\.' : 'altavista', 'answerbus\.com' : 'answerbus', 'webcrawler\.' : 'webcrawler', 'sol\.dk' : 'sol', 'ilse\.' : 'ilse', 'excite\.' : 'excite', 'o2\.pl' : 'o2pl', 'edderkoppen\.dk' : 'edderkoppen', 'ifind\.freeserve' : 'freeserve', 'sphere\.com' : 'sphere', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', 'es\.mirago\.com' : 'miragoes', 'evreka\.passagen\.se' : 'passagen', 'chello\.cz' : 'chellocz', 'jumpy\.it' : 'jumpy\.it', 'search\.alice\.it\.master' : 'aliceitmaster', 'redbox\.cz' : 'redbox', 'metacrawler\.' : 'metacrawler', 'szukaj\.wp\.pl' : 'wp', 'pogodak\.' : 'pogodak', 'rambler\.ru' : 'rambler', 'mirago\.de' : 'miragode', 'dogpile\.com' : 'dogpile', 'gazeta\.pl' : 'gazetapl', 'ukplus\.' : 'ukplus', 'recherche\.aol\.fr' : 'aolfr', 'steadysearch\.com' : 'steadysearch', 'googlee\.' : 'google', 'stumbleupon\.com' : 'stumbleupon', 'search\.genieo\.com' : 'genieo', '(^|\.)go\.com' : 'go', '\.3721\.com' : '3721', 'engine\.exe' : 'engine', 'search\..*\.\w+' : 'search', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'chello\.no' : 'chellono', 'claro-search\.com' : 'clarosearch', 'int\.search-results\.com' : 'nortonsavesearch', 'googlecom\.com' : 'google', 'ya(ndex)?\.ru' : 'yandex', 'anzwers\.com\.au' : 'anzwers', 'heureka\.hu' : 'heureka', 'ukdirectory\.' : 'ukdirectory', 'chello\.be' : 'chellobe', 'mywebsearch\.com' : 'mywebsearch', 'ledix\.net' : 'ledix', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'start\.shaw\.ca' : 'shawca', 'katalog\.onet\.pl' : 'katalogonetpl', 'infoseek\.de' : 'infoseek', '66\.102\.[1-9]\.104' : 'google_cache', 'wwweasel\.de' : 'wwweasel', 'index\.hu' : 'indexhu', '4\-counter\.com' : 'google4counter', 'szukacz\.pl' : 'szukaczpl', 'blingo\.com' : 'blingo', 'ofir\.dk' : 'ofir', 'questionanswering\.com' : 'questionanswering', 'chello\.fr' : 'chellofr', 'mysearch\.' : 'mysearch', 'a9\.com' : 'a9', 'de\.aolsearch\.com' : 'aolsearch', 'centraldatabase\.org' : 'centraldatabase', 'yahoo\.' : 'yahoo', 'aport\.ru' : 'aport', 'chello\.nl' : 'chellonl', 'goodsearch\.com' : 'goodsearch', 'copernic\.com' : 'copernic', '\.accoona\.com' : 'accoona', 'szukaj\.onet\.pl' : 'onetpl', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'sagool\.jp' : 'sagool', 'sify\.com' : 'sify', 'mirago\.ch' : 'miragoch', 'icq\.com\/search' : 'icq', 'schoenerbrausen\.de' : 'schoenerbrausen', 'supereva\.com' : 'supereva', 'tiscali\.' : 'tiscali', 'francite\.' : 'francite', 'images\.google\.' : 'google_image', '(^|\.)ask\.com' : 'ask', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'zoznam\.sk' : 'zoznam', 'goggle\.co\.hu' : 'google', 'i-une\.com' : 'iune', 'isearch\.avg\.com' : 'avgsearch', 'search\.fbdownloader\.com' : 'fbdownloader', 'alexa\.com' : 'alexa', '\.sogou\.com' : 'sogou', 'ecosia\.org' : 'ecosiasearch', 'o2suche\.aol\.de' : 'o2aolde', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'atlas\.cz' : 'atlas', 'mirago\.nl' : 'miragonl', '66\.249\.93\.104' : 'google_cache', '(?:www[12]?|mixidj)\.delta-search\.com' : 'delta-search', 'alltheweb\.com' : 'alltheweb', 'seznam\.cz' : 'seznam', 'netscape\.' : 'netscape', 'keresolap\.hu' : 'keresolap_hu', 'mamma\.' : 'mamma', 'jyxo\.(cz|com)' : 'jyxo', 'suche\.aol\.de' : 'aolsuche', 'search\.babylon\.com' : 'babylon', 'www1\.search-results\.com' : 'searchresults', 'search\.ch' : 'searchch', 'google\.[\w.]+/products' : 'google_products', 'bing\.' : 'bing', '212\.227\.33\.241' : 'metaspinner', 'mirago\.dk' : 'miragodk', '(^|\.)ask\.co\.uk' : 'askuk', 'nl\.ask.\com' : 'asknl', 'chello\.sk' : 'chellosk', 'teecno\.it' : 'teecnoit', 'eniro\.se' : 'enirose', 'base\.google\.' : 'google_base', 'webmania\.hu' : 'webmania', 'biglotron\.com' : 'biglotron', 'lycos\.' : 'lycos', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'hotbot\.' : 'hotbot', 'gery\.pl' : 'gerypl', 'www\.search\.com' : 'search.com', 'mirago\.be' : 'miragobe', '1klik\.dk' : '1klik', 'spotjockey\.' : 'spotjockey', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'att\.net' : 'att', 'atomz\.' : 'atomz', 'euroseek\.' : 'euroseek', 'interia\.pl' : 'interiapl', 'search[\w\-]+\.free\.fr' : 'free', 'polymeta\.hu' : 'polymeta_hu', '\.vnet\.cn' : 'vnet', 'wow\.pl' : 'wowpl', '\.lbb\.org' : 'lbb', 'search\.aol\.co' : 'aol', 'fireball\.de' : 'fireball', '216\.239\.(35|37|39|51)\.101' : 'google_cache', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'search\.sli\.sympatico\.ca' : 'sympatico', 'del\.icio\.us' : 'delicious', 'voila\.' : 'voila', 'goliat\.hu' : 'goliat', 'google\.' : 'google', 'wahoo\.hu' : 'wahoo', 'www\.holasearch\.com' : 'holasearch', 'mozbot\.fr' : 'mozbot', 'mirago\.it' : 'miragoit', 'chello\.at' : 'chelloat', '(brisbane|suche)\.t-online\.de' : 't-online', 'iask\.com' : 'iask', 'icerocket\.com' : 'icerocket', 'nbci\.com\/search' : 'nbci', 'search\.conduit\.com' : 'conduit', 'sucheaol\.aol\.de' : 'aolde', 'search\.terra\.' : 'terra', 'haku\.www\.fi' : 'haku', 'suchen\.abacho\.de' : 'abacho', 'ixquick\.com' : 'ixquick', 'danielsen\.com' : 'danielsen', 'northernlight\.' : 'northernlight', 'kataweb\.it' : 'kataweb', 'steady-search\.com' : 'steadysearch', 'netluchs\.de' : 'netluchs', 'najdi\.to' : 'najdi', 'live\.com' : 'live', 'spray\.' : 'spray', 'no\.mirago\.com' : 'miragono', 'shinyseek\.it' : 'shinyseek\.it', 'fr\.ask.\com' : 'askfr', 'virgilio\.it' : 'virgilio', 'scroogle\.org' : 'scroogle', 'ineffabile\.it' : 'ineffabile', 'orbis\.dk' : 'orbis', 'splut\.' : 'splut', 'ukindex\.co\.uk' : 'ukindex', 'findarticles\.com' : 'findarticles', 'looksmart\.co\.uk' : 'looksmartuk', 'metabot\.ru' : 'metabot', 'ctrouve\.' : 'ctrouve', 'allesklar\.de' : 'allesklar', 'search\.alice\.it' : 'aliceit', 'vindex\.' : 'vindex', 'groups\.google\.' : 'google_groups', 'suche\d?\.web\.de' : 'webde', 'quick\.cz' : 'quick', 'infospace\.com' : 'infospace', 'dmoz\.org' : 'dmoz', 'www\.benefind\.de' : 'benefind', '216\.239\.5[0-9]\.104' : 'google_cache', 'arianna\.libero\.it' : 'arianna', 'www\.searchmobileonline\.com' : 'searchmobileonline', 'mirago\.co\.uk' : 'miragocouk', 'froogle\.google\.' : 'google_froogle', 'it\.ask.\com' : 'askit', 'go2net\.com' : 'go2net', 'suche\.gmx\.net' : 'gmxsuche', 'turtle\.ru' : 'turtle', 'uk\.ask.\com' : 'askuk', 'overture\.com' : 'overture', 'chello\.se' : 'chellose', 'gotuneed\.com' : 'gotuneed', 'wisenut\.com' : 'wisenut', 'chello\.pl' : 'chellopl', 'tyfon\.dk' : 'tyfon', 'mirago\.fr' : 'miragofr', 'windowssearch\.com' : 'Windows Search', 'searches\.omiga-plus\.com' : 'Omiga-plus', 'qwant\.com' : 'Qwant', 'wow\.com' : 'WOW', 'lemoteur\.orange\.fr' : 'Orange', 'buenosearch\.com' : 'Bueno Search', 'jwss\.cc' : 'jws'} -search_engines_knwown_url = {'mysearch' : 'searchfor=', 'webde' : 'su=', 'chellose' : 'q1=', 'teecnoit' : 'q=', 'chellopl' : 'q1=', 'engine' : 'p1=', 'abacho' : 'q=', 'toile' : 'q=', 'internetto' : 'searchstr=', 'searchalot' : 'q=', 'teoma' : 'q=', 'rambler' : 'words=', 'att' : 'qry=', 'questionanswering' : '', 'netsprintpl' : 'q=', 'clarosearch' : 'q=', 'yahoo_mindset' : 'p=', 'interiapl' : 'q=', 'chellonl' : 'q1=', 'iask' : '(w|k)=', 'freeserve' : 'q=', 'swik' : 'swik\.net/', 'avgsearch' : 'q=', 'start' : 'q=', 'yahoo' : 'p=', 'netease' : 'q=', 'mirago' : '(txtsearch|qry)=', 'eniro' : 'q=', 'excite' : 'search=', 'searchch' : 'q=', 'findarticles' : 'key=', 'icerocket' : 'q=', 'a9' : 'a9\.com\/', 'miragose' : '(txtsearch|qry)=', 'miragoes' : '(txtsearch|qry)=', 'live' : 'q=', 'miragoit' : '(txtsearch|qry)=', 'enirose' : 'q=', 'fbdownloader' : 'q=', 'katalogonetpl' : 'qt=', 'voila' : '(kw|rdata)=', 'ixquick' : 'query=', 'iminent' : 'q=', 'passagen' : 'q=', 'copernic' : 'web\/', 'startxxl' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'vivisimo' : 'query=', 'wisenut' : 'query=', 'delta-search' : 'q=', 'quick' : 'query=', 'miragobe' : '(txtsearch|qry)=', 'baidu' : '(wd|word)=', 'tango_hu' : 'q=', 'supereva' : 'q=', 'jumpy\.it' : 'searchWord=', 'benefind' : 'q=', 'arianna' : 'query=', 'miragode' : '(txtsearch|qry)=', 'earthlink' : 'q=', 'finddk' : 'words=', 'search.com' : 'q=', 'seznam' : '(w|q)=', 'nusearch' : 'nusearch_terms=', 'ukdirectory' : 'k=', 'chellono' : 'q1=', 'ineffabile' : '', 'looksmart' : 'key=', 'metaspinner' : 'qry=', 'hotbot' : 'mt=', 'mywebsearch' : 'searchfor=', 'polymeta_hu' : '', 'steadysearch' : 'w=', 'sagool' : 'q=', 'francite' : 'name=', 'accoona' : 'qt=', 'nbci' : 'keyword=', 'soso' : 'q=', 'euroseek' : 'query=', 'iune' : '(keywords|q)=', 'spray' : 'string=', 'comettoolbar' : 'qry=', 'edderkoppen' : 'query=', 'gotuneed' : '', 'chellocz' : 'q1=', 'vnet' : 'kw=', 'kartoo' : '', 'askfr' : '(ask|q)=', 'chellohu' : 'q1=', 'metabot' : 'st=', 'lycos' : 'query=', 'bbc' : 'q=', 'shawca' : 'q=', 'jyxo' : '(s|q)=', 'netscape' : 'search=', 'godado' : 'Keywords=', 'wowpl' : 'q=', 'clubinternet' : 'q=', 'najdi' : 'dotaz=', 'bungeebonesdotcom' : 'query=', 'ecosiasearch' : 'q=', 'redbox' : 'srch=', 'ukplus' : 'search=', 'polskapl' : 'qt=', 'aol' : 'query=', 'origo' : '(q|search)=', 'yandex' : 'text=', 't-online' : 'q=', 'miragodk' : '(txtsearch|qry)=', '1klik' : 'query=', 'chellobe' : 'q1=', 'askes' : '(ask|q)=', 'go2net' : 'general=', 'atomz' : 'sp-q=', 'stumbleupon' : '', 'answerbus' : '', 'miragofr' : '(txtsearch|qry)=', 'miragoch' : '(txtsearch|qry)=', 'google_base' : '(p|q|as_p|as_q)=', 'sify' : 'keyword=', '3721' : '(p|name)=', 'zhongsou' : '(word|w)=', 'gerypl' : 'q=', 'delicious' : 'all=', 'opasia' : 'q=', 'go' : 'qt=', 'segnalo' : '', 'askde' : '(ask|q)=', 'asknl' : '(ask|q)=', 'netluchs' : 'query=', 'flipora' : 'q=', 'haku' : 'w=', 'aolsearch' : 'q=', 'onetpl' : 'qt=', 'holasearch' : 'q=', 'schoenerbrausen' : 'q=', 'chellofr' : 'q1=', 'google_froogle' : '(p|q|as_p|as_q)=', 'miragocouk' : '(txtsearch|qry)=', 'dodajpl' : 'keyword=', 'aport' : 'r=', 'kataweb' : 'q=', 'anzwers' : 'search=', 'centraldatabase' : 'query=', 'szukaczpl' : 'q=', 'northernlight' : 'qr=', 'alltheweb' : 'q(|uery)=', 'infoseek' : 'qt=', 'msn' : 'q=', 'digg' : 's=', 'virgilio' : 'qs=', 'google_products' : '(p|q|as_p|as_q)=', 'danielsen' : 'q=', 'miner' : 'q=', 'ofir' : 'querytext=', 'sympatico' : 'query=', 'searchmobileonline' : 'q=', 'metacrawler' : 'general=', 'sol' : 'q=', 'altavista' : 'q=', 'miragono' : '(txtsearch|qry)=', 'sphere' : 'q=', 'looksmartuk' : 'key=', 'aolsuche' : 'q=', 'fireball' : 'q=', 'askjp' : '(ask|q)=', 'nortonsavesearch' : 'q=', 'genieo' : 'q=', 'dmoz' : 'search=', 'searchy' : 'search_term=', 'chellocom' : 'q1=', 'infospace' : 'qkw=', 'centrum' : 'q=', 'alexa' : 'q=', 'goodsearch' : 'Keywords=', 'ukindex' : 'stext=', 'conduit' : 'q=', 'wwweasel' : 'q=', 'dogpile' : 'q(|kw)=', 'overture' : 'keywords=', 'google_image' : '(p|q|as_p|as_q)=', 'google' : '(p|q|as_p|as_q)=', 'o2aolde' : 'q=', 'keresolap_hu' : 'q=', 'icq' : 'q=', 'spotjockey' : 'Search_Keyword=', 'bing' : 'q=', 'shinyseek\.it' : 'KEY=', 'orbis' : 'search_field=', 'goliat' : 'KERESES=', 'ilse' : 'search_for=', 'google_groups' : 'group\/', 'chelloat' : 'q1=', 'metacrawler_de' : 'qry=', 'searchresults' : 'q=', 'askit' : '(ask|q)=', 'miragonl' : '(txtsearch|qry)=', 'scroogle' : 'Gw=', 'terra' : 'query=', 'jubii' : 'soegeord=', 'wp' : 'szukaj=', 'chellosk' : 'q1=', 'babylon' : 'q=', 'vindex' : 'in=', 'aolde' : 'q=', 'sogou' : 'query=', 'aliceit' : 'qs=', 'kvasir' : 'q=', 'aliceitmaster' : 'qs=', 'o2pl' : 'qt=', 'biglotron' : 'question=', 'blingo' : 'q=', 'avantfind' : 'keywords=', 'mozbot' : 'q=', 'splut' : 'pattern=', 'atlas' : '(searchtext|q)=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'ledix' : 'q=', 'bluewin' : 'qry=', 'clusty' : 'query=', 'pogodak' : 'q=', 'webcrawler' : 'searchText=', 'hogapl' : 'qt=', 'wahoo' : 'q=', 'gmxsuche' : 'q=', 'ask' : '(ask|q)=', 'gazetapl' : 'slowo=', 'heureka' : 'heureka=', 'tiscali' : 'key=', 'askuk' : '(ask|q)=', 'mamma' : 'query='} +search_engines_knwown_url = {'segnalo' : '', 'comettoolbar' : 'qry=', 'chellofr' : 'q1=', 'yandex' : 'text=', 'google_products' : '(p|q|as_p|as_q)=', 'genieo' : 'q=', 'searchy' : 'search_term=', 'goodsearch' : 'Keywords=', 'chellocz' : 'q1=', 'tango_hu' : 'q=', 'msn' : 'q=', 'nortonsavesearch' : 'q=', 'o2aolde' : 'q=', 'miragocouk' : '(txtsearch|qry)=', 'google_image' : '(p|q|as_p|as_q)=', 'questionanswering' : '', 'conduit' : 'q=', 'start' : 'q=', 'miner' : 'q=', 'haku' : 'w=', 'ecosiasearch' : 'q=', 'kataweb' : 'q=', 'ukindex' : 'stext=', 'rambler' : 'words=', 'pogodak' : 'q=', 'toile' : 'q=', 'jubii' : 'soegeord=', 'spotjockey' : 'Search_Keyword=', 'gmxsuche' : 'q=', 'ledix' : 'q=', 'steadysearch' : 'w=', 'miragofr' : '(txtsearch|qry)=', 'askjp' : '(ask|q)=', 'teecnoit' : 'q=', 'anzwers' : 'search=', 'ixquick' : 'query=', 'metaspinner' : 'qry=', 'dmoz' : 'search=', 'sphere' : 'q=', 'ukdirectory' : 'k=', 'miragonl' : '(txtsearch|qry)=', 'francite' : 'name=', 'bbc' : 'q=', 'goliat' : 'KERESES=', 'terra' : 'query=', 'sympatico' : 'query=', 'aport' : 'r=', 'vnet' : 'kw=', 'jumpy\.it' : 'searchWord=', 'miragoes' : '(txtsearch|qry)=', 'netease' : 'q=', 'origo' : '(q|search)=', 'northernlight' : 'qr=', 'ofir' : 'querytext=', 'delta-search' : 'q=', 'bungeebonesdotcom' : 'query=', 'digg' : 's=', 'holasearch' : 'q=', 'finddk' : 'words=', 'ilse' : 'search_for=', 'orbis' : 'search_field=', 'clubinternet' : 'q=', 'live' : 'q=', 'yahoo_mindset' : 'p=', 'tiscali' : 'key=', 'hogapl' : 'qt=', 'seznam' : '(w|q)=', 'katalogonetpl' : 'qt=', 'teoma' : 'q=', 'chellonl' : 'q1=', 'virgilio' : 'qs=', 'freeserve' : 'q=', 'sify' : 'keyword=', 'gazetapl' : 'slowo=', 'voila' : '(kw|rdata)=', 'alexa' : 'q=', 'searchresults' : 'q=', 'mozbot' : 'q=', 'blingo' : 'q=', 'nbci' : 'keyword=', 'chellohu' : 'q1=', 'ineffabile' : '', '1klik' : 'query=', 'webcrawler' : 'searchText=', 'yahoo' : 'p=', 'atlas' : '(searchtext|q)=', 'onetpl' : 'qt=', 'miragodk' : '(txtsearch|qry)=', 'altavista' : 'q=', 'godado' : 'Keywords=', 'bluewin' : 'qry=', 'a9' : 'a9\.com\/', 'earthlink' : 'q=', 'dodajpl' : 'keyword=', 'copernic' : 'web\/', 'delicious' : 'all=', 'aliceitmaster' : 'qs=', 'splut' : 'pattern=', 'excite' : 'search=', 'avgsearch' : 'q=', 'danielsen' : 'q=', 'edderkoppen' : 'query=', 'go' : 'qt=', 'aolsearch' : 'q=', 'schoenerbrausen' : 'q=', 'stumbleupon' : '', 'askit' : '(ask|q)=', 'kartoo' : '', 'wowpl' : 'q=', 'mirago' : '(txtsearch|qry)=', 'netsprintpl' : 'q=', 'vivisimo' : 'query=', 'benefind' : 'q=', 'polymeta_hu' : '', 'engine' : 'p1=', 'searchch' : 'q=', 'looksmart' : 'key=', 'metabot' : 'st=', 'quick' : 'query=', 'google' : '(p|q|as_p|as_q)=', 'kvasir' : 'q=', 'netscape' : 'search=', 'fireball' : 'q=', 'clarosearch' : 'q=', 'search.com' : 'q=', 'infospace' : 'qkw=', 'eniro' : 'q=', 'biglotron' : 'question=', 'aolsuche' : 'q=', 'miragoit' : '(txtsearch|qry)=', 'google_groups' : 'group\/', 'avantfind' : 'keywords=', 'passagen' : 'q=', 'aliceit' : 'qs=', 'redbox' : 'srch=', 'ukplus' : 'search=', 'supereva' : 'q=', 'vindex' : 'in=', 'internetto' : 'searchstr=', 'centrum' : 'q=', 'iask' : '(w|k)=', 'atomz' : 'sp-q=', 'chellocom' : 'q1=', 'lycos' : 'query=', 'metacrawler' : 'general=', 'polskapl' : 'qt=', 'abacho' : 'q=', 'shinyseek\.it' : 'KEY=', 'aol' : 'query=', 'wisenut' : 'query=', 'clusty' : 'query=', 'wwweasel' : 'q=', '3721' : '(p|name)=', 'sagool' : 'q=', 'sogou' : 'query=', 'swik' : 'swik\.net/', 'jyxo' : '(s|q)=', 'google_froogle' : '(p|q|as_p|as_q)=', 'findarticles' : 'key=', 'miragode' : '(txtsearch|qry)=', 'najdi' : 'dotaz=', 'google_base' : '(p|q|as_p|as_q)=', 'enirose' : 'q=', 'miragose' : '(txtsearch|qry)=', 'interiapl' : 'q=', 'iminent' : 'q=', 't-online' : 'q=', 'chellosk' : 'q1=', 'bing' : 'q=', 'webde' : 'su=', 'flipora' : 'q=', 'alltheweb' : 'q(|uery)=', 'mywebsearch' : 'searchfor=', 'overture' : 'keywords=', 'centraldatabase' : 'query=', 'icerocket' : 'q=', 'askuk' : '(ask|q)=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'soso' : 'q=', 'mysearch' : 'searchfor=', 'scroogle' : 'Gw=', 'ask' : '(ask|q)=', 'metacrawler_de' : 'qry=', 'spray' : 'string=', 'iune' : '(keywords|q)=', 'searchalot' : 'q=', 'wp' : 'szukaj=', 'gotuneed' : '', 'babylon' : 'q=', 'euroseek' : 'query=', 'shawca' : 'q=', 'hotbot' : 'mt=', 'askfr' : '(ask|q)=', 'att' : 'qry=', 'miragono' : '(txtsearch|qry)=', 'nusearch' : 'nusearch_terms=', 'chelloat' : 'q1=', 'netluchs' : 'query=', 'fbdownloader' : 'q=', 'wahoo' : 'q=', 'chellono' : 'q1=', 'keresolap_hu' : 'q=', 'gerypl' : 'q=', 'baidu' : '(wd|word)=', 'szukaczpl' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'arianna' : 'query=', 'asknl' : '(ask|q)=', 'heureka' : 'heureka=', 'opasia' : 'q=', 'icq' : 'q=', 'chellobe' : 'q1=', 'aolde' : 'q=', 'answerbus' : '', 'askde' : '(ask|q)=', 'looksmartuk' : 'key=', 'google4counter' : '(p|q|as_p|as_q)=', 'miragobe' : '(txtsearch|qry)=', 'startxxl' : 'q=', 'o2pl' : 'qt=', 'zhongsou' : '(word|w)=', 'searchmobileonline' : 'q=', 'mamma' : 'query=', 'go2net' : 'general=', 'sol' : 'q=', 'askes' : '(ask|q)=', 'chellose' : 'q1=', 'dogpile' : 'q(|kw)=', 'chellopl' : 'q1=', 'accoona' : 'qt=', 'infoseek' : 'qt=', 'Omiga-plus' : 'q=', 'Qwant' : 'q=', 'Windows Search' : 'q=', 'Bueno Search' : 'q=', 'Orange' : 'kw=', 'jws' : 'q=', 'WOW' : 'q='} operating_systems = ['windows[_+ ]?2005', 'windows[_+ ]nt[_+ ]6\.0', 'windows[_+ ]?2008', 'windows[_+ ]nt[_+ ]6\.1', 'windows[_+ ]?2012', 'windows[_+ ]nt[_+ ]6\.2', 'windows[_+ ]?vista', 'windows[_+ ]nt[_+ ]6', 'windows[_+ ]?2003', 'windows[_+ ]nt[_+ ]5\.2', 'windows[_+ ]xp', 'windows[_+ ]nt[_+ ]5\.1', 'windows[_+ ]me', 'win[_+ ]9x', 'windows[_+ ]?2000', 'windows[_+ ]nt[_+ ]5', 'winnt', 'windows[_+ \-]?nt', 'win32', 'win(.*)98', 'win(.*)95', 'win(.*)16', 'windows[_+ ]3', 'win(.*)ce', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4', 'mac[_+ ]os[_+ ]x', 'mac[_+ ]?p', 'mac[_+ ]68', 'macweb', 'macintosh', 'linux(.*)android', 'linux(.*)asplinux', 'linux(.*)centos', 'linux(.*)debian', 'linux(.*)fedora', 'linux(.*)gentoo', 'linux(.*)mandr', 'linux(.*)momonga', 'linux(.*)pclinuxos', 'linux(.*)red[_+ ]hat', 'linux(.*)suse', 'linux(.*)ubuntu', 'linux(.*)vector', 'linux(.*)vine', 'linux(.*)white\sbox', 'linux(.*)zenwalk', 'linux', 'gnu.hurd', 'bsdi', 'gnu.kfreebsd', 'freebsd', 'openbsd', 'netbsd', 'dragonfly', 'aix', 'sunos', 'irix', 'osf', 'hp\-ux', 'unix', 'x11', 'gnome\-vfs', 'beos', 'os/2', 'amiga', 'atari', 'vms', 'commodore', 'qnx', 'inferno', 'palmos', 'syllable', 'blackberry', 'cp/m', 'crayos', 'dreamcast', 'iphone[_+ ]os', 'risc[_+ ]?os', 'symbian', 'webtv', 'playstation', 'xbox', 'wii', 'vienna', 'newsfire', 'applesyndication', 'akregator', 'plagger', 'syndirella', 'j2me', 'java', 'microsoft', 'msie[_+ ]', 'ms[_+ ]frontpage', 'windows'] -operating_systems_hashid = {'msie[_+ ]' : 'winunknown', 'gnu.hurd' : 'gnu', 'osf' : 'osf', 'windows[_+ ]?vista' : 'winvista', 'unix' : 'unix', 'windows[_+ ]3' : 'win16', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'windows[_+ \-]?nt' : 'winnt', 'iphone[_+ ]os' : 'ios', 'linux(.*)vine' : 'linuxvine', 'vms' : 'vms', 'wii' : 'wii', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7' : 'macosx7', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6' : 'macosx6', 'ms[_+ ]frontpage' : 'winunknown', 'netbsd' : 'bsdnetbsd', 'linux(.*)fedora' : 'linuxfedora', 'playstation' : 'psp', 'dreamcast' : 'dreamcast', 'linux(.*)ubuntu' : 'linuxubuntu', 'win(.*)16' : 'win16', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8' : 'macosx8', 'beos' : 'beos', 'dragonflybsd' : 'bsddflybsd', 'linux(.*)zenwalk' : 'linuxzenwalk', 'symbian' : 'symbian', 'gnome\-vfs' : 'unix', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'linux(.*)android' : 'linuxandroid', 'hp\-ux' : 'hp\-ux', 'irix' : 'irix', 'windows[_+ ]?2005' : 'winlong', 'webtv' : 'webtv', 'windows[_+ ]?2000' : 'win2000', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'win(.*)ce' : 'wince', 'macweb' : 'macintosh', 'linux(.*)white\sbox' : 'linuxwhitebox', 'atari' : 'atari', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'xbox' : 'winxbox', 'linux(.*)asplinux' : 'linuxasplinux', 'win(.*)95' : 'win95', 'bsdi' : 'bsdi', 'windows[_+ ]?2003' : 'win2003', 'crayos' : 'crayos', 'aix' : 'aix', 'win[_+ ]9x' : 'winme', 'windows[_+ ]?2008' : 'win2008', 'syllable' : 'syllable', 'vienna' : 'macosx', 'commodore' : 'commodore', 'winnt' : 'winnt', 'plagger' : 'unix', 'linux' : 'linux', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5' : 'macosx5', 'newsfire' : 'macosx', 'linux(.*)vector' : 'linuxvector', 'mac[_+ ]68' : 'macintosh', 'mac[_+ ]?p' : 'macintosh', 'risc[_+ ]?os' : 'riscos', 'macintosh' : 'macintosh', 'windows[_+ ]?2012' : 'win2012', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'akregator' : 'linux', 'linux(.*)debian' : 'linuxdebian', 'sunos' : 'sunos', 'java' : 'java', 'syndirella' : 'winxp', 'linux(.*)suse' : 'linuxsuse', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9' : 'macosx9', 'microsoft' : 'winunknown', 'win(.*)98' : 'win98', 'x11' : 'unix', 'windows[_+ ]me' : 'winme', 'linux(.*)mandr' : 'linuxmandr', 'qnx' : 'qnx', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4' : 'macosx4', 'linux(.*)momonga' : 'linuxmomonga', 'cp/m' : 'cp/m', 'win32' : 'winnt', 'blackberry' : 'blackberry', 'applesyndication' : 'macosx', 'os/2' : 'os/2', 'windows[_+ ]xp' : 'winxp', 'mac[_+ ]os[_+ ]x' : 'macosx', 'linux(.*)gentoo' : 'linuxgentoo', 'inferno' : 'inferno', 'j2me' : 'j2me', 'gnu.kfreebsd' : 'bsdkfreebsd', 'windows[_+ ]nt[_+ ]6\.2' : 'win8', 'amiga' : 'amigaos', 'openbsd' : 'bsdopenbsd', 'windows' : 'winunknown', 'palmos' : 'palmos', 'freebsd' : 'bsdfreebsd', 'linux(.*)centos' : 'linuxcentos'} +operating_systems_hashid = {'bsdi' : 'bsdi', 'x11' : 'unix', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'linux' : 'linux', 'linux(.*)zenwalk' : 'linuxzenwalk', 'windows[_+ \-]?nt' : 'winnt', 'macweb' : 'macintosh', 'linux(.*)centos' : 'linuxcentos', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'mac[_+ ]?p' : 'macintosh', 'msie[_+ ]' : 'winunknown', 'win(.*)95' : 'win95', 'os/2' : 'os/2', 'linux(.*)momonga' : 'linuxmomonga', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'commodore' : 'commodore', 'winnt' : 'winnt', 'dreamcast' : 'dreamcast', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'ms[_+ ]frontpage' : 'winunknown', 'win(.*)16' : 'win16', 'syndirella' : 'winxp', 'macintosh' : 'macintosh', 'win(.*)98' : 'win98', 'osf' : 'osf', 'webtv' : 'webtv', 'linux(.*)asplinux' : 'linuxasplinux', 'linux(.*)suse' : 'linuxsuse', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9' : 'macosx9', 'linux(.*)ubuntu' : 'linuxubuntu', 'plagger' : 'unix', 'crayos' : 'crayos', 'wii' : 'wii', 'iphone[_+ ]os' : 'ios', 'gnu.kfreebsd' : 'bsdkfreebsd', 'windows[_+ ]xp' : 'winxp', 'linux(.*)mandr' : 'linuxmandr', 'windows[_+ ]?2000' : 'win2000', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4' : 'macosx4', 'linux(.*)vector' : 'linuxvector', 'aix' : 'aix', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8' : 'macosx8', 'xbox' : 'winxbox', 'linux(.*)vine' : 'linuxvine', 'windows[_+ ]me' : 'winme', 'gnu.hurd' : 'gnu', 'linux(.*)gentoo' : 'linuxgentoo', 'j2me' : 'j2me', 'windows[_+ ]?vista' : 'winvista', 'windows' : 'winunknown', 'linux(.*)fedora' : 'linuxfedora', 'gnome\-vfs' : 'unix', 'linux(.*)debian' : 'linuxdebian', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'windows[_+ ]?2005' : 'winlong', 'syllable' : 'syllable', 'windows[_+ ]nt[_+ ]6\.2' : 'win8', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'playstation' : 'psp', 'mac[_+ ]68' : 'macintosh', 'java' : 'java', 'windows[_+ ]?2012' : 'win2012', 'linux(.*)white\sbox' : 'linuxwhitebox', 'inferno' : 'inferno', 'vms' : 'vms', 'palmos' : 'palmos', 'qnx' : 'qnx', 'atari' : 'atari', 'windows[_+ ]?2008' : 'win2008', 'cp/m' : 'cp/m', 'win[_+ ]9x' : 'winme', 'risc[_+ ]?os' : 'riscos', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7' : 'macosx7', 'windows[_+ ]?2003' : 'win2003', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5' : 'macosx5', 'win(.*)ce' : 'wince', 'akregator' : 'linux', 'hp\-ux' : 'hp\-ux', 'dragonflybsd' : 'bsddflybsd', 'newsfire' : 'macosx', 'microsoft' : 'winunknown', 'netbsd' : 'bsdnetbsd', 'irix' : 'irix', 'mac[_+ ]os[_+ ]x' : 'macosx', 'beos' : 'beos', 'applesyndication' : 'macosx', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6' : 'macosx6', 'win32' : 'winnt', 'linux(.*)android' : 'linuxandroid', 'sunos' : 'sunos', 'symbian' : 'symbian', 'vienna' : 'macosx', 'openbsd' : 'bsdopenbsd', 'windows[_+ ]3' : 'win16', 'blackberry' : 'blackberry', 'unix' : 'unix', 'amiga' : 'amigaos', 'freebsd' : 'bsdfreebsd'} -operating_systems_family = {'mac' : 'Macintosh', 'linux' : 'Linux', 'win' : 'Windows', 'bsd' : 'BSD'} +operating_systems_family = {'mac' : 'Macintosh', 'bsd' : 'BSD', 'win' : 'Windows', 'linux' : 'Linux'} browsers = ['elinks', 'firebird', 'go!zilla', 'icab', 'links', 'lynx', 'omniweb', '22acidownload', 'abrowse', 'aol\-iweng', 'amaya', 'amigavoyager', 'arora', 'aweb', 'charon', 'donzilla', 'seamonkey', 'flock', 'minefield', 'bonecho', 'granparadiso', 'songbird', 'strata', 'sylera', 'kazehakase', 'prism', 'icecat', 'iceape', 'iceweasel', 'w3clinemode', 'bpftp', 'camino', 'chimera', 'cyberdog', 'dillo', 'xchaos_arachne', 'doris', 'dreamcast', 'xbox', 'downloadagent', 'ecatch', 'emailsiphon', 'encompass', 'epiphany', 'friendlyspider', 'fresco', 'galeon', 'flashget', 'freshdownload', 'getright', 'leechget', 'netants', 'headdump', 'hotjava', 'ibrowse', 'intergo', 'k\-meleon', 'k\-ninja', 'linemodebrowser', 'lotus\-notes', 'macweb', 'multizilla', 'ncsa_mosaic', 'netcaptor', 'netpositive', 'nutscrape', 'msfrontpageexpress', 'contiki', 'emacs\-w3', 'phoenix', 'shiira', 'tzgeturl', 'viking', 'webfetcher', 'webexplorer', 'webmirror', 'webvcr', 'qnx\svoyager', 'cloudflare', 'grabber', 'teleport', 'webcapture', 'webcopier', 'real', 'winamp', 'windows\-media\-player', 'audion', 'freeamp', 'itunes', 'jetaudio', 'mint_audio', 'mpg123', 'mplayer', 'nsplayer', 'qts', 'quicktime', 'sonique', 'uplayer', 'xaudio', 'xine', 'xmms', 'gstreamer', 'abilon', 'aggrevator', 'aiderss', 'akregator', 'applesyndication', 'betanews_reader', 'blogbridge', 'cyndicate', 'feeddemon', 'feedreader', 'feedtools', 'greatnews', 'gregarius', 'hatena_rss', 'jetbrains_omea', 'liferea', 'netnewswire', 'newsfire', 'newsgator', 'newzcrawler', 'plagger', 'pluck', 'potu', 'pubsub\-rss\-reader', 'pulpfiction', 'rssbandit', 'rssreader', 'rssowl', 'rss\sxpress', 'rssxpress', 'sage', 'sharpreader', 'shrook', 'straw', 'syndirella', 'vienna', 'wizz\srss\snews\sreader', 'alcatel', 'lg\-', 'mot\-', 'nokia', 'panasonic', 'philips', 'sagem', 'samsung', 'sie\-', 'sec\-', 'sonyericsson', 'ericsson', 'mmef', 'mspie', 'vodafone', 'wapalizer', 'wapsilon', 'wap', 'webcollage', 'up\.', 'android', 'blackberry', 'cnf2', 'docomo', 'ipcheck', 'iphone', 'portalmmm', 'webtv', 'democracy', 'cjb\.net', 'ossproxy', 'smallproxy', 'adobeair', 'apt', 'analogx_proxy', 'gnome\-vfs', 'neon', 'curl', 'csscheck', 'httrack', 'fdm', 'javaws', 'wget', 'fget', 'chilkat', 'webdownloader\sfor\sx', 'w3m', 'wdg_validator', 'w3c_validator', 'jigsaw', 'webreaper', 'webzip', 'staroffice', 'gnus', 'nikto', 'download\smaster', 'microsoft\-webdav\-miniredir', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav', 'POE\-Component\-Client\-HTTP', 'mozilla', 'libwww', 'lwp', 'WebSec'] -browsers_hashid = {'nsplayer' : 'NetShow Player (media player)', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'donzilla' : 'Donzilla', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'rssxpress' : 'RSSXpress (RSS Reader)', 'flock' : 'Flock', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'contiki' : 'Contiki', 'galeon' : 'Galeon', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'aiderss' : 'AideRSS (RSS Reader)', 'jigsaw' : 'W3C Validator', 'webexplorer' : 'IBM-WebExplorer', 'blogbridge' : 'BlogBridge (RSS Reader)', 'windows\-media\-player' : 'Windows Media Player (media player)', 'chrome' : 'Google Chrome', 'webtv' : 'WebTV browser', 'iceape' : 'GNU IceApe', 'httrack' : 'HTTrack', 'mint_audio' : 'Mint Audio (media player)', 'flashget' : 'FlashGet', 'ecatch' : 'eCatch', 'newsgator' : 'NewsGator (RSS Reader)', 'analogx_proxy' : 'AnalogX Proxy', 'freeamp' : 'FreeAmp (media player)', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'macweb' : 'MacWeb', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'icecat' : 'GNU IceCat', 'arora' : 'Arora', 'webcapture' : 'Acrobat Webcapture', 'go!zilla' : 'Go!Zilla', 'liferea' : 'Liferea (RSS Reader)', 'philips' : 'Philips Browser (PDA/Phone browser)', 'pluck' : 'Pluck (RSS Reader)', 'ibrowse' : 'iBrowse', 'xbox' : 'XBoX', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'w3c_validator' : 'W3C Validator', 'real' : 'Real player or compatible (media player)', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'msie' : 'MS Internet Explorer', 'samsung' : 'Samsung (PDA/Phone browser)', 'links' : 'Links', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'democracy' : 'Democracy', 'freshdownload' : 'FreshDownload', 'webfetcher' : 'WebFetcher', 'qnx\svoyager' : 'QNX Voyager', 'netscape' : 'Netscape', 'encompass' : 'Encompass', 'sonique' : 'Sonique (media player)', 'cjb\.net' : 'CJB.NET Proxy', 'vienna' : 'Vienna (RSS Reader)', 'firebird' : 'Firebird (Old Firefox)', 'potu' : 'Potu (RSS Reader)', 'javaws' : 'Java Web Start', 'w3m' : 'w3m', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'ncsa_mosaic' : 'NCSA Mosaic', 'lotus\-notes' : 'Lotus Notes web client', 'iceweasel' : 'Iceweasel', 'amaya' : 'Amaya', 'feedtools' : 'FeedTools (RSS Reader)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'feeddemon' : 'FeedDemon (RSS Reader)', 'netants' : 'NetAnts', 'xine' : 'Xine, a free multimedia player (media player)', 'gregarius' : 'Gregarius (RSS Reader)', 'hatena_rss' : 'Hatena (RSS Reader)', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'straw' : 'Straw (RSS Reader)', 'webreaper' : 'WebReaper', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'wget' : 'Wget', 'grabber' : 'Grabber', 'gstreamer' : 'GStreamer (media library)', 'aggrevator' : 'Aggrevator (RSS Reader)', 'iphone' : 'IPhone (PDA/Phone browser)', 'aweb' : 'AWeb', 'firefox' : 'Firefox', 'staroffice' : 'StarOffice', 'ossproxy' : 'OSSProxy', 'lg\-' : 'LG (PDA/Phone browser)', 'adobeair' : 'AdobeAir', 'w3clinemode' : 'W3CLineMode', 'gnus' : 'Gnus Network User Services', 'mozilla' : 'Mozilla', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'download\smaster' : 'Download Master', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'dreamcast' : 'Dreamcast', 'getright' : 'GetRight', 'svn' : 'Subversion client', 'camino' : 'Camino', 'msfrontpageexpress' : 'MS FrontPage Express', 'intergo' : 'InterGO', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'WebSec' : 'Web Secretary', 'mplayer' : 'The Movie Player (media player)', 'mpg123' : 'mpg123 (media player)', 'shiira' : 'Shiira', 'quicktime' : 'QuickTime (media player)', 'smallproxy' : 'SmallProxy', 'bpftp' : 'BPFTP', 'webvcr' : 'WebVCR', 'webzip' : 'WebZIP', 'csscheck' : 'WDG CSS Validator', 'netcaptor' : 'NetCaptor', 'doris' : 'Doris (for Symbian)', 'uplayer' : 'Ultra Player (media player)', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)', 'headdump' : 'HeadDump', 'abilon' : 'Abilon (RSS Reader)', 'opera' : 'Opera', 'neon' : 'Neon HTTP and WebDAV client library', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'sylera' : 'Sylera', 'sie\-' : 'SIE (PDA/Phone browser)', 'webmirror' : 'WebMirror', 'ipcheck' : 'Supervision IP Check (phone)', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'wdg_validator' : 'WDG HTML Validator', 'friendlyspider' : 'FriendlySpider', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'amigavoyager' : 'AmigaVoyager', 'safari' : 'Safari', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'chimera' : 'Chimera (Old Camino)', 'curl' : 'Curl', 'konqueror' : 'Konqueror', 'audion' : 'Audion (media player)', 'nikto' : 'Nikto Web Scanner', 'tzgeturl' : 'TzGetURL', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'dillo' : 'Dillo', 'qts' : 'QuickTime (media player)', 'emacs\-w3' : 'Emacs/w3s', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'lynx' : 'Lynx', 'cyndicate' : 'Cyndicate (RSS Reader)', 'itunes' : 'Apple iTunes (media player)', 'winamp' : 'WinAmp (media player)', 'phoenix' : 'Phoenix', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'kazehakase' : 'Kazehakase', 'multizilla' : 'MultiZilla', 'hotjava' : 'Sun HotJava', 'greatnews' : 'GreatNews (RSS Reader)', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'linemodebrowser' : 'W3C Line Mode Browser', 'lwp' : 'LibWWW-perl', 'seamonkey' : 'SeaMonkey', 'jetaudio' : 'JetAudio (media player)', 'sagem' : 'Sagem (PDA/Phone browser)', 'omniweb' : 'OmniWeb', 'emailsiphon' : 'EmailSiphon', 'newsfire' : 'NewsFire (RSS Reader)', 'chilkat' : 'Chilkat', 'aol\-iweng' : 'AOL-Iweng', 'rssreader' : 'RssReader (RSS Reader)', 'minefield' : 'Minefield (Firefox 3.0 development)', '22acidownload' : '22AciDownload', 'downloadagent' : 'DownloadAgent', 'android' : 'Android browser (PDA/Phone browser)', 'plagger' : 'Plagger (RSS Reader)', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'fdm' : 'FDM Free Download Manager', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'cyberdog' : 'Cyberdog', 'webcopier' : 'WebCopier', 'abrowse' : 'ABrowse', 'strata' : 'Strata', 'leechget' : 'LeechGet', 'prism' : 'Prism', 'charon' : 'Charon', 'cloudflare' : 'CloudFlare', 'teleport' : 'TelePort Pro', 'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'sage' : 'Sage (RSS Reader)', 'xchaos_arachne' : 'Arachne', 'elinks' : 'ELinks', 'epiphany' : 'Epiphany', 'jetbrains_omea' : 'Omea (RSS Reader)', 'nutscrape' : 'Nutscrape', 'icab' : 'iCab', 'webdownloader\sfor\sx' : 'Downloader for X', 'sharpreader' : 'SharpReader (RSS Reader)', 'xmms' : 'XMMS (media player)', 'k\-ninja' : 'K-Ninja', 'apt' : 'Debian APT', 'rssowl' : 'RSSOwl (RSS Reader)', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'shrook' : 'Shrook (RSS Reader)', 'k\-meleon' : 'K-Meleon', 'fget' : 'FGet', 'libwww' : 'LibWWW', 'songbird' : 'Songbird', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'netpositive' : 'NetPositive', 'akregator' : 'Akregator (RSS Reader)', 'feedreader' : 'FeedReader (RSS Reader)', 'fresco' : 'ANT Fresco', 'syndirella' : 'Syndirella (RSS Reader)', 'viking' : 'Viking'} +browsers_hashid = {'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'feedreader' : 'FeedReader (RSS Reader)', 'apt' : 'Debian APT', 'xine' : 'Xine, a free multimedia player (media player)', 'iceape' : 'GNU IceApe', 'webexplorer' : 'IBM-WebExplorer', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'staroffice' : 'StarOffice', 'ncsa_mosaic' : 'NCSA Mosaic', 'xchaos_arachne' : 'Arachne', 'netscape' : 'Netscape', 'macweb' : 'MacWeb', 'strata' : 'Strata', 'links' : 'Links', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'omniweb' : 'OmniWeb', 'WebSec' : 'Web Secretary', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'qnx\svoyager' : 'QNX Voyager', 'nsplayer' : 'NetShow Player (media player)', 'blogbridge' : 'BlogBridge (RSS Reader)', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'doris' : 'Doris (for Symbian)', 'w3c_validator' : 'W3C Validator', 'syndirella' : 'Syndirella (RSS Reader)', 'sonique' : 'Sonique (media player)', 'ibrowse' : 'iBrowse', 'gnus' : 'Gnus Network User Services', 'chimera' : 'Chimera (Old Camino)', 'mozilla' : 'Mozilla', 'amaya' : 'Amaya', 'shiira' : 'Shiira', 'lotus\-notes' : 'Lotus Notes web client', 'aiderss' : 'AideRSS (RSS Reader)', 'dreamcast' : 'Dreamcast', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'aggrevator' : 'Aggrevator (RSS Reader)', 'rssreader' : 'RssReader (RSS Reader)', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'samsung' : 'Samsung (PDA/Phone browser)', 'webcapture' : 'Acrobat Webcapture', 'grabber' : 'Grabber', 'friendlyspider' : 'FriendlySpider', 'webmirror' : 'WebMirror', 'k\-meleon' : 'K-Meleon', 'mplayer' : 'The Movie Player (media player)', 'quicktime' : 'QuickTime (media player)', 'straw' : 'Straw (RSS Reader)', 'adobeair' : 'AdobeAir', 'feeddemon' : 'FeedDemon (RSS Reader)', 'aol\-iweng' : 'AOL-Iweng', 'webcopier' : 'WebCopier', 'minefield' : 'Minefield (Firefox 3.0 development)', 'plagger' : 'Plagger (RSS Reader)', 'flashget' : 'FlashGet', 'webtv' : 'WebTV browser', 'ipcheck' : 'Supervision IP Check (phone)', 'cloudflare' : 'CloudFlare', 'fget' : 'FGet', 'amigavoyager' : 'AmigaVoyager', 'jigsaw' : 'W3C Validator', 'jetaudio' : 'JetAudio (media player)', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'xmms' : 'XMMS (media player)', 'msie' : 'MS Internet Explorer', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'songbird' : 'Songbird', 'elinks' : 'ELinks', 'newsgator' : 'NewsGator (RSS Reader)', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'webdownloader\sfor\sx' : 'Downloader for X', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'philips' : 'Philips Browser (PDA/Phone browser)', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'windows\-media\-player' : 'Windows Media Player (media player)', 'nutscrape' : 'Nutscrape', 'ecatch' : 'eCatch', 'donzilla' : 'Donzilla', 'getright' : 'GetRight', 'xbox' : 'XBoX', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'liferea' : 'Liferea (RSS Reader)', 'kazehakase' : 'Kazehakase', 'sharpreader' : 'SharpReader (RSS Reader)', 'opera' : 'Opera', 'real' : 'Real player or compatible (media player)', 'ossproxy' : 'OSSProxy', 'winamp' : 'WinAmp (media player)', 'potu' : 'Potu (RSS Reader)', 'fdm' : 'FDM Free Download Manager', 'nikto' : 'Nikto Web Scanner', 'firefox' : 'Firefox', 'teleport' : 'TelePort Pro', 'arora' : 'Arora', 'greatnews' : 'GreatNews (RSS Reader)', 'encompass' : 'Encompass', 'uplayer' : 'Ultra Player (media player)', 'camino' : 'Camino', 'neon' : 'Neon HTTP and WebDAV client library', 'safari' : 'Safari', 'k\-ninja' : 'K-Ninja', 'aweb' : 'AWeb', 'bpftp' : 'BPFTP', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'abrowse' : 'ABrowse', 'epiphany' : 'Epiphany', 'android' : 'Android browser (PDA/Phone browser)', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'webvcr' : 'WebVCR', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'emacs\-w3' : 'Emacs/w3s', 'leechget' : 'LeechGet', 'firebird' : 'Firebird (Old Firefox)', 'icab' : 'iCab', 'linemodebrowser' : 'W3C Line Mode Browser', 'chilkat' : 'Chilkat', 'jetbrains_omea' : 'Omea (RSS Reader)', 'sage' : 'Sage (RSS Reader)', 'shrook' : 'Shrook (RSS Reader)', 'webzip' : 'WebZIP', 'viking' : 'Viking', 'sylera' : 'Sylera', 'phoenix' : 'Phoenix', 'webfetcher' : 'WebFetcher', 'multizilla' : 'MultiZilla', 'hotjava' : 'Sun HotJava', 'netants' : 'NetAnts', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'netcaptor' : 'NetCaptor', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'feedtools' : 'FeedTools (RSS Reader)', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'intergo' : 'InterGO', 'webreaper' : 'WebReaper', '22acidownload' : '22AciDownload', 'mint_audio' : 'Mint Audio (media player)', 'charon' : 'Charon', 'chrome' : 'Google Chrome', 'emailsiphon' : 'EmailSiphon', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'cjb\.net' : 'CJB.NET Proxy', 'msfrontpageexpress' : 'MS FrontPage Express', 'sagem' : 'Sagem (PDA/Phone browser)', 'seamonkey' : 'SeaMonkey', 'lwp' : 'LibWWW-perl', 'prism' : 'Prism', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'lg\-' : 'LG (PDA/Phone browser)', 'freshdownload' : 'FreshDownload', 'analogx_proxy' : 'AnalogX Proxy', 'headdump' : 'HeadDump', 'itunes' : 'Apple iTunes (media player)', 'contiki' : 'Contiki', 'galeon' : 'Galeon', 'flock' : 'Flock', 'mpg123' : 'mpg123 (media player)', 'gregarius' : 'Gregarius (RSS Reader)', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'newsfire' : 'NewsFire (RSS Reader)', 'curl' : 'Curl', 'netpositive' : 'NetPositive', 'libwww' : 'LibWWW', 'javaws' : 'Java Web Start', 'qts' : 'QuickTime (media player)', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'download\smaster' : 'Download Master', 'gstreamer' : 'GStreamer (media library)', 'wdg_validator' : 'WDG HTML Validator', 'w3m' : 'w3m', 'freeamp' : 'FreeAmp (media player)', 'akregator' : 'Akregator (RSS Reader)', 'go!zilla' : 'Go!Zilla', 'rssowl' : 'RSSOwl (RSS Reader)', 'abilon' : 'Abilon (RSS Reader)', 'dillo' : 'Dillo', 'svn' : 'Subversion client', 'konqueror' : 'Konqueror', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'pluck' : 'Pluck (RSS Reader)', 'iphone' : 'IPhone (PDA/Phone browser)', 'wget' : 'Wget', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'lynx' : 'Lynx', 'sie\-' : 'SIE (PDA/Phone browser)', 'smallproxy' : 'SmallProxy', 'fresco' : 'ANT Fresco', 'cyberdog' : 'Cyberdog', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'downloadagent' : 'DownloadAgent', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)', 'cyndicate' : 'Cyndicate (RSS Reader)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'tzgeturl' : 'TzGetURL', 'hatena_rss' : 'Hatena (RSS Reader)', 'audion' : 'Audion (media player)', 'rssxpress' : 'RSSXpress (RSS Reader)', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'vienna' : 'Vienna (RSS Reader)', 'csscheck' : 'WDG CSS Validator', 'httrack' : 'HTTrack', 'democracy' : 'Democracy', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'icecat' : 'GNU IceCat', 'iceweasel' : 'Iceweasel', 'w3clinemode' : 'W3CLineMode'} -browsers_icons = {'gregarius' : 'rss', 'hatena_rss' : 'rss', 'feeddemon' : 'rss', 'feedtools' : 'rss', 'granparadiso' : 'firefox', 'xine' : 'mediaplayer', 'mmef' : 'pdaphone', 'ncsa_mosaic' : 'ncsa_mosaic', 'iceweasel' : 'iceweasel', 'amaya' : 'amaya', 'lotus\-notes' : 'lotusnotes', 'javaws' : 'java', 'aggrevator' : 'rss', 'aweb' : 'aweb', 'iphone' : 'pdaphone', 'grabber' : 'grabber', 'rss\sxpress' : 'rss', 'webreaper' : 'webreaper', 'straw' : 'rss', 'sec\-' : 'pdaphone', 'getright' : 'getright', 'svn' : 'subversion', 'camino' : 'chimera', 'wizz\srss\snews\sreader' : 'wizz', 'vodafone' : 'pdaphone', 'dreamcast' : 'dreamcast', 'adobeair' : 'adobe', 'mozilla' : 'mozilla', 'gnus' : 'gnus', 'firefox' : 'firefox', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'lg\-' : 'pdaphone', 'staroffice' : 'staroffice', 'bpftp' : 'bpftp', 'webzip' : 'webzip', 'doris' : 'doris', 'uplayer' : 'mediaplayer', 'mplayer' : 'mediaplayer', 'mpg123' : 'mediaplayer', 'rssbandit' : 'rss', 'msfrontpageexpress' : 'fpexpress', 'portalmmm' : 'pdaphone', 'mspie' : 'pdaphone', 'galeon' : 'galeon', 'aiderss' : 'rss', 'microsoft\-webdav\-miniredir' : 'frontpage', 'flock' : 'flock', 'nsplayer' : 'netshow', 'donzilla' : 'mozilla', 'gnome\-vfs' : 'gnome', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'rssxpress' : 'rss', 'xaudio' : 'mediaplayer', 'analogx_proxy' : 'analogx', 'alcatel' : 'pdaphone', 'freeamp' : 'mediaplayer', 'macweb' : 'macweb', 'nokia' : 'pdaphone', 'newsgator' : 'rss', 'ecatch' : 'ecatch', 'httrack' : 'httrack', 'iceape' : 'mozilla', 'flashget' : 'flashget', 'mint_audio' : 'mediaplayer', 'chrome' : 'chrome', 'blogbridge' : 'rss', 'windows\-media\-player' : 'mplayer', 'webtv' : 'webtv', 'samsung' : 'pdaphone', 'msie' : 'msie', 'pluck' : 'rss', 'philips' : 'pdaphone', 'liferea' : 'rss', 'xbox' : 'winxbox', 'webcollage' : 'pdaphone', 'real' : 'real', 'ibrowse' : 'ibrowse', 'webcapture' : 'adobe', 'icecat' : 'icecat', 'go!zilla' : 'gozilla', 'firebird' : 'phoenix', 'potu' : 'rss', 'encompass' : 'encompass', 'netscape' : 'netscape', 'cjb\.net' : 'cjbnet', 'vienna' : 'rss', 'sonique' : 'mediaplayer', 'docomo' : 'pdaphone', 'freshdownload' : 'freshdownload', 'strata' : 'mozilla', 'panasonic' : 'pdaphone', 'cyberdog' : 'cyberdog', 'webcopier' : 'webcopier', 'plagger' : 'rss', 'mot\-' : 'pdaphone', 'android' : 'android', 'newsfire' : 'rss', 'minefield' : 'firefox', 'rssreader' : 'rss', 'icab' : 'icab', 'jetbrains_omea' : 'rss', 'epiphany' : 'epiphany', 'wapsilon' : 'pdaphone', 'sage' : 'rss', 'leechget' : 'leechget', 'teleport' : 'teleport', 'prism' : 'mozilla', 'k\-meleon' : 'kmeleon', 'apt' : 'apt', 'rssowl' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'shrook' : 'rss', 'newzcrawler' : 'rss', 'sharpreader' : 'rss', 'xmms' : 'mediaplayer', 'fresco' : 'fresco', 'syndirella' : 'rss', 'netpositive' : 'netpositive', 'akregator' : 'rss', 'feedreader' : 'rss', 'songbird' : 'mozilla', 'pulpfiction' : 'rss', 'sie\-' : 'pdaphone', 'netnewswire' : 'rss', 'sylera' : 'mozilla', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'neon' : 'neon', 'opera' : 'opera', 'sonyericsson' : 'pdaphone', 'ericsson' : 'pdaphone', 'pubsub\-rss\-reader' : 'rss', 'abilon' : 'abilon', 'chimera' : 'chimera', 'konqueror' : 'konqueror', 'amigavoyager' : 'amigavoyager', 'safari' : 'safari', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'wapalizer' : 'pdaphone', 'up\.' : 'pdaphone', 'itunes' : 'mediaplayer', 'winamp' : 'mediaplayer', 'applesyndication' : 'rss', 'phoenix' : 'phoenix', 'wap' : 'pdaphone', 'bonecho' : 'firefox', 'lynx' : 'lynx', 'dillo' : 'dillo', 'qts' : 'mediaplayer', 'blackberry' : 'pdaphone', 'audion' : 'mediaplayer', 'omniweb' : 'omniweb', 'seamonkey' : 'seamonkey', 'jetaudio' : 'mediaplayer', 'sagem' : 'pdaphone', 'avantbrowser' : 'avant', 'greatnews' : 'rss', 'hotjava' : 'hotjava', 'betanews_reader' : 'rss', 'kazehakase' : 'mozilla', 'multizilla' : 'multizilla'} +browsers_icons = {'firebird' : 'phoenix', 'icab' : 'icab', 'jetbrains_omea' : 'rss', 'gnome\-vfs' : 'gnome', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'leechget' : 'leechget', 'up\.' : 'pdaphone', 'aweb' : 'aweb', 'bpftp' : 'bpftp', 'rssbandit' : 'rss', 'android' : 'android', 'epiphany' : 'epiphany', 'camino' : 'chimera', 'encompass' : 'encompass', 'uplayer' : 'mediaplayer', 'neon' : 'neon', 'safari' : 'safari', 'chrome' : 'chrome', 'feedtools' : 'rss', 'mint_audio' : 'mediaplayer', 'webreaper' : 'webreaper', 'wap' : 'pdaphone', 'ericsson' : 'pdaphone', 'phoenix' : 'phoenix', 'sylera' : 'mozilla', 'multizilla' : 'multizilla', 'hotjava' : 'hotjava', 'portalmmm' : 'pdaphone', 'newzcrawler' : 'rss', 'sage' : 'rss', 'webzip' : 'webzip', 'shrook' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'webcollage' : 'pdaphone', 'akregator' : 'rss', 'freeamp' : 'mediaplayer', 'rssowl' : 'rss', 'go!zilla' : 'gozilla', 'newsfire' : 'rss', 'alcatel' : 'pdaphone', 'netpositive' : 'netpositive', 'javaws' : 'java', 'qts' : 'mediaplayer', 'analogx_proxy' : 'analogx', 'freshdownload' : 'freshdownload', 'lg\-' : 'pdaphone', 'galeon' : 'galeon', 'itunes' : 'mediaplayer', 'gregarius' : 'rss', 'mpg123' : 'mediaplayer', 'flock' : 'flock', 'sagem' : 'pdaphone', 'msfrontpageexpress' : 'fpexpress', 'cjb\.net' : 'cjbnet', 'applesyndication' : 'rss', 'prism' : 'mozilla', 'seamonkey' : 'seamonkey', 'wizz\srss\snews\sreader' : 'wizz', 'mmef' : 'pdaphone', 'iceweasel' : 'iceweasel', 'icecat' : 'icecat', 'hatena_rss' : 'rss', 'docomo' : 'pdaphone', 'rss\sxpress' : 'rss', 'granparadiso' : 'firefox', 'pubsub\-rss\-reader' : 'rss', 'rssxpress' : 'rss', 'audion' : 'mediaplayer', 'xaudio' : 'mediaplayer', 'vienna' : 'rss', 'mot\-' : 'pdaphone', 'httrack' : 'httrack', 'fresco' : 'fresco', 'blackberry' : 'pdaphone', 'cyberdog' : 'cyberdog', 'dillo' : 'dillo', 'abilon' : 'abilon', 'svn' : 'subversion', 'iphone' : 'pdaphone', 'nokia' : 'pdaphone', 'pluck' : 'rss', 'konqueror' : 'konqueror', 'lynx' : 'lynx', 'sie\-' : 'pdaphone', 'nsplayer' : 'netshow', 'blogbridge' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'doris' : 'doris', 'strata' : 'mozilla', 'macweb' : 'macweb', 'bonecho' : 'firefox', 'omniweb' : 'omniweb', 'vodafone' : 'pdaphone', 'wapalizer' : 'pdaphone', 'iceape' : 'mozilla', 'staroffice' : 'staroffice', 'panasonic' : 'pdaphone', 'netscape' : 'netscape', 'ncsa_mosaic' : 'ncsa_mosaic', 'feedreader' : 'rss', 'wapsilon' : 'pdaphone', 'apt' : 'apt', 'xine' : 'mediaplayer', 'avantbrowser' : 'avant', 'aggrevator' : 'rss', 'samsung' : 'pdaphone', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'rssreader' : 'rss', 'grabber' : 'grabber', 'webcapture' : 'adobe', 'dreamcast' : 'dreamcast', 'sec\-' : 'pdaphone', 'amaya' : 'amaya', 'mozilla' : 'mozilla', 'chimera' : 'chimera', 'gnus' : 'gnus', 'lotus\-notes' : 'lotusnotes', 'aiderss' : 'rss', 'syndirella' : 'rss', 'sonique' : 'mediaplayer', 'ibrowse' : 'ibrowse', 'jetaudio' : 'mediaplayer', 'pulpfiction' : 'rss', 'xmms' : 'mediaplayer', 'webtv' : 'webtv', 'flashget' : 'flashget', 'amigavoyager' : 'amigavoyager', 'feeddemon' : 'rss', 'webcopier' : 'webcopier', 'minefield' : 'firefox', 'plagger' : 'rss', 'k\-meleon' : 'kmeleon', 'adobeair' : 'adobe', 'straw' : 'rss', 'mplayer' : 'mediaplayer', 'teleport' : 'teleport', 'firefox' : 'firefox', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'greatnews' : 'rss', 'kazehakase' : 'mozilla', 'sharpreader' : 'rss', 'liferea' : 'rss', 'winamp' : 'mediaplayer', 'real' : 'real', 'opera' : 'opera', 'potu' : 'rss', 'ecatch' : 'ecatch', 'windows\-media\-player' : 'mplayer', 'getright' : 'getright', 'donzilla' : 'mozilla', 'mspie' : 'pdaphone', 'xbox' : 'winxbox', 'songbird' : 'mozilla', 'betanews_reader' : 'rss', 'msie' : 'msie', 'newsgator' : 'rss', 'philips' : 'pdaphone', 'sonyericsson' : 'pdaphone', 'netnewswire' : 'rss', 'microsoft\-webdav\-miniredir' : 'frontpage'} diff --git a/tools/iwla_convert.pl b/tools/iwla_convert.pl index 970ce4d..696e230 100755 --- a/tools/iwla_convert.pl +++ b/tools/iwla_convert.pl @@ -7,6 +7,7 @@ my @awstats_libs = ('search_engines.pm', 'robots.pm', 'operating_systems.pm', 'b # my @awstats_libs = ('browsers.pm', 'browsers_phone.pm', 'mime.pm', 'referer_spam.pm', 'search_engines.pm', 'operating_systems.pm', 'robots.pm', 'worms.pm'); foreach $lib (@awstats_libs) {require $awstats_lib_root . $lib;} +require './tools/own_search_engines.pm'; sub dumpList { my @list = @{$_[0]}; @@ -64,6 +65,7 @@ print $FIC "]\n\n"; print $FIC "search_engines_2 = ["; dumpList(\@SearchEnginesSearchIDOrder_list2, $FIC, 1); +dumpList(\@Own_SearchEnginesSearchIDOrder, $FIC, 0); print $FIC "]\n\n"; print $FIC "not_search_engines_keys = {"; @@ -72,10 +74,12 @@ print $FIC "}\n\n"; print $FIC "search_engines_hashid = {"; dumpHash(\%SearchEnginesHashID, $FIC, 1); +dumpHash(\%Own_SearchEnginesHashID, $FIC, 0); print $FIC "}\n\n"; print $FIC "search_engines_knwown_url = {"; dumpHash(\%SearchEnginesKnownUrl, $FIC, 1); +dumpHash(\%Own_SearchEnginesKnownUrl, $FIC, 0); print $FIC "}\n\n"; print $FIC "operating_systems = ["; diff --git a/tools/own_search_engines.pm b/tools/own_search_engines.pm new file mode 100644 index 0000000..3a12c79 --- /dev/null +++ b/tools/own_search_engines.pm @@ -0,0 +1,34 @@ +@Own_SearchEnginesSearchIDOrder=( +'jwss\.cc', +'lemoteur\.orange\.fr', +'windowssearch\.com', +'qwant\.com', +'wow\.com', +'searches\.omiga-plus\.com', +'buenosearch\.com', +'searches\.vi-view\.com' +); + +%Own_SearchEnginesHashID = ( + 'jwss\.cc', 'jws', + 'lemoteur\.orange\.fr', 'Orange', + 'windowssearch\.com', 'Windows Search', + 'qwant\.com', 'Qwant', + 'wow\.com', 'WOW', + 'searches\.omiga-plus\.com', 'Omiga-plus', + 'buenosearch\.com', 'Bueno Search', + 'searches\.vi-view\.com', 'vi-view' + ); + +%Own_SearchEnginesKnownUrl=( + 'jws','q=', + 'Orange', 'kw=', + 'Windows Search', 'q=', + 'Qwant', 'q=', + 'WOW', 'q=', + 'Omiga-plus', 'q=', + 'Bueno Search', 'q=', + 'vi-view', 'q=' + ); + + From d4210de7f423a4422e837f362bf2c19a6d2e27f6 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 6 Jul 2015 08:08:09 +0200 Subject: [PATCH 190/195] Add Google via SFR search engine --- awstats_data.py | 16 ++++++++-------- tools/own_search_engines.pm | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/awstats_data.py b/awstats_data.py index 78ee578..33157e1 100644 --- a/awstats_data.py +++ b/awstats_data.py @@ -4,23 +4,23 @@ robots = ['appie', 'architext', 'bingpreview', 'bjaaland', 'contentmatch', 'ferr search_engines = ['google\.[\w.]+/products', 'base\.google\.', 'froogle\.google\.', 'groups\.google\.', 'images\.google\.', 'google\.', 'googlee\.', 'googlecom\.com', 'goggle\.co\.hu', '216\.239\.(35|37|39|51)\.100', '216\.239\.(35|37|39|51)\.101', '216\.239\.5[0-9]\.104', '64\.233\.1[0-9]{2}\.104', '66\.102\.[1-9]\.104', '66\.249\.93\.104', '72\.14\.2[0-9]{2}\.104', 'msn\.', 'live\.com', 'bing\.', 'voila\.', 'mindset\.research\.yahoo', 'yahoo\.', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)', 'search\.aol\.co', 'tiscali\.', 'lycos\.', 'alexa\.com', 'alltheweb\.com', 'altavista\.', 'a9\.com', 'dmoz\.org', 'netscape\.', 'search\.terra\.', 'www\.search\.com', 'search\.sli\.sympatico\.ca', 'excite\.'] -search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'claro-search\.com', 'www1\.search-results\.com', 'www\.holasearch\.com', 'search\.conduit\.com', 'static\.flipora\.com', '(?:www[12]?|mixidj)\.delta-search\.com', 'start\.iminent\.com', 'www\.searchmobileonline\.com', 'int\.search-results\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'isearch\.avg\.com', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'search\.fbdownloader\.com', 'search\.babylon\.com', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'o2suche\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'suche\.gmx\.net', 'ecosia\.org', 'de\.aolsearch\.com', 'suche\.aol\.de', 'www\.startxxl\.com', 'www\.benefind\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'search\.genieo\.com', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.', 'jwss\.cc', 'lemoteur\.orange\.fr', 'windowssearch\.com', 'qwant\.com', 'wow\.com', 'searches\.omiga-plus\.com', 'buenosearch\.com'] +search_engines_2 = ['4\-counter\.com', 'att\.net', 'bungeebonesdotcom', 'northernlight\.', 'hotbot\.', 'kvasir\.', 'webcrawler\.', 'metacrawler\.', 'go2net\.com', '(^|\.)go\.com', 'euroseek\.', 'looksmart\.', 'spray\.', 'nbci\.com\/search', 'de\.ask.\com', 'es\.ask.\com', 'fr\.ask.\com', 'it\.ask.\com', 'nl\.ask.\com', 'uk\.ask.\com', '(^|\.)ask\.com', 'atomz\.', 'overture\.com', 'teoma\.', 'findarticles\.com', 'infospace\.com', 'mamma\.', 'dejanews\.', 'dogpile\.com', 'wisenut\.com', 'ixquick\.com', 'search\.earthlink\.net', 'i-une\.com', 'blingo\.com', 'centraldatabase\.org', 'clusty\.com', 'mysearch\.', 'vivisimo\.com', 'kartoo\.com', 'icerocket\.com', 'sphere\.com', 'ledix\.net', 'start\.shaw\.ca', 'searchalot\.com', 'copernic\.com', 'avantfind\.com', 'steadysearch\.com', 'steady-search\.com', 'claro-search\.com', 'www1\.search-results\.com', 'www\.holasearch\.com', 'search\.conduit\.com', 'static\.flipora\.com', '(?:www[12]?|mixidj)\.delta-search\.com', 'start\.iminent\.com', 'www\.searchmobileonline\.com', 'int\.search-results\.com', 'chello\.at', 'chello\.be', 'chello\.cz', 'chello\.fr', 'chello\.hu', 'chello\.nl', 'chello\.no', 'chello\.pl', 'chello\.se', 'chello\.sk', 'chello', 'mirago\.be', 'mirago\.ch', 'mirago\.de', 'mirago\.dk', 'es\.mirago\.com', 'mirago\.fr', 'mirago\.it', 'mirago\.nl', 'no\.mirago\.com', 'mirago\.se', 'mirago\.co\.uk', 'mirago', 'answerbus\.com', 'icq\.com\/search', 'nusearch\.com', 'goodsearch\.com', 'scroogle\.org', 'questionanswering\.com', 'mywebsearch\.com', 'as\.starware\.com', 'del\.icio\.us', 'digg\.com', 'stumbleupon\.com', 'swik\.net', 'segnalo\.alice\.it', 'ineffabile\.it', 'anzwers\.com\.au', 'engine\.exe', 'miner\.bol\.com\.br', '\.baidu\.com', '\.vnet\.cn', '\.soso\.com', '\.sogou\.com', '\.3721\.com', 'iask\.com', '\.accoona\.com', '\.163\.com', '\.zhongsou\.com', 'atlas\.cz', 'seznam\.cz', 'quick\.cz', 'centrum\.cz', 'jyxo\.(cz|com)', 'najdi\.to', 'redbox\.cz', 'isearch\.avg\.com', 'opasia\.dk', 'danielsen\.com', 'sol\.dk', 'jubii\.dk', 'find\.dk', 'edderkoppen\.dk', 'netstjernen\.dk', 'orbis\.dk', 'tyfon\.dk', '1klik\.dk', 'ofir\.dk', 'ilse\.', 'vindex\.', '(^|\.)ask\.co\.uk', 'bbc\.co\.uk/cgi-bin/search', 'ifind\.freeserve', 'looksmart\.co\.uk', 'splut\.', 'spotjockey\.', 'ukdirectory\.', 'ukindex\.co\.uk', 'ukplus\.', 'searchy\.co\.uk', 'search\.fbdownloader\.com', 'search\.babylon\.com', 'haku\.www\.fi', 'recherche\.aol\.fr', 'ctrouve\.', 'francite\.', '\.lbb\.org', 'rechercher\.libertysurf\.fr', 'search[\w\-]+\.free\.fr', 'recherche\.club-internet\.fr', 'toile\.com', 'biglotron\.com', 'mozbot\.fr', 'sucheaol\.aol\.de', 'o2suche\.aol\.de', 'fireball\.de', 'infoseek\.de', 'suche\d?\.web\.de', '[a-z]serv\.rrzn\.uni-hannover\.de', 'suchen\.abacho\.de', '(brisbane|suche)\.t-online\.de', 'allesklar\.de', 'meinestadt\.de', '212\.227\.33\.241', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)', 'wwweasel\.de', 'netluchs\.de', 'schoenerbrausen\.de', 'suche\.gmx\.net', 'ecosia\.org', 'de\.aolsearch\.com', 'suche\.aol\.de', 'www\.startxxl\.com', 'www\.benefind\.de', 'heureka\.hu', 'vizsla\.origo\.hu', 'lapkereso\.hu', 'goliat\.hu', 'index\.hu', 'wahoo\.hu', 'webmania\.hu', 'search\.internetto\.hu', 'tango\.hu', 'keresolap\.hu', 'polymeta\.hu', 'sify\.com', 'virgilio\.it', 'arianna\.libero\.it', 'supereva\.com', 'kataweb\.it', 'search\.alice\.it\.master', 'search\.alice\.it', 'gotuneed\.com', 'godado', 'jumpy\.it', 'shinyseek\.it', 'teecno\.it', 'search\.genieo\.com', 'ask\.jp', 'sagool\.jp', 'sok\.start\.no', 'eniro\.no', 'szukaj\.wp\.pl', 'szukaj\.onet\.pl', 'dodaj\.pl', 'gazeta\.pl', 'gery\.pl', 'hoga\.pl', 'netsprint\.pl', 'interia\.pl', 'katalog\.onet\.pl', 'o2\.pl', 'polska\.pl', 'szukacz\.pl', 'wow\.pl', 'ya(ndex)?\.ru', 'aport\.ru', 'rambler\.ru', 'turtle\.ru', 'metabot\.ru', 'evreka\.passagen\.se', 'eniro\.se', 'zoznam\.sk', 'sapo\.pt', 'search\.ch', 'search\.bluewin\.ch', 'pogodak\.', 'jwss\.cc', 'lemoteur\.orange\.fr', 'windowssearch\.com', 'qwant\.com', 'wow\.com', 'searches\.omiga-plus\.com', 'buenosearch\.com', 'searches\.vi-view\.com'] -not_search_engines_keys = {'altavista\.' : 'babelfish\.altavista\.', 'tiscali\.' : 'mail\.tiscali\.', 'msn\.' : 'hotmail\.msn\.', 'yandex\.' : 'direct\.yandex\.', 'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'google\.' : 'translate\.google\.'} +not_search_engines_keys = {'tiscali\.' : 'mail\.tiscali\.', 'altavista\.' : 'babelfish\.altavista\.', 'yahoo\.' : '(?:picks|mail)\.yahoo\.|yahoo\.[^/]+/picks', 'google\.' : 'translate\.google\.', 'msn\.' : 'hotmail\.msn\.', 'yandex\.' : 'direct\.yandex\.'} -search_engines_hashid = {'centrum\.cz' : 'centrum', 'polska\.pl' : 'polskapl', 'opasia\.dk' : 'opasia', 'mirago' : 'mirago', 'start\.iminent\.com' : 'iminent', 'search\.internetto\.hu' : 'internetto', 'searchy\.co\.uk' : 'searchy', 'nusearch\.com' : 'nusearch', 'searchalot\.com' : 'searchalot', 'dejanews\.' : 'dejanews', 'static\.flipora\.com' : 'flipora', 'tango\.hu' : 'tango_hu', 'msn\.' : 'msn', 'chello' : 'chellocom', 'www\.startxxl\.com' : 'startxxl', 'lapkereso\.hu' : 'lapkereso', 'netstjernen\.dk' : 'netstjernen', 'dodaj\.pl' : 'dodajpl', 'godado' : 'godado', 'looksmart\.' : 'looksmart', 'digg\.com' : 'digg', '\.163\.com' : 'netease', 'vizsla\.origo\.hu' : 'origo', 'swik\.net' : 'swik', 'as\.starware\.com' : 'comettoolbar', 'ask\.jp' : 'askjp', 'netsprint\.pl' : 'netsprintpl', 'de\.ask.\com' : 'askde', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'toile\.com' : 'toile', 'recherche\.club-internet\.fr' : 'clubinternet', 'sok\.start\.no' : 'start', '\.soso\.com' : 'soso', 'kvasir\.' : 'kvasir', 'teoma\.' : 'teoma', 'find\.dk' : 'finddk', 'vivisimo\.com' : 'vivisimo', 'search\.bluewin\.ch' : 'bluewin', 'es\.ask.\com' : 'askes', '\.zhongsou\.com' : 'zhongsou', 'mirago\.se' : 'miragose', 'sapo\.pt' : 'sapo', '\.baidu\.com' : 'baidu', 'segnalo\.alice\.it' : 'segnalo', 'kartoo\.com' : 'kartoo', 'avantfind\.com' : 'avantfind', 'search\.earthlink\.net' : 'earthlink', 'jubii\.dk' : 'jubii', 'clusty\.com' : 'clusty', 'eniro\.no' : 'eniro', 'chello\.hu' : 'chellohu', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', 'meinestadt\.de' : 'meinestadt', 'altavista\.' : 'altavista', 'answerbus\.com' : 'answerbus', 'webcrawler\.' : 'webcrawler', 'sol\.dk' : 'sol', 'ilse\.' : 'ilse', 'excite\.' : 'excite', 'o2\.pl' : 'o2pl', 'edderkoppen\.dk' : 'edderkoppen', 'ifind\.freeserve' : 'freeserve', 'sphere\.com' : 'sphere', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', 'es\.mirago\.com' : 'miragoes', 'evreka\.passagen\.se' : 'passagen', 'chello\.cz' : 'chellocz', 'jumpy\.it' : 'jumpy\.it', 'search\.alice\.it\.master' : 'aliceitmaster', 'redbox\.cz' : 'redbox', 'metacrawler\.' : 'metacrawler', 'szukaj\.wp\.pl' : 'wp', 'pogodak\.' : 'pogodak', 'rambler\.ru' : 'rambler', 'mirago\.de' : 'miragode', 'dogpile\.com' : 'dogpile', 'gazeta\.pl' : 'gazetapl', 'ukplus\.' : 'ukplus', 'recherche\.aol\.fr' : 'aolfr', 'steadysearch\.com' : 'steadysearch', 'googlee\.' : 'google', 'stumbleupon\.com' : 'stumbleupon', 'search\.genieo\.com' : 'genieo', '(^|\.)go\.com' : 'go', '\.3721\.com' : '3721', 'engine\.exe' : 'engine', 'search\..*\.\w+' : 'search', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'chello\.no' : 'chellono', 'claro-search\.com' : 'clarosearch', 'int\.search-results\.com' : 'nortonsavesearch', 'googlecom\.com' : 'google', 'ya(ndex)?\.ru' : 'yandex', 'anzwers\.com\.au' : 'anzwers', 'heureka\.hu' : 'heureka', 'ukdirectory\.' : 'ukdirectory', 'chello\.be' : 'chellobe', 'mywebsearch\.com' : 'mywebsearch', 'ledix\.net' : 'ledix', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'start\.shaw\.ca' : 'shawca', 'katalog\.onet\.pl' : 'katalogonetpl', 'infoseek\.de' : 'infoseek', '66\.102\.[1-9]\.104' : 'google_cache', 'wwweasel\.de' : 'wwweasel', 'index\.hu' : 'indexhu', '4\-counter\.com' : 'google4counter', 'szukacz\.pl' : 'szukaczpl', 'blingo\.com' : 'blingo', 'ofir\.dk' : 'ofir', 'questionanswering\.com' : 'questionanswering', 'chello\.fr' : 'chellofr', 'mysearch\.' : 'mysearch', 'a9\.com' : 'a9', 'de\.aolsearch\.com' : 'aolsearch', 'centraldatabase\.org' : 'centraldatabase', 'yahoo\.' : 'yahoo', 'aport\.ru' : 'aport', 'chello\.nl' : 'chellonl', 'goodsearch\.com' : 'goodsearch', 'copernic\.com' : 'copernic', '\.accoona\.com' : 'accoona', 'szukaj\.onet\.pl' : 'onetpl', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'sagool\.jp' : 'sagool', 'sify\.com' : 'sify', 'mirago\.ch' : 'miragoch', 'icq\.com\/search' : 'icq', 'schoenerbrausen\.de' : 'schoenerbrausen', 'supereva\.com' : 'supereva', 'tiscali\.' : 'tiscali', 'francite\.' : 'francite', 'images\.google\.' : 'google_image', '(^|\.)ask\.com' : 'ask', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'zoznam\.sk' : 'zoznam', 'goggle\.co\.hu' : 'google', 'i-une\.com' : 'iune', 'isearch\.avg\.com' : 'avgsearch', 'search\.fbdownloader\.com' : 'fbdownloader', 'alexa\.com' : 'alexa', '\.sogou\.com' : 'sogou', 'ecosia\.org' : 'ecosiasearch', 'o2suche\.aol\.de' : 'o2aolde', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'atlas\.cz' : 'atlas', 'mirago\.nl' : 'miragonl', '66\.249\.93\.104' : 'google_cache', '(?:www[12]?|mixidj)\.delta-search\.com' : 'delta-search', 'alltheweb\.com' : 'alltheweb', 'seznam\.cz' : 'seznam', 'netscape\.' : 'netscape', 'keresolap\.hu' : 'keresolap_hu', 'mamma\.' : 'mamma', 'jyxo\.(cz|com)' : 'jyxo', 'suche\.aol\.de' : 'aolsuche', 'search\.babylon\.com' : 'babylon', 'www1\.search-results\.com' : 'searchresults', 'search\.ch' : 'searchch', 'google\.[\w.]+/products' : 'google_products', 'bing\.' : 'bing', '212\.227\.33\.241' : 'metaspinner', 'mirago\.dk' : 'miragodk', '(^|\.)ask\.co\.uk' : 'askuk', 'nl\.ask.\com' : 'asknl', 'chello\.sk' : 'chellosk', 'teecno\.it' : 'teecnoit', 'eniro\.se' : 'enirose', 'base\.google\.' : 'google_base', 'webmania\.hu' : 'webmania', 'biglotron\.com' : 'biglotron', 'lycos\.' : 'lycos', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'hotbot\.' : 'hotbot', 'gery\.pl' : 'gerypl', 'www\.search\.com' : 'search.com', 'mirago\.be' : 'miragobe', '1klik\.dk' : '1klik', 'spotjockey\.' : 'spotjockey', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'att\.net' : 'att', 'atomz\.' : 'atomz', 'euroseek\.' : 'euroseek', 'interia\.pl' : 'interiapl', 'search[\w\-]+\.free\.fr' : 'free', 'polymeta\.hu' : 'polymeta_hu', '\.vnet\.cn' : 'vnet', 'wow\.pl' : 'wowpl', '\.lbb\.org' : 'lbb', 'search\.aol\.co' : 'aol', 'fireball\.de' : 'fireball', '216\.239\.(35|37|39|51)\.101' : 'google_cache', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'search\.sli\.sympatico\.ca' : 'sympatico', 'del\.icio\.us' : 'delicious', 'voila\.' : 'voila', 'goliat\.hu' : 'goliat', 'google\.' : 'google', 'wahoo\.hu' : 'wahoo', 'www\.holasearch\.com' : 'holasearch', 'mozbot\.fr' : 'mozbot', 'mirago\.it' : 'miragoit', 'chello\.at' : 'chelloat', '(brisbane|suche)\.t-online\.de' : 't-online', 'iask\.com' : 'iask', 'icerocket\.com' : 'icerocket', 'nbci\.com\/search' : 'nbci', 'search\.conduit\.com' : 'conduit', 'sucheaol\.aol\.de' : 'aolde', 'search\.terra\.' : 'terra', 'haku\.www\.fi' : 'haku', 'suchen\.abacho\.de' : 'abacho', 'ixquick\.com' : 'ixquick', 'danielsen\.com' : 'danielsen', 'northernlight\.' : 'northernlight', 'kataweb\.it' : 'kataweb', 'steady-search\.com' : 'steadysearch', 'netluchs\.de' : 'netluchs', 'najdi\.to' : 'najdi', 'live\.com' : 'live', 'spray\.' : 'spray', 'no\.mirago\.com' : 'miragono', 'shinyseek\.it' : 'shinyseek\.it', 'fr\.ask.\com' : 'askfr', 'virgilio\.it' : 'virgilio', 'scroogle\.org' : 'scroogle', 'ineffabile\.it' : 'ineffabile', 'orbis\.dk' : 'orbis', 'splut\.' : 'splut', 'ukindex\.co\.uk' : 'ukindex', 'findarticles\.com' : 'findarticles', 'looksmart\.co\.uk' : 'looksmartuk', 'metabot\.ru' : 'metabot', 'ctrouve\.' : 'ctrouve', 'allesklar\.de' : 'allesklar', 'search\.alice\.it' : 'aliceit', 'vindex\.' : 'vindex', 'groups\.google\.' : 'google_groups', 'suche\d?\.web\.de' : 'webde', 'quick\.cz' : 'quick', 'infospace\.com' : 'infospace', 'dmoz\.org' : 'dmoz', 'www\.benefind\.de' : 'benefind', '216\.239\.5[0-9]\.104' : 'google_cache', 'arianna\.libero\.it' : 'arianna', 'www\.searchmobileonline\.com' : 'searchmobileonline', 'mirago\.co\.uk' : 'miragocouk', 'froogle\.google\.' : 'google_froogle', 'it\.ask.\com' : 'askit', 'go2net\.com' : 'go2net', 'suche\.gmx\.net' : 'gmxsuche', 'turtle\.ru' : 'turtle', 'uk\.ask.\com' : 'askuk', 'overture\.com' : 'overture', 'chello\.se' : 'chellose', 'gotuneed\.com' : 'gotuneed', 'wisenut\.com' : 'wisenut', 'chello\.pl' : 'chellopl', 'tyfon\.dk' : 'tyfon', 'mirago\.fr' : 'miragofr', 'windowssearch\.com' : 'Windows Search', 'searches\.omiga-plus\.com' : 'Omiga-plus', 'qwant\.com' : 'Qwant', 'wow\.com' : 'WOW', 'lemoteur\.orange\.fr' : 'Orange', 'buenosearch\.com' : 'Bueno Search', 'jwss\.cc' : 'jws'} +search_engines_hashid = {'recherche\.aol\.fr' : 'aolfr', 'google\.' : 'google', 'engine\.exe' : 'engine', 'netsprint\.pl\/hoga\-search' : 'hogapl', 'search\.fbdownloader\.com' : 'fbdownloader', 'chello\.pl' : 'chellopl', 'suche\.gmx\.net' : 'gmxsuche', '\.baidu\.com' : 'baidu', 'ya(ndex)?\.ru' : 'yandex', 'i-une\.com' : 'iune', 'edderkoppen\.dk' : 'edderkoppen', 'mirago\.dk' : 'miragodk', 'biglotron\.com' : 'biglotron', 'infoseek\.de' : 'infoseek', 'findarticles\.com' : 'findarticles', 'chello\.se' : 'chellose', 'suche\d?\.web\.de' : 'webde', 'goliat\.hu' : 'goliat', 'meinestadt\.de' : 'meinestadt', '\.accoona\.com' : 'accoona', 'nl\.ask.\com' : 'asknl', 'infospace\.com' : 'infospace', 'mysearch\.' : 'mysearch', 'francite\.' : 'francite', 'searchy\.co\.uk' : 'searchy', '(66\.218\.71\.225|216\.109\.117\.135|216\.109\.125\.130|66\.218\.69\.11)' : 'yahoo', 'iask\.com' : 'iask', 'googlee\.' : 'google', 'index\.hu' : 'indexhu', 'clusty\.com' : 'clusty', 'www\.startxxl\.com' : 'startxxl', 'search\.earthlink\.net' : 'earthlink', 'danielsen\.com' : 'danielsen', 'digg\.com' : 'digg', 'uk\.ask.\com' : 'askuk', 'mirago' : 'mirago', 'dodaj\.pl' : 'dodajpl', 'altavista\.' : 'altavista', 'chello\.no' : 'chellono', 'es\.mirago\.com' : 'miragoes', 'teoma\.' : 'teoma', 'isearch\.avg\.com' : 'avgsearch', 'search\..*\.\w+' : 'search', 'schoenerbrausen\.de' : 'schoenerbrausen', 'ineffabile\.it' : 'ineffabile', 'mozbot\.fr' : 'mozbot', 'atlas\.cz' : 'atlas', '1klik\.dk' : '1klik', 'de\.ask.\com' : 'askde', 'o2\.pl' : 'o2pl', '\.sogou\.com' : 'sogou', 'netluchs\.de' : 'netluchs', 'mindset\.research\.yahoo' : 'yahoo_mindset', 'search\.internetto\.hu' : 'internetto', 'search\.bluewin\.ch' : 'bluewin', 'images\.google\.' : 'google_image', 'mirago\.fr' : 'miragofr', 'nusearch\.com' : 'nusearch', 'stumbleupon\.com' : 'stumbleupon', 'o2suche\.aol\.de' : 'o2aolde', 'www\.benefind\.de' : 'benefind', 'search\.babylon\.com' : 'babylon', '(^|\.)ask\.com' : 'ask', 'teecno\.it' : 'teecnoit', 'yahoo\.' : 'yahoo', '\.3721\.com' : '3721', 'steady-search\.com' : 'steadysearch', 'sucheaol\.aol\.de' : 'aolde', '(brisbane|suche)\.t-online\.de' : 't-online', '216\.239\.5[0-9]\.104' : 'google_cache', 'chello\.hu' : 'chellohu', 'jubii\.dk' : 'jubii', 'www\.searchmobileonline\.com' : 'searchmobileonline', 'gotuneed\.com' : 'gotuneed', 'virgilio\.it' : 'virgilio', 'wwweasel\.de' : 'wwweasel', 'ledix\.net' : 'ledix', 'rambler\.ru' : 'rambler', 'arianna\.libero\.it' : 'arianna', 'ecosia\.org' : 'ecosiasearch', 'no\.mirago\.com' : 'miragono', 'as\.starware\.com' : 'comettoolbar', 'centrum\.cz' : 'centrum', 'mirago\.ch' : 'miragoch', 'supereva\.com' : 'supereva', 'groups\.google\.' : 'google_groups', 'spotjockey\.' : 'spotjockey', 'goggle\.co\.hu' : 'google', 'recherche\.club-internet\.fr' : 'clubinternet', 'toile\.com' : 'toile', 'centraldatabase\.org' : 'centraldatabase', 'ctrouve\.' : 'ctrouve', '(?:www[12]?|mixidj)\.delta-search\.com' : 'delta-search', 'search\.terra\.' : 'terra', 'blingo\.com' : 'blingo', 'rechercher\.libertysurf\.fr' : 'libertysurf', 'gery\.pl' : 'gerypl', 'avantfind\.com' : 'avantfind', 'godado' : 'godado', 'anzwers\.com\.au' : 'anzwers', 'scroogle\.org' : 'scroogle', 'eniro\.se' : 'enirose', 'chello\.cz' : 'chellocz', 'mamma\.' : 'mamma', 'sify\.com' : 'sify', '(^|\.)ask\.co\.uk' : 'askuk', 'netstjernen\.dk' : 'netstjernen', 'search\.ch' : 'searchch', 'answerbus\.com' : 'answerbus', 'alltheweb\.com' : 'alltheweb', 'netscape\.' : 'netscape', 'ask\.jp' : 'askjp', 'search\.alice\.it\.master' : 'aliceitmaster', 'chello\.fr' : 'chellofr', 'voila\.' : 'voila', 'del\.icio\.us' : 'delicious', 'mirago\.be' : 'miragobe', '\.zhongsou\.com' : 'zhongsou', 'chello' : 'chellocom', 'haku\.www\.fi' : 'haku', 'seznam\.cz' : 'seznam', 'webcrawler\.' : 'webcrawler', 'hotbot\.' : 'hotbot', 'looksmart\.co\.uk' : 'looksmartuk', 'bing\.' : 'bing', 'orbis\.dk' : 'orbis', 'froogle\.google\.' : 'google_froogle', 'int\.search-results\.com' : 'nortonsavesearch', 'keresolap\.hu' : 'keresolap_hu', '216\.239\.(35|37|39|51)\.100' : 'google_cache', 'jyxo\.(cz|com)' : 'jyxo', 'suche\.aol\.de' : 'aolsuche', 'zoznam\.sk' : 'zoznam', 'mirago\.de' : 'miragode', '\.lbb\.org' : 'lbb', 'search\.genieo\.com' : 'genieo', 'shinyseek\.it' : 'shinyseek\.it', 'www\.holasearch\.com' : 'holasearch', 'excite\.' : 'excite', '216\.239\.(35|37|39|51)\.101' : 'google_cache', 'swik\.net' : 'swik', '66\.249\.93\.104' : 'google_cache', 'miner\.bol\.com\.br' : 'miner', '\.163\.com' : 'netease', '\.vnet\.cn' : 'vnet', 'pogodak\.' : 'pogodak', 'go2net\.com' : 'go2net', 'dogpile\.com' : 'dogpile', 'live\.com' : 'live', 'claro-search\.com' : 'clarosearch', 'nbci\.com\/search' : 'nbci', 'search\.alice\.it' : 'aliceit', 'evreka\.passagen\.se' : 'passagen', 'tiscali\.' : 'tiscali', 'copernic\.com' : 'copernic', 'overture\.com' : 'overture', 'search\.sli\.sympatico\.ca' : 'sympatico', 'fr\.ask.\com' : 'askfr', 'alexa\.com' : 'alexa', 'find\.dk' : 'finddk', '(161\.58\.227\.204|161\.58\.247\.101|212\.40\.165\.90|213\.133\.108\.202|217\.160\.108\.151|217\.160\.111\.99|217\.160\.131\.108|217\.160\.142\.227|217\.160\.176\.42)' : 'metacrawler_de', 'msn\.' : 'msn', 'search\.conduit\.com' : 'conduit', 'sapo\.pt' : 'sapo', 'ukplus\.' : 'ukplus', 'looksmart\.' : 'looksmart', 'sol\.dk' : 'sol', 'kataweb\.it' : 'kataweb', 'interia\.pl' : 'interiapl', 'polymeta\.hu' : 'polymeta_hu', 'chello\.sk' : 'chellosk', 'search[\w\-]+\.free\.fr' : 'free', 'metabot\.ru' : 'metabot', 'netsprint\.pl' : 'netsprintpl', 'lapkereso\.hu' : 'lapkereso', 'wisenut\.com' : 'wisenut', 'tango\.hu' : 'tango_hu', 'mywebsearch\.com' : 'mywebsearch', 'eniro\.no' : 'eniro', 'szukaj\.onet\.pl' : 'onetpl', '\.soso\.com' : 'soso', 'segnalo\.alice\.it' : 'segnalo', 'splut\.' : 'splut', 'fireball\.de' : 'fireball', 'vindex\.' : 'vindex', 'dmoz\.org' : 'dmoz', 'search\.aol\.co' : 'aol', 'goodsearch\.com' : 'goodsearch', '[a-z]serv\.rrzn\.uni-hannover\.de' : 'meta', 'bungeebonesdotcom' : 'bungeebonesdotcom', 'ofir\.dk' : 'ofir', 'ifind\.freeserve' : 'freeserve', 'de\.aolsearch\.com' : 'aolsearch', 'mirago\.se' : 'miragose', 'att\.net' : 'att', 'www\.search\.com' : 'search.com', 'chello\.be' : 'chellobe', 'ixquick\.com' : 'ixquick', 'szukaj\.wp\.pl' : 'wp', 'katalog\.onet\.pl' : 'katalogonetpl', 'vivisimo\.com' : 'vivisimo', 'northernlight\.' : 'northernlight', 'turtle\.ru' : 'turtle', 'wow\.pl' : 'wowpl', '(^|\.)go\.com' : 'go', 'szukacz\.pl' : 'szukaczpl', 'metacrawler\.' : 'metacrawler', 'googlecom\.com' : 'google', 'dejanews\.' : 'dejanews', 'mirago\.it' : 'miragoit', '64\.233\.1[0-9]{2}\.104' : 'google_cache', 'wahoo\.hu' : 'wahoo', 'mirago\.nl' : 'miragonl', 'a9\.com' : 'a9', 'suchen\.abacho\.de' : 'abacho', 'bbc\.co\.uk/cgi-bin/search' : 'bbc', 'questionanswering\.com' : 'questionanswering', 'najdi\.to' : 'najdi', 'jumpy\.it' : 'jumpy\.it', 'aport\.ru' : 'aport', 'vizsla\.origo\.hu' : 'origo', 'spray\.' : 'spray', 'sphere\.com' : 'sphere', 'steadysearch\.com' : 'steadysearch', '66\.102\.[1-9]\.104' : 'google_cache', 'chello\.nl' : 'chellonl', 'atomz\.' : 'atomz', 'google\.[\w.]+/products' : 'google_products', 'redbox\.cz' : 'redbox', 'lycos\.' : 'lycos', 'chello\.at' : 'chelloat', 'quick\.cz' : 'quick', 'kartoo\.com' : 'kartoo', 'icerocket\.com' : 'icerocket', 'mirago\.co\.uk' : 'miragocouk', 'gazeta\.pl' : 'gazetapl', 'start\.shaw\.ca' : 'shawca', 'allesklar\.de' : 'allesklar', 'polska\.pl' : 'polskapl', 'start\.iminent\.com' : 'iminent', 'tyfon\.dk' : 'tyfon', 'heureka\.hu' : 'heureka', 'webmania\.hu' : 'webmania', 'es\.ask.\com' : 'askes', 'opasia\.dk' : 'opasia', 'euroseek\.' : 'euroseek', 'ilse\.' : 'ilse', 'it\.ask.\com' : 'askit', 'base\.google\.' : 'google_base', '4\-counter\.com' : 'google4counter', '212\.227\.33\.241' : 'metaspinner', 'sok\.start\.no' : 'start', 'ukindex\.co\.uk' : 'ukindex', 'static\.flipora\.com' : 'flipora', 'ukdirectory\.' : 'ukdirectory', 'searchalot\.com' : 'searchalot', 'sagool\.jp' : 'sagool', 'www1\.search-results\.com' : 'searchresults', 'kvasir\.' : 'kvasir', 'icq\.com\/search' : 'icq', '72\.14\.2[0-9]{2}\.104' : 'google_cache', 'www.sfr\.fr\/recherche\/google' : 'google', 'searches\.omiga-plus\.com' : 'Omiga-plus', 'lemoteur\.orange\.fr' : 'Orange', 'searches\.vi-view\.com' : 'vi-view', 'qwant\.com' : 'Qwant', 'buenosearch\.com' : 'Bueno Search', 'wow\.com' : 'WOW', 'windowssearch\.com' : 'Windows Search', 'jwss\.cc' : 'jws'} -search_engines_knwown_url = {'segnalo' : '', 'comettoolbar' : 'qry=', 'chellofr' : 'q1=', 'yandex' : 'text=', 'google_products' : '(p|q|as_p|as_q)=', 'genieo' : 'q=', 'searchy' : 'search_term=', 'goodsearch' : 'Keywords=', 'chellocz' : 'q1=', 'tango_hu' : 'q=', 'msn' : 'q=', 'nortonsavesearch' : 'q=', 'o2aolde' : 'q=', 'miragocouk' : '(txtsearch|qry)=', 'google_image' : '(p|q|as_p|as_q)=', 'questionanswering' : '', 'conduit' : 'q=', 'start' : 'q=', 'miner' : 'q=', 'haku' : 'w=', 'ecosiasearch' : 'q=', 'kataweb' : 'q=', 'ukindex' : 'stext=', 'rambler' : 'words=', 'pogodak' : 'q=', 'toile' : 'q=', 'jubii' : 'soegeord=', 'spotjockey' : 'Search_Keyword=', 'gmxsuche' : 'q=', 'ledix' : 'q=', 'steadysearch' : 'w=', 'miragofr' : '(txtsearch|qry)=', 'askjp' : '(ask|q)=', 'teecnoit' : 'q=', 'anzwers' : 'search=', 'ixquick' : 'query=', 'metaspinner' : 'qry=', 'dmoz' : 'search=', 'sphere' : 'q=', 'ukdirectory' : 'k=', 'miragonl' : '(txtsearch|qry)=', 'francite' : 'name=', 'bbc' : 'q=', 'goliat' : 'KERESES=', 'terra' : 'query=', 'sympatico' : 'query=', 'aport' : 'r=', 'vnet' : 'kw=', 'jumpy\.it' : 'searchWord=', 'miragoes' : '(txtsearch|qry)=', 'netease' : 'q=', 'origo' : '(q|search)=', 'northernlight' : 'qr=', 'ofir' : 'querytext=', 'delta-search' : 'q=', 'bungeebonesdotcom' : 'query=', 'digg' : 's=', 'holasearch' : 'q=', 'finddk' : 'words=', 'ilse' : 'search_for=', 'orbis' : 'search_field=', 'clubinternet' : 'q=', 'live' : 'q=', 'yahoo_mindset' : 'p=', 'tiscali' : 'key=', 'hogapl' : 'qt=', 'seznam' : '(w|q)=', 'katalogonetpl' : 'qt=', 'teoma' : 'q=', 'chellonl' : 'q1=', 'virgilio' : 'qs=', 'freeserve' : 'q=', 'sify' : 'keyword=', 'gazetapl' : 'slowo=', 'voila' : '(kw|rdata)=', 'alexa' : 'q=', 'searchresults' : 'q=', 'mozbot' : 'q=', 'blingo' : 'q=', 'nbci' : 'keyword=', 'chellohu' : 'q1=', 'ineffabile' : '', '1klik' : 'query=', 'webcrawler' : 'searchText=', 'yahoo' : 'p=', 'atlas' : '(searchtext|q)=', 'onetpl' : 'qt=', 'miragodk' : '(txtsearch|qry)=', 'altavista' : 'q=', 'godado' : 'Keywords=', 'bluewin' : 'qry=', 'a9' : 'a9\.com\/', 'earthlink' : 'q=', 'dodajpl' : 'keyword=', 'copernic' : 'web\/', 'delicious' : 'all=', 'aliceitmaster' : 'qs=', 'splut' : 'pattern=', 'excite' : 'search=', 'avgsearch' : 'q=', 'danielsen' : 'q=', 'edderkoppen' : 'query=', 'go' : 'qt=', 'aolsearch' : 'q=', 'schoenerbrausen' : 'q=', 'stumbleupon' : '', 'askit' : '(ask|q)=', 'kartoo' : '', 'wowpl' : 'q=', 'mirago' : '(txtsearch|qry)=', 'netsprintpl' : 'q=', 'vivisimo' : 'query=', 'benefind' : 'q=', 'polymeta_hu' : '', 'engine' : 'p1=', 'searchch' : 'q=', 'looksmart' : 'key=', 'metabot' : 'st=', 'quick' : 'query=', 'google' : '(p|q|as_p|as_q)=', 'kvasir' : 'q=', 'netscape' : 'search=', 'fireball' : 'q=', 'clarosearch' : 'q=', 'search.com' : 'q=', 'infospace' : 'qkw=', 'eniro' : 'q=', 'biglotron' : 'question=', 'aolsuche' : 'q=', 'miragoit' : '(txtsearch|qry)=', 'google_groups' : 'group\/', 'avantfind' : 'keywords=', 'passagen' : 'q=', 'aliceit' : 'qs=', 'redbox' : 'srch=', 'ukplus' : 'search=', 'supereva' : 'q=', 'vindex' : 'in=', 'internetto' : 'searchstr=', 'centrum' : 'q=', 'iask' : '(w|k)=', 'atomz' : 'sp-q=', 'chellocom' : 'q1=', 'lycos' : 'query=', 'metacrawler' : 'general=', 'polskapl' : 'qt=', 'abacho' : 'q=', 'shinyseek\.it' : 'KEY=', 'aol' : 'query=', 'wisenut' : 'query=', 'clusty' : 'query=', 'wwweasel' : 'q=', '3721' : '(p|name)=', 'sagool' : 'q=', 'sogou' : 'query=', 'swik' : 'swik\.net/', 'jyxo' : '(s|q)=', 'google_froogle' : '(p|q|as_p|as_q)=', 'findarticles' : 'key=', 'miragode' : '(txtsearch|qry)=', 'najdi' : 'dotaz=', 'google_base' : '(p|q|as_p|as_q)=', 'enirose' : 'q=', 'miragose' : '(txtsearch|qry)=', 'interiapl' : 'q=', 'iminent' : 'q=', 't-online' : 'q=', 'chellosk' : 'q1=', 'bing' : 'q=', 'webde' : 'su=', 'flipora' : 'q=', 'alltheweb' : 'q(|uery)=', 'mywebsearch' : 'searchfor=', 'overture' : 'keywords=', 'centraldatabase' : 'query=', 'icerocket' : 'q=', 'askuk' : '(ask|q)=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'soso' : 'q=', 'mysearch' : 'searchfor=', 'scroogle' : 'Gw=', 'ask' : '(ask|q)=', 'metacrawler_de' : 'qry=', 'spray' : 'string=', 'iune' : '(keywords|q)=', 'searchalot' : 'q=', 'wp' : 'szukaj=', 'gotuneed' : '', 'babylon' : 'q=', 'euroseek' : 'query=', 'shawca' : 'q=', 'hotbot' : 'mt=', 'askfr' : '(ask|q)=', 'att' : 'qry=', 'miragono' : '(txtsearch|qry)=', 'nusearch' : 'nusearch_terms=', 'chelloat' : 'q1=', 'netluchs' : 'query=', 'fbdownloader' : 'q=', 'wahoo' : 'q=', 'chellono' : 'q1=', 'keresolap_hu' : 'q=', 'gerypl' : 'q=', 'baidu' : '(wd|word)=', 'szukaczpl' : 'q=', 'miragoch' : '(txtsearch|qry)=', 'arianna' : 'query=', 'asknl' : '(ask|q)=', 'heureka' : 'heureka=', 'opasia' : 'q=', 'icq' : 'q=', 'chellobe' : 'q1=', 'aolde' : 'q=', 'answerbus' : '', 'askde' : '(ask|q)=', 'looksmartuk' : 'key=', 'google4counter' : '(p|q|as_p|as_q)=', 'miragobe' : '(txtsearch|qry)=', 'startxxl' : 'q=', 'o2pl' : 'qt=', 'zhongsou' : '(word|w)=', 'searchmobileonline' : 'q=', 'mamma' : 'query=', 'go2net' : 'general=', 'sol' : 'q=', 'askes' : '(ask|q)=', 'chellose' : 'q1=', 'dogpile' : 'q(|kw)=', 'chellopl' : 'q1=', 'accoona' : 'qt=', 'infoseek' : 'qt=', 'Omiga-plus' : 'q=', 'Qwant' : 'q=', 'Windows Search' : 'q=', 'Bueno Search' : 'q=', 'Orange' : 'kw=', 'jws' : 'q=', 'WOW' : 'q='} +search_engines_knwown_url = {'clusty' : 'query=', 'mywebsearch' : 'searchfor=', 'o2pl' : 'qt=', 'jubii' : 'soegeord=', 'finddk' : 'words=', 'chellono' : 'q1=', 'search.com' : 'q=', 'askuk' : '(ask|q)=', 'iminent' : 'q=', 'earthlink' : 'q=', 'passagen' : 'q=', 'miragobe' : '(txtsearch|qry)=', 'miragoit' : '(txtsearch|qry)=', 'danielsen' : 'q=', 'askde' : '(ask|q)=', 'looksmartuk' : 'key=', 'orbis' : 'search_field=', 'chellocz' : 'q1=', 'nusearch' : 'nusearch_terms=', 'searchmobileonline' : 'q=', 'avantfind' : 'keywords=', 'kartoo' : '', 'asknl' : '(ask|q)=', 'chellose' : 'q1=', 'teoma' : 'q=', 'bungeebonesdotcom' : 'query=', 'metacrawler_de' : 'qry=', '1klik' : 'query=', 'bing' : 'q=', 'mysearch' : 'searchfor=', 'aolsearch' : 'q=', 'yahoo_mindset' : 'p=', 'go' : 'qt=', 'wisenut' : 'query=', 'chellohu' : 'q1=', 'iune' : '(keywords|q)=', 'francite' : 'name=', 'gmxsuche' : 'q=', 'benefind' : 'q=', 'o2aolde' : 'q=', 'jyxo' : '(s|q)=', 'chellopl' : 'q1=', 'schoenerbrausen' : 'q=', 'findarticles' : 'key=', 'looksmart' : 'key=', 'conduit' : 'q=', 'google4counter' : '(p|q|as_p|as_q)=', 'google_image' : '(p|q|as_p|as_q)=', 'spray' : 'string=', 'baidu' : '(wd|word)=', 'mamma' : 'query=', 'chelloat' : 'q1=', 'ixquick' : 'query=', 'heureka' : 'heureka=', '3721' : '(p|name)=', 'questionanswering' : '', 'live' : 'q=', 'kataweb' : 'q=', 'aliceit' : 'qs=', 'google_products' : '(p|q|as_p|as_q)=', 'euroseek' : 'query=', 'sympatico' : 'query=', 'go2net' : 'general=', 'accoona' : 'qt=', 'netease' : 'q=', 'redbox' : 'srch=', 'sol' : 'q=', 'goodsearch' : 'Keywords=', 'miragoch' : '(txtsearch|qry)=', 'seznam' : '(w|q)=', 'chellonl' : 'q1=', 'start' : 'q=', 'zhongsou' : '(word|w)=', 'ecosiasearch' : 'q=', 'katalogonetpl' : 'qt=', 'nortonsavesearch' : 'q=', 'aolsuche' : 'q=', 'att' : 'qry=', 'delicious' : 'all=', 'origo' : '(q|search)=', 'jumpy\.it' : 'searchWord=', 'wwweasel' : 'q=', 'aliceitmaster' : 'qs=', 'sagool' : 'q=', 'flipora' : 'q=', 'gerypl' : 'q=', 'miragode' : '(txtsearch|qry)=', 'nbci' : 'keyword=', 'searchresults' : 'q=', 'centrum' : 'q=', 'engine' : 'p1=', 'tango_hu' : 'q=', 'netluchs' : 'query=', 'delta-search' : 'q=', 'icerocket' : 'q=', 'spotjockey' : 'Search_Keyword=', 'northernlight' : 'qr=', 'dodajpl' : 'keyword=', 'google_base' : '(p|q|as_p|as_q)=', 'google_cache' : '(p|q|as_p|as_q)=cache:[0-9A-Za-z]{12}:', 'blingo' : 'q=', 'google_froogle' : '(p|q|as_p|as_q)=', 'abacho' : 'q=', 'holasearch' : 'q=', 'fireball' : 'q=', 'google' : '(p|q|as_p|as_q)=', 'terra' : 'query=', 't-online' : 'q=', 'aol' : 'query=', 'lycos' : 'query=', 'edderkoppen' : 'query=', 'hogapl' : 'qt=', 'yandex' : 'text=', 'askjp' : '(ask|q)=', 'dmoz' : 'search=', 'chellocom' : 'q1=', 'goliat' : 'KERESES=', 'hotbot' : 'mt=', 'ukplus' : 'search=', 'anzwers' : 'search=', 'aport' : 'r=', 'avgsearch' : 'q=', 'centraldatabase' : 'query=', 'ilse' : 'search_for=', 'miragofr' : '(txtsearch|qry)=', 'metacrawler' : 'general=', 'infoseek' : 'qt=', 'aolde' : 'q=', 'interiapl' : 'q=', 'dogpile' : 'q(|kw)=', 'google_groups' : 'group\/', 'biglotron' : 'question=', 'startxxl' : 'q=', 'alexa' : 'q=', 'iask' : '(w|k)=', 'clarosearch' : 'q=', 'atlas' : '(searchtext|q)=', 'wahoo' : 'q=', 'toile' : 'q=', 'sphere' : 'q=', 'metabot' : 'st=', 'scroogle' : 'Gw=', 'mirago' : '(txtsearch|qry)=', 'alltheweb' : 'q(|uery)=', 'yahoo' : 'p=', 'pogodak' : 'q=', 'ukindex' : 'stext=', 'gazetapl' : 'slowo=', 'genieo' : 'q=', 'szukaczpl' : 'q=', 'steadysearch' : 'w=', 'gotuneed' : '', 'miner' : 'q=', 'virgilio' : 'qs=', 'miragodk' : '(txtsearch|qry)=', 'mozbot' : 'q=', 'wp' : 'szukaj=', 'swik' : 'swik\.net/', 'wowpl' : 'q=', 'najdi' : 'dotaz=', 'keresolap_hu' : 'q=', 'vivisimo' : 'query=', 'polymeta_hu' : '', 'kvasir' : 'q=', 'babylon' : 'q=', 'icq' : 'q=', 'comettoolbar' : 'qry=', 'vindex' : 'in=', 'atomz' : 'sp-q=', 'fbdownloader' : 'q=', 'ledix' : 'q=', 'ofir' : 'querytext=', 'chellobe' : 'q1=', 'answerbus' : '', 'miragoes' : '(txtsearch|qry)=', 'sogou' : 'query=', 'segnalo' : '', 'voila' : '(kw|rdata)=', 'msn' : 'q=', 'quick' : 'query=', 'webcrawler' : 'searchText=', 'searchch' : 'q=', 'internetto' : 'searchstr=', 'sify' : 'keyword=', 'arianna' : 'query=', 'splut' : 'pattern=', 'enirose' : 'q=', 'netscape' : 'search=', 'godado' : 'Keywords=', 'stumbleupon' : '', 'overture' : 'keywords=', 'netsprintpl' : 'q=', 'rambler' : 'words=', 'freeserve' : 'q=', 'chellofr' : 'q1=', 'askes' : '(ask|q)=', 'copernic' : 'web\/', 'polskapl' : 'qt=', 'bluewin' : 'qry=', 'ineffabile' : '', 'miragose' : '(txtsearch|qry)=', 'supereva' : 'q=', 'miragonl' : '(txtsearch|qry)=', 'metaspinner' : 'qry=', 'excite' : 'search=', 'miragocouk' : '(txtsearch|qry)=', 'ukdirectory' : 'k=', 'ask' : '(ask|q)=', 'opasia' : 'q=', 'bbc' : 'q=', 'a9' : 'a9\.com\/', 'eniro' : 'q=', 'askfr' : '(ask|q)=', 'askit' : '(ask|q)=', 'teecnoit' : 'q=', 'shawca' : 'q=', 'digg' : 's=', 'webde' : 'su=', 'searchalot' : 'q=', 'soso' : 'q=', 'shinyseek\.it' : 'KEY=', 'vnet' : 'kw=', 'clubinternet' : 'q=', 'miragono' : '(txtsearch|qry)=', 'chellosk' : 'q1=', 'tiscali' : 'key=', 'onetpl' : 'qt=', 'haku' : 'w=', 'altavista' : 'q=', 'infospace' : 'qkw=', 'searchy' : 'search_term=', 'vi-view' : 'q=', 'jws' : 'q=', 'WOW' : 'q=', 'Omiga-plus' : 'q=', 'Qwant' : 'q=', 'Windows Search' : 'q=', 'Bueno Search' : 'q=', 'Orange' : 'kw='} operating_systems = ['windows[_+ ]?2005', 'windows[_+ ]nt[_+ ]6\.0', 'windows[_+ ]?2008', 'windows[_+ ]nt[_+ ]6\.1', 'windows[_+ ]?2012', 'windows[_+ ]nt[_+ ]6\.2', 'windows[_+ ]?vista', 'windows[_+ ]nt[_+ ]6', 'windows[_+ ]?2003', 'windows[_+ ]nt[_+ ]5\.2', 'windows[_+ ]xp', 'windows[_+ ]nt[_+ ]5\.1', 'windows[_+ ]me', 'win[_+ ]9x', 'windows[_+ ]?2000', 'windows[_+ ]nt[_+ ]5', 'winnt', 'windows[_+ \-]?nt', 'win32', 'win(.*)98', 'win(.*)95', 'win(.*)16', 'windows[_+ ]3', 'win(.*)ce', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4', 'mac[_+ ]os[_+ ]x', 'mac[_+ ]?p', 'mac[_+ ]68', 'macweb', 'macintosh', 'linux(.*)android', 'linux(.*)asplinux', 'linux(.*)centos', 'linux(.*)debian', 'linux(.*)fedora', 'linux(.*)gentoo', 'linux(.*)mandr', 'linux(.*)momonga', 'linux(.*)pclinuxos', 'linux(.*)red[_+ ]hat', 'linux(.*)suse', 'linux(.*)ubuntu', 'linux(.*)vector', 'linux(.*)vine', 'linux(.*)white\sbox', 'linux(.*)zenwalk', 'linux', 'gnu.hurd', 'bsdi', 'gnu.kfreebsd', 'freebsd', 'openbsd', 'netbsd', 'dragonfly', 'aix', 'sunos', 'irix', 'osf', 'hp\-ux', 'unix', 'x11', 'gnome\-vfs', 'beos', 'os/2', 'amiga', 'atari', 'vms', 'commodore', 'qnx', 'inferno', 'palmos', 'syllable', 'blackberry', 'cp/m', 'crayos', 'dreamcast', 'iphone[_+ ]os', 'risc[_+ ]?os', 'symbian', 'webtv', 'playstation', 'xbox', 'wii', 'vienna', 'newsfire', 'applesyndication', 'akregator', 'plagger', 'syndirella', 'j2me', 'java', 'microsoft', 'msie[_+ ]', 'ms[_+ ]frontpage', 'windows'] -operating_systems_hashid = {'bsdi' : 'bsdi', 'x11' : 'unix', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'linux' : 'linux', 'linux(.*)zenwalk' : 'linuxzenwalk', 'windows[_+ \-]?nt' : 'winnt', 'macweb' : 'macintosh', 'linux(.*)centos' : 'linuxcentos', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'mac[_+ ]?p' : 'macintosh', 'msie[_+ ]' : 'winunknown', 'win(.*)95' : 'win95', 'os/2' : 'os/2', 'linux(.*)momonga' : 'linuxmomonga', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'commodore' : 'commodore', 'winnt' : 'winnt', 'dreamcast' : 'dreamcast', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'ms[_+ ]frontpage' : 'winunknown', 'win(.*)16' : 'win16', 'syndirella' : 'winxp', 'macintosh' : 'macintosh', 'win(.*)98' : 'win98', 'osf' : 'osf', 'webtv' : 'webtv', 'linux(.*)asplinux' : 'linuxasplinux', 'linux(.*)suse' : 'linuxsuse', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9' : 'macosx9', 'linux(.*)ubuntu' : 'linuxubuntu', 'plagger' : 'unix', 'crayos' : 'crayos', 'wii' : 'wii', 'iphone[_+ ]os' : 'ios', 'gnu.kfreebsd' : 'bsdkfreebsd', 'windows[_+ ]xp' : 'winxp', 'linux(.*)mandr' : 'linuxmandr', 'windows[_+ ]?2000' : 'win2000', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4' : 'macosx4', 'linux(.*)vector' : 'linuxvector', 'aix' : 'aix', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8' : 'macosx8', 'xbox' : 'winxbox', 'linux(.*)vine' : 'linuxvine', 'windows[_+ ]me' : 'winme', 'gnu.hurd' : 'gnu', 'linux(.*)gentoo' : 'linuxgentoo', 'j2me' : 'j2me', 'windows[_+ ]?vista' : 'winvista', 'windows' : 'winunknown', 'linux(.*)fedora' : 'linuxfedora', 'gnome\-vfs' : 'unix', 'linux(.*)debian' : 'linuxdebian', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'windows[_+ ]?2005' : 'winlong', 'syllable' : 'syllable', 'windows[_+ ]nt[_+ ]6\.2' : 'win8', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'playstation' : 'psp', 'mac[_+ ]68' : 'macintosh', 'java' : 'java', 'windows[_+ ]?2012' : 'win2012', 'linux(.*)white\sbox' : 'linuxwhitebox', 'inferno' : 'inferno', 'vms' : 'vms', 'palmos' : 'palmos', 'qnx' : 'qnx', 'atari' : 'atari', 'windows[_+ ]?2008' : 'win2008', 'cp/m' : 'cp/m', 'win[_+ ]9x' : 'winme', 'risc[_+ ]?os' : 'riscos', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7' : 'macosx7', 'windows[_+ ]?2003' : 'win2003', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5' : 'macosx5', 'win(.*)ce' : 'wince', 'akregator' : 'linux', 'hp\-ux' : 'hp\-ux', 'dragonflybsd' : 'bsddflybsd', 'newsfire' : 'macosx', 'microsoft' : 'winunknown', 'netbsd' : 'bsdnetbsd', 'irix' : 'irix', 'mac[_+ ]os[_+ ]x' : 'macosx', 'beos' : 'beos', 'applesyndication' : 'macosx', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6' : 'macosx6', 'win32' : 'winnt', 'linux(.*)android' : 'linuxandroid', 'sunos' : 'sunos', 'symbian' : 'symbian', 'vienna' : 'macosx', 'openbsd' : 'bsdopenbsd', 'windows[_+ ]3' : 'win16', 'blackberry' : 'blackberry', 'unix' : 'unix', 'amiga' : 'amigaos', 'freebsd' : 'bsdfreebsd'} +operating_systems_hashid = {'qnx' : 'qnx', 'blackberry' : 'blackberry', 'linux(.*)suse' : 'linuxsuse', 'linux(.*)white\sbox' : 'linuxwhitebox', 'amiga' : 'amigaos', 'java' : 'java', 'linux(.*)momonga' : 'linuxmomonga', 'msie[_+ ]' : 'winunknown', 'symbian' : 'symbian', 'microsoft' : 'winunknown', 'beos' : 'beos', 'win(.*)ce' : 'wince', 'applesyndication' : 'macosx', 'playstation' : 'psp', 'windows[_+ ]me' : 'winme', 'gnu.hurd' : 'gnu', 'gnu.kfreebsd' : 'bsdkfreebsd', 'windows[_+ ]nt[_+ ]6' : 'winvista', 'syllable' : 'syllable', 'openbsd' : 'bsdopenbsd', 'unix' : 'unix', 'windows[_+ ]nt[_+ ]5\.2' : 'win2003', 'linux(.*)android' : 'linuxandroid', 'windows[_+ ]nt[_+ ]5\.1' : 'winxp', 'mac[_+ ]os[_+ ]x' : 'macosx', 'gnome\-vfs' : 'unix', 'windows[_+ ]nt[_+ ]6\.0' : 'winlong', 'palmos' : 'palmos', 'windows[_+ ]nt[_+ ]6\.1' : 'win7', 'sunos' : 'sunos', 'windows[_+ ]?2005' : 'winlong', 'newsfire' : 'macosx', 'vms' : 'vms', 'risc[_+ ]?os' : 'riscos', 'linux' : 'linux', 'ms[_+ ]frontpage' : 'winunknown', 'vienna' : 'macosx', 'mac[_+ ]68' : 'macintosh', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7' : 'macosx7', 'windows[_+ ]nt[_+ ]5' : 'win2000', 'syndirella' : 'winxp', 'wii' : 'wii', 'irix' : 'irix', 'dragonflybsd' : 'bsddflybsd', 'windows' : 'winunknown', 'atari' : 'atari', 'netbsd' : 'bsdnetbsd', 'macintosh' : 'macintosh', 'plagger' : 'unix', 'x11' : 'unix', 'linux(.*)zenwalk' : 'linuxzenwalk', 'crayos' : 'crayos', 'dreamcast' : 'dreamcast', 'linux(.*)vine' : 'linuxvine', 'osf' : 'osf', 'akregator' : 'linux', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8' : 'macosx8', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]6' : 'macosx6', 'win(.*)95' : 'win95', 'windows[_+ ]?vista' : 'winvista', 'os/2' : 'os/2', 'linux(.*)debian' : 'linuxdebian', 'webtv' : 'webtv', 'win[_+ ]9x' : 'winme', 'aix' : 'aix', 'cp/m' : 'cp/m', 'linux(.*)red[_+ ]hat' : 'linuxredhat', 'win(.*)16' : 'win16', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]5' : 'macosx5', 'linux(.*)asplinux' : 'linuxasplinux', 'inferno' : 'inferno', 'win(.*)98' : 'win98', 'bsdi' : 'bsdi', 'windows[_+ ]?2008' : 'win2008', 'freebsd' : 'bsdfreebsd', 'hp\-ux' : 'hp\-ux', 'windows[_+ ]xp' : 'winxp', 'commodore' : 'commodore', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9' : 'macosx9', 'xbox' : 'winxbox', 'windows[_+ \-]?nt' : 'winnt', 'linux(.*)gentoo' : 'linuxgentoo', 'windows[_+ ]?2012' : 'win2012', 'macweb' : 'macintosh', 'winnt' : 'winnt', 'linux(.*)fedora' : 'linuxfedora', 'iphone[_+ ]os' : 'ios', 'win32' : 'winnt', 'windows[_+ ]?2000' : 'win2000', 'linux(.*)pclinuxos' : 'linuxpclinuxos', 'j2me' : 'j2me', 'windows[_+ ]3' : 'win16', 'linux(.*)vector' : 'linuxvector', 'mac[_+ ]?p' : 'macintosh', 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]4' : 'macosx4', 'windows[_+ ]?2003' : 'win2003', 'linux(.*)mandr' : 'linuxmandr', 'linux(.*)ubuntu' : 'linuxubuntu', 'linux(.*)centos' : 'linuxcentos', 'windows[_+ ]nt[_+ ]6\.2' : 'win8'} -operating_systems_family = {'mac' : 'Macintosh', 'bsd' : 'BSD', 'win' : 'Windows', 'linux' : 'Linux'} +operating_systems_family = {'linux' : 'Linux', 'bsd' : 'BSD', 'win' : 'Windows', 'mac' : 'Macintosh'} browsers = ['elinks', 'firebird', 'go!zilla', 'icab', 'links', 'lynx', 'omniweb', '22acidownload', 'abrowse', 'aol\-iweng', 'amaya', 'amigavoyager', 'arora', 'aweb', 'charon', 'donzilla', 'seamonkey', 'flock', 'minefield', 'bonecho', 'granparadiso', 'songbird', 'strata', 'sylera', 'kazehakase', 'prism', 'icecat', 'iceape', 'iceweasel', 'w3clinemode', 'bpftp', 'camino', 'chimera', 'cyberdog', 'dillo', 'xchaos_arachne', 'doris', 'dreamcast', 'xbox', 'downloadagent', 'ecatch', 'emailsiphon', 'encompass', 'epiphany', 'friendlyspider', 'fresco', 'galeon', 'flashget', 'freshdownload', 'getright', 'leechget', 'netants', 'headdump', 'hotjava', 'ibrowse', 'intergo', 'k\-meleon', 'k\-ninja', 'linemodebrowser', 'lotus\-notes', 'macweb', 'multizilla', 'ncsa_mosaic', 'netcaptor', 'netpositive', 'nutscrape', 'msfrontpageexpress', 'contiki', 'emacs\-w3', 'phoenix', 'shiira', 'tzgeturl', 'viking', 'webfetcher', 'webexplorer', 'webmirror', 'webvcr', 'qnx\svoyager', 'cloudflare', 'grabber', 'teleport', 'webcapture', 'webcopier', 'real', 'winamp', 'windows\-media\-player', 'audion', 'freeamp', 'itunes', 'jetaudio', 'mint_audio', 'mpg123', 'mplayer', 'nsplayer', 'qts', 'quicktime', 'sonique', 'uplayer', 'xaudio', 'xine', 'xmms', 'gstreamer', 'abilon', 'aggrevator', 'aiderss', 'akregator', 'applesyndication', 'betanews_reader', 'blogbridge', 'cyndicate', 'feeddemon', 'feedreader', 'feedtools', 'greatnews', 'gregarius', 'hatena_rss', 'jetbrains_omea', 'liferea', 'netnewswire', 'newsfire', 'newsgator', 'newzcrawler', 'plagger', 'pluck', 'potu', 'pubsub\-rss\-reader', 'pulpfiction', 'rssbandit', 'rssreader', 'rssowl', 'rss\sxpress', 'rssxpress', 'sage', 'sharpreader', 'shrook', 'straw', 'syndirella', 'vienna', 'wizz\srss\snews\sreader', 'alcatel', 'lg\-', 'mot\-', 'nokia', 'panasonic', 'philips', 'sagem', 'samsung', 'sie\-', 'sec\-', 'sonyericsson', 'ericsson', 'mmef', 'mspie', 'vodafone', 'wapalizer', 'wapsilon', 'wap', 'webcollage', 'up\.', 'android', 'blackberry', 'cnf2', 'docomo', 'ipcheck', 'iphone', 'portalmmm', 'webtv', 'democracy', 'cjb\.net', 'ossproxy', 'smallproxy', 'adobeair', 'apt', 'analogx_proxy', 'gnome\-vfs', 'neon', 'curl', 'csscheck', 'httrack', 'fdm', 'javaws', 'wget', 'fget', 'chilkat', 'webdownloader\sfor\sx', 'w3m', 'wdg_validator', 'w3c_validator', 'jigsaw', 'webreaper', 'webzip', 'staroffice', 'gnus', 'nikto', 'download\smaster', 'microsoft\-webdav\-miniredir', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav', 'POE\-Component\-Client\-HTTP', 'mozilla', 'libwww', 'lwp', 'WebSec'] -browsers_hashid = {'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'feedreader' : 'FeedReader (RSS Reader)', 'apt' : 'Debian APT', 'xine' : 'Xine, a free multimedia player (media player)', 'iceape' : 'GNU IceApe', 'webexplorer' : 'IBM-WebExplorer', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'staroffice' : 'StarOffice', 'ncsa_mosaic' : 'NCSA Mosaic', 'xchaos_arachne' : 'Arachne', 'netscape' : 'Netscape', 'macweb' : 'MacWeb', 'strata' : 'Strata', 'links' : 'Links', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'omniweb' : 'OmniWeb', 'WebSec' : 'Web Secretary', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'qnx\svoyager' : 'QNX Voyager', 'nsplayer' : 'NetShow Player (media player)', 'blogbridge' : 'BlogBridge (RSS Reader)', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'doris' : 'Doris (for Symbian)', 'w3c_validator' : 'W3C Validator', 'syndirella' : 'Syndirella (RSS Reader)', 'sonique' : 'Sonique (media player)', 'ibrowse' : 'iBrowse', 'gnus' : 'Gnus Network User Services', 'chimera' : 'Chimera (Old Camino)', 'mozilla' : 'Mozilla', 'amaya' : 'Amaya', 'shiira' : 'Shiira', 'lotus\-notes' : 'Lotus Notes web client', 'aiderss' : 'AideRSS (RSS Reader)', 'dreamcast' : 'Dreamcast', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'aggrevator' : 'Aggrevator (RSS Reader)', 'rssreader' : 'RssReader (RSS Reader)', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'samsung' : 'Samsung (PDA/Phone browser)', 'webcapture' : 'Acrobat Webcapture', 'grabber' : 'Grabber', 'friendlyspider' : 'FriendlySpider', 'webmirror' : 'WebMirror', 'k\-meleon' : 'K-Meleon', 'mplayer' : 'The Movie Player (media player)', 'quicktime' : 'QuickTime (media player)', 'straw' : 'Straw (RSS Reader)', 'adobeair' : 'AdobeAir', 'feeddemon' : 'FeedDemon (RSS Reader)', 'aol\-iweng' : 'AOL-Iweng', 'webcopier' : 'WebCopier', 'minefield' : 'Minefield (Firefox 3.0 development)', 'plagger' : 'Plagger (RSS Reader)', 'flashget' : 'FlashGet', 'webtv' : 'WebTV browser', 'ipcheck' : 'Supervision IP Check (phone)', 'cloudflare' : 'CloudFlare', 'fget' : 'FGet', 'amigavoyager' : 'AmigaVoyager', 'jigsaw' : 'W3C Validator', 'jetaudio' : 'JetAudio (media player)', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'xmms' : 'XMMS (media player)', 'msie' : 'MS Internet Explorer', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'songbird' : 'Songbird', 'elinks' : 'ELinks', 'newsgator' : 'NewsGator (RSS Reader)', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'webdownloader\sfor\sx' : 'Downloader for X', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'philips' : 'Philips Browser (PDA/Phone browser)', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'windows\-media\-player' : 'Windows Media Player (media player)', 'nutscrape' : 'Nutscrape', 'ecatch' : 'eCatch', 'donzilla' : 'Donzilla', 'getright' : 'GetRight', 'xbox' : 'XBoX', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'liferea' : 'Liferea (RSS Reader)', 'kazehakase' : 'Kazehakase', 'sharpreader' : 'SharpReader (RSS Reader)', 'opera' : 'Opera', 'real' : 'Real player or compatible (media player)', 'ossproxy' : 'OSSProxy', 'winamp' : 'WinAmp (media player)', 'potu' : 'Potu (RSS Reader)', 'fdm' : 'FDM Free Download Manager', 'nikto' : 'Nikto Web Scanner', 'firefox' : 'Firefox', 'teleport' : 'TelePort Pro', 'arora' : 'Arora', 'greatnews' : 'GreatNews (RSS Reader)', 'encompass' : 'Encompass', 'uplayer' : 'Ultra Player (media player)', 'camino' : 'Camino', 'neon' : 'Neon HTTP and WebDAV client library', 'safari' : 'Safari', 'k\-ninja' : 'K-Ninja', 'aweb' : 'AWeb', 'bpftp' : 'BPFTP', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'abrowse' : 'ABrowse', 'epiphany' : 'Epiphany', 'android' : 'Android browser (PDA/Phone browser)', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'webvcr' : 'WebVCR', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'emacs\-w3' : 'Emacs/w3s', 'leechget' : 'LeechGet', 'firebird' : 'Firebird (Old Firefox)', 'icab' : 'iCab', 'linemodebrowser' : 'W3C Line Mode Browser', 'chilkat' : 'Chilkat', 'jetbrains_omea' : 'Omea (RSS Reader)', 'sage' : 'Sage (RSS Reader)', 'shrook' : 'Shrook (RSS Reader)', 'webzip' : 'WebZIP', 'viking' : 'Viking', 'sylera' : 'Sylera', 'phoenix' : 'Phoenix', 'webfetcher' : 'WebFetcher', 'multizilla' : 'MultiZilla', 'hotjava' : 'Sun HotJava', 'netants' : 'NetAnts', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'netcaptor' : 'NetCaptor', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'feedtools' : 'FeedTools (RSS Reader)', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'intergo' : 'InterGO', 'webreaper' : 'WebReaper', '22acidownload' : '22AciDownload', 'mint_audio' : 'Mint Audio (media player)', 'charon' : 'Charon', 'chrome' : 'Google Chrome', 'emailsiphon' : 'EmailSiphon', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'cjb\.net' : 'CJB.NET Proxy', 'msfrontpageexpress' : 'MS FrontPage Express', 'sagem' : 'Sagem (PDA/Phone browser)', 'seamonkey' : 'SeaMonkey', 'lwp' : 'LibWWW-perl', 'prism' : 'Prism', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'lg\-' : 'LG (PDA/Phone browser)', 'freshdownload' : 'FreshDownload', 'analogx_proxy' : 'AnalogX Proxy', 'headdump' : 'HeadDump', 'itunes' : 'Apple iTunes (media player)', 'contiki' : 'Contiki', 'galeon' : 'Galeon', 'flock' : 'Flock', 'mpg123' : 'mpg123 (media player)', 'gregarius' : 'Gregarius (RSS Reader)', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'newsfire' : 'NewsFire (RSS Reader)', 'curl' : 'Curl', 'netpositive' : 'NetPositive', 'libwww' : 'LibWWW', 'javaws' : 'Java Web Start', 'qts' : 'QuickTime (media player)', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'download\smaster' : 'Download Master', 'gstreamer' : 'GStreamer (media library)', 'wdg_validator' : 'WDG HTML Validator', 'w3m' : 'w3m', 'freeamp' : 'FreeAmp (media player)', 'akregator' : 'Akregator (RSS Reader)', 'go!zilla' : 'Go!Zilla', 'rssowl' : 'RSSOwl (RSS Reader)', 'abilon' : 'Abilon (RSS Reader)', 'dillo' : 'Dillo', 'svn' : 'Subversion client', 'konqueror' : 'Konqueror', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'pluck' : 'Pluck (RSS Reader)', 'iphone' : 'IPhone (PDA/Phone browser)', 'wget' : 'Wget', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'lynx' : 'Lynx', 'sie\-' : 'SIE (PDA/Phone browser)', 'smallproxy' : 'SmallProxy', 'fresco' : 'ANT Fresco', 'cyberdog' : 'Cyberdog', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'downloadagent' : 'DownloadAgent', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)', 'cyndicate' : 'Cyndicate (RSS Reader)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'tzgeturl' : 'TzGetURL', 'hatena_rss' : 'Hatena (RSS Reader)', 'audion' : 'Audion (media player)', 'rssxpress' : 'RSSXpress (RSS Reader)', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'vienna' : 'Vienna (RSS Reader)', 'csscheck' : 'WDG CSS Validator', 'httrack' : 'HTTrack', 'democracy' : 'Democracy', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'icecat' : 'GNU IceCat', 'iceweasel' : 'Iceweasel', 'w3clinemode' : 'W3CLineMode'} +browsers_hashid = {'sie\-' : 'SIE (PDA/Phone browser)', 'gnus' : 'Gnus Network User Services', 'webcopier' : 'WebCopier', 'nokia' : 'Nokia Browser (PDA/Phone browser)', 'feedtools' : 'FeedTools (RSS Reader)', 'iceape' : 'GNU IceApe', 'xbox' : 'XBoX', 'lotus\-notes' : 'Lotus Notes web client', 'konqueror' : 'Konqueror', 'hatena_rss' : 'Hatena (RSS Reader)', 'feeddemon' : 'FeedDemon (RSS Reader)', 'bpftp' : 'BPFTP', 'macweb' : 'MacWeb', 'sonyericsson' : 'Sony/Ericsson Browser (PDA/Phone browser)', 'straw' : 'Straw (RSS Reader)', 'democracy' : 'Democracy', 'emacs\-w3' : 'Emacs/w3s', 'xaudio' : 'Some XAudio Engine based MPEG player (media player)', 'android' : 'Android browser (PDA/Phone browser)', 'linemodebrowser' : 'W3C Line Mode Browser', 'sylera' : 'Sylera', 'jetaudio' : 'JetAudio (media player)', 'alcatel' : 'Alcatel Browser (PDA/Phone browser)', 'amaya' : 'Amaya', 'k\-meleon' : 'K-Meleon', 'netnewswire' : 'NetNewsWire (RSS Reader)', 'jetbrains_omea' : 'Omea (RSS Reader)', 'windows\-media\-player' : 'Windows Media Player (media player)', 'sage' : 'Sage (RSS Reader)', 'netpositive' : 'NetPositive', 'webvcr' : 'WebVCR', 'rssbandit' : 'RSS Bandit (RSS Reader)', 'wapalizer' : 'WAPalizer (PDA/Phone browser)', 'arora' : 'Arora', 'w3c_validator' : 'W3C Validator', 'netcaptor' : 'NetCaptor', 'audion' : 'Audion (media player)', 'sec\-' : 'Sony/Ericsson (PDA/Phone browser)', 'lynx' : 'Lynx', 'aggrevator' : 'Aggrevator (RSS Reader)', 'cjb\.net' : 'CJB.NET Proxy', 'feedreader' : 'FeedReader (RSS Reader)', 'itunes' : 'Apple iTunes (media player)', 'bonecho' : 'BonEcho (Firefox 2.0 development)', 'mozilla' : 'Mozilla', 'ericsson' : 'Ericsson Browser (PDA/Phone browser)', 'phoenix' : 'Phoenix', 'grabber' : 'Grabber', 'dillo' : 'Dillo', 'charon' : 'Charon', 'prism' : 'Prism', 'apt' : 'Debian APT', 'wdg_validator' : 'WDG HTML Validator', 'msfrontpageexpress' : 'MS FrontPage Express', 'newzcrawler' : 'NewzCrawler (RSS Reader)', 'mint_audio' : 'Mint Audio (media player)', 'abilon' : 'Abilon (RSS Reader)', 'adobeair' : 'AdobeAir', 'microsoft\-webdav\-miniredir' : 'Microsoft Data Access Component Internet Publishing Provider', 'staroffice' : 'StarOffice', '22acidownload' : '22AciDownload', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'Microsoft Data Access Component Internet Publishing Provider Cache Manager', 'seamonkey' : 'SeaMonkey', 'friendlyspider' : 'FriendlySpider', 'shrook' : 'Shrook (RSS Reader)', 'mspie' : 'MS Pocket Internet Explorer (PDA/Phone browser)', 'blogbridge' : 'BlogBridge (RSS Reader)', 'fresco' : 'ANT Fresco', 'wizz\srss\snews\sreader' : 'Wizz RSS News Reader (RSS Reader)', 'docomo' : 'I-Mode phone (PDA/Phone browser)', 'winamp' : 'WinAmp (media player)', 'webtv' : 'WebTV browser', 'freshdownload' : 'FreshDownload', 'ecatch' : 'eCatch', 'webzip' : 'WebZIP', 'sonique' : 'Sonique (media player)', 'contiki' : 'Contiki', 'pluck' : 'Pluck (RSS Reader)', 'webcollage' : 'WebCollage (PDA/Phone browser)', 'netants' : 'NetAnts', 'wget' : 'Wget', 'webexplorer' : 'IBM-WebExplorer', 'sagem' : 'Sagem (PDA/Phone browser)', 'wap' : 'Unknown WAP browser (PDA/Phone browser)', 'nutscrape' : 'Nutscrape', 'svn' : 'Subversion client', 'plagger' : 'Plagger (RSS Reader)', 'hotjava' : 'Sun HotJava', 'gstreamer' : 'GStreamer (media library)', 'aiderss' : 'AideRSS (RSS Reader)', 'opera' : 'Opera', 'dreamcast' : 'Dreamcast', 'analogx_proxy' : 'AnalogX Proxy', 'webcapture' : 'Acrobat Webcapture', 'doris' : 'Doris (for Symbian)', 'flashget' : 'FlashGet', 'downloadagent' : 'DownloadAgent', 'portalmmm' : 'I-Mode phone (PDA/Phone browser)', 'songbird' : 'Songbird', 'firebird' : 'Firebird (Old Firefox)', 'newsgator' : 'NewsGator (RSS Reader)', 'javaws' : 'Java Web Start', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'Microsoft Data Access Component Internet Publishing Provider DAV', 'iceweasel' : 'Iceweasel', 'uplayer' : 'Ultra Player (media player)', 'getright' : 'GetRight', 'chrome' : 'Google Chrome', 'ipcheck' : 'Supervision IP Check (phone)', 'xmms' : 'XMMS (media player)', 'akregator' : 'Akregator (RSS Reader)', 'w3m' : 'w3m', 'cyndicate' : 'Cyndicate (RSS Reader)', 'nsplayer' : 'NetShow Player (media player)', 'mplayer' : 'The Movie Player (media player)', 'elinks' : 'ELinks', 'mmef' : 'Microsoft Mobile Explorer (PDA/Phone browser)', 'greatnews' : 'GreatNews (RSS Reader)', 'go!zilla' : 'Go!Zilla', 'jigsaw' : 'W3C Validator', 'minefield' : 'Minefield (Firefox 3.0 development)', 'icab' : 'iCab', 'ossproxy' : 'OSSProxy', 'shiira' : 'Shiira', 'rssxpress' : 'RSSXpress (RSS Reader)', 'webmirror' : 'WebMirror', 'gregarius' : 'Gregarius (RSS Reader)', 'syndirella' : 'Syndirella (RSS Reader)', 'libwww' : 'LibWWW', 'icecat' : 'GNU IceCat', 'epiphany' : 'Epiphany', 'xchaos_arachne' : 'Arachne', 'flock' : 'Flock', 'k\-ninja' : 'K-Ninja', 'cnf2' : 'Supervision I-Mode ByTel (phone)', 'leechget' : 'LeechGet', 'webfetcher' : 'WebFetcher', 'sharpreader' : 'SharpReader (RSS Reader)', 'strata' : 'Strata', 'ncsa_mosaic' : 'NCSA Mosaic', 'lwp' : 'LibWWW-perl', 'fget' : 'FGet', 'webreaper' : 'WebReaper', 'philips' : 'Philips Browser (PDA/Phone browser)', 'intergo' : 'InterGO', 'fdm' : 'FDM Free Download Manager', 'newsfire' : 'NewsFire (RSS Reader)', 'donzilla' : 'Donzilla', 'cyberdog' : 'Cyberdog', 'w3clinemode' : 'W3CLineMode', 'aweb' : 'AWeb', 'rss\sxpress' : 'RSS Xpress (RSS Reader)', 'netscape' : 'Netscape', 'firefox' : 'Firefox', 'vienna' : 'Vienna (RSS Reader)', 'curl' : 'Curl', 'lg\-' : 'LG (PDA/Phone browser)', 'liferea' : 'Liferea (RSS Reader)', 'rssreader' : 'RssReader (RSS Reader)', 'quicktime' : 'QuickTime (media player)', 'rssowl' : 'RSSOwl (RSS Reader)', 'potu' : 'Potu (RSS Reader)', 'real' : 'Real player or compatible (media player)', 'kazehakase' : 'Kazehakase', 'amigavoyager' : 'AmigaVoyager', 'nikto' : 'Nikto Web Scanner', 'samsung' : 'Samsung (PDA/Phone browser)', 'camino' : 'Camino', 'headdump' : 'HeadDump', 'mpg123' : 'mpg123 (media player)', 'ibrowse' : 'iBrowse', 'httrack' : 'HTTrack', 'betanews_reader' : 'Betanews Reader (RSS Reader)', 'multizilla' : 'MultiZilla', 'csscheck' : 'WDG CSS Validator', 'chilkat' : 'Chilkat', 'gnome\-vfs' : 'Gnome FileSystem Abstraction library', 'qnx\svoyager' : 'QNX Voyager', 'xine' : 'Xine, a free multimedia player (media player)', 'wapsilon' : 'WAPsilon (PDA/Phone browser)', 'omniweb' : 'OmniWeb', 'qts' : 'QuickTime (media player)', 'iphone' : 'IPhone (PDA/Phone browser)', 'download\smaster' : 'Download Master', 'chimera' : 'Chimera (Old Camino)', 'WebSec' : 'Web Secretary', 'viking' : 'Viking', 'links' : 'Links', 'galeon' : 'Galeon', 'aol\-iweng' : 'AOL-Iweng', 'neon' : 'Neon HTTP and WebDAV client library', 'blackberry' : 'BlackBerry (PDA/Phone browser)', 'POE\-Component\-Client\-HTTP' : 'HTTP user-agent for POE (portable networking framework for Perl)', 'emailsiphon' : 'EmailSiphon', 'pulpfiction' : 'PulpFiction (RSS Reader)', 'panasonic' : 'Panasonic Browser (PDA/Phone browser)', 'msie' : 'MS Internet Explorer', 'encompass' : 'Encompass', 'tzgeturl' : 'TzGetURL', 'up\.' : 'UP.Browser (PDA/Phone browser)', 'safari' : 'Safari', 'vodafone' : 'Vodaphone browser (PDA/Phone browser)', 'smallproxy' : 'SmallProxy', 'webdownloader\sfor\sx' : 'Downloader for X', 'cloudflare' : 'CloudFlare', 'freeamp' : 'FreeAmp (media player)', 'applesyndication' : 'AppleSyndication (RSS Reader)', 'teleport' : 'TelePort Pro', 'abrowse' : 'ABrowse', 'mot\-' : 'Motorola Browser (PDA/Phone browser)', 'granparadiso' : 'GranParadiso (Firefox 3.0 development)', 'pubsub\-rss\-reader' : 'PubSub (RSS Reader)'} -browsers_icons = {'firebird' : 'phoenix', 'icab' : 'icab', 'jetbrains_omea' : 'rss', 'gnome\-vfs' : 'gnome', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'leechget' : 'leechget', 'up\.' : 'pdaphone', 'aweb' : 'aweb', 'bpftp' : 'bpftp', 'rssbandit' : 'rss', 'android' : 'android', 'epiphany' : 'epiphany', 'camino' : 'chimera', 'encompass' : 'encompass', 'uplayer' : 'mediaplayer', 'neon' : 'neon', 'safari' : 'safari', 'chrome' : 'chrome', 'feedtools' : 'rss', 'mint_audio' : 'mediaplayer', 'webreaper' : 'webreaper', 'wap' : 'pdaphone', 'ericsson' : 'pdaphone', 'phoenix' : 'phoenix', 'sylera' : 'mozilla', 'multizilla' : 'multizilla', 'hotjava' : 'hotjava', 'portalmmm' : 'pdaphone', 'newzcrawler' : 'rss', 'sage' : 'rss', 'webzip' : 'webzip', 'shrook' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'webcollage' : 'pdaphone', 'akregator' : 'rss', 'freeamp' : 'mediaplayer', 'rssowl' : 'rss', 'go!zilla' : 'gozilla', 'newsfire' : 'rss', 'alcatel' : 'pdaphone', 'netpositive' : 'netpositive', 'javaws' : 'java', 'qts' : 'mediaplayer', 'analogx_proxy' : 'analogx', 'freshdownload' : 'freshdownload', 'lg\-' : 'pdaphone', 'galeon' : 'galeon', 'itunes' : 'mediaplayer', 'gregarius' : 'rss', 'mpg123' : 'mediaplayer', 'flock' : 'flock', 'sagem' : 'pdaphone', 'msfrontpageexpress' : 'fpexpress', 'cjb\.net' : 'cjbnet', 'applesyndication' : 'rss', 'prism' : 'mozilla', 'seamonkey' : 'seamonkey', 'wizz\srss\snews\sreader' : 'wizz', 'mmef' : 'pdaphone', 'iceweasel' : 'iceweasel', 'icecat' : 'icecat', 'hatena_rss' : 'rss', 'docomo' : 'pdaphone', 'rss\sxpress' : 'rss', 'granparadiso' : 'firefox', 'pubsub\-rss\-reader' : 'rss', 'rssxpress' : 'rss', 'audion' : 'mediaplayer', 'xaudio' : 'mediaplayer', 'vienna' : 'rss', 'mot\-' : 'pdaphone', 'httrack' : 'httrack', 'fresco' : 'fresco', 'blackberry' : 'pdaphone', 'cyberdog' : 'cyberdog', 'dillo' : 'dillo', 'abilon' : 'abilon', 'svn' : 'subversion', 'iphone' : 'pdaphone', 'nokia' : 'pdaphone', 'pluck' : 'rss', 'konqueror' : 'konqueror', 'lynx' : 'lynx', 'sie\-' : 'pdaphone', 'nsplayer' : 'netshow', 'blogbridge' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'doris' : 'doris', 'strata' : 'mozilla', 'macweb' : 'macweb', 'bonecho' : 'firefox', 'omniweb' : 'omniweb', 'vodafone' : 'pdaphone', 'wapalizer' : 'pdaphone', 'iceape' : 'mozilla', 'staroffice' : 'staroffice', 'panasonic' : 'pdaphone', 'netscape' : 'netscape', 'ncsa_mosaic' : 'ncsa_mosaic', 'feedreader' : 'rss', 'wapsilon' : 'pdaphone', 'apt' : 'apt', 'xine' : 'mediaplayer', 'avantbrowser' : 'avant', 'aggrevator' : 'rss', 'samsung' : 'pdaphone', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'rssreader' : 'rss', 'grabber' : 'grabber', 'webcapture' : 'adobe', 'dreamcast' : 'dreamcast', 'sec\-' : 'pdaphone', 'amaya' : 'amaya', 'mozilla' : 'mozilla', 'chimera' : 'chimera', 'gnus' : 'gnus', 'lotus\-notes' : 'lotusnotes', 'aiderss' : 'rss', 'syndirella' : 'rss', 'sonique' : 'mediaplayer', 'ibrowse' : 'ibrowse', 'jetaudio' : 'mediaplayer', 'pulpfiction' : 'rss', 'xmms' : 'mediaplayer', 'webtv' : 'webtv', 'flashget' : 'flashget', 'amigavoyager' : 'amigavoyager', 'feeddemon' : 'rss', 'webcopier' : 'webcopier', 'minefield' : 'firefox', 'plagger' : 'rss', 'k\-meleon' : 'kmeleon', 'adobeair' : 'adobe', 'straw' : 'rss', 'mplayer' : 'mediaplayer', 'teleport' : 'teleport', 'firefox' : 'firefox', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'greatnews' : 'rss', 'kazehakase' : 'mozilla', 'sharpreader' : 'rss', 'liferea' : 'rss', 'winamp' : 'mediaplayer', 'real' : 'real', 'opera' : 'opera', 'potu' : 'rss', 'ecatch' : 'ecatch', 'windows\-media\-player' : 'mplayer', 'getright' : 'getright', 'donzilla' : 'mozilla', 'mspie' : 'pdaphone', 'xbox' : 'winxbox', 'songbird' : 'mozilla', 'betanews_reader' : 'rss', 'msie' : 'msie', 'newsgator' : 'rss', 'philips' : 'pdaphone', 'sonyericsson' : 'pdaphone', 'netnewswire' : 'rss', 'microsoft\-webdav\-miniredir' : 'frontpage'} +browsers_icons = {'staroffice' : 'staroffice', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\scache\smanager' : 'frontpage', 'seamonkey' : 'seamonkey', 'abilon' : 'abilon', 'adobeair' : 'adobe', 'microsoft\-webdav\-miniredir' : 'frontpage', 'mspie' : 'pdaphone', 'avantbrowser' : 'avant', 'shrook' : 'rss', 'prism' : 'mozilla', 'apt' : 'apt', 'mint_audio' : 'mediaplayer', 'msfrontpageexpress' : 'fpexpress', 'newzcrawler' : 'rss', 'wap' : 'pdaphone', 'svn' : 'subversion', 'winamp' : 'mediaplayer', 'docomo' : 'pdaphone', 'webtv' : 'webtv', 'ecatch' : 'ecatch', 'freshdownload' : 'freshdownload', 'webzip' : 'webzip', 'sonique' : 'mediaplayer', 'blogbridge' : 'rss', 'fresco' : 'fresco', 'wizz\srss\snews\sreader' : 'wizz', 'sagem' : 'pdaphone', 'pluck' : 'rss', 'webcollage' : 'pdaphone', 'flashget' : 'flashget', 'analogx_proxy' : 'analogx', 'webcapture' : 'adobe', 'doris' : 'doris', 'javaws' : 'java', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sdav' : 'frontpage', 'portalmmm' : 'pdaphone', 'songbird' : 'mozilla', 'newsgator' : 'rss', 'firebird' : 'phoenix', 'hotjava' : 'hotjava', 'aiderss' : 'rss', 'plagger' : 'rss', 'dreamcast' : 'dreamcast', 'microsoft\soffice\sprotocol\sdiscovery' : 'frontpage', 'opera' : 'opera', 'nsplayer' : 'netshow', 'mmef' : 'pdaphone', 'greatnews' : 'rss', 'mplayer' : 'mediaplayer', 'getright' : 'getright', 'chrome' : 'chrome', 'uplayer' : 'mediaplayer', 'iceweasel' : 'iceweasel', 'akregator' : 'rss', 'microsoft\sdata\saccess\sinternet\spublishing\sprovider\sprotocol\sdiscovery' : 'frontpage', 'xmms' : 'mediaplayer', 'hatena_rss' : 'rss', 'feeddemon' : 'rss', 'microsoft\soffice\sexistence\sdiscovery' : 'frontpage', 'sonyericsson' : 'pdaphone', 'straw' : 'rss', 'bpftp' : 'bpftp', 'macweb' : 'macweb', 'webcopier' : 'webcopier', 'gnus' : 'gnus', 'nokia' : 'pdaphone', 'feedtools' : 'rss', 'xbox' : 'winxbox', 'iceape' : 'mozilla', 'lotus\-notes' : 'lotusnotes', 'sie\-' : 'pdaphone', 'konqueror' : 'konqueror', 'netnewswire' : 'rss', 'k\-meleon' : 'kmeleon', 'alcatel' : 'pdaphone', 'amaya' : 'amaya', 'sage' : 'rss', 'windows\-media\-player' : 'mplayer', 'netpositive' : 'netpositive', 'jetbrains_omea' : 'rss', 'jetaudio' : 'mediaplayer', 'xaudio' : 'mediaplayer', 'android' : 'android', 'sylera' : 'mozilla', 'sec\-' : 'pdaphone', 'audion' : 'mediaplayer', 'lynx' : 'lynx', 'aggrevator' : 'rss', 'cjb\.net' : 'cjbnet', 'rssbandit' : 'rss', 'wapalizer' : 'pdaphone', 'dillo' : 'dillo', 'itunes' : 'mediaplayer', 'feedreader' : 'rss', 'bonecho' : 'firefox', 'mozilla' : 'mozilla', 'ericsson' : 'pdaphone', 'phoenix' : 'phoenix', 'grabber' : 'grabber', 'ibrowse' : 'ibrowse', 'httrack' : 'httrack', 'mpg123' : 'mediaplayer', 'multizilla' : 'multizilla', 'betanews_reader' : 'rss', 'samsung' : 'pdaphone', 'camino' : 'chimera', 'chimera' : 'chimera', 'iphone' : 'pdaphone', 'galeon' : 'galeon', 'gnome\-vfs' : 'gnome', 'omniweb' : 'omniweb', 'qts' : 'mediaplayer', 'xine' : 'mediaplayer', 'wapsilon' : 'pdaphone', 'msie' : 'msie', 'encompass' : 'encompass', 'panasonic' : 'pdaphone', 'up\.' : 'pdaphone', 'pulpfiction' : 'rss', 'neon' : 'neon', 'blackberry' : 'pdaphone', 'teleport' : 'teleport', 'mot\-' : 'pdaphone', 'granparadiso' : 'firefox', 'freeamp' : 'mediaplayer', 'applesyndication' : 'rss', 'pubsub\-rss\-reader' : 'rss', 'safari' : 'safari', 'vodafone' : 'pdaphone', 'rssxpress' : 'rss', 'gregarius' : 'rss', 'minefield' : 'firefox', 'go!zilla' : 'gozilla', 'icab' : 'icab', 'flock' : 'flock', 'leechget' : 'leechget', 'syndirella' : 'rss', 'icecat' : 'icecat', 'epiphany' : 'epiphany', 'donzilla' : 'mozilla', 'philips' : 'pdaphone', 'webreaper' : 'webreaper', 'newsfire' : 'rss', 'sharpreader' : 'rss', 'strata' : 'mozilla', 'ncsa_mosaic' : 'ncsa_mosaic', 'rssreader' : 'rss', 'rssowl' : 'rss', 'potu' : 'rss', 'vienna' : 'rss', 'lg\-' : 'pdaphone', 'liferea' : 'rss', 'kazehakase' : 'mozilla', 'amigavoyager' : 'amigavoyager', 'real' : 'real', 'aweb' : 'aweb', 'cyberdog' : 'cyberdog', 'netscape' : 'netscape', 'firefox' : 'firefox', 'rss\sxpress' : 'rss'} diff --git a/tools/own_search_engines.pm b/tools/own_search_engines.pm index 3a12c79..ff758a6 100644 --- a/tools/own_search_engines.pm +++ b/tools/own_search_engines.pm @@ -17,7 +17,8 @@ 'wow\.com', 'WOW', 'searches\.omiga-plus\.com', 'Omiga-plus', 'buenosearch\.com', 'Bueno Search', - 'searches\.vi-view\.com', 'vi-view' + 'searches\.vi-view\.com', 'vi-view', + 'www.sfr\.fr\/recherche\/google', 'google' ); %Own_SearchEnginesKnownUrl=( From b72563af8d476edcab97345b1bc8f2bedda0086b Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 8 Jul 2015 08:20:22 +0200 Subject: [PATCH 191/195] WIP --- conf.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/conf.py b/conf.py index 823671d..e06aa5b 100644 --- a/conf.py +++ b/conf.py @@ -1,6 +1,6 @@ # Web server log -analyzed_filename = '/var/log/apache2/soutade.fr_access.log' +analyzed_filename = '/var/log/apache2/access.log.1,/var/log/apache2/access.log' # Domain name to analyze domain_name = 'soutade.fr' @@ -17,7 +17,7 @@ display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_p reverse_dns_timeout = 0.2 # Count this addresses as hit -page_to_hit_conf = [r'^.+/logo[/]?$', r'^.+/search[/]?.*$'] +page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/.+$'] @@ -25,17 +25,13 @@ hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^ max_hits_displayed = 100 max_downloads_displayed = 100 -# Compressed files -compress_output_files = ['html', 'css', 'js'] +compress_output_files = ['html', 'css', 'js', 'xml'] -# Locale in French -locale = 'fr' +#locale = 'fr' # Tracked IP -tracked_ip = ['82.232.68.211'] +tracked_ip = ['192.168.1.1'] -# Feed url feeds = [r'^.*/atom.xml$', r'^.*/rss.xml$'] -# Consider xml files as multimedia (append to current list) -multimedia_files_append = ['xml'] +multimedia_file_append = ['xml'] From 47cd9264c5226fa3b931154d72245b8848c1a2b7 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 13 Jul 2015 11:43:13 +0200 Subject: [PATCH 192/195] Update tools to sort documentation --- tools/extract_doc.py | 6 ++++-- tools/extract_docs.sh | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/extract_doc.py b/tools/extract_doc.py index 601b4cc..6b39063 100755 --- a/tools/extract_doc.py +++ b/tools/extract_doc.py @@ -1,8 +1,10 @@ #!/usr/bin/env python import sys +import re -excludes = ['istats_diff.py'] +excludes = [] +# excludes = [r'.*_diff.py'] filename = sys.argv[1] printName = False @@ -15,7 +17,7 @@ if filename.endswith('__init__.py'): sys.exit(0) for e in excludes: - if filename.endswith(e): + if re.match(e, filename): sys.stderr.write('\tSkip %s\n' % (filename)) sys.exit(0) diff --git a/tools/extract_docs.sh b/tools/extract_docs.sh index 007f21b..539eb84 100755 --- a/tools/extract_docs.sh +++ b/tools/extract_docs.sh @@ -8,14 +8,18 @@ rm -f "${MODULES_TARGET}" echo "Generate plugins index" python tools/extract_doc.py -p iwla.py > "${MODULES_TARGET}" -find plugins -name '*.py' -exec python tools/extract_doc.py -p \{\} \; >> "${MODULES_TARGET}" +for p in `find plugins -name '*.py' | sort | sed ':a;N;$!ba;s/\n/ /g'`; do + python tools/extract_doc.py -p $p >> "${MODULES_TARGET}" +done echo "\n" >> "${MODULES_TARGET}" echo "Generate doc from iwla.py" python tools/extract_doc.py iwla.py >> "${MODULES_TARGET}" echo "Generate plugins documentation" -find plugins -name '*.py' -exec python tools/extract_doc.py \{\} \; >> "${MODULES_TARGET}" +for p in `find plugins -name '*.py' | sort` ; do + python tools/extract_doc.py $p >> "${MODULES_TARGET}" +done echo "Generate ${TARGET_MD}" cat "${MAIN_MD}" "${MODULES_TARGET}" > "${TARGET_MD}" From e8e395101892e26197a32581272f4857d036d054 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 13 Jul 2015 13:03:41 +0200 Subject: [PATCH 193/195] Update documentation --- docs/index.md | 650 ++++++++++++++++++++++++++++-------------------- docs/main.md | 8 +- docs/modules.md | 650 ++++++++++++++++++++++++++++-------------------- 3 files changed, 777 insertions(+), 531 deletions(-) diff --git a/docs/index.md b/docs/index.md index 20ff9f0..5dba8fc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -97,24 +97,28 @@ Plugins Optional configuration values ends with *. * iwla.py - * plugins/display/top_downloads.py * plugins/display/all_visits.py - * plugins/display/top_hits.py - * plugins/display/track_users.py - * plugins/display/feeds.py * plugins/display/browsers.py - * plugins/display/referers.py + * plugins/display/feeds.py + * plugins/display/hours_stats.py + * plugins/display/istats_diff.py * plugins/display/operating_systems.py - * plugins/display/top_visitors.py + * plugins/display/referers.py * plugins/display/referers_diff.py + * plugins/display/top_downloads.py + * plugins/display/top_downloads_diff.py + * plugins/display/top_hits.py * plugins/display/top_pages.py + * plugins/display/top_visitors.py + * plugins/display/track_users.py + * plugins/post_analysis/browsers.py + * plugins/post_analysis/feeds.py + * plugins/post_analysis/hours_stats.py + * plugins/post_analysis/operating_systems.py + * plugins/post_analysis/referers.py + * plugins/post_analysis/reverse_dns.py * plugins/post_analysis/top_downloads.py * plugins/post_analysis/top_hits.py - * plugins/post_analysis/feeds.py - * plugins/post_analysis/browsers.py - * plugins/post_analysis/referers.py - * plugins/post_analysis/operating_systems.py - * plugins/post_analysis/reverse_dns.py * plugins/post_analysis/top_pages.py * plugins/pre_analysis/page_to_hit.py * plugins/pre_analysis/robots.py @@ -187,6 +191,9 @@ iwla requests => [fields_from_format_log] extract_request => + http_method + http_uri + http_version extract_uri extract_parameters* extract_referer* => @@ -206,34 +213,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -261,22 +240,22 @@ plugins.display.all_visits None -plugins.display.top_hits +plugins.display.browsers ------------------------ Display hook - Create TOP hits page + Create browsers page Plugin requirements : - post_analysis/top_hits + post_analysis/browsers Conf values needed : - max_hits_displayed* - create_all_hits_page* + max_browsers_displayed* + create_browsers_page* Output files : - OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/browsers.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -289,34 +268,6 @@ plugins.display.top_hits None -plugins.display.track_users ---------------------------- - - Display hook - - Track users - - Plugin requirements : - None - - Conf values needed : - tracked_ip - create_tracked_page* - - Output files : - OUTPUT_ROOT/year/month/index.html - OUTPUT_ROOT/year/month/tracked_users.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.feeds --------------------- @@ -325,7 +276,7 @@ plugins.display.feeds Display feeds parsers Plugin requirements : - None + post_analysis/feeds Conf values needed : create_all_feeds_page* @@ -344,22 +295,72 @@ plugins.display.feeds None -plugins.display.browsers ------------------------- +plugins.display.hours_stats +--------------------------- Display hook - Create browsers page + Display statistics by hour/week day Plugin requirements : - post_analysis/browsers + post_analysis/hours_stats Conf values needed : - max_browsers_displayed* - create_browsers_page* + None + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.istats_diff +--------------------------- + + Display hook interface + + Enlight new and updated statistics + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.operating_systems +--------------------------------- + + Display hook + + Add operating systems statistics + + Plugin requirements : + post_analysis/operating_systems + + Conf values needed : + create_families_page* Output files : - OUTPUT_ROOT/year/month/browsers.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -403,20 +404,130 @@ plugins.display.referers None -plugins.display.operating_systems ---------------------------------- +plugins.display.referers_diff +----------------------------- Display hook - Add operating systems statistics + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - post_analysis/operating_systems + display/referers Conf values needed : - create_families_page* + None Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads_diff +---------------------------------- + + Display hook + + Enlight new and updated downloads in in top_downloads.html + + Plugin requirements : + display/top_downloads + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -455,21 +566,23 @@ plugins.display.top_visitors None -plugins.display.referers_diff ------------------------------ +plugins.display.track_users +--------------------------- Display hook - Enlight new and updated key phrases in in all_key_phrases.html + Track users Plugin requirements : - display/referers + None Conf values needed : - None + tracked_ip + create_tracked_page* Output files : - None + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/tracked_users.html Statistics creation : None @@ -481,29 +594,201 @@ plugins.display.referers_diff None -plugins.display.top_pages -------------------------- +plugins.post_analysis.browsers +------------------------------ - Display hook + Post analysis hook - Create TOP pages page + Detect browser information from requests Plugin requirements : - post_analysis/top_pages + None Conf values needed : - max_pages_displayed* - create_all_pages_page* + None Output files : - OUTPUT_ROOT/year/month/top_pages.html - OUTPUT_ROOT/year/month/index.html + None + + Statistics creation : + visits : + remote_addr => + browser + + month_stats : + browsers => + browser => count + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.feeds +--------------------------- + + Post analysis hook + + Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + If there is ony one hit per day to a feed, merge feeds parsers with the same user agent + as it must be the same person with a different IP address. + + Plugin requirements : + None + + Conf values needed : + feeds + merge_one_hit_only_feeds_parsers* + + Output files : + None + + Statistics creation : + remote_addr => + feed_parser + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.hours_stats +--------------------------------- + + Post analysis hook + + Count pages, hits and bandwidth by hour/week day + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + month_stats: + hours_stats => + 00 .. 23 => + pages + hits + bandwidth + + days_stats => + 0 .. 6 => + pages + hits + bandwidth + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.operating_systems +--------------------------------------- + + Post analysis hook + + Detect operating systems from requests + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + visits : + remote_addr => + operating_system + + month_stats : + operating_systems => + operating_system => count + + os_families => + family => count + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None Statistics creation : None Statistics update : + month_stats : + referers => + pages => count + hits => count + robots_referers => + pages => count + hits => count + search_engine_referers => + pages => count + hits => count + key_phrases => + phrase => count + + Statistics deletion : None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed Statistics deletion : None @@ -565,169 +850,6 @@ plugins.post_analysis.top_hits None -plugins.post_analysis.feeds ---------------------------- - - Post analysis hook - - Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) - If there is ony one hit per day to a feed, merge feeds parsers with the same user agent - as it must be the same person with a different IP address. - - Plugin requirements : - None - - Conf values needed : - feeds - merge_one_hit_only_feeds_parsers* - - Output files : - None - - Statistics creation : - remote_addr => - feed_parser - - Statistics update : - None - - Statistics deletion : - None - - -plugins.post_analysis.browsers ------------------------------- - - Post analysis hook - - Detect browser information from requests - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - visits : - remote_addr => - browser - - month_stats : - browsers => - browser => count - - Statistics update : - None - - Statistics deletion : - None - - -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages => count - hits => count - robots_referers => - pages => count - hits => count - search_engine_referers => - pages => count - hits => count - key_phrases => - phrase => count - - Statistics deletion : - None - - -plugins.post_analysis.operating_systems ---------------------------------------- - - Post analysis hook - - Detect operating systems from requests - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - visits : - remote_addr => - operating_system - - month_stats : - operating_systems => - operating_system => count - - os_families => - family => count - - Statistics update : - None - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - plugins.post_analysis.top_pages ------------------------------- diff --git a/docs/main.md b/docs/main.md index 6338ed7..09f4ef1 100644 --- a/docs/main.md +++ b/docs/main.md @@ -4,19 +4,21 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolithic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). Usage ----- - ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] [-r|--reset year/month] [-z|--dont-compress] -c : Clean output (database and HTML) before starting -i : Read data from stdin instead of conf.analyzed_filename - -f : Read data from FILE instead of conf.analyzed_filename + -f : Analyse this log file, multiple files can be specified (comma separated). gz files are acceptedRead data from FILE instead of conf.analyzed_filename -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + -r : Reset analysis to a specific date (month/year) + -z : Don't compress databases (bigger but faster, not compatible with compressed databases) Basic usage ----------- diff --git a/docs/modules.md b/docs/modules.md index 6c413b8..b68c706 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -1,22 +1,26 @@ * iwla.py - * plugins/display/top_downloads.py * plugins/display/all_visits.py - * plugins/display/top_hits.py - * plugins/display/track_users.py - * plugins/display/feeds.py * plugins/display/browsers.py - * plugins/display/referers.py + * plugins/display/feeds.py + * plugins/display/hours_stats.py + * plugins/display/istats_diff.py * plugins/display/operating_systems.py - * plugins/display/top_visitors.py + * plugins/display/referers.py * plugins/display/referers_diff.py + * plugins/display/top_downloads.py + * plugins/display/top_downloads_diff.py + * plugins/display/top_hits.py * plugins/display/top_pages.py + * plugins/display/top_visitors.py + * plugins/display/track_users.py + * plugins/post_analysis/browsers.py + * plugins/post_analysis/feeds.py + * plugins/post_analysis/hours_stats.py + * plugins/post_analysis/operating_systems.py + * plugins/post_analysis/referers.py + * plugins/post_analysis/reverse_dns.py * plugins/post_analysis/top_downloads.py * plugins/post_analysis/top_hits.py - * plugins/post_analysis/feeds.py - * plugins/post_analysis/browsers.py - * plugins/post_analysis/referers.py - * plugins/post_analysis/operating_systems.py - * plugins/post_analysis/reverse_dns.py * plugins/post_analysis/top_pages.py * plugins/pre_analysis/page_to_hit.py * plugins/pre_analysis/robots.py @@ -89,6 +93,9 @@ iwla requests => [fields_from_format_log] extract_request => + http_method + http_uri + http_version extract_uri extract_parameters* extract_referer* => @@ -108,34 +115,6 @@ iwla None -plugins.display.top_downloads ------------------------------ - - Display hook - - Create TOP downloads page - - Plugin requirements : - post_analysis/top_downloads - - Conf values needed : - max_downloads_displayed* - create_all_downloads_page* - - Output files : - OUTPUT_ROOT/year/month/top_downloads.html - OUTPUT_ROOT/year/month/index.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.all_visits -------------------------- @@ -163,22 +142,22 @@ plugins.display.all_visits None -plugins.display.top_hits +plugins.display.browsers ------------------------ Display hook - Create TOP hits page + Create browsers page Plugin requirements : - post_analysis/top_hits + post_analysis/browsers Conf values needed : - max_hits_displayed* - create_all_hits_page* + max_browsers_displayed* + create_browsers_page* Output files : - OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/browsers.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -191,34 +170,6 @@ plugins.display.top_hits None -plugins.display.track_users ---------------------------- - - Display hook - - Track users - - Plugin requirements : - None - - Conf values needed : - tracked_ip - create_tracked_page* - - Output files : - OUTPUT_ROOT/year/month/index.html - OUTPUT_ROOT/year/month/tracked_users.html - - Statistics creation : - None - - Statistics update : - None - - Statistics deletion : - None - - plugins.display.feeds --------------------- @@ -227,7 +178,7 @@ plugins.display.feeds Display feeds parsers Plugin requirements : - None + post_analysis/feeds Conf values needed : create_all_feeds_page* @@ -246,22 +197,72 @@ plugins.display.feeds None -plugins.display.browsers ------------------------- +plugins.display.hours_stats +--------------------------- Display hook - Create browsers page + Display statistics by hour/week day Plugin requirements : - post_analysis/browsers + post_analysis/hours_stats Conf values needed : - max_browsers_displayed* - create_browsers_page* + None + + Output files : + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.istats_diff +--------------------------- + + Display hook interface + + Enlight new and updated statistics + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.operating_systems +--------------------------------- + + Display hook + + Add operating systems statistics + + Plugin requirements : + post_analysis/operating_systems + + Conf values needed : + create_families_page* Output files : - OUTPUT_ROOT/year/month/browsers.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -305,20 +306,130 @@ plugins.display.referers None -plugins.display.operating_systems ---------------------------------- +plugins.display.referers_diff +----------------------------- Display hook - Add operating systems statistics + Enlight new and updated key phrases in in all_key_phrases.html Plugin requirements : - post_analysis/operating_systems + display/referers Conf values needed : - create_families_page* + None Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads +----------------------------- + + Display hook + + Create TOP downloads page + + Plugin requirements : + post_analysis/top_downloads + + Conf values needed : + max_downloads_displayed* + create_all_downloads_page* + + Output files : + OUTPUT_ROOT/year/month/top_downloads.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_downloads_diff +---------------------------------- + + Display hook + + Enlight new and updated downloads in in top_downloads.html + + Plugin requirements : + display/top_downloads + + Conf values needed : + None + + Output files : + None + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_hits +------------------------ + + Display hook + + Create TOP hits page + + Plugin requirements : + post_analysis/top_hits + + Conf values needed : + max_hits_displayed* + create_all_hits_page* + + Output files : + OUTPUT_ROOT/year/month/top_hits.html + OUTPUT_ROOT/year/month/index.html + + Statistics creation : + None + + Statistics update : + None + + Statistics deletion : + None + + +plugins.display.top_pages +------------------------- + + Display hook + + Create TOP pages page + + Plugin requirements : + post_analysis/top_pages + + Conf values needed : + max_pages_displayed* + create_all_pages_page* + + Output files : + OUTPUT_ROOT/year/month/top_pages.html OUTPUT_ROOT/year/month/index.html Statistics creation : @@ -357,21 +468,23 @@ plugins.display.top_visitors None -plugins.display.referers_diff ------------------------------ +plugins.display.track_users +--------------------------- Display hook - Enlight new and updated key phrases in in all_key_phrases.html + Track users Plugin requirements : - display/referers + None Conf values needed : - None + tracked_ip + create_tracked_page* Output files : - None + OUTPUT_ROOT/year/month/index.html + OUTPUT_ROOT/year/month/tracked_users.html Statistics creation : None @@ -383,29 +496,201 @@ plugins.display.referers_diff None -plugins.display.top_pages -------------------------- +plugins.post_analysis.browsers +------------------------------ - Display hook + Post analysis hook - Create TOP pages page + Detect browser information from requests Plugin requirements : - post_analysis/top_pages + None Conf values needed : - max_pages_displayed* - create_all_pages_page* + None Output files : - OUTPUT_ROOT/year/month/top_pages.html - OUTPUT_ROOT/year/month/index.html + None + + Statistics creation : + visits : + remote_addr => + browser + + month_stats : + browsers => + browser => count + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.feeds +--------------------------- + + Post analysis hook + + Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + If there is ony one hit per day to a feed, merge feeds parsers with the same user agent + as it must be the same person with a different IP address. + + Plugin requirements : + None + + Conf values needed : + feeds + merge_one_hit_only_feeds_parsers* + + Output files : + None + + Statistics creation : + remote_addr => + feed_parser + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.hours_stats +--------------------------------- + + Post analysis hook + + Count pages, hits and bandwidth by hour/week day + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + month_stats: + hours_stats => + 00 .. 23 => + pages + hits + bandwidth + + days_stats => + 0 .. 6 => + pages + hits + bandwidth + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.operating_systems +--------------------------------------- + + Post analysis hook + + Detect operating systems from requests + + Plugin requirements : + None + + Conf values needed : + None + + Output files : + None + + Statistics creation : + visits : + remote_addr => + operating_system + + month_stats : + operating_systems => + operating_system => count + + os_families => + family => count + + Statistics update : + None + + Statistics deletion : + None + + +plugins.post_analysis.referers +------------------------------ + + Post analysis hook + + Extract referers and key phrases from requests + + Plugin requirements : + None + + Conf values needed : + domain_name + + Output files : + None Statistics creation : None Statistics update : + month_stats : + referers => + pages => count + hits => count + robots_referers => + pages => count + hits => count + search_engine_referers => + pages => count + hits => count + key_phrases => + phrase => count + + Statistics deletion : None + + +plugins.post_analysis.reverse_dns +--------------------------------- + + Post analysis hook + + Replace IP by reverse DNS names + + Plugin requirements : + None + + Conf values needed : + reverse_dns_timeout* + + Output files : + None + + Statistics creation : + None + + Statistics update : + valid_visitors: + remote_addr + dns_name_replaced + dns_analyzed Statistics deletion : None @@ -467,169 +752,6 @@ plugins.post_analysis.top_hits None -plugins.post_analysis.feeds ---------------------------- - - Post analysis hook - - Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) - If there is ony one hit per day to a feed, merge feeds parsers with the same user agent - as it must be the same person with a different IP address. - - Plugin requirements : - None - - Conf values needed : - feeds - merge_one_hit_only_feeds_parsers* - - Output files : - None - - Statistics creation : - remote_addr => - feed_parser - - Statistics update : - None - - Statistics deletion : - None - - -plugins.post_analysis.browsers ------------------------------- - - Post analysis hook - - Detect browser information from requests - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - visits : - remote_addr => - browser - - month_stats : - browsers => - browser => count - - Statistics update : - None - - Statistics deletion : - None - - -plugins.post_analysis.referers ------------------------------- - - Post analysis hook - - Extract referers and key phrases from requests - - Plugin requirements : - None - - Conf values needed : - domain_name - - Output files : - None - - Statistics creation : - None - - Statistics update : - month_stats : - referers => - pages => count - hits => count - robots_referers => - pages => count - hits => count - search_engine_referers => - pages => count - hits => count - key_phrases => - phrase => count - - Statistics deletion : - None - - -plugins.post_analysis.operating_systems ---------------------------------------- - - Post analysis hook - - Detect operating systems from requests - - Plugin requirements : - None - - Conf values needed : - None - - Output files : - None - - Statistics creation : - visits : - remote_addr => - operating_system - - month_stats : - operating_systems => - operating_system => count - - os_families => - family => count - - Statistics update : - None - - Statistics deletion : - None - - -plugins.post_analysis.reverse_dns ---------------------------------- - - Post analysis hook - - Replace IP by reverse DNS names - - Plugin requirements : - None - - Conf values needed : - reverse_dns_timeout* - - Output files : - None - - Statistics creation : - None - - Statistics update : - valid_visitors: - remote_addr - dns_name_replaced - dns_analyzed - - Statistics deletion : - None - - plugins.post_analysis.top_pages ------------------------------- From 6605fc7e493f036e3b12db29b2a6a880e540aca0 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 13 Jul 2015 13:07:39 +0200 Subject: [PATCH 194/195] Update documentation --- docs/index.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index 5dba8fc..0415eea 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,19 +4,21 @@ iwla Introduction ------------ -iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolothic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. +iwla (Intelligent Web Log Analyzer) is basically a clone of [awstats](http://www.awstats.org). The main problem with awstats is that it's a very monolithic project with everything in one big PERL file. In opposite, iwla has been though to be very modular : a small core analysis and a lot of filters. It can be viewed as UNIX pipes. Philosophy of iwla is : add, update, delete ! That's the job of each filter : modify statistics until final result. It's written in Python. Nevertheless, iwla is only focused on HTTP logs. It uses data (robots definitions, search engines definitions) and design from awstats. Moreover, it's not dynamic, but only generates static HTML page (with gzip compression option). Usage ----- - ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] + ./iwla [-c|--clean-output] [-i|--stdin] [-f FILE|--file FILE] [-d LOGLEVEL|--log-level LOGLEVEL] [-r|--reset year/month] [-z|--dont-compress] -c : Clean output (database and HTML) before starting -i : Read data from stdin instead of conf.analyzed_filename - -f : Read data from FILE instead of conf.analyzed_filename + -f : Analyse this log file, multiple files can be specified (comma separated). gz files are acceptedRead data from FILE instead of conf.analyzed_filename -d : Loglevel in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + -r : Reset analysis to a specific date (month/year) + -z : Don't compress databases (bigger but faster, not compatible with compressed databases) Basic usage ----------- From ee743240856ea4d969a899e722b06e005accf7a9 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Mon, 13 Jul 2015 13:09:32 +0200 Subject: [PATCH 195/195] Update help --- ChangeLog | 11 ++++++++++- iwla.py | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b08797e..3fb03fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2 (02/03/2015) +v0.3 (13/07/2015) ** User ** Add referers_diff display plugin Add year statistics in month details @@ -9,9 +9,18 @@ v0.2 (02/03/2015) Add feeds plugin Add _append feature to conf.py Add hours_stats plugin + Add display/top_downloads_diff plugin + Can specify multiple files to analyze + Add reset feature + Add gz files support + Add -z option (don't compress databases) + Add own search enfines files ** Dev ** Add istats_diff interface + Sort documentation output + Add debug traces in robots plugin + Update awstats data ** Bugs ** Forgot tag diff --git a/iwla.py b/iwla.py index 7eb0940..7e23d3d 100755 --- a/iwla.py +++ b/iwla.py @@ -798,7 +798,7 @@ if __name__ == '__main__': help='Read data from stdin instead of conf.analyzed_filename') parser.add_argument('-f', '--file', dest='file', - help='Analyse this log file') + help='Analyse this log file, multiple files can be specified (comma separated). gz files are accepted') parser.add_argument('-d', '--log-level', dest='loglevel', default='INFO', type=str, @@ -810,7 +810,7 @@ if __name__ == '__main__': parser.add_argument('-z', '--dont-compress', dest='dont_compress', action='store_true', default=False, - help='Don\'t compress databases (bigger but faster)') + help='Don\'t compress databases (bigger but faster, not compatible with compressed databases)') args = parser.parse_args()