Check pt

Author: matteius

CMakeLists.txt

@@ -247,6 +247,7 @@ set(SOURCES
         ${WEB_SOURCES}
         ${ROOT_SOURCES}
         "${INIH_INCLUDE_DIR}/ini.c"
+        include/utils/strings.h
 )
 
 # Add go2rtc sources if enabled

include/utils/strings.h

@@ -0,0 +1,17 @@
+
+
+#ifndef STRINGS_H
+#define STRINGS_H
+
+#include <stdbool.h>
+
+/**
+ * Check if a string ends with a given suffix
+ *
+ * @param str The string to check
+ * @param suffix The suffix to look for
+ * @return true if the string ends with the suffix, false otherwise
+ */
+bool ends_with(const char *str, const char *suffix);
+
+#endif //STRINGS_H

src/utils/strings.c

@@ -0,0 +1,16 @@
+#include <string.h>
+#include <stdbool.h>
+
+
+bool ends_with(const char *str, const char *suffix) {
+    if (!str || !suffix)
+        return false;
+
+    size_t str_len = strlen(str);
+    size_t suffix_len = strlen(suffix);
+
+    if (suffix_len > str_len)
+        return false;
+
+    return strcmp(str + str_len - suffix_len, suffix) == 0;
+}

src/video/detection_model.c

@@ -15,6 +15,7 @@
 #include "core/config.h"
 #include "core/shutdown_coordinator.h"
 #include "utils/memory.h"  // For get_total_memory_allocated
+#include "utils/strings.h"
 #include "video/detection_model.h"
 #include "video/sod_detection.h"
 #include "video/sod_realnet.h"
@@ -310,9 +311,7 @@ detection_model_t load_detection_model(const char *model_path, float threshold)
     }
 
     // Check if this is an API URL (starts with http:// or https://) or the special "api-detection" string
-    bool is_api_url = (strncmp(model_path, "http://", 7) == 0 || 
-                      strncmp(model_path, "https://", 8) == 0 ||
-                      strcmp(model_path, "api-detection") == 0);
+    bool is_api_url = ends_with(model_path, "api-detection");
 
     // Only check file existence if it's not an API URL
     if (!is_api_url) {

src/video/detection_stream_thread.c

@@ -18,6 +18,7 @@
 #include "core/logger.h"
 #include "core/config.h"
 #include "core/shutdown_coordinator.h"
+#include "utils/strings.h"
 #include "video/detection_stream_thread.h"
 #include "video/detection_model.h"
 #include "video/sod_integration.h"
@@ -949,9 +950,7 @@ static void *stream_detection_thread_func(void *arg) {
         log_info("[Stream %s] Loading detection model: %s", thread->stream_name, thread->model_path);
 
         // Check if this is an API URL or the special "api-detection" string
-        bool is_api_detection = (strncmp(thread->model_path, "http://", 7) == 0 || 
-                               strncmp(thread->model_path, "https://", 8) == 0 ||
-                               strcmp(thread->model_path, "api-detection") == 0);
+        bool is_api_detection = ends_with(thread->model_path, "api-detection");
 
         // Only check file existence if it's not an API detection
         if (!is_api_detection) {

tests/CMakeLists.txt

@@ -51,6 +51,7 @@ set(DETECTION_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/../external/inih/ini.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../external/cjson/cJSON.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../external/mongoose/mongoose.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/utils/strings.c
 )
 
 # Define motion detection sources
@@ -215,6 +216,7 @@ set(STREAM_DETECTION_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/core/shutdown_coordinator.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/web/logger_websocket.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/utils/memory.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/utils/strings.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../external/inih/ini.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../external/cjson/cJSON.c
 )