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

Fix resource loading

Browse Source
This commit is contained in:
sardelka9515
2022-10-19 19:07:29 +08:00
parent 9e0ce58bd2
commit a50ae062d8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Client/Scripts/Scripting/Resources.cs
View File

@ -44,8 +44,16 @@ namespace RageCoop.Client.Scripting
} }
internal class Resources internal class Resources
{ {
public static string TempPath;
internal readonly ConcurrentDictionary<string, ClientResource> LoadedResources = new ConcurrentDictionary<string, ClientResource>(); internal readonly ConcurrentDictionary<string, ClientResource> LoadedResources = new ConcurrentDictionary<string, ClientResource>();
private Logger Logger { get; set; } private Logger Logger { get; set; }
static Resources()
{
TempPath = Path.Combine(Path.GetTempPath(), "RageCoop");
if (Directory.Exists(TempPath)) { try { Directory.Delete(TempPath, true); } catch { } }
TempPath = CoreUtils.GetTempDirectory(TempPath);
Directory.CreateDirectory(TempPath);
}
public Resources() public Resources()
{ {
Logger = Main.Logger; Logger = Main.Logger;
@ -66,7 +74,10 @@ namespace RageCoop.Client.Scripting
{ {
Main.QueueToMainThreadAndWait(() => Main.QueueToMainThreadAndWait(() =>
{ {
Directory.GetFiles(path, "*.dll", SearchOption.AllDirectories).ForEach(x => ScriptDomain.CurrentDomain.StartScripts(x)); foreach (var res in LoadedResources)
{
Directory.GetFiles(res.Value.ScriptsDirectory, "*.dll", SearchOption.AllDirectories).ForEach(x => ScriptDomain.CurrentDomain.StartScripts(x));
}
SetupScripts(); SetupScripts();
}); });
}); });
@ -79,7 +90,7 @@ namespace RageCoop.Client.Scripting
Loader.LoaderContext.RequestUnload(); Loader.LoaderContext.RequestUnload();
} }
private void Unpack(string zipPath, string dataFolderRoot) private ClientResource Unpack(string zipPath, string dataFolderRoot)
{ {
var r = new ClientResource() var r = new ClientResource()
{ {
@ -87,7 +98,7 @@ namespace RageCoop.Client.Scripting
Scripts = new List<ClientScript>(), Scripts = new List<ClientScript>(),
Name = Path.GetFileNameWithoutExtension(zipPath), Name = Path.GetFileNameWithoutExtension(zipPath),
DataFolder = Path.Combine(dataFolderRoot, Path.GetFileNameWithoutExtension(zipPath)), DataFolder = Path.Combine(dataFolderRoot, Path.GetFileNameWithoutExtension(zipPath)),
ScriptsDirectory = Path.Combine(Directory.GetParent(zipPath).FullName, Path.GetFileNameWithoutExtension(zipPath)) ScriptsDirectory = Path.Combine(TempPath, Path.GetFileNameWithoutExtension(zipPath)),
}; };
Directory.CreateDirectory(r.DataFolder); Directory.CreateDirectory(r.DataFolder);
var scriptsDir = r.ScriptsDirectory; var scriptsDir = r.ScriptsDirectory;
@ -96,7 +107,7 @@ namespace RageCoop.Client.Scripting
Directory.CreateDirectory(scriptsDir); Directory.CreateDirectory(scriptsDir);
new FastZip().ExtractZip(zipPath, scriptsDir, null); new FastZip().ExtractZip(zipPath, scriptsDir, null);
foreach (var dir in Directory.GetDirectories(scriptsDir, "*", SearchOption.AllDirectories)) foreach (var dir in Directory.GetDirectories(scriptsDir, "*", SearchOption.AllDirectories))
{ {
@ -132,6 +143,7 @@ namespace RageCoop.Client.Scripting
} }
LoadedResources.TryAdd(r.Name, r); LoadedResources.TryAdd(r.Name, r);
return r;
} }
private void SetupScripts() private void SetupScripts()