Code re-style.

This commit is contained in:
2020-08-05 21:00:35 +01:00
parent 6f728047c3
commit 569eaa09f6
142 changed files with 5327 additions and 2877 deletions

View File

@@ -41,29 +41,66 @@ namespace Marechai.Services
public async Task<List<ProcessorViewModel>> GetAsync() =>
await _context.Processors.Select(p => new ProcessorViewModel
{
Name = p.Name, CompanyName = p.Company.Name, CompanyId = p.Company.Id, ModelCode = p.ModelCode,
Introduced = p.Introduced, Speed = p.Speed, Package = p.Package, Gprs = p.Gprs,
GprSize = p.GprSize, Fprs = p.Fprs, FprSize = p.FprSize, Cores = p.Cores,
ThreadsPerCore = p.ThreadsPerCore, Process = p.Process, ProcessNm = p.ProcessNm, DieSize = p.DieSize,
Transistors = p.Transistors, DataBus = p.DataBus, AddrBus = p.AddrBus, SimdRegisters = p.SimdRegisters,
SimdSize = p.SimdSize, L1Instruction = p.L1Instruction, L1Data = p.L1Data, L2 = p.L2,
L3 = p.L3, InstructionSet = p.InstructionSet.Name, Id = p.Id,
Name = p.Name,
CompanyName = p.Company.Name,
CompanyId = p.Company.Id,
ModelCode = p.ModelCode,
Introduced = p.Introduced,
Speed = p.Speed,
Package = p.Package,
Gprs = p.Gprs,
GprSize = p.GprSize,
Fprs = p.Fprs,
FprSize = p.FprSize,
Cores = p.Cores,
ThreadsPerCore = p.ThreadsPerCore,
Process = p.Process,
ProcessNm = p.ProcessNm,
DieSize = p.DieSize,
Transistors = p.Transistors,
DataBus = p.DataBus,
AddrBus = p.AddrBus,
SimdRegisters = p.SimdRegisters,
SimdSize = p.SimdSize,
L1Instruction = p.L1Instruction,
L1Data = p.L1Data,
L2 = p.L2,
L3 = p.L3,
InstructionSet = p.InstructionSet.Name,
Id = p.Id,
InstructionSetExtensions = p.InstructionSetExtensions.Select(e => e.Extension.Extension).ToList()
}).OrderBy(p => p.CompanyName).ThenBy(p => p.Name).ToListAsync();
public async Task<List<ProcessorViewModel>> GetByMachineAsync(int machineId) =>
await _context.ProcessorsByMachine.Where(p => p.MachineId == machineId).Select(p => new ProcessorViewModel
{
Name = p.Processor.Name, CompanyName = p.Processor.Company.Name, CompanyId = p.Processor.Company.Id,
ModelCode = p.Processor.ModelCode, Introduced = p.Processor.Introduced, Speed = p.Speed,
Package = p.Processor.Package, Gprs = p.Processor.Gprs, GprSize = p.Processor.GprSize,
Fprs = p.Processor.Fprs, FprSize = p.Processor.FprSize, Cores = p.Processor.Cores,
ThreadsPerCore = p.Processor.ThreadsPerCore, Process = p.Processor.Process,
ProcessNm = p.Processor.ProcessNm, DieSize = p.Processor.DieSize, Transistors = p.Processor.Transistors,
DataBus = p.Processor.DataBus, AddrBus = p.Processor.AddrBus, SimdRegisters = p.Processor.SimdRegisters,
SimdSize = p.Processor.SimdSize, L1Instruction = p.Processor.L1Instruction, L1Data = p.Processor.L1Data,
L2 = p.Processor.L2, L3 = p.Processor.L3, InstructionSet = p.Processor.InstructionSet.Name,
Id = p.Processor.Id,
Name = p.Processor.Name,
CompanyName = p.Processor.Company.Name,
CompanyId = p.Processor.Company.Id,
ModelCode = p.Processor.ModelCode,
Introduced = p.Processor.Introduced,
Speed = p.Speed,
Package = p.Processor.Package,
Gprs = p.Processor.Gprs,
GprSize = p.Processor.GprSize,
Fprs = p.Processor.Fprs,
FprSize = p.Processor.FprSize,
Cores = p.Processor.Cores,
ThreadsPerCore = p.Processor.ThreadsPerCore,
Process = p.Processor.Process,
ProcessNm = p.Processor.ProcessNm,
DieSize = p.Processor.DieSize,
Transistors = p.Processor.Transistors,
DataBus = p.Processor.DataBus,
AddrBus = p.Processor.AddrBus,
SimdRegisters = p.Processor.SimdRegisters,
SimdSize = p.Processor.SimdSize,
L1Instruction = p.Processor.L1Instruction,
L1Data = p.Processor.L1Data,
L2 = p.Processor.L2,
L3 = p.Processor.L3,
InstructionSet = p.Processor.InstructionSet.Name,
Id = p.Processor.Id,
InstructionSetExtensions =
p.Processor.InstructionSetExtensions.Select(e => e.Extension.Extension).ToList()
}).OrderBy(p => p.CompanyName).ThenBy(p => p.Name).ToListAsync();
@@ -71,13 +108,33 @@ namespace Marechai.Services
public async Task<ProcessorViewModel> GetAsync(int id) =>
await _context.Processors.Where(p => p.Id == id).Select(p => new ProcessorViewModel
{
Name = p.Name, CompanyName = p.Company.Name, CompanyId = p.Company.Id, ModelCode = p.ModelCode,
Introduced = p.Introduced, Speed = p.Speed, Package = p.Package, Gprs = p.Gprs,
GprSize = p.GprSize, Fprs = p.Fprs, FprSize = p.FprSize, Cores = p.Cores,
ThreadsPerCore = p.ThreadsPerCore, Process = p.Process, ProcessNm = p.ProcessNm, DieSize = p.DieSize,
Transistors = p.Transistors, DataBus = p.DataBus, AddrBus = p.AddrBus, SimdRegisters = p.SimdRegisters,
SimdSize = p.SimdSize, L1Instruction = p.L1Instruction, L1Data = p.L1Data, L2 = p.L2,
L3 = p.L3, InstructionSet = p.InstructionSet.Name, InstructionSetId = p.InstructionSetId
Name = p.Name,
CompanyName = p.Company.Name,
CompanyId = p.Company.Id,
ModelCode = p.ModelCode,
Introduced = p.Introduced,
Speed = p.Speed,
Package = p.Package,
Gprs = p.Gprs,
GprSize = p.GprSize,
Fprs = p.Fprs,
FprSize = p.FprSize,
Cores = p.Cores,
ThreadsPerCore = p.ThreadsPerCore,
Process = p.Process,
ProcessNm = p.ProcessNm,
DieSize = p.DieSize,
Transistors = p.Transistors,
DataBus = p.DataBus,
AddrBus = p.AddrBus,
SimdRegisters = p.SimdRegisters,
SimdSize = p.SimdSize,
L1Instruction = p.L1Instruction,
L1Data = p.L1Data,
L2 = p.L2,
L3 = p.L3,
InstructionSet = p.InstructionSet.Name,
InstructionSetId = p.InstructionSetId
}).FirstOrDefaultAsync();
public async Task UpdateAsync(ProcessorViewModel viewModel, string userId)
@@ -120,15 +177,31 @@ namespace Marechai.Services
{
var model = new Processor
{
AddrBus = viewModel.AddrBus, CompanyId = viewModel.CompanyId, Cores = viewModel.Cores,
DataBus = viewModel.DataBus, DieSize = viewModel.DieSize, Fprs = viewModel.Fprs,
FprSize = viewModel.FprSize, Gprs = viewModel.Gprs, GprSize = viewModel.GprSize,
InstructionSetId = viewModel.InstructionSetId, Introduced = viewModel.Introduced,
L1Data = viewModel.L1Data, L1Instruction = viewModel.L1Instruction, L2 = viewModel.L2,
L3 = viewModel.L3, ModelCode = viewModel.ModelCode, Name = viewModel.Name, Package = viewModel.Package,
Process = viewModel.Process, ProcessNm = viewModel.ProcessNm, SimdRegisters = viewModel.SimdRegisters,
SimdSize = viewModel.SimdSize, Speed = viewModel.Speed, ThreadsPerCore = viewModel.ThreadsPerCore,
Transistors = viewModel.Transistors
AddrBus = viewModel.AddrBus,
CompanyId = viewModel.CompanyId,
Cores = viewModel.Cores,
DataBus = viewModel.DataBus,
DieSize = viewModel.DieSize,
Fprs = viewModel.Fprs,
FprSize = viewModel.FprSize,
Gprs = viewModel.Gprs,
GprSize = viewModel.GprSize,
InstructionSetId = viewModel.InstructionSetId,
Introduced = viewModel.Introduced,
L1Data = viewModel.L1Data,
L1Instruction = viewModel.L1Instruction,
L2 = viewModel.L2,
L3 = viewModel.L3,
ModelCode = viewModel.ModelCode,
Name = viewModel.Name,
Package = viewModel.Package,
Process = viewModel.Process,
ProcessNm = viewModel.ProcessNm,
SimdRegisters = viewModel.SimdRegisters,
SimdSize = viewModel.SimdSize,
Speed = viewModel.Speed,
ThreadsPerCore = viewModel.ThreadsPerCore,
Transistors = viewModel.Transistors
};
await _context.Processors.AddAsync(model);