Notify upload progress from batch request to its child requests.

google_apis/drive/drive_api_requests.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 "google_apis/drive/drive_api_requests.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
@@ skipping 1150 matching lines @@
 
 //========================== BatchUploadRequest ==========================
 
 BatchUploadRequest::BatchUploadRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator)
     : UrlFetchRequestBase(sender),
       sender_(sender),
       url_generator_(url_generator),
       committed_(false),
+      last_progress_value_(0),
       weak_ptr_factory_(this) {
 }
 
 BatchUploadRequest::~BatchUploadRequest() {
   for (const auto& child : child_requests_) {
     // Request will be deleted in |RequestFinished| method.
     sender_->RequestFinished(child.request);
   }
 }
 
@@ skipping 67 matching lines @@
 void BatchUploadRequest::MayCompletePrepare() {
   if (!committed_ || prepare_callback_.is_null())
     return;
   for (const auto& child : child_requests_) {
     if (!child.prepared)
       return;
   }
 
   // Build multipart body here.
   std::vector<ContentTypeAndData> parts;
-  for (const auto& child : child_requests_) {
+  for (auto& child : child_requests_) {
     std::string type;
     std::string data;
     const bool result = child.request->GetContentData(&type, &data);
     // Upload request must have content data.
     DCHECK(result);
 
     const GURL url = child.request->GetURL();
     std::string method;
     switch (child.request->GetRequestType()) {
       case net::URLFetcher::POST:
         method = "POST";
         break;
       case net::URLFetcher::PUT:
         method = "PUT";
         break;
       default:
         NOTREACHED();
         break;
     }
+    const std::string header = base::StringPrintf(
+        kBatchUploadRequestFormat, method.c_str(), url.path().c_str(),
+        url_generator_.GetBatchUploadUrl().host().c_str(), type.c_str());
+
+    child.data_offset = header.size();
+    child.data_size = data.size();
 
     parts.push_back(ContentTypeAndData());
     parts.back().type = kHttpContentType;
-    parts.back().data = base::StringPrintf(
-        kBatchUploadRequestFormat, method.c_str(), url.path().c_str(),
-        url_generator_.GetBatchUploadUrl().host().c_str(), type.c_str());
+    parts.back().data = header;
     parts.back().data.append(data);
   }
 
-  GenerateMultipartBody(MULTIPART_MIXED, boundary_, parts, &upload_content_);
+  std::vector<uint64> part_data_offset;
+  GenerateMultipartBody(MULTIPART_MIXED, boundary_, parts, &upload_content_,
+                        &part_data_offset);
+  DCHECK(part_data_offset.size() == child_requests_.size());
+  for (size_t i = 0; i < child_requests_.size(); ++i) {
+    child_requests_[i].data_offset += part_data_offset[i];
+  }
   prepare_callback_.Run(HTTP_SUCCESS);
 }
 
 bool BatchUploadRequest::GetContentData(std::string* upload_content_type,
                                         std::string* upload_content_data) {
   upload_content_type->assign(upload_content_.type);
   upload_content_data->assign(upload_content_.data);
   return true;
 }
 
@@ skipping 46 matching lines @@
 }
 
 void BatchUploadRequest::RunCallbackOnPrematureFailure(DriveApiErrorCode code) {
   for (auto child : child_requests_) {
     child.request->RunCallbackOnPrematureFailure(code);
     sender_->RequestFinished(child.request);
   }
   child_requests_.clear();
 }
 
+void BatchUploadRequest::OnURLFetchUploadProgress(const net::URLFetcher* source,
+                                                  int64 current,
+                                                  int64 total) {
+  for (auto child : child_requests_) {
+    if (child.data_offset <= current &&
+        current <= child.data_offset + child.data_size) {
+      child.request->OnURLFetchUploadProgress(
+          source, current - child.data_offset, child.data_size);
+    } else if (last_progress_value_ < child.data_offset + child.data_size &&
+               child.data_offset + child.data_size < current) {
+      child.request->OnURLFetchUploadProgress(source, child.data_size,
+                                              child.data_size);
+    }
+  }
+  last_progress_value_ = current;
+}
 }  // namespace drive
 }  // namespace google_apis