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

Merge pull request #1546 from sbwalker/dev

Browse Source 
bootstrap5 fix to theme creator template, modifications to updater app
This commit is contained in:
Shaun Walker
2021-07-08 10:31:19 -04:00
committed by GitHub
parent 48b9e2f97b f536033087
commit 010872ef35
4 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Upgrade/Index.razor
View File

@ -73,7 +73,7 @@
AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info); AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info);
ShowProgressIndicator(); ShowProgressIndicator();
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
await interop.RedirectBrowser(NavigateUrl(), 20); await interop.RedirectBrowser(NavigateUrl(), 10);
await InstallationService.Upgrade(); await InstallationService.Upgrade();
} }
catch (Exception ex) catch (Exception ex)

2
Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor vendored
View File

@ -4,7 +4,7 @@
<main role="main"> <main role="main">
<nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top">
<Logo /><Menu Orientation="Horizontal" /> <Logo /><Menu Orientation="Horizontal" />
<div class="controls ml-md-auto"> <div class="controls ms-auto">
<div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div> <div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>
</div> </div>
</nav> </nav>

19
Oqtane.Server/wwwroot/app_offline.bak
View File

@ -3,15 +3,26 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<title>Oqtane</title> <title>Upgrade Framework</title>
<base href="/" /> <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> </head>
<body> <body onload="forceWait()">
<div> <div>
<br /><br /> <br /><br />
<h1 align="center">Please Wait... Upgrade In Progress....</h1> <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>
<div class="app-progress-indicator"></div>
<script>
function forceWait() {
setInterval(function () {
window.location.href = "/";
}, 120 * 1000);
}
</script>
</body> </body>
</html> </html>

25
Oqtane.Updater/Program.cs
View File

@ -50,10 +50,13 @@ namespace Oqtane.Updater
using (ZipArchive archive = ZipFile.OpenRead(packagename)) using (ZipArchive archive = ZipFile.OpenRead(packagename))
{ {
foreach (ZipArchiveEntry entry in archive.Entries) foreach (ZipArchiveEntry entry in archive.Entries)
{
if (!string.IsNullOrEmpty(entry.Name))
{ {
files.Add(Path.Combine(contentrootfolder, entry.FullName)); files.Add(Path.Combine(contentrootfolder, entry.FullName));
} }
} }
}
// ensure files are not locked // ensure files are not locked
if (CanAccessFiles(files)) if (CanAccessFiles(files))
@ -107,6 +110,8 @@ namespace Oqtane.Updater
using (ZipArchive archive = ZipFile.OpenRead(packagename)) using (ZipArchive archive = ZipFile.OpenRead(packagename))
{ {
foreach (ZipArchiveEntry entry in archive.Entries) foreach (ZipArchiveEntry entry in archive.Entries)
{
if (!string.IsNullOrEmpty(entry.Name))
{ {
string filename = Path.Combine(contentrootfolder, entry.FullName); string filename = Path.Combine(contentrootfolder, entry.FullName);
if (!Directory.Exists(Path.GetDirectoryName(filename))) if (!Directory.Exists(Path.GetDirectoryName(filename)))
@ -117,6 +122,7 @@ namespace Oqtane.Updater
} }
} }
} }
}
catch (Exception ex) catch (Exception ex)
{ {
// an error occurred extracting a file // an error occurred extracting a file
@ -138,15 +144,12 @@ namespace Oqtane.Updater
// restore on failure // restore on failure
foreach (string file in files) foreach (string file in files)
{ {
File.Delete(file);
string filename = Path.Combine(backupfolder, file.Replace(contentrootfolder + Path.DirectorySeparatorChar, "")); string filename = Path.Combine(backupfolder, file.Replace(contentrootfolder + Path.DirectorySeparatorChar, ""));
if (File.Exists(filename)) if (File.Exists(filename))
{ {
File.Copy(filename, file); File.Copy(filename, file);
} }
else
{
File.Delete(file);
}
} }
// clean up backup // clean up backup
Directory.Delete(backupfolder, true); Directory.Delete(backupfolder, true);
@ -191,7 +194,12 @@ namespace Oqtane.Updater
private static bool CanAccessFiles(List<string> files) 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; bool canAccess = true;
FileStream stream = null; FileStream stream = null;
int i = 0; int i = 0;
@ -200,8 +208,8 @@ namespace Oqtane.Updater
string filepath = files[i]; string filepath = files[i];
int attempts = 0; int attempts = 0;
bool locked = true; bool locked = true;
// try up to 30 times
while (attempts < 30 && locked) while (attempts < retries && locked)
{ {
try try
{ {
@ -217,7 +225,7 @@ namespace Oqtane.Updater
} }
catch // file is locked by another process catch // file is locked by another process
{ {
Thread.Sleep(1000); // wait 1 second Thread.Sleep(sleep * 1000); // wait
} }
finally finally
{ {
@ -228,6 +236,7 @@ namespace Oqtane.Updater
if (locked) if (locked)
{ {
canAccess = false; canAccess = false;
Console.WriteLine("File Locked: " + filepath);
} }
i += 1; i += 1;
} }