Adding size and last modified time support to FileEnumerator and FileUtilProxy::Entry.

base/file_util_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 
 #include <windows.h>
 #include <propvarutil.h>
 #include <psapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <time.h>
+#include <limits>

[brettw, 2011/07/13 15:51:41]

Can you add a blank line here between the C & C++ includes?

[tzik, 2011/07/14 07:05:42]

Done.

 #include <string>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/win/pe_image.h"
 #include "base/win/scoped_handle.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 863 matching lines @@
 
 bool FileEnumerator::IsDirectory(const FindInfo& info) {
   return (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
 }
 
 // static
 FilePath FileEnumerator::GetFilename(const FindInfo& find_info) {
   return FilePath(find_info.cFileName);
 }
 
+// static
+int64 FileEnumerator::GetFilesize(const FindInfo& find_info) {
+  ULARGE_INTEGER size;
+  size.HighPart = find_info.nFileSizeHigh;
+  size.LowPart = find_info.nFileSizeLow;
+  DCHECK(size.QuadPart <= std::numeric_limits<int64>::max());

[brettw, 2011/07/13 15:51:41]

I probably wouldn't bother with this check, it's not clear to me what it helps.

[tzik, 2011/07/14 07:05:42]

Out of my cowardice,  QuadPart can be greater than 2^63 in thousands years
after.

[kinuko, 2011/07/14 07:18:17]

Long live chromium...

style-nit: it'd be better to use DCHECK_LE.

[tzik, 2011/07/14 10:42:45]

Done.

+  return static_cast<int64>(size.QuadPart);
+}
+
+// static
+base::Time FileEnumerator::GetLastModifiedTime(const FindInfo& find_info) {
+  return base::Time::FromFileTime(find_info.ftLastWriteTime);
+}
+
 FilePath FileEnumerator::Next() {
   base::ThreadRestrictions::AssertIOAllowed();
 
   while (has_find_data_ || !pending_paths_.empty()) {
     if (!has_find_data_) {
       // The last find FindFirstFile operation is done, prepare a new one.
       root_path_ = pending_paths_.top();
       pending_paths_.pop();
 
       // Start a new find operation.
@@ skipping 262 matching lines @@
       uint8 unused = *(touch + offset);
       offset += step_size;
     }
     FreeLibrary(dll_module);
   }
 
   return true;
 }
 
 }  // namespace file_util