Changeset 267

Timestamp:

05/26/10 16:26:02 (21 months ago)

Author:

mickem

Message:

2010-05-25 MickeM - 0.3.8 (take 2)

! Release the new version

• Fixed issue with FILEAGE

Location:

branches/stable

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (1 diff)
• include/strEx.h (modified) (3 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (5 diffs)

branches/stable/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,8,68
-#define PRODUCTVER     0,3,8,68
-#define STRFILEVER     _T("0.3.8.68")
-#define STRPRODUCTVER  _T("0.3.8.68")
-#define STRPRODUCTDATE  _T("2010-05-17")
+#define FILEVER        0,3,8,72
+#define PRODUCTVER     0,3,8,72
+#define STRFILEVER     _T("0.3.8.72")
+#define STRPRODUCTVER  _T("0.3.8.72")
+#define STRPRODUCTDATE  _T("2010-05-25")
 #endif // AUTOBUILD_H

branches/stable/changelog

@@ -6 +6 @@
  * Fix depend onservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2010-05-25 MickeM - 0.3.8 (take 2)
+ ! Release the new version
+ * Fixed issue with FILEAGE
+
+2010-05-19 MickeM - 0.3.8
+ ! Release the new version
 
 2010-05-17 MickeM

branches/stable/include/strEx.h

@@ -202 +202 @@
     return buf;
   }
+#define MK_FORMAT_FTD(min, key, val) \
+  if (mtm->tm_year > min) \
+  strEx::replace(format, key, strEx::itos(val));  \
+  else  \
+  strEx::replace(format, key, _T("0"));
+
+
 
   static const __int64 SECS_BETWEEN_EPOCHS = 11644473600;
@@ -345 +352 @@
   }
 
-#define MK_FORMAT_FTD(min, key, val) \
-  if (mtm->tm_year > min) \
-    strEx::replace(format, key, strEx::itos(val));  \
-  else  \
-    strEx::replace(format, key, _T("0"));
-
-  inline std::wstring format_time_delta(struct tm *mtm, std::wstring format = _T("%Y years %m months %d days %H hours %M minutes")) {
-    // "Date: %Y-%m-%d %H:%M:%S"
-    MK_FORMAT_FTD(70, _T("%Y"), mtm->tm_year);
-    MK_FORMAT_FTD(0, _T("%m"), mtm->tm_mon);
-    MK_FORMAT_FTD(0, _T("%d"), mtm->tm_mday-1);
-    MK_FORMAT_FTD(0, _T("%H"), mtm->tm_hour);
-    MK_FORMAT_FTD(0, _T("%M"), mtm->tm_min);
-    MK_FORMAT_FTD(0, _T("%S"), mtm->tm_sec);
-    return format;
-  }
 
 #define WEEK  (7 * 24 * 60 * 60 * 1000)
@@ -613 +604 @@
   }
 
+  inline std::wstring format_time_delta(struct tm *mtm, std::wstring format = _T("%Y years %m months %d days %H hours %M minutes")) {
+    // "Date: %Y-%m-%d %H:%M:%S"
+    MK_FORMAT_FTD(70, _T("%Y"), mtm->tm_year);
+    MK_FORMAT_FTD(0, _T("%m"), mtm->tm_mon);
+    MK_FORMAT_FTD(0, _T("%d"), mtm->tm_mday-1);
+    MK_FORMAT_FTD(0, _T("%H"), mtm->tm_hour);
+    MK_FORMAT_FTD(0, _T("%M"), mtm->tm_min);
+    MK_FORMAT_FTD(0, _T("%S"), mtm->tm_sec);
+    return format;
+  }
+  inline std::wstring format_time_delta(time_t time, std::wstring format = _T("%Y years %m months %d days %H hours %M minutes")) {
+    struct tm nt; // = new struct tm;
+#if (_MSC_VER > 1300)  // 1300 == VC++ 7.0
+    if (gmtime_s(&nt, &time) != 0)
+      return _T("");
+#else
+    nt = gmtime(&time);
+    if (nt == NULL)
+      return "";
+#endif
+    return format_time_delta(&nt, format);
+  }
+  inline std::wstring format_filetime_delta(unsigned long long filetime, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
+    if (filetime == 0)
+      return _T("ZERO");
+    //filetime -= (SECS_BETWEEN_EPOCHS * SECS_TO_100NS);
+    filetime /= SECS_TO_100NS;
+    return format_time_delta(static_cast<time_t>(filetime), format);
+  }
 
 #ifdef _DEBUG

branches/stable/modules/CheckDisk/CheckDisk.cpp

@@ -478 +478 @@
 
   std::wstring error;
-  bool has_error;
+  //bool has_error;
 
   static file_info get(__int64 now, std::wstring path, std::wstring file) {
@@ -677 +677 @@
 };
 
+struct file_container : public file_info {
+  std::wstring error_;
+
+
+  static file_container get(std::wstring file) {
+    FILETIME now;
+    GetSystemTimeAsFileTime(&now);
+    unsigned __int64 nowi64 = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
+    return get(file, nowi64);
+  }
+
+  static file_container get(std::wstring file, unsigned long long now) {
+
+    BY_HANDLE_FILE_INFORMATION _info;
+
+    HANDLE hFile = CreateFile(file.c_str(), FILE_READ_ATTRIBUTES, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+      0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
+    if (hFile == INVALID_HANDLE_VALUE) {
+      return file_container(now, file, _T("Could not open file: ") + file);
+    }
+    GetFileInformationByHandle(hFile, &_info);
+    CloseHandle(hFile);
+    file_container info(now, _info, file);
+    //info.ullNow = now;
+    return info;
+  }
+
+
+  file_container(__int64 now, const BY_HANDLE_FILE_INFORMATION info, std::wstring file) : file_info(now, info, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
+  file_container(__int64 now, std::wstring file, std::wstring error) : error_(error), file_info(now, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
+
+  bool has_errors() {
+    return !error_.empty();
+  }
+  std::wstring get_error() {
+    return error_;
+  }
+
+};
 struct file_filter {
   filters::filter_all_numeric<unsigned long long, checkHolders::disk_size_handler<checkHolders::disk_size_type> > size;
@@ -955 +994 @@
   std::wstring path;
   bool debug = false;
-  find_first_file_info finder;
   MAP_OPTIONS_BEGIN(stl_args)
     MAP_OPTIONS_STR(_T("path"), path)
@@ -968 +1006 @@
   }
 
-  NSC_error errors;
-  pattern_type splitpath = split_pattern(path);
-  recursive_scan<find_first_file_info>(splitpath.first, splitpath.second, -1, -1, finder, &errors, debug);
-  if (errors.has_error()) {
+  file_container info = file_container::get(path);
+
+  if (!info.error_.empty()) {
     if (show_errors_)
-      message = errors.get_error();
+      message = _T("0&") + info.error_;
     else
-      message = _T("Check contains error. Check log for details (or enable show_errors in nsc.ini)");
-    return NSCAPI::returnUNKNOWN;
-  }
-  time_t value = (finder.now_-finder.info.ullLastWriteTime)/10000000;
-  message = strEx::itos(value/60) + _T("&") + strEx::format_time_delta(gmtime(&value), format);
+      message = _T("0&Check contains error. Check log for details (or enable show_errors in nsc.ini)");
+    return NSCAPI::returnUNKNOWN;
+  }
+  static const __int64 SECS_TO_100NS = 10000000;
+  time_t value = (info.ullNow-info.ullLastWriteTime)/SECS_TO_100NS;
+  message = strEx::itos(value/60) + _T("&") + strEx::format_time_delta(value, format);
   return NSCAPI::returnOK;
 }
@@ -1177 +1215 @@
   return returnCode;
 }
-struct file_container : public file_info {
-  std::wstring error_;
-
-  static file_container get(std::wstring file, unsigned long long now) {
-
-    BY_HANDLE_FILE_INFORMATION _info;
-
-    HANDLE hFile = CreateFile(file.c_str(), FILE_READ_ATTRIBUTES, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-      0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
-    if (hFile == INVALID_HANDLE_VALUE) {
-      return file_container(now, file, _T("Could not open file: ") + file);
-    }
-    GetFileInformationByHandle(hFile, &_info);
-    CloseHandle(hFile);
-    file_container info(now, _info, file);
-    //info.ullNow = now;
-    return info;
-  }
-
-
-  file_container(__int64 now, const BY_HANDLE_FILE_INFORMATION info, std::wstring file) : file_info(now, info, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
-  file_container(__int64 now, std::wstring file, std::wstring error) : error_(error), file_info(now, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
-
-  bool has_errors() {
-    return !error_.empty();
-  }
-  std::wstring get_error() {
-    return error_;
-  }
-
-};
+
 
 typedef checkHolders::ExactBounds<checkHolders::NumericBounds<checkHolders::disk_size_type, checkHolders::disk_size_handler<checkHolders::disk_size_type> > > ExactBoundsDiscSize;