aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix variable naming.

Browse Source
This commit is contained in:
Natalia Portillo
2019-11-10 13:43:13 +00:00
parent db9ec11ab8
commit e45ef84919
1 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
DiscImageChef.Server/Controllers/UploadReportController.cs
View File

@@ -52,13 +52,13 @@ namespace DiscImageChef.Server.Controllers
{ {
public class UploadReportController : Controller public class UploadReportController : Controller
{ {
readonly DicServerContext _ctx;
readonly IWebHostEnvironment _environment; readonly IWebHostEnvironment _environment;
readonly DicServerContext ctx;
public UploadReportController(IWebHostEnvironment environment, DicServerContext _ctx) public UploadReportController(IWebHostEnvironment environment, DicServerContext ctx)
{ {
_environment = environment; _environment = environment;
ctx = _ctx; _ctx = ctx;
} }
/// <summary>Receives a report from DiscImageChef.Core, verifies it's in the correct format and stores it on the server</summary> /// <summary>Receives a report from DiscImageChef.Core, verifies it's in the correct format and stores it on the server</summary>
@@ -121,11 +121,11 @@ namespace DiscImageChef.Server.Controllers
if(newUploadedReport.ATA?.ReadCapabilities?.CHS != null) if(newUploadedReport.ATA?.ReadCapabilities?.CHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => _ctx.Chs.FirstOrDefault(c =>
c.Cylinders == newUploadedReport. c.Cylinders == newUploadedReport.
ATA.ReadCapabilities.CHS.Cylinders && ATA.ReadCapabilities.CHS.Cylinders &&
c.Heads == newUploadedReport.ATA.ReadCapabilities.CHS.Heads && c.Heads == newUploadedReport.ATA.ReadCapabilities.CHS.Heads &&
c.Sectors == newUploadedReport.ATA.ReadCapabilities.CHS.Sectors); c.Sectors == newUploadedReport.ATA.ReadCapabilities.CHS.Sectors);
if(existingChs != null) if(existingChs != null)
newUploadedReport.ATA.ReadCapabilities.CHS = existingChs; newUploadedReport.ATA.ReadCapabilities.CHS = existingChs;
@@ -134,12 +134,13 @@ namespace DiscImageChef.Server.Controllers
if(newUploadedReport.ATA?.ReadCapabilities?.CurrentCHS != null) if(newUploadedReport.ATA?.ReadCapabilities?.CurrentCHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => _ctx.Chs.FirstOrDefault(c =>
c.Cylinders == newUploadedReport. c.Cylinders == newUploadedReport.
ATA.ReadCapabilities.CurrentCHS.Cylinders && ATA.ReadCapabilities.CurrentCHS.Cylinders &&
c.Heads == newUploadedReport.ATA.ReadCapabilities.CurrentCHS.Heads && c.Heads == newUploadedReport.
c.Sectors == newUploadedReport. ATA.ReadCapabilities.CurrentCHS.Heads &&
ATA.ReadCapabilities.CurrentCHS.Sectors); c.Sectors == newUploadedReport.
ATA.ReadCapabilities.CurrentCHS.Sectors);
if(existingChs != null) if(existingChs != null)
newUploadedReport.ATA.ReadCapabilities.CurrentCHS = existingChs; newUploadedReport.ATA.ReadCapabilities.CurrentCHS = existingChs;
@@ -163,9 +164,9 @@ namespace DiscImageChef.Server.Controllers
if(media.CHS != null) if(media.CHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CHS.Cylinders && _ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CHS.Cylinders &&
c.Heads == media.CHS.Heads && c.Heads == media.CHS.Heads &&
c.Sectors == media.CHS.Sectors); c.Sectors == media.CHS.Sectors);
if(existingChs != null) if(existingChs != null)
media.CHS = existingChs; media.CHS = existingChs;
@@ -174,9 +175,9 @@ namespace DiscImageChef.Server.Controllers
if(media.CHS != null) if(media.CHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CurrentCHS.Cylinders && _ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CurrentCHS.Cylinders &&
c.Heads == media.CurrentCHS.Heads && c.Heads == media.CurrentCHS.Heads &&
c.Sectors == media.CurrentCHS.Sectors); c.Sectors == media.CurrentCHS.Sectors);
if(existingChs != null) if(existingChs != null)
media.CurrentCHS = existingChs; media.CurrentCHS = existingChs;
@@ -184,8 +185,8 @@ namespace DiscImageChef.Server.Controllers
} }
} }
ctx.Reports.Add(newUploadedReport); _ctx.Reports.Add(newUploadedReport);
ctx.SaveChanges(); _ctx.SaveChanges();
var pgpIn = new MemoryStream(Encoding.UTF8.GetBytes(reportV2String)); var pgpIn = new MemoryStream(Encoding.UTF8.GetBytes(reportV2String));
var pgpOut = new MemoryStream(); var pgpOut = new MemoryStream();
@@ -280,11 +281,11 @@ namespace DiscImageChef.Server.Controllers
if(newUploadedReport.ATA?.ReadCapabilities?.CHS != null) if(newUploadedReport.ATA?.ReadCapabilities?.CHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => _ctx.Chs.FirstOrDefault(c =>
c.Cylinders == newUploadedReport. c.Cylinders == newUploadedReport.
ATA.ReadCapabilities.CHS.Cylinders && ATA.ReadCapabilities.CHS.Cylinders &&
c.Heads == newUploadedReport.ATA.ReadCapabilities.CHS.Heads && c.Heads == newUploadedReport.ATA.ReadCapabilities.CHS.Heads &&
c.Sectors == newUploadedReport.ATA.ReadCapabilities.CHS.Sectors); c.Sectors == newUploadedReport.ATA.ReadCapabilities.CHS.Sectors);
if(existingChs != null) if(existingChs != null)
newUploadedReport.ATA.ReadCapabilities.CHS = existingChs; newUploadedReport.ATA.ReadCapabilities.CHS = existingChs;
@@ -293,12 +294,13 @@ namespace DiscImageChef.Server.Controllers
if(newUploadedReport.ATA?.ReadCapabilities?.CurrentCHS != null) if(newUploadedReport.ATA?.ReadCapabilities?.CurrentCHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => _ctx.Chs.FirstOrDefault(c =>
c.Cylinders == newUploadedReport. c.Cylinders == newUploadedReport.
ATA.ReadCapabilities.CurrentCHS.Cylinders && ATA.ReadCapabilities.CurrentCHS.Cylinders &&
c.Heads == newUploadedReport.ATA.ReadCapabilities.CurrentCHS.Heads && c.Heads == newUploadedReport.
c.Sectors == newUploadedReport. ATA.ReadCapabilities.CurrentCHS.Heads &&
ATA.ReadCapabilities.CurrentCHS.Sectors); c.Sectors == newUploadedReport.
ATA.ReadCapabilities.CurrentCHS.Sectors);
if(existingChs != null) if(existingChs != null)
newUploadedReport.ATA.ReadCapabilities.CurrentCHS = existingChs; newUploadedReport.ATA.ReadCapabilities.CurrentCHS = existingChs;
@@ -322,9 +324,9 @@ namespace DiscImageChef.Server.Controllers
if(media.CHS != null) if(media.CHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CHS.Cylinders && _ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CHS.Cylinders &&
c.Heads == media.CHS.Heads && c.Heads == media.CHS.Heads &&
c.Sectors == media.CHS.Sectors); c.Sectors == media.CHS.Sectors);
if(existingChs != null) if(existingChs != null)
media.CHS = existingChs; media.CHS = existingChs;
@@ -333,9 +335,9 @@ namespace DiscImageChef.Server.Controllers
if(media.CHS != null) if(media.CHS != null)
{ {
Chs existingChs = Chs existingChs =
ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CurrentCHS.Cylinders && _ctx.Chs.FirstOrDefault(c => c.Cylinders == media.CurrentCHS.Cylinders &&
c.Heads == media.CurrentCHS.Heads && c.Heads == media.CurrentCHS.Heads &&
c.Sectors == media.CurrentCHS.Sectors); c.Sectors == media.CurrentCHS.Sectors);
if(existingChs != null) if(existingChs != null)
media.CurrentCHS = existingChs; media.CurrentCHS = existingChs;
@@ -343,8 +345,8 @@ namespace DiscImageChef.Server.Controllers
} }
} }
ctx.Reports.Add(newUploadedReport); _ctx.Reports.Add(newUploadedReport);
ctx.SaveChanges(); _ctx.SaveChanges();
var pgpIn = new MemoryStream(Encoding.UTF8.GetBytes(reportJson)); var pgpIn = new MemoryStream(Encoding.UTF8.GetBytes(reportJson));
var pgpOut = new MemoryStream(); var pgpOut = new MemoryStream();