From 981f3209e0435ebee3fc95076eaba351da3c778d Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Fri, 18 Jun 2021 21:16:38 +0100 Subject: [PATCH] ignore code 1 --- .../UploadFilesToServerUsingWebRequest.cs | 15 ++++++++++++++- src/nuget-host/Controllers/PackagesController.cs | 5 +++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs b/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs index ffbb512..ecf8a20 100644 --- a/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs +++ b/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs @@ -3,9 +3,15 @@ using System.IO; using System.Net; using System.Text; using System.Threading.Tasks; +using Newtonsoft.Json; namespace nuget_cli { + public class nugetdresp { + public int ecode {get; set; } + public string message {get; set; } + public string id { get; set; } + } public class UploadFilesToServerUsingWebRequest { @@ -83,10 +89,17 @@ namespace nuget_cli { String json = re.ReadToEnd(); report.Message = json; + + var res = JsonConvert.DeserializeObject(json); + report.AlreadyPresent = res.ecode == 1; + var hrep = resp as HttpWebResponse; report.StatusCode = hrep.StatusCode.ToString(); + // ecode == 1 => package already present server side. report.OK = hrep.StatusCode == - HttpStatusCode.Accepted || hrep.StatusCode == HttpStatusCode.OK; + HttpStatusCode.Accepted + || hrep.StatusCode == HttpStatusCode.OK + || res.ecode == 1; } else throw new Exception("Invalid server response type"); } diff --git a/src/nuget-host/Controllers/PackagesController.cs b/src/nuget-host/Controllers/PackagesController.cs index 249eb0a..a9a4e75 100644 --- a/src/nuget-host/Controllers/PackagesController.cs +++ b/src/nuget-host/Controllers/PackagesController.cs @@ -120,7 +120,8 @@ namespace nuget_host.Controllers var destdir = new DirectoryInfo(dest.DirectoryName); if (dest.Exists) { - ViewData["error"] = "existant"; + ViewData["msg"] = "existant"; + ViewData["ecode"] = 1; logger.LogWarning("400 : existant"); return BadRequest(ViewData); } @@ -180,7 +181,7 @@ namespace nuget_host.Controllers { if (string.IsNullOrEmpty(id)) { - ViewData["warn"] = "no id"; + ViewData["msg"] = "no id"; } else {