Compare commits

..

1 Commits

Author SHA1 Message Date
56c1e059f9 Don't build tests by default, fix enlarge button 2020-12-31 10:43:03 -05:00
5 changed files with 30 additions and 46 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-x64-linux - ./sist2.gz
- ./sist2-x64-linux-debug.tar.gz - ./sist2_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-linux - ./sist2_arm64.gz

View File

@ -10,11 +10,10 @@ 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
mv sist2 sist2-x64-linux gzip -9 sist2
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
mv sist2_debug sist2-x64-linux-debug tar -czf sist2_debug.tar.gz sist2_debug libasan.so.2
tar -czf sist2-x64-linux-debug.tar.gz sist2-x64-linux-debug libasan.so.2

View File

@ -10,4 +10,5 @@ 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-linux mv sist2 sist2_arm64
gzip -9 sist2_arm64

View File

@ -165,9 +165,6 @@ window.onload = () => {
} }
} }
}); });
initTagTree();
updateTagTree();
}; };
function saveTag(tag, hit) { function saveTag(tag, hit) {
@ -191,8 +188,6 @@ function saveTag(tag, hit) {
hideAfter: 3000, hideAfter: 3000,
loaderBg: "#08c7e8", loaderBg: "#08c7e8",
}); });
window.setTimeout(updateTagTree, 2000);
}) })
} }
@ -203,7 +198,7 @@ function deleteTag(tag, hit) {
delete: true, delete: true,
name: tag, name: tag,
doc_id: hit["_id"], doc_id: hit["_id"],
path_md5: md5(relPath) relpath: relPath
}).then(() => { }).then(() => {
$.toast({ $.toast({
heading: "Tag deleted", heading: "Tag deleted",
@ -215,8 +210,6 @@ function deleteTag(tag, hit) {
hideAfter: 3000, hideAfter: 3000,
loaderBg: "#08c7e8", loaderBg: "#08c7e8",
}); });
window.setTimeout(updateTagTree, 2000);
}) })
} }
@ -320,8 +313,25 @@ $.jsonPost("es", {
mimeTree.node("any").select(); mimeTree.node("any").select();
}); });
function initTagTree() { // Tags tree
tagMap = [{text: "All", id: "any"}]; $.jsonPost("es", {
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'
@ -336,34 +346,8 @@ function initTagTree() {
}); });
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(".");

File diff suppressed because one or more lines are too long