Tweak CI settings

.drone.yml

@@ -11,6 +11,21 @@ steps:
     image: simon987/ubuntu_ci
     commands:
       - ./ci/build.sh
+  - name: docker
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKER_USER
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: simon987/sist2
+      context: ./Docker/
+      dockerfile: ./Docker/Dockerfile
+      auto_tag: true
+      auto_tag_suffix: x64-linux
+      when:
+        event:
+          - tag
   - name: scp files
     image: appleboy/drone-scp
     settings:
@@ -24,8 +39,9 @@ steps:
         from_secret: SSH_KEY
       target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
       source:
-        - ./sist2.gz
+        - ./VERSION
-        - ./sist2_debug.tar.gz
+        - ./sist2-x64-linux
+        - ./sist2-x64-linux-debug.tar.gz
 
 ---
 kind: pipeline
@@ -51,6 +67,6 @@ steps:
         from_secret: SSH_USER
       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}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
       source:
-        - ./sist2_arm64.gz
+        - ./sist2-arm64-linux

Docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:19.10
+FROM ubuntu:20.04
 MAINTAINER simon987 <me@simon987.net>
 
 RUN apt update

Docker/build.sh

@@ -1,14 +0,0 @@
-rm ./sist2 sist2_debug
-cp ../sist2.gz .
-gzip -d sist2.gz
-strip sist2
-
-version=$(./sist2 --version)
-
-echo "Version ${version}"
-docker build . -t simon987/sist2:${version} -t simon987/sist2:latest
-
-docker push simon987/sist2:${version}
-docker push simon987/sist2:latest
-
-docker run --rm simon987/sist2 -v

ci/build.sh

@@ -10,10 +10,13 @@ rm -rf CMakeFiles CMakeCache.txt
 cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
 make -j 33
 strip sist2
-gzip -9 sist2
+./sist2 -v > VERSION
+cp sist2 Docker/
+mv sist2 sist2-x64-linux
 
 rm -rf CMakeFiles CMakeCache.txt
 cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
 make -j 33
 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

ci/build_arm64.sh

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

src/static/js/search.js

@@ -165,6 +165,9 @@ window.onload = () => {
             }
         }
     });
+
+    initTagTree();
+    updateTagTree();
 };
 
 function saveTag(tag, hit) {
@@ -188,6 +191,8 @@ function saveTag(tag, hit) {
             hideAfter: 3000,
             loaderBg: "#08c7e8",
         });
+
+        window.setTimeout(updateTagTree, 2000);
     })
 }
 
@@ -198,7 +203,7 @@ function deleteTag(tag, hit) {
         delete: true,
         name: tag,
         doc_id: hit["_id"],
-        relpath: relPath
+        path_md5: md5(relPath)
     }).then(() => {
         $.toast({
             heading: "Tag deleted",
@@ -210,6 +215,8 @@ function deleteTag(tag, hit) {
             hideAfter: 3000,
             loaderBg: "#08c7e8",
         });
+
+        window.setTimeout(updateTagTree, 2000);
     })
 }
 
@@ -313,25 +320,8 @@ $.jsonPost("es", {
     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({
         selection: {
             mode: 'checkbox'
@@ -346,8 +336,34 @@ $.jsonPost("es", {
     });
     tagTree.on("node.state.changed", handleTreeClick(tagTree));
     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) {
     // let tags = tag.split("#")[0].split(".");