Fix #376

Fix tag

sist2-admin/sist2_admin/sist2.py

@@ -187,6 +187,7 @@ class Sist2Index:
     def name(self) -> str:
         return self._descriptor["name"]
 
+
 class WebOptions(BaseModel):
     indices: List[str] = []
 
@@ -212,7 +213,8 @@ class WebOptions(BaseModel):
                 f"--lang={self.lang}"]
 
         if search_backend.backend_type == SearchBackendType("sqlite"):
-            args.append(f"--search-index={search_backend.search_index}")
+            search_index_absolute = os.path.join(DATA_FOLDER, search_backend.search_index)
+            args.append(f"--search-index={search_index_absolute}")
         else:
             args.append(f"--es-url={search_backend.es_url}")
             args.append(f"--es-index={search_backend.es_index}")
@@ -238,6 +240,7 @@ class WebOptions(BaseModel):
 
         return args
 
+
 class Sist2:
 
     def __init__(self, bin_path: str, data_directory: str):
@@ -357,5 +360,3 @@ class Sist2:
         t_stdout.start()
 
         return proc.pid
-
-

sist2-admin/sist2_admin/state.py

@@ -65,8 +65,8 @@ def get_log_files_to_remove(db: PersistentState, job_name: str, n: int):
         if row["name"].endswith(f"[{job_name}]"):
             counter += 1
 
-        if counter > n:
-            to_remove.append(row)
+            if counter > n:
+                to_remove.append(row)
 
     return to_remove
 

sist2-vue/src/Sist2Api.ts

@@ -531,8 +531,8 @@ class Sist2Api {
             size: 0
         }).then(res => {
             const range = {
-                min: res.aggregations.dateMin.value,
-                max: res.aggregations.dateMax.value,
+                min: res.aggregations.dateMin.value / 1000,
+                max: res.aggregations.dateMax.value / 1000,
             }
 
             if (range.min == null) {

src/parsing/parse.c

@@ -53,9 +53,9 @@ file_type_t get_file_type(unsigned int mime, size_t size, const char *filepath)
     } else if (IS_FONT(mime)) {
         return FILETYPE_FONT;
     } else if (ScanCtx.arc_ctx.mode != ARC_MODE_SKIP && (
-                    IS_ARC(mime) ||
-                    (IS_ARC_FILTER(mime) && should_parse_filtered_file(filepath))
-            )) {
+            IS_ARC(mime) ||
+            (IS_ARC_FILTER(mime) && should_parse_filtered_file(filepath))
+    )) {
         return FILETYPE_ARCHIVE;
     } else if ((ScanCtx.ooxml_ctx.content_size > 0 || ScanCtx.media_ctx.tn_size > 0) && IS_DOC(mime)) {
         return FILETYPE_OOXML;
@@ -155,19 +155,17 @@ void parse(parse_job_t *job) {
     doc->meta_head = NULL;
     doc->meta_tail = NULL;
     doc->size = job->vfile.st_size;
-    doc->mtime = job->vfile.mtime;
+    doc->mtime = MAX(job->vfile.mtime, 0);
     doc->mime = get_mime(job);
     generate_doc_id(doc->filepath + ScanCtx.index.desc.root_len, doc->doc_id);
 
     if (doc->mime == GET_MIME_ERROR_FATAL) {
-
         CLOSE_FILE(job->vfile)
         free(doc);
         return;
     }
 
     if (database_mark_document(ProcData.index_db, doc->doc_id, doc->mtime)) {
-
         CLOSE_FILE(job->vfile)
         free(doc);
         return;

src/web/serve.c

@@ -248,9 +248,11 @@ void serve_file_from_disk(cJSON *json, index_t *idx, struct mg_connection *nc, s
 
     char mime_mapping[8192];
     if (strlen(ext) == 0) {
-        snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s", full_path, mime);
+        snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s%s",
+                 full_path, mime, STR_STARTS_WITH_CONSTANT(mime, "text/") ? "; charset=utf8" : "");
     } else {
-        snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s", ext, mime);
+        snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s%s",
+                 ext, mime, STR_STARTS_WITH_CONSTANT(mime, "text/") ? "; charset=utf8" : "");
     }
 
     struct mg_http_serve_opts opts = {
@@ -526,9 +528,9 @@ void tag(struct mg_connection *nc, struct mg_http_message *hm) {
     }
 
     tag_req_t *req = parse_tag_request(json);
-    cJSON_Delete(json);
     if (req == NULL) {
         LOG_DEBUGF("serve.c", "Could not parse tag request", arg_index);
+        cJSON_Delete(json);
         HTTP_REPLY_BAD_REQUEST
         return;
     }
@@ -552,6 +554,7 @@ void tag(struct mg_connection *nc, struct mg_http_message *hm) {
     }
 
     free(req);
+    cJSON_Delete(json);
 }
 
 int validate_auth(struct mg_connection *nc, struct mg_http_message *hm) {