Compare commits

...

5 Commits

Author SHA1 Message Date
013c54daa0 Fix tag delete 2020-12-31 12:55:37 -05:00
54308ef5e2 Update tags tab automatically 2020-12-31 12:45:23 -05:00
638c2a5c1a Update binary names (again) 2020-12-31 11:03:25 -05:00
9587caddd9 Don't build tests by default, fix enlarge button 2020-12-31 10:55:34 -05:00
f5bbe0dc97 Update binary names 2020-12-31 10:54:30 -05:00
7 changed files with 58 additions and 34 deletions

View File

@ -24,8 +24,8 @@ steps:
from_secret: SSH_KEY from_secret: SSH_KEY
target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/ target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
source: source:
- ./sist2.gz - ./sist2-x64-linux
- ./sist2_debug.tar.gz - ./sist2-x64-linux-debug.tar.gz
--- ---
kind: pipeline kind: pipeline
@ -53,4 +53,4 @@ steps:
from_secret: SSH_KEY from_secret: SSH_KEY
target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/ target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
source: source:
- ./sist2_arm64.gz - ./sist2-arm64-linux

View File

@ -5,7 +5,7 @@ project(sist2 C)
option(SIST_DEBUG "Build a debug executable" on) option(SIST_DEBUG "Build a debug executable" on)
set(BUILD_TESTS on) set(BUILD_TESTS off)
add_subdirectory(third-party/libscan) add_subdirectory(third-party/libscan)
set(ARGPARSE_SHARED off) set(ARGPARSE_SHARED off)
add_subdirectory(third-party/argparse) add_subdirectory(third-party/argparse)

View File

@ -10,10 +10,11 @@ rm -rf CMakeFiles CMakeCache.txt
cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" . cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
make -j 33 make -j 33
strip sist2 strip sist2
gzip -9 sist2 mv sist2 sist2-x64-linux
rm -rf CMakeFiles CMakeCache.txt rm -rf CMakeFiles CMakeCache.txt
cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" . cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
make -j 33 make -j 33
cp /usr/lib/x86_64-linux-gnu/libasan.so.2.0.0 libasan.so.2 cp /usr/lib/x86_64-linux-gnu/libasan.so.2.0.0 libasan.so.2
tar -czf sist2_debug.tar.gz sist2_debug libasan.so.2 mv sist2_debug sist2-x64-linux-debug
tar -czf sist2-x64-linux-debug.tar.gz sist2-x64-linux-debug libasan.so.2

View File

@ -10,5 +10,4 @@ rm -rf CMakeFiles CMakeCache.txt
cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" . cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
make -j 4 make -j 4
strip sist2 strip sist2
mv sist2 sist2_arm64 mv sist2 sist2-arm64-linux
gzip -9 sist2_arm64

View File

@ -165,6 +165,9 @@ window.onload = () => {
} }
} }
}); });
initTagTree();
updateTagTree();
}; };
function saveTag(tag, hit) { function saveTag(tag, hit) {
@ -188,6 +191,8 @@ function saveTag(tag, hit) {
hideAfter: 3000, hideAfter: 3000,
loaderBg: "#08c7e8", loaderBg: "#08c7e8",
}); });
window.setTimeout(updateTagTree, 2000);
}) })
} }
@ -198,7 +203,7 @@ function deleteTag(tag, hit) {
delete: true, delete: true,
name: tag, name: tag,
doc_id: hit["_id"], doc_id: hit["_id"],
relpath: relPath path_md5: md5(relPath)
}).then(() => { }).then(() => {
$.toast({ $.toast({
heading: "Tag deleted", heading: "Tag deleted",
@ -210,6 +215,8 @@ function deleteTag(tag, hit) {
hideAfter: 3000, hideAfter: 3000,
loaderBg: "#08c7e8", loaderBg: "#08c7e8",
}); });
window.setTimeout(updateTagTree, 2000);
}) })
} }
@ -313,25 +320,8 @@ $.jsonPost("es", {
mimeTree.node("any").select(); mimeTree.node("any").select();
}); });
// Tags tree function initTagTree() {
$.jsonPost("es", { tagMap = [{text: "All", id: "any"}];
aggs: {
tags: {
terms: {
field: "tag",
size: 10000
}
}
},
size: 0,
}).then(resp => {
resp["aggregations"]["tags"]["buckets"]
.sort((a, b) => a["key"].localeCompare(b["key"]))
.forEach(bucket => {
addTag(tagMap, bucket["key"], bucket["key"], bucket["doc_count"])
});
tagMap.push({"text": "All", "id": "any"});
tagTree = new InspireTree({ tagTree = new InspireTree({
selection: { selection: {
mode: 'checkbox' mode: 'checkbox'
@ -346,8 +336,34 @@ $.jsonPost("es", {
}); });
tagTree.on("node.state.changed", handleTreeClick(tagTree)); tagTree.on("node.state.changed", handleTreeClick(tagTree));
tagTree.node("any").select(); tagTree.node("any").select();
searchBusy = false; }
});
function updateTagTree() {
$.jsonPost("es", {
aggs: {
tags: {
terms: {
field: "tag",
size: 10000
}
}
},
size: 0,
}).then(resp => {
tagMap = [];
resp["aggregations"]["tags"]["buckets"]
.sort((a, b) => a["key"].localeCompare(b["key"]))
.forEach(bucket => {
addTag(tagMap, bucket["key"], bucket["key"], bucket["doc_count"])
});
tagTree.removeAll();
tagMap.push({text: "All", id: "any"})
tagTree.addNodes(tagMap);
searchBusy = false;
});
}
function addTag(map, tag, id, count) { function addTag(map, tag, id, count) {
// let tags = tag.split("#")[0].split("."); // let tags = tag.split("#")[0].split(".");

View File

@ -29,13 +29,13 @@
</div> </div>
<div id="treemap-card" class="stats-card"> <div id="treemap-card" class="stats-card">
<button class="btn stats-btn" onclick="fullScreen('treemap-card')">Enlarge</button> <button class="btn stats-btn" onclick="fullScreen('treemap-card')" id="treemap-card-enlarge">Enlarge</button>
<button class="btn stats-btn" onclick="exportTreemap()">Export</button> <button class="btn stats-btn" onclick="exportTreemap()">Export</button>
<svg id="treemap"></svg> <svg id="treemap"></svg>
</div> </div>
<div id="graphs-card" class="stats-card"> <div id="graphs-card" class="stats-card">
<button class="btn stats-btn" onclick="fullScreen('graphs-card')">Enlarge</button> <button class="btn stats-btn" onclick="fullScreen('graphs-card')" id="graphs-card-enlarge">Enlarge</button>
<div class="graph"> <div class="graph">
<svg id="agg_mime_size"></svg> <svg id="agg_mime_size"></svg>
</div> </div>
@ -789,7 +789,15 @@ window.onload = function () {
function fullScreen(selector) { function fullScreen(selector) {
const card = document.getElementById(selector); const card = document.getElementById(selector);
const btn = document.getElementById(selector + "-enlarge");
card.classList.toggle("full-screen"); card.classList.toggle("full-screen");
if (card.classList.contains("full-screen")) {
btn.innerText = "Shrink";
} else {
btn.innerText = "Enlarge";
}
} }
function exportTreemap() { function exportTreemap() {

File diff suppressed because one or more lines are too long