@@ -120,8 +120,9 @@ public RestRequest(Uri resource, Method method)
120
120
/// </summary>
121
121
/// <param name="name">The parameter name to use in the request</param>
122
122
/// <param name="path">Full path to file to upload</param>
123
+ /// <param name="contentType">The MIME type of the file to upload</param>
123
124
/// <returns>This request</returns>
124
- public IRestRequest AddFile ( string name , string path )
125
+ public IRestRequest AddFile ( string name , string path , string contentType = null )
125
126
{
126
127
FileInfo f = new FileInfo ( path ) ;
127
128
long fileLength = f . Length ;
@@ -137,76 +138,24 @@ public IRestRequest AddFile(string name, string path)
137
138
{
138
139
file . BaseStream . CopyTo ( s ) ;
139
140
}
140
- }
141
+ } ,
142
+ ContentType = contentType
141
143
} ) ;
142
144
}
143
145
144
- /// <summary>
145
- /// Adds a file to the Files collection to be included with a POST or PUT request with the specified content type
146
- /// (other methods do not support file uploads).
147
- /// </summary>
148
- /// <param name="name">The parameter name to use in the request</param>
149
- /// <param name="path">Full path to file to upload</param>
150
- /// <param name="contentType">The MIME type of the file to upload</param>
151
- /// <returns>This request</returns>
152
- public IRestRequest AddFile ( string name , string path , string contentType )
153
- {
154
- FileInfo f = new FileInfo ( path ) ;
155
- long fileLength = f . Length ;
156
-
157
- return AddFile ( new FileParameter
158
- {
159
- Name = name ,
160
- FileName = Path . GetFileName ( path ) ,
161
- ContentLength = fileLength ,
162
- Writer = s =>
163
- {
164
- using ( var file = new StreamReader ( path ) )
165
- {
166
- file . BaseStream . CopyTo ( s ) ;
167
- }
168
- } ,
169
- ContentType = contentType
170
- } ) ;
171
- }
172
-
173
146
/// <summary>
174
147
/// Adds the bytes to the Files collection with the specified file name
175
148
/// </summary>
176
149
/// <param name="name">The parameter name to use in the request</param>
177
150
/// <param name="bytes">The file data</param>
178
151
/// <param name="fileName">The file name to use for the uploaded file</param>
179
- /// <returns>This request</returns>
180
- public IRestRequest AddFile ( string name , byte [ ] bytes , string fileName )
181
- {
182
- return this . AddFile ( FileParameter . Create ( name , bytes , fileName ) ) ;
183
- }
184
-
185
- /// <summary>
186
- /// Adds the bytes to the Files collection with the specified file name and content type
187
- /// </summary>
188
- /// <param name="name">The parameter name to use in the request</param>
189
- /// <param name="bytes">The file data</param>
190
- /// <param name="fileName">The file name to use for the uploaded file</param>
191
152
/// <param name="contentType">The MIME type of the file to upload</param>
192
153
/// <returns>This request</returns>
193
- public IRestRequest AddFile ( string name , byte [ ] bytes , string fileName , string contentType )
154
+ public IRestRequest AddFile ( string name , byte [ ] bytes , string fileName , string contentType = null )
194
155
{
195
156
return this . AddFile ( FileParameter . Create ( name , bytes , fileName , contentType ) ) ;
196
157
}
197
158
198
- /// <summary>
199
- /// Adds the bytes to the Files collection with the specified file name and content type
200
- /// </summary>
201
- /// <param name="name">The parameter name to use in the request</param>
202
- /// <param name="writer">A function that writes directly to the stream. Should NOT close the stream.</param>
203
- /// <param name="fileName">The file name to use for the uploaded file</param>
204
- /// <returns>This request</returns>
205
- public IRestRequest AddFile ( string name , Action < Stream > writer , string fileName )
206
- {
207
- return this . AddFile ( name , writer , fileName , null ) ;
208
- }
209
-
210
159
/// <summary>
211
160
/// Adds the bytes to the Files collection with the specified file name and content type
212
161
/// </summary>
@@ -215,7 +164,7 @@ public IRestRequest AddFile(string name, Action<Stream> writer, string fileName)
215
164
/// <param name="fileName">The file name to use for the uploaded file</param>
216
165
/// <param name="contentType">The MIME type of the file to upload</param>
217
166
/// <returns>This request</returns>
218
- public IRestRequest AddFile ( string name , Action < Stream > writer , string fileName , string contentType )
167
+ public IRestRequest AddFile ( string name , Action < Stream > writer , string fileName , string contentType = null )
219
168
{
220
169
return AddFile ( new FileParameter
221
170
{
0 commit comments