Merge pull request #263 from simon987/dependabot/npm_and_yarn/sist2-vue/url-parse-1.5.10

Bump url-parse from 1.5.4 to 1.5.10 in /sist2-vue
2025-12-19 18:24:54 +00:00 · 2022-02-28 09:26:15 -05:00 · 2022-02-28 04:23:32 +00:00 · 2022-02-26 11:37:16 -05:00 · 2022-02-27 00:25:23 +08:00
2 changed files with 20 additions and 11 deletions
--- a/sist2-vue/package-lock.json
+++ b/sist2-vue/package-lock.json
@@ -14098,9 +14098,9 @@
      }
    },
    "node_modules/url-parse": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz",
-      "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
      "dev": true,
      "dependencies": {
        "querystringify": "^2.1.1",
@@ -27019,9 +27019,9 @@
      }
    },
    "url-parse": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz",
-      "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
      "dev": true,
      "requires": {
        "querystringify": "^2.1.1",
--- a/src/main.c
+++ b/src/main.c
@@ -103,7 +103,7 @@ void sig_handler(int signum) {
    exit(-1);
 }

-void init_dir(const char *dirpath) {
+void init_dir(const char *dirpath, scan_args_t* args) {
    char path[PATH_MAX];
    snprintf(path, PATH_MAX, "%sdescriptor.json", dirpath);

@@ -111,9 +111,18 @@ void init_dir(const char *dirpath) {
    strcpy(ScanCtx.index.desc.version, Version);
    strcpy(ScanCtx.index.desc.type, INDEX_TYPE_NDJSON);

-    unsigned char index_md5[MD5_DIGEST_LENGTH];
-    MD5((unsigned char *) &ScanCtx.index.desc.timestamp, sizeof(ScanCtx.index.desc.timestamp), index_md5);
-    buf2hex(index_md5, MD5_DIGEST_LENGTH, ScanCtx.index.desc.id);
+    if (args->incremental != NULL) {
+      // copy old index id
+      char descriptor_path[PATH_MAX];
+      snprintf(descriptor_path, PATH_MAX, "%sdescriptor.json", args->incremental);
+      index_descriptor_t original_desc = read_index_descriptor(descriptor_path);
+      memcpy(ScanCtx.index.desc.id, original_desc.id, sizeof(original_desc.id));
+    } else {
+      // genreate new index id based on timestamp
+      unsigned char index_md5[MD5_DIGEST_LENGTH];
+      MD5((unsigned char *) &ScanCtx.index.desc.timestamp, sizeof(ScanCtx.index.desc.timestamp), index_md5);
+      buf2hex(index_md5, MD5_DIGEST_LENGTH, ScanCtx.index.desc.id);
+    }

    write_index_descriptor(path, &ScanCtx.index.desc);
 }
@@ -378,7 +387,7 @@ void sist2_scan(scan_args_t *args) {

    initialize_scan_context(args);

-    init_dir(ScanCtx.index.path);
+    init_dir(ScanCtx.index.path, args);

    char store_path[PATH_MAX];
    snprintf(store_path, PATH_MAX, "%sthumbs", ScanCtx.index.path);
Author	SHA1	Message	Date
simon987	25ab883063	Merge pull request #263 from simon987/dependabot/npm_and_yarn/sist2-vue/url-parse-1.5.10 Bump url-parse from 1.5.4 to 1.5.10 in /sist2-vue	2022-02-28 09:26:15 -05:00
dependabot[bot]	6ab606203f	Bump url-parse from 1.5.4 to 1.5.10 in /sist2-vue Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-28 04:23:32 +00:00
simon987	6ec98046fa	Merge pull request #262 from yatli/fix_261 fix #261: inherit index id from base index when using incremental scan	2022-02-26 11:37:16 -05:00
Yatao Li	4fac81ca6a	fix #261 : new index ids generated for incremental scan	2022-02-27 00:25:23 +08:00