From 14dc1311bcc1e43e626813aa69d30850da8320ee Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 24 May 2023 17:00:26 +0200 Subject: [PATCH 1/3] Update adlist.date_updated in parseList command Signed-off-by: DL6ER --- src/gravity-tools.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gravity-tools.c b/src/gravity-tools.c index 852a2bb5c..ddf638f91 100644 --- a/src/gravity-tools.c +++ b/src/gravity-tools.c @@ -317,7 +317,7 @@ int gravity_parseList(const char *infile, const char *outfile, const char *adlis } // Update number of domains on this list - sql = "UPDATE adlist SET number = ?, invalid_domains = ? WHERE id = ?;"; + sql = "UPDATE adlist SET number = ?, invalid_domains = ?, date_updated = cast(strftime('%s', 'now') as int) WHERE id = ?;"; if(sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) { printf("%s %s Unable to prepare SQL statement to update adlist properties in database file %s\n", @@ -406,4 +406,4 @@ int gravity_parseList(const char *infile, const char *outfile, const char *adlis // Return success return EXIT_SUCCESS; -} \ No newline at end of file +} From 15faf3ca001284b78462cc27ad34b6854034d8ec Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 24 May 2023 17:02:55 +0200 Subject: [PATCH 2/3] Rename src/{gravity-tools.* => tools/gravity-parseList.*} Signed-off-by: DL6ER --- src/CMakeLists.txt | 2 -- src/args.c | 2 +- src/tools/CMakeLists.txt | 2 ++ src/{gravity-tools.c => tools/gravity-parseList.c} | 4 ++-- src/{gravity-tools.h => tools/gravity-parseList.h} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/{gravity-tools.c => tools/gravity-parseList.c} (99%) rename src/{gravity-tools.h => tools/gravity-parseList.h} (91%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b7c4ec6e..cee7b1b32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -128,8 +128,6 @@ set(sources FTL.h gc.c gc.h - gravity-tools.c - gravity-tools.h log.c log.h main.c diff --git a/src/args.c b/src/args.c index f7e1c2e93..fc49a68c2 100644 --- a/src/args.c +++ b/src/args.c @@ -33,7 +33,7 @@ // LUA dependencies #include "lua/ftl_lua.h" // gravity_parseList() -#include "gravity-tools.h" +#include "tools/gravity-parseList.h" // run_dhcp_discover() #include "tools/dhcp-discover.h" // run_arp_scan() diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 47de88b1a..47b9e5e10 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -13,6 +13,8 @@ set(tools_sources arp-scan.h dhcp-discover.c dhcp-discover.h + gravity-parseList.c + gravity-parseList.h ) add_library(tools OBJECT ${tools_sources}) diff --git a/src/gravity-tools.c b/src/tools/gravity-parseList.c similarity index 99% rename from src/gravity-tools.c rename to src/tools/gravity-parseList.c index ddf638f91..8fb7d1fac 100644 --- a/src/gravity-tools.c +++ b/src/tools/gravity-parseList.c @@ -3,12 +3,12 @@ * Network-wide ad blocking via your own hardware. * * FTL Engine -* Gravity tools collection routines +* Gravity parseList routines * * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ -#include "gravity-tools.h" +#include "tools/gravity-parseList.h" #include "args.h" #include #include "database/sqlite3.h" diff --git a/src/gravity-tools.h b/src/tools/gravity-parseList.h similarity index 91% rename from src/gravity-tools.h rename to src/tools/gravity-parseList.h index 3cc021711..fb09c1d2e 100644 --- a/src/gravity-tools.h +++ b/src/tools/gravity-parseList.h @@ -3,7 +3,7 @@ * Network-wide ad blocking via your own hardware. * * FTL Engine -* Gravity tools collection prototypes +* Gravity parseList prototypes * * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ From 42b36cf5d1038d1f77ee4968242b1ba3d5dc8efd Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 24 May 2023 21:50:23 +0200 Subject: [PATCH 3/3] Update src/tools/gravity-parseList.c Co-authored-by: yubiuser Signed-off-by: DL6ER --- src/tools/gravity-parseList.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/gravity-parseList.c b/src/tools/gravity-parseList.c index 8fb7d1fac..f49bcb7b2 100644 --- a/src/tools/gravity-parseList.c +++ b/src/tools/gravity-parseList.c @@ -316,7 +316,7 @@ int gravity_parseList(const char *infile, const char *outfile, const char *adlis } } - // Update number of domains on this list + // Update number of domains and update timestamp on this list sql = "UPDATE adlist SET number = ?, invalid_domains = ?, date_updated = cast(strftime('%s', 'now') as int) WHERE id = ?;"; if(sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {