From a3b57f703399f8955a4e1b773b85a8c9a44bedf9 Mon Sep 17 00:00:00 2001 From: farfalleflickan <6597735+farfalleflickan@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:14:15 +0100 Subject: [PATCH] Fixed --clean behaviour, version bump --- src/main.c | 12 +++++++++++- src/tvshow.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index c1e6676..50d4ba2 100644 --- a/src/main.c +++ b/src/main.c @@ -17,7 +17,7 @@ #include "main.h" #define REPO_URL "https://github.com/farfalleflickan/cmyflix" -#define VERSION_STRING "0.21" +#define VERSION_STRING "0.22" // GLOBAL VARIABLES FILE *LOGFILE=NULL; @@ -268,8 +268,13 @@ void cleanMode(progConfig *conf, progFlags flags) { if (threadArgTV.oldJSON!=NULL) { char *newDB=cJSON_Print(threadArgTV.oldJSON); cJSON_Delete(threadArgTV.oldJSON); + freeFileMem(conf->dbNameTV, conf->tvDB_str); writeCharToFile(newDB, conf->dbNameTV); tryFree(newDB); + cJSON_Delete(conf->JSON_tvDB); + conf->JSON_tvDB=NULL; + conf->tvDB_str=fileToMem(conf->dbNameTV); + conf->JSON_tvDB=cJSON_Parse(conf->tvDB_str); } else { printInfo("cleanMode warning", true, "oldJSON was NULL!\n"); } @@ -279,8 +284,13 @@ void cleanMode(progConfig *conf, progFlags flags) { if (threadArgMovies.oldJSON!=NULL) { char *newDB=cJSON_Print(threadArgMovies.oldJSON); cJSON_Delete(threadArgMovies.oldJSON); + freeFileMem(conf->dbNameMovie, conf->moDB_str); writeCharToFile(newDB, conf->dbNameMovie); tryFree(newDB); + cJSON_Delete(conf->JSON_moDB); + conf->JSON_moDB=NULL; + conf->moDB_str=fileToMem(conf->dbNameMovie); + conf->JSON_moDB=cJSON_Parse(conf->moDB_str); } else { printInfo("cleanMode warning", true, "oldJSON was NULL!\n"); } diff --git a/src/tvshow.c b/src/tvshow.c index 7463280..d623f2a 100755 --- a/src/tvshow.c +++ b/src/tvshow.c @@ -49,7 +49,7 @@ struct fileList *createTVShowDB(progConfig *conf) { break; } } else { - printError("createTVShowDB warning", false, "some errors occured while reading \"%s\", parts of the database will be rebuilt from scratch...\n", conf->dbNameTV); + printError("createTVShowDB warning", false, HYEL, "some errors occured while reading \"%s\", parts of the database will be rebuilt from scratch...\n", conf->dbNameTV); threadObj[i].oldJSON=NULL; conf->tvDB_exists=false; cJSON_Delete(tempJSON);