Revision 0daedeef trunk/Pithos.Network/CloudFilesClient.cs
b/trunk/Pithos.Network/CloudFilesClient.cs | ||
---|---|---|
1456 | 1456 |
} |
1457 | 1457 |
} |
1458 | 1458 |
|
1459 |
public void DeleteObject(string account, string sourceContainer, string objectName) |
|
1459 |
public void DeleteObject(string account, string sourceContainer, string objectName, bool isDirectory)
|
|
1460 | 1460 |
{ |
1461 | 1461 |
if (String.IsNullOrWhiteSpace(sourceContainer)) |
1462 | 1462 |
throw new ArgumentNullException("sourceContainer", "The container property can't be empty"); |
... | ... | |
1465 | 1465 |
Contract.EndContractBlock(); |
1466 | 1466 |
|
1467 | 1467 |
var targetUrl = FolderConstants.TrashContainer + "/" + objectName; |
1468 |
/* |
|
1469 |
if (isDirectory) |
|
1470 |
targetUrl = targetUrl + "?delimiter=/"; |
|
1471 |
*/ |
|
1472 |
|
|
1468 | 1473 |
var sourceUrl = String.Format("/{0}/{1}", sourceContainer, objectName); |
1469 | 1474 |
|
1470 | 1475 |
using (var client = new RestClient(_baseClient)) |
... | ... | |
1520 | 1525 |
|
1521 | 1526 |
var expectedCodes = new[] { HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created}; |
1522 | 1527 |
var result=(expectedCodes.Contains(client.StatusCode)); |
1523 |
DeleteObject(account, cloudFile.Container, fileUrl); |
|
1528 |
DeleteObject(account, cloudFile.Container, fileUrl, cloudFile.IsDirectory);
|
|
1524 | 1529 |
return result; |
1525 | 1530 |
} |
1526 | 1531 |
catch |
Also available in: Unified diff