Fixed upload issue

VenusInterns · Sep 11, 2017 · 835a4b7 · 835a4b7
1 parent 786ff82
commit 835a4b7
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/BlogTemplate/Models/BlogDataStore.cs b/BlogTemplate/Models/BlogDataStore.cs
@@ -356,10 +356,13 @@ public void SaveFiles(List<IFormFile> files)
                 {
                     using (Stream uploadedFileStream = file.OpenReadStream())
                     {
-                        string name = file.FileName;
+                        string name = Path.GetFileName(file.FileName);
+                        string filePath = Path.Combine(UploadsFolder, name);
+
                         if(CheckFileNameExists(name))
                         {
-                            _fileSystem.DeleteFile($"{UploadsFolder}\\{name}");
+                            _fileSystem.DeleteFile(filePath);
+                            continue;
                         }
 
                         byte[] buffer = new byte[1024];
@@ -371,7 +374,7 @@ public void SaveFiles(List<IFormFile> files)
                             {
                                 break;
                             }
-                            _fileSystem.AppendFile($"{UploadsFolder}\\{name}", buffer, 0, bytesRead);
+                            _fileSystem.AppendFile(filePath, buffer, 0, bytesRead);
                         } while (bytesRead > 0);
                     }
                 }
@@ -384,21 +387,9 @@ public IEnumerable<string> GetFileNames()
             return fileNames;
         }
 
-        private bool CheckFileNameExists(string fileName)
-        {
-            return _fileSystem.FileExists($"{UploadsFolder}\\{fileName}");
-        }
-
-        private string CreateFileName(string fileName)
+        private bool CheckFileNameExists(string filePath)
         {
-            string tempName = fileName;
-            string shortName = Path.GetFileNameWithoutExtension(fileName);
-            string ext = Path.GetExtension(fileName);
-            for(int i = 1; CheckFileNameExists(tempName); i++)
-            {
-                tempName = $"{shortName}-{i}{ext}";
-            }
-            return tempName;
+            return _fileSystem.FileExists(filePath);
         }
     }
 }