diff --git a/lookyloo/lookyloo.py b/lookyloo/lookyloo.py
index ed1d64f6..175ca257 100644
--- a/lookyloo/lookyloo.py
+++ b/lookyloo/lookyloo.py
@@ -997,7 +997,7 @@ class Lookyloo():
today = date.today()
calendar_week = today.isocalendar()[1]
- stats_dict = {'analysis': 0, 'analysis_with_redirects': 0, 'redirects': 0}
+ stats_dict = {'submissions': 0, 'submissions_with_redirects': 0, 'redirects': 0}
stats: Dict[int, Dict[int, Dict[str, Any]]] = {}
weeks_stats: Dict[int, Dict] = {}
@@ -1006,30 +1006,30 @@ class Lookyloo():
cache = self.capture_cache(uuid)
if 'timestamp' not in cache:
continue
- date_analysis: datetime = datetime.fromisoformat(cache['timestamp'].rstrip('Z')) # type: ignore
+ date_submission: datetime = datetime.fromisoformat(cache['timestamp'].rstrip('Z')) # type: ignore
- if date_analysis.year not in stats:
- stats[date_analysis.year] = {}
- if date_analysis.month not in stats[date_analysis.year]:
- stats[date_analysis.year][date_analysis.month] = defaultdict(dict, **stats_dict)
- stats[date_analysis.year][date_analysis.month]['uniq_urls'] = set()
- stats[date_analysis.year][date_analysis.month]['analysis'] += 1
- stats[date_analysis.year][date_analysis.month]['uniq_urls'].add(cache['url'])
+ if date_submission.year not in stats:
+ stats[date_submission.year] = {}
+ if date_submission.month not in stats[date_submission.year]:
+ stats[date_submission.year][date_submission.month] = defaultdict(dict, **stats_dict)
+ stats[date_submission.year][date_submission.month]['uniq_urls'] = set()
+ stats[date_submission.year][date_submission.month]['submissions'] += 1
+ stats[date_submission.year][date_submission.month]['uniq_urls'].add(cache['url'])
if len(cache['redirects']) > 0: # type: ignore
- stats[date_analysis.year][date_analysis.month]['analysis_with_redirects'] += 1
- stats[date_analysis.year][date_analysis.month]['redirects'] += len(cache['redirects']) # type: ignore
- stats[date_analysis.year][date_analysis.month]['uniq_urls'].update(cache['redirects'])
+ stats[date_submission.year][date_submission.month]['submissions_with_redirects'] += 1
+ stats[date_submission.year][date_submission.month]['redirects'] += len(cache['redirects']) # type: ignore
+ stats[date_submission.year][date_submission.month]['uniq_urls'].update(cache['redirects'])
- if date_analysis.isocalendar()[1] >= calendar_week - 1:
- if date_analysis.isocalendar()[1] not in weeks_stats:
- weeks_stats[date_analysis.isocalendar()[1]] = defaultdict(dict, **stats_dict)
- weeks_stats[date_analysis.isocalendar()[1]]['uniq_urls'] = set()
- weeks_stats[date_analysis.isocalendar()[1]]['analysis'] += 1
- weeks_stats[date_analysis.isocalendar()[1]]['uniq_urls'].add(cache['url'])
+ if date_submission.isocalendar()[1] >= calendar_week - 1:
+ if date_submission.isocalendar()[1] not in weeks_stats:
+ weeks_stats[date_submission.isocalendar()[1]] = defaultdict(dict, **stats_dict)
+ weeks_stats[date_submission.isocalendar()[1]]['uniq_urls'] = set()
+ weeks_stats[date_submission.isocalendar()[1]]['submissions'] += 1
+ weeks_stats[date_submission.isocalendar()[1]]['uniq_urls'].add(cache['url'])
if len(cache['redirects']) > 0: # type: ignore
- weeks_stats[date_analysis.isocalendar()[1]]['analysis_with_redirects'] += 1
- weeks_stats[date_analysis.isocalendar()[1]]['redirects'] += len(cache['redirects']) # type: ignore
- weeks_stats[date_analysis.isocalendar()[1]]['uniq_urls'].update(cache['redirects'])
+ weeks_stats[date_submission.isocalendar()[1]]['submissions_with_redirects'] += 1
+ weeks_stats[date_submission.isocalendar()[1]]['redirects'] += len(cache['redirects']) # type: ignore
+ weeks_stats[date_submission.isocalendar()[1]]['uniq_urls'].update(cache['redirects'])
statistics: Dict[str, List] = {'weeks': [], 'years': []}
for week_number in sorted(weeks_stats.keys()):
@@ -1041,7 +1041,7 @@ class Lookyloo():
statistics['weeks'].append(week_stat)
for year in sorted(stats.keys()):
- year_stats: Dict[str, Union[int, List]] = {'year': year, 'months': [], 'yearly_analysis': 0, 'yearly_redirects': 0}
+ year_stats: Dict[str, Union[int, List]] = {'year': year, 'months': [], 'yearly_submissions': 0, 'yearly_redirects': 0}
for month in sorted(stats[year].keys()):
month_stats = stats[year][month]
urls = month_stats.pop('uniq_urls')
@@ -1050,7 +1050,7 @@ class Lookyloo():
month_stats['uniq_domains'] = len(uniq_domains(urls))
year_stats['months'].append(month_stats) # type: ignore
- year_stats['yearly_analysis'] += month_stats['analysis']
+ year_stats['yearly_submissions'] += month_stats['submissions']
year_stats['yearly_redirects'] += month_stats['redirects']
statistics['years'].append(year_stats)
return statistics
diff --git a/website/web/static/stats_graph.js b/website/web/static/stats_graph.js
index 3580caff..f9ec7599 100644
--- a/website/web/static/stats_graph.js
+++ b/website/web/static/stats_graph.js
@@ -7,12 +7,17 @@ var height = 800;
d3.json('/json/stats').then(json => {
var datasets = []
json.years.forEach(year => {
- var data_year = { label: `Analysis ${year.year}`, x: [], y: [] }
+ var submissions_year = { label: `Submissions ${year.year}`, x: [], y: [] }
+ var unique_urls_year = { label: `Unique URLs ${year.year}`, x: [], y: [] }
year.months.forEach(month => {
- data_year.x.push(month.month_number)
- data_year.y.push(month.analysis)
+ submissions_year.x.push(month.month_number)
+ unique_urls_year.x.push(month.month_number)
+
+ submissions_year.y.push(month.submissions)
+ unique_urls_year.y.push(month.uniq_urls)
});
- datasets.push(data_year)
+ datasets.push(submissions_year)
+ datasets.push(unique_urls_year)
});
var x_scale = d3.scaleLinear()
diff --git a/website/web/templates/stats.html b/website/web/templates/stats.html
index 075949b4..583a20bc 100644
--- a/website/web/templates/stats.html
+++ b/website/web/templates/stats.html
@@ -19,8 +19,8 @@
</thead>
<tbody>
<tr>
- <td> {{ week['analysis'] }} </td>
- <td> {{ week['analysis_with_redirects'] }} </td>
+ <td> {{ week['submissions'] }} </td>
+ <td> {{ week['submissions_with_redirects'] }} </td>
<td> {{ week['redirects'] }} </td>
<td> {{ week['uniq_urls'] }} </td>
<td> {{ week['uniq_domains'] }} </td>
@@ -35,7 +35,7 @@
{% for year in stats['years'] %}
<h2>Year: {{ year['year'] }}</h2>
<ul>
- <li><b>Total analysis</b>: {{ year['yearly_analysis'] }}</li>
+ <li><b>Total submissions</b>: {{ year['yearly_submissions'] }}</li>
<li><b>Total redirects</b>: {{ year['yearly_redirects'] }}</li>
</ul>
<div>
@@ -54,8 +54,8 @@
</thead>
<tbody>
<tr>
- <td> {{ month['analysis'] }} </td>
- <td> {{ month['analysis_with_redirects'] }} </td>
+ <td> {{ month['submissions'] }} </td>
+ <td> {{ month['submissions_with_redirects'] }} </td>
<td> {{ month['redirects'] }} </td>
<td> {{ month['uniq_urls'] }} </td>
<td> {{ month['uniq_domains'] }} </td>