Update hook behaviour to play nicer with indexer

Author: ThatHackerDudeFromCyberspace

extractor/main.c

@@ -243,6 +243,24 @@ void index_file(char *path, char* filename, bool new) {
             free(fileType);
         }
 
+        // Create JSON objects
+        cJSON* json = cJSON_CreateObject();
+        if (!json) {
+            fprintf(stderr, "Failed to create a JSON object");
+            return;
+        }
+        
+        generateChangeRequest(json, full_path, uuid, header.name, header.author, header.icon, new);
+        
+
+        const int result = scanner_post_change(json);
+        char* stringJSON = cJSON_Print(json);
+        Log("Indexing json:\n%s\n\n", stringJSON);
+        free(stringJSON);
+        Log("ccat error: %d\n", result);
+        cJSON_Delete(json);
+
+        // Run install hook AFTER index to prevent re-running on some failure modes
         if (header.useHooks) {
             Log("Script uses hooks!");
             // If the file is functional, run install hook
@@ -288,28 +306,6 @@ void index_file(char *path, char* filename, bool new) {
         free(sdr_path);
     }
 
-
-    // Create JSON objects
-    cJSON* json = cJSON_CreateObject();
-    if (!json) {
-        fprintf(stderr, "Failed to create a JSON object");
-        return;
-    }
-    
-    generateChangeRequest(json, full_path, uuid, header.name, header.author, header.icon, new);
-    
-
-    const int result = scanner_post_change(json);
-    char* stringJSON = cJSON_Print(json);
-    Log("Indexing json:\n%s\n\n", stringJSON);
-    free(stringJSON);
-    Log("ccat error: %d\n", result);
-    //printf("Json: %s\n", cJSON_Print(json));
-
-    if (json)
-    {
-        cJSON_Delete(json);
-    }
     // Can you believe that cJSON deleting causes issues
     freeScriptHeader(&header);
     free(full_path);
@@ -331,6 +327,9 @@ void remove_file(const char* path, const char* filename, char* uuid) {
         readScriptHeader(file, &header);
         fclose(file);
 
+        Log("Removing ccat entry.");
+        scanner_delete_ccat_entry(uuid);
+
         // If the file is uses hooks, run removal hook
         if (header.useHooks) {
             Log("Script uses hooks!");
@@ -363,6 +362,11 @@ void remove_file(const char* path, const char* filename, char* uuid) {
         freeScriptHeader(&header);
         Log("Removing: %s\n", sdrPath);
     }
+    else
+    {
+        Log("Removing ccat entry.");
+        scanner_delete_ccat_entry(uuid);
+    }
 
     if (access(sdrPath, R_OK|W_OK) == F_OK)
     {
@@ -372,8 +376,6 @@ void remove_file(const char* path, const char* filename, char* uuid) {
 
     free(sdrPath);
     free(sdrScriptPath);
-    Log("Removing ccat entry.");
-    scanner_delete_ccat_entry(uuid);
 }
 
 int extractor(const struct scanner_event* event) {
@@ -406,7 +408,7 @@ int extractor(const struct scanner_event* event) {
 }
 
 __attribute__((__visibility__("default"))) int load_extractor(ScannerEventHandler** handler, int *unk1) {
-    Log("sh_integration extractor v4.0.0 initialised\n");
+    Log("sh_integration extractor v4.1.0 initialised\n");
     *handler = extractor;
     *unk1 = 0;
     return 0;

launcher/main.c

@@ -160,7 +160,7 @@ LIPCcode go_callback(LIPC* lipc, const char* property, void* value, void* data)
 #ifndef LAUNCHER_TESTING
 int main(void) {
     openlog(SERVICE_NAME, LOG_CONS|LOG_NDELAY|LOG_PID, LOG_USER);
-    Log("sh_integration launcher v4.0.0");
+    Log("sh_integration launcher v4.1.0");
     LIPCcode code;
     LIPC* lipc = LipcOpenEx(SERVICE_NAME, &code);
     if (code != LIPC_OK)

meson.build

@@ -1,4 +1,4 @@
-project('sh_integration', 'c', version : '4.0.0', default_options: ['warning_level=everything', 'c_std=gnu23'])
+project('sh_integration', 'c', version : '4.1.0', default_options: ['warning_level=everything', 'c_std=gnu23'])
 
 arch = meson.get_external_property('arch', 'armhf')
 if arch == 'armhf'

readme.md

@@ -1,5 +1,5 @@
 # SH_Integration
-SH_Integration v4.0.0
+SH_Integration v4.1.0
 
 <a href='https://ko-fi.com/H2H0R8K8K' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi3.png?v=6' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>