From f2ab2e93fb90ed74a68075970227f8531435a3de Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Mar 2017 18:38:44 -0400 Subject: [PATCH] space is a wonderful place, time is a wonderful time --- Project-Unite/Controllers/AdminController.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Project-Unite/Controllers/AdminController.cs b/Project-Unite/Controllers/AdminController.cs index d863010..f753fb9 100644 --- a/Project-Unite/Controllers/AdminController.cs +++ b/Project-Unite/Controllers/AdminController.cs @@ -121,7 +121,15 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t string backupUrl = backupDir.Remove(0, 1) + "/ShiftOS-" + DateTime.Now.ToString().Replace("/", "-") + ".zip"; string backupname = Path.Combine(backupServerDir, "ShiftOS-" + DateTime.Now.ToString().Replace("/", "-") + ".zip"); - System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname); + + try + { + System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname); + } + catch + { + return Content(backupname + "

" + Server.MapPath("~/Uploads")); + } var backupData = new AssetBackup(); backupData.Id = Guid.NewGuid().ToString(); backupData.UserId = User.Identity.GetUserId();