FIx Marcolin Problems

2019-05-04 20:07:54 +02:00
parent 68c088206a
commit 690eb0e4e8
5 changed files with 51 additions and 12 deletions
@@ -95,6 +95,10 @@ namespace Step.Controllers.WebApi
        [Route("upload"), HttpPost]
        public async Task<IHttpActionResult> UpdloadProgramWithImage()
        {
+
+            bool imageUploaded = false;
+            string mainPPName = "";
+
            if (!Request.Content.IsMimeMultipartContent())
            {
                throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
@@ -120,6 +124,8 @@ namespace Step.Controllers.WebApi
                        if (item.ParameterName == "main")
                        {
                            File.WriteAllBytes(TEMP_PP_FOLDER + item.FileName, item.Data);
+                            mainPPName = item.FileName;
+
                            // Upload main program
                            CmsError cmsError = ncFileHandler.UploadPartProgramAndActivate(TEMP_PP_FOLDER, item.FileName, out ActiveProgramDataModel programData);
                            if (cmsError.IsError())
@@ -137,9 +143,23 @@ namespace Step.Controllers.WebApi
                        {
                            // Upload image
                            File.WriteAllBytes(PART_PRG_IMAGES + item.FileName, item.Data);
+                            imageUploaded = true;
                        }
                    }
                }
+
+                if (!imageUploaded)
+                {
+                    mainPPName = Path.GetFileNameWithoutExtension(mainPPName);
+                    string [] imgFiles = Directory.GetFiles(PART_PRG_IMAGES);
+                    foreach(string f in imgFiles)
+                    {
+                        if(Path.GetFileNameWithoutExtension(f) == mainPPName)
+                            File.Delete(f);
+                    }
+
+                }
+
            }

            return Ok();