@@ -25,8 +25,6 @@ namespace Fossology.Rest.Dotnet
25
25
26
26
using RestSharp ;
27
27
28
- using Tethys . Logging ;
29
-
30
28
using JsonSerializer = RestSharp . Serialization . Json . JsonSerializer ;
31
29
32
30
/// <summary>
@@ -277,20 +275,29 @@ public bool IsUploadUnpacked(int id)
277
275
NullValueHandling = NullValueHandling . Ignore ,
278
276
} ) ;
279
277
280
- return jobs . All ( job => job . Status == "Completed" ) ;
278
+ return jobs != null && jobs . All ( job => job . Status == "Completed" ) ;
281
279
} // IsUploadUnpacked()
282
280
283
281
/// <summary>
284
282
/// Gets the upload with the specified id.
285
283
/// </summary>
286
284
/// <param name="id">The identifier.</param>
285
+ /// <param name="groupName">The group name to choose.</param>
287
286
/// <returns>A <see cref="Upload"/> object.</returns>
288
- public Upload GetUpload ( int id )
287
+ public Upload GetUpload ( int id , string groupName = "" )
289
288
{
290
289
Log . Debug ( $ "Getting upload { id } ...") ;
291
290
292
- var response = this . api . Get ( this . Url + $ "/uploads/{ id } ", true ) ;
291
+ var request = new RestRequest ( this . Url + $ "/uploads/{ id } ", Method . GET ) ;
292
+ request . RequestFormat = DataFormat . Json ;
293
+ request . JsonSerializer = new JsonSerializer ( ) ;
294
+ request . Parameters . Clear ( ) ;
295
+ if ( ! string . IsNullOrEmpty ( groupName ) )
296
+ {
297
+ request . AddHeader ( "groupName" , groupName ) ;
298
+ } // if
293
299
300
+ var response = this . api . Execute ( request ) ;
294
301
if ( response . StatusCode == HttpStatusCode . OK )
295
302
{
296
303
var upload = JsonConvert . DeserializeObject < Upload > (
@@ -316,12 +323,22 @@ public Upload GetUpload(int id)
316
323
/// Gets the summary for the upload with the specified id.
317
324
/// </summary>
318
325
/// <param name="id">The identifier.</param>
326
+ /// <param name="groupName">The group name to choose.</param>
319
327
/// <returns>A <see cref="UploadSummary"/> object.</returns>
320
- public UploadSummary GetUploadSummary ( int id )
328
+ public UploadSummary GetUploadSummary ( int id , string groupName = "" )
321
329
{
322
330
Log . Debug ( $ "Getting upload summary { id } ...") ;
323
331
324
- var response = this . api . Get ( this . Url + $ "/uploads/{ id } /summary") ;
332
+ var request = new RestRequest ( this . Url + $ "/uploads/{ id } /summary", Method . GET ) ;
333
+ request . RequestFormat = DataFormat . Json ;
334
+ request . JsonSerializer = new JsonSerializer ( ) ;
335
+ request . Parameters . Clear ( ) ;
336
+ if ( ! string . IsNullOrEmpty ( groupName ) )
337
+ {
338
+ request . AddHeader ( "groupName" , groupName ) ;
339
+ } // if
340
+
341
+ var response = this . api . Execute ( request ) ;
325
342
var summary = JsonConvert . DeserializeObject < UploadSummary > (
326
343
response . Content ,
327
344
new JsonSerializerSettings
0 commit comments