-
-
-
+
+
+
+ @if (!FeatureFlag.DISABLE_MULTI_MAP())
+ {
+
+
+ @foreach (var item in WHMaps)
+ {
+
+
+
+
+
+
-
- }
-
-
- @if (_selectedSystemLink == null && _selectedSystemNode == null)
- {
- Add System
- }
+ }
+
+
+ @if (_isAdmin)
+ {
+
+
+
+
+
+ }
+
+
+ }
+ else
+ {
+
+
+
+
+
+ }
+
+
+ @if (_selectedSystemLink == null && _selectedSystemNode == null)
+ {
+ Add System
+ }
- @if (_selectedSystemLink != null)
- {
- Toggle EOL
-
-
-
- Normal
- Critical
- Verge
-
-
+ @if (_selectedSystemLink != null)
+ {
+
Toggle EOL
+
+
+
+ Normal
+ Critical
+ Verge
+
+
-
-
- Small
- Medium
- Large
- XLarge
-
-
-
- }
+
+
+ Small
+ Medium
+ Large
+ XLarge
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/WHMapper/Pages/Mapper/Signatures/Import.cs b/WHMapper/Pages/Mapper/Signatures/Import.cs
index 7306f6b1..e5cb2f24 100644
--- a/WHMapper/Pages/Mapper/Signatures/Import.cs
+++ b/WHMapper/Pages/Mapper/Signatures/Import.cs
@@ -24,8 +24,6 @@ namespace WHMapper.Pages.Mapper.Signatures
[Authorize(Policy = "Access")]
public partial class Import : Microsoft.AspNetCore.Components.ComponentBase
{
- private const string _scanResultRegex = "[a-zA-Z]{3}-[0-9]{3}\\s([a-zA-Z\\s]+)[0-9]*.[0-9]+%\\s[0-9]*.[0-9]+\\sAU";
-
[Inject]
private IEveUserInfosServices UserService { get; set; } = null!;
@@ -48,7 +46,7 @@ public partial class Import : Microsoft.AspNetCore.Components.ComponentBase
private FluentValueValidator
_ccValidator = new FluentValueValidator(x => x
.NotEmpty()
.NotNull()
- .Matches(_scanResultRegex));
+ .Matches(IWHSignatureHelper.SCAN_VALIDATION_REGEX));
private string _scanResult = String.Empty;
private bool _lazyDeleted = false;
diff --git a/WHMapper/Pages/Mapper/Signatures/Import.razor b/WHMapper/Pages/Mapper/Signatures/Import.razor
index be160ce2..697050b7 100644
--- a/WHMapper/Pages/Mapper/Signatures/Import.razor
+++ b/WHMapper/Pages/Mapper/Signatures/Import.razor
@@ -8,7 +8,7 @@
- Cancel
- Update Signatures
+ Cancel
+ Update Signatures
diff --git a/WHMapper/Pages/Mapper/Signatures/Overview.razor b/WHMapper/Pages/Mapper/Signatures/Overview.razor
index b7b65e1a..7816b0a9 100644
--- a/WHMapper/Pages/Mapper/Signatures/Overview.razor
+++ b/WHMapper/Pages/Mapper/Signatures/Overview.razor
@@ -1,84 +1,84 @@
@using WHMapper.Models.DTO.Anoik;
-
-
-
-
-
-
-
-
-
-
-
-
-
- Name
- Group
- Type
- Created
- Created by
- Updated
- Updated by
-
-
-
-
-
-
- @context.Name
- @context.Group
- @if (@context.Group == Models.Db.Enums.WHSignatureGroup.Wormhole && !String.IsNullOrEmpty(context.Type) && context.Type.Contains(" -> "))
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+ Group
+ Type
+ Created
+ Created by
+ Updated
+ Updated by
+
+
+
+
+
+
+ @context.Name
+ @context.Group
+ @if (@context.Group == Models.Db.Enums.WHSignatureGroup.Wormhole && !String.IsNullOrEmpty(context.Type) && context.Type.Contains(" -> "))
+ {
+ var splitRes = @context.Type.Split(" -> ");
+ @context.Type
+ }
+ else
+ {
+ @context.Type
+ }
+ @(DateDiff(_currentDateTime,context.Created))
+ @context.CreatedBy
+ @(DateDiff(_currentDateTime,context.Updated))
+ @context.UpdatedBy
+
+
+
+
+
+ @context.Name
+
+
+ @foreach (WHMapper.Models.Db.Enums.WHSignatureGroup item in Enum.GetValues(typeof(WHMapper.Models.Db.Enums.WHSignatureGroup)))
+ {
+ @GetDisplayText(item)
+ }
+
+
+
+
+ @if (@context.Group == Models.Db.Enums.WHSignatureGroup.Wormhole)
{
- var splitRes = @context.Type.Split(" -> ");
- @context.Type
+
+ @foreach (WormholeTypeInfo wti in AnoikServices.GetWormholeTypes().Result)
+ {
+ @wti.ToString()
+ }
+
}
else
{
- @context.Type
+
}
- @(DateDiff(_currentDateTime,context.Created))
- @context.CreatedBy
- @(DateDiff(_currentDateTime,context.Updated))
- @context.UpdatedBy
-
-
-
-
-
- @context.Name
-
-
- @foreach (WHMapper.Models.Db.Enums.WHSignatureGroup item in Enum.GetValues(typeof(WHMapper.Models.Db.Enums.WHSignatureGroup)))
- {
- @GetDisplayText(item)
- }
-
+
+ @(DateDiff(_currentDateTime,context.Created))
+ @context.CreatedBy
+ @(DateDiff(_currentDateTime,context.Updated))
+ @context.UpdatedBy
+
+
-
-
- @if (@context.Group == Models.Db.Enums.WHSignatureGroup.Wormhole)
- {
-
- @foreach (WormholeTypeInfo wti in AnoikServices.GetWormholeTypes().Result)
- {
- @wti.ToString()
- }
-
- }
- else
- {
-
- }
-
- @(DateDiff(_currentDateTime,context.Created))
- @context.CreatedBy
- @(DateDiff(_currentDateTime,context.Updated))
- @context.UpdatedBy
-
-
-
\ No newline at end of file
diff --git a/WHMapper/Pages/Mapper/SystemInfos/Overview.razor b/WHMapper/Pages/Mapper/SystemInfos/Overview.razor
index 2aa48f56..3f00b1f7 100644
--- a/WHMapper/Pages/Mapper/SystemInfos/Overview.razor
+++ b/WHMapper/Pages/Mapper/SystemInfos/Overview.razor
@@ -1,4 +1,4 @@
-
+
Name:
@@ -66,4 +66,4 @@
}
-
+
\ No newline at end of file
diff --git a/WHMapper/Program.cs b/WHMapper/Program.cs
index 9096f5d6..7df0a55f 100644
--- a/WHMapper/Program.cs
+++ b/WHMapper/Program.cs
@@ -56,8 +56,8 @@
// Add services to the container.
-builder.Services.AddDbContext(options =>
- options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection")),ServiceLifetime.Transient);
+builder.Services.AddDbContextFactory(options =>
+ options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection")));
builder.Services.AddSignalR();
@@ -99,6 +99,10 @@
IConfigurationSection evessoConf = builder.Configuration.GetSection("EveSSO");
+IConfigurationSection evessoConfScopes = evessoConf.GetSection("DefaultScopes");
+
+
+
AuthenticationBuilder authenticationBuilder = builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
.AddCookie(CookieAuthenticationDefaults.AuthenticationScheme, options =>
{
@@ -110,11 +114,11 @@
options.ClientSecret = evessoConf["Secret"];
options.CallbackPath = new PathString("/sso/callback");
options.Scope.Clear();
- options.Scope.Add("esi-location.read_location.v1");
- options.Scope.Add("esi-location.read_ship_type.v1");
- options.Scope.Add("esi-ui.open_window.v1");
- options.Scope.Add("esi-ui.write_waypoint.v1");
- options.Scope.Add("esi-search.search_structures.v1");
+
+ foreach (string scope in evessoConfScopes.Get())
+ options.Scope.Add(scope);
+
+
options.SaveTokens = true;
options.UsePkce = true;
})
diff --git a/WHMapper/Repositories/ADefaultRepository.cs b/WHMapper/Repositories/ADefaultRepository.cs
index 9ffaa4dd..80217fff 100644
--- a/WHMapper/Repositories/ADefaultRepository.cs
+++ b/WHMapper/Repositories/ADefaultRepository.cs
@@ -2,7 +2,8 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
-
+using Microsoft.EntityFrameworkCore;
+
namespace WHMapper.Repositories
{
@@ -12,9 +13,9 @@ namespace WHMapper.Repositories
/// Server DbContext
/// Object to Manage in database
/// type of Id of Object
- public abstract class ADefaultRepository : IDefaultRepository
+ public abstract class ADefaultRepository where C : DbContext
{
- protected readonly C _dbContext;
+ protected readonly IDbContextFactory _contextFactory;
protected abstract Task?> AGetAll();
protected abstract Task AGetById(U id);
@@ -22,12 +23,9 @@ public abstract class ADefaultRepository : IDefaultRepository
protected abstract Task AUpdate(U id, T item);
protected abstract Task ADeleteById(U id);
-
- protected static SemaphoreSlim semSlim = new SemaphoreSlim(1, 1);
-
- public ADefaultRepository(C dbContext)
+ public ADefaultRepository(IDbContextFactory dbContext)
{
- _dbContext = dbContext;
+ _contextFactory = dbContext;
}
public async Task Create(T item)
@@ -56,5 +54,7 @@ public async Task DeleteById(U id)
return await AUpdate(id, item);
}
+
+
}
}
diff --git a/WHMapper/Repositories/WHAccesses/WHAccessRepository.cs b/WHMapper/Repositories/WHAccesses/WHAccessRepository.cs
index 003f1bda..c21f2d89 100644
--- a/WHMapper/Repositories/WHAccesses/WHAccessRepository.cs
+++ b/WHMapper/Repositories/WHAccesses/WHAccessRepository.cs
@@ -8,94 +8,97 @@ namespace WHMapper.Repositories.WHAccesses
{
public class WHAccessRepository : ADefaultRepository, IWHAccessRepository
{
- public WHAccessRepository(WHMapperContext context) : base(context)
+ public WHAccessRepository(IDbContextFactory context)
+ : base(context)
{
}
protected override async Task ACreate(WHAccess item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- await _dbContext.DbWHAccesses.AddAsync(item);
- await _dbContext.SaveChangesAsync();
+ try
+ {
+ await context.DbWHAccesses.AddAsync(item);
+ await context.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
- }
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
}
protected override async Task ADeleteById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- var deleteRow = await _dbContext.DbWHAccesses.Where(x => x.Id == id).ExecuteDeleteAsync();
- if (deleteRow > 0)
- return true;
- else
+ try
+ {
+ var deleteRow = await context.DbWHAccesses.Where(x => x.Id == id).ExecuteDeleteAsync();
+ if (deleteRow > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception ex)
+ {
return false;
- }
- catch (Exception ex)
- {
- return false;
- }
- finally
- {
- semSlim.Release();
+ }
}
}
protected override async Task?> AGetAll()
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- return await _dbContext.DbWHAccesses.ToListAsync();
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ return await context.DbWHAccesses.ToListAsync();
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AGetById(int id)
{
- await semSlim.WaitAsync();
- try
- {
- return await _dbContext.DbWHAccesses.FindAsync(id);
- }
- finally
+ using (var context = _contextFactory.CreateDbContext())
{
- semSlim.Release();
- }
+ try
+ {
+ return await context.DbWHAccesses.FindAsync(id);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
}
protected override async Task AUpdate(int id, WHAccess item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (id != item.Id)
- return null;
+ try
+ {
+ if (id != item.Id)
+ return null;
- _dbContext.DbWHAccesses.Update(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- finally
- {
- semSlim.Release();
+ context.DbWHAccesses.Update(item);
+ await context.SaveChangesAsync();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
}
diff --git a/WHMapper/Repositories/WHAdmins/WHAdminRepository.cs b/WHMapper/Repositories/WHAdmins/WHAdminRepository.cs
index a3e7caad..8f218608 100644
--- a/WHMapper/Repositories/WHAdmins/WHAdminRepository.cs
+++ b/WHMapper/Repositories/WHAdmins/WHAdminRepository.cs
@@ -8,94 +8,97 @@ namespace WHMapper.Repositories.WHAdmins
{
public class WHAdminRepository : ADefaultRepository, IWHAdminRepository
{
- public WHAdminRepository(WHMapperContext context) : base(context)
+ public WHAdminRepository(IDbContextFactory context)
+ : base(context)
{
}
protected override async Task ACreate(WHAdmin item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- await _dbContext.DbWHAdmins.AddAsync(item);
- await _dbContext.SaveChangesAsync();
+ try
+ {
+ await context.DbWHAdmins.AddAsync(item);
+ await context.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task ADeleteById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- var deleteRow = await _dbContext.DbWHAdmins.Where(x => x.Id == id).ExecuteDeleteAsync();
- if (deleteRow > 0)
- return true;
- else
+ try
+ {
+ var deleteRow = await context.DbWHAdmins.Where(x => x.Id == id).ExecuteDeleteAsync();
+ if (deleteRow > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception ex)
+ {
return false;
- }
- catch (Exception ex)
- {
- return false;
- }
- finally
- {
- semSlim.Release();
+ }
}
}
protected override async Task?> AGetAll()
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- return await _dbContext.DbWHAdmins.ToListAsync();
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ return await context.DbWHAdmins.ToListAsync();
+ }
+ catch(Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AGetById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- return await _dbContext.DbWHAdmins.FindAsync(id);
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ return await context.DbWHAdmins.FindAsync(id);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AUpdate(int id, WHAdmin item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (id != item.Id)
- return null;
+ try
+ {
+ if (id != item.Id)
+ return null;
- _dbContext.DbWHAdmins.Update(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- finally
- {
- semSlim.Release();
+ context.DbWHAdmins.Update(item);
+ await context.SaveChangesAsync();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
}
diff --git a/WHMapper/Repositories/WHMaps/WHMapRepository.cs b/WHMapper/Repositories/WHMaps/WHMapRepository.cs
index 60262dd9..b815e290 100644
--- a/WHMapper/Repositories/WHMaps/WHMapRepository.cs
+++ b/WHMapper/Repositories/WHMaps/WHMapRepository.cs
@@ -8,101 +8,107 @@ namespace WHMapper.Repositories.WHMaps
{
public class WHMapRepository : ADefaultRepository, IWHMapRepository
{
- public WHMapRepository(WHMapperContext context) : base(context)
+ public WHMapRepository(IDbContextFactory context)
+ : base(context)
{
}
protected override async Task ACreate(WHMap item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- await _dbContext.DbWHMaps.AddAsync(item);
- await _dbContext.SaveChangesAsync();
+ try
+ {
+ await context.DbWHMaps.AddAsync(item);
+ await context.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task ADeleteById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- var deleteRow = await _dbContext.DbWHMaps.Where(x => x.Id == id).ExecuteDeleteAsync();
- if (deleteRow > 0)
- return true;
- else
+ try
+ {
+ var deleteRow = await context.DbWHMaps.Where(x => x.Id == id).ExecuteDeleteAsync();
+ if (deleteRow > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception ex)
+ {
return false;
- }
- catch (Exception ex)
- {
- return false;
- }
- finally
- {
- semSlim.Release();
+ }
}
}
protected override async Task?> AGetAll()
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
+ try
+ {
+
+ if (context.DbWHMaps.Count() == 0)
+ return await context.DbWHMaps.ToListAsync();
+ else
+ return await context.DbWHMaps
+ .Include(x => x.WHSystems)
+ .Include(x => x.WHSystemLinks)
+ .OrderBy(x => x.Name).ToListAsync();
+ }
+ catch(Exception ex)
+ {
+ return null;
+ }
- if (_dbContext.DbWHMaps.Count() == 0)
- return await _dbContext.DbWHMaps.ToListAsync();
- else
- return await _dbContext.DbWHMaps
- .Include(x => x.WHSystems)
- .Include(x => x.WHSystemLinks)
- .OrderBy(x => x.Name).ToListAsync();
- }
- finally
- {
- semSlim.Release();
}
}
protected override async Task AGetById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- return await _dbContext.DbWHMaps.FindAsync(id);
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ return await context.DbWHMaps
+ .Include(x => x.WHSystems)
+ .Include(x => x.WHSystemLinks)
+ .OrderBy(x => x.Name).FirstOrDefaultAsync(x => x.Id==id);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
-
}
protected override async Task AUpdate(int id, WHMap item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (id != item.Id)
- return null;
+ try
+ {
+ if (id != item.Id)
+ return null;
- _dbContext.DbWHMaps.Update(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- finally
- {
- semSlim.Release();
+ context.DbWHMaps.Update(item);
+ await context.SaveChangesAsync();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
}
diff --git a/WHMapper/Repositories/WHSignatures/WHSignatureRepository.cs b/WHMapper/Repositories/WHSignatures/WHSignatureRepository.cs
index ae92ad5a..774055f5 100644
--- a/WHMapper/Repositories/WHSignatures/WHSignatureRepository.cs
+++ b/WHMapper/Repositories/WHSignatures/WHSignatureRepository.cs
@@ -10,198 +10,195 @@ namespace WHMapper.Repositories.WHSignatures
public class WHSignatureRepository : ADefaultRepository, IWHSignatureRepository
{
- public WHSignatureRepository(WHMapperContext context) : base(context)
+ public WHSignatureRepository(IDbContextFactory context)
+ : base(context)
{
}
protected override async Task ACreate(WHSignature item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- await _dbContext.DbWHSignatures.AddAsync(item);
- await _dbContext.SaveChangesAsync();
+ try
+ {
+ await context.DbWHSignatures.AddAsync(item);
+ await context.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task ADeleteById(int id)
{
- await semSlim.WaitAsync();
- try
- {
- await _dbContext.DbWHSignatures.Where(x => x.Id == id).ExecuteDeleteAsync();
- return true;
- }
- catch (Exception ex)
+ using (var context = _contextFactory.CreateDbContext())
{
- return false;
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ await context.DbWHSignatures.Where(x => x.Id == id).ExecuteDeleteAsync();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
}
}
protected override async Task?> AGetAll()
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (_dbContext.DbWHSignatures.Count() == 0)
- return await _dbContext.DbWHSignatures.ToListAsync();
- else
- return await _dbContext.DbWHSignatures.OrderBy(x => x.Id)
- .ToListAsync();
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ if (context.DbWHSignatures.Count() == 0)
+ return await context.DbWHSignatures.ToListAsync();
+ else
+ return await context.DbWHSignatures.OrderBy(x => x.Id)
+ .ToListAsync();
+ }
+ catch(Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AGetById(int id)
{
- await semSlim.WaitAsync();
- try
- {
- return await _dbContext.DbWHSignatures.FindAsync(id);
- }
- finally
+ using (var context = _contextFactory.CreateDbContext())
{
- semSlim.Release();
+ try
+ {
+ return await context.DbWHSignatures.FindAsync(id);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AUpdate(int id, WHSignature item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (id != item.Id)
- return null;
+ try
+ {
+ if (id != item.Id)
+ return null;
- _dbContext.DbWHSignatures.Update(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- finally
- {
- semSlim.Release();
+ context.DbWHSignatures.Update(item);
+ await context.SaveChangesAsync();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
public async Task GetByName(string name)
{
- await semSlim.WaitAsync();
- try
- {
- return await _dbContext.DbWHSignatures.FirstOrDefaultAsync(x => x.Name == name);
- }
- finally
+ using (var context = _contextFactory.CreateDbContext())
{
- semSlim.Release();
+ try
+ {
+ return await context.DbWHSignatures.FirstOrDefaultAsync(x => x.Name == name);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
public async Task> Update(IEnumerable whSignatures)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
-
- foreach (var sig in whSignatures)
+ try
{
- _dbContext.Entry(sig).State = EntityState.Modified;
- }
- await _dbContext.SaveChangesAsync();
+ foreach (var sig in whSignatures)
+ {
+ context.Entry(sig).State = EntityState.Modified;
+ }
- return whSignatures;
- }
- catch(Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ await context.SaveChangesAsync();
+
+ return whSignatures;
+ }
+ catch(Exception ex)
+ {
+ return null;
+ }
}
}
public async Task?> GetByWHId(int whid)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (_dbContext.DbWHSignatures.Count() == 0)
- return await _dbContext.DbWHSignatures.ToListAsync();
- else
- return await _dbContext.DbWHSignatures.Where(x => x.WHId == whid).OrderBy(x => x.Id)
- .ToListAsync();
+ try
+ {
+ if (context.DbWHSignatures.Count() == 0)
+ return await context.DbWHSignatures.ToListAsync();
+ else
+ return await context.DbWHSignatures.Where(x => x.WHId == whid).OrderBy(x => x.Id)
+ .ToListAsync();
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
public async Task DeleteByWHId(int whid)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- int rowDeleted = await _dbContext.DbWHSignatures.Where(x => x.WHId == whid).ExecuteDeleteAsync();
- if (rowDeleted > 0)
- return true;
- else
+ try
+ {
+ int rowDeleted = await context.DbWHSignatures.Where(x => x.WHId == whid).ExecuteDeleteAsync();
+ if (rowDeleted > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception ex)
+ {
return false;
- }
- catch (Exception ex)
- {
- return false;
- }
- finally
- {
- semSlim.Release();
+ }
}
}
public async Task> Create(IEnumerable whSignatures)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- var sigArray = whSignatures.ToArray();
- await _dbContext.DbWHSignatures.AddRangeAsync(sigArray);
- await _dbContext.SaveChangesAsync();
+ try
+ {
+ var sigArray = whSignatures.ToArray();
+ await context.DbWHSignatures.AddRangeAsync(sigArray);
+ await context.SaveChangesAsync();
- return whSignatures;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ return whSignatures;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
}
diff --git a/WHMapper/Repositories/WHSystemLinks/WHSystemLinkRepository.cs b/WHMapper/Repositories/WHSystemLinks/WHSystemLinkRepository.cs
index ede33977..7e34aeae 100644
--- a/WHMapper/Repositories/WHSystemLinks/WHSystemLinkRepository.cs
+++ b/WHMapper/Repositories/WHSystemLinks/WHSystemLinkRepository.cs
@@ -8,92 +8,95 @@ namespace WHMapper.Repositories.WHSystemLinks
{
public class WHSystemLinkRepository : ADefaultRepository, IWHSystemLinkRepository
{
- public WHSystemLinkRepository(WHMapperContext context) : base(context)
+ public WHSystemLinkRepository(IDbContextFactory context)
+ : base(context)
{
}
protected override async Task ACreate(WHSystemLink item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- await _dbContext.DbWHSystemLinks.AddAsync(item);
- await _dbContext.SaveChangesAsync();
+ try
+ {
+ await context.DbWHSystemLinks.AddAsync(item);
+ await context.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- semSlim.Release();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task ADeleteById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- int rowDeleted = await _dbContext.DbWHSystemLinks.Where(x => x.Id == id).ExecuteDeleteAsync();
- if (rowDeleted > 0)
- return true;
- else
+ try
+ {
+ int rowDeleted = await context.DbWHSystemLinks.Where(x => x.Id == id).ExecuteDeleteAsync();
+ if (rowDeleted > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception ex)
+ {
return false;
- }
- catch (Exception ex)
- {
- return false;
- }
- finally
- {
- semSlim.Release();
+ }
}
}
protected override async Task?> AGetAll()
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- return await _dbContext.DbWHSystemLinks.ToListAsync();
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ return await context.DbWHSystemLinks.ToListAsync();
+ }
+ catch(Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AGetById(int id)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- return await _dbContext.DbWHSystemLinks.FindAsync(id);
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ return await context.DbWHSystemLinks.FindAsync(id);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AUpdate(int id, WHSystemLink item)
{
- await semSlim.WaitAsync();
- try
+ using (var context = _contextFactory.CreateDbContext())
{
- if (id != item.Id)
- return null;
+ try
+ {
+ if (id != item.Id)
+ return null;
- _dbContext.DbWHSystemLinks.Update(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- finally
- {
- semSlim.Release();
+ context.DbWHSystemLinks.Update(item);
+ await context.SaveChangesAsync();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
}
diff --git a/WHMapper/Repositories/WHSystems/WHSystemRepository.cs b/WHMapper/Repositories/WHSystems/WHSystemRepository.cs
index e3de57e9..f2af5322 100644
--- a/WHMapper/Repositories/WHSystems/WHSystemRepository.cs
+++ b/WHMapper/Repositories/WHSystems/WHSystemRepository.cs
@@ -10,133 +10,121 @@ namespace WHMapper.Repositories.WHSystems
{
public class WHSystemRepository : ADefaultRepository, IWHSystemRepository
{
- public WHSystemRepository(WHMapperContext context) : base(context)
+ public WHSystemRepository(IDbContextFactory context)
+ : base(context)
{
}
protected override async Task ACreate(WHSystem item)
{
- await semSlim.WaitAsync();
- try
- {
- await _dbContext.DbWHSystems.AddAsync(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
+ using (var context = _contextFactory.CreateDbContext())
{
-
- return null;
- }
- finally
- {
- semSlim.Release();
+ try
+ {
+ await context.DbWHSystems.AddAsync(item);
+ await context.SaveChangesAsync();
+
+ return item;
+ }
+ catch (Exception ex)
+ {
+
+ return null;
+ }
}
}
protected override async Task ADeleteById(int id)
{
- await semSlim.WaitAsync();
- try
- {
- await _dbContext.DbWHSystems.Where(x => x.Id == id).ExecuteDeleteAsync();
- return true;
- }
- catch(Exception ex)
- {
- return false;
- }
- finally
- {
- semSlim.Release();
+ using (var context = _contextFactory.CreateDbContext())
+ {
+ try
+ {
+ await context.DbWHSystems.Where(x => x.Id == id).ExecuteDeleteAsync();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
}
}
protected override async Task?> AGetAll()
{
- await semSlim.WaitAsync();
- try
- {
- if (_dbContext.DbWHSystems.Count() == 0)
- return await _dbContext.DbWHSystems.ToListAsync();
- else
- return await _dbContext.DbWHSystems.OrderBy(x => x.Name)
- .Include(x => x.WHSignatures)
- .ToListAsync();
- }
- catch (Exception ex)
- {
-
- return null;
- }
- finally
- {
- semSlim.Release();
+ using (var context = _contextFactory.CreateDbContext())
+ {
+ try
+ {
+ if (context.DbWHSystems.Count() == 0)
+ return await context.DbWHSystems.ToListAsync();
+ else
+ return await context.DbWHSystems.OrderBy(x => x.Name)
+ .Include(x => x.WHSignatures)
+ .ToListAsync();
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
protected override async Task AGetById(int id)
{
- await semSlim.WaitAsync();
- try
- {
- var res = await _dbContext.DbWHSystems
- .Include(x=>x.WHSignatures)
- .SingleOrDefaultAsync(x => x.Id == id);
-
- return res;
- }
- catch (Exception ex)
+ using (var context = _contextFactory.CreateDbContext())
{
+ try
+ {
+ var res = await context.DbWHSystems
+ .Include(x => x.WHSignatures)
+ .SingleOrDefaultAsync(x => x.Id == id);
- return null;
- }
- finally
- {
- semSlim.Release();
+ return res;
+ }
+ catch (Exception ex)
+ {
+
+ return null;
+ }
}
}
protected override async Task AUpdate(int id, WHSystem item)
{
- await semSlim.WaitAsync();
- try
- {
- if (id != item.Id)
- return null;
-
- _dbContext.DbWHSystems.Update(item);
- await _dbContext.SaveChangesAsync();
- return item;
- }
- catch (Exception ex)
+ using (var context = _contextFactory.CreateDbContext())
{
+ try
+ {
+ if (id != item.Id)
+ return null;
- return null;
- }
- finally
- {
- semSlim.Release();
+ context.DbWHSystems.Update(item);
+ await context.SaveChangesAsync();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
}
public async Task GetByName(string name)
{
- await semSlim.WaitAsync();
- try
- {
- return await _dbContext.DbWHSystems.Include(x => x.WHSignatures).FirstOrDefaultAsync(x => x.Name == name);
- }
- catch (Exception ex)
- {
+ using (var context = _contextFactory.CreateDbContext())
+ {
+ try
+ {
+ return await context.DbWHSystems.Include(x => x.WHSignatures).FirstOrDefaultAsync(x => x.Name == name);
+ }
+ catch (Exception ex)
+ {
- return null;
- }
- finally
- {
- semSlim.Release();
+ return null;
+ }
}
}
}
diff --git a/WHMapper/Services/SDE/ISDEServices.cs b/WHMapper/Services/SDE/ISDEServices.cs
index 765cd2b4..0f70fea0 100644
--- a/WHMapper/Services/SDE/ISDEServices.cs
+++ b/WHMapper/Services/SDE/ISDEServices.cs
@@ -5,7 +5,7 @@ namespace WHMapper.Services.SDE
{
public interface ISDEServices
{
- IEnumerable SearchSystem(string value);
+ Task> SearchSystem(string value);
}
}
diff --git a/WHMapper/Services/SDE/SDEServices.cs b/WHMapper/Services/SDE/SDEServices.cs
index 48641d12..2057a4a7 100644
--- a/WHMapper/Services/SDE/SDEServices.cs
+++ b/WHMapper/Services/SDE/SDEServices.cs
@@ -1,8 +1,10 @@
using System;
using System.IO.Compression;
+using WHMapper.Models.Db;
using WHMapper.Models.DTO.EveAPI.Universe;
using WHMapper.Models.DTO.SDE;
using WHMapper.Services.Anoik;
+using WHMapper.Services.EveAPI;
using YamlDotNet.Serialization;
using YamlDotNet.Serialization.NamingConventions;
@@ -10,6 +12,8 @@ namespace WHMapper.Services.SDE
{
public class SDEServices : ISDEServices
{
+ private readonly ParallelOptions _options;
+
private readonly ILogger _logger;
private const string SDE_ZIP_PATH = @"./Resources/SDE/sde.zip";
@@ -21,6 +25,7 @@ public class SDEServices : ISDEServices
public SDEServices(ILogger logger)
{
_logger = logger;
+ _options = new ParallelOptions { MaxDegreeOfParallelism = 4 };
if (!Directory.Exists(SDE_TARGET_DIRECTORY))
{
@@ -33,7 +38,7 @@ public SDEServices(ILogger logger)
}
- public IEnumerable? SearchSystem(string value)
+ public async Task> SearchSystem(string value)
{
if (Directory.Exists(SDE_TARGET_DIRECTORY) && !String.IsNullOrEmpty(value) && value.Length > 2)
{
@@ -44,7 +49,15 @@ public SDEServices(ILogger logger)
.WithNamingConvention(CamelCaseNamingConvention.Instance)
.Build();
- foreach (string directoryPath in directories)
+ /*
+ await Parallel.ForEachAsync(directories.Take(20), _options, async (allianceId, token) =>
+ {
+ //var alliance = await EveAPIServices.AllianceServices.GetAlliance(allianceId);
+ //_eveCharacterEntities.Add(new WHAccess(allianceId, alliance.Name, Models.Db.Enums.WHAccessEntity.Alliance));
+ });*/
+
+ //foreach (string directoryPath in directories)
+ await Parallel.ForEachAsync(directories.Take(20), _options, async (directoryPath, token) =>
{
var sdeFiles = Directory.GetFiles(directoryPath);
if (sdeFiles.Count() > 0 && sdeFiles.Any(x => x.Contains(SDE_DEFAULT_SOLARSYSTEM_STATIC_FILEMANE)))
@@ -63,8 +76,7 @@ public SDEServices(ILogger logger)
}
}
}
- }
-
+ });
return results;
}
diff --git a/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs b/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs
index 21ad7836..7522eb06 100644
--- a/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs
+++ b/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs
@@ -5,6 +5,8 @@ namespace WHMapper.Services.WHSignature
{
public interface IWHSignatureHelper
{
+ const string SCAN_VALIDATION_REGEX = "[a-zA-Z]{3}-[0-9]{3}\\s([a-zA-Z\\s]+)[0-9]*.[0-9]+%\\s[0-9]*.[0-9]+\\s(AU|km)";
+
Task ValidateScanResult(string? scanResult);
Task?> ParseScanResult(string scanUser,int currentSystemScannedId, string? scanResult);
Task ImportScanResult(string scanUser, int currentSystemScannedId, string? scanResult,bool lazyDeleted);
diff --git a/WHMapper/Services/WHSignatures/WHSignatureHelper.cs b/WHMapper/Services/WHSignatures/WHSignatureHelper.cs
index ae20436f..0ef34bcc 100644
--- a/WHMapper/Services/WHSignatures/WHSignatureHelper.cs
+++ b/WHMapper/Services/WHSignatures/WHSignatureHelper.cs
@@ -15,8 +15,6 @@ namespace WHMapper.Services.WHSignatures
{
public class WHSignatureHelper : IWHSignatureHelper
{
- private const string SCAN_VALIDATION_REGEX = "[a-zA-Z]{3}-[0-9]{3}\\s([a-zA-Z\\s]+)[0-9]*.[0-9]+%\\s[0-9]*.[0-9]+\\sAU";
-
private IWHSignatureRepository _dbWHSignatures;
public WHSignatureHelper(IWHSignatureRepository sigRepo)
@@ -30,7 +28,7 @@ public async Task ValidateScanResult(string? scanResult)
{
if (!string.IsNullOrEmpty(scanResult))
{
- Match match = Regex.Match(scanResult, SCAN_VALIDATION_REGEX, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(2));
+ Match match = Regex.Match(scanResult, IWHSignatureHelper.SCAN_VALIDATION_REGEX, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(2));
return match.Success;
}
return false;
diff --git a/WHMapper/WHMapper.csproj b/WHMapper/WHMapper.csproj
index 79465924..f9e73d75 100644
--- a/WHMapper/WHMapper.csproj
+++ b/WHMapper/WHMapper.csproj
@@ -8,6 +8,9 @@
6545e3a1-0941-41bf-a51b-1a58ca6ed175
+
+ 4
+
@@ -88,7 +91,7 @@
-
+
diff --git a/WHMapper/appsettings.Development.json b/WHMapper/appsettings.Development.json
deleted file mode 100644
index 9e53786e..00000000
--- a/WHMapper/appsettings.Development.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "DetailedErrors": true,
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- }
-}
-
diff --git a/WHMapper/appsettings.json b/WHMapper/appsettings.json
index 1e497dae..91511d89 100644
--- a/WHMapper/appsettings.json
+++ b/WHMapper/appsettings.json
@@ -11,13 +11,14 @@
"EveSSO": {
"Domain": "login.eveonline.com",
- "ClientId": "39eee319b2d14a4a9ba3e9eb1b1410b8",
- "Secret": "Qg5uFfjYcqhvrw6FdXhxTMHM9yxNBBb8N3BYGvCN",
+ "ClientId": "",
+ "Secret": "",
"DefaultScopes": [
"esi-location.read_location.v1",
"esi-location.read_ship_type.v1",
"esi-ui.open_window.v1",
- "esi-ui.write_waypoint.v1"
+ "esi-ui.write_waypoint.v1",
+ "esi-search.search_structures.v1"
]
},
"EveAPI": {
diff --git a/WHMapper/wwwroot/favicon.ico b/WHMapper/wwwroot/favicon.ico
index 63e859b476eff5055e0e557aaa151ca8223fbeef..3027c9960552e63dcb5f4251ba52b379c69590d4 100644
GIT binary patch
literal 28143
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