simon987/od-database
1
0
Fork 0
mirror of https://github.com/simon987/od-database.git synced 2025-04-20 02:46:45 +00:00
Code Issues Projects Releases Wiki Activity

Modified graph of file types

Browse Source
This commit is contained in:
Simon 2018-06-19 20:17:20 -04:00
parent 76ed03a82e
commit c99400994b
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
search/search.py
View File

@ -246,7 +246,7 @@ class ElasticSearchEngine(SearchEngine):
"ext_group": { "ext_group": {
"terms": { "terms": {
"field": "ext", "field": "ext",
"size": 30 "size": 20
}, },
"aggs": { "aggs": {
"size": { "size": {

40
static/js/report.js
View File

@ -132,34 +132,24 @@ function drawChart(rData) {
var otherCount = 0; var otherCount = 0;
for (var ext in rData["ext_stats"]) { for (var ext in rData["ext_stats"]) {
//Ignore file sizes below 0.5%
if (!isRelevant(rData, ext)) {
otherSize += rData["ext_stats"][ext][0];
otherCount += rData["ext_stats"][ext][1];
} else {
dataSetSize.push(rData["ext_stats"][ext][0]); dataSetSize.push(rData["ext_stats"][ext][0]);
dataSetCount.push(rData["ext_stats"][ext][1]); dataSetCount.push(rData["ext_stats"][ext][1]);
labels.push(rData["ext_stats"][ext][2] + " x" + rData["ext_stats"][ext][1] + " (" + humanFileSize(rData["ext_stats"][ext][0]) + ")"); labels.push(rData["ext_stats"][ext][2] + " x" + rData["ext_stats"][ext][1] + " (" + humanFileSize(rData["ext_stats"][ext][0]) + ")");
colors.push(getRandomColor())
}
}
if (otherCount !== 0) {
colors.push(getRandomColor()); colors.push(getRandomColor());
labels.push("other x" + otherCount + " (" + humanFileSize(otherSize) + ")");
dataSetSize.push(otherSize);
dataSetCount.push(otherCount);
} }
var ctx = document.getElementById('typesChart').getContext('2d'); var ctx = document.getElementById('typesChart').getContext('2d');
var fileTypePieChart = new Chart(ctx, { var fileTypePieChart = new Chart(ctx, {
type: 'pie', type: 'doughnut',
data: { data: {
datasets: [{ datasets: [{
data: rData["total_size"] < 100000 ? dataSetCount : dataSetSize, data: dataSetSize,
backgroundColor: colors,
borderWidth: 1
}, {
data: dataSetCount,
backgroundColor: colors, backgroundColor: colors,
borderWidth: 1 borderWidth: 1
}], }],
@ -179,8 +169,10 @@ function drawChart(rData) {
fontColor: "#bbbbbb", fontColor: "#bbbbbb",
fontFamily: "Lato,'Helvetica Neue',Arial,Helvetica,sans-serif", fontFamily: "Lato,'Helvetica Neue',Arial,Helvetica,sans-serif",
boxWidth: 20, boxWidth: 20,
} },
} position: "left"
},
cutoutPercentage: 15
} }
}); });
} }
@ -209,16 +201,16 @@ function fillDatabaseTable(rData) {
document.getElementById("sizeVariance").innerHTML = humanFileSize(rData["size_variance"]); document.getElementById("sizeVariance").innerHTML = humanFileSize(rData["size_variance"]);
} }
function isRelevant(rData, ext) { function isRelevant(rData, ext, bySize) {
// if (ext[2] === "") { if (ext[2] === "") {
// return false; return false;
// } }
if (rData["total_size"] < 100000) { if (bySize) {
return rData["ext_stats"][ext][1] > 0.03 * rData["total_count"] return rData["ext_stats"][ext][1] > 0.03 * rData["total_count"]
} else { } else {
return rData["ext_stats"][ext][0] > 0.005 * rData["total_size"] return rData["ext_stats"][ext][0] > 0.002 * rData["total_size"]
} }