Changeset 13689 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers

Timestamp:

03/11/16 12:56:12 (9 years ago)

Author:

jlodewyc

Message:

#2582 Implemented uploading

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Files:

• . (modified) (1 prop)
• Controllers/HomeController.cs (modified) (1 diff)
• Controllers/JobController.cs (modified) (7 diffs)
• Controllers/ResourceController.cs (added)
• Controllers/UserController.cs (added)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs

@@ -27 +27 @@
                 var model = loginViewModelService.GetLoginViewModel();
                 HiveServiceLocatorWebManagerService hiveServiceLocator = (HiveServiceLocatorWebManagerService)HiveServiceLocatorWebManagerService.Instance;
-                Settings.Default.UserName = loginName;
-                Settings.Default.Password = Common.CryptoService.EncryptString(password);
-                Settings.Default.Save();
+                HeuristicLab.Clients.Common.Properties.Settings.Default.UserName = loginName;
+                HeuristicLab.Clients.Common.Properties.Settings.Default.Password = Common.CryptoService.EncryptString(password);
+                HeuristicLab.Clients.Common.Properties.Settings.Default.Save();
                 hiveServiceLocator.Username = loginName;
                 hiveServiceLocator.Password = password;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs

@@ -14 +14 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using System.Threading;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -32 +33 @@
             _environment = env;
         }
+        #region Jobs
         public IActionResult Index()
         {
             try
             {
+
                 vm.userJobs = client.GetJobs();
             }
@@ -56 +59 @@
                 vm.userJobs = client.GetJobs();
                 vm.selectedJob = client.GetJob(id);
-                vm.jobTasks = client.GetLightweightJobTasks(id);
+
+                vm.lightJobTasks = client.GetLightweightJobTasks(id);
+                foreach (var light in vm.lightJobTasks)
+                {
+                    vm.filledJobTasks.Add(client.GetTask(light.Id));
+                }
                 ViewBag.Title = vm.selectedJob.Name + " - Jobs";
                 return View("Index", vm);
@@ -66 +74 @@
             }
         }
-        public IActionResult Delete(Guid id)
+        public IActionResult Delete(Guid id)// delete a job
         {
             if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
@@ -83 +91 @@
             }
         }
-
-        public IActionResult Upload()
+        #endregion
+
+        #region Uploads
+        public IActionResult Uploads()
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, -1);
+
+                ViewBag.Title = "Uploaded files";
+                return View("Uploads", upper);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        public IActionResult UploadDir(int index)
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+
+                ViewBag.Title = "Uploaded files";
+                return View("Uploads", upper);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        private void fillUploadsPaths(UploadedJobViewModel vm, int index)
+        {
+            var tempdex = index; //Fix when maps gets deleted
+            var start = Path.Combine(_environment.WebRootPath, "uploads", client.ClientCredentials.UserName.UserName);
+            var dirs = Directory.GetDirectories(start);
+            foreach (string dir in dirs)
+            {
+                if (Directory.GetFiles(dir).Length == 0 && Directory.GetDirectories(dir).Length == 0)
+                {
+                    Directory.Delete(dir, false);
+                    tempdex = -1;
+                }
+                else {
+                    vm.FullDatePaths.Add(dir);
+                    var temp = dir.Split('\\');
+                    vm.DisplayDatePaths.Add(temp[temp.Length - 1]);
+                }
+            }
+            if (tempdex != -1)
+            {
+                vm.SelectedIndex = tempdex;
+                dirs = Directory.GetFiles(vm.FullDatePaths[tempdex]);
+                foreach (string dir in dirs)
+                {
+                    vm.FullFilesPaths.Add(dir);
+                    var temp = dir.Split('\\');
+                    vm.DisplayFilesPaths.Add(temp[temp.Length - 1]);
+                }
+            }
+        }
+        public IActionResult DeleteFile(int index, int filedex)
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+                System.IO.File.Delete(upper.FullFilesPaths[filedex]);
+                var message = upper.DisplayFilesPaths[filedex] + " has been deleted";
+
+                upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+                upper.message = message;
+                ViewBag.Title = "Uploaded files";
+
+                return View("Uploads", upper);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+
+        public IActionResult OpenFile(int index, int filedex)
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+
+                FileOpeningService serve = FileOpeningService.Instance;
+                serve.NewModel();
+                serve.env = _environment;
+
+                var ioptimizer = ContentManager.Load(upper.FullFilesPaths[filedex]);
+
+                serve.vm.SelectedTask = new OptimizerHiveTask((IOptimizer)ioptimizer);
+                if (serve.vm.SelectedTask.ItemTask.Item is IAlgorithm)
+                {
+                    serve.vm.SelectedAlgorithm = (IAlgorithm)serve.vm.SelectedTask.ItemTask.Item;
+                }
+                else if (serve.vm.SelectedTask.ItemTask.Item is BatchRun)
+                {
+                    serve.vm.SelectedBatchRun = (BatchRun)serve.vm.SelectedTask.ItemTask.Item;
+                }
+                else if (serve.vm.SelectedTask.ItemTask.Item is Experiment)
+                {
+                    serve.vm.SelectedExperiment = (Experiment)serve.vm.SelectedTask.ItemTask.Item;
+                }
+
+                ViewBag.Title = serve.vm.SelectedTask.ItemTask.Name + " - Open file";
+
+                return View("OpenFile", serve.vm);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+
+        public IActionResult AddToHive()
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                    var job = FileOpeningService.Instance.AddCurrentModelToHive();
+                    while (job.Progress.ProgressValue != 1)
+                    { }
+
+                    Thread.Sleep(1000);
+                    job.Progress.Status = "Upload finished";
+                    Thread.Sleep(2000);
+                    return RedirectToAction("Index", "Job");
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        //TODO Work in progress
+        /* public async Task<IActionResult> DownloadFile(int index, int filedex)
+         {
+             if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+             {
+                 UploadedJobViewModel upper = new UploadedJobViewModel();
+                 fillUploadsPaths(upper, index);
+
+                HttpContext.Response.ContentType = "APPLICATION/OCTET-STREAM";
+                 String Header = "Attachment; Filename=" + upper.DisplayFilesPaths[filedex];
+                 HttpContext.Response.Headers.Add("Content-Disposition", Header);
+                 System.IO.FileInfo Dfile = new System.IO.FileInfo(upper.FullFilesPaths[filedex]);
+                 await HttpContext.Response.WriteAsync(Dfile.FullName);
+                 //HttpContext.Response.End();
+
+                 var message = upper.DisplayFilesPaths[filedex] + " has been downloaded";
+
+                 upper.message = message;
+                 ViewBag.Title = "Downloaded file";
+
+                 return View("Uploads", upper);
+             }
+             else
+             {
+                 HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                 return RedirectToAction("Index", "Home");
+             }
+         }*/
+
+        #endregion
+
+        #region Uploader
+        public IActionResult Uploader()
         {
             if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
             {
                 ViewBag.Title = "Upload Jobs";
-                return View("Upload");
+                ViewBag.Name = client.ClientCredentials.UserName.UserName;
+                return View("Uploader");
             }
             else
@@ -98 +283 @@
         }
         [HttpPost]
-        public async Task<IActionResult> Upload(ICollection<IFormFile> files)
+        public async Task<IActionResult> Uploader(ICollection<IFormFile> files, string directory)
         {
 
             UploadedJobViewModel upper = new UploadedJobViewModel();
-            var uploads = Path.Combine(_environment.WebRootPath, "uploads");
+            var uploads = Path.Combine(_environment.WebRootPath, "uploads", client.ClientCredentials.UserName.UserName,
+                directory);
+            Directory.CreateDirectory(uploads);
             foreach (var file in files)
             {
@@ -109 +296 @@
                     var fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"');
                     await file.SaveAsAsync(Path.Combine(uploads, fileName));
-                    var ioptimizer = ContentManager.Load(Path.Combine(uploads, fileName));
-                    OptimizerHiveTask task = new OptimizerHiveTask((IOptimizer)ioptimizer);
-                    upper.Tasks.Add(task);
+                    // var ioptimizer = ContentManager.Load(Path.Combine(uploads, fileName));
+                    //OptimizerHiveTask task = new OptimizerHiveTask((IOptimizer)ioptimizer);
+                    //upper.Tasks.Add(task);
                 }
             }
             ViewBag.Title = "Upload complete";
-            return View();
-
-        }
+            return RedirectToAction("Uploads", "Job");
+
+        }
+        #endregion
     }
 }