sist2-vue/src/Sist2Query.ts

@@ -69,7 +69,7 @@ interface SortMode {
 
 class Sist2Query {
 
-    searchQuery(blankSearch: boolean = false): any {
+    searchQuery(): any {
 
         const getters = store.getters;
 
@@ -93,6 +93,22 @@ class Sist2Query {
             {terms: {index: selectedIndexIds}}
         ] as any[];
 
+        if (sizeMin && sizeMax) {
+            filters.push({range: {size: {gte: sizeMin, lte: sizeMax}}})
+        } else if (sizeMin) {
+            filters.push({range: {size: {gte: sizeMin}}})
+        } else if (sizeMax) {
+            filters.push({range: {size: {lte: sizeMax}}})
+        }
+
+        if (dateMin && dateMax) {
+            filters.push({range: {mtime: {gte: dateMin, lte: dateMax}}})
+        } else if (dateMin) {
+            filters.push({range: {mtime: {gte: dateMin}}})
+        } else if (dateMax) {
+            filters.push({range: {mtime: {lte: dateMax}}})
+        }
+
         const fields = [
             "name^8",
             "content^3",
@@ -112,39 +128,20 @@ class Sist2Query {
             fields.push("name.nGram^3");
         }
 
-        if (!blankSearch) {
+        const path = pathText.replace(/\/$/, "").toLowerCase(); //remove trailing slashes
-            if (sizeMin && sizeMax) {
+        if (path !== "") {
-                filters.push({range: {size: {gte: sizeMin, lte: sizeMax}}})
+            filters.push({term: {path: path}})
-            } else if (sizeMin) {
+        }
-                filters.push({range: {size: {gte: sizeMin}}})
-            } else if (sizeMax) {
-                filters.push({range: {size: {lte: sizeMax}}})
-            }
 
-            if (dateMin && dateMax) {
+        if (selectedMimeTypes.length > 0) {
-                filters.push({range: {mtime: {gte: dateMin, lte: dateMax}}})
+            filters.push({terms: {"mime": selectedMimeTypes}});
-            } else if (dateMin) {
+        }
-                filters.push({range: {mtime: {gte: dateMin}}})
-            } else if (dateMax) {
-                filters.push({range: {mtime: {lte: dateMax}}})
-            }
 
-            const path = pathText.replace(/\/$/, "").toLowerCase(); //remove trailing slashes
+        if (selectedTags.length > 0) {
-
+            if (getters.optTagOrOperator) {
-            if (path !== "") {
+                filters.push({terms: {"tag": selectedTags}});
-                filters.push({term: {path: path}})
+            } else {
-            }
+                selectedTags.forEach((tag: string) => filters.push({term: {"tag": tag}}));
-
-            if (selectedMimeTypes.length > 0) {
-                filters.push({terms: {"mime": selectedMimeTypes}});
-            }
-
-            if (selectedTags.length > 0) {
-                if (getters.optTagOrOperator) {
-                    filters.push({terms: {"tag": selectedTags}});
-                } else {
-                    selectedTags.forEach((tag: string) => filters.push({term: {"tag": tag}}));
-                }
             }
         }
 
@@ -185,7 +182,7 @@ class Sist2Query {
             size: size,
         } as any;
 
-        if (!empty && !blankSearch) {
+        if (!empty) {
             q.query.bool.must = query;
         }
 
@@ -240,7 +237,7 @@ class Sist2Query {
                 }
             }
 
-            if (!empty && !blankSearch) {
+            if (!empty) {
                 q.query.function_score.query.bool.must.push(query);
             }
         }

sist2-vue/src/components/Lightbox.vue

@@ -89,6 +89,7 @@ export default {
 
       switch (e.key) {
         case " ": {
+          console.log("SPACE")
           e.preventDefault();
           e.stopPropagation();
           e.stopImmediatePropagation();
@@ -97,12 +98,16 @@ export default {
           [...document.getElementsByClassName("fslightbox-absoluted")].forEach(elem => {
             if (elem.style.transform === "translate(0px)" || elem.style.transform === "translate(0px, 0px)") {
               const vid = elem.getElementsByTagName("video")[0];
+              console.log(elem)
+              console.log(vid)
 
               if (vid) {
                 if (vid.paused) {
                   vid.play();
+                  console.log("PLAY")
                 } else {
                   vid.pause()
+                  console.log("PAUSE")
                 }
               }
             }
@@ -114,28 +119,24 @@ export default {
         }
         case "ArrowUp":
         case "k": {
-          if (!lightboxStore.data.isThumbing && lightboxStore.core.thumbsToggler) {
+          if (!lightboxStore.data.isThumbing) {
             lightboxStore.core.thumbsToggler.toggleThumbs();
           }
           return false;
         }
         case "ArrowDown":
         case "j": {
-          if (lightboxStore.data.isThumbing && lightboxStore.core.thumbsToggler) {
+          if (lightboxStore.data.isThumbing) {
             lightboxStore.core.thumbsToggler.toggleThumbs();
           }
           return false;
         }
         case "h": {
-          if (lightboxStore.core.stageManager.getPreviousSlideIndex) {
+          lightboxStore.core.slideIndexChanger.jumpTo(lightboxStore.core.stageManager.getPreviousSlideIndex());
-            lightboxStore.core.slideIndexChanger.jumpTo(lightboxStore.core.stageManager.getPreviousSlideIndex());
+          break;
-          }
-          return false;
         }
         case "l": {
-          if (lightboxStore.core.stageManager.getNextSlideIndex) {
+          lightboxStore.core.slideIndexChanger.jumpTo(lightboxStore.core.stageManager.getNextSlideIndex());
-            lightboxStore.core.slideIndexChanger.jumpTo(lightboxStore.core.stageManager.getNextSlideIndex());
-          }
           return false;
         }
       }

sist2-vue/src/store/index.ts

@@ -241,11 +241,6 @@ export default new Vuex.Store({
             }
         },
         async updateArgs({state}, router: VueRouter) {
-
-            if (router.currentRoute.path !== "/") {
-                return;
-            }
-
             await router.push({
                 query: {
                     q: state.searchText.trim() ? state.searchText.trim().replace(/\s+/g, " ") : undefined,

sist2-vue/src/views/SearchPage.vue

@@ -139,9 +139,7 @@ export default Vue.extend({
         this.setSist2Info(data);
         this.setIndices(data.indices);
 
-        const doBlankSearch = !this.$store.state.optUpdateMimeMap;
+        Sist2Api.getMimeTypes(Sist2Query.searchQuery()).then(({mimeMap}) => {
-
-        Sist2Api.getMimeTypes(Sist2Query.searchQuery(doBlankSearch)).then(({mimeMap}) => {
           this.$store.commit("setUiMimeMap", mimeMap);
           this.uiLoading = false;
           this.search(true);

src/index/elastic.c

@@ -214,13 +214,7 @@ void print_errors(response_t *r) {
     *(tmp + r->size) = '\0';
 
     cJSON *ret_json = cJSON_Parse(tmp);
-    cJSON *errors = cJSON_GetObjectItem(ret_json, "errors");
+    if (cJSON_GetObjectItem(ret_json, "errors")->valueint != 0) {
-
-    if (errors == NULL) {
-        char *str = cJSON_Print(ret_json);
-        LOG_ERRORF("elastic.c", "%s\n", str);
-        cJSON_free(str);
-    } else if (errors->valueint != 0) {
         cJSON *err;
         cJSON_ArrayForEach(err, cJSON_GetObjectItem(ret_json, "items")) {
             if (cJSON_GetObjectItem(cJSON_GetObjectItem(err, "index"), "status")->valueint != 201) {

third-party/libscan/libscan/media/media.c

@@ -4,12 +4,7 @@
 
 #define MIN_SIZE 32
 #define AVIO_BUF_SIZE 8192
-#define IS_VIDEO(fmt) ( \
+#define IS_VIDEO(fmt) ((fmt)->iformat->name && strcmp((fmt)->iformat->name, "image2") != 0)
-    (fmt)->iformat->name && strcmp((fmt)->iformat->name, "image2") != 0 \
-    && strcmp((fmt)->iformat->name, "jpeg_pipe") != 0 \
-    && strcmp((fmt)->iformat->name, "webp_pipe") != 0 \
-    && strcmp((fmt)->iformat->name, "png_pipe") != 0 \
-    )
 
 
 #define STORE_AS_IS ((void*)-1)
@@ -284,22 +279,18 @@ static void
 append_video_meta(scan_media_ctx_t *ctx, AVFormatContext *pFormatCtx, AVFrame *frame, document_t *doc, int is_video) {
 
     if (is_video) {
-        if (pFormatCtx->duration / AV_TIME_BASE != 0) {
+        meta_line_t *meta_duration = malloc(sizeof(meta_line_t));
-            meta_line_t *meta_duration = malloc(sizeof(meta_line_t));
+        meta_duration->key = MetaMediaDuration;
-            meta_duration->key = MetaMediaDuration;
+        meta_duration->long_val = pFormatCtx->duration / AV_TIME_BASE;
-            meta_duration->long_val = pFormatCtx->duration / AV_TIME_BASE;
+        if (meta_duration->long_val > INT32_MAX) {
-            if (meta_duration->long_val > INT32_MAX) {
+            meta_duration->long_val = 0;
-                meta_duration->long_val = 0;
-            }
-            APPEND_META(doc, meta_duration)
         }
+        APPEND_META(doc, meta_duration)
 
-        if (pFormatCtx->bit_rate != 0) {
+        meta_line_t *meta_bitrate = malloc(sizeof(meta_line_t));
-            meta_line_t *meta_bitrate = malloc(sizeof(meta_line_t));
+        meta_bitrate->key = MetaMediaBitrate;
-            meta_bitrate->key = MetaMediaBitrate;
+        meta_bitrate->long_val = pFormatCtx->bit_rate;
-            meta_bitrate->long_val = pFormatCtx->bit_rate;
+        APPEND_META(doc, meta_bitrate)
-            APPEND_META(doc, meta_bitrate)
-        }
     }
 
     AVDictionaryEntry *tag = NULL;
@@ -586,8 +577,7 @@ void parse_media_format_ctx(scan_media_ctx_t *ctx, AVFormatContext *pFormatCtx,
 
         int video_duration_in_seconds = (int) (pFormatCtx->duration / AV_TIME_BASE);
 
-        int thumbnails_to_generate = (IS_VIDEO(pFormatCtx) && stream->codecpar->codec_id != AV_CODEC_ID_GIF &&
+        int thumbnails_to_generate = (IS_VIDEO(pFormatCtx) && stream->codecpar->codec_id != AV_CODEC_ID_GIF && video_duration_in_seconds >= 15)
-                                      video_duration_in_seconds >= 15)
                                      // Limit to ~1 thumbnail every 7s
                                      ? MAX(MIN(ctx->tn_count, video_duration_in_seconds / 7 + 1), 1) + 1
                                      : 1;