Merge pull request #1546 from sbwalker/dev
bootstrap5 fix to theme creator template, modifications to updater app
This commit is contained in:
commit
010872ef35
@ -73,7 +73,7 @@
|
||||
AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info);
|
||||
ShowProgressIndicator();
|
||||
var interop = new Interop(JSRuntime);
|
||||
await interop.RedirectBrowser(NavigateUrl(), 20);
|
||||
await interop.RedirectBrowser(NavigateUrl(), 10);
|
||||
await InstallationService.Upgrade();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -4,7 +4,7 @@
|
||||
<main role="main">
|
||||
<nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top">
|
||||
<Logo /><Menu Orientation="Horizontal" />
|
||||
<div class="controls ml-md-auto">
|
||||
<div class="controls ms-auto">
|
||||
<div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>
|
||||
</div>
|
||||
</nav>
|
||||
|
@ -3,15 +3,26 @@
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<title>Oqtane</title>
|
||||
<title>Upgrade Framework</title>
|
||||
<base href="/" />
|
||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="http://www.oqtane.net/css/app.css">
|
||||
</head>
|
||||
<body>
|
||||
<body onload="forceWait()">
|
||||
<div>
|
||||
<br /><br />
|
||||
<h1 align="center">Please Wait... Upgrade In Progress....</h1>
|
||||
<br /><br />
|
||||
<h1 align="center">Please Wait... Upgrade In Progress...</h1>
|
||||
<p align="center">(this process can take a few minutes... please be patient)</p>
|
||||
</div>
|
||||
|
||||
<div class="app-progress-indicator"></div>
|
||||
|
||||
<script>
|
||||
function forceWait() {
|
||||
setInterval(function () {
|
||||
window.location.href = "/";
|
||||
}, 120 * 1000);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
@ -20,7 +20,7 @@ namespace Oqtane.Updater
|
||||
//Array.Resize(ref args, 2);
|
||||
//args[0] = @"C:\yourpath\oqtane.framework\Oqtane.Server";
|
||||
//args[1] = @"C:\yourpath\oqtane.framework\Oqtane.Server\wwwroot";
|
||||
|
||||
|
||||
if (args.Length == 2)
|
||||
{
|
||||
string contentrootfolder = args[0];
|
||||
@ -51,7 +51,10 @@ namespace Oqtane.Updater
|
||||
{
|
||||
foreach (ZipArchiveEntry entry in archive.Entries)
|
||||
{
|
||||
files.Add(Path.Combine(contentrootfolder, entry.FullName));
|
||||
if (!string.IsNullOrEmpty(entry.Name))
|
||||
{
|
||||
files.Add(Path.Combine(contentrootfolder, entry.FullName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -108,12 +111,15 @@ namespace Oqtane.Updater
|
||||
{
|
||||
foreach (ZipArchiveEntry entry in archive.Entries)
|
||||
{
|
||||
string filename = Path.Combine(contentrootfolder, entry.FullName);
|
||||
if (!Directory.Exists(Path.GetDirectoryName(filename)))
|
||||
if (!string.IsNullOrEmpty(entry.Name))
|
||||
{
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(filename));
|
||||
string filename = Path.Combine(contentrootfolder, entry.FullName);
|
||||
if (!Directory.Exists(Path.GetDirectoryName(filename)))
|
||||
{
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(filename));
|
||||
}
|
||||
entry.ExtractToFile(filename, true);
|
||||
}
|
||||
entry.ExtractToFile(filename, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -138,15 +144,12 @@ namespace Oqtane.Updater
|
||||
// restore on failure
|
||||
foreach (string file in files)
|
||||
{
|
||||
File.Delete(file);
|
||||
string filename = Path.Combine(backupfolder, file.Replace(contentrootfolder + Path.DirectorySeparatorChar, ""));
|
||||
if (File.Exists(filename))
|
||||
{
|
||||
File.Copy(filename, file);
|
||||
}
|
||||
else
|
||||
{
|
||||
File.Delete(file);
|
||||
}
|
||||
}
|
||||
// clean up backup
|
||||
Directory.Delete(backupfolder, true);
|
||||
@ -191,7 +194,12 @@ namespace Oqtane.Updater
|
||||
|
||||
private static bool CanAccessFiles(List<string> files)
|
||||
{
|
||||
// ensure files are not locked by another process - the shutdownTimeLimit defines the duration for app shutdown
|
||||
// ensure files are not locked by another process
|
||||
// the IIS ShutdownTimeLimit defines the duration for app shutdown (default is 90 seconds)
|
||||
// websockets can delay application shutdown (ie. Blazor Server)
|
||||
int retries = 60;
|
||||
int sleep = 2;
|
||||
|
||||
bool canAccess = true;
|
||||
FileStream stream = null;
|
||||
int i = 0;
|
||||
@ -200,8 +208,8 @@ namespace Oqtane.Updater
|
||||
string filepath = files[i];
|
||||
int attempts = 0;
|
||||
bool locked = true;
|
||||
// try up to 30 times
|
||||
while (attempts < 30 && locked)
|
||||
|
||||
while (attempts < retries && locked)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -217,7 +225,7 @@ namespace Oqtane.Updater
|
||||
}
|
||||
catch // file is locked by another process
|
||||
{
|
||||
Thread.Sleep(1000); // wait 1 second
|
||||
Thread.Sleep(sleep * 1000); // wait
|
||||
}
|
||||
finally
|
||||
{
|
||||
@ -228,6 +236,7 @@ namespace Oqtane.Updater
|
||||
if (locked)
|
||||
{
|
||||
canAccess = false;
|
||||
Console.WriteLine("File Locked: " + filepath);
|
||||
}
|
||||
i += 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user