lancommander-ref/LANCommander
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix upload archive being deleted before disposed

Browse source
This commit is contained in:
Pat Hartl 2025-02-16 10:48:21 -06:00
parent 54acf8e60c
commit f802448aaa
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
LANCommander.Server.Services/ImportService.cs
View file

@ -15,9 +15,17 @@ public class ImportService<T>(
{
var importArchive = await archiveService.FirstOrDefaultAsync(a => a.ObjectKey == objectKey.ToString());
var importArchivePath = await archiveService.GetArchiveFileLocationAsync(importArchive);
T entity;
using var importZip = ZipFile.OpenRead(importArchivePath);
return await importer.ImportAsync(objectKey, importZip);
using (var importZip = ZipFile.OpenRead(importArchivePath))
{
entity = await importer.ImportAsync(objectKey, importZip);
}
await archiveService.DeleteAsync(importArchive);
return entity;
}
public async Task<T> ImportFromLocalFileAsync(string localFilePath)

3
LANCommander.Server.Services/Importers/GameImporter.cs
View file

@ -23,7 +23,6 @@ public class GameImporter(
public async Task<Game> ImportAsync(Guid objectKey, ZipArchive importZip)
{
var importArchive = await archiveService.FirstOrDefaultAsync(a => a.ObjectKey == objectKey.ToString());
var importArchivePath = await archiveService.GetArchiveFileLocationAsync(importArchive);
var storageLocation = await storageLocationService.GetAsync(importArchive.StorageLocationId);
var manifest = ManifestHelper.Deserialize<GameManifest>(await importZip.ReadAllTextAsync(ManifestHelper.ManifestFilename));
@ -45,8 +44,6 @@ public class GameImporter(
game = await UpdateCollections(game, manifest);
game = await UpdateDependentGames(game, manifest);
await archiveService.DeleteAsync(importArchive, storageLocation);
return game;
}