mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
first big change of logViewer - just doing a backup
This commit is contained in:
parent
b761471ec3
commit
5de436e4f3
|
@ -8,29 +8,6 @@ var configPath = path.join(configFolder, 'config.json')
|
||||||
const config = require(configPath);
|
const config = require(configPath);
|
||||||
|
|
||||||
|
|
||||||
var _getAllFilesFromFolder = function(dir) {
|
|
||||||
|
|
||||||
var filesystem = require("fs");
|
|
||||||
var results = [];
|
|
||||||
|
|
||||||
filesystem.readdirSync(dir).forEach(function(file) {
|
|
||||||
|
|
||||||
file = dir+'/'+file;
|
|
||||||
var stat = filesystem.statSync(file);
|
|
||||||
|
|
||||||
if (stat && stat.isDirectory()) {
|
|
||||||
results = results.concat(_getAllFilesFromFolder(file))
|
|
||||||
} else results.push(file);
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
return results;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
console.log(_getAllFilesFromFolder(__dirname));
|
|
||||||
|
|
||||||
|
|
||||||
// WINDOW LISTENER
|
// WINDOW LISTENER
|
||||||
window.addEventListener('DOMContentLoaded', () => {
|
window.addEventListener('DOMContentLoaded', () => {
|
||||||
document.getElementById('enable_filter_info').addEventListener('click', () => {
|
document.getElementById('enable_filter_info').addEventListener('click', () => {
|
||||||
|
@ -87,22 +64,45 @@ ipcRenderer.on('action-update-log', (event, arg) => {
|
||||||
// https://stackoverflow.com/a/29497680
|
// https://stackoverflow.com/a/29497680
|
||||||
entry = entry.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,'')
|
entry = entry.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,'')
|
||||||
|
|
||||||
|
|
||||||
var tbl = document.getElementById("log");
|
var tbl = document.getElementById("log");
|
||||||
var row = document.createElement("tr");
|
var row = document.createElement("tr");
|
||||||
|
|
||||||
var timestamp = document.createElement("td");
|
var timestamp = document.createElement("td");
|
||||||
var timestampText = document.createElement('span');
|
var timestampText = document.createElement('span');
|
||||||
datetime = new Date();
|
|
||||||
timestampText.innerText = datetime.toISOString();
|
//datetime = new Date();
|
||||||
|
//timestampText.innerText = datetime.toISOString();
|
||||||
|
timestampText.innerText = entry.slice(0, 19);
|
||||||
timestamp.appendChild(timestampText);
|
timestamp.appendChild(timestampText);
|
||||||
|
|
||||||
|
var type = document.createElement("td");
|
||||||
|
var typeText = document.createElement('span');
|
||||||
|
// typeText.innerText = entry.slice(10, 30).match(/[\[](.*)[^\]]/g);
|
||||||
|
typeText.innerText = entry.match(/\[[^\]]+\]/g)[0];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// let res = str.match(/[\[](.*)[^\]]/g);
|
||||||
|
|
||||||
|
type.appendChild(typeText);
|
||||||
|
|
||||||
|
var area = document.createElement("td");
|
||||||
|
var areaText = document.createElement('span');
|
||||||
|
//areaText.innerText = entry.slice(10, 50).match(/[\] \[](.*)[^\]]/g);
|
||||||
|
areaText.innerText = entry.match(/\[[^\]]+\]/g)[1];
|
||||||
|
area.appendChild(areaText);
|
||||||
|
|
||||||
var logEntry = document.createElement("td");
|
var logEntry = document.createElement("td");
|
||||||
var logEntryText = document.createElement('span');
|
var logEntryText = document.createElement('span');
|
||||||
logEntryText.innerText = entry
|
|
||||||
|
|
||||||
|
logEntryText.innerText = entry.split("]")[2];
|
||||||
logEntry.appendChild(logEntryText);
|
logEntry.appendChild(logEntryText);
|
||||||
|
|
||||||
row.appendChild(timestamp);
|
row.appendChild(timestamp);
|
||||||
|
row.appendChild(type);
|
||||||
|
row.appendChild(area);
|
||||||
row.appendChild(logEntry);
|
row.appendChild(logEntry);
|
||||||
tbl.appendChild(row);
|
tbl.appendChild(row);
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,10 @@
|
||||||
<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
|
<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
<!-- chart.js -->
|
<!-- chart.js -->
|
||||||
|
|
||||||
<input type="checkbox" class="btn-check" id="enable_filter_info" autocomplete="off" checked>
|
|
||||||
|
<nav class="navbar fixed-top bg-light">
|
||||||
|
<div class="container-fluid">
|
||||||
|
<input type="checkbox" class="btn-check" id="enable_filter_info" autocomplete="off" checked>
|
||||||
<label class="btn btn-outline-info" for="enable_filter_info">info</label>
|
<label class="btn btn-outline-info" for="enable_filter_info">info</label>
|
||||||
|
|
||||||
<input type="checkbox" class="btn-check" id="enable_filter_debug" autocomplete="off">
|
<input type="checkbox" class="btn-check" id="enable_filter_debug" autocomplete="off">
|
||||||
|
@ -28,11 +31,18 @@
|
||||||
<input type="checkbox" class="btn-check" id="enable_filter_error" autocomplete="off">
|
<input type="checkbox" class="btn-check" id="enable_filter_error" autocomplete="off">
|
||||||
<label class="btn btn-outline-danger" for="enable_filter_error">error</label>
|
<label class="btn btn-outline-danger" for="enable_filter_error">error</label>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="container-fluid mt-5"></div>
|
||||||
|
|
||||||
<table class="table table-hover">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="col">Timestamp</th>
|
<th scope="col">Timestamp</th>
|
||||||
|
<th scope="col">Type</th>
|
||||||
|
<th scope="col">Area</th>
|
||||||
<th scope="col">Log entry</th>
|
<th scope="col">Log entry</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
@ -47,6 +57,8 @@
|
||||||
-->
|
-->
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -35,4 +35,4 @@ html {
|
||||||
#expand_textarea_label{
|
#expand_textarea_label{
|
||||||
border: 0;
|
border: 0;
|
||||||
padding: 1px;
|
padding: 1px;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue