ExifTool:

* Add an extra check if a file is a directory

Author: PolarGoose

src/DOpusScriptingExtensions/ExifTool/ExifTool.h

@@ -21,8 +21,8 @@ class ATL_NO_VTABLE CExifTool :
   } CATCH_ALL_EXCEPTIONS()
 
   STDMETHOD(GetInfoAsJson)(BSTR fileFullName, IDispatch* tagNamesJsArray, BSTR* infoAsJson) override try {
-   *infoAsJson = Copy(ToWide(
-     exifToolWrapper->GetTagInfosJson(fileFullName, ToUtf8StringVector(JsStringArrayToVector(tagNamesJsArray)))));
+    *infoAsJson = Copy(
+      exifToolWrapper->GetTagInfosJson(fileFullName, ToUtf8StringVector(JsStringArrayToVector(tagNamesJsArray))));
     return S_OK;
   } CATCH_ALL_EXCEPTIONS()
 

src/DOpusScriptingExtensions/ExifTool/ExifToolWrapper.h

@@ -28,12 +28,17 @@ class ExifToolWrapper : NonCopyableAndNonMovable {
   //    },   
   //    ...
   //   }]
-  std::string GetTagInfosJson(std::wstring_view filePath, const std::vector<std::string>& tagNames) {
+  std::wstring GetTagInfosJson(std::wstring_view filePath, const std::vector<std::string>& tagNames) {
     if (!std::filesystem::exists(filePath))
     {
       THROW_WEXCEPTION(L"File not found '{}'", filePath);
     }
 
+    if (std::filesystem::is_directory(filePath))
+    {
+      THROW_WEXCEPTION(L"File is a directory '{}'", filePath);
+    }
+
     ioCtx.restart();
 
     boost::asio::write(stdInPipe, boost::asio::buffer(
@@ -47,12 +52,12 @@ class ExifToolWrapper : NonCopyableAndNonMovable {
 
     ioCtx.run();
 
-    const std::string stdErr = std::string{ static_cast<const char*>(errBuf.data().data()), errBuf.size() - readyErrStr.size() };
+    const auto& stdErr = ToWide({ GetData(errBuf), errBuf.size() - readyErrStr.size() });
     if (!stdErr.empty()) {
-      THROW_WEXCEPTION(L"ExifTool.exe failed to get information from the file: '{}'. Error message: {}", filePath, ToWide(stdErr));
+      THROW_WEXCEPTION(L"ExifTool.exe failed to get information from the file: '{}'. Error message: {}", filePath, stdErr);
     }
 
-    return { static_cast<const char*>(outBuf.data().data()), outBuf.size() - readyStr.size() };
+    return ToWide({ GetData(outBuf), outBuf.size() - readyStr.size() });
   }
 
 private:

src/DOpusScriptingExtensions/ProcessRunner/ProcessRunner.h

@@ -79,8 +79,8 @@ class ATL_NO_VTABLE CProcessRunner :
 
     const auto& exitCode = proc.wait();
 
-    return { ToWide({ static_cast<const char*>(outBuffer.data().data()), outBuffer.size() }),
-             ToWide({ static_cast<const char*>(errBuffer.data().data()), errBuffer.size() }),
+    return { ToWide({ GetData(outBuffer), outBuffer.size() }),
+             ToWide({ GetData(errBuffer), errBuffer.size() }),
             exitCode };
   }
 };

src/DOpusScriptingExtensions/Utils/StringUtils.h

@@ -19,6 +19,10 @@ inline std::vector<std::string> ToUtf8StringVector(const std::vector<std::wstrin
   return std::vector<std::string>(transformed.begin(), transformed.end());
 }
 
+inline const char* GetData(const boost::asio::streambuf& buf) {
+  return static_cast<const char*>(buf.data().data());
+}
+
 // Allow std::format(L"..") to format std::filesystem::path and boost::filesystem::path
 namespace std {
   template <>

src/Test/test.js

@@ -526,6 +526,11 @@ function ExifTool_throws_if_file_not_found() {
   assertStringContains(res, "File not found 'C:/non_existent_file'")
 }
 
+function ExifTool_throws_if_file_is_a_directory() {
+  var res = assertThrows(function () { exifTool.GetInfoAsJson("C:/Windows") })
+  assertStringContains(res, "File is a directory 'C:/Windows'")
+}
+
 function ExifTool_can_get_all_tags() {
   var json = exifTool.GetInfoAsJson("C:/Windows/SystemResources/Windows.UI.SettingsAppThreshold/SystemSettings/Assets/HDRSample.mkv")
 
@@ -562,6 +567,15 @@ function ExifTool_if_specific_tag_does_not_exists_it_is_ignored() {
   assertStringDoesNotContain(json, 'NonExistentTagName')
 }
 
+function ExifTool_throws_if_tags_have_wrong_format() {
+  var res = assertThrows(function () {
+    exifTool.GetInfoAsJson(
+      "C:/Windows/SystemResources/Windows.UI.SettingsAppThreshold/SystemSettings/Assets/HDRSample.mkv",
+      ["TrackType", 1, "NonExistentTagName"])
+  })
+  assertStringContains(res, "the element with the index 1 is not a string but a variant type #3")
+}
+
 function ExifTool_returns_empty_string_if_file_does_not_have_specified_tags() {
   var json = exifTool.GetInfoAsJson(
     "C:/Windows/SystemResources/Windows.UI.SettingsAppThreshold/SystemSettings/Assets/HDRSample.mkv",
@@ -651,9 +665,11 @@ runTest(MediaInfoRetriever_can_open_media_file)
 runTest(MediaInfoRetriever_can_close_file)
 
 runTest(ExifTool_throws_if_file_not_found)
+runTest(ExifTool_throws_if_file_is_a_directory)
 runTest(ExifTool_can_get_all_tags)
 runTest(ExifTool_can_get_specific_tags)
 runTest(ExifTool_if_specific_tag_does_not_exists_it_is_ignored)
+runTest(ExifTool_throws_if_tags_have_wrong_format)
 runTest(ExifTool_returns_no_tags_if_file_does_not_have_specified_tags)
 runTest(ExifTool_works_with_file_names_containing_unicode_characters)
 runTest(ExifTool_can_parse_json)