Change media galleries to external file system type to add toURL support

chrome/browser/media_galleries/fileapi/picasa_file_util.cc

 // Copyright 2013 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 "chrome/browser/media_galleries/fileapi/picasa_file_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 31 matching lines @@
 
   if (it == map->end())
     return base::File::FILE_ERROR_NOT_FOUND;
 
   if (album_info != NULL)
     *album_info = it->second;
 
   return base::File::FILE_OK;
 }
 
+std::vector<std::string> GetVirtualPathComponents(

[Lei Zhang, 2014/03/26 17:50:11]

Might be nice to merge the 3 version of this somehow after M35.

[vandebo (ex-Chrome), 2014/03/26 23:25:24]

Yea, there's a general todo to refactor the file utils for these three types to
share code.

+    const fileapi::FileSystemURL& url) {
+  ImportedMediaGalleryRegistry* imported_registry =
+      ImportedMediaGalleryRegistry::GetInstance();
+  base::FilePath root = imported_registry->ImportedRoot().Append("picasa");
+
+  DCHECK(root.IsParent(url.path()));
+  base::FilePath virtual_path;
+  root.AppendRelativePath(url.path(), &virtual_path);
+
+  std::vector<std::string> result;
+  fileapi::VirtualPath::GetComponentsUTF8Unsafe(virtual_path, &result);
+  return result;
+}
+
 PicasaDataProvider::DataType GetDataTypeForURL(
     const fileapi::FileSystemURL& url) {
-  std::vector<std::string> components;
-  fileapi::VirtualPath::GetComponentsUTF8Unsafe(url.path(), &components);
-
+  std::vector<std::string> components = GetVirtualPathComponents(url);
   if (components.size() >= 2 && components[0] == kPicasaDirAlbums)
     return PicasaDataProvider::ALBUMS_IMAGES_DATA;
 
   return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA;
 }
 
 }  // namespace
 
 const char kPicasaDirAlbums[]  = "albums";
 const char kPicasaDirFolders[] = "folders";
@@ skipping 33 matching lines @@
 
 base::File::Error PicasaFileUtil::GetFileInfoSync(
     FileSystemOperationContext* context, const FileSystemURL& url,
     base::File::Info* file_info, base::FilePath* platform_path) {
   DCHECK(context);
   DCHECK(file_info);
 
   if (platform_path)
     *platform_path = base::FilePath();
 
-  std::vector<std::string> components;
-  fileapi::VirtualPath::GetComponentsUTF8Unsafe(url.path(), &components);
+  std::vector<std::string> components = GetVirtualPathComponents(url);
 
   switch (components.size()) {
     case 0:
       // Root directory.
       file_info->is_directory = true;
       return base::File::FILE_OK;
     case 1:
       if (components[0] == kPicasaDirAlbums ||
           components[0] == kPicasaDirFolders) {
         file_info->is_directory = true;
@@ skipping 47 matching lines @@
   base::FilePath platform_directory_path;
   base::File::Error error = GetFileInfoSync(
       context, url, &file_info, &platform_directory_path);
 
   if (error != base::File::FILE_OK)
     return error;
 
   if (!file_info.is_directory)
     return base::File::FILE_ERROR_NOT_A_DIRECTORY;
 
-  std::vector<std::string> components;
-  fileapi::VirtualPath::GetComponentsUTF8Unsafe(url.path(), &components);
-
+  std::vector<std::string> components = GetVirtualPathComponents(url);
   switch (components.size()) {
     case 0: {
       // Root directory.
       file_list->push_back(
           DirectoryEntry(kPicasaDirAlbums, DirectoryEntry::DIRECTORY, 0,
                          base::Time()));
       file_list->push_back(
           DirectoryEntry(kPicasaDirFolders, DirectoryEntry::DIRECTORY, 0,
                          base::Time()));
       break;
@@ skipping 84 matching lines @@
     fileapi::FileSystemOperationContext* context,
     const fileapi::FileSystemURL& url) {
   return base::File::FILE_ERROR_SECURITY;
 }
 
 base::File::Error PicasaFileUtil::GetLocalFilePath(
     FileSystemOperationContext* context, const FileSystemURL& url,
     base::FilePath* local_file_path) {
   DCHECK(local_file_path);
   DCHECK(url.is_valid());
-  std::vector<std::string> components;
-  fileapi::VirtualPath::GetComponentsUTF8Unsafe(url.path(), &components);
+  std::vector<std::string> components = GetVirtualPathComponents(url);
 
   switch (components.size()) {
     case 2:
       if (components[0] == kPicasaDirFolders) {
         scoped_ptr<AlbumMap> album_map = GetDataProvider()->GetFolders();
         AlbumInfo album_info;
         base::File::Error error =
             FindAlbumInfo(components[1], album_map.get(), &album_info);
         if (error != base::File::FILE_OK)
           return error;
@@ skipping 26 matching lines @@
 
       if (components[0] == kPicasaDirFolders) {
         scoped_ptr<AlbumMap> album_map = GetDataProvider()->GetFolders();
         AlbumInfo album_info;
         base::File::Error error =
             FindAlbumInfo(components[1], album_map.get(), &album_info);
         if (error != base::File::FILE_OK)
           return error;
 
         // Not part of this class's mandate to check that it actually exists.
-        *local_file_path = album_info.path.Append(url.path().BaseName());
+        *local_file_path = album_info.path.Append(components[2]);
         return base::File::FILE_OK;
       }
 
       return base::File::FILE_ERROR_NOT_FOUND;
       break;
   }
 
   // All other cases don't have a local path. The valid cases should be
   // intercepted by GetFileInfo()/CreateFileEnumerator(). Invalid cases
   // return a NOT_FOUND error.
@@ skipping 30 matching lines @@
   }
   NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread(
       context.Pass(), url, callback);
 }
 
 PicasaDataProvider* PicasaFileUtil::GetDataProvider() {
   return ImportedMediaGalleryRegistry::PicasaDataProvider();
 }
 
 }  // namespace picasa