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

Replace getCurDisplayRoot() by getCurDisplayPath()

Browse Source
This commit is contained in:
Grégory Soutadé 2014-11-27 14:29:25 +01:00
parent ce4bca056d
commit 02233f2f37
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iwla.py
View File

@ -84,9 +84,9 @@ class IWLA(object):
def hasBeenViewed(self, request): def hasBeenViewed(self, request):
return int(request['status']) in conf.viewed_http_codes return int(request['status']) in conf.viewed_http_codes
def getCurDisplayRoot(self): def getCurDisplayPath(self, filename):
cur_time = self.meta_infos['last_time'] 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): def _clearMeta(self):
self.meta_infos = { self.meta_infos = {
@ -99,7 +99,7 @@ class IWLA(object):
return self.display return self.display
def getDBFilename(self, time): 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): def _serialize(self, obj, filename):
base = os.path.dirname(filename) base = os.path.dirname(filename)
@ -220,14 +220,14 @@ class IWLA(object):
def getDisplayIndex(self): def getDisplayIndex(self):
cur_time = self.meta_infos['last_time'] cur_time = self.meta_infos['last_time']
filename = '%s/index.html' % (self.getCurDisplayRoot()) filename = self.getCurDisplayPath('index.html')
return self.display.getPage(filename) return self.display.getPage(filename)
def _generateDisplayDaysStat(self): def _generateDisplayDaysStat(self):
cur_time = self.meta_infos['last_time'] cur_time = self.meta_infos['last_time']
title = 'Stats %d/%d' % (cur_time.tm_mon, cur_time.tm_year) 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) print '==> Generate display (%s)' % (filename)
page = DisplayHTMLPage(title, filename) page = DisplayHTMLPage(title, filename)

2
plugins/display/all_visits.py
View File

@ -18,7 +18,7 @@ class IWLADisplayAllVisits(IPlugin):
title = time.strftime('All visits - %B %Y', self.iwla.getCurTime()) title = time.strftime('All visits - %B %Y', self.iwla.getCurTime())
filename = 'all_visits.html' filename = 'all_visits.html'
path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) path = self.iwla.getCurDisplayPath(filename)
page = DisplayHTMLPage(title, path) page = DisplayHTMLPage(title, path)
table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen'])

4
plugins/display/referers.py
View File

@ -55,7 +55,7 @@ class IWLADisplayReferers(IPlugin):
title = time.strftime('Connexion from - %B %Y', cur_time) title = time.strftime('Connexion from - %B %Y', cur_time)
filename = 'referers.html' filename = 'referers.html'
path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) path = self.iwla.getCurDisplayPath(filename)
page = DisplayHTMLPage(title, path) page = DisplayHTMLPage(title, path)
table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits']) table = DisplayHTMLBlockTable('Connexion from', ['Origin', 'Pages', 'Hits'])
@ -94,7 +94,7 @@ class IWLADisplayReferers(IPlugin):
title = time.strftime('Key Phrases - %B %Y', cur_time) title = time.strftime('Key Phrases - %B %Y', cur_time)
filename = 'key_phrases.html' filename = 'key_phrases.html'
path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) path = self.iwla.getCurDisplayPath(filename)
page = DisplayHTMLPage(title, path) page = DisplayHTMLPage(title, path)
table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search']) table = DisplayHTMLBlockTable('Top key phrases', ['Key phrase', 'Search'])

2
plugins/display/top_downloads.py
View File

@ -25,7 +25,7 @@ class IWLADisplayTopDownloads(IPlugin):
title = time.strftime('Top Downloads - %B %Y', self.iwla.getCurTime()) title = time.strftime('Top Downloads - %B %Y', self.iwla.getCurTime())
filename = 'top_downloads.html' filename = 'top_downloads.html'
path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) path = self.iwla.getCurDisplayPath(filename)
page = DisplayHTMLPage(title, path) page = DisplayHTMLPage(title, path)
table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit']) table = DisplayHTMLBlockTable('All Downloads', ['URI', 'Hit'])

2
plugins/display/top_hits.py
View File

@ -25,7 +25,7 @@ class IWLADisplayTopHits(IPlugin):
title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime()) title = time.strftime('All Hits - %B %Y', self.iwla.getCurTime())
filename = 'top_hits.html' filename = 'top_hits.html'
path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) path = self.iwla.getCurDisplayPath(filename)
page = DisplayHTMLPage(title, path) page = DisplayHTMLPage(title, path)
table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance']) table = DisplayHTMLBlockTable('Top Hits', ['URI', 'Entrance'])

2
plugins/display/top_pages.py
View File

@ -25,7 +25,7 @@ class IWLADisplayTopPages(IPlugin):
title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime()) title = time.strftime('All Pages - %B %Y', self.iwla.getCurTime())
filename = 'top_pages.html' filename = 'top_pages.html'
path = '%s/%s' % (self.iwla.getCurDisplayRoot(), filename) path = self.iwla.getCurDisplayPath(filename)
page = DisplayHTMLPage(title, path) page = DisplayHTMLPage(title, path)
table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance']) table = DisplayHTMLBlockTable('Top Pages', ['URI', 'Entrance'])