Changeset 4580c6c in nscp for modules/CheckExternalScripts/CheckExternalScripts.cpp

Timestamp:

07/08/09 21:23:39 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

79f8b2c

Parents:

dcd5462

Message:

2009-07-05 MickeM

• Fixed issue with CheckExternalScripts and script_dir: not adding the commands properly.
• Fixed issue with CheckExternalScripts and script_dir: not using relative paths (#310).

2009-06-20 MickeM

• Fixed issue with CheckDisk and paths not working out properly

as well as some missing files for the build to work properly

File:

• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -25 +25 @@
 #include <config.h>
 #include <msvc_wrappers.h>
+#include <file_helpers.hpp>
 
 CheckExternalScripts gCheckExternalScripts;
@@ -38 +39 @@
 
 void CheckExternalScripts::addAllScriptsFrom(std::wstring path) {
-  std::wstring baseDir;
+  file_helpers::patterns::pattern_type pattern = file_helpers::patterns::split_pattern(path);
+  if (!file_helpers::checks::exists(pattern.first)) 
+    pattern.first = NSCModuleHelper::getBasePath() + _T("\\") + pattern.first;
+  if (!file_helpers::checks::exists(pattern.first))
+    NSC_LOG_ERROR_STD(_T("Path was not found: ") + pattern.first);
+/* TODO: do we need this?
   std::wstring::size_type pos = path.find_last_of('*');
   if (pos == std::wstring::npos) {
     path += _T("*.*");
   }
+  */
   WIN32_FIND_DATA wfd;
-  HANDLE hFind = FindFirstFile(path.c_str(), &wfd);
+  std::wstring real_path = file_helpers::patterns::combine_pattern(pattern);
+  HANDLE hFind = FindFirstFile(real_path.c_str(), &wfd);
   if (hFind != INVALID_HANDLE_VALUE) {
     do {
       if ((wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) {
-        addCommand(wfd.cFileName);
+        addCommand(wfd.cFileName, pattern.first + _T("\\") + wfd.cFileName, _T(""));
       }
     } while (FindNextFile(hFind, &wfd));
   } else {
-    NSC_LOG_ERROR_STD(_T("No scripts found in path: ") + path);
+    NSC_LOG_ERROR_STD(_T("No scripts found in path: ") + real_path);
     return;
   }