From c234abbcc20a8b584708b6660381cc3f8259eebd Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Sun, 5 Jan 2020 21:50:48 -0800 Subject: [PATCH] Update migration Signed-off-by: James Ketrenos --- migration | 2 +- scanner/scanner.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/migration b/migration index 1b8f945..a579afe 100644 --- a/migration +++ b/migration @@ -1,7 +1,7 @@ PRAGMA foreign_keys=OFF; PRAGMA legacy_alter_table=ON; BEGIN TRANSACTION; -ALTER TABLES photos RENAME TO photos_; +ALTER TABLE photos RENAME TO photos_; CREATE TABLE `photos` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` VARCHAR(255), `filename` VARCHAR(255), `added` DATETIME, `modified` DATETIME, `updated` DATETIME, `scanned` DATETIME, `taken` DATETIME, `width` INTEGER, `height` INTEGER, `size` INTEGER, `duplicate` TINYINT(1) DEFAULT 0, `deleted` TINYINT(1) DEFAULT 0, `albumId` INTEGER REFERENCES `albums` (`id`), `faces` INTEGER DEFAULT -1); INSERT INTO photos (id,name,filename,added,modified,updated,scanned,taken,width,height,size,duplicate,deleted,albumId,faces) SELECT id,name,filename,added,modified,updated,scanned,taken,width,height,size,duplicate,deleted,albumId,faces FROM photos_; COMMIT; diff --git a/scanner/scanner.c b/scanner/scanner.c index d5f78d7..928fdc1 100644 --- a/scanner/scanner.c +++ b/scanner/scanner.c @@ -62,7 +62,7 @@ long double euclideanDistance(long double *a, long double *b) { } int main(int argc, char *argv[]) { - + int maxId = 0; int len = 0; int i; Face *pChain = NULL; @@ -90,6 +90,7 @@ int main(int argc, char *argv[]) { } char path[1028*2]; sprintf(path, "%s/%s", pathBuf, ent->d_name); + maxId = maxId > id ? maxId : id; Face *pFace = readFaceDescriptor(id, path); if (!pFace) { continue; @@ -180,6 +181,9 @@ int main(int argc, char *argv[]) { pLink = pLink->next; sourceIndex++; } + + sprintf(sqlBuf, "UPDATE faces SET lastComparedId=%d;", maxId); + rc = sqlite3_exec(db, "COMMIT;", 0, 0, &err_msg); if (rc != SQLITE_OK ) { fprintf(stderr, "SQL error: %s\n", err_msg); @@ -191,4 +195,4 @@ int main(int argc, char *argv[]) { sqlite3_close(db); return 0; -} \ No newline at end of file +}