clean up

Author: MrAMS

.clang-tidy

@@ -14,6 +14,8 @@ Checks: >
     -readability-uppercase-literal-suffix,
     -readability-simplify-boolean-expr,
     -readability-math-missing-parentheses,
+    -readability-braces-around-statements,
+    -readability-isolate-declaration,
     clang-analyzer-*,
     -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
     performance-*,

tools/mtmd/CMakeLists.txt

@@ -39,6 +39,11 @@ if (MTMD_WITH_FFMPEG)
     endif()
 endif()
 
+option(MTMD_MAX_VIDEO_FRAMES_SMALL "Set a small number of frames for fast test locally" OFF)
+if(MTMD_MAX_VIDEO_FRAMES_SMALL)
+    target_compile_definitions(mtmd PRIVATE MTMD_MAX_VIDEO_FRAMES_SMALL)
+endif()
+
 if (BUILD_SHARED_LIBS)
     set_target_properties     (mtmd PROPERTIES POSITION_INDEPENDENT_CODE ON)
     target_compile_definitions(mtmd PRIVATE LLAMA_BUILD)

tools/mtmd/mtmd-cli.cpp

@@ -153,8 +153,8 @@ struct mtmd_cli_context {
         );
     }
 
-    bool load_media(const std::string & fname) {
-        mtmd::bitmap bmp(mtmd_helper_bitmap_init_from_file(ctx_vision.get(), fname.c_str()));
+    bool load_media(const std::string & path) {
+        mtmd::bitmap bmp(mtmd_helper_bitmap_init_from_file(ctx_vision.get(), path.c_str()));
         if (!bmp.ptr) {
             return false;
         }

tools/mtmd/mtmd-helper.cpp

@@ -5,6 +5,10 @@
 #   define NOMINMAX
 #endif
 #include <windows.h>
+#else
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #endif
 
 #include "mtmd.h"
@@ -442,16 +446,16 @@ mtmd_bitmap * mtmd_helper_bitmap_init_from_buf(mtmd_context * ctx, const unsigne
     return result;
 }
 
-mtmd_bitmap * mtmd_helper_bitmap_init_from_file(mtmd_context * ctx, const char * fname) {
+mtmd_bitmap * mtmd_helper_bitmap_init_from_file(mtmd_context * ctx, const char * path) {
     // although we could read the file into memory and call mtmd_helper_bitmap_init_from_buf,
     // but for video files, it's better to let ffmpeg read from file
-    if(mtmd_video::is_video_file(fname)){
-        return mtmd_video::init_video_bitmap(ctx, fname);
+    if(mtmd_video::is_video_file(path) || mtmd_helper::is_dir(path)){
+        return mtmd_video::init_video_bitmap(ctx, path);
     }
 
-    FILE * f = fopen(fname, "rb");
+    FILE * f = fopen(path, "rb");
     if (!f) {
-        LOG_ERR("Unable to open file %s: %s\n", fname, strerror(errno));
+        LOG_ERR("Unable to open path %s: %s\n", path, strerror(errno));
         return nullptr;
     }
 
@@ -463,11 +467,76 @@ mtmd_bitmap * mtmd_helper_bitmap_init_from_file(mtmd_context * ctx, const char *
     size_t n_read = fread(buf, 1, file_size, f);
     fclose(f);
     if (n_read != (size_t)file_size) {
-        LOG_ERR("Failed to read entire file %s", fname);
+        LOG_ERR("Failed to read entire path %s", path);
         return nullptr;
     }
 
     auto * res = mtmd_helper_bitmap_init_from_buf(ctx, buf, file_size);
     delete [] buf;
     return res;
 }
+
+namespace mtmd_helper{
+
+bool has_image_ext(const std::string & name) {
+    auto lower = name;
+    std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c){ return (char)std::tolower(c); });
+    return lower.rfind(".jpg")  != std::string::npos ||
+           lower.rfind(".jpeg") != std::string::npos ||
+           lower.rfind(".png")  != std::string::npos ||
+           lower.rfind(".bmp")  != std::string::npos ||
+           lower.rfind(".gif")  != std::string::npos ||
+           lower.rfind(".webp") != std::string::npos;
+}
+
+bool is_dir(const std::string & path) {
+#if defined(_WIN32)
+    DWORD attrs = GetFileAttributesA(path.c_str());
+    return (attrs != INVALID_FILE_ATTRIBUTES) && (attrs & FILE_ATTRIBUTE_DIRECTORY);
+#else
+    struct stat st;
+    if (stat(path.c_str(), &st) != 0) return false;
+    return S_ISDIR(st.st_mode);
+#endif
+}
+
+void list_files(const std::string & dir, std::vector<std::string> & out, bool recursive) {
+#if defined(_WIN32)
+    std::string pattern = dir;
+    if (!pattern.empty() && pattern.back() != '/' && pattern.back() != '\\') pattern += "\\";
+    pattern += "*";
+    WIN32_FIND_DATAA ffd;
+    HANDLE hFind = FindFirstFileA(pattern.c_str(), &ffd);
+    if (hFind == INVALID_HANDLE_VALUE) return;
+    do {
+        std::string name = ffd.cFileName;
+        if (name == "." || name == "..") continue;
+        std::string path = dir;
+        if (!path.empty() && path.back() != '/' && path.back() != '\\') path += "\\";
+        path += name;
+        if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+            if (recursive) list_files(path, out, recursive);
+        } else {
+            out.push_back(path);
+        }
+    } while (FindNextFileA(hFind, &ffd) != 0);
+    FindClose(hFind);
+#else
+    DIR * dp = opendir(dir.c_str());
+    if (!dp) return;
+    struct dirent * de;
+    while ((de = readdir(dp)) != nullptr) {
+        std::string name = de->d_name;
+        if (name == "." || name == "..") continue;
+        std::string path = dir + "/" + name;
+        if (is_dir(path)) {
+            if (recursive) list_files(path, out, recursive);
+        } else {
+            out.push_back(path);
+        }
+    }
+    closedir(dp);
+#endif
+}
+
+}

tools/mtmd/mtmd-helper.h

@@ -24,7 +24,7 @@ extern "C" {
 // it calls mtmd_helper_bitmap_init_from_buf() internally
 // returns nullptr on failure
 // this function is thread-safe
-MTMD_API mtmd_bitmap * mtmd_helper_bitmap_init_from_file(mtmd_context * ctx, const char * fname);
+MTMD_API mtmd_bitmap * mtmd_helper_bitmap_init_from_file(mtmd_context * ctx, const char * path);
 
 // helper function to construct a mtmd_bitmap from a buffer containing a file
 // supported formats:
@@ -88,4 +88,10 @@ MTMD_API int32_t mtmd_helper_decode_image_chunk(mtmd_context * ctx,
 // C++ wrappers
 //
 
+namespace mtmd_helper{
+    bool has_image_ext(const std::string & name);
+    bool is_dir(const std::string & path);
+    void list_files(const std::string & dir, std::vector<std::string> & out, bool recursive);
+}
+
 #endif