Fix #373

Only remove files with job_name.

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:
+            if counter > n:
-            to_remove.append(row)
+                to_remove.append(row)
 
     return to_remove
 

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(mime) ||
-                    (IS_ARC_FILTER(mime) && should_parse_filtered_file(filepath))
+            (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;