soutade/iwla
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Store files in month directory

Browse Source
This commit is contained in:
Grégory Soutadé
2014-11-27 14:11:47 +01:00
parent f7bf2e11ba
commit ce4bca056d
7 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iwla.py
View File

@@ -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