diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index df7815968..a9fdbe558 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit df78159688a5824291ff95b0ae963fdf51f2bb3a +Subproject commit a9fdbe55855c6e74e36a8cb6e4b905c1d2ef3c80 diff --git a/Aaru.Devices/Device/ScsiCommands/SPC.cs b/Aaru.Devices/Device/ScsiCommands/SPC.cs index 0cdefbaa3..d32cdb5e0 100644 --- a/Aaru.Devices/Device/ScsiCommands/SPC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SPC.cs @@ -394,13 +394,9 @@ public partial class Device /// Timeout in seconds. /// Duration in milliseconds it took for the device to execute the command. /// true to prevent medium removal, false to allow it. - public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, bool prevent, uint timeout, out double duration) - { - if(prevent) - return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration); - - return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration); - } + public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, bool prevent, uint timeout, out double duration) => + prevent ? SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration) + : SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration); /// Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command /// true if the command failed and contains the sense buffer. diff --git a/Aaru.Filesystems/QNX4.cs b/Aaru.Filesystems/QNX4.cs index 66e6d47ff..8414a4cff 100644 --- a/Aaru.Filesystems/QNX4.cs +++ b/Aaru.Filesystems/QNX4.cs @@ -100,13 +100,10 @@ public sealed class QNX4 : IFilesystem return false; // Check inodes are in use - if((qnxSb.rootDir.di_status & 0x01) != 0x01 || - (qnxSb.inode.di_status & 0x01) != 0x01 || - (qnxSb.boot.di_status & 0x01) != 0x01) - return false; + return (qnxSb.rootDir.di_status & 0x01) == 0x01 && (qnxSb.inode.di_status & 0x01) == 0x01 && + (qnxSb.boot.di_status & 0x01) == 0x01; // All hail filesystems without identification marks - return true; } /// diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs index 1cfbecf41..8ec3b24d0 100644 --- a/Aaru.Images/BlindWrite4/Read.cs +++ b/Aaru.Images/BlindWrite4/Read.cs @@ -1212,13 +1212,8 @@ public sealed partial class BlindWrite4 } /// - public List GetSessionTracks(Session session) - { - if(Sessions.Contains(session)) - return GetSessionTracks(session.Sequence); - - return null; - } + public List GetSessionTracks(Session session) => + Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null; /// public List GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList(); diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs index 626530d5d..f6bee2e21 100644 --- a/Aaru.Images/BlindWrite5/Read.cs +++ b/Aaru.Images/BlindWrite5/Read.cs @@ -2132,13 +2132,8 @@ public sealed partial class BlindWrite5 } /// - public List GetSessionTracks(Session session) - { - if(Sessions.Contains(session)) - return GetSessionTracks(session.Sequence); - - return null; - } + public List GetSessionTracks(Session session) => + Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null; /// public List GetSessionTracks(ushort session) => diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs index 32ded6ec5..31fb8fbcc 100644 --- a/Aaru.Images/CDRDAO/Read.cs +++ b/Aaru.Images/CDRDAO/Read.cs @@ -1492,11 +1492,5 @@ public sealed partial class Cdrdao public List GetSessionTracks(Session session) => GetSessionTracks(session.Sequence); /// - public List GetSessionTracks(ushort session) - { - if(session == 1) - return Tracks; - - return null; - } + public List GetSessionTracks(ushort session) => session == 1 ? Tracks : null; } \ No newline at end of file diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index df9c6c7b9..a88bb356b 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -2355,13 +2355,8 @@ public sealed partial class CdrWin } /// - public List GetSessionTracks(Session session) - { - if(_discImage.Sessions.Contains(session)) - return GetSessionTracks(session.Sequence); - - return null; - } + public List GetSessionTracks(Session session) => + _discImage.Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null; /// public List GetSessionTracks(ushort session) => diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs index de71abcf0..1f2e44bc1 100644 --- a/Aaru.Images/CloneCD/Read.cs +++ b/Aaru.Images/CloneCD/Read.cs @@ -1364,13 +1364,8 @@ public sealed partial class CloneCd } /// - public List GetSessionTracks(Session session) - { - if(Sessions.Contains(session)) - return GetSessionTracks(session.Sequence); - - return null; - } + public List GetSessionTracks(Session session) => + Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null; /// public List GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList(); diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs index d2ad9ce1c..bcbfaf2cb 100644 --- a/Aaru.Images/DiscJuggler/Read.cs +++ b/Aaru.Images/DiscJuggler/Read.cs @@ -1342,13 +1342,8 @@ public sealed partial class DiscJuggler } /// - public List GetSessionTracks(Session session) - { - if(Sessions.Contains(session)) - return GetSessionTracks(session.Sequence); - - return null; - } + public List GetSessionTracks(Session session) => + Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null; /// public List GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList(); diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs index 594e138e2..fa4adc1fa 100644 --- a/Aaru.Images/GDI/Read.cs +++ b/Aaru.Images/GDI/Read.cs @@ -877,13 +877,8 @@ public sealed partial class Gdi } /// - public List GetSessionTracks(Session session) - { - if(_discImage.Sessions.Contains(session)) - return GetSessionTracks(session.Sequence); - - return null; - } + public List GetSessionTracks(Session session) => + _discImage.Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null; /// public List GetSessionTracks(ushort session) diff --git a/Aaru.Images/ZZZRawImage/Helpers.cs b/Aaru.Images/ZZZRawImage/Helpers.cs index f337136da..f6888ec5a 100644 --- a/Aaru.Images/ZZZRawImage/Helpers.cs +++ b/Aaru.Images/ZZZRawImage/Helpers.cs @@ -61,11 +61,8 @@ public sealed partial class ZZZRawImage case 116480: return MediaType.Apple32SS; case 133120: return MediaType.ATARI_525_ED; case 143360: return MediaType.Apple33SS; - case 163840: - if(_imageInfo.SectorSize == 256) - return MediaType.ACORN_525_SS_DD_40; + case 163840: return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_40 : MediaType.DOS_525_SS_DD_8; - return MediaType.DOS_525_SS_DD_8; case 184320: return MediaType.DOS_525_SS_DD_9; case 204800: return MediaType.ACORN_525_SS_SD_80; case 232960: return MediaType.Apple32DS; @@ -77,21 +74,12 @@ public sealed partial class ZZZRawImage case 315392: return MediaType.MetaFloppy_Mod_II; case 322560: return MediaType.Apricot_35; case 325632: return MediaType.ECMA_70; - case 327680: - if(_imageInfo.SectorSize == 256) - return MediaType.ACORN_525_SS_DD_80; + case 327680: return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_80 : MediaType.DOS_525_DS_DD_8; - return MediaType.DOS_525_DS_DD_8; - case 368640: - if(_extension == ".st") - return MediaType.DOS_35_SS_DD_9; + case 368640: return _extension == ".st" ? MediaType.DOS_35_SS_DD_9 : MediaType.DOS_525_DS_DD_9; - return MediaType.DOS_525_DS_DD_9; - case 409600: - if(_extension == ".st") - return MediaType.ATARI_35_SS_DD; + case 409600: return _extension == ".st" ? MediaType.ATARI_35_SS_DD : MediaType.AppleSonySS; - return MediaType.AppleSonySS; case 450560: return MediaType.ATARI_35_SS_DD_11; case 495872: return MediaType.IBM43FD_128; case 512512: return MediaType.ECMA_59; @@ -110,11 +98,8 @@ public sealed partial class ZZZRawImage }; case 839680: return MediaType.FDFORMAT_35_DD; - case 901120: - if(_extension == ".st") - return MediaType.ATARI_35_DS_DD_11; + case 901120: return _extension == ".st" ? MediaType.ATARI_35_DS_DD_11 : MediaType.CBM_AMIGA_35_DD; - return MediaType.CBM_AMIGA_35_DD; case 988416: return MediaType.IBM43FD_256; case 995072: return MediaType.IBM53FD_256; case 1021696: return MediaType.ECMA_99_26;