diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index e1d1a486f..fc24fb01a 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -416,7 +416,7 @@
-
+
diff --git a/Aaru.Core/Devices/Dumping/Dump.cs b/Aaru.Core/Devices/Dumping/Dump.cs
index 21b5657a3..b865b60b1 100644
--- a/Aaru.Core/Devices/Dumping/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/Dump.cs
@@ -42,7 +42,7 @@ namespace Aaru.Core.Devices.Dumping
readonly DumpSubchannel _subchannel;
readonly bool _trim;
bool _aborted;
- DicContext _ctx; // Master database context
+ AaruContext _ctx; // Master database context
Aaru.Database.Models.Device _dbDev; // Device database entry
bool _dumpFirstTrackPregap;
bool _fixOffset;
@@ -113,7 +113,7 @@ namespace Aaru.Core.Devices.Dumping
public void Start()
{
// Open master database
- _ctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath);
+ _ctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
// Search for device in master database
_dbDev = _ctx.Devices.FirstOrDefault(d => d.Manufacturer == _dev.Manufacturer && d.Model == _dev.Model &&
diff --git a/Aaru.Core/Remote.cs b/Aaru.Core/Remote.cs
index fdbcae346..36271da1e 100644
--- a/Aaru.Core/Remote.cs
+++ b/Aaru.Core/Remote.cs
@@ -113,7 +113,7 @@ namespace Aaru.Core
public static void UpdateMasterDatabase(bool create)
{
- DicContext mctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath);
+ AaruContext mctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
mctx.Database.Migrate();
mctx.SaveChanges();
diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs
index 4dc7cd18c..0cc5675dd 100644
--- a/Aaru.Core/Statistics.cs
+++ b/Aaru.Core/Statistics.cs
@@ -61,7 +61,7 @@ namespace Aaru.Core
/// Loads saved statistics from disk
public static void LoadStats()
{
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
if(File.Exists(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml")))
try
@@ -506,7 +506,7 @@ namespace Aaru.Core
/// Saves statistics to disk
public static void SaveStats()
{
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.SaveChanges();
if(Aaru.Settings.Settings.Current.Stats != null &&
@@ -519,7 +519,7 @@ namespace Aaru.Core
{
var submitThread = new Thread(() =>
{
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
try
{
@@ -1157,7 +1157,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.DeviceStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Commands.Add(new Command
{
@@ -1178,7 +1178,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.FilesystemStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Filesystems.Add(new Filesystem
{
@@ -1199,7 +1199,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.PartitionStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Partitions.Add(new Partition
{
@@ -1220,7 +1220,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.FilterStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Filters.Add(new Filter
{
@@ -1241,7 +1241,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.MediaImageStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.MediaFormats.Add(new MediaFormat
{
@@ -1268,7 +1268,7 @@ namespace Aaru.Core
else
deviceBus = dev.Type.ToString();
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.SeenDevices.Add(new DeviceStat
{
@@ -1289,7 +1289,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.MediaStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Medias.Add(new Aaru.Database.Models.Media
{
@@ -1307,7 +1307,7 @@ namespace Aaru.Core
!Aaru.Settings.Settings.Current.Stats.MediaStats)
return;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.RemoteApplications.Add(new RemoteApplication
{
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index 9ec44e001..59d650f31 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -108,7 +108,7 @@
-
+
diff --git a/Aaru.Database/Context.cs b/Aaru.Database/Context.cs
index 543cda095..4e973a7dc 100644
--- a/Aaru.Database/Context.cs
+++ b/Aaru.Database/Context.cs
@@ -35,9 +35,9 @@ using Microsoft.EntityFrameworkCore;
namespace Aaru.Database
{
- public sealed class DicContext : DbContext
+ public sealed class AaruContext : DbContext
{
- public DicContext(DbContextOptions options) : base(options) { }
+ public AaruContext(DbContextOptions options) : base(options) { }
public DbSet Devices { get; set; }
public DbSet Reports { get; set; }
@@ -59,12 +59,12 @@ namespace Aaru.Database
// Note: If table does not appear check that last migration has been REALLY added to the project
- public static DicContext Create(string dbPath)
+ public static AaruContext Create(string dbPath)
{
var optionsBuilder = new DbContextOptionsBuilder();
optionsBuilder.UseLazyLoadingProxies().UseSqlite($"Data Source={dbPath}");
- return new DicContext(optionsBuilder.Options);
+ return new AaruContext(optionsBuilder.Options);
}
}
}
\ No newline at end of file
diff --git a/Aaru.Database/ContextFactory.cs b/Aaru.Database/ContextFactory.cs
index 558f6d976..82eb119ed 100644
--- a/Aaru.Database/ContextFactory.cs
+++ b/Aaru.Database/ContextFactory.cs
@@ -2,8 +2,8 @@ using Microsoft.EntityFrameworkCore.Design;
namespace Aaru.Database
{
- public class DicContextFactory : IDesignTimeDbContextFactory
+ public class AaruContextFactory : IDesignTimeDbContextFactory
{
- public DicContext CreateDbContext(string[] args) => DicContext.Create("discimagechef.db");
+ public AaruContext CreateDbContext(string[] args) => AaruContext.Create("aaru.db");
}
}
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs
index 5a1c488f8..79fbd6b20 100644
--- a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs
+++ b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181126222301_DeviceReportV2")]
partial class DeviceReportV2
{
diff --git a/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs b/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs
index 167d615dd..e774f8cdd 100644
--- a/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs
+++ b/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181127001622_AddDeviceBasicFields")]
partial class AddDeviceBasicFields
{
diff --git a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs
index 418e7c8a3..948735d06 100644
--- a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs
+++ b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181127013131_CorrectReportsDbSet")]
partial class CorrectReportsDbSet
{
diff --git a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs
index 303350710..e950fa80f 100644
--- a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs
+++ b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181221015906_NameValueStatistics")]
partial class NameValueStatistics
{
diff --git a/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs b/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs
index d341c8d3d..37c40a1a5 100644
--- a/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs
+++ b/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181221032605_MediaStatistics")]
partial class MediaStatistics
{
diff --git a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs
index 73fe8889c..5a8b7e2d3 100644
--- a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs
+++ b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181221034941_SeenDevicesStatistics")]
partial class SeenDevicesStatistics
{
diff --git a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs
index edde893dc..b373db538 100644
--- a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs
+++ b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181221040408_OperatingSystemStatistics")]
partial class OperatingSystemStatistics
{
diff --git a/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs b/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs
index 61df48fc9..33ccc3b0d 100644
--- a/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs
+++ b/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181221041242_VersionStatistics")]
partial class VersionStatistics
{
diff --git a/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs b/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs
index 18df86094..71ea4ff61 100644
--- a/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs
+++ b/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181221125353_AddStatsCounters")]
partial class AddStatsCounters
{
diff --git a/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs b/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs
index 5a1aabf6d..ebad41a18 100644
--- a/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs
+++ b/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181223183913_FixUnsignedFields")]
partial class FixUnsignedFields
{
diff --git a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs
index 1c43cb78b..dc4b633d5 100644
--- a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs
+++ b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports")]
partial class UseBinaryDataForIdentifyInquiryAndModesInReports
{
diff --git a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs
index ac766be27..14c9f2c44 100644
--- a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs
+++ b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181224044809_StoreUsbIdsInDatabase")]
partial class StoreUsbIdsInDatabase
{
diff --git a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs
index a5dfcde47..eb976b582 100644
--- a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs
+++ b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181224172147_FixUsbIdsAndIndexes")]
partial class FixUsbIdsAndIndexes
{
diff --git a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs
index 2e8e9f670..ea62b6382 100644
--- a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs
+++ b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181225002740_AddCdOffsets")]
partial class AddCdOffsets
{
diff --git a/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs b/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs
index 3214a098c..b0e0d6a98 100644
--- a/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs
+++ b/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181225152947_StoreMmcGetConfigurationResponse")]
partial class StoreMmcGetConfigurationResponse
{
diff --git a/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs b/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs
index 7f7009d3c..0f71289b6 100644
--- a/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs
+++ b/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20181225214500_StoreReadResultsInReportDatabase")]
partial class StoreReadResultsInReportDatabase
{
diff --git a/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs b/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs
index ac6953840..31a1f0b2c 100644
--- a/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs
+++ b/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20190102061236_AddMultisessionLeadTest")]
partial class AddMultisessionLeadTest
{
diff --git a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs
index 9634c21ba..f41725a4c 100644
--- a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs
+++ b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20190102230036_AddOptimalReadMultipleCount")]
partial class AddOptimalReadMultipleCount
{
diff --git a/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs b/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs
index c96e36f5f..c7c275d2d 100644
--- a/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs
+++ b/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20190108013456_AddChangeableScsiModes")]
partial class AddChangeableScsiModes
{
diff --git a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs
index c475b3679..9ebf502e9 100644
--- a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs
+++ b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20190525183723_IdForDensityCode")]
partial class IdForDensityCode
{
diff --git a/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs b/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs
index 574f859f3..cc678225e 100644
--- a/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs
+++ b/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20191103000828_MakeFieldsUnsigned")]
partial class MakeFieldsUnsigned
{
diff --git a/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs b/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs
index 8bd845a6c..3db91bb7c 100644
--- a/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs
+++ b/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20191207175444_SyncWithServerChanges")]
partial class SyncWithServerChanges
{
diff --git a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs
index bda686507..3de6f43da 100644
--- a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs
+++ b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20191207183522_AddNameCountModel")]
partial class AddNameCountModel
{
diff --git a/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs b/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs
index 53efb8fd3..4c60b8067 100644
--- a/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs
+++ b/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
+ [DbContext(typeof(AaruContext))]
[Migration("20191207184342_AddRemoteStats")]
partial class AddRemoteStats
{
diff --git a/Aaru.Database/Migrations/DicContextModelSnapshot.cs b/Aaru.Database/Migrations/AaruContextModelSnapshot.cs
similarity index 99%
rename from Aaru.Database/Migrations/DicContextModelSnapshot.cs
rename to Aaru.Database/Migrations/AaruContextModelSnapshot.cs
index 2a37f9b60..ca179cda4 100644
--- a/Aaru.Database/Migrations/DicContextModelSnapshot.cs
+++ b/Aaru.Database/Migrations/AaruContextModelSnapshot.cs
@@ -6,8 +6,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
namespace Aaru.Database.Migrations
{
- [DbContext(typeof(DicContext))]
- internal class DicContextModelSnapshot : ModelSnapshot
+ [DbContext(typeof(AaruContext))]
+ internal class AaruContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
diff --git a/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs b/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs
index de4f3e4b7..8849a3be3 100644
--- a/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs
+++ b/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs
@@ -45,7 +45,7 @@ namespace Aaru.Gui.Dialogs
{
XamlReader.Load(this);
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
if(ctx.Commands.Any())
{
diff --git a/Aaru.Gui/Forms/frmMain.xeto.cs b/Aaru.Gui/Forms/frmMain.xeto.cs
index 6194887f7..b9fa23adb 100644
--- a/Aaru.Gui/Forms/frmMain.xeto.cs
+++ b/Aaru.Gui/Forms/frmMain.xeto.cs
@@ -696,7 +696,7 @@ namespace Aaru.Gui.Forms
protected void OnMenuStatistics(object sender, EventArgs e)
{
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
if(!ctx.Commands.Any() &&
!ctx.Filesystems.Any() &&
diff --git a/Aaru/Commands/Database/Statistics.cs b/Aaru/Commands/Database/Statistics.cs
index f2a568f02..358ef1f4a 100644
--- a/Aaru/Commands/Database/Statistics.cs
+++ b/Aaru/Commands/Database/Statistics.cs
@@ -55,7 +55,7 @@ namespace Aaru.Commands
if(verbose)
AaruConsole.VerboseWriteLineEvent += System.Console.WriteLine;
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
if(!ctx.Commands.Any() &&
!ctx.Filesystems.Any() &&
diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs
index 114d147c3..2871914c3 100644
--- a/Aaru/Commands/Database/Update.cs
+++ b/Aaru/Commands/Database/Update.cs
@@ -86,7 +86,7 @@ namespace Aaru.Commands
{
File.Delete(Aaru.Settings.Settings.LocalDbPath);
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Database.Migrate();
ctx.SaveChanges();
}
diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs
index 424b51223..f814001b7 100644
--- a/Aaru/Commands/Device/DeviceReport.cs
+++ b/Aaru/Commands/Device/DeviceReport.cs
@@ -1265,7 +1265,7 @@ namespace Aaru.Commands.Device
jsonSw.Close();
jsonFs.Close();
- using(var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath))
+ using(var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath))
{
ctx.Reports.Add(new Report(report));
ctx.SaveChanges();
diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs
index a8b8b64eb..04afe4c15 100644
--- a/Aaru/Commands/Device/Info.cs
+++ b/Aaru/Commands/Device/Info.cs
@@ -1133,7 +1133,7 @@ namespace Aaru.Commands.Device
AaruConsole.WriteLine();
// Open master database
- var ctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
// Search for device in master database
Aaru.Database.Models.Device dbDev =
diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs
index 1a7b58d91..37edd6730 100644
--- a/Aaru/Commands/Media/Info.cs
+++ b/Aaru/Commands/Media/Info.cs
@@ -552,7 +552,7 @@ namespace Aaru.Commands.Media
bool supportsRwSubchannel = Dump.SupportsRwSubchannel(dev, null, null);
// Open master database
- var ctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
// Search for device in master database
Aaru.Database.Models.Device dbDev =
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index 81e417556..ef4c7cc9b 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -76,7 +76,7 @@ namespace Aaru
Aaru.Settings.Settings.LoadSettings();
- var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath);
+ var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
ctx.Database.Migrate();
ctx.SaveChanges();
@@ -88,7 +88,7 @@ namespace Aaru
UpdateCommand.DoUpdate(true);
}
- var masterContext = DicContext.Create(Aaru.Settings.Settings.MasterDbPath);
+ var masterContext = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
if(masterContext.Database.GetPendingMigrations().Any())
{