Skip to content

Commit

Permalink
v0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AriesLR committed Mar 8, 2024
1 parent 73b2291 commit bc9ad63
Show file tree
Hide file tree
Showing 65 changed files with 192 additions and 100 deletions.
Binary file modified Build/Aetherium/Aetherium.dll
Binary file not shown.
Binary file modified Build/Aetherium/Aetherium.exe
Binary file not shown.
Binary file modified Build/Aetherium/Aetherium.pdb
Binary file not shown.
Binary file modified Build/Aetherium/resources.pri
Binary file not shown.
1 change: 1 addition & 0 deletions Build/Aetherium/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<script src="_framework/blazor.webview.js" autostart="false"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/sessionStorageInterop.js"></script>
<script src="js/scrollToBottom.js"></script>

</body>

Expand Down
4 changes: 4 additions & 0 deletions Build/Aetherium/wwwroot/js/scrollToBottom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
window.scrollToBottom = () => {
const textarea = document.getElementById('outputTextarea');
textarea.scrollTop = textarea.scrollHeight;
};
Binary file modified Installer/Aetherium-Setup.exe
Binary file not shown.
Binary file modified src/.vs/Aetherium/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/.vs/Aetherium/v17/.futdcache.v2
Binary file not shown.
Binary file modified src/.vs/Aetherium/v17/.suo
Binary file not shown.
76 changes: 15 additions & 61 deletions src/.vs/Aetherium/v17/DocumentLayout.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,17 @@
"Version": 1,
"WorkspaceRootPath": "G:\\#Github#\\Aetherium\\src\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\components\\pages\\config.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\components\\pages\\config.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}"
},
{
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\components\\layout\\mainlayout.razor.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\components\\layout\\mainlayout.razor.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}"
},
{
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\wwwroot\\css\\app.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\wwwroot\\css\\app.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}"
},
{
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\components\\pages\\server.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\components\\pages\\server.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}"
},
{
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\components\\pages\\rcon.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\components\\pages\\rcon.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}"
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\wwwroot\\css\\app.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\wwwroot\\css\\app.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}"
},
{
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}"
"AbsoluteMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|g:\\#github#\\aetherium\\src\\aetherium\\components\\layout\\mainlayout.razor.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}",
"RelativeMoniker": "D:0:0:{97D4DB64-8EA9-40EB-8F11-F7E0457EE277}|Aetherium\\Aetherium.csproj|solutionrelative:aetherium\\components\\layout\\mainlayout.razor.css||{A5401142-F49D-43DB-90B1-F57BA349E55C}"
}
],
"DocumentGroupContainers": [
Expand All @@ -38,78 +26,44 @@
"Children": [
{
"$type": "Document",
"DocumentIndex": 2,
"DocumentIndex": 1,
"Title": "app.css",
"DocumentMoniker": "G:\\#Github#\\Aetherium\\src\\Aetherium\\wwwroot\\css\\app.css",
"RelativeDocumentMoniker": "Aetherium\\wwwroot\\css\\app.css",
"ToolTip": "G:\\#Github#\\Aetherium\\src\\Aetherium\\wwwroot\\css\\app.css",
"RelativeToolTip": "Aetherium\\wwwroot\\css\\app.css",
"ViewState": "AQIAAEsAAAAAAAAAAAAIwFgAAAA0AAAA",
"ViewState": "AQIAAEsAAAAAAAAAAAAIwGAAAABBAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003000|",
"WhenOpened": "2024-03-07T07:01:58.451Z",
"IsPinned": true
"IsPinned": true,
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"DocumentIndex": 2,
"Title": "MainLayout.razor.css",
"DocumentMoniker": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Layout\\MainLayout.razor.css",
"RelativeDocumentMoniker": "Aetherium\\Components\\Layout\\MainLayout.razor.css",
"ToolTip": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Layout\\MainLayout.razor.css",
"RelativeToolTip": "Aetherium\\Components\\Layout\\MainLayout.razor.css",
"ViewState": "AQIAAAAAAAAAAAAAAAAAABwAAAArAAAA",
"ViewState": "AQIAAAAAAAAAAAAAAAAAABAAAAArAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003000|",
"WhenOpened": "2024-03-07T07:42:56.143Z",
"IsPinned": true
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Config.razor",
"DocumentMoniker": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Config.razor",
"RelativeDocumentMoniker": "Aetherium\\Components\\Pages\\Config.razor",
"ToolTip": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Config.razor",
"RelativeToolTip": "Aetherium\\Components\\Pages\\Config.razor",
"ViewState": "AQIAAO0AAAAAAAAAAAAAAEsAAAAxAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|",
"WhenOpened": "2024-03-08T10:23:14.876Z",
"IsPinned": true,
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"DocumentIndex": 0,
"Title": "Server.razor",
"DocumentMoniker": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Server.razor",
"RelativeDocumentMoniker": "Aetherium\\Components\\Pages\\Server.razor",
"ToolTip": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Server.razor",
"RelativeToolTip": "Aetherium\\Components\\Pages\\Server.razor",
"ViewState": "AQIAAAAAAAAAAAAAAAAAABUAAAAaAAAA",
"ViewState": "AQIAAAIAAAAAAAAAAAAUwAwAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|",
"WhenOpened": "2024-03-08T06:24:45.988Z"
},
{
"$type": "Document",
"DocumentIndex": 5,
"Title": "Home.razor",
"DocumentMoniker": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Home.razor",
"RelativeDocumentMoniker": "Aetherium\\Components\\Pages\\Home.razor",
"ToolTip": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Home.razor",
"RelativeToolTip": "Aetherium\\Components\\Pages\\Home.razor",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAA8AAAAGAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|",
"WhenOpened": "2024-03-07T09:54:27.908Z"
},
{
"$type": "Document",
"DocumentIndex": 4,
"Title": "Rcon.razor",
"DocumentMoniker": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Rcon.razor",
"RelativeDocumentMoniker": "Aetherium\\Components\\Pages\\Rcon.razor",
"ToolTip": "G:\\#Github#\\Aetherium\\src\\Aetherium\\Components\\Pages\\Rcon.razor",
"RelativeToolTip": "Aetherium\\Components\\Pages\\Rcon.razor",
"ViewState": "AQIAAAEAAAAAAAAAAAAUwBUAAAAuAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|",
"WhenOpened": "2024-03-07T09:21:39.525Z"
"WhenOpened": "2024-03-08T11:51:50.303Z",
"EditorCaption": ""
}
]
}
Expand Down
Binary file modified src/.vs/ProjectEvaluation/aetherium.metadata.v7.bin
Binary file not shown.
Binary file modified src/.vs/ProjectEvaluation/aetherium.projects.v7.bin
Binary file not shown.
6 changes: 5 additions & 1 deletion src/Aetherium/Components/Layout/ProcessMonitor.razor
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@
}

// Get CPU usage
CpuUsage = (int)cpuCounter.NextValue() / Environment.ProcessorCount;
double cpuUsage = (double)cpuCounter.NextValue() / Environment.ProcessorCount;
string formatCpuUsage = cpuUsage.ToString("0.0");
float cpuUsageFloat = float.Parse(formatCpuUsage);

CpuUsage = cpuUsageFloat;

// Get memory usage
MemoryUsageMB = (int)(ramCounter.NextValue() / (1024f * 1024f)); // Convert bytes to megabytes and cast to int
Expand Down
45 changes: 21 additions & 24 deletions src/Aetherium/Components/Pages/Server.razor
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="row">
<div class="col">
<h5>Server Output</h5>
<textarea class="form-control mb-1" rows="10" readonly style="background-image: linear-gradient(45deg, rgba(173,0,255,0.05) 0%, rgba(0,221,255,0.05) 100%); color: rgb(255, 255, 255, 0.90); border-color: rgb(255, 255, 255, 0.05); resize: none; margin-top: 0.25rem; margin-bottom: 0.25rem;">@serverOutput</textarea>
<textarea id="outputTextarea" class="form-control mb-1" rows="10" readonly style="background-image: linear-gradient(45deg, rgba(173,0,255,0.05) 0%, rgba(0,221,255,0.05) 100%); color: rgb(255, 255, 255, 0.90); border-color: rgb(255, 255, 255, 0.05); resize: none; margin-top: 0.25rem; margin-bottom: 0.25rem;">@serverOutput</textarea>
</div>
</div>
<div class="row mb-4">
Expand Down Expand Up @@ -218,6 +218,7 @@
if (!string.IsNullOrEmpty(e.Data))
{
serverOutput += e.Data + Environment.NewLine;
await UpdateServerOutput();
await InvokeAsync(() => StateHasChanged()); // Update UI
await SetItem("serverOutput", serverOutput);
}
Expand All @@ -229,6 +230,7 @@
if (!string.IsNullOrEmpty(e.Data))
{
serverOutput += e.Data + Environment.NewLine;
await UpdateServerOutput();
await InvokeAsync(() => StateHasChanged()); // Update UI
await SetItem("serverOutput", serverOutput);
}
Expand All @@ -252,6 +254,12 @@
{
StartRestartTimer();
}
// Start the backup timer if save backups are enabled
if (saveBackupsEnabled)
{
StartSaveBackups();
Debug.WriteLine("Starting Backups");
}
}
catch (Exception ex)
{
Expand All @@ -264,6 +272,11 @@
}
}

private async Task UpdateServerOutput()
{
await JSRuntime.InvokeVoidAsync("scrollToBottom");
}

private void StopServer()
{
if (serverStopping)
Expand All @@ -282,6 +295,10 @@
// Stop the restart timer
StopRestartTimer();

// Stop backup timer
StopBackupTimer();
Debug.WriteLine("Stopping Backups");

serverStopping = false; // Re-enable stop button
}
else
Expand All @@ -296,34 +313,13 @@
automaticRestarts = (bool)(e?.Value ?? false);
configuration.AutomaticRestarts = automaticRestarts;
SaveConfig();

if (automaticRestarts)
{
StartRestartTimer();
}
else
{
StopRestartTimer();
}
}

private void ToggleSaveBackups(ChangeEventArgs e)
{
bool newValue = (bool)(e?.Value ?? false);
if (newValue == saveBackupsEnabled) return; // No change, return early
saveBackupsEnabled = newValue;
saveBackupsEnabled = (bool)(e?.Value ?? false);
configuration.SaveBackupsEnabled = saveBackupsEnabled;
SaveConfig();

if (saveBackupsEnabled)
{
StartSaveBackups(); // Start backup if enabled
}
else
{
StopBackupTimer(); // Stop backup if disabled
}
}

private void StartSaveBackups()
Expand Down Expand Up @@ -376,12 +372,13 @@
DirectoryCopy(saveFolderPath, tempBackupFolder, true);

// Compress the backup folder
string zipFileName = $"backup_{DateTime.Now:yyyyMMddHHmmss}.zip";
string zipFileName = $"{configuration.ConfigName}_backup_{DateTime.Now:MM-dd-yyyy-HHmm}.zip";
string zipFilePath = Path.Combine(backupFolderPath, zipFileName);
ZipFile.CreateFromDirectory(tempBackupFolder, zipFilePath);

// Remove the temporary backup folder
Directory.Delete(tempBackupFolder, true);

}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/Aetherium/Components/Pages/Settings.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col">
<h6>Version: v0.1.0</h6>
<h6>Version: v0.1.1</h6>

<div class="themesdropdown">
<div class="dropdown">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("Aetherium")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.9.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.9+8fd33c19031c60c46ce12c6e948e2ac28bf72d1c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.9+73b2291a2b70f0493e585a31d1a30476c91345ed")]
[assembly: System.Reflection.AssemblyProductAttribute("Aetherium")]
[assembly: System.Reflection.AssemblyTitleAttribute("Aetherium")]
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.9.0")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
95f278ecef8d8c6550d7a27e4127b4dcadf7ff2968edad84a1e8351c5afda7fb
4a86a16017aa99a45a2c7db0e6f8100a09ee13d306f55134e2f6229c83775dd7
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -876,3 +876,4 @@ G:\#Github#\Aetherium\src\Aetherium\obj\Debug\net8.0-windows10.0.19041.0\win10-x
G:\#Github#\Aetherium\src\Aetherium\obj\Debug\net8.0-windows10.0.19041.0\win10-x64\qualifiers.txt.intermediate
G:\#Github#\Aetherium\src\Aetherium\obj\Debug\net8.0-windows10.0.19041.0\win10-x64\MultipleQualifiersPerDimensionFound.txt
G:\#Github#\Aetherium\src\Aetherium\bin\Debug\net8.0-windows10.0.19041.0\win10-x64\wwwroot\css\bootstrap\bootstrap.css
G:\#Github#\Aetherium\src\Aetherium\bin\Debug\net8.0-windows10.0.19041.0\win10-x64\wwwroot\js\scrollToBottom.js
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"documents":{"G:\\#Github#\\Aetherium\\*":"https://raw.githubusercontent.com/AriesLR/Aetherium/8fd33c19031c60c46ce12c6e948e2ac28bf72d1c/*"}}
{"documents":{"G:\\#Github#\\Aetherium\\*":"https://raw.githubusercontent.com/AriesLR/Aetherium/73b2291a2b70f0493e585a31d1a30476c91345ed/*"}}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ wwwroot\images\logo.png
wwwroot\index.html
wwwroot\js\bootstrap.bundle.min.js
wwwroot\js\bootstrap.bundle.min.js.map
wwwroot\js\scrollToBottom.js
wwwroot\js\sessionStorageInterop.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ wwwroot\images\logo.png
wwwroot\index.html
wwwroot\js\bootstrap.bundle.min.js
wwwroot\js\bootstrap.bundle.min.js.map
wwwroot\js\scrollToBottom.js
wwwroot\js\sessionStorageInterop.js
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Version": 1,
"Hash": "WnxdibZBUFiSBThdt/uUaz1e6riD8xgPjRJJzjFWHjU=",
"Hash": "YDyUSKFPu+ggoIFO238x7LWCGIucz5YakODG3ixwQKM=",
"Source": "Aetherium",
"BasePath": "/",
"Mode": "Root",
Expand Down Expand Up @@ -263,6 +263,25 @@
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\js\\bootstrap.bundle.min.js.map"
},
{
"Identity": "G:\\#Github#\\Aetherium\\src\\Aetherium\\wwwroot\\js\\scrollToBottom.js",
"SourceId": "Aetherium",
"SourceType": "Discovered",
"ContentRoot": "G:\\#Github#\\Aetherium\\src\\Aetherium\\wwwroot\\",
"BasePath": "/",
"RelativePath": "js/scrollToBottom.js",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\js\\scrollToBottom.js"
},
{
"Identity": "G:\\#Github#\\Aetherium\\src\\Aetherium\\wwwroot\\js\\sessionStorageInterop.js",
"SourceId": "Aetherium",
Expand Down
Loading

0 comments on commit bc9ad63

Please sign in to comment.