Add path filtering to DeviceMediaFileUtil

webkit/fileapi/media/device_media_file_util.cc

 // Copyright (c) 2012 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 "webkit/fileapi/media/device_media_file_util.h"
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "webkit/blob/shareable_file_reference.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/isolated_context.h"
+#include "webkit/fileapi/media/filtering_file_enumerator.h"
 #include "webkit/fileapi/media/media_device_interface_impl.h"
 #include "webkit/fileapi/media/media_device_map_service.h"
+#include "webkit/fileapi/media/media_path_filter.h"
 
 using base::PlatformFileError;
 using base::PlatformFileInfo;
 using webkit_blob::ShareableFileReference;
 
 namespace fileapi {
 
 namespace {
 
 const FilePath::CharType kDeviceMediaFileUtilTempDir[] =
@@ skipping 34 matching lines @@
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 PlatformFileError DeviceMediaFileUtil::GetFileInfo(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     PlatformFileInfo* file_info,
     FilePath* platform_path) {
   if (!context->media_device())
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
-  return context->media_device()->GetFileInfo(url.path(), file_info);
+  PlatformFileError error =
+      context->media_device()->GetFileInfo(url.path(), file_info);
+  if (error != base::PLATFORM_FILE_OK)
+      return error;
+
+  if (file_info->is_directory ||
+      context->media_path_filter()->Match(url.path()))
+    return base::PLATFORM_FILE_OK;
+  return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 }
 
 FileSystemFileUtil::AbstractFileEnumerator*
 DeviceMediaFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     bool recursive) {
   if (!context->media_device())
     return new FileSystemFileUtil::EmptyFileEnumerator();
-  return context->media_device()->CreateFileEnumerator(url.path(), recursive);
+  return new FilteringFileEnumerator(
+      make_scoped_ptr(
+          context->media_device()->CreateFileEnumerator(url.path(), recursive)),
+      context->media_path_filter());
 }
 
 PlatformFileError DeviceMediaFileUtil::GetLocalFilePath(
     FileSystemOperationContext* context,
     const FileSystemURL& file_system_url,
     FilePath* local_file_path) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 PlatformFileError DeviceMediaFileUtil::Touch(
@@ skipping 12 matching lines @@
     const FileSystemURL& url,
     int64 length) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 bool DeviceMediaFileUtil::PathExists(
     FileSystemOperationContext* context,
     const FileSystemURL& url) {
   if (!context->media_device())
     return false;
-  return context->media_device()->PathExists(url.path());
+
+  FilePath path;
+  PlatformFileInfo file_info;
+  PlatformFileError error =
+      GetFileInfo(context, url, &file_info, &path);

[kmadhusu, 2012/08/03 23:58:47]

nit: Try to fit as much as possible in line 129.

[tzik, 2012/08/04 01:00:42]

Done.

+  return error == base::PLATFORM_FILE_OK;
 }
 
 bool DeviceMediaFileUtil::DirectoryExists(
     FileSystemOperationContext* context,
     const FileSystemURL& url) {
   if (!context->media_device())
     return false;
   return context->media_device()->DirectoryExists(url.path());
 }
 
 bool DeviceMediaFileUtil::IsDirectoryEmpty(
     FileSystemOperationContext* context,
     const FileSystemURL& url) {
   if (!context->media_device())
     return false;
-  return context->media_device()->IsDirectoryEmpty(url.path());
+
+  scoped_ptr<AbstractFileEnumerator> enumerator(
+      CreateFileEnumerator(context, url, false));
+  FilePath path;
+  while (!(path = enumerator->Next()).empty()) {
+    if (enumerator->IsDirectory() ||
+        context->media_path_filter()->Match(path))
+      return false;
+  }
+  return true;
 }
 
 PlatformFileError DeviceMediaFileUtil::CopyOrMoveFile(
     FileSystemOperationContext* context,
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     bool copy) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
@@ skipping 53 matching lines @@
                                                         file_info);
   if (*result == base::PLATFORM_FILE_OK) {
     file_ref = ShareableFileReference::GetOrCreate(
         *local_path, ShareableFileReference::DELETE_ON_FINAL_RELEASE,
         context->file_task_runner());
   }
   return file_ref;
 }
 
 }  // namespace fileapi