[Media Galleries] Introduce a new type for Mac Image Capture.

chrome/browser/system_monitor/media_storage_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.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
@@ skipping 16 matching lines @@
 #include "chrome/browser/system_monitor/removable_device_notifications_window_win.h"
 #endif
 
 #if defined(OS_LINUX)  // Implies OS_CHROMEOS
 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h"
 #endif
 
 using base::SystemMonitor;
 using content::BrowserThread;
 
+const char kRootPath[] = "/";
+
 namespace chrome {
 
 namespace {
 
-typedef std::vector<SystemMonitor::RemovableStorageInfo> RemovableStorageInfo;
-
 // MediaDeviceNotification.DeviceInfo histogram values.
 enum DeviceInfoHistogramBuckets {
   MASS_STORAGE_DEVICE_NAME_AND_UUID_AVAILABLE,
   MASS_STORAGE_DEVICE_UUID_MISSING,
   MASS_STORAGE_DEVICE_NAME_MISSING,
   MASS_STORAGE_DEVICE_NAME_AND_UUID_MISSING,
   MTP_STORAGE_DEVICE_NAME_AND_UUID_AVAILABLE,
   MTP_STORAGE_DEVICE_UUID_MISSING,
   MTP_STORAGE_DEVICE_NAME_MISSING,
   MTP_STORAGE_DEVICE_NAME_AND_UUID_MISSING,
   DEVICE_INFO_BUCKET_BOUNDARY
 };
 
 // Prefix constants for different device id spaces.
 const char kRemovableMassStorageWithDCIMPrefix[] = "dcim:";
 const char kRemovableMassStorageNoDCIMPrefix[] = "nodcim:";
 const char kFixedMassStoragePrefix[] = "path:";
 const char kMtpPtpPrefix[] = "mtp:";
+const char kMacImageCapture[] = "ic:";
 
 static bool (*g_test_get_device_info_from_path_function)(  // NOLINT
     const FilePath& path, std::string* device_id, string16* device_name,
     FilePath* relative_path) = NULL;
 
 void ValidatePathOnFileThread(
     const FilePath& path, const MediaStorageUtil::BoolCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file_util::PathExists(path)));
 }
 
+bool IsRemovableStorageAttached(const std::string& id) {
+  std::vector<SystemMonitor::RemovableStorageInfo> media_devices =
+      SystemMonitor::Get()->GetAttachedRemovableStorage();
+  for (std::vector<SystemMonitor::RemovableStorageInfo>::const_iterator it =
+           media_devices.begin();
+       it != media_devices.end();
+       ++it) {
+    if (it->device_id == id)
+      return true;
+  }
+  return false;
+}
+
 FilePath::StringType FindRemovableStorageLocationById(
     const std::string& device_id) {
-  RemovableStorageInfo media_devices =
+  std::vector<SystemMonitor::RemovableStorageInfo> media_devices =
       SystemMonitor::Get()->GetAttachedRemovableStorage();
-  for (RemovableStorageInfo::const_iterator it = media_devices.begin();
+  for (std::vector<SystemMonitor::RemovableStorageInfo>::const_iterator it =
+           media_devices.begin();
        it != media_devices.end();
        ++it) {
     if (it->device_id == device_id)
       return it->location;
   }
   return FilePath::StringType();
 }
 
 void FilterAttachedDevicesOnFileThread(MediaStorageUtil::DeviceIdSet* devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   MediaStorageUtil::DeviceIdSet missing_devices;
 
   for (MediaStorageUtil::DeviceIdSet::const_iterator it = devices->begin();
        it != devices->end();
        ++it) {
     MediaStorageUtil::Type type;
     std::string unique_id;
     if (!MediaStorageUtil::CrackDeviceId(*it, &type, &unique_id)) {
       missing_devices.insert(*it);
       continue;
     }
 
     if (type == MediaStorageUtil::FIXED_MASS_STORAGE) {
       if (!file_util::PathExists(FilePath::FromUTF8Unsafe(unique_id)))
         missing_devices.insert(*it);
       continue;
     }
 
-    DCHECK(type == MediaStorageUtil::MTP_OR_PTP ||
-           type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM ||
-           type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM);
-    if (FindRemovableStorageLocationById(*it).empty())
+    if (!IsRemovableStorageAttached(*it))
       missing_devices.insert(*it);
   }
 
   for (MediaStorageUtil::DeviceIdSet::const_iterator it =
            missing_devices.begin();
        it != missing_devices.end();
        ++it) {
     devices->erase(*it);
   }
 }
 
 }  // namespace
 
 // static
 std::string MediaStorageUtil::MakeDeviceId(Type type,
                                            const std::string& unique_id) {
   DCHECK(!unique_id.empty());
   switch (type) {
     case REMOVABLE_MASS_STORAGE_WITH_DCIM:
       return std::string(kRemovableMassStorageWithDCIMPrefix) + unique_id;
     case REMOVABLE_MASS_STORAGE_NO_DCIM:
       return std::string(kRemovableMassStorageNoDCIMPrefix) + unique_id;
     case FIXED_MASS_STORAGE:
       return std::string(kFixedMassStoragePrefix) + unique_id;
     case MTP_OR_PTP:
       return std::string(kMtpPtpPrefix) + unique_id;
+    case MAC_IMAGE_CAPTURE:
+      return std::string(kMacImageCapture) + unique_id;
   }
   NOTREACHED();
   return std::string();
 }
 
 // static
 bool MediaStorageUtil::CrackDeviceId(const std::string& device_id,
                                      Type* type, std::string* unique_id) {
   size_t prefix_length = device_id.find_first_of(':');
   std::string prefix = prefix_length != std::string::npos ?
                        device_id.substr(0, prefix_length + 1) : "";
 
   Type found_type;
   if (prefix == kRemovableMassStorageWithDCIMPrefix) {
     found_type = REMOVABLE_MASS_STORAGE_WITH_DCIM;
   } else if (prefix == kRemovableMassStorageNoDCIMPrefix) {
     found_type = REMOVABLE_MASS_STORAGE_NO_DCIM;
   } else if (prefix == kFixedMassStoragePrefix) {
     found_type = FIXED_MASS_STORAGE;
   } else if (prefix == kMtpPtpPrefix) {
     found_type = MTP_OR_PTP;
+  } else if (prefix == kMacImageCapture) {
+    found_type = MAC_IMAGE_CAPTURE;
   } else {
     NOTREACHED();
     return false;
   }
   if (type)
     *type = found_type;
 
   if (unique_id)
     *unique_id = device_id.substr(prefix_length + 1);
   return true;
 }
 
 // static
 bool MediaStorageUtil::IsMediaDevice(const std::string& device_id) {
   Type type;
   return CrackDeviceId(device_id, &type, NULL) &&
-      (type == REMOVABLE_MASS_STORAGE_WITH_DCIM || type == MTP_OR_PTP);
+      (type == REMOVABLE_MASS_STORAGE_WITH_DCIM || type == MTP_OR_PTP ||
+       type == MAC_IMAGE_CAPTURE);
 }
 
 // static
 bool MediaStorageUtil::IsRemovableDevice(const std::string& device_id) {
   Type type;
   return CrackDeviceId(device_id, &type, NULL) && type != FIXED_MASS_STORAGE;
 }
 
 // static
 bool MediaStorageUtil::IsMassStorageDevice(const std::string& device_id) {
   Type type;
-  return CrackDeviceId(device_id, &type, NULL) && type != MTP_OR_PTP;
+  return CrackDeviceId(device_id, &type, NULL) &&
+         (type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
+          type == REMOVABLE_MASS_STORAGE_NO_DCIM ||
+          type == FIXED_MASS_STORAGE);
 }
 
 // static
+bool MediaStorageUtil::CanCreateFileSystem(const std::string& device_id,
+                                           const FilePath& path) {
+  Type type;
+  if (!CrackDeviceId(device_id, &type, NULL))
+    return false;
+
+  if (type == MAC_IMAGE_CAPTURE)
+    return true;
+
+  return path.IsAbsolute() && !path.ReferencesParent();
+}
+
+// static
 void MediaStorageUtil::IsDeviceAttached(const std::string& device_id,
                                         const BoolCallback& callback) {
   Type type;
   std::string unique_id;
   if (!CrackDeviceId(device_id, &type, &unique_id)) {
     callback.Run(false);
     return;
   }
 
   if (type == FIXED_MASS_STORAGE) {
     // For this type, the unique_id is the path.
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                             base::Bind(&ValidatePathOnFileThread,
                                        FilePath::FromUTF8Unsafe(unique_id),
                                        callback));
   } else {
     DCHECK(type == MTP_OR_PTP ||
            type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
            type == REMOVABLE_MASS_STORAGE_NO_DCIM);
     // We should be able to find removable storage in SystemMonitor.
-    callback.Run(!FindRemovableStorageLocationById(device_id).empty());
+    callback.Run(IsRemovableStorageAttached(device_id));
   }
 }
 
 // static
 void MediaStorageUtil::FilterAttachedDevices(DeviceIdSet* devices,
                                              const base::Closure& done) {
   if (BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
     FilterAttachedDevicesOnFileThread(devices);
     done.Run();
     return;
@@ skipping 83 matching lines @@
   Type type;
   std::string unique_id;
   if (!CrackDeviceId(device_id, &type, &unique_id))
     return FilePath();
 
   if (type == FIXED_MASS_STORAGE) {
     // For this type, the unique_id is the path.
     return FilePath::FromUTF8Unsafe(unique_id);
   }
 
+  // For ImageCapture, the synthetic filesystem will be rooted at a fake
+  // top-level directory which is the device_id.
+  if (type == MAC_IMAGE_CAPTURE) {
+#if !defined(OS_WIN)
+    return FilePath(kRootPath + device_id);

[Lei Zhang, 2012/12/12 20:21:27]

I think if you make kRootPath a FilePath::StringType, then you can write:
return FilePath(kRootPath).AppendASCII(device_id);

[Greg Billock, 2012/12/12 21:12:18]

Yeah, I was looking at that, and I think the device ID will be ascii, but I
didn't want to bake in that assumption.

Ultimately, I think this'll be fixed if we can move to a metadata struct that
can carry more information so we aren't faking a path, or when we are, it's one
we know we're faking.

On 2012/12/12 20:21:27, Lei Zhang wrote:

+#endif
+  }
+
   DCHECK(type == MTP_OR_PTP ||
          type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
          type == REMOVABLE_MASS_STORAGE_NO_DCIM);
   return FilePath(FindRemovableStorageLocationById(device_id));
 }
 
 // static
 void MediaStorageUtil::RecordDeviceInfoHistogram(bool mass_storage,
                                                  const std::string& device_uuid,
                                                  const string16& device_name) {
@@ skipping 18 matching lines @@
 
 // static
 void MediaStorageUtil::SetGetDeviceInfoFromPathFunctionForTesting(
     GetDeviceInfoFromPathFunction function) {
   g_test_get_device_info_from_path_function = function;
 }
 
 MediaStorageUtil::MediaStorageUtil() {}
 
 }  // namespace chrome