Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

improve user experience by delegating application restart responsibility to the host user

Browse Source
This commit is contained in:
Shaun Walker
2020-11-24 16:22:53 -05:00
parent fa59ec1b24
commit 5e42ab8cca
14 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -68,6 +68,14 @@ namespace Oqtane.Controllers
return installation;
}
// GET api/<controller>/restart
[HttpPost("restart")]
[Authorize(Roles = RoleNames.Host)]
public void Restart()
{
_installationManager.RestartApplication();
}
// GET api/<controller>/load
[HttpGet("load")]
public IActionResult Load()

7
Oqtane.Server/Controllers/ModuleDefinitionController.cs
View File

@ -96,7 +96,7 @@ namespace Oqtane.Controllers
public void InstallModules()
{
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
_installationManager.InstallPackages("Modules", true);
_installationManager.InstallPackages("Modules");
}
// DELETE api/<controller>/5?siteid=x
@ -159,9 +159,6 @@ namespace Oqtane.Controllers
// remove module definition
_moduleDefinitions.DeleteModuleDefinition(id, siteid);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Definition {ModuleDefinitionName} Deleted", moduledefinition.Name);
// restart application
_installationManager.RestartApplication();
}
}
}
@ -205,8 +202,6 @@ namespace Oqtane.Controllers
resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + ".Uninstall.sql"));
EmbedResourceFiles(Utilities.PathCombine(rootPath, "Oqtane.Server", "Oqtane.Server.csproj"), resources);
}
_installationManager.RestartApplication();
}
}

6
Oqtane.Server/Controllers/ThemeController.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Models;
using Microsoft.AspNetCore.Authorization;
@ -45,7 +45,7 @@ namespace Oqtane.Controllers
public void InstallThemes()
{
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
_installationManager.InstallPackages("Themes", true);
_installationManager.InstallPackages("Themes");
}
// DELETE api/<controller>/xxx
@ -79,8 +79,6 @@ namespace Oqtane.Controllers
Directory.Delete(folder, true);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Resource Folder Removed For {ThemeName}", theme.ThemeName);
}
_installationManager.RestartApplication();
}
}

10
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -26,15 +26,11 @@ namespace Oqtane.Infrastructure
_cache = cache;
}
public void InstallPackages(string folders, bool restart)
public void InstallPackages(string folders)
{
var webRootPath = _environment.WebRootPath;
var install = InstallPackages(folders, webRootPath);
if (install && restart)
if (!InstallPackages(folders, _environment.WebRootPath))
{
RestartApplication();
// error installing packages
}
}

4
Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs
View File

@ -1,8 +1,8 @@
namespace Oqtane.Infrastructure
namespace Oqtane.Infrastructure
{
public interface IInstallationManager
{
void InstallPackages(string folders, bool restart);
void InstallPackages(string folders);
void UpgradeFramework();
void RestartApplication();
}