move to uploads

qdraw · Feb 15, 2018 · 76b6860 · 76b6860
1 parent 56a1f82
commit 76b6860
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -286,3 +286,7 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+
+uploads/*
+Thumbs.db
diff --git a/theiacore/theiacore/Controllers/ApiController.cs b/theiacore/theiacore/Controllers/ApiController.cs
@@ -25,7 +25,7 @@ public ApiController(IHostingEnvironment hostingEnvironment)
         }
 
 
-        public async Task<IActionResult> Post(List<IFormFile> files)
+        /*public async Task<IActionResult> Post(List<IFormFile> files)
         {
             long size = files.Sum(f => f.Length);
 
@@ -47,7 +47,7 @@ public async Task<IActionResult> Post(List<IFormFile> files)
             // Don't rely on or trust the FileName property without validation.
 
             return Ok(new {count = files.Count, size, filePath});
-        }
+        }*/
 
         [HttpPost]
         [ValidateAntiForgeryToken]
@@ -64,23 +64,25 @@ public async Task<IActionResult> UploadFile(IFormFile file)
                 return BadRequest("file not selected");
 
             var path = Path.Combine(
-                Directory.GetCurrentDirectory(),
+                Directory.GetCurrentDirectory(),"uploads",
                 guid);
 
+            Console.WriteLine(path);
+
             using (var stream = new FileStream(path, FileMode.Create))
             {
                 await file.CopyToAsync(stream);
             }
 
-            using (Image img = Image.FromFile(guid))
+            using (Image img = Image.FromFile(path))
             {
                 if (!img.RawFormat.Equals(System.Drawing.Imaging.ImageFormat.Jpeg))
                 {
                     return BadRequest("wrong format");
                 }
             }
 
-            return Json(GetTensorObject.GetJsonFormat(guid));
+            return Json(GetTensorObject.GetJsonFormat(path));
         }
 
 
@@ -97,20 +99,21 @@ public async Task<IActionResult> Upload()
             // todo: check apikey
 
             var guid = DateTime.UtcNow.ToString("yyyyddMM_HHmmss__") + Guid.NewGuid().ToString().Substring(0, 20) + ".jpg";
-            using (var stream = System.IO.File.Create(Path.Combine(_hostingEnvironment.ContentRootPath, guid)))
+            var path = Path.Combine(_hostingEnvironment.ContentRootPath, "uploads", guid);
+            using (var stream = System.IO.File.Create(path))
             {
                 await Request.StreamFile(stream);
             }
 
-            using (Image img = Image.FromFile(guid))
+            using (Image img = Image.FromFile(path))
             {
                 if (!img.RawFormat.Equals(System.Drawing.Imaging.ImageFormat.Jpeg))
                 {
                     return BadRequest("wrong format");
                 }
             }
 
-            var tensorObject = GetTensorObject.GetJsonFormat(guid);
+            var tensorObject = GetTensorObject.GetJsonFormat(path);
 
             if (IsKeyOptOutAnalytics(Request))
             {

diff --git a/theiacore/theiacore/Startup.cs b/theiacore/theiacore/Startup.cs
@@ -26,7 +26,14 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMvc();
             services.AddSingleton<IFileProvider>(
                 new PhysicalFileProvider(
-                    Path.Combine(Directory.GetCurrentDirectory(), "wwwroot")));
+                    Path.Combine(Directory.GetCurrentDirectory())));
+
+            if (!Directory.Exists(Path.Combine(Directory.GetCurrentDirectory(), "uploads")))
+            {
+                Directory.CreateDirectory(Path.Combine(Directory.GetCurrentDirectory(), "uploads"));
+            }
+
+
 
         }