diff --git a/Aaru.Server.Task/Program.cs b/Aaru.Server.Task/Program.cs index 8e0e6578..eaa79238 100644 --- a/Aaru.Server.Task/Program.cs +++ b/Aaru.Server.Task/Program.cs @@ -50,7 +50,7 @@ namespace Aaru.Server.Task start = DateTime.UtcNow; System.Console.WriteLine("{0}: Connecting to database...", DateTime.UtcNow); - var ctx = new DicServerContext(); + var ctx = new AaruServerContext(); end = DateTime.UtcNow; System.Console.WriteLine("{0}: Took {1:F2} seconds", end, (end - start).TotalSeconds); diff --git a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs index 1d60578d..ada1e3b6 100644 --- a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs @@ -16,9 +16,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class AtasController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public AtasController(DicServerContext context) => _context = context; + public AtasController(AaruServerContext context) => _context = context; // GET: Admin/Atas public IActionResult Index() => View(_context.Ata.AsEnumerable().OrderBy(m => m.IdentifyDevice?.Model). diff --git a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs index 8c6955c2..73804259 100644 --- a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class BlockDescriptorsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public BlockDescriptorsController(DicServerContext context) => _context = context; + public BlockDescriptorsController(AaruServerContext context) => _context = context; // GET: Admin/BlockDescriptors public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs index 43953d09..765d8fd0 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs @@ -13,9 +13,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class ChsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public ChsController(DicServerContext context) => _context = context; + public ChsController(AaruServerContext context) => _context = context; // GET: Admin/Chs public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs index 35928a87..c9787751 100644 --- a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class CommandsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public CommandsController(DicServerContext context) => _context = context; + public CommandsController(AaruServerContext context) => _context = context; // GET: Admin/Commands public async Task Index() => View(await _context.Commands.OrderBy(c => c.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs index ddd0bf2b..39ce74a5 100644 --- a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs @@ -11,9 +11,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class CompactDiscOffsetsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public CompactDiscOffsetsController(DicServerContext context) => _context = context; + public CompactDiscOffsetsController(AaruServerContext context) => _context = context; // GET: Admin/CompactDiscOffsets public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs index b26e8991..74656aa8 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class DeviceStatsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public DeviceStatsController(DicServerContext context) => _context = context; + public DeviceStatsController(AaruServerContext context) => _context = context; // GET: Admin/DeviceStats public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs index d8565a6a..7b3f1375 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs @@ -12,9 +12,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class DevicesController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public DevicesController(DicServerContext context) => _context = context; + public DevicesController(AaruServerContext context) => _context = context; // GET: Admin/Devices public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs index 8c7ceb06..ef4885ac 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class FilesystemsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public FilesystemsController(DicServerContext context) => _context = context; + public FilesystemsController(AaruServerContext context) => _context = context; // GET: Admin/Filesystems public async Task Index() => View(await _context.Filesystems.OrderBy(f => f.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs index b4e99c49..a3cc0e49 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class FiltersController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public FiltersController(DicServerContext context) => _context = context; + public FiltersController(AaruServerContext context) => _context = context; // GET: Admin/Filters public async Task Index() => View(await _context.Filters.OrderBy(f => f.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs index 4ef74336..76e837eb 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs @@ -13,9 +13,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class FireWiresController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public FireWiresController(DicServerContext context) => _context = context; + public FireWiresController(AaruServerContext context) => _context = context; // GET: Admin/FireWires public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs index c1e3ebd3..d2be941e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class MediaFormatsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public MediaFormatsController(DicServerContext context) => _context = context; + public MediaFormatsController(AaruServerContext context) => _context = context; // GET: Admin/MediaFormats public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs index f874df74..b0c8a066 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class MediasController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public MediasController(DicServerContext context) => _context = context; + public MediasController(AaruServerContext context) => _context = context; // GET: Admin/Medias public IActionResult Index(bool? real) diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs index 475e1b08..16a3e29c 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs @@ -11,9 +11,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class MmcController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public MmcController(DicServerContext context) => _context = context; + public MmcController(AaruServerContext context) => _context = context; // GET: Admin/Mmc public IActionResult Index() => View(_context.Mmc.Where(m => m.ModeSense2AData != null). diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs index 8883abce..0f0f842f 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class MmcFeaturesController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public MmcFeaturesController(DicServerContext context) => _context = context; + public MmcFeaturesController(AaruServerContext context) => _context = context; // GET: Admin/MmcFeatures public async Task Index() => View(await _context.MmcFeatures.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs index f7abf718..51c0d722 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class MmcSdsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public MmcSdsController(DicServerContext context) => _context = context; + public MmcSdsController(AaruServerContext context) => _context = context; // GET: Admin/MmcSds public async Task Index() => View(await _context.MmcSd.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs index 3c01b75e..fe774281 100644 --- a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class OperatingSystemsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public OperatingSystemsController(DicServerContext context) => _context = context; + public OperatingSystemsController(AaruServerContext context) => _context = context; // GET: Admin/OperatingSystems public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs index 47c22fdf..98b5a93d 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class PartitionsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public PartitionsController(DicServerContext context) => _context = context; + public PartitionsController(AaruServerContext context) => _context = context; // GET: Admin/Partitions public async Task Index() => View(await _context.Partitions.OrderBy(p => p.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs index bdc03965..de944983 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class PcmciasController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public PcmciasController(DicServerContext context) => _context = context; + public PcmciasController(AaruServerContext context) => _context = context; // GET: Admin/Pcmcias public async Task Index() => View(await _context.Pcmcia.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs index 8732e685..efae3ce1 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs @@ -12,9 +12,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class ReportsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public ReportsController(DicServerContext context) => _context = context; + public ReportsController(AaruServerContext context) => _context = context; // GET: Admin/Reports public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs index 003a8c76..92429f2b 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class ScsiModesController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public ScsiModesController(DicServerContext context) => _context = context; + public ScsiModesController(AaruServerContext context) => _context = context; // GET: Admin/ScsiModes public async Task Index() => View(await _context.ScsiMode.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs index b2dfd8bd..4ee622d2 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class ScsiPagesController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public ScsiPagesController(DicServerContext context) => _context = context; + public ScsiPagesController(AaruServerContext context) => _context = context; // GET: Admin/ScsiPages public async Task Index() => View(await _context.ScsiPage.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs index c6ffc65e..2f32a55e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs @@ -16,9 +16,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class ScsisController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public ScsisController(DicServerContext context) => _context = context; + public ScsisController(AaruServerContext context) => _context = context; // GET: Admin/Scsis public IActionResult Index() => View(_context.Scsi.AsEnumerable(). diff --git a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs index 74f24614..9f648a88 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs @@ -13,9 +13,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class SscsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public SscsController(DicServerContext context) => _context = context; + public SscsController(AaruServerContext context) => _context = context; // GET: Admin/Sscs public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs index 59c73640..22b6bb5b 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs @@ -11,9 +11,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class SupportedDensitiesController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public SupportedDensitiesController(DicServerContext context) => _context = context; + public SupportedDensitiesController(AaruServerContext context) => _context = context; // GET: Admin/SupportedDensities public async Task Index() => View(await _context. diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs index 78ea4c77..c1c764d6 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs @@ -22,9 +22,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class TestedMediasController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public TestedMediasController(DicServerContext context) => _context = context; + public TestedMediasController(AaruServerContext context) => _context = context; // GET: Admin/TestedMedias public async Task Index() => View(await _context. diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs index 2d9feeba..a6446cd5 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs @@ -11,9 +11,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class TestedSequentialMediasController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public TestedSequentialMediasController(DicServerContext context) => _context = context; + public TestedSequentialMediasController(AaruServerContext context) => _context = context; // GET: Admin/TestedSequentialMedias public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs index 6ddec396..f977c8c9 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class UsbProductsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public UsbProductsController(DicServerContext context) => _context = context; + public UsbProductsController(AaruServerContext context) => _context = context; // GET: Admin/UsbProducts public async Task Index() => View(await _context. diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs index 1f055d8c..d1557e78 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class UsbVendorsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public UsbVendorsController(DicServerContext context) => _context = context; + public UsbVendorsController(AaruServerContext context) => _context = context; // GET: Admin/UsbVendors public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs index 8298783b..0110c32e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs @@ -13,9 +13,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class UsbsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public UsbsController(DicServerContext context) => _context = context; + public UsbsController(AaruServerContext context) => _context = context; // GET: Admin/Usbs public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs index 0b457d2b..c5d5b294 100644 --- a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs @@ -10,9 +10,9 @@ namespace Aaru.Server.Areas.Admin.Controllers [Area("Admin"), Authorize] public class VersionsController : Controller { - readonly DicServerContext _context; + readonly AaruServerContext _context; - public VersionsController(DicServerContext context) => _context = context; + public VersionsController(AaruServerContext context) => _context = context; // GET: Admin/Versions public async Task Index() => View(await _context.Versions.OrderBy(v => v.Name).ToListAsync()); diff --git a/Aaru.Server/Controllers/ReportController.cs b/Aaru.Server/Controllers/ReportController.cs index 8601004c..b1312e2c 100644 --- a/Aaru.Server/Controllers/ReportController.cs +++ b/Aaru.Server/Controllers/ReportController.cs @@ -47,9 +47,9 @@ namespace Aaru.Server.Controllers { public class ReportController : Controller { - readonly DicServerContext _ctx; + readonly AaruServerContext _ctx; - public ReportController(DicServerContext context) => _ctx = context; + public ReportController(AaruServerContext context) => _ctx = context; public ActionResult Index() => RedirectToAction("View", "Report", new RouteValueDictionary { diff --git a/Aaru.Server/Controllers/StatsController.cs b/Aaru.Server/Controllers/StatsController.cs index 6bde651c..9cee9577 100644 --- a/Aaru.Server/Controllers/StatsController.cs +++ b/Aaru.Server/Controllers/StatsController.cs @@ -52,10 +52,10 @@ namespace Aaru.Server.Controllers /// Renders a page with statistics, list of media type, devices, etc public class StatsController : Controller { - readonly DicServerContext ctx; + readonly AaruServerContext ctx; readonly IWebHostEnvironment env; - public StatsController(IWebHostEnvironment environment, DicServerContext context) + public StatsController(IWebHostEnvironment environment, AaruServerContext context) { env = environment; ctx = context; diff --git a/Aaru.Server/Controllers/UpdateController.cs b/Aaru.Server/Controllers/UpdateController.cs index eb980ba5..e7739d53 100644 --- a/Aaru.Server/Controllers/UpdateController.cs +++ b/Aaru.Server/Controllers/UpdateController.cs @@ -46,9 +46,9 @@ namespace Aaru.Server.Controllers { public class UpdateController : Controller { - readonly DicServerContext _ctx; + readonly AaruServerContext _ctx; - public UpdateController(DicServerContext ctx) => _ctx = ctx; + public UpdateController(AaruServerContext ctx) => _ctx = ctx; /// Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server /// HTTP response diff --git a/Aaru.Server/Controllers/UploadReportController.cs b/Aaru.Server/Controllers/UploadReportController.cs index 794ba91d..846b6155 100644 --- a/Aaru.Server/Controllers/UploadReportController.cs +++ b/Aaru.Server/Controllers/UploadReportController.cs @@ -52,10 +52,10 @@ namespace Aaru.Server.Controllers { public class UploadReportController : Controller { - readonly DicServerContext _ctx; + readonly AaruServerContext _ctx; readonly IWebHostEnvironment _environment; - public UploadReportController(IWebHostEnvironment environment, DicServerContext ctx) + public UploadReportController(IWebHostEnvironment environment, AaruServerContext ctx) { _environment = environment; _ctx = ctx; diff --git a/Aaru.Server/Controllers/UploadStatsController.cs b/Aaru.Server/Controllers/UploadStatsController.cs index 242a6d30..cba5c2a8 100644 --- a/Aaru.Server/Controllers/UploadStatsController.cs +++ b/Aaru.Server/Controllers/UploadStatsController.cs @@ -51,10 +51,10 @@ namespace Aaru.Server.Controllers { public class UploadStatsController : Controller { - readonly DicServerContext _ctx; + readonly AaruServerContext _ctx; IWebHostEnvironment _environment; - public UploadStatsController(IWebHostEnvironment environment, DicServerContext ctx) + public UploadStatsController(IWebHostEnvironment environment, AaruServerContext ctx) { _environment = environment; _ctx = ctx; diff --git a/Aaru.Server/Core/StatsConverter.cs b/Aaru.Server/Core/StatsConverter.cs index 4069f5a3..1550086a 100644 --- a/Aaru.Server/Core/StatsConverter.cs +++ b/Aaru.Server/Core/StatsConverter.cs @@ -41,7 +41,7 @@ namespace Aaru.Server { public static void Convert(Stats newStats) { - var ctx = new DicServerContext(); + var ctx = new AaruServerContext(); if(newStats.Commands != null) { diff --git a/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs b/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs index 4e4013b8..5123a95c 100644 --- a/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs +++ b/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191102132240_InitialMigration")] partial class InitialMigration { diff --git a/Aaru.Server/Migrations/20191102132240_InitialMigration.cs b/Aaru.Server/Migrations/20191102132240_InitialMigration.cs index 3450def1..36a6b122 100644 --- a/Aaru.Server/Migrations/20191102132240_InitialMigration.cs +++ b/Aaru.Server/Migrations/20191102132240_InitialMigration.cs @@ -10,39 +10,39 @@ namespace Aaru.Server.Migrations protected override void Up(MigrationBuilder migrationBuilder) { #region Check for old tables - bool AtasExists = DicServerContext.TableExists("Atas"); - bool BlockDescriptorsExists = DicServerContext.TableExists("BlockDescriptors"); - bool ChsExists = DicServerContext.TableExists("Chs"); - bool CommandsExists = DicServerContext.TableExists("Commands"); - bool CompactDiscOffsetsExists = DicServerContext.TableExists("CompactDiscOffsets"); - bool DensityCodesExists = DicServerContext.TableExists("DensityCodes"); - bool DevicesExists = DicServerContext.TableExists("Devices"); - bool DeviceStatsExists = DicServerContext.TableExists("DeviceStats"); - bool FilesystemsExists = DicServerContext.TableExists("Filesystems"); - bool FiltersExists = DicServerContext.TableExists("Filters"); - bool FireWiresExists = DicServerContext.TableExists("FireWires"); - bool MediaExists = DicServerContext.TableExists("Media"); - bool MediaFormatsExists = DicServerContext.TableExists("MediaFormats"); - bool MmcFeaturesExists = DicServerContext.TableExists("MmcFeatures"); - bool MmcsExists = DicServerContext.TableExists("Mmcs"); - bool MmcSdsExists = DicServerContext.TableExists("MmcSds"); - bool OperatingSystemsExists = DicServerContext.TableExists("OperatingSystems"); - bool PartitionsExists = DicServerContext.TableExists("Partitions"); - bool PcmciasExists = DicServerContext.TableExists("Pcmcias"); - bool ScsiModesExists = DicServerContext.TableExists("ScsiModes"); - bool ScsiPagesExists = DicServerContext.TableExists("ScsiPages"); - bool ScsisExists = DicServerContext.TableExists("Scsis"); - bool SscsExists = DicServerContext.TableExists("Sscs"); - bool SscSupportedMediasExists = DicServerContext.TableExists("SscSupportedMedias"); - bool SupportedDensitiesExists = DicServerContext.TableExists("SupportedDensities"); - bool TestedMediasExists = DicServerContext.TableExists("TestedMedias"); - bool TestedSequentialMediasExists = DicServerContext.TableExists("TestedSequentialMedias"); - bool UploadedReportsExists = DicServerContext.TableExists("UploadedReports"); - bool UsbProductsExists = DicServerContext.TableExists("UsbProducts"); - bool UsbsExists = DicServerContext.TableExists("Usbs"); - bool UsbVendorsExists = DicServerContext.TableExists("UsbVendors"); - bool VersionsExists = DicServerContext.TableExists("Versions"); - bool EFExists = DicServerContext.TableExists("__MigrationHistory"); + bool AtasExists = AaruServerContext.TableExists("Atas"); + bool BlockDescriptorsExists = AaruServerContext.TableExists("BlockDescriptors"); + bool ChsExists = AaruServerContext.TableExists("Chs"); + bool CommandsExists = AaruServerContext.TableExists("Commands"); + bool CompactDiscOffsetsExists = AaruServerContext.TableExists("CompactDiscOffsets"); + bool DensityCodesExists = AaruServerContext.TableExists("DensityCodes"); + bool DevicesExists = AaruServerContext.TableExists("Devices"); + bool DeviceStatsExists = AaruServerContext.TableExists("DeviceStats"); + bool FilesystemsExists = AaruServerContext.TableExists("Filesystems"); + bool FiltersExists = AaruServerContext.TableExists("Filters"); + bool FireWiresExists = AaruServerContext.TableExists("FireWires"); + bool MediaExists = AaruServerContext.TableExists("Media"); + bool MediaFormatsExists = AaruServerContext.TableExists("MediaFormats"); + bool MmcFeaturesExists = AaruServerContext.TableExists("MmcFeatures"); + bool MmcsExists = AaruServerContext.TableExists("Mmcs"); + bool MmcSdsExists = AaruServerContext.TableExists("MmcSds"); + bool OperatingSystemsExists = AaruServerContext.TableExists("OperatingSystems"); + bool PartitionsExists = AaruServerContext.TableExists("Partitions"); + bool PcmciasExists = AaruServerContext.TableExists("Pcmcias"); + bool ScsiModesExists = AaruServerContext.TableExists("ScsiModes"); + bool ScsiPagesExists = AaruServerContext.TableExists("ScsiPages"); + bool ScsisExists = AaruServerContext.TableExists("Scsis"); + bool SscsExists = AaruServerContext.TableExists("Sscs"); + bool SscSupportedMediasExists = AaruServerContext.TableExists("SscSupportedMedias"); + bool SupportedDensitiesExists = AaruServerContext.TableExists("SupportedDensities"); + bool TestedMediasExists = AaruServerContext.TableExists("TestedMedias"); + bool TestedSequentialMediasExists = AaruServerContext.TableExists("TestedSequentialMedias"); + bool UploadedReportsExists = AaruServerContext.TableExists("UploadedReports"); + bool UsbProductsExists = AaruServerContext.TableExists("UsbProducts"); + bool UsbsExists = AaruServerContext.TableExists("Usbs"); + bool UsbVendorsExists = AaruServerContext.TableExists("UsbVendors"); + bool VersionsExists = AaruServerContext.TableExists("Versions"); + bool EFExists = AaruServerContext.TableExists("__MigrationHistory"); #endregion #region Drop old restrictions diff --git a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs b/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs index 2e683e9a..bdb905b9 100644 --- a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs +++ b/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191102231633_MakeFieldsUnsigned")] partial class MakeFieldsUnsigned { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1904,7 +1904,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("SscId"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -1914,7 +1914,7 @@ namespace Aaru.Server.Migrations .WithMany() .HasForeignKey("ATAPIId"); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId"); @@ -1943,14 +1943,14 @@ namespace Aaru.Server.Migrations .HasForeignKey("USBId"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -1985,9 +1985,9 @@ namespace Aaru.Server.Migrations .HasForeignKey("USBId"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs b/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs index 594f4f9c..0be7844d 100644 --- a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs +++ b/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191106230730_CreateIdentitySchema")] partial class CreateIdentitySchema { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2100,7 +2100,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("SscId"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2110,7 +2110,7 @@ namespace Aaru.Server.Migrations .WithMany() .HasForeignKey("ATAPIId"); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId"); @@ -2139,14 +2139,14 @@ namespace Aaru.Server.Migrations .HasForeignKey("USBId"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2181,9 +2181,9 @@ namespace Aaru.Server.Migrations .HasForeignKey("USBId"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs b/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs index 368fa7ad..d6fcd834 100644 --- a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs +++ b/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191108004756_SetAllOnDeleteSetNull")] partial class SetAllOnDeleteSetNull { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2120,7 +2120,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2132,7 +2132,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2168,15 +2168,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2219,9 +2219,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs b/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs index 7ff1ce54..15277531 100644 --- a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs +++ b/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191110143605_CascadeDeleteDensityCodes")] partial class CascadeDeleteDensityCodes { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2120,7 +2120,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2132,7 +2132,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2168,15 +2168,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2219,9 +2219,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs b/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs index d992e010..92ebeb18 100644 --- a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs +++ b/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191110144834_CascadeDeleteBlockDescriptors")] partial class CascadeDeleteBlockDescriptors { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2120,7 +2120,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2132,7 +2132,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2168,15 +2168,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2219,9 +2219,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs b/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs index 20cc3829..8ae34aa4 100644 --- a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs +++ b/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191113003156_CascadeDeleteMmcFeatures")] partial class CascadeDeleteMmcFeatures { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2120,7 +2120,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2132,7 +2132,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2168,15 +2168,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2219,9 +2219,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs b/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs index bc96ac4a..a82985a3 100644 --- a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs +++ b/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191117215158_CascadeDeleteSupportedDensities")] partial class CascadeDeleteSupportedDensities { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2120,7 +2120,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2132,7 +2132,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2168,15 +2168,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2219,9 +2219,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs b/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs index 69d8ee30..7b7fd7a2 100644 --- a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs +++ b/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191124212117_EFTypesUpdate")] partial class EFTypesUpdate { @@ -1379,7 +1379,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1396,7 +1396,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1430,7 +1430,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1512,7 +1512,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1540,7 +1540,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1557,7 +1557,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1574,7 +1574,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1594,7 +1594,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1611,7 +1611,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1631,7 +1631,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1648,7 +1648,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1717,7 +1717,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1749,7 +1749,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1777,7 +1777,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2120,7 +2120,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2132,7 +2132,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2168,15 +2168,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2219,9 +2219,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs b/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs index 1b88df5b..060dd116 100644 --- a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs +++ b/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191124220655_AddSupportsScrambledReadCd")] partial class AddSupportsScrambledReadCd { @@ -1385,7 +1385,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1402,7 +1402,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1436,7 +1436,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1518,7 +1518,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1546,7 +1546,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1563,7 +1563,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1580,7 +1580,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1600,7 +1600,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1617,7 +1617,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1637,7 +1637,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1654,7 +1654,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1723,7 +1723,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1755,7 +1755,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1783,7 +1783,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2126,7 +2126,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2138,7 +2138,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2174,15 +2174,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2225,9 +2225,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs b/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs index 636be1f1..9214e4f5 100644 --- a/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs +++ b/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191203212552_NameCountModel")] partial class NameCountModel { @@ -1385,7 +1385,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1402,7 +1402,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1436,7 +1436,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1518,7 +1518,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1546,7 +1546,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1563,7 +1563,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1580,7 +1580,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1600,7 +1600,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1617,7 +1617,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1637,7 +1637,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1654,7 +1654,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1723,7 +1723,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1755,7 +1755,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1783,7 +1783,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2126,7 +2126,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2138,7 +2138,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2174,15 +2174,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2225,9 +2225,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs b/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs index aaa1673d..24d57155 100644 --- a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs +++ b/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] [Migration("20191204182314_RemoteStatistics")] partial class RemoteStatistics { @@ -1385,7 +1385,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1402,7 +1402,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1436,7 +1436,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1518,7 +1518,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1546,7 +1546,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1563,7 +1563,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1580,7 +1580,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1600,7 +1600,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1617,7 +1617,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1637,7 +1637,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1654,7 +1654,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.RemoteApplication", b => + modelBuilder.Entity("DiscImageChef.Server.Models.RemoteApplication", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1674,7 +1674,7 @@ namespace Aaru.Server.Migrations b.ToTable("RemoteApplications"); }); - modelBuilder.Entity("Aaru.Server.Models.RemoteArchitecture", b => + modelBuilder.Entity("DiscImageChef.Server.Models.RemoteArchitecture", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1691,7 +1691,7 @@ namespace Aaru.Server.Migrations b.ToTable("RemoteArchitectures"); }); - modelBuilder.Entity("Aaru.Server.Models.RemoteOperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.RemoteOperatingSystem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1711,7 +1711,7 @@ namespace Aaru.Server.Migrations b.ToTable("RemoteOperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1780,7 +1780,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1812,7 +1812,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1840,7 +1840,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2183,7 +2183,7 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2195,7 +2195,7 @@ namespace Aaru.Server.Migrations .HasForeignKey("ATAPIId") .OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset") + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") .WithMany("Devices") .HasForeignKey("CdOffsetId") .OnDelete(DeleteBehavior.SetNull); @@ -2231,15 +2231,15 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report") + b.HasOne("DiscImageChef.Server.Models.Device", "Report") .WithMany() .HasForeignKey("ReportId") .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA") .WithMany() @@ -2282,9 +2282,9 @@ namespace Aaru.Server.Migrations .OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor") + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") .WithMany("Products") .HasForeignKey("VendorId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs b/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs index a8231472..a29f20b2 100644 --- a/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs +++ b/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; namespace Aaru.Server.Migrations { - [DbContext(typeof(DicServerContext))] + [DbContext(typeof(AaruServerContext))] internal class DicServerContextModelSnapshot : ModelSnapshot { protected override void BuildModel(ModelBuilder modelBuilder) @@ -969,7 +969,7 @@ namespace Aaru.Server.Migrations b.ToTable("Usb"); }); - modelBuilder.Entity("Aaru.Server.Models.Command", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -982,7 +982,7 @@ namespace Aaru.Server.Migrations b.ToTable("Commands"); }); - modelBuilder.Entity("Aaru.Server.Models.CompactDiscOffset", b => + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1007,7 +1007,7 @@ namespace Aaru.Server.Migrations b.ToTable("CdOffsets"); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1070,7 +1070,7 @@ namespace Aaru.Server.Migrations b.ToTable("Devices"); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1091,7 +1091,7 @@ namespace Aaru.Server.Migrations b.ToTable("DeviceStats"); }); - modelBuilder.Entity("Aaru.Server.Models.Filesystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1104,7 +1104,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filesystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Filter", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1117,7 +1117,7 @@ namespace Aaru.Server.Migrations b.ToTable("Filters"); }); - modelBuilder.Entity("Aaru.Server.Models.Media", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1132,7 +1132,7 @@ namespace Aaru.Server.Migrations b.ToTable("Medias"); }); - modelBuilder.Entity("Aaru.Server.Models.MediaFormat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1145,7 +1145,7 @@ namespace Aaru.Server.Migrations b.ToTable("MediaFormats"); }); - modelBuilder.Entity("Aaru.Server.Models.OperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1160,7 +1160,7 @@ namespace Aaru.Server.Migrations b.ToTable("OperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.Partition", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1173,7 +1173,7 @@ namespace Aaru.Server.Migrations b.ToTable("Partitions"); }); - modelBuilder.Entity("Aaru.Server.Models.RemoteApplication", b => + modelBuilder.Entity("DiscImageChef.Server.Models.RemoteApplication", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1188,7 +1188,7 @@ namespace Aaru.Server.Migrations b.ToTable("RemoteApplications"); }); - modelBuilder.Entity("Aaru.Server.Models.RemoteArchitecture", b => + modelBuilder.Entity("DiscImageChef.Server.Models.RemoteArchitecture", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1201,7 +1201,7 @@ namespace Aaru.Server.Migrations b.ToTable("RemoteArchitectures"); }); - modelBuilder.Entity("Aaru.Server.Models.RemoteOperatingSystem", b => + modelBuilder.Entity("DiscImageChef.Server.Models.RemoteOperatingSystem", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1216,7 +1216,7 @@ namespace Aaru.Server.Migrations b.ToTable("RemoteOperatingSystems"); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1269,7 +1269,7 @@ namespace Aaru.Server.Migrations b.ToTable("Reports"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1294,7 +1294,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbProducts"); }); - modelBuilder.Entity("Aaru.Server.Models.UsbVendor", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1315,7 +1315,7 @@ namespace Aaru.Server.Migrations b.ToTable("UsbVendors"); }); - modelBuilder.Entity("Aaru.Server.Models.Version", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => { b.Property("Id").ValueGeneratedOnAdd().HasColumnType("int"); @@ -1564,7 +1564,7 @@ namespace Aaru.Server.Migrations OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.Device", b => + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA").WithMany().HasForeignKey("ATAId"). OnDelete(DeleteBehavior.SetNull); @@ -1572,7 +1572,7 @@ namespace Aaru.Server.Migrations b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset").WithMany("Devices"). + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset").WithMany("Devices"). HasForeignKey("CdOffsetId").OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany(). @@ -1594,13 +1594,13 @@ namespace Aaru.Server.Migrations OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.DeviceStat", b => + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => { - b.HasOne("Aaru.Server.Models.Device", "Report").WithMany().HasForeignKey("ReportId"). + b.HasOne("DiscImageChef.Server.Models.Device", "Report").WithMany().HasForeignKey("ReportId"). OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UploadedReport", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => { b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA").WithMany().HasForeignKey("ATAId"). OnDelete(DeleteBehavior.SetNull); @@ -1627,9 +1627,9 @@ namespace Aaru.Server.Migrations OnDelete(DeleteBehavior.SetNull); }); - modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor").WithMany("Products"). + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor").WithMany("Products"). HasForeignKey("VendorId").OnDelete(DeleteBehavior.Cascade).IsRequired(); }); diff --git a/Aaru.Server/Models/Context.cs b/Aaru.Server/Models/Context.cs index f1499b48..265c276c 100644 --- a/Aaru.Server/Models/Context.cs +++ b/Aaru.Server/Models/Context.cs @@ -39,11 +39,11 @@ using Microsoft.Extensions.Configuration; namespace Aaru.Server.Models { - public sealed class DicServerContext : IdentityDbContext + public sealed class AaruServerContext : IdentityDbContext { - public DicServerContext() { } + public AaruServerContext() { } - public DicServerContext(DbContextOptions options) : base(options) { } + public AaruServerContext(DbContextOptions options) : base(options) { } public DbSet Devices { get; set; } public DbSet Reports { get; set; } @@ -262,7 +262,7 @@ namespace Aaru.Server.Models internal static bool TableExists(string tableName) { - using var db = new DicServerContext(); + using var db = new AaruServerContext(); DbConnection connection = db.Database.GetDbConnection(); connection.Open(); diff --git a/Aaru.Server/Program.cs b/Aaru.Server/Program.cs index da08a9c6..47de67a5 100644 --- a/Aaru.Server/Program.cs +++ b/Aaru.Server/Program.cs @@ -89,7 +89,7 @@ namespace Aaru.Server { start = DateTime.Now; System.Console.WriteLine("\u001b[31;1mUpdating database with Entity Framework...\u001b[0m"); - var context = services.GetRequiredService(); + var context = services.GetRequiredService(); context.Database.Migrate(); end = DateTime.Now; diff --git a/Aaru.Server/Seeder.cs b/Aaru.Server/Seeder.cs index 2cc0ccea..15aeed4c 100644 --- a/Aaru.Server/Seeder.cs +++ b/Aaru.Server/Seeder.cs @@ -7,7 +7,7 @@ namespace Aaru.Server { public static class Seeder { - public static void Seed(DicServerContext ctx, IServiceProvider serviceProvider) + public static void Seed(AaruServerContext ctx, IServiceProvider serviceProvider) { string email = "claunia@claunia.com"; char[] randChars = new char[16]; diff --git a/Aaru.Server/Startup.cs b/Aaru.Server/Startup.cs index a7db1c1f..b570c54e 100644 --- a/Aaru.Server/Startup.cs +++ b/Aaru.Server/Startup.cs @@ -21,7 +21,7 @@ namespace Aaru.Server // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - services.AddDbContext(options => options. + services.AddDbContext(options => options. UseMySql(Configuration. GetConnectionString("DefaultConnection")). UseLazyLoadingProxies()); @@ -30,7 +30,7 @@ namespace Aaru.Server { options.SignIn.RequireConfirmedAccount = true; options.User.RequireUniqueEmail = true; - }).AddEntityFrameworkStores(); + }).AddEntityFrameworkStores(); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); } diff --git a/Aaru.Server/appsettings.json b/Aaru.Server/appsettings.json index b3ef4873..5acea4cd 100644 --- a/Aaru.Server/appsettings.json +++ b/Aaru.Server/appsettings.json @@ -7,6 +7,6 @@ } }, "ConnectionStrings": { - "DicServerContextConnection": "Server=(localdb)\\mssqllocaldb;Database=DiscImageChef.Server;Trusted_Connection=True;MultipleActiveResultSets=true" + "AaruServerContextConnection": "Server=(localdb)\\mssqllocaldb;Database=Aaru.Server;Trusted_Connection=True;MultipleActiveResultSets=true" } } \ No newline at end of file