Merge pull request #14 from ncw/range

files: Allow extra headers for file download in DownloadHeaders

Author: diwakergupta

dropbox/files/client.go

@@ -1331,6 +1331,9 @@ func (dbx *apiImpl) Download(arg *DownloadArg) (res *FileMetadata, content io.Re
 	headers := map[string]string{
 		"Dropbox-API-Arg": string(b),
 	}
+	for k, v := range arg.ExtraHeaders {
+		headers[k] = v
+	}
 	if dbx.Config.AsMemberID != "" {
 		headers["Dropbox-API-Select-User"] = dbx.Config.AsMemberID
 	}
@@ -1350,7 +1353,7 @@ func (dbx *apiImpl) Download(arg *DownloadArg) (res *FileMetadata, content io.Re
 	body := []byte(resp.Header.Get("Dropbox-API-Result"))
 	content = resp.Body
 	dbx.Config.TryLog("body: %v", body)
-	if resp.StatusCode == http.StatusOK {
+	if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusPartialContent {
 		err = json.Unmarshal(body, &res)
 		if err != nil {
 			return

dropbox/files/types.go

@@ -739,6 +739,8 @@ type DownloadArg struct {
 	Path string `json:"path"`
 	// Rev : Deprecated. Please specify revision in `path` instead.
 	Rev string `json:"rev,omitempty"`
+	// ExtraHeaders can be used to pass Range, If-None-Match headers
+	ExtraHeaders map[string]string `json:"-"`
 }
 
 // NewDownloadArg returns a new DownloadArg instance

generator/go_client.stoneg.py

@@ -90,7 +90,10 @@ def _generate_route(self, namespace, route):
             self._generate_request(namespace, route)
             self._generate_post()
             self._generate_response(route)
-            with self.block('if resp.StatusCode == http.StatusOK'):
+            ok_check = 'if resp.StatusCode == http.StatusOK'
+            if fn == "Download":
+                ok_check += ' || resp.StatusCode == http.StatusPartialContent'
+            with self.block(ok_check):
                 self._generate_result(route)
             self._generate_error_handling(route)
 
@@ -128,6 +131,8 @@ def _generate_request(self, namespace, route):
         for k, v in sorted(headers.items()):
             out('\t"{}": {},'.format(k, v))
         out('}')
+        if fmt_var(route.name) == "Download":
+            out('for k, v := range arg.ExtraHeaders { headers[k] = v }')
         if auth != 'noauth' and auth != 'team':
             with self.block('if dbx.Config.AsMemberID != ""'):
                 out('headers["Dropbox-API-Select-User"] = dbx.Config.AsMemberID')

generator/go_types.stoneg.py

@@ -86,7 +86,9 @@ def _generate_struct(self, struct):
                 self.emit(fmt_type(struct.parent_type, struct.namespace).lstrip('*'))
             for field in struct.fields:
                 self._generate_field(field, namespace=struct.namespace)
-            self.emit()
+            if struct.name in ('DownloadArg',):
+                self.emit('// ExtraHeaders can be used to pass Range, If-None-Match headers')
+                self.emit('ExtraHeaders map[string]string `json:"-"`')
         self._generate_struct_builder(struct)
 
     def _generate_struct_builder(self, struct):