From 2dd3bc18dc1b8a7f324cb7f695ab1c4a19c1330f Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 3 Oct 2023 23:00:32 +0100 Subject: [PATCH] [Aaru.Database] Reformat and cleanup. --- Aaru.Database/Aaru.Database.csproj | 20 ++++++++++---------- Aaru.Database/Context.cs | 17 +++++++++++++++++ Aaru.Database/ContextFactory.cs | 4 ++++ Aaru.Database/Models/BaseOperatingSystem.cs | 3 +++ Aaru.Database/Models/CdOffset.cs | 2 ++ Aaru.Database/Models/DeviceStat.cs | 4 ++++ Aaru.Database/Models/Media.cs | 3 +++ Aaru.Database/Models/NameCountModel.cs | 2 ++ Aaru.Database/Models/NesHeaderInfo.cs | 16 +++++++++++++++- Aaru.Database/Models/Report.cs | 1 + Aaru.Database/Models/UsbProduct.cs | 6 ++++++ Aaru.Database/Models/UsbVendor.cs | 3 +++ 12 files changed, 70 insertions(+), 11 deletions(-) diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj index 2d5b9ebed..5a0f49333 100644 --- a/Aaru.Database/Aaru.Database.csproj +++ b/Aaru.Database/Aaru.Database.csproj @@ -32,8 +32,8 @@ CS1591;CS1574 - - + + $(Version)+{chash:8} @@ -46,19 +46,19 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + - - + + \ No newline at end of file diff --git a/Aaru.Database/Context.cs b/Aaru.Database/Context.cs index e14194ccc..393291509 100644 --- a/Aaru.Database/Context.cs +++ b/Aaru.Database/Context.cs @@ -46,38 +46,55 @@ public sealed class AaruContext : DbContext /// List of known devices public DbSet Devices { get; set; } + /// List of local device reports public DbSet Reports { get; set; } + /// Command usage statistics public DbSet Commands { get; set; } + /// Statistics for found filesystems public DbSet Filesystems { get; set; } + /// Statistics for used filters public DbSet Filters { get; set; } + /// Statistics for media image formats public DbSet MediaFormats { get; set; } + /// Statistics for partitioning schemes public DbSet Partitions { get; set; } + /// Statistics for media types public DbSet Medias { get; set; } + /// Statistics for devices seen using commands public DbSet SeenDevices { get; set; } + /// Statistics for operating systems public DbSet OperatingSystems { get; set; } + /// Statistics for used Aaru versions public DbSet Versions { get; set; } + /// List of known USB vendors public DbSet UsbVendors { get; set; } + /// List of known USB products public DbSet UsbProducts { get; set; } + /// List of CD reading offsets public DbSet CdOffsets { get; set; } + /// Statistics of remote applications public DbSet RemoteApplications { get; set; } + /// Statistics of remote architectures public DbSet RemoteArchitectures { get; set; } + /// Statistics of remote operating systems public DbSet RemoteOperatingSystems { get; set; } + /// Known iNES/NES 2.0 headers public DbSet NesHeaders { get; set; } diff --git a/Aaru.Database/ContextFactory.cs b/Aaru.Database/ContextFactory.cs index af505794d..de3cb5180 100644 --- a/Aaru.Database/ContextFactory.cs +++ b/Aaru.Database/ContextFactory.cs @@ -38,9 +38,13 @@ namespace Aaru.Database; /// Database context factory, for design time public class AaruContextFactory : IDesignTimeDbContextFactory { +#region IDesignTimeDbContextFactory Members + /// /// Creates a database context /// Ignored parameters /// A database context public AaruContext CreateDbContext(string[] args) => AaruContext.Create("aaru.db"); + +#endregion } \ No newline at end of file diff --git a/Aaru.Database/Models/BaseOperatingSystem.cs b/Aaru.Database/Models/BaseOperatingSystem.cs index cfa23c2e9..7e74a5b9d 100644 --- a/Aaru.Database/Models/BaseOperatingSystem.cs +++ b/Aaru.Database/Models/BaseOperatingSystem.cs @@ -38,10 +38,13 @@ public abstract class BaseOperatingSystem : BaseModel { /// Operating system name public string Name { get; set; } + /// Operating system version public string Version { get; set; } + /// Has already been synchronized with Aaru's server public bool Synchronized { get; set; } + /// Statistical count public ulong Count { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/CdOffset.cs b/Aaru.Database/Models/CdOffset.cs index 4e13f0ca6..66c4f3013 100644 --- a/Aaru.Database/Models/CdOffset.cs +++ b/Aaru.Database/Models/CdOffset.cs @@ -71,8 +71,10 @@ public class CdOffset : CommonTypes.Metadata.CdOffset /// Database ID public int Id { get; set; } + /// Date when model has been added to the database public DateTime AddedWhen { get; set; } + /// Date when model was last modified public DateTime ModifiedWhen { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/DeviceStat.cs b/Aaru.Database/Models/DeviceStat.cs index 98fd59353..332c29209 100644 --- a/Aaru.Database/Models/DeviceStat.cs +++ b/Aaru.Database/Models/DeviceStat.cs @@ -38,12 +38,16 @@ public class DeviceStat : BaseModel { /// Manufacturer public string Manufacturer { get; set; } + /// Model public string Model { get; set; } + /// Revision or firmware version public string Revision { get; set; } + /// Bus public string Bus { get; set; } + /// Has already been synchronized with Aaru's server public bool Synchronized { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/Media.cs b/Aaru.Database/Models/Media.cs index 4ff942a95..fd7ba27cd 100644 --- a/Aaru.Database/Models/Media.cs +++ b/Aaru.Database/Models/Media.cs @@ -38,10 +38,13 @@ public class Media : BaseModel { /// Media type name public string Type { get; set; } + /// Found physically, or in image public bool Real { get; set; } + /// Has already been synchronized with Aaru's server public bool Synchronized { get; set; } + /// Count of times found public ulong Count { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/NameCountModel.cs b/Aaru.Database/Models/NameCountModel.cs index 4e79d63e8..53ef31aa9 100644 --- a/Aaru.Database/Models/NameCountModel.cs +++ b/Aaru.Database/Models/NameCountModel.cs @@ -38,8 +38,10 @@ public abstract class NameCountModel : BaseModel { /// Value name public string Name { get; set; } + /// Has already been synchronized with Aaru's server public bool Synchronized { get; set; } + /// Value count public ulong Count { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/NesHeaderInfo.cs b/Aaru.Database/Models/NesHeaderInfo.cs index 58e476e4b..8821ab12d 100644 --- a/Aaru.Database/Models/NesHeaderInfo.cs +++ b/Aaru.Database/Models/NesHeaderInfo.cs @@ -9,32 +9,46 @@ namespace Aaru.Database.Models; public class NesHeaderInfo : BaseModel { /// ROM hash - [StringLength(64), Required] + [StringLength(64)] + [Required] public string Sha256 { get; set; } + /// If true vertical mirroring is hard-wired, horizontal or mapper defined otherwise public bool NametableMirroring { get; set; } + /// If true a battery is present public bool BatteryPresent { get; set; } + /// If true the four player screen mode is hardwired public bool FourScreenMode { get; set; } + /// Mapper number (NES 2.0 when in conflict) public ushort Mapper { get; set; } + /// Console type public NesConsoleType ConsoleType { get; set; } + /// Submapper number public byte Submapper { get; set; } + /// Timing mode public NesTimingMode TimingMode { get; set; } + /// Vs. PPU type public NesVsPpuType VsPpuType { get; set; } + /// Vs. hardware type public NesVsHardwareType VsHardwareType { get; set; } + /// Extended console type public NesExtendedConsoleType ExtendedConsoleType { get; set; } + /// Default expansion device public NesDefaultExpansionDevice DefaultExpansionDevice { get; set; } + /// Date when model has been added to the database public DateTime AddedWhen { get; set; } + /// Date when model was last modified public DateTime ModifiedWhen { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/Report.cs b/Aaru.Database/Models/Report.cs index 5c9c8d0dd..7e26d2dd9 100644 --- a/Aaru.Database/Models/Report.cs +++ b/Aaru.Database/Models/Report.cs @@ -70,6 +70,7 @@ public class Report : DeviceReport /// Date when the device report was created public DateTime Created { get; set; } + /// If this model has already been upload public bool Uploaded { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/UsbProduct.cs b/Aaru.Database/Models/UsbProduct.cs index d767a6af1..07f36ef27 100644 --- a/Aaru.Database/Models/UsbProduct.cs +++ b/Aaru.Database/Models/UsbProduct.cs @@ -56,16 +56,22 @@ public class UsbProduct /// Database ID [Key] public int Id { get; set; } + /// Product ID public ushort ProductId { get; set; } + /// Product name public string Product { get; set; } + /// Date when model has been added to the database public DateTime AddedWhen { get; set; } + /// Date when model was last modified public DateTime ModifiedWhen { get; set; } + /// USB vendor ID public ushort VendorId { get; set; } + /// Database link to USB vendor public virtual UsbVendor Vendor { get; set; } } \ No newline at end of file diff --git a/Aaru.Database/Models/UsbVendor.cs b/Aaru.Database/Models/UsbVendor.cs index 9efe4f608..4c7303a22 100644 --- a/Aaru.Database/Models/UsbVendor.cs +++ b/Aaru.Database/Models/UsbVendor.cs @@ -55,10 +55,13 @@ public class UsbVendor /// Database ID [Key] public ushort Id { get; set; } + /// Vendor name public string Vendor { get; set; } + /// Date when model has been added to the database public DateTime AddedWhen { get; set; } + /// Date when model was last modified public DateTime ModifiedWhen { get; set; }