expvintl/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix resource duplication

Browse Source
This commit is contained in:
Sardelka
2022-07-20 09:32:26 +08:00
parent 264158957c
commit 51dd445a31
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RageCoop.Client/Networking/DownloadManager.cs
View File

@ -15,9 +15,9 @@ namespace RageCoop.Client
{
var fr = new Packets.FileTransferRequest();
fr.Unpack(data);
if (fr.Name.EndsWith(".zip"))
if (fr.Name.EndsWith(".res"))
{
_zips.Add(fr.Name);
_resources.Add(fr.Name);
}
return new Packets.FileTransferResponse()
{
@ -44,7 +44,7 @@ namespace RageCoop.Client
{
try
{
Main.Resources.Load(ResourceFolder,_zips.ToArray());
Main.Resources.Load(ResourceFolder,_resources.ToArray());
return new Packets.FileTransferResponse() { ID=0, Response=FileResponse.Loaded };
}
catch(Exception ex)
@ -62,7 +62,7 @@ namespace RageCoop.Client
}
}
private static readonly Dictionary<int, DownloadFile> InProgressDownloads = new Dictionary<int, DownloadFile>();
private static readonly List<string> _zips = new List<string>();
private static readonly HashSet<string> _resources = new HashSet<string>();
public static bool AddFile(int id, string name, long length)
{
var path = $"{ResourceFolder}\\{name}";
@ -149,10 +149,6 @@ namespace RageCoop.Client
{
InProgressDownloads.Remove(id);
f.Dispose();
if (f.FileName.EndsWith(".zip"))
{
_zips.Add(f.FileName);
}
Main.Logger.Info($"Download finished:{f.FileName}");
DownloadCompleted?.Invoke(null, Path.Combine(ResourceFolder, f.FileName));
}
@ -172,15 +168,7 @@ namespace RageCoop.Client
}
InProgressDownloads.Clear();
}
if (Directory.Exists(ResourceFolder))
{
foreach (var zip in Directory.GetDirectories(ResourceFolder, "*.zip"))
{
File.Delete(zip);
}
}
_zips.Clear();
_resources.Clear();
}
}

6
RageCoop.Server/Scripting/Resources.cs
View File

@ -41,7 +41,7 @@ namespace RageCoop.Server.Scripting
{
// Pack client side resource as a zip file
Logger?.Info("Packing client-side resource: "+resourceFolder);
var zipPath = Path.Combine(tmpDir, Path.GetFileName(resourceFolder))+".zip";
var zipPath = Path.Combine(tmpDir, Path.GetFileName(resourceFolder))+".res";
try
{
using (ZipFile zip = ZipFile.Create(zipPath))
@ -67,7 +67,7 @@ namespace RageCoop.Server.Scripting
}
}
}
var packed = Directory.GetFiles(path, "*.zip", SearchOption.TopDirectoryOnly);
var packed = Directory.GetFiles(path, "*.res", SearchOption.TopDirectoryOnly);
if (packed.Length>0)
{
ClientResourceZips.AddRange(packed);
@ -100,7 +100,7 @@ namespace RageCoop.Server.Scripting
Logger?.Error(ex);
}
}
foreach (var resource in Directory.GetFiles(path, "*.zip", SearchOption.TopDirectoryOnly))
foreach (var resource in Directory.GetFiles(path, "*.res", SearchOption.TopDirectoryOnly))
{
try
{