Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/egalware/webdoorcreator into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-09-04 15:05:43 +02:00
parent 01ef886474 42c23db164
commit 4f5dac3156
11 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>WebDoorCreator - Egalware</i>
<h4>Version: 0.9.2309.0410</h4>
<h4>Version: 0.9.2309.0414</h4>
<br /> Release note:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
0.9.2309.0410
0.9.2309.0414
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>0.9.2309.0410</version>
<version>0.9.2309.0414</version>
<url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>
WebDoorCreator.Data/Services/WebDoorCreatorService.cs
+12 -1
View File
@@ -3381,7 +3381,7 @@ namespace WebDoorCreator.Data.Services
{
var fileName = file.Split(".");
lang = fileName[0].Substring(fileName[0].Length - 2, 2);
//lang = fileName[0].Split("\\").TakeLast(1).ToString().Substring(fileName[0].Length - 2, 2);
//leggo tutte le linee del file
List<string> lines = File.ReadAllLines(file).ToList();
@@ -3391,6 +3391,17 @@ namespace WebDoorCreator.Data.Services
if (!line.StartsWith("//") && line != "")
{
string[] lineSplit = line.Split("=");
if (lineSplit[0] == "0")
{
if (lineSplit[1] != "ENG")
{
lang = lineSplit[1];
}
else
{
lang = "EN";
}
}
//string trad = "";
if (lineSplit.Length != 1)
{
WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
+14 -3
View File
@@ -1,5 +1,9 @@
<button @onclick="()=>doSave()">Save</button>
@if (files2Chk != null && files2Chk.Count() > 0)
{
<div class="w-100 text-end">
<button @onclick="()=>doSave()" class="btn btn-success">Save</button>
</div>
}
<div class="d-flex justify-content-between my-2">
<div class="col-5 text-center fw-bold border border-secondary rounded d-flex justify-content-between">
@@ -26,7 +30,7 @@
</div>
@if (isLoading)
{
<ProgressDisplay Title="@titleMsg" CurrVal="@sendDataVal" MaxVal="@sendDataMaxVal" ExpTimeMSec="1000"></ProgressDisplay>
<ProgressDisplay Title="@titleMsg" CurrVal="@sendDataVal" MaxVal="@sendDataMaxVal" ExpTimeMSec="8000"></ProgressDisplay>
}
else if (files2Chk != null && files2Chk.Count() > 0)
{
@@ -103,6 +107,13 @@ else if (files2Chk != null && files2Chk.Count() > 0)
</tbody>
</table>
}
else if (files2Chk == null || files2Chk.Count() == 0)
{
<div class="alert alert-info text-dark">
<div class="w-100 text-center fs-4"><i class="fa-solid fa-arrow-up"></i></div>
<div class="w-100 text-center fs-4">@scanMsg</div>
</div>
}
<!-- Modal -->
<div class="modal fade" id="fileDiffModal" tabindex="-1" aria-labelledby="fileDiffModalLabel" aria-hidden="true">
WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
+29 -10
View File
@@ -21,6 +21,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
private int sendDataVal = 0;
private string titleMsg = "Scanning directories";
private string scanMsg = "CLICK TO SCAN";
[Parameter]
public CompoSelectFilter actFilter { get; set; } = new CompoSelectFilter();
@@ -164,12 +165,13 @@ namespace WebDoorCreator.UI.Components.FilesMan
{
await Task.Delay(1);
//var sb = new StringBuilder();
string dir2chk = "";
foreach (var item in files2Chk)
var files2Save = searchRecords.Where(x => x.Value.action).ToDictionary(x => x.Key, x => x.Value);
foreach (var item in files2Save)
{
var fileDIrs = item.Key.Split("\\");
string dir2chk = "";
var fileDirs = item.Key.Split("\\");
foreach (var dir in fileDIrs.SkipLast(1))
foreach (var dir in fileDirs.SkipLast(1))
{
dir2chk += $"\\{dir}";
if (!Directory.Exists($"{rootPathOld}{dir2chk}"))
@@ -192,20 +194,32 @@ namespace WebDoorCreator.UI.Components.FilesMan
File.Delete($"{rootPathOld}\\{item.Key}");
}
}
await doScan();
}
protected async Task doScan()
{
isLoading = true;
//await StartLongTimer();
//isSendingData = true;
isLoading = true;
sendDataVal = 0;
sendDataNextVal = 90;
var updTask1 = Task.Run(async () =>
await WDCService.populateHws()
);
await updTask1;
searchRecords = new Dictionary<string, FileDTO>();
tempDOT.Clear();
await WDCService.populateHws();
var oldFiles = await WDCService.scanSrcDestDir(rootPathOld);
var newFiles = await WDCService.scanSrcDestDir(rootPathNew);
tempDOT.Clear();
var updTask2 = Task.Run(async () =>
await WDCService.scanSrcDestDir(rootPathOld)
);
var oldFiles = await updTask2;
// ;
sendDataVal = 30;
var updTask3 = Task.Run(async () =>
await WDCService.scanSrcDestDir(rootPathNew)
);
var newFiles = await updTask3;
sendDataVal = 60;
//tempDOT = await WDCService.scanAndCompare();
foreach (var item in newFiles)
@@ -226,6 +240,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
searchRecords.Add(item.Key, item.Value);
}
sendDataVal = 90;
foreach (var item in oldFiles)
{
item.Value.status = Core.Enum.fileStatus.rem;
@@ -237,6 +252,10 @@ namespace WebDoorCreator.UI.Components.FilesMan
sendDataVal = 100;
sendDataNextVal = 100;
isLoading = false;
if (searchRecords.Count == 0)
{
scanMsg = "THE DIRECTORIES HAVE NO DIFFERENCES";
}
}
protected override async Task OnParametersSetAsync()
WebDoorCreator.UI/Components/FilesMan/VocRefresh.razor
+9 -5
View File
@@ -27,8 +27,8 @@ else
<thead>
<tr>
<th class="text-end">Old text</th>
<th>New text</th>
<th></th>
<th>New text</th>
</tr>
</thead>
<tbody>
@@ -52,14 +52,14 @@ else
<td class="col-5 text-end text-danger text-decoration-line-through">
@($"{item.Key} --> {vocLemmas2Dict[item.Key]}")
</td>
<td class="col-5 text-start text-success">
@($"{item.Key} --> {item.Value}")
</td>
<td class="col-1 text-center">
<div class="form-check">
@if (isReady2Save(item.Key))
{
<input class="form-check-input" type="checkbox" value="" id="flexCheckChecked" checked @onclick="()=>setConf(item.Key, false)">
<button @onclick="()=>setConf(item.Key, false)">
</button>
@*<input class="form-check-input" type="checkbox" value="" id="flexCheckChecked" checked @onclick="()=>setConf(item.Key, false)">*@
}
else
{
@@ -67,6 +67,10 @@ else
}
</div>
</td>
<td class="col-5 text-start text-success">
@($"{item.Key} --> {item.Value}")
</td>
}
</tr>
WebDoorCreator.UI/DX.txt
+1 -1
View File
File diff suppressed because one or more lines are too long
WebDoorCreator.UI/Pages/SuperAdmin.razor
+6 -2
View File
@@ -15,11 +15,15 @@
@if (CurrMode == AdminMode.Company)
{
<CompanyList E_currCompany="catchCurrComp"></CompanyList>
<div class="p-2">
<CompanyList E_currCompany="catchCurrComp"></CompanyList>
</div>
}
else if (CurrMode == AdminMode.Interface)
{
<VocRefresh lang="EN"></VocRefresh>
<div class="p-2">
<VocRefresh lang="EN"></VocRefresh>
</div>
}
else if (CurrMode == AdminMode.Component)
{
WebDoorCreator.UI/SX.txt
+1 -1
View File
File diff suppressed because one or more lines are too long
WebDoorCreator.UI/WebDoorCreator.UI.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>0.9.2309.0410</Version>
<Version>0.9.2309.0414</Version>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
</PropertyGroup>