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

REFACTOR: Loop can be converted into LINQ-expression.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 07:08:26 +00:00
parent 4d886dae25
commit 5592f147ac
71 changed files with 668 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DiscImageChef.Decoders/Floppy/Apple2.cs
View File

@@ -33,6 +33,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using DiscImageChef.Console;
@@ -563,11 +564,8 @@ namespace DiscImageChef.Decoders.Floppy
MemoryStream raw = new MemoryStream();
raw.Write(track.gap, 0, track.gap.Length);
foreach(RawSector sector in track.sectors)
{
byte[] rawSector = MarshalSector(sector);
raw.Write(rawSector, 0, rawSector.Length);
}
foreach(byte[] rawSector in track.sectors.Select(sector => MarshalSector(sector)))
{ raw.Write(rawSector, 0, rawSector.Length); }
return raw.ToArray();
}
@@ -607,11 +605,7 @@ namespace DiscImageChef.Decoders.Floppy
if(disk == null) return null;
MemoryStream raw = new MemoryStream();
foreach(RawTrack track in disk)
{
byte[] rawTrack = MarshalTrack(track);
raw.Write(rawTrack, 0, rawTrack.Length);
}
foreach(byte[] rawTrack in disk.Select(track => MarshalTrack(track))) { raw.Write(rawTrack, 0, rawTrack.Length); }
return raw.ToArray();
}

14
DiscImageChef.Decoders/Floppy/AppleSony.cs
View File

@@ -33,6 +33,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
@@ -446,11 +447,8 @@ namespace DiscImageChef.Decoders.Floppy
MemoryStream raw = new MemoryStream();
raw.Write(track.gap, 0, track.gap.Length);
foreach(RawSector sector in track.sectors)
{
byte[] rawSector = MarshalSector(sector);
raw.Write(rawSector, 0, rawSector.Length);
}
foreach(byte[] rawSector in track.sectors.Select(sector => MarshalSector(sector)))
{ raw.Write(rawSector, 0, rawSector.Length); }
return raw.ToArray();
}
@@ -490,11 +488,7 @@ namespace DiscImageChef.Decoders.Floppy
if(disk == null) return null;
MemoryStream raw = new MemoryStream();
foreach(RawTrack track in disk)
{
byte[] rawTrack = MarshalTrack(track);
raw.Write(rawTrack, 0, rawTrack.Length);
}
foreach(byte[] rawTrack in disk.Select(track => MarshalTrack(track))) { raw.Write(rawTrack, 0, rawTrack.Length); }
return raw.ToArray();
}

3
DiscImageChef.Decoders/PCMCIA/CIS.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace DiscImageChef.Decoders.PCMCIA
@@ -278,7 +279,7 @@ namespace DiscImageChef.Decoders.PCMCIA
else
{
sb.AppendLine("\tAdditional information:");
foreach(string info in tuple.AdditionalInformation) if(!string.IsNullOrEmpty(info)) sb.AppendFormat("\t\t{0}", info).AppendLine();
foreach(string info in tuple.AdditionalInformation.Where(info => !string.IsNullOrEmpty(info))) sb.AppendFormat("\t\t{0}", info).AppendLine();
}
return sb.ToString();

15
DiscImageChef.Decoders/SCSI/Modes/2A.cs
View File

@@ -30,6 +30,7 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using System.Linq;
using System.Text;
namespace DiscImageChef.Decoders.SCSI
@@ -413,14 +414,12 @@ namespace DiscImageChef.Decoders.SCSI
}
if(page.WriteSpeedPerformanceDescriptors != null)
foreach(ModePage_2A_WriteDescriptor descriptor in page.WriteSpeedPerformanceDescriptors)
if(descriptor.WriteSpeed > 0)
if(descriptor.RotationControl == 0)
sb.AppendFormat("\tDrive supports writing at {0} Kbyte/sec. in CLV mode",
descriptor.WriteSpeed).AppendLine();
else if(descriptor.RotationControl == 1)
sb.AppendFormat("\tDrive supports writing at is {0} Kbyte/sec. in pure CAV mode",
descriptor.WriteSpeed).AppendLine();
foreach(ModePage_2A_WriteDescriptor descriptor in page.WriteSpeedPerformanceDescriptors.Where(descriptor => descriptor.WriteSpeed > 0)) if(descriptor.RotationControl == 0)
sb.AppendFormat("\tDrive supports writing at {0} Kbyte/sec. in CLV mode",
descriptor.WriteSpeed).AppendLine();
else if(descriptor.RotationControl == 1)
sb.AppendFormat("\tDrive supports writing at is {0} Kbyte/sec. in pure CAV mode",
descriptor.WriteSpeed).AppendLine();
if(page.TestWrite) sb.AppendLine("\tDrive supports test writing");

3
DiscImageChef.Decoders/SCSI/Modes/Mode10.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace DiscImageChef.Decoders.SCSI
{
@@ -275,7 +276,7 @@ namespace DiscImageChef.Decoders.SCSI
public static byte[] EncodeMode10(DecodedMode mode, PeripheralDeviceTypes deviceType)
{
int modeSize = 0;
if(mode.Pages != null) foreach(ModePage page in mode.Pages) modeSize += page.PageResponse.Length;
if(mode.Pages != null) modeSize += mode.Pages.Sum(page => page.PageResponse.Length);
byte[] hdr = EncodeModeHeader10(mode.Header, deviceType);
modeSize += hdr.Length;

3
DiscImageChef.Decoders/SCSI/Modes/Mode6.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace DiscImageChef.Decoders.SCSI
{
@@ -205,7 +206,7 @@ namespace DiscImageChef.Decoders.SCSI
public static byte[] EncodeMode6(DecodedMode mode, PeripheralDeviceTypes deviceType)
{
int modeSize = 0;
if(mode.Pages != null) foreach(ModePage page in mode.Pages) modeSize += page.PageResponse.Length;
if(mode.Pages != null) modeSize += mode.Pages.Sum(page => page.PageResponse.Length);
byte[] hdr = EncodeModeHeader6(mode.Header, deviceType);
modeSize += hdr.Length;