From a19878ba39db3997dc0ff0a66a59fc1f3852659e Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 1 Mar 2020 02:28:07 +0000 Subject: [PATCH] Code styling. --- Aaru.Server.Task/Program.cs | 73 ++++----- .../Areas/Admin/Controllers/AtasController.cs | 4 +- .../Areas/Admin/Controllers/ChsController.cs | 2 +- .../Admin/Controllers/DevicesController.cs | 2 +- .../Admin/Controllers/FireWiresController.cs | 2 +- .../Areas/Admin/Controllers/MmcController.cs | 2 +- .../Controllers/MmcFeaturesController.cs | 2 +- .../Admin/Controllers/MmcSdsController.cs | 2 +- .../Admin/Controllers/PcmciasController.cs | 2 +- .../Admin/Controllers/ReportsController.cs | 2 +- .../Admin/Controllers/ScsiModesController.cs | 2 +- .../Admin/Controllers/ScsiPagesController.cs | 2 +- .../Admin/Controllers/ScsisController.cs | 4 +- .../Areas/Admin/Controllers/SscsController.cs | 2 +- .../SupportedDensitiesController.cs | 2 +- .../Controllers/TestedMediasController.cs | 2 +- .../TestedSequentialMediasController.cs | 2 +- .../Areas/Admin/Controllers/UsbsController.cs | 2 +- .../Admin/Views/Atas/CheckPrivate.cshtml | 4 +- .../Areas/Admin/Views/Atas/Compare.cshtml | 6 +- .../Areas/Admin/Views/Atas/Consolidate.cshtml | 2 +- .../Areas/Admin/Views/Atas/Index.cshtml | 2 +- .../Admin/Views/BlockDescriptors/Index.cshtml | 2 +- .../Areas/Admin/Views/Chs/Consolidate.cshtml | 2 +- .../Areas/Admin/Views/Chs/Index.cshtml | 2 +- .../Areas/Admin/Views/Commands/Index.cshtml | 2 +- .../Views/CompactDiscOffsets/Index.cshtml | 2 +- .../Admin/Views/DeviceStats/Index.cshtml | 4 +- .../Areas/Admin/Views/Devices/Details.cshtml | 56 +++---- .../Areas/Admin/Views/Devices/Find.cshtml | 4 +- .../Areas/Admin/Views/Devices/Index.cshtml | 2 +- .../Admin/Views/Filesystems/Index.cshtml | 2 +- .../Areas/Admin/Views/Filters/Index.cshtml | 2 +- .../Admin/Views/FireWires/Consolidate.cshtml | 2 +- .../Areas/Admin/Views/FireWires/Index.cshtml | 2 +- .../Admin/Views/MediaFormats/Index.cshtml | 2 +- .../Areas/Admin/Views/Medias/Index.cshtml | 2 +- .../Areas/Admin/Views/Mmc/Index.cshtml | 4 +- .../Admin/Views/MmcFeatures/Index.cshtml | 2 +- .../Areas/Admin/Views/MmcSds/Delete.cshtml | 16 +- .../Areas/Admin/Views/MmcSds/Details.cshtml | 16 +- .../Areas/Admin/Views/MmcSds/Index.cshtml | 2 +- .../Admin/Views/OperatingSystems/Index.cshtml | 2 +- .../Areas/Admin/Views/Partitions/Index.cshtml | 2 +- .../Areas/Admin/Views/Pcmcias/Index.cshtml | 2 +- .../Areas/Admin/Views/Reports/Details.cshtml | 42 ++--- .../Areas/Admin/Views/Reports/Index.cshtml | 2 +- .../Areas/Admin/Views/ScsiModes/Index.cshtml | 2 +- .../Areas/Admin/Views/ScsiPages/Index.cshtml | 2 +- .../Areas/Admin/Views/Scsis/Compare.cshtml | 6 +- .../Admin/Views/Scsis/Consolidate.cshtml | 2 +- .../Areas/Admin/Views/Scsis/Index.cshtml | 2 +- .../Areas/Admin/Views/Shared/_Layout.cshtml | 6 +- .../Admin/Views/Shared/_LoginPartial.cshtml | 2 +- .../Areas/Admin/Views/Sscs/Consolidate.cshtml | 2 +- .../Areas/Admin/Views/Sscs/Index.cshtml | 2 +- .../Views/SupportedDensities/Index.cshtml | 2 +- .../Admin/Views/TestedMedias/Delete.cshtml | 144 +++++++++--------- .../Admin/Views/TestedMedias/Details.cshtml | 144 +++++++++--------- .../Admin/Views/TestedMedias/Index.cshtml | 2 +- .../Admin/Views/TestedMedias/ViewData.cshtml | 8 +- .../Views/TestedSequentialMedias/Index.cshtml | 2 +- .../Admin/Views/UsbProducts/Index.cshtml | 2 +- .../Admin/Views/UsbVendors/Details.cshtml | 2 +- .../Areas/Admin/Views/UsbVendors/Index.cshtml | 2 +- .../Areas/Admin/Views/Usbs/Consolidate.cshtml | 2 +- .../Areas/Admin/Views/Usbs/Index.cshtml | 2 +- .../Areas/Admin/Views/Versions/Index.cshtml | 2 +- Aaru.Server/BasicAuthMiddleware.cs | 8 +- Aaru.Server/Controllers/ReportController.cs | 2 +- Aaru.Server/Controllers/StatsController.cs | 8 +- Aaru.Server/Controllers/UpdateController.cs | 6 +- .../Controllers/UploadReportController.cs | 10 +- .../Controllers/UploadStatsController.cs | 23 ++- Aaru.Server/Core/ScsiMmcFeatures.cs | 1 - Aaru.Server/Core/StatsConverter.cs | 10 +- Aaru.Server/Core/TestedMedia.cs | 34 ++--- .../AaruServerContextModelSnapshot.cs | 54 ++++--- Aaru.Server/Models/CdOffset.cs | 2 +- Aaru.Server/Models/Command.cs | 2 +- Aaru.Server/Models/Context.cs | 54 ++++--- Aaru.Server/Models/Filesystem.cs | 2 +- Aaru.Server/Models/Filter.cs | 2 +- Aaru.Server/Models/MediaFormat.cs | 2 +- Aaru.Server/Models/OperatingSystem.cs | 2 +- Aaru.Server/Models/Partition.cs | 2 +- Aaru.Server/Models/RemoteApplication.cs | 2 +- Aaru.Server/Models/RemoteArchitecture.cs | 2 +- Aaru.Server/Models/RemoteOperatingSystem.cs | 2 +- Aaru.Server/Models/UsbProduct.cs | 2 +- Aaru.Server/Models/UsbVendor.cs | 2 +- Aaru.Server/Models/Version.cs | 2 +- Aaru.Server/Program.cs | 6 +- Aaru.Server/Startup.cs | 6 +- Aaru.Server/Views/Report/View.cshtml | 58 +++---- Aaru.Server/Views/Shared/Error.cshtml | 2 +- .../Views/Shared/_CookieConsentPartial.cshtml | 2 +- Aaru.Server/Views/Shared/_Layout.cshtml | 4 +- Aaru.Server/Views/Stats/Index.cshtml | 42 ++--- 99 files changed, 497 insertions(+), 502 deletions(-) diff --git a/Aaru.Server.Task/Program.cs b/Aaru.Server.Task/Program.cs index eaa79238..7b40d416 100644 --- a/Aaru.Server.Task/Program.cs +++ b/Aaru.Server.Task/Program.cs @@ -368,15 +368,15 @@ namespace Aaru.Server.Task switch(manufacturer) { - case"Lite-ON": + case "Lite-ON": manufacturer = "JLMS"; break; - case"LG Electronics": + case "LG Electronics": manufacturer = "HL-DT-ST"; break; - case"Panasonic": + case "Panasonic": manufacturer = "MATSHITA"; break; @@ -472,46 +472,49 @@ namespace Aaru.Server.Task { var sr = new StreamReader("drive_offsets.json"); - var offsets = JsonSerializer.Deserialize(sr.ReadToEnd()); + CompactDiscOffset[] offsets = JsonSerializer.Deserialize(sr.ReadToEnd()); if(offsets != null) { - foreach(var offset in offsets) + foreach(CompactDiscOffset offset in offsets) { - CompactDiscOffset cdOffset = - ctx.CdOffsets.FirstOrDefault(o => o.Manufacturer == offset.Manufacturer && o.Model == offset.Model); - if(cdOffset is null) - { - offset.ModifiedWhen = DateTime.UtcNow; + CompactDiscOffset cdOffset = + ctx.CdOffsets.FirstOrDefault(o => o.Manufacturer == offset.Manufacturer && + o.Model == offset.Model); - ctx.CdOffsets.Add(offset); - addedOffsets++; - } - else - { - if(Math.Abs(cdOffset.Agreement - offset.Agreement) > 0 || offset.Agreement < 0) - { - cdOffset.Agreement = offset.Agreement; - cdOffset.ModifiedWhen = DateTime.UtcNow; - } + if(cdOffset is null) + { + offset.ModifiedWhen = DateTime.UtcNow; - if(cdOffset.Offset != offset.Offset) - { - cdOffset.Offset = offset.Offset; - cdOffset.ModifiedWhen = DateTime.UtcNow; - } + ctx.CdOffsets.Add(offset); + addedOffsets++; + } + else + { + if(Math.Abs(cdOffset.Agreement - offset.Agreement) > 0 || + offset.Agreement < 0) + { + cdOffset.Agreement = offset.Agreement; + cdOffset.ModifiedWhen = DateTime.UtcNow; + } - if(cdOffset.Submissions != offset.Submissions) - { - cdOffset.Submissions = offset.Submissions; - cdOffset.ModifiedWhen = DateTime.UtcNow; - } + if(cdOffset.Offset != offset.Offset) + { + cdOffset.Offset = offset.Offset; + cdOffset.ModifiedWhen = DateTime.UtcNow; + } - if(Math.Abs(cdOffset.Agreement - offset.Agreement) > 0 || - cdOffset.Offset != offset.Offset || - cdOffset.Submissions != offset.Submissions) - modifiedOffsets++; - } + if(cdOffset.Submissions != offset.Submissions) + { + cdOffset.Submissions = offset.Submissions; + cdOffset.ModifiedWhen = DateTime.UtcNow; + } + + if(Math.Abs(cdOffset.Agreement - offset.Agreement) > 0 || + cdOffset.Offset != offset.Offset || + cdOffset.Submissions != offset.Submissions) + modifiedOffsets++; + } } } } diff --git a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs index ada1e3b6..0a48cdd9 100644 --- a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -326,7 +326,7 @@ namespace Aaru.Server.Areas.Admin.Controllers } } else if(lv == null && - rv == null) { } + rv == null) {} else if(lv != null && rv == null) { diff --git a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs index 765d8fd0..16e668c4 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs index 7b3f1375..75fc4f24 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs index 76e837eb..2f8e5eed 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs index 16a3e29c..bd5f32e7 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs index 0f0f842f..a3c230d9 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs index 51c0d722..3e197ed0 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs index de944983..680adf58 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs index efae3ce1..70440348 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs index 92429f2b..ba380b85 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs index 4ee622d2..729b035e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs index 2f32a55e..06590e2e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -300,7 +300,7 @@ namespace Aaru.Server.Areas.Admin.Controllers } } else if(lv == null && - rv == null) { } + rv == null) {} else if(lv != null && rv == null) { diff --git a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs index 9f648a88..e85238d0 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs index 22b6bb5b..f5ac7bbd 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs index c1c764d6..e759252e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs @@ -1,7 +1,6 @@ using System.Linq; using System.Threading.Tasks; using System.Web; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.SCSI; using Aaru.Decoders.ATA; @@ -9,6 +8,7 @@ using Aaru.Decoders.Bluray; using Aaru.Decoders.CD; using Aaru.Decoders.DVD; using Aaru.Decoders.SCSI; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs index a6446cd5..ca1f524c 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs index 0110c32e..eca8163b 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml index 7a5fa318..9598650a 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml @@ -36,7 +36,7 @@ } ATA IDENTIFY DEVICE responses with possible private data -@if (!Model.Any()) +@if(!Model.Any()) {
No private data found. @@ -91,7 +91,7 @@ ATA IDENTIFY DEVICE responses with possible private data - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml index 6b261775..09ee5885 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml @@ -34,13 +34,13 @@ // ****************************************************************************/ }

Comparing ATA IDENTIFY ID @Model.LeftId with ID @Model.RightId

-@if (Model.AreEqual) +@if(Model.AreEqual) {

No differences found.

return; } -@if (Model.HasError) +@if(Model.HasError) {

@Model.ErrorMessage

return; @@ -61,7 +61,7 @@ - @for (var i = 0; i < Model.ValueNames.Count; i++) + @for(var i = 0; i < Model.ValueNames.Count; i++) { diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml index 04a78395..64b6faea 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml @@ -10,7 +10,7 @@ - @foreach (var item in Model.List) + @foreach(var item in Model.List) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model.SameButManufacturer) + @foreach(var item in Model.SameButManufacturer) {
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml index 27bdb77b..510adf74 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml @@ -54,7 +54,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml b/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml index 0411ba0f..8a621aaa 100644 --- a/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml @@ -49,7 +49,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml index 24769ff9..cdf1ed25 100644 --- a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml @@ -10,7 +10,7 @@ - @foreach (var item in Model.List) + @foreach(var item in Model.List) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model.SameAll) + @foreach(var item in Model.SameAll) {
diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml index 23a2dd51..3a8ec1d3 100644 --- a/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml @@ -51,7 +51,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml index 1ccb8e98..f1aaeb7e 100644 --- a/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml @@ -47,7 +47,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml index 28df651c..aad6b53e 100644 --- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml @@ -63,7 +63,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml index 0ab33523..62ae636d 100644 --- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml @@ -56,7 +56,7 @@
@@ -72,7 +72,7 @@ @Html.DisplayFor(modelItem => item.Bus) - @if (item.Report is null) + @if(item.Report is null) { @("No") (Find) diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml index 25b92ca2..6ca40dde 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml @@ -91,61 +91,61 @@ Edit Back to List -@if (Model.ReadCapabilitiesId != 0) +@if(Model.ReadCapabilitiesId != 0) { } -@if (Model.Report.ATA != null) +@if(Model.Report.ATA != null) { } -@if (Model.Report.ATAPI != null) +@if(Model.Report.ATAPI != null) { } -@if (Model.Report.SCSI != null) +@if(Model.Report.SCSI != null) { } -@if (Model.Report.MultiMediaCard != null) +@if(Model.Report.MultiMediaCard != null) { } -@if (Model.Report.SecureDigital != null) +@if(Model.Report.SecureDigital != null) { } -@if (Model.Report.USB != null) +@if(Model.Report.USB != null) { } -@if (Model.Report.FireWire != null) +@if(Model.Report.FireWire != null) {
Has a FireWire report.
} -@if (Model.Report.PCMCIA != null) +@if(Model.Report.PCMCIA != null) {
Has a PCMCIA report.
} -@if (Model.SameAll.Count > 0) +@if(Model.SameAll.Count > 0) {

Other device reports with same manufacturer, model and revision:

@@ -159,7 +159,7 @@
@@ -175,7 +175,7 @@
} -@if (Model.SameButManufacturer.Count > 0) +@if(Model.SameButManufacturer.Count > 0) {

Other device reports with same model and revision:

@@ -189,7 +189,7 @@
@@ -205,7 +205,7 @@
} -@if (Model.ReportAll.Count > 0) +@if(Model.ReportAll.Count > 0) {

Uploaded reports with same manufacturer, model and revision:

@@ -219,7 +219,7 @@ - @foreach (var item in Model.ReportAll) + @foreach(var item in Model.ReportAll) { @@ -235,7 +235,7 @@
} -@if (Model.ReportButManufacturer.Count > 0) +@if(Model.ReportButManufacturer.Count > 0) {

Device reports with same model and revision:

@@ -249,7 +249,7 @@ - @foreach (var item in Model.ReportButManufacturer) + @foreach(var item in Model.ReportButManufacturer) { @@ -265,7 +265,7 @@
} -@if (Model.StatsAll.Count > 0) +@if(Model.StatsAll.Count > 0) {

Device statistics with same manufacturer, model and revision:

@@ -291,7 +291,7 @@ - @foreach (var item in Model.StatsAll) + @foreach(var item in Model.StatsAll) { @@ -307,13 +307,13 @@ @Html.DisplayFor(modelItem => item.Bus) - @if (item.Report is null) + @if(item.Report is null) { @("No") } else { - @if (item.Report.Id == Model.Report.Id) + @if(item.Report.Id == Model.Report.Id) { @("Us") } @@ -332,7 +332,7 @@
} -@if (Model.StatsButManufacturer.Count > 0) +@if(Model.StatsButManufacturer.Count > 0) {

Device statistics with same model and revision:

@@ -358,7 +358,7 @@ - @foreach (var item in Model.StatsButManufacturer) + @foreach(var item in Model.StatsButManufacturer) { @@ -374,7 +374,7 @@ @Html.DisplayFor(modelItem => item.Bus) - @if (item.Report is null) + @if(item.Report is null) { @("No") } @@ -392,7 +392,7 @@
} -@if (Model.TestedMedias.Count > 0) +@if(Model.TestedMedias.Count > 0) {

Tested media:

@@ -412,7 +412,7 @@ - @foreach (var item in Model.TestedMedias) + @foreach(var item in Model.TestedMedias) { @@ -433,7 +433,7 @@
} -@if (Model.TestedSequentialMedias.Count > 0) +@if(Model.TestedSequentialMedias.Count > 0) {

Tested media:

@@ -453,7 +453,7 @@ - @foreach (var item in Model.TestedSequentialMedias) + @foreach(var item in Model.TestedSequentialMedias) { diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml index 499aee17..eba2d212 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml @@ -63,7 +63,7 @@
-@if (Model.LikeDevices.Count == 0) +@if(Model.LikeDevices.Count == 0) {
No device report with similar information has been found!
} @@ -91,7 +91,7 @@ else - @foreach (var item in Model.LikeDevices) + @foreach(var item in Model.LikeDevices) { diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml index 4d5d67bb..909e0fba 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml @@ -59,7 +59,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml index 601393e7..5db269d2 100644 --- a/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml @@ -46,7 +46,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml index 55848cad..23aa4b61 100644 --- a/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml @@ -46,7 +46,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml index acce8ad0..ebc8125a 100644 --- a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml @@ -28,7 +28,7 @@ - @foreach (var item in Model.List) + @foreach(var item in Model.List) { diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml index 29ede571..8eda14ec 100644 --- a/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml @@ -57,7 +57,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml index 69c4c94d..d73707f1 100644 --- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml @@ -47,7 +47,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml index b3d91bcc..51fc843f 100644 --- a/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml @@ -53,7 +53,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml index e18c63a0..056c2ed1 100644 --- a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml @@ -51,14 +51,14 @@ - @foreach (var item in Model) + @foreach(var item in Model) { @Html.DisplayFor(modelItem => item.Id) - @if (item.FeaturesId != null) + @if(item.FeaturesId != null) { @Html.DisplayFor(modelItem => item.FeaturesId) } diff --git a/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml index 3b04c51b..b5e1d530 100644 --- a/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml @@ -410,7 +410,7 @@ -@foreach (var item in Model) +@foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml index 5b5ab32f..5bdb50b8 100644 --- a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml @@ -40,9 +40,9 @@

MultiMediaCard / SecureDigital registers


- @if (Model.SCR != null) + @if(Model.SCR != null) { - if (Model.CID != null) + if(Model.CID != null) {
@Html.DisplayNameFor(model => model.CID) @@ -51,7 +51,7 @@ @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyCID(Model.CID))) } - if (Model.CSD != null) + if(Model.CSD != null) {
@Html.DisplayNameFor(model => model.CSD) @@ -60,7 +60,7 @@ @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyCSD(Model.CSD))) } - if (Model.OCR != null) + if(Model.OCR != null) {
@Html.DisplayNameFor(model => model.OCR) @@ -79,7 +79,7 @@ } else { - if (Model.CID != null) + if(Model.CID != null) {
@Html.DisplayNameFor(model => model.CID) @@ -88,7 +88,7 @@ @Html.Raw(Html.EncodedMultiLineText(Aaru.Decoders.MMC.Decoders.PrettifyCID(Model.CID))) } - if (Model.CSD != null) + if(Model.CSD != null) {
@Html.DisplayNameFor(model => model.CSD) @@ -97,7 +97,7 @@ @Html.Raw(Html.EncodedMultiLineText(Aaru.Decoders.MMC.Decoders.PrettifyCSD(Model.CSD))) } - if (Model.OCR != null) + if(Model.OCR != null) {
@Html.DisplayNameFor(model => model.OCR) @@ -107,7 +107,7 @@ } - if (Model.ExtendedCSD != null) + if(Model.ExtendedCSD != null) {
@Html.DisplayNameFor(model => model.ExtendedCSD) diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml index 9990b113..ad2b00bf 100644 --- a/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml @@ -39,9 +39,9 @@

MultiMediaCard / SecureDigital registers


- @if (Model.SCR != null) + @if(Model.SCR != null) { - if (Model.CID != null) + if(Model.CID != null) {
@Html.DisplayNameFor(model => model.CID) @@ -50,7 +50,7 @@ @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyCID(Model.CID))) } - if (Model.CSD != null) + if(Model.CSD != null) {
@Html.DisplayNameFor(model => model.CSD) @@ -59,7 +59,7 @@ @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyCSD(Model.CSD))) } - if (Model.OCR != null) + if(Model.OCR != null) {
@Html.DisplayNameFor(model => model.OCR) @@ -78,7 +78,7 @@ } else { - if (Model.CID != null) + if(Model.CID != null) {
@Html.DisplayNameFor(model => model.CID) @@ -87,7 +87,7 @@ @Html.Raw(Html.EncodedMultiLineText(Aaru.Decoders.MMC.Decoders.PrettifyCID(Model.CID))) } - if (Model.CSD != null) + if(Model.CSD != null) {
@Html.DisplayNameFor(model => model.CSD) @@ -96,7 +96,7 @@ @Html.Raw(Html.EncodedMultiLineText(Aaru.Decoders.MMC.Decoders.PrettifyCSD(Model.CSD))) } - if (Model.OCR != null) + if(Model.OCR != null) {
@Html.DisplayNameFor(model => model.OCR) @@ -106,7 +106,7 @@ } - if (Model.ExtendedCSD != null) + if(Model.ExtendedCSD != null) {
@Html.DisplayNameFor(model => model.ExtendedCSD) diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml index 617d53a1..1eb8e65d 100644 --- a/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml @@ -44,7 +44,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml index ec24390d..c075ac79 100644 --- a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml @@ -49,7 +49,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml index c767439c..0ba3a770 100644 --- a/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml @@ -46,7 +46,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml index 6bb0ca49..6d032738 100644 --- a/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml @@ -59,7 +59,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml index 09da9842..c831b2af 100644 --- a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml @@ -50,61 +50,61 @@ Promote Back to List -@if (Model.ReadCapabilitiesId != 0) +@if(Model.ReadCapabilitiesId != 0) { } -@if (Model.Report.ATA != null) +@if(Model.Report.ATA != null) { } -@if (Model.Report.ATAPI != null) +@if(Model.Report.ATAPI != null) { } -@if (Model.Report.SCSI != null) +@if(Model.Report.SCSI != null) { } -@if (Model.Report.MultiMediaCard != null) +@if(Model.Report.MultiMediaCard != null) { } -@if (Model.Report.SecureDigital != null) +@if(Model.Report.SecureDigital != null) { } -@if (Model.Report.USB != null) +@if(Model.Report.USB != null) { } -@if (Model.Report.FireWire != null) +@if(Model.Report.FireWire != null) {
Has a FireWire report.
} -@if (Model.Report.PCMCIA != null) +@if(Model.Report.PCMCIA != null) {
Has a PCMCIA report.
} -@if (Model.SameAll.Count > 0) +@if(Model.SameAll.Count > 0) {

Other uploaded reports with same manufacturer, model and revision:

@@ -118,7 +118,7 @@ - @foreach (var item in Model.SameAll) + @foreach(var item in Model.SameAll) { @@ -134,7 +134,7 @@
} -@if (Model.SameButManufacturer.Count > 0) +@if(Model.SameButManufacturer.Count > 0) {

Other uploaded reports with same model and revision:

@@ -148,7 +148,7 @@ - @foreach (var item in Model.SameButManufacturer) + @foreach(var item in Model.SameButManufacturer) { @@ -164,7 +164,7 @@
} -@if (Model.ReportAll.Count > 0) +@if(Model.ReportAll.Count > 0) {

Device reports with same manufacturer, model and revision:

@@ -178,7 +178,7 @@ - @foreach (var item in Model.ReportAll) + @foreach(var item in Model.ReportAll) { @@ -194,7 +194,7 @@
} -@if (Model.ReportButManufacturer.Count > 0) +@if(Model.ReportButManufacturer.Count > 0) {

Device reports with same model and revision:

@@ -208,7 +208,7 @@ - @foreach (var item in Model.ReportButManufacturer) + @foreach(var item in Model.ReportButManufacturer) { @@ -224,7 +224,7 @@
} -@if (Model.TestedMedias.Count > 0) +@if(Model.TestedMedias.Count > 0) {

Tested media:

@@ -244,7 +244,7 @@ - @foreach (var item in Model.TestedMedias) + @foreach(var item in Model.TestedMedias) { @@ -265,7 +265,7 @@
} -@if (Model.TestedSequentialMedias.Count > 0) +@if(Model.TestedSequentialMedias.Count > 0) {

Tested media:

@@ -285,7 +285,7 @@ - @foreach (var item in Model.TestedSequentialMedias) + @foreach(var item in Model.TestedSequentialMedias) { diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml index ba714ef7..13493692 100644 --- a/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml @@ -26,7 +26,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml index 73469ca9..804d366c 100644 --- a/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml @@ -59,7 +59,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml index faad4dcb..e60c5c8a 100644 --- a/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml @@ -47,7 +47,7 @@ - @foreach (var item in Model) + @foreach(var item in Model) { diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml index bf05a8c6..fc63dcf9 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml @@ -34,13 +34,13 @@ // ****************************************************************************/ }

Comparing SCSI INQUIRY ID @Model.LeftId with ID @Model.RightId

-@if (Model.AreEqual) +@if(Model.AreEqual) {

No differences found.

return; } -@if (Model.HasError) +@if(Model.HasError) {

@Model.ErrorMessage

return; @@ -61,7 +61,7 @@ - @for (var i = 0; i < Model.ValueNames.Count; i++) + @for(var i = 0; i < Model.ValueNames.Count; i++) { diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml index 81ba55e0..d424719f 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml @@ -10,7 +10,7 @@ - @foreach (var item in Model.List) + @foreach(var item in Model.List) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model.List) + @foreach(var item in Model.List) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model.Products) + @foreach(var item in Model.Products) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model.List) + @foreach(var item in Model.List) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (var item in Model) + @foreach(var item in Model) { - @foreach (KeyValuePair kvp in ViewBag.repModeSense) + @foreach(KeyValuePair kvp in ViewBag.repModeSense) {
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml index 712d1a01..6b648a7b 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml @@ -66,7 +66,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml index 0f7abb91..30c89f63 100644 --- a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml @@ -38,7 +38,7 @@ - @switch (DateTime.UtcNow.DayOfYear) + @switch(DateTime.UtcNow.DayOfYear) { // 24th January, Macintosh launch case 24: @@ -77,7 +77,7 @@ DiscImageChef Server Administrative Area - @if (SignInManager.IsSignedIn(User)) + @if(SignInManager.IsSignedIn(User)) {
Hello @UserManager.GetUserName(User)! @@ -103,7 +103,7 @@ Claunia.com
- @switch (DateTime.UtcNow.DayOfYear) + @switch(DateTime.UtcNow.DayOfYear) { // 24th January, Macintosh launch case 24: diff --git a/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml b/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml index 1404911b..357ece12 100644 --- a/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml @@ -2,7 +2,7 @@ @inject SignInManager SignInManager @inject UserManager UserManager
diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml index 1b198495..a85224d0 100644 --- a/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml @@ -53,7 +53,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml index fc9ebbcf..4a931977 100644 --- a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml @@ -77,7 +77,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml index a74b9216..28943ce6 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml @@ -42,7 +42,7 @@ @Html.DisplayNameFor(model => model.IdentifyData)
- @if (Model.IdentifyData != null) + @if(Model.IdentifyData != null) { @Model.IdentifyData.Length bytes } @@ -253,7 +253,7 @@ @Html.DisplayNameFor(model => model.Density)
- @if (Model.Density is null) + @if(Model.Density is null) { @("") } @@ -284,7 +284,7 @@ @Html.DisplayNameFor(model => model.MediumType)
- @if (Model.MediumType is null) + @if(Model.MediumType is null) { @("") } @@ -417,7 +417,7 @@ @Html.DisplayNameFor(model => model.ModeSense6Data)
- @if (Model.ModeSense6Data != null) + @if(Model.ModeSense6Data != null) { @Model.ModeSense6Data.Length bytes } @@ -430,7 +430,7 @@ @Html.DisplayNameFor(model => model.ModeSense10Data)
- @if (Model.ModeSense10Data != null) + @if(Model.ModeSense10Data != null) { @Model.ModeSense10Data.Length bytes } @@ -479,7 +479,7 @@ @Html.DisplayNameFor(model => model.UnformattedBPT)
- @if (Model.UnformattedBPT is null) + @if(Model.UnformattedBPT is null) { @("") } @@ -492,7 +492,7 @@ @Html.DisplayNameFor(model => model.UnformattedBPS)
- @if (Model.UnformattedBPS is null) + @if(Model.UnformattedBPS is null) { @("") } @@ -607,7 +607,7 @@ @Html.DisplayNameFor(model => model.IntersessionLeadInData)
- @if (Model.IntersessionLeadInData != null) + @if(Model.IntersessionLeadInData != null) { @Model.IntersessionLeadInData.Length bytes } @@ -620,7 +620,7 @@ @Html.DisplayNameFor(model => model.IntersessionLeadOutData)
- @if (Model.IntersessionLeadOutData != null) + @if(Model.IntersessionLeadOutData != null) { @Model.IntersessionLeadOutData.Length bytes } @@ -633,7 +633,7 @@ @Html.DisplayNameFor(model => model.Read6Data)
- @if (Model.Read6Data != null) + @if(Model.Read6Data != null) { @Model.Read6Data.Length bytes } @@ -646,7 +646,7 @@ @Html.DisplayNameFor(model => model.Read10Data)
- @if (Model.Read10Data != null) + @if(Model.Read10Data != null) { @Model.Read10Data.Length bytes } @@ -659,7 +659,7 @@ @Html.DisplayNameFor(model => model.Read12Data)
- @if (Model.Read12Data != null) + @if(Model.Read12Data != null) { @Model.Read12Data.Length bytes } @@ -672,7 +672,7 @@ @Html.DisplayNameFor(model => model.Read16Data)
- @if (Model.Read16Data != null) + @if(Model.Read16Data != null) { @Model.Read16Data.Length bytes } @@ -685,7 +685,7 @@ @Html.DisplayNameFor(model => model.ReadLong10Data)
- @if (Model.ReadLong10Data != null) + @if(Model.ReadLong10Data != null) { @Model.ReadLong10Data.Length bytes } @@ -698,7 +698,7 @@ @Html.DisplayNameFor(model => model.ReadLong16Data)
- @if (Model.ReadLong16Data != null) + @if(Model.ReadLong16Data != null) { @Model.ReadLong16Data.Length bytes } @@ -711,7 +711,7 @@ @Html.DisplayNameFor(model => model.ReadSectorsData)
- @if (Model.ReadSectorsData != null) + @if(Model.ReadSectorsData != null) { @Model.ReadSectorsData.Length bytes } @@ -724,7 +724,7 @@ @Html.DisplayNameFor(model => model.ReadSectorsRetryData)
- @if (Model.ReadSectorsRetryData != null) + @if(Model.ReadSectorsRetryData != null) { @Model.ReadSectorsRetryData.Length bytes } @@ -737,7 +737,7 @@ @Html.DisplayNameFor(model => model.ReadDmaData)
- @if (Model.ReadDmaData != null) + @if(Model.ReadDmaData != null) { @Model.ReadDmaData.Length bytes } @@ -750,7 +750,7 @@ @Html.DisplayNameFor(model => model.ReadDmaRetryData)
- @if (Model.ReadDmaRetryData != null) + @if(Model.ReadDmaRetryData != null) { @Model.ReadDmaRetryData.Length bytes } @@ -763,7 +763,7 @@ @Html.DisplayNameFor(model => model.ReadLbaData)
- @if (Model.ReadLbaData != null) + @if(Model.ReadLbaData != null) { @Model.ReadLbaData.Length bytes } @@ -776,7 +776,7 @@ @Html.DisplayNameFor(model => model.ReadRetryLbaData)
- @if (Model.ReadRetryLbaData != null) + @if(Model.ReadRetryLbaData != null) { @Model.ReadRetryLbaData.Length bytes } @@ -789,7 +789,7 @@ @Html.DisplayNameFor(model => model.ReadDmaLbaData)
- @if (Model.ReadDmaLbaData != null) + @if(Model.ReadDmaLbaData != null) { @Model.ReadDmaLbaData.Length bytes } @@ -802,7 +802,7 @@ @Html.DisplayNameFor(model => model.ReadDmaRetryLbaData)
- @if (Model.ReadDmaRetryLbaData != null) + @if(Model.ReadDmaRetryLbaData != null) { @Model.ReadDmaRetryLbaData.Length bytes } @@ -815,7 +815,7 @@ @Html.DisplayNameFor(model => model.ReadLba48Data)
- @if (Model.ReadLba48Data != null) + @if(Model.ReadLba48Data != null) { @Model.ReadLba48Data.Length bytes } @@ -828,7 +828,7 @@ @Html.DisplayNameFor(model => model.ReadDmaLba48Data)
- @if (Model.ReadDmaLba48Data != null) + @if(Model.ReadDmaLba48Data != null) { @Model.ReadDmaLba48Data.Length bytes } @@ -841,7 +841,7 @@ @Html.DisplayNameFor(model => model.ReadLongData)
- @if (Model.ReadLongData != null) + @if(Model.ReadLongData != null) { @Model.ReadLongData.Length bytes } @@ -854,7 +854,7 @@ @Html.DisplayNameFor(model => model.ReadLongRetryData)
- @if (Model.ReadLongRetryData != null) + @if(Model.ReadLongRetryData != null) { @Model.ReadLongRetryData.Length bytes } @@ -867,7 +867,7 @@ @Html.DisplayNameFor(model => model.ReadLongLbaData)
- @if (Model.ReadLongLbaData != null) + @if(Model.ReadLongLbaData != null) { @Model.ReadLongLbaData.Length bytes } @@ -880,7 +880,7 @@ @Html.DisplayNameFor(model => model.ReadLongRetryLbaData)
- @if (Model.ReadLongRetryLbaData != null) + @if(Model.ReadLongRetryLbaData != null) { @Model.ReadLongRetryLbaData.Length bytes } @@ -893,7 +893,7 @@ @Html.DisplayNameFor(model => model.TocData)
- @if (Model.TocData != null) + @if(Model.TocData != null) { @Model.TocData.Length bytes } @@ -906,7 +906,7 @@ @Html.DisplayNameFor(model => model.FullTocData)
- @if (Model.FullTocData != null) + @if(Model.FullTocData != null) { @Model.FullTocData.Length bytes } @@ -919,7 +919,7 @@ @Html.DisplayNameFor(model => model.AtipData)
- @if (Model.AtipData != null) + @if(Model.AtipData != null) { @Model.AtipData.Length bytes } @@ -932,7 +932,7 @@ @Html.DisplayNameFor(model => model.PmaData)
- @if (Model.PmaData != null) + @if(Model.PmaData != null) { @Model.PmaData.Length bytes } @@ -945,7 +945,7 @@ @Html.DisplayNameFor(model => model.ReadCdData)
- @if (Model.ReadCdData != null) + @if(Model.ReadCdData != null) { @Model.ReadCdData.Length bytes } @@ -958,7 +958,7 @@ @Html.DisplayNameFor(model => model.ReadCdMsfData)
- @if (Model.ReadCdMsfData != null) + @if(Model.ReadCdMsfData != null) { @Model.ReadCdMsfData.Length bytes } @@ -971,7 +971,7 @@ @Html.DisplayNameFor(model => model.ReadCdFullData)
- @if (Model.ReadCdFullData != null) + @if(Model.ReadCdFullData != null) { @Model.ReadCdFullData.Length bytes } @@ -984,7 +984,7 @@ @Html.DisplayNameFor(model => model.ReadCdMsfFullData)
- @if (Model.ReadCdMsfFullData != null) + @if(Model.ReadCdMsfFullData != null) { @Model.ReadCdMsfFullData.Length bytes } @@ -997,7 +997,7 @@ @Html.DisplayNameFor(model => model.Track1PregapData)
- @if (Model.Track1PregapData != null) + @if(Model.Track1PregapData != null) { @Model.Track1PregapData.Length bytes } @@ -1010,7 +1010,7 @@ @Html.DisplayNameFor(model => model.LeadInData)
- @if (Model.LeadInData != null) + @if(Model.LeadInData != null) { @Model.LeadInData.Length bytes } @@ -1023,7 +1023,7 @@ @Html.DisplayNameFor(model => model.LeadOutData)
- @if (Model.LeadOutData != null) + @if(Model.LeadOutData != null) { @Model.LeadOutData.Length bytes } @@ -1036,7 +1036,7 @@ @Html.DisplayNameFor(model => model.C2PointersData)
- @if (Model.C2PointersData != null) + @if(Model.C2PointersData != null) { @Model.C2PointersData.Length bytes } @@ -1049,7 +1049,7 @@ @Html.DisplayNameFor(model => model.PQSubchannelData)
- @if (Model.PQSubchannelData != null) + @if(Model.PQSubchannelData != null) { @Model.PQSubchannelData.Length bytes } @@ -1062,7 +1062,7 @@ @Html.DisplayNameFor(model => model.RWSubchannelData)
- @if (Model.RWSubchannelData != null) + @if(Model.RWSubchannelData != null) { @Model.RWSubchannelData.Length bytes } @@ -1075,7 +1075,7 @@ @Html.DisplayNameFor(model => model.CorrectedSubchannelData)
- @if (Model.CorrectedSubchannelData != null) + @if(Model.CorrectedSubchannelData != null) { @Model.CorrectedSubchannelData.Length bytes } @@ -1088,7 +1088,7 @@ @Html.DisplayNameFor(model => model.PQSubchannelWithC2Data)
- @if (Model.PQSubchannelWithC2Data != null) + @if(Model.PQSubchannelWithC2Data != null) { @Model.PQSubchannelWithC2Data.Length bytes } @@ -1101,7 +1101,7 @@ @Html.DisplayNameFor(model => model.RWSubchannelWithC2Data)
- @if (Model.RWSubchannelWithC2Data != null) + @if(Model.RWSubchannelWithC2Data != null) { @Model.RWSubchannelWithC2Data.Length bytes } @@ -1114,7 +1114,7 @@ @Html.DisplayNameFor(model => model.CorrectedSubchannelWithC2Data)
- @if (Model.CorrectedSubchannelWithC2Data != null) + @if(Model.CorrectedSubchannelWithC2Data != null) { @Model.CorrectedSubchannelWithC2Data.Length bytes } @@ -1127,7 +1127,7 @@ @Html.DisplayNameFor(model => model.PfiData)
- @if (Model.PfiData != null) + @if(Model.PfiData != null) { @Model.PfiData.Length bytes } @@ -1140,7 +1140,7 @@ @Html.DisplayNameFor(model => model.DmiData)
- @if (Model.DmiData != null) + @if(Model.DmiData != null) { @Model.DmiData.Length bytes } @@ -1153,7 +1153,7 @@ @Html.DisplayNameFor(model => model.CmiData)
- @if (Model.CmiData != null) + @if(Model.CmiData != null) { @Model.CmiData.Length bytes } @@ -1166,7 +1166,7 @@ @Html.DisplayNameFor(model => model.DvdBcaData)
- @if (Model.DvdBcaData != null) + @if(Model.DvdBcaData != null) { @Model.DvdBcaData.Length bytes } @@ -1179,7 +1179,7 @@ @Html.DisplayNameFor(model => model.DvdAacsData)
- @if (Model.DvdAacsData != null) + @if(Model.DvdAacsData != null) { @Model.DvdAacsData.Length bytes } @@ -1192,7 +1192,7 @@ @Html.DisplayNameFor(model => model.DvdDdsData)
- @if (Model.DvdDdsData != null) + @if(Model.DvdDdsData != null) { @Model.DvdDdsData.Length bytes } @@ -1205,7 +1205,7 @@ @Html.DisplayNameFor(model => model.DvdSaiData)
- @if (Model.DvdSaiData != null) + @if(Model.DvdSaiData != null) { @Model.DvdSaiData.Length bytes } @@ -1218,7 +1218,7 @@ @Html.DisplayNameFor(model => model.PriData)
- @if (Model.PriData != null) + @if(Model.PriData != null) { @Model.PriData.Length bytes } @@ -1231,7 +1231,7 @@ @Html.DisplayNameFor(model => model.EmbossedPfiData)
- @if (Model.EmbossedPfiData != null) + @if(Model.EmbossedPfiData != null) { @Model.EmbossedPfiData.Length bytes } @@ -1244,7 +1244,7 @@ @Html.DisplayNameFor(model => model.AdipData)
- @if (Model.AdipData != null) + @if(Model.AdipData != null) { @Model.AdipData.Length bytes } @@ -1257,7 +1257,7 @@ @Html.DisplayNameFor(model => model.DcbData)
- @if (Model.DcbData != null) + @if(Model.DcbData != null) { @Model.DcbData.Length bytes } @@ -1270,7 +1270,7 @@ @Html.DisplayNameFor(model => model.HdCmiData)
- @if (Model.HdCmiData != null) + @if(Model.HdCmiData != null) { @Model.HdCmiData.Length bytes } @@ -1283,7 +1283,7 @@ @Html.DisplayNameFor(model => model.DvdLayerData)
- @if (Model.DvdLayerData != null) + @if(Model.DvdLayerData != null) { @Model.DvdLayerData.Length bytes } @@ -1296,7 +1296,7 @@ @Html.DisplayNameFor(model => model.BluBcaData)
- @if (Model.BluBcaData != null) + @if(Model.BluBcaData != null) { @Model.BluBcaData.Length bytes } @@ -1309,7 +1309,7 @@ @Html.DisplayNameFor(model => model.BluDdsData)
- @if (Model.BluDdsData != null) + @if(Model.BluDdsData != null) { @Model.BluDdsData.Length bytes } @@ -1322,7 +1322,7 @@ @Html.DisplayNameFor(model => model.BluSaiData)
- @if (Model.BluSaiData != null) + @if(Model.BluSaiData != null) { @Model.BluSaiData.Length bytes } @@ -1335,7 +1335,7 @@ @Html.DisplayNameFor(model => model.BluDiData)
- @if (Model.BluDiData != null) + @if(Model.BluDiData != null) { @Model.BluDiData.Length bytes } @@ -1348,7 +1348,7 @@ @Html.DisplayNameFor(model => model.BluPacData)
- @if (Model.PlextorReadCddaData != null) + @if(Model.PlextorReadCddaData != null) { @Model.PlextorReadCddaData.Length bytes } @@ -1361,7 +1361,7 @@ @Html.DisplayNameFor(model => model.PlextorReadCddaData)
- @if (Model.PlextorReadCddaData != null) + @if(Model.PlextorReadCddaData != null) { @Model.PlextorReadCddaData.Length bytes } @@ -1374,7 +1374,7 @@ @Html.DisplayNameFor(model => model.PioneerReadCddaData)
- @if (Model.PioneerReadCddaData != null) + @if(Model.PioneerReadCddaData != null) { @Model.PioneerReadCddaData.Length bytes } @@ -1387,7 +1387,7 @@ @Html.DisplayNameFor(model => model.PioneerReadCddaMsfData)
- @if (Model.PioneerReadCddaMsfData != null) + @if(Model.PioneerReadCddaMsfData != null) { @Model.PioneerReadCddaMsfData.Length bytes } @@ -1400,7 +1400,7 @@ @Html.DisplayNameFor(model => model.NecReadCddaData)
- @if (Model.NecReadCddaData != null) + @if(Model.NecReadCddaData != null) { @Model.NecReadCddaData.Length bytes } @@ -1413,7 +1413,7 @@ @Html.DisplayNameFor(model => model.PlextorReadRawDVDData)
- @if (Model.PlextorReadRawDVDData != null) + @if(Model.PlextorReadRawDVDData != null) { @Model.PlextorReadRawDVDData.Length bytes } @@ -1426,7 +1426,7 @@ @Html.DisplayNameFor(model => model.HLDTSTReadRawDVDData)
- @if (Model.HLDTSTReadRawDVDData != null) + @if(Model.HLDTSTReadRawDVDData != null) { @Model.HLDTSTReadRawDVDData.Length bytes } @@ -1445,7 +1445,7 @@ @Html.DisplayNameFor(model => model.ReadCdScrambledData)
- @if (Model.ReadCdScrambledData != null) + @if(Model.ReadCdScrambledData != null) { @Model.ReadCdScrambledData.Length bytes } diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml index bd292a50..c2186e38 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml @@ -41,7 +41,7 @@ @Html.DisplayNameFor(model => model.IdentifyData)
- @if (Model.IdentifyData != null) + @if(Model.IdentifyData != null) { @Model.IdentifyData.Length bytes } @@ -252,7 +252,7 @@ @Html.DisplayNameFor(model => model.Density)
- @if (Model.Density is null) + @if(Model.Density is null) { @("") } @@ -283,7 +283,7 @@ @Html.DisplayNameFor(model => model.MediumType)
- @if (Model.MediumType is null) + @if(Model.MediumType is null) { @("") } @@ -416,7 +416,7 @@ @Html.DisplayNameFor(model => model.ModeSense6Data)
- @if (Model.ModeSense6Data != null) + @if(Model.ModeSense6Data != null) { @Model.ModeSense6Data.Length bytes } @@ -429,7 +429,7 @@ @Html.DisplayNameFor(model => model.ModeSense10Data)
- @if (Model.ModeSense10Data != null) + @if(Model.ModeSense10Data != null) { @Model.ModeSense10Data.Length bytes } @@ -478,7 +478,7 @@ @Html.DisplayNameFor(model => model.UnformattedBPT)
- @if (Model.UnformattedBPT is null) + @if(Model.UnformattedBPT is null) { @("") } @@ -491,7 +491,7 @@ @Html.DisplayNameFor(model => model.UnformattedBPS)
- @if (Model.UnformattedBPS is null) + @if(Model.UnformattedBPS is null) { @("") } @@ -606,7 +606,7 @@ @Html.DisplayNameFor(model => model.IntersessionLeadInData)
- @if (Model.IntersessionLeadInData != null) + @if(Model.IntersessionLeadInData != null) { @Model.IntersessionLeadInData.Length bytes } @@ -619,7 +619,7 @@ @Html.DisplayNameFor(model => model.IntersessionLeadOutData)
- @if (Model.IntersessionLeadOutData != null) + @if(Model.IntersessionLeadOutData != null) { @Model.IntersessionLeadOutData.Length bytes } @@ -632,7 +632,7 @@ @Html.DisplayNameFor(model => model.Read6Data)
- @if (Model.Read6Data != null) + @if(Model.Read6Data != null) { @Model.Read6Data.Length bytes } @@ -645,7 +645,7 @@ @Html.DisplayNameFor(model => model.Read10Data)
- @if (Model.Read10Data != null) + @if(Model.Read10Data != null) { @Model.Read10Data.Length bytes } @@ -658,7 +658,7 @@ @Html.DisplayNameFor(model => model.Read12Data)
- @if (Model.Read12Data != null) + @if(Model.Read12Data != null) { @Model.Read12Data.Length bytes } @@ -671,7 +671,7 @@ @Html.DisplayNameFor(model => model.Read16Data)
- @if (Model.Read16Data != null) + @if(Model.Read16Data != null) { @Model.Read16Data.Length bytes } @@ -684,7 +684,7 @@ @Html.DisplayNameFor(model => model.ReadLong10Data)
- @if (Model.ReadLong10Data != null) + @if(Model.ReadLong10Data != null) { @Model.ReadLong10Data.Length bytes } @@ -697,7 +697,7 @@ @Html.DisplayNameFor(model => model.ReadLong16Data)
- @if (Model.ReadLong16Data != null) + @if(Model.ReadLong16Data != null) { @Model.ReadLong16Data.Length bytes } @@ -710,7 +710,7 @@ @Html.DisplayNameFor(model => model.ReadSectorsData)
- @if (Model.ReadSectorsData != null) + @if(Model.ReadSectorsData != null) { @Model.ReadSectorsData.Length bytes } @@ -723,7 +723,7 @@ @Html.DisplayNameFor(model => model.ReadSectorsRetryData)
- @if (Model.ReadSectorsRetryData != null) + @if(Model.ReadSectorsRetryData != null) { @Model.ReadSectorsRetryData.Length bytes } @@ -736,7 +736,7 @@ @Html.DisplayNameFor(model => model.ReadDmaData)
- @if (Model.ReadDmaData != null) + @if(Model.ReadDmaData != null) { @Model.ReadDmaData.Length bytes } @@ -749,7 +749,7 @@ @Html.DisplayNameFor(model => model.ReadDmaRetryData)
- @if (Model.ReadDmaRetryData != null) + @if(Model.ReadDmaRetryData != null) { @Model.ReadDmaRetryData.Length bytes } @@ -762,7 +762,7 @@ @Html.DisplayNameFor(model => model.ReadLbaData)
- @if (Model.ReadLbaData != null) + @if(Model.ReadLbaData != null) { @Model.ReadLbaData.Length bytes } @@ -775,7 +775,7 @@ @Html.DisplayNameFor(model => model.ReadRetryLbaData)
- @if (Model.ReadRetryLbaData != null) + @if(Model.ReadRetryLbaData != null) { @Model.ReadRetryLbaData.Length bytes } @@ -788,7 +788,7 @@ @Html.DisplayNameFor(model => model.ReadDmaLbaData)
- @if (Model.ReadDmaLbaData != null) + @if(Model.ReadDmaLbaData != null) { @Model.ReadDmaLbaData.Length bytes } @@ -801,7 +801,7 @@ @Html.DisplayNameFor(model => model.ReadDmaRetryLbaData)
- @if (Model.ReadDmaRetryLbaData != null) + @if(Model.ReadDmaRetryLbaData != null) { @Model.ReadDmaRetryLbaData.Length bytes } @@ -814,7 +814,7 @@ @Html.DisplayNameFor(model => model.ReadLba48Data)
- @if (Model.ReadLba48Data != null) + @if(Model.ReadLba48Data != null) { @Model.ReadLba48Data.Length bytes } @@ -827,7 +827,7 @@ @Html.DisplayNameFor(model => model.ReadDmaLba48Data)
- @if (Model.ReadDmaLba48Data != null) + @if(Model.ReadDmaLba48Data != null) { @Model.ReadDmaLba48Data.Length bytes } @@ -840,7 +840,7 @@ @Html.DisplayNameFor(model => model.ReadLongData)
- @if (Model.ReadLongData != null) + @if(Model.ReadLongData != null) { @Model.ReadLongData.Length bytes } @@ -853,7 +853,7 @@ @Html.DisplayNameFor(model => model.ReadLongRetryData)
- @if (Model.ReadLongRetryData != null) + @if(Model.ReadLongRetryData != null) { @Model.ReadLongRetryData.Length bytes } @@ -866,7 +866,7 @@ @Html.DisplayNameFor(model => model.ReadLongLbaData)
- @if (Model.ReadLongLbaData != null) + @if(Model.ReadLongLbaData != null) { @Model.ReadLongLbaData.Length bytes } @@ -879,7 +879,7 @@ @Html.DisplayNameFor(model => model.ReadLongRetryLbaData)
- @if (Model.ReadLongRetryLbaData != null) + @if(Model.ReadLongRetryLbaData != null) { @Model.ReadLongRetryLbaData.Length bytes } @@ -892,7 +892,7 @@ @Html.DisplayNameFor(model => model.TocData)
- @if (Model.TocData != null) + @if(Model.TocData != null) { @Model.TocData.Length bytes } @@ -905,7 +905,7 @@ @Html.DisplayNameFor(model => model.FullTocData)
- @if (Model.FullTocData != null) + @if(Model.FullTocData != null) { @Model.FullTocData.Length bytes } @@ -918,7 +918,7 @@ @Html.DisplayNameFor(model => model.AtipData)
- @if (Model.AtipData != null) + @if(Model.AtipData != null) { @Model.AtipData.Length bytes } @@ -931,7 +931,7 @@ @Html.DisplayNameFor(model => model.PmaData)
- @if (Model.PmaData != null) + @if(Model.PmaData != null) { @Model.PmaData.Length bytes } @@ -944,7 +944,7 @@ @Html.DisplayNameFor(model => model.ReadCdData)
- @if (Model.ReadCdData != null) + @if(Model.ReadCdData != null) { @Model.ReadCdData.Length bytes } @@ -957,7 +957,7 @@ @Html.DisplayNameFor(model => model.ReadCdMsfData)
- @if (Model.ReadCdMsfData != null) + @if(Model.ReadCdMsfData != null) { @Model.ReadCdMsfData.Length bytes } @@ -970,7 +970,7 @@ @Html.DisplayNameFor(model => model.ReadCdFullData)
- @if (Model.ReadCdFullData != null) + @if(Model.ReadCdFullData != null) { @Model.ReadCdFullData.Length bytes } @@ -983,7 +983,7 @@ @Html.DisplayNameFor(model => model.ReadCdMsfFullData)
- @if (Model.ReadCdMsfFullData != null) + @if(Model.ReadCdMsfFullData != null) { @Model.ReadCdMsfFullData.Length bytes } @@ -996,7 +996,7 @@ @Html.DisplayNameFor(model => model.Track1PregapData)
- @if (Model.Track1PregapData != null) + @if(Model.Track1PregapData != null) { @Model.Track1PregapData.Length bytes } @@ -1009,7 +1009,7 @@ @Html.DisplayNameFor(model => model.LeadInData)
- @if (Model.LeadInData != null) + @if(Model.LeadInData != null) { @Model.LeadInData.Length bytes } @@ -1022,7 +1022,7 @@ @Html.DisplayNameFor(model => model.LeadOutData)
- @if (Model.LeadOutData != null) + @if(Model.LeadOutData != null) { @Model.LeadOutData.Length bytes } @@ -1035,7 +1035,7 @@ @Html.DisplayNameFor(model => model.C2PointersData)
- @if (Model.C2PointersData != null) + @if(Model.C2PointersData != null) { @Model.C2PointersData.Length bytes } @@ -1048,7 +1048,7 @@ @Html.DisplayNameFor(model => model.PQSubchannelData)
- @if (Model.PQSubchannelData != null) + @if(Model.PQSubchannelData != null) { @Model.PQSubchannelData.Length bytes } @@ -1061,7 +1061,7 @@ @Html.DisplayNameFor(model => model.RWSubchannelData)
- @if (Model.RWSubchannelData != null) + @if(Model.RWSubchannelData != null) { @Model.RWSubchannelData.Length bytes } @@ -1074,7 +1074,7 @@ @Html.DisplayNameFor(model => model.CorrectedSubchannelData)
- @if (Model.CorrectedSubchannelData != null) + @if(Model.CorrectedSubchannelData != null) { @Model.CorrectedSubchannelData.Length bytes } @@ -1087,7 +1087,7 @@ @Html.DisplayNameFor(model => model.PQSubchannelWithC2Data)
- @if (Model.PQSubchannelWithC2Data != null) + @if(Model.PQSubchannelWithC2Data != null) { @Model.PQSubchannelWithC2Data.Length bytes } @@ -1100,7 +1100,7 @@ @Html.DisplayNameFor(model => model.RWSubchannelWithC2Data)
- @if (Model.RWSubchannelWithC2Data != null) + @if(Model.RWSubchannelWithC2Data != null) { @Model.RWSubchannelWithC2Data.Length bytes } @@ -1113,7 +1113,7 @@ @Html.DisplayNameFor(model => model.CorrectedSubchannelWithC2Data)
- @if (Model.CorrectedSubchannelWithC2Data != null) + @if(Model.CorrectedSubchannelWithC2Data != null) { @Model.CorrectedSubchannelWithC2Data.Length bytes } @@ -1126,7 +1126,7 @@ @Html.DisplayNameFor(model => model.PfiData)
- @if (Model.PfiData != null) + @if(Model.PfiData != null) { @Model.PfiData.Length bytes } @@ -1139,7 +1139,7 @@ @Html.DisplayNameFor(model => model.DmiData)
- @if (Model.DmiData != null) + @if(Model.DmiData != null) { @Model.DmiData.Length bytes } @@ -1152,7 +1152,7 @@ @Html.DisplayNameFor(model => model.CmiData)
- @if (Model.CmiData != null) + @if(Model.CmiData != null) { @Model.CmiData.Length bytes } @@ -1165,7 +1165,7 @@ @Html.DisplayNameFor(model => model.DvdBcaData)
- @if (Model.DvdBcaData != null) + @if(Model.DvdBcaData != null) { @Model.DvdBcaData.Length bytes } @@ -1178,7 +1178,7 @@ @Html.DisplayNameFor(model => model.DvdAacsData)
- @if (Model.DvdAacsData != null) + @if(Model.DvdAacsData != null) { @Model.DvdAacsData.Length bytes } @@ -1191,7 +1191,7 @@ @Html.DisplayNameFor(model => model.DvdDdsData)
- @if (Model.DvdDdsData != null) + @if(Model.DvdDdsData != null) { @Model.DvdDdsData.Length bytes } @@ -1204,7 +1204,7 @@ @Html.DisplayNameFor(model => model.DvdSaiData)
- @if (Model.DvdSaiData != null) + @if(Model.DvdSaiData != null) { @Model.DvdSaiData.Length bytes } @@ -1217,7 +1217,7 @@ @Html.DisplayNameFor(model => model.PriData)
- @if (Model.PriData != null) + @if(Model.PriData != null) { @Model.PriData.Length bytes } @@ -1230,7 +1230,7 @@ @Html.DisplayNameFor(model => model.EmbossedPfiData)
- @if (Model.EmbossedPfiData != null) + @if(Model.EmbossedPfiData != null) { @Model.EmbossedPfiData.Length bytes } @@ -1243,7 +1243,7 @@ @Html.DisplayNameFor(model => model.AdipData)
- @if (Model.AdipData != null) + @if(Model.AdipData != null) { @Model.AdipData.Length bytes } @@ -1256,7 +1256,7 @@ @Html.DisplayNameFor(model => model.DcbData)
- @if (Model.DcbData != null) + @if(Model.DcbData != null) { @Model.DcbData.Length bytes } @@ -1269,7 +1269,7 @@ @Html.DisplayNameFor(model => model.HdCmiData)
- @if (Model.HdCmiData != null) + @if(Model.HdCmiData != null) { @Model.HdCmiData.Length bytes } @@ -1282,7 +1282,7 @@ @Html.DisplayNameFor(model => model.DvdLayerData)
- @if (Model.DvdLayerData != null) + @if(Model.DvdLayerData != null) { @Model.DvdLayerData.Length bytes } @@ -1295,7 +1295,7 @@ @Html.DisplayNameFor(model => model.BluBcaData)
- @if (Model.BluBcaData != null) + @if(Model.BluBcaData != null) { @Model.BluBcaData.Length bytes } @@ -1308,7 +1308,7 @@ @Html.DisplayNameFor(model => model.BluDdsData)
- @if (Model.BluDdsData != null) + @if(Model.BluDdsData != null) { @Model.BluDdsData.Length bytes } @@ -1321,7 +1321,7 @@ @Html.DisplayNameFor(model => model.BluSaiData)
- @if (Model.BluSaiData != null) + @if(Model.BluSaiData != null) { @Model.BluSaiData.Length bytes } @@ -1334,7 +1334,7 @@ @Html.DisplayNameFor(model => model.BluDiData)
- @if (Model.BluDiData != null) + @if(Model.BluDiData != null) { @Model.BluDiData.Length bytes } @@ -1347,7 +1347,7 @@ @Html.DisplayNameFor(model => model.BluPacData)
- @if (Model.PlextorReadCddaData != null) + @if(Model.PlextorReadCddaData != null) { @Model.PlextorReadCddaData.Length bytes } @@ -1360,7 +1360,7 @@ @Html.DisplayNameFor(model => model.PlextorReadCddaData)
- @if (Model.PlextorReadCddaData != null) + @if(Model.PlextorReadCddaData != null) { @Model.PlextorReadCddaData.Length bytes } @@ -1373,7 +1373,7 @@ @Html.DisplayNameFor(model => model.PioneerReadCddaData)
- @if (Model.PioneerReadCddaData != null) + @if(Model.PioneerReadCddaData != null) { @Model.PioneerReadCddaData.Length bytes } @@ -1386,7 +1386,7 @@ @Html.DisplayNameFor(model => model.PioneerReadCddaMsfData)
- @if (Model.PioneerReadCddaMsfData != null) + @if(Model.PioneerReadCddaMsfData != null) { @Model.PioneerReadCddaMsfData.Length bytes } @@ -1399,7 +1399,7 @@ @Html.DisplayNameFor(model => model.NecReadCddaData)
- @if (Model.NecReadCddaData != null) + @if(Model.NecReadCddaData != null) { @Model.NecReadCddaData.Length bytes } @@ -1412,7 +1412,7 @@ @Html.DisplayNameFor(model => model.PlextorReadRawDVDData)
- @if (Model.PlextorReadRawDVDData != null) + @if(Model.PlextorReadRawDVDData != null) { @Model.PlextorReadRawDVDData.Length bytes } @@ -1425,7 +1425,7 @@ @Html.DisplayNameFor(model => model.HLDTSTReadRawDVDData)
- @if (Model.HLDTSTReadRawDVDData != null) + @if(Model.HLDTSTReadRawDVDData != null) { @Model.HLDTSTReadRawDVDData.Length bytes } @@ -1444,7 +1444,7 @@ @Html.DisplayNameFor(model => model.ReadCdScrambledData)
- @if (Model.ReadCdScrambledData != null) + @if(Model.ReadCdScrambledData != null) { @Model.ReadCdScrambledData.Length bytes } diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml index 3d6a3a8e..bc8c87bf 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml @@ -62,7 +62,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml index 99aa1a47..9ce6c1e8 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml @@ -5,13 +5,13 @@ Layout = "_Layout"; }

Showing data from @Model.DataName for tested media id @Model.TestedMediaId

-@if (Model.Decoded is null && - Model.RawDataAsHex is null) +@if(Model.Decoded is null && + Model.RawDataAsHex is null) {
No data found
} -@if (Model.RawDataAsHex != null) +@if(Model.RawDataAsHex != null) {

Hex dump:

@@ -20,7 +20,7 @@ } -@if (Model.Decoded != null) +@if(Model.Decoded != null) {

Decoded information:

diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml index ed6328c9..e6668286 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml @@ -62,7 +62,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml index 9e56b31f..7f2e23a7 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml @@ -49,7 +49,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml index 9317e162..b088e264 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml @@ -65,7 +65,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml index 645a0066..83c358fc 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml @@ -47,7 +47,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml index 1eab7174..40152d67 100644 --- a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml @@ -25,7 +25,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml index e322c906..92d08a40 100644 --- a/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml @@ -59,7 +59,7 @@
diff --git a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml index aba68674..e74365d2 100644 --- a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml @@ -47,7 +47,7 @@
diff --git a/Aaru.Server/BasicAuthMiddleware.cs b/Aaru.Server/BasicAuthMiddleware.cs index dce66e7e..084dd5e3 100644 --- a/Aaru.Server/BasicAuthMiddleware.cs +++ b/Aaru.Server/BasicAuthMiddleware.cs @@ -73,10 +73,10 @@ namespace Aaru.Server string validUser = configuration.GetValue("MetricsAuthentication:Username"); string validPassword = configuration.GetValue("MetricsAuthentication:Password"); - return!string.IsNullOrWhiteSpace(validUser) && - !string.IsNullOrWhiteSpace(validPassword) && - username.Equals(validUser, StringComparison.InvariantCultureIgnoreCase) && - password.Equals(validPassword); + return !string.IsNullOrWhiteSpace(validUser) && + !string.IsNullOrWhiteSpace(validPassword) && + username.Equals(validUser, StringComparison.InvariantCultureIgnoreCase) && + password.Equals(validPassword); } } } \ No newline at end of file diff --git a/Aaru.Server/Controllers/ReportController.cs b/Aaru.Server/Controllers/ReportController.cs index b1312e2c..54290662 100644 --- a/Aaru.Server/Controllers/ReportController.cs +++ b/Aaru.Server/Controllers/ReportController.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.SCSI; using Aaru.Decoders.PCMCIA; using Aaru.Decoders.SCSI; +using Aaru.Server.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; diff --git a/Aaru.Server/Controllers/StatsController.cs b/Aaru.Server/Controllers/StatsController.cs index 9cee9577..18f8418d 100644 --- a/Aaru.Server/Controllers/StatsController.cs +++ b/Aaru.Server/Controllers/StatsController.cs @@ -38,9 +38,9 @@ using System.Reflection; using System.Threading; using System.Xml; using System.Xml.Serialization; -using Aaru.Server.Models; using Aaru.CommonTypes.Interop; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using OperatingSystem = Aaru.Server.Models.OperatingSystem; @@ -52,7 +52,7 @@ namespace Aaru.Server.Controllers /// Renders a page with statistics, list of media type, devices, etc public class StatsController : Controller { - readonly AaruServerContext ctx; + readonly AaruServerContext ctx; readonly IWebHostEnvironment env; public StatsController(IWebHostEnvironment environment, AaruServerContext context) @@ -96,7 +96,7 @@ namespace Aaru.Server.Controllers { List operatingSystems = new List(); - foreach(Models.OperatingSystem nvs in ctx.OperatingSystems) + foreach(OperatingSystem nvs in ctx.OperatingSystems) operatingSystems.Add(new NameValueStats { name = @@ -111,7 +111,7 @@ namespace Aaru.Server.Controllers { List versions = new List(); - foreach(Models.Version nvs in ctx.Versions) + foreach(Version nvs in ctx.Versions) versions.Add(new NameValueStats { name = nvs.Name == "previous" ? "Previous than 3.4.99.0" : nvs.Name, Value = nvs.Count diff --git a/Aaru.Server/Controllers/UpdateController.cs b/Aaru.Server/Controllers/UpdateController.cs index e7739d53..8be5c849 100644 --- a/Aaru.Server/Controllers/UpdateController.cs +++ b/Aaru.Server/Controllers/UpdateController.cs @@ -35,9 +35,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; using Aaru.Dto; +using Aaru.Server.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; @@ -96,8 +96,8 @@ namespace Aaru.Server.Controllers })), device.Id, device.OptimalMultipleSectorsRead)); - JsonSerializer js = JsonSerializer.Create(); - var sw = new StringWriter(); + var js = JsonSerializer.Create(); + var sw = new StringWriter(); js.Serialize(sw, sync); return new ContentResult diff --git a/Aaru.Server/Controllers/UploadReportController.cs b/Aaru.Server/Controllers/UploadReportController.cs index 4768ade6..927f0ba7 100644 --- a/Aaru.Server/Controllers/UploadReportController.cs +++ b/Aaru.Server/Controllers/UploadReportController.cs @@ -38,9 +38,9 @@ using System.Net; using System.Text; using System.Threading.Tasks; using System.Xml.Serialization; +using Aaru.CommonTypes.Metadata; using Aaru.Server.Models; using Cinchoo.PGP; -using Aaru.CommonTypes.Metadata; using MailKit.Net.Smtp; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; @@ -52,7 +52,7 @@ namespace Aaru.Server.Controllers { public class UploadReportController : Controller { - readonly AaruServerContext _ctx; + readonly AaruServerContext _ctx; readonly IWebHostEnvironment _environment; public UploadReportController(IWebHostEnvironment environment, AaruServerContext ctx) @@ -249,9 +249,9 @@ namespace Aaru.Server.Controllers { HttpRequest request = HttpContext.Request; - var sr = new StreamReader(request.Body); - string reportJson = await sr.ReadToEndAsync(); - var newReport = JsonConvert.DeserializeObject(reportJson); + var sr = new StreamReader(request.Body); + string reportJson = await sr.ReadToEndAsync(); + DeviceReportV2 newReport = JsonConvert.DeserializeObject(reportJson); if(newReport == null) { diff --git a/Aaru.Server/Controllers/UploadStatsController.cs b/Aaru.Server/Controllers/UploadStatsController.cs index cba5c2a8..17f7cca7 100644 --- a/Aaru.Server/Controllers/UploadStatsController.cs +++ b/Aaru.Server/Controllers/UploadStatsController.cs @@ -38,8 +38,8 @@ using System.Net; using System.Threading; using System.Threading.Tasks; using System.Xml.Serialization; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -52,7 +52,7 @@ namespace Aaru.Server.Controllers public class UploadStatsController : Controller { readonly AaruServerContext _ctx; - IWebHostEnvironment _environment; + IWebHostEnvironment _environment; public UploadStatsController(IWebHostEnvironment environment, AaruServerContext ctx) { @@ -60,10 +60,7 @@ namespace Aaru.Server.Controllers _ctx = ctx; } - /// - /// Receives statistics from Aaru.Core, processes them and adds them to a server-side global statistics - /// XML - /// + /// Receives statistics from Aaru.Core, processes them and adds them to a server-side global statistics XML /// HTTP response [Route("api/uploadstats"), HttpPost] public async Task UploadStats() @@ -122,9 +119,9 @@ namespace Aaru.Server.Controllers { HttpRequest request = HttpContext.Request; - var sr = new StreamReader(request.Body); - string statsString = await sr.ReadToEndAsync(); - var newstats = JsonConvert.DeserializeObject(statsString); + var sr = new StreamReader(request.Body); + string statsString = await sr.ReadToEndAsync(); + StatsDto newstats = JsonConvert.DeserializeObject(statsString); if(newstats == null) { @@ -150,10 +147,10 @@ namespace Aaru.Server.Controllers if(newstats.Versions != null) foreach(NameValueStats nvs in newstats.Versions) { - Models.Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); + Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); if(existing == null) - _ctx.Versions.Add(new Models.Version + _ctx.Versions.Add(new Version { Name = nvs.name, Count = nvs.Value }); @@ -220,12 +217,12 @@ namespace Aaru.Server.Controllers if(newstats.OperatingSystems != null) foreach(OsStats operatingSystem in newstats.OperatingSystems) { - Models.OperatingSystem existing = + OperatingSystem existing = _ctx.OperatingSystems.FirstOrDefault(c => c.Name == operatingSystem.name && c.Version == operatingSystem.version); if(existing == null) - _ctx.OperatingSystems.Add(new Models.OperatingSystem + _ctx.OperatingSystems.Add(new OperatingSystem { Name = operatingSystem.name, Version = operatingSystem.version, Count = operatingSystem.Value diff --git a/Aaru.Server/Core/ScsiMmcFeatures.cs b/Aaru.Server/Core/ScsiMmcFeatures.cs index cc47d521..d9e226a3 100644 --- a/Aaru.Server/Core/ScsiMmcFeatures.cs +++ b/Aaru.Server/Core/ScsiMmcFeatures.cs @@ -33,7 +33,6 @@ using System.Collections.Generic; using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.SCSI; -using Aaru.Decoders.SCSI.MMC; namespace Aaru.Server { diff --git a/Aaru.Server/Core/StatsConverter.cs b/Aaru.Server/Core/StatsConverter.cs index 1550086a..ec81b1b7 100644 --- a/Aaru.Server/Core/StatsConverter.cs +++ b/Aaru.Server/Core/StatsConverter.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System.Linq; -using Aaru.Server.Models; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Models; using Version = Aaru.Server.Models.Version; namespace Aaru.Server @@ -362,10 +362,10 @@ namespace Aaru.Server if(string.IsNullOrWhiteSpace(nvs.name)) continue; - Models.Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); + Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); if(existing == null) - ctx.Versions.Add(new Models.Version + ctx.Versions.Add(new Version { Count = nvs.Value, Name = nvs.name }); @@ -375,10 +375,10 @@ namespace Aaru.Server } else { - Models.Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous"); + Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous"); if(existing == null) - ctx.Versions.Add(new Models.Version + ctx.Versions.Add(new Version { Count = 1, Name = "previous" }); diff --git a/Aaru.Server/Core/TestedMedia.cs b/Aaru.Server/Core/TestedMedia.cs index 524e1b40..0e7dc5b8 100644 --- a/Aaru.Server/Core/TestedMedia.cs +++ b/Aaru.Server/Core/TestedMedia.cs @@ -86,15 +86,15 @@ namespace Aaru.Server.App_Start { mediaOneValue.Add($"Medium has {testedMedia.Blocks} blocks of {testedMedia.BlockSize} bytes each"); - if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000000) + if((testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 > 1000000) mediaOneValue. - Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB"); - else if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000) + Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB"); + else if((testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 > 1000) mediaOneValue. - Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB"); + Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB"); else mediaOneValue. - Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); + Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); } if(testedMedia.CHS != null && @@ -115,7 +115,7 @@ namespace Aaru.Server.App_Start Add($"Sectors addressable in CHS mode: {testedMedia.CHS.Cylinders * testedMedia.CHS.Heads * testedMedia.CHS.Sectors} max., {currentSectors} current"); mediaOneValue. - Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); + Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {((ulong)currentSectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); } else if(testedMedia.CHS != null) { @@ -126,37 +126,37 @@ namespace Aaru.Server.App_Start mediaOneValue.Add($"Sectors addressable in CHS mode: {currentSectors}"); mediaOneValue. - Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); + Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {((ulong)currentSectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); } if(testedMedia.LBASectors != null) { mediaOneValue.Add($"Sectors addressable in sectors in 28-bit LBA mode: {testedMedia.LBASectors}"); - if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000000) + if(((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 > 1000000) mediaOneValue. - Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB"); - else if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000) + Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB"); + else if(((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 > 1000) mediaOneValue. - Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB"); + Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB"); else mediaOneValue. - Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); + Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); } if(testedMedia.LBA48Sectors != null) { mediaOneValue.Add($"Sectors addressable in sectors in 48-bit LBA mode: {testedMedia.LBA48Sectors}"); - if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000000) + if((testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 > 1000000) mediaOneValue. - Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB"); - else if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000) + Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB"); + else if((testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 > 1000) mediaOneValue. - Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB"); + Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB"); else mediaOneValue. - Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); + Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB"); } if(testedMedia.NominalRotationRate != null && diff --git a/Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs b/Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs index 777a70c7..ef32de41 100644 --- a/Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs +++ b/Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs @@ -1492,14 +1492,14 @@ namespace Aaru.Server.Migrations modelBuilder.Entity("Aaru.CommonTypes.Metadata.Mmc", b => { - b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany(). - HasForeignKey("FeaturesId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany().HasForeignKey("FeaturesId"). + OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.Scsi", b => { - b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany(). - HasForeignKey("ModeSenseId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany().HasForeignKey("ModeSenseId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.Mmc", "MultiMediaDevice").WithMany(). HasForeignKey("MultiMediaDeviceId").OnDelete(DeleteBehavior.SetNull); @@ -1516,46 +1516,44 @@ namespace Aaru.Server.Migrations b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("EVPDPages").HasForeignKey("ScsiId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", null).WithMany("ModePages"). - HasForeignKey("ScsiModeId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", null).WithMany("ModePages").HasForeignKey("ScsiModeId"). + OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.SscSupportedMedia", b => { - b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedMediaTypes"). - HasForeignKey("SscId").OnDelete(DeleteBehavior.SetNull); - - b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null). - WithMany("SupportedMediaTypes").HasForeignKey("TestedSequentialMediaId"). + b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedMediaTypes").HasForeignKey("SscId"). OnDelete(DeleteBehavior.SetNull); + + b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null).WithMany("SupportedMediaTypes"). + HasForeignKey("TestedSequentialMediaId").OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.SupportedDensity", b => { - b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedDensities"). - HasForeignKey("SscId").OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null). - WithMany("SupportedDensities").HasForeignKey("TestedSequentialMediaId"). + b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedDensities").HasForeignKey("SscId"). OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null).WithMany("SupportedDensities"). + HasForeignKey("TestedSequentialMediaId").OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.TestedMedia", b => { - b.HasOne("Aaru.CommonTypes.Metadata.Ata", null).WithMany("RemovableMedias"). - HasForeignKey("AtaId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.Ata", null).WithMany("RemovableMedias").HasForeignKey("AtaId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CHS").WithMany().HasForeignKey("CHSId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany(). - HasForeignKey("CurrentCHSId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany().HasForeignKey("CurrentCHSId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.Mmc", null).WithMany("TestedMedia").HasForeignKey("MmcId"). OnDelete(DeleteBehavior.Cascade); - b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("RemovableMedias"). - HasForeignKey("ScsiId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("RemovableMedias").HasForeignKey("ScsiId"). + OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.TestedSequentialMedia", b => @@ -1575,8 +1573,8 @@ namespace Aaru.Server.Migrations b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset").WithMany("Devices"). HasForeignKey("CdOffsetId").OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany(). - HasForeignKey("FireWireId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany(). HasForeignKey("MultiMediaCardId").OnDelete(DeleteBehavior.SetNull); @@ -1608,8 +1606,8 @@ namespace Aaru.Server.Migrations b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany(). - HasForeignKey("FireWireId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany(). HasForeignKey("MultiMediaCardId").OnDelete(DeleteBehavior.SetNull); @@ -1629,8 +1627,8 @@ namespace Aaru.Server.Migrations modelBuilder.Entity("Aaru.Server.Models.UsbProduct", b => { - b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor").WithMany("Products"). - HasForeignKey("VendorId").OnDelete(DeleteBehavior.Cascade).IsRequired(); + b.HasOne("Aaru.Server.Models.UsbVendor", "Vendor").WithMany("Products").HasForeignKey("VendorId"). + OnDelete(DeleteBehavior.Cascade).IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => diff --git a/Aaru.Server/Models/CdOffset.cs b/Aaru.Server/Models/CdOffset.cs index 0782f31d..b218861e 100644 --- a/Aaru.Server/Models/CdOffset.cs +++ b/Aaru.Server/Models/CdOffset.cs @@ -39,7 +39,7 @@ namespace Aaru.Server.Models { public class CompactDiscOffset : CdOffset { - public CompactDiscOffset() { } + public CompactDiscOffset() {} public CompactDiscOffset(string manufacturer, string model, short offset, int submissions, float agreement) { diff --git a/Aaru.Server/Models/Command.cs b/Aaru.Server/Models/Command.cs index dddf1e49..918470aa 100644 --- a/Aaru.Server/Models/Command.cs +++ b/Aaru.Server/Models/Command.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class Command : NameCountModel { } + public class Command : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Models/Context.cs b/Aaru.Server/Models/Context.cs index 265c276c..3329b6b7 100644 --- a/Aaru.Server/Models/Context.cs +++ b/Aaru.Server/Models/Context.cs @@ -41,9 +41,9 @@ namespace Aaru.Server.Models { public sealed class AaruServerContext : IdentityDbContext { - public AaruServerContext() { } + public AaruServerContext() {} - public AaruServerContext(DbContextOptions options) : base(options) { } + public AaruServerContext(DbContextOptions options) : base(options) {} public DbSet Devices { get; set; } public DbSet Reports { get; set; } @@ -113,14 +113,14 @@ namespace Aaru.Server.Models modelBuilder.Entity("Aaru.CommonTypes.Metadata.Mmc", b => { - b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany(). - HasForeignKey("FeaturesId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany().HasForeignKey("FeaturesId"). + OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.Scsi", b => { - b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany(). - HasForeignKey("ModeSenseId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany().HasForeignKey("ModeSenseId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.Mmc", "MultiMediaDevice").WithMany(). HasForeignKey("MultiMediaDeviceId").OnDelete(DeleteBehavior.SetNull); @@ -137,46 +137,44 @@ namespace Aaru.Server.Models b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("EVPDPages").HasForeignKey("ScsiId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", null).WithMany("ModePages"). - HasForeignKey("ScsiModeId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", null).WithMany("ModePages").HasForeignKey("ScsiModeId"). + OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.SscSupportedMedia", b => { - b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedMediaTypes"). - HasForeignKey("SscId").OnDelete(DeleteBehavior.SetNull); - - b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null). - WithMany("SupportedMediaTypes").HasForeignKey("TestedSequentialMediaId"). + b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedMediaTypes").HasForeignKey("SscId"). OnDelete(DeleteBehavior.SetNull); + + b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null).WithMany("SupportedMediaTypes"). + HasForeignKey("TestedSequentialMediaId").OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.SupportedDensity", b => { - b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedDensities"). - HasForeignKey("SscId").OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null). - WithMany("SupportedDensities").HasForeignKey("TestedSequentialMediaId"). + b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedDensities").HasForeignKey("SscId"). OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null).WithMany("SupportedDensities"). + HasForeignKey("TestedSequentialMediaId").OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.TestedMedia", b => { - b.HasOne("Aaru.CommonTypes.Metadata.Ata", null).WithMany("RemovableMedias"). - HasForeignKey("AtaId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.Ata", null).WithMany("RemovableMedias").HasForeignKey("AtaId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CHS").WithMany().HasForeignKey("CHSId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany(). - HasForeignKey("CurrentCHSId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany().HasForeignKey("CurrentCHSId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.Mmc", null).WithMany("TestedMedia").HasForeignKey("MmcId"). OnDelete(DeleteBehavior.Cascade); - b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("RemovableMedias"). - HasForeignKey("ScsiId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("RemovableMedias").HasForeignKey("ScsiId"). + OnDelete(DeleteBehavior.SetNull); }); modelBuilder.Entity("Aaru.CommonTypes.Metadata.TestedSequentialMedia", b => @@ -196,8 +194,8 @@ namespace Aaru.Server.Models b.HasOne("Aaru.Server.Models.CompactDiscOffset", "CdOffset").WithMany("Devices"). HasForeignKey("CdOffsetId").OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany(). - HasForeignKey("FireWireId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany(). HasForeignKey("MultiMediaCardId").OnDelete(DeleteBehavior.SetNull); @@ -229,8 +227,8 @@ namespace Aaru.Server.Models b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId"). OnDelete(DeleteBehavior.SetNull); - b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany(). - HasForeignKey("FireWireId").OnDelete(DeleteBehavior.SetNull); + b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId"). + OnDelete(DeleteBehavior.SetNull); b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany(). HasForeignKey("MultiMediaCardId").OnDelete(DeleteBehavior.SetNull); diff --git a/Aaru.Server/Models/Filesystem.cs b/Aaru.Server/Models/Filesystem.cs index 15eec158..b101b795 100644 --- a/Aaru.Server/Models/Filesystem.cs +++ b/Aaru.Server/Models/Filesystem.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class Filesystem : NameCountModel { } + public class Filesystem : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Models/Filter.cs b/Aaru.Server/Models/Filter.cs index ce5e37c2..bd56eb2f 100644 --- a/Aaru.Server/Models/Filter.cs +++ b/Aaru.Server/Models/Filter.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class Filter : NameCountModel { } + public class Filter : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Models/MediaFormat.cs b/Aaru.Server/Models/MediaFormat.cs index 6c2c6763..1e05df04 100644 --- a/Aaru.Server/Models/MediaFormat.cs +++ b/Aaru.Server/Models/MediaFormat.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class MediaFormat : NameCountModel { } + public class MediaFormat : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Models/OperatingSystem.cs b/Aaru.Server/Models/OperatingSystem.cs index 6f316b7d..695f2b66 100644 --- a/Aaru.Server/Models/OperatingSystem.cs +++ b/Aaru.Server/Models/OperatingSystem.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class OperatingSystem : BaseOperatingSystem { } + public class OperatingSystem : BaseOperatingSystem {} } \ No newline at end of file diff --git a/Aaru.Server/Models/Partition.cs b/Aaru.Server/Models/Partition.cs index 8b2b8335..947f8385 100644 --- a/Aaru.Server/Models/Partition.cs +++ b/Aaru.Server/Models/Partition.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class Partition : NameCountModel { } + public class Partition : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteApplication.cs b/Aaru.Server/Models/RemoteApplication.cs index e397c96b..3afcac18 100644 --- a/Aaru.Server/Models/RemoteApplication.cs +++ b/Aaru.Server/Models/RemoteApplication.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class RemoteApplication : BaseOperatingSystem { } + public class RemoteApplication : BaseOperatingSystem {} } \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteArchitecture.cs b/Aaru.Server/Models/RemoteArchitecture.cs index 231b428d..2fe198a3 100644 --- a/Aaru.Server/Models/RemoteArchitecture.cs +++ b/Aaru.Server/Models/RemoteArchitecture.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class RemoteArchitecture : NameCountModel { } + public class RemoteArchitecture : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteOperatingSystem.cs b/Aaru.Server/Models/RemoteOperatingSystem.cs index 9ddf6836..5b940035 100644 --- a/Aaru.Server/Models/RemoteOperatingSystem.cs +++ b/Aaru.Server/Models/RemoteOperatingSystem.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class RemoteOperatingSystem : BaseOperatingSystem { } + public class RemoteOperatingSystem : BaseOperatingSystem {} } \ No newline at end of file diff --git a/Aaru.Server/Models/UsbProduct.cs b/Aaru.Server/Models/UsbProduct.cs index 0d765966..97831d50 100644 --- a/Aaru.Server/Models/UsbProduct.cs +++ b/Aaru.Server/Models/UsbProduct.cs @@ -37,7 +37,7 @@ namespace Aaru.Server.Models { public class UsbProduct : BaseModel { - public UsbProduct() { } + public UsbProduct() {} public UsbProduct(UsbVendor vendor, ushort id, string product) { diff --git a/Aaru.Server/Models/UsbVendor.cs b/Aaru.Server/Models/UsbVendor.cs index a2aaa169..5fd586e2 100644 --- a/Aaru.Server/Models/UsbVendor.cs +++ b/Aaru.Server/Models/UsbVendor.cs @@ -40,7 +40,7 @@ namespace Aaru.Server.Models { public class UsbVendor : BaseModel { - public UsbVendor() { } + public UsbVendor() {} public UsbVendor(ushort id, string vendor) { diff --git a/Aaru.Server/Models/Version.cs b/Aaru.Server/Models/Version.cs index e691baa0..95f0648e 100644 --- a/Aaru.Server/Models/Version.cs +++ b/Aaru.Server/Models/Version.cs @@ -32,5 +32,5 @@ namespace Aaru.Server.Models { - public class Version : NameCountModel { } + public class Version : NameCountModel {} } \ No newline at end of file diff --git a/Aaru.Server/Program.cs b/Aaru.Server/Program.cs index 47de67a5..30272021 100644 --- a/Aaru.Server/Program.cs +++ b/Aaru.Server/Program.cs @@ -1,6 +1,6 @@ using System; -using Aaru.Server.Models; using Aaru.CommonTypes.Interop; +using Aaru.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; @@ -49,7 +49,7 @@ namespace Aaru.Server @" _\////////////_____\///////////________\/////////__" + "\n\u001b[0m" + "\u001b[32m :MMMMMK; cWMNkl:;;;:lxKMXc .0MMMMMO\u001b[0m\n" + - "\u001b[32m ..KMMMMMMNo,. ,OMMMMMMW:,. \u001b[37;1m DiscImageChef Website\u001b[0m\n" + + "\u001b[32m ..KMMMMMMNo,. ,OMMMMMMW:,. \u001b[37;1m Aaru Website\u001b[0m\n" + "\u001b[32m .;d0NMMMMMMMMMMMMMMW0d:' .;lOWMMMMMMMMMMMMMXkl. \u001b[37;1m Version \u001b[0m\u001b[33m{0}\u001b[37;1m-\u001b[0m\u001b[31m{1}\u001b[0m\n" + "\u001b[32m :KMMMMMMMMMMMMMMMMMMMMMMMMc WMMMMMMMMMMMMMMMMMMMMMMWk'\u001b[0m\n" + "\u001b[32m ;NMMMMWX0kkkkO0XMMMMMMMMMMM0' dNMMMMMMMMMMW0xl:;,;:oOWMMX; \u001b[37;1m Running under \u001b[35;1m{2}\u001b[37;1m, \u001b[35m{3}-bit\u001b[37;1m in \u001b[35m{4}-bit\u001b[37;1m mode.\u001b[0m\n" + @@ -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(); + AaruServerContext context = services.GetRequiredService(); context.Database.Migrate(); end = DateTime.Now; diff --git a/Aaru.Server/Startup.cs b/Aaru.Server/Startup.cs index b570c54e..f0709e42 100644 --- a/Aaru.Server/Startup.cs +++ b/Aaru.Server/Startup.cs @@ -22,9 +22,9 @@ namespace Aaru.Server public void ConfigureServices(IServiceCollection services) { services.AddDbContext(options => options. - UseMySql(Configuration. - GetConnectionString("DefaultConnection")). - UseLazyLoadingProxies()); + UseMySql(Configuration. + GetConnectionString("DefaultConnection")). + UseLazyLoadingProxies()); services.AddDefaultIdentity(options => { diff --git a/Aaru.Server/Views/Report/View.cshtml b/Aaru.Server/Views/Report/View.cshtml index a5bcd69b..953f7a9f 100644 --- a/Aaru.Server/Views/Report/View.cshtml +++ b/Aaru.Server/Views/Report/View.cshtml @@ -42,7 +42,7 @@ Aaru Report for @ViewBag.lblModel @ViewBag.lblRevision -@if (ViewBag.UsbItem != null) +@if(ViewBag.UsbItem != null) {

@@ -55,7 +55,7 @@ Aaru Report for
} -@if (ViewBag.FireWireItem != null) +@if(ViewBag.FireWireItem != null) {

@@ -68,7 +68,7 @@ Aaru Report for
} -@if (ViewBag.PcmciaItem != null) +@if(ViewBag.PcmciaItem != null) {

@@ -79,9 +79,9 @@ Aaru Report for Manufacturer code: @ViewBag.PcmciaItem.VendorDescription
Card code: @ViewBag.PcmciaItem.CardCode
Compliance: @ViewBag.PcmciaItem.Compliance
- @if (ViewBag.repPcmciaTuples != null) + @if(ViewBag.repPcmciaTuples != null) { - foreach (KeyValuePair kvp in ViewBag.repPcmciaTuples) + foreach(KeyValuePair kvp in ViewBag.repPcmciaTuples) { @kvp.Key: @kvp.Value
@@ -90,7 +90,7 @@ Aaru Report for
} -@if (ViewBag.AtaItem != null) +@if(ViewBag.AtaItem != null) {

@@ -99,19 +99,19 @@ Aaru Report for
@ViewBag.lblAtaDeviceType
- @foreach (KeyValuePair kvp in ViewBag.repAtaTwo) + @foreach(KeyValuePair kvp in ViewBag.repAtaTwo) { @kvp.Key: @kvp.Value
}
- @foreach (string item in ViewBag.repAtaOne) + @foreach(string item in ViewBag.repAtaOne) { @Html.Raw(item)
}
} -@if (ViewBag.repScsi != null) +@if(ViewBag.repScsi != null) {

@@ -120,11 +120,11 @@ Aaru Report for Vendor: @ViewBag.lblScsiVendor
Product: @ViewBag.lblScsiProduct
Revision: @ViewBag.lblScsiRevision
- @foreach (string item in ViewBag.repScsi) + @foreach(string item in ViewBag.repScsi) { @Html.Raw(item)
} - @if (ViewBag.repModeSense != null) + @if(ViewBag.repModeSense != null) {

@@ -134,7 +134,7 @@ Aaru Report for
Mode Contents
@@ -148,7 +148,7 @@ Aaru Report for
} - @if (ViewBag.repEvpd != null) + @if(ViewBag.repEvpd != null) {

@@ -158,7 +158,7 @@ Aaru Report for EVPD Contents - @foreach (KeyValuePair kvp in ViewBag.repEvpd) + @foreach(KeyValuePair kvp in ViewBag.repEvpd) { @@ -172,31 +172,31 @@ Aaru Report for
} - @if (ViewBag.repScsiMmcMode != null) + @if(ViewBag.repScsiMmcMode != null) {

SCSI CD-ROM capabilities:
- @foreach (string item in ViewBag.repScsiMmcMode) + @foreach(string item in ViewBag.repScsiMmcMode) { @Html.Raw(item)
}
} - @if (ViewBag.repScsiMmcFeatures != null) + @if(ViewBag.repScsiMmcFeatures != null) {

SCSI MMC features:
- @foreach (string item in ViewBag.repScsiMmcFeatures) + @foreach(string item in ViewBag.repScsiMmcFeatures) { @Html.Raw(item)
}
} - @if (ViewBag.divScsiSscVisible == true) + @if(ViewBag.divScsiSscVisible == true) {

@@ -207,9 +207,9 @@ Aaru Report for
Minimum block length: @ViewBag.lblScsiSscMinBlock bytes
- @if (ViewBag.repScsiSscDensities != null) + @if(ViewBag.repScsiSscDensities != null) { - foreach (SupportedDensity density in ViewBag.repScsiSscDensities) + foreach(SupportedDensity density in ViewBag.repScsiSscDensities) {
@@ -229,9 +229,9 @@ Aaru Report for
} } - @if (ViewBag.repScsiSscMedias != null) + @if(ViewBag.repScsiSscMedias != null) { - foreach (SscSupportedMedia media in ViewBag.repScsiSscMedias) + foreach(SscSupportedMedia media in ViewBag.repScsiSscMedias) {
@@ -250,37 +250,37 @@ Aaru Report for }
} -@if (ViewBag.repTestedMedia != null) +@if(ViewBag.repTestedMedia != null) {

Tested media:
- @foreach (string item in ViewBag.repTestedMedia) + @foreach(string item in ViewBag.repTestedMedia) { @Html.Raw(item)
}
} -@if (ViewBag.repMMC != null) +@if(ViewBag.repMMC != null) {

MultiMediaCard device:
- @foreach (string item in ViewBag.repMMC) + @foreach(string item in ViewBag.repMMC) { @Html.Raw(item)
}
} -@if (ViewBag.repSD != null) +@if(ViewBag.repSD != null) {

SecureDigital device:
- @foreach (string item in ViewBag.repSD) + @foreach(string item in ViewBag.repSD) { @Html.Raw(item)
} diff --git a/Aaru.Server/Views/Shared/Error.cshtml b/Aaru.Server/Views/Shared/Error.cshtml index 757f9b16..b009397c 100644 --- a/Aaru.Server/Views/Shared/Error.cshtml +++ b/Aaru.Server/Views/Shared/Error.cshtml @@ -4,7 +4,7 @@ }

Error.

An error occurred while processing your request.

-@if (Model.ShowRequestId) +@if(Model.ShowRequestId) {

Request ID: diff --git a/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml b/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml index 8c2eaa3d..d997b974 100644 --- a/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml +++ b/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml @@ -5,7 +5,7 @@ var cookieString = consentFeature?.CreateConsentCookie(); } -@if (showBanner) +@if(showBanner) {