lanpartytools/LANCommander
lanpartytools/LANCommander
1
0
Fork 0
Code Issues Pull requests Projects Releases 17 Packages Activity

Converted GamesController to use services

Browse source
This commit is contained in:
Pat Hartl 2023-01-09 01:35:08 -06:00
parent bb6d6b7845
commit 2625aec8ff
7 changed files with 153 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

161
LANCommander/Controllers/GamesController.cs
View file

@ -20,14 +20,16 @@ namespace LANCommander.Controllers
{
private readonly DatabaseContext Context;
private readonly GameService GameService;
private readonly ArchiveService ArchiveService;
private readonly CategoryService CategoryService;
private readonly TagService TagService;
private readonly GenreService GenreService;
public GamesController(DatabaseContext context, GameService gameService, CategoryService categoryService, TagService tagService, GenreService genreService)
public GamesController(DatabaseContext context, GameService gameService, ArchiveService archiveService, CategoryService categoryService, TagService tagService, GenreService genreService)
{
Context = context;
GameService = gameService;
ArchiveService = archiveService;
CategoryService = categoryService;
TagService = tagService;
GenreService = genreService;
@ -36,9 +38,7 @@ namespace LANCommander.Controllers
// GET: Games
public async Task<IActionResult> Index()
{
return Context.Games != null ?
View(await Context.Games.ToListAsync()) :
Problem("Entity set 'DatabaseContext.Games' is null.");
return View(GameService.Get());
}
// GET: Games/Create
@ -56,34 +56,21 @@ namespace LANCommander.Controllers
{
if (ModelState.IsValid)
{
using (Repository<Game> repo = new Repository<Game>(Context, HttpContext))
{
await repo.Add(game);
await repo.SaveChanges();
}
await GameService.Add(game);
return RedirectToAction(nameof(Index));
}
return View(game);
}
// GET: Games/Edit/5
public async Task<IActionResult> Edit(Guid? id)
{
Game game;
Game game = await GameService.Get(id.GetValueOrDefault());
if (id == null || Context.Games == null)
{
if (game == null)
return NotFound();
}
using (Repository<Game> repo = new Repository<Game>(Context, HttpContext))
{
game = await repo.Find(id.GetValueOrDefault());
if (game == null)
return NotFound();
}
return View(game);
}
@ -104,16 +91,11 @@ namespace LANCommander.Controllers
{
try
{
using (Repository<Game> repo = new Repository<Game>(Context, HttpContext))
{
repo.Update(game);
await repo.SaveChanges();
}
await GameService.Update(game);
}
catch (DbUpdateConcurrencyException)
{
if (!GameExists(game.Id))
if (!GameService.Exists(game.Id))
{
return NotFound();
}
@ -122,6 +104,7 @@ namespace LANCommander.Controllers
throw;
}
}
return RedirectToAction(nameof(Index));
}
return View(game);
@ -135,8 +118,8 @@ namespace LANCommander.Controllers
return NotFound();
}
var game = await Context.Games
.FirstOrDefaultAsync(m => m.Id == id);
var game = await GameService.Get(id.GetValueOrDefault());
if (game == null)
{
return NotFound();
@ -150,122 +133,28 @@ namespace LANCommander.Controllers
[ValidateAntiForgeryToken]
public async Task<IActionResult> DeleteConfirmed(Guid id)
{
using (Repository<Game> repo = new Repository<Game>(Context, HttpContext))
{
var game = await repo.Find(id);
var game = await GameService.Get(id);
if (game == null)
return NotFound();
if (game == null)
return NotFound();
if (game.Archives != null && game.Archives.Count > 0)
{
using (var archiveRepo = new Repository<Archive>(Context, HttpContext))
{
foreach (var archive in game.Archives.OrderByDescending(a => a.CreatedOn))
{
var archiveFile = Path.Combine("Upload", archive.ObjectKey);
var iconFile = Path.Combine("Icon", $"{game.Id}.png");
await GameService.Delete(game);
if (System.IO.File.Exists(archiveFile))
System.IO.File.Delete(archiveFile);
if (System.IO.File.Exists(iconFile))
System.IO.File.Delete(iconFile);
archiveRepo.Delete(archive);
}
await archiveRepo.SaveChanges();
}
}
repo.Delete(game);
await repo.SaveChanges();
return RedirectToAction(nameof(Index));
}
return RedirectToAction(nameof(Index));
}
public async Task<IActionResult> GetIcon(Guid id)
{
var cachedPath = Path.Combine("Icon", $"{id}.png");
if (!System.IO.Directory.Exists("Icon"))
System.IO.Directory.CreateDirectory("Icon");
if (System.IO.File.Exists(cachedPath))
try
{
return File(System.IO.File.ReadAllBytes(cachedPath), "image/png");
var game = await GameService.Get(id);
return File(GameService.GetIcon(game), "image/png");
}
else
catch (FileNotFoundException ex)
{
using (var repo = new Repository<Game>(Context, HttpContext))
{
var game = await repo.Find(id);
if (game.Archives == null || game.Archives.Count == 0)
return NotFound();
var archive = game.Archives.OrderByDescending(a => a.CreatedOn).FirstOrDefault();
Bitmap bitmap = null;
var manifest = ArchiveService.ReadManifest(archive.ObjectKey);
var iconReference = ArchiveService.ReadFile(archive.ObjectKey, manifest.Icon);
if (IsWinPEFile(iconReference))
{
var tmp = System.IO.Path.GetTempFileName();
System.IO.File.WriteAllBytes(tmp, iconReference);
var icon = System.Drawing.Icon.ExtractAssociatedIcon(tmp);
bitmap = icon.ToBitmap();
}
else
{
using (var ms = new MemoryStream(iconReference))
{
bitmap = (Bitmap)Bitmap.FromStream(ms);
}
}
var iconPng = ConvertToPng(bitmap);
System.IO.File.WriteAllBytes(cachedPath, iconPng);
return File(iconPng, "image/png");
}
}
}
private static bool IsWinPEFile(byte[] file)
{
var mz = new byte[2];
using (var ms = new MemoryStream(file))
{
ms.Read(mz, 0, 2);
}
return System.Text.Encoding.UTF8.GetString(mz) == "MZ";
}
private static byte[] ConvertToPng(Image img)
{
using (var stream = new MemoryStream())
{
img.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
return stream.ToArray();
}
}
private bool GameExists(Guid id)
{
return (Context.Games?.Any(e => e.Id == id)).GetValueOrDefault();
return NotFound();
}
}
}
}

5
LANCommander/Extensions/StringExtensions.cs
View file

@ -10,5 +10,10 @@ namespace LANCommander.Extensions
return removeInvalidChars.Replace(filename, replacement);
}
public static string ToPath(this string path)
{
return Path.Combine(path.Split("/"));
}
}
}

17
LANCommander/Helpers/DirectoryHelpers.cs Normal file
View file

@ -0,0 +1,17 @@
namespace LANCommander.Helpers
{
public static class DirectoryHelpers
{
public static void DeleteIfExists(string path, bool recursive = true)
{
if (Directory.Exists(path))
Directory.Delete(path, recursive);
}
public static void CreateIfMissing(string path)
{
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
}
}
}

11
LANCommander/Helpers/FileHelpers.cs Normal file
View file

@ -0,0 +1,11 @@
namespace LANCommander.Helpers
{
public static class FileHelpers
{
public static void DeleteIfExists(string path)
{
if (File.Exists(path))
File.Delete(path);
}
}
}

3
LANCommander/Program.cs
View file

@ -97,4 +97,7 @@ app.MapRazorPages();
if (!Directory.Exists("Upload"))
Directory.CreateDirectory("Upload");
if (!Directory.Exists("Icon"))
Directory.CreateDirectory("Icon");
app.Run();

19
LANCommander/Services/BaseDatabaseService.cs
View file

@ -4,7 +4,7 @@ using System.Linq.Expressions;
namespace LANCommander.Services
{
public class BaseDatabaseService<T> where T : BaseModel
public abstract class BaseDatabaseService<T> where T : BaseModel
{
public DatabaseContext Context { get; set; }
public HttpContext HttpContext { get; set; }
@ -14,12 +14,12 @@ namespace LANCommander.Services
HttpContext = httpContextAccessor.HttpContext;
}
public ICollection<T> Get()
public virtual ICollection<T> Get()
{
return Get(x => true).ToList();
}
public async Task<T> Get(Guid id)
public virtual async Task<T> Get(Guid id)
{
using (var repo = new Repository<T>(Context, HttpContext))
{
@ -27,7 +27,7 @@ namespace LANCommander.Services
}
}
public IQueryable<T> Get(Expression<Func<T, bool>> predicate)
public virtual IQueryable<T> Get(Expression<Func<T, bool>> predicate)
{
using (var repo = new Repository<T>(Context, HttpContext))
{
@ -35,7 +35,12 @@ namespace LANCommander.Services
}
}
public async Task<T> Add(T entity)
public virtual bool Exists(Guid id)
{
return Get(id) != null;
}
public virtual async Task<T> Add(T entity)
{
using (var repo = new Repository<T>(Context, HttpContext))
{
@ -46,7 +51,7 @@ namespace LANCommander.Services
}
}
public async Task<T> Update(T entity)
public virtual async Task<T> Update(T entity)
{
using (var repo = new Repository<T>(Context, HttpContext))
{
@ -57,7 +62,7 @@ namespace LANCommander.Services
}
}
public async Task Delete(T entity)
public virtual async Task Delete(T entity)
{
using (var repo = new Repository<T>(Context, HttpContext))
{

80
LANCommander/Services/GameService.cs
View file

@ -1,5 +1,8 @@
using LANCommander.Data;
using LANCommander.Data.Models;
using LANCommander.Extensions;
using LANCommander.Helpers;
using System.Drawing;
namespace LANCommander.Services
{
@ -8,5 +11,82 @@ namespace LANCommander.Services
public GameService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
{
}
public override async Task Delete(Game game)
{
foreach (var archive in game.Archives.OrderByDescending(a => a.CreatedOn))
{
FileHelpers.DeleteIfExists($"Icon/{game.Id}.png".ToPath());
FileHelpers.DeleteIfExists($"Upload/{archive.ObjectKey}".ToPath());
}
await base.Delete(game);
}
public byte[] GetIcon(Game game)
{
var cachedPath = $"Icon/{game.Id}.png";
if (File.Exists(cachedPath))
return File.ReadAllBytes(cachedPath);
else
{
if (game.Archives == null || game.Archives.Count == 0)
throw new FileNotFoundException();
var archive = game.Archives.OrderByDescending(a => a.CreatedOn).FirstOrDefault();
Bitmap bitmap = null;
var manifest = ArchiveService.ReadManifest(archive.ObjectKey);
var iconReference = ArchiveService.ReadFile(archive.ObjectKey, manifest.Icon);
if (IsWinPEFile(iconReference))
{
var tmp = System.IO.Path.GetTempFileName();
System.IO.File.WriteAllBytes(tmp, iconReference);
var icon = System.Drawing.Icon.ExtractAssociatedIcon(tmp);
bitmap = icon.ToBitmap();
}
else
{
using (var ms = new MemoryStream(iconReference))
{
bitmap = (Bitmap)Bitmap.FromStream(ms);
}
}
var iconPng = ConvertToPng(bitmap);
File.WriteAllBytes(cachedPath, iconPng);
return iconPng;
}
}
private static bool IsWinPEFile(byte[] file)
{
var mz = new byte[2];
using (var ms = new MemoryStream(file))
{
ms.Read(mz, 0, 2);
}
return System.Text.Encoding.UTF8.GetString(mz) == "MZ";
}
private static byte[] ConvertToPng(Image img)
{
using (var stream = new MemoryStream())
{
img.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
return stream.ToArray();
}
}
}
}