aaru-dps/Aaru.CommonTypes
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.CommonTypes.git synced 2025-12-16 11:14:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redo Reformat and cleanup.

Browse Source 
Rider EAP was having a bug interpreting .editorconfig that didn't generate the code style as we wanted.
This is now done with Rider-stable.
This commit is contained in:
Natalia Portillo
2023-10-04 17:34:26 +01:00
parent 39d41b1503
commit 7796540b5e
24 changed files with 293 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.editorconfig
View File

@@ -83,7 +83,7 @@ resharper_braces_for_ifelse
resharper_braces_for_while = required_for_multiline
resharper_builtin_type_apply_to_native_integer = false
resharper_constructor_or_destructor_body = expression_body
resharper_csharp_align_first_arg_by_paren = false
resharper_csharp_align_first_arg_by_paren = true
resharper_csharp_empty_block_style = together_same_line
resharper_csharp_place_comments_at_first_column = true
resharper_csharp_prefer_qualified_reference = false
@@ -108,6 +108,7 @@ resharper_int_align_enum_initializers
resharper_int_align_eq = true
resharper_keep_existing_embedded_arrangement = false
resharper_keep_existing_initializer_arrangement = false
resharper_keep_existing_linebreaks = false
resharper_keep_existing_list_patterns_arrangement = false
resharper_keep_existing_property_patterns_arrangement = false
resharper_keep_existing_switch_expression_arrangement = false
@@ -125,6 +126,7 @@ resharper_outdent_statement_labels
resharper_parentheses_redundancy_style = remove
resharper_place_attribute_on_same_line = false
resharper_place_simple_embedded_statement_on_same_line = false
resharper_place_simple_initializer_on_single_line = false
resharper_qualified_using_at_nested_scope = true
resharper_show_autodetect_configure_formatting_tip = false
resharper_simple_block_style = on_single_line
@@ -146,6 +148,8 @@ resharper_use_indent_from_vs
resharper_wrap_after_dot_in_method_calls = true
resharper_wrap_base_clause_style = chop_if_long
resharper_wrap_braced_init_list_style = chop_if_long
resharper_wrap_chained_binary_expressions = chop_if_long
resharper_wrap_chained_method_calls = chop_if_long
resharper_wrap_ctor_initializer_style = chop_if_long
resharper_wrap_lines = true
resharper_xmldoc_attribute_indent = align_by_first_attribute

7
AaruMetadata/Dimensions.cs
View File

@@ -56,10 +56,9 @@ public class Dimensions
? null
: new Dimensions
{
Diameter =
cicm.DiameterSpecified
? cicm.Diameter
: null,
Diameter = cicm.DiameterSpecified
? cicm.Diameter
: null,
Height = cicm.HeightSpecified
? cicm.Height
: null,

4
AaruMetadata/PCMCIA.cs
View File

@@ -74,7 +74,7 @@ public class Pcmcia
AdditionalInformation =
cicm.AdditionalInformation is null
? null
: new List<string>(
cicm.AdditionalInformation)
: new List<string>(cicm.
AdditionalInformation)
};
}

21
Extents/ExtentsByte.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsByte
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsByte
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<byte, byte>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsByte
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<byte, byte>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsByte
foreach(Tuple<byte, byte> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<byte, byte>(extent.Item1, (byte)(item - 1));
@@ -179,8 +175,7 @@ public class ExtentsByte
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<byte, byte>((byte)(item + 1), extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsByte
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<byte, byte>(extent.Item1, (byte)(item - 1));
@@ -199,8 +193,7 @@ public class ExtentsByte
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

3
Extents/ExtentsConverter.cs
View File

@@ -77,8 +77,7 @@ public static class ExtentsConverter
if(extents == null)
return null;
var tuples = extents.Select(extent => new Tuple<ulong, ulong>(extent.Start, extent.End)).
ToList();
var tuples = extents.Select(extent => new Tuple<ulong, ulong>(extent.Start, extent.End)).ToList();
return new ExtentsULong(tuples);
}

21
Extents/ExtentsInt.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsInt
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsInt
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<int, int>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsInt
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<int, int>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsInt
foreach(Tuple<int, int> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<int, int>(extent.Item1, item - 1);
@@ -179,8 +175,7 @@ public class ExtentsInt
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<int, int>(item + 1, extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsInt
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<int, int>(extent.Item1, item - 1);
@@ -199,8 +193,7 @@ public class ExtentsInt
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

21
Extents/ExtentsLong.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsLong
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsLong
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<long, long>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsLong
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<long, long>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsLong
foreach(Tuple<long, long> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<long, long>(extent.Item1, item - 1);
@@ -179,8 +175,7 @@ public class ExtentsLong
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<long, long>(item + 1, extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsLong
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<long, long>(extent.Item1, item - 1);
@@ -199,8 +193,7 @@ public class ExtentsLong
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

21
Extents/ExtentsSByte.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsSByte
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsSByte
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<sbyte, sbyte>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsSByte
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<sbyte, sbyte>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsSByte
foreach(Tuple<sbyte, sbyte> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<sbyte, sbyte>(extent.Item1, (sbyte)(item - 1));
@@ -179,8 +175,7 @@ public class ExtentsSByte
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<sbyte, sbyte>((sbyte)(item + 1), extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsSByte
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<sbyte, sbyte>(extent.Item1, (sbyte)(item - 1));
@@ -199,8 +193,7 @@ public class ExtentsSByte
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

21
Extents/ExtentsShort.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsShort
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsShort
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<short, short>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsShort
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<short, short>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsShort
foreach(Tuple<short, short> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<short, short>(extent.Item1, (short)(item - 1));
@@ -179,8 +175,7 @@ public class ExtentsShort
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<short, short>((short)(item + 1), extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsShort
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<short, short>(extent.Item1, (short)(item - 1));
@@ -199,8 +193,7 @@ public class ExtentsShort
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

21
Extents/ExtentsUInt.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsUInt
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsUInt
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<uint, uint>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsUInt
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<uint, uint>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsUInt
foreach(Tuple<uint, uint> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<uint, uint>(extent.Item1, item - 1);
@@ -179,8 +175,7 @@ public class ExtentsUInt
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<uint, uint>(item + 1, extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsUInt
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<uint, uint>(extent.Item1, item - 1);
@@ -199,8 +193,7 @@ public class ExtentsUInt
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

21
Extents/ExtentsULong.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsULong
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsULong
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<ulong, ulong>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsULong
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<ulong, ulong>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsULong
foreach(Tuple<ulong, ulong> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<ulong, ulong>(extent.Item1, item - 1);
@@ -179,8 +175,7 @@ public class ExtentsULong
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<ulong, ulong>(item + 1, extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsULong
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<ulong, ulong>(extent.Item1, item - 1);
@@ -199,8 +193,7 @@ public class ExtentsULong
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

21
Extents/ExtentsUShort.cs
View File

@@ -75,8 +75,7 @@ public class ExtentsUShort
for(var i = 0; i < _backend.Count; i++)
{
// Already contained in an extent
if(item >= _backend[i].Item1 &&
item <= _backend[i].Item2)
if(item >= _backend[i].Item1 && item <= _backend[i].Item2)
return;
// Expands existing extent start
@@ -84,8 +83,7 @@ public class ExtentsUShort
{
removeOne = _backend[i];
if(i > 0 &&
item == _backend[i - 1].Item2 + 1)
if(i > 0 && item == _backend[i - 1].Item2 + 1)
{
removeTwo = _backend[i - 1];
itemToAdd = new Tuple<ushort, ushort>(_backend[i - 1].Item1, _backend[i].Item2);
@@ -102,8 +100,7 @@ public class ExtentsUShort
removeOne = _backend[i];
if(i < _backend.Count - 1 &&
item == _backend[i + 1].Item1 - 1)
if(i < _backend.Count - 1 && item == _backend[i + 1].Item1 - 1)
{
removeTwo = _backend[i + 1];
itemToAdd = new Tuple<ushort, ushort>(_backend[i].Item1, _backend[i + 1].Item2);
@@ -168,8 +165,7 @@ public class ExtentsUShort
foreach(Tuple<ushort, ushort> extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
item < extent.Item2)
if(item > extent.Item1 && item < extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<ushort, ushort>(extent.Item1, (ushort)(item - 1));
@@ -179,8 +175,7 @@ public class ExtentsUShort
}
// Extent is left border, but not only element
if(item == extent.Item1 &&
item != extent.Item2)
if(item == extent.Item1 && item != extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<ushort, ushort>((ushort)(item + 1), extent.Item2);
@@ -189,8 +184,7 @@ public class ExtentsUShort
}
// Extent is right border, but not only element
if(item != extent.Item1 &&
item == extent.Item2)
if(item != extent.Item1 && item == extent.Item2)
{
toRemove = extent;
toAddOne = new Tuple<ushort, ushort>(extent.Item1, (ushort)(item - 1));
@@ -199,8 +193,7 @@ public class ExtentsUShort
}
// Extent is only element
if(item != extent.Item1 ||
item != extent.Item2)
if(item != extent.Item1 || item != extent.Item2)
continue;
toRemove = extent;

7
Filters.cs
View File

@@ -65,8 +65,7 @@ public sealed class FiltersList
{
var filter = (IFilter)type.GetConstructor(Type.EmptyTypes)?.Invoke(Array.Empty<object>());
if(filter != null &&
!Filters.ContainsKey(filter.Name.ToLower()))
if(filter != null && !Filters.ContainsKey(filter.Name.ToLower()))
Filters.Add(filter.Name.ToLower(), filter);
}
catch(Exception exception)
@@ -92,8 +91,8 @@ public sealed class FiltersList
if(!filter.Identify(path))
continue;
var foundFilter = (IFilter)filter.GetType().GetConstructor(Type.EmptyTypes)?.
Invoke(Array.Empty<object>());
var foundFilter =
(IFilter)filter.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(Array.Empty<object>());
if(foundFilter?.Open(path) == ErrorNumber.NoError)
return foundFilter;

3
Geometry.cs
View File

@@ -133,8 +133,7 @@ public static class Geometry
geom.encoding == geometry.encoding &&
geom.variableSectorsPerTrack ==
geometry.variableSectorsPerTrack
select geom.type).
FirstOrDefault();
select geom.type).FirstOrDefault();
/// <summary>Gets the geometry for a given media type</summary>
/// <param name="mediaType">Media type</param>

12
Interop/DetectOS.cs
View File

@@ -119,8 +119,7 @@ public static class DetectOS
/// <exception cref="Exception">Unhandled exception</exception>
public static PlatformID GetRealPlatformID()
{
if((int)Environment.OSVersion.Platform < 4 ||
(int)Environment.OSVersion.Platform == 5)
if((int)Environment.OSVersion.Platform < 4 || (int)Environment.OSVersion.Platform == 5)
return (PlatformID)(int)Environment.OSVersion.Platform;
int error = uname(out utsname unixname);
@@ -270,7 +269,8 @@ public static class DetectOS
{
return FileVersionInfo.
GetVersionInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System),
"KERNEL32.DLL")).ProductVersion;
"KERNEL32.DLL")).
ProductVersion;
}
return environ;
@@ -319,14 +319,12 @@ public static class DetectOS
string[] pieces = version.Split('.');
if(pieces.Length < 2 ||
!int.TryParse(pieces[1], out int minor))
if(pieces.Length < 2 || !int.TryParse(pieces[1], out int minor))
return "macOS";
int.TryParse(pieces[0], out int major);
if(minor >= 12 ||
major >= 11)
if(minor >= 12 || major >= 11)
return "macOS";
return minor >= 8 ? "OS X" : "Mac OS X";

8
Interop/Version.cs
View File

@@ -55,15 +55,17 @@ public static class Version
{
Assembly assembly = typeof(GCSettings).Assembly;
string[] assemblyPath = assembly.CodeBase?.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
string[] assemblyPath = assembly.CodeBase?.Split(new[]
{
'/', '\\'
}, StringSplitOptions.RemoveEmptyEntries);
if(assemblyPath is null)
return null;
int netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
if(netCoreAppIndex > 0 &&
netCoreAppIndex < assemblyPath.Length - 2)
if(netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2)
return assemblyPath[netCoreAppIndex + 1];
return null;

12
MediaTypeFromDevice/FromMmc.cs
View File

@@ -82,8 +82,8 @@ public static partial class MediaTypeFromDevice
return MediaType.CD;
case 0x01:
case 0x05:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM, mediumType);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM,
mediumType);
return MediaType.CDROM;
case 0x02:
@@ -116,8 +116,8 @@ public static partial class MediaTypeFromDevice
case 0x16:
case 0x17:
case 0x18:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR, mediumType);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR,
mediumType);
return MediaType.CDR;
case 0x20:
@@ -129,8 +129,8 @@ public static partial class MediaTypeFromDevice
case 0x26:
case 0x27:
case 0x28:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW, mediumType);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW,
mediumType);
return MediaType.CDRW;
case 0x40 when isUsb && !opticalDisc:

40
MediaTypeFromDevice/FromOdc.cs
View File

@@ -45,11 +45,7 @@ public static partial class MediaTypeFromDevice
/// <returns>Media type</returns>
static MediaType GetFromOdc(byte mediumType, ulong blocks, uint blockSize)
{
if(mediumType != 0x01 &&
mediumType != 0x02 &&
mediumType != 0x03 &&
mediumType != 0x05 &&
mediumType != 0x07)
if(mediumType != 0x01 && mediumType != 0x02 && mediumType != 0x03 && mediumType != 0x05 && mediumType != 0x07)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical,
@@ -127,9 +123,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_14517_512;
default:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType, blocks, blockSize);
return MediaType.UnknownMO;
}
@@ -197,9 +192,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_260_Double;
default:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType, blocks, blockSize);
return MediaType.UnknownMO;
}
@@ -248,9 +242,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_317;
default:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType, blocks, blockSize);
return MediaType.UnknownMO;
}
@@ -266,9 +259,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_322;
default:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType, blocks, blockSize);
return MediaType.UnknownMO;
}
@@ -284,9 +276,8 @@ public static partial class MediaTypeFromDevice
return MediaType.UDO;
case 3668759:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_UDO2, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_UDO2,
mediumType, blocks, blockSize);
return MediaType.UDO2_WORM;
case 3669724:
@@ -295,17 +286,16 @@ public static partial class MediaTypeFromDevice
return MediaType.UDO2;
default:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType, blocks, blockSize);
return MediaType.UnknownMO;
}
}
default:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType,
blocks, blockSize);
return MediaType.UnknownMO;
}

249
MediaTypeFromDevice/FromSbc.cs
View File

@@ -51,13 +51,13 @@ public static partial class MediaTypeFromDevice
switch(mediumType)
{
case 0x09:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA54,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA54, mediumType,
blocks, blockSize);
return MediaType.ECMA_54;
case 0x0A:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA59,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA59, mediumType,
blocks, blockSize);
return MediaType.ECMA_59;
case 0x0B:
@@ -80,18 +80,18 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_69_8;
}
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown, mediumType,
blocks, blockSize);
return MediaType.Unknown;
case 0x0E:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA66,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA66, mediumType,
blocks, blockSize);
return MediaType.ECMA_66;
case 0x12:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA70,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA70, mediumType,
blocks, blockSize);
return MediaType.ECMA_70;
case 0x16:
@@ -109,8 +109,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_78_2;
}
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown, mediumType,
blocks, blockSize);
return MediaType.Unknown;
case 0x1A:
@@ -133,13 +133,13 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_99_8;
}
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown, mediumType,
blocks, blockSize);
return MediaType.Unknown;
case 0x1E:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD, mediumType,
blocks, blockSize);
return MediaType.DOS_35_DS_DD_9;
case 0x41:
@@ -164,13 +164,13 @@ public static partial class MediaTypeFromDevice
break;
case 0x93:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PC98_MF2HD,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PC98_MF2HD, mediumType,
blocks, blockSize);
return MediaType.NEC_35_HD_15;
case 0x94:
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2HD,
mediumType, blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2HD, mediumType,
blocks, blockSize);
return MediaType.DOS_35_HD;
}
@@ -181,15 +181,13 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 720:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Atari_MD1SD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Atari_MD1SD,
mediumType, blocks, blockSize);
return MediaType.ATARI_525_SD;
case 1040:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Atari_MD1DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Atari_MD1DD,
mediumType, blocks, blockSize);
return MediaType.ATARI_525_DD;
case 1898:
@@ -224,51 +222,43 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_66;
case 400:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Acorn_MD1SD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1SD,
mediumType, blocks, blockSize);
return MediaType.ACORN_525_SS_SD_40;
case 455:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Apple_DOS32, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS32,
mediumType, blocks, blockSize);
return MediaType.Apple32SS;
case 560:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Apple_DOS33, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS33,
mediumType, blocks, blockSize);
return MediaType.Apple33SS;
case 640:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Acorn_MD1DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1DD,
mediumType, blocks, blockSize);
return MediaType.ACORN_525_SS_DD_40;
case 720:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Atari_MD1DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Atari_MD1DD,
mediumType, blocks, blockSize);
return MediaType.ATARI_525_DD;
case 800:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80,
mediumType, blocks, blockSize);
return MediaType.ACORN_525_SS_SD_80;
case 910:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Apple_DOS32_DS, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS32_DS,
mediumType, blocks, blockSize);
return MediaType.Apple32DS;
case 1120:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Apple_DOS33_DS, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS33_DS,
mediumType, blocks, blockSize);
return MediaType.Apple33DS;
case 1121:
@@ -277,15 +267,13 @@ public static partial class MediaTypeFromDevice
return MediaType.IBM33FD_256;
case 1232:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MetaFloppy, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MetaFloppy,
mediumType, blocks, blockSize);
return MediaType.MetaFloppy_Mod_II;
case 1280 when mediumType == 0x01:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80,
mediumType, blocks, blockSize);
return MediaType.ACORN_525_SS_DD_80;
case 1280:
@@ -315,8 +303,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_99_26;
case 39168 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
case 41004 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Bernoulli10, blocks);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli10,
blocks);
return MediaType.Bernoulli10;
case 46956:
@@ -345,15 +333,13 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 320:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MD1DD_8, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD1DD_8,
mediumType, blocks, blockSize);
return MediaType.DOS_525_SS_DD_8;
case 360:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MD1DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD1DD,
mediumType, blocks, blockSize);
return MediaType.DOS_525_SS_DD_9;
case 610:
@@ -362,63 +348,53 @@ public static partial class MediaTypeFromDevice
return MediaType.IBM33FD_512;
case 630 when mediumType == 0x01:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Apricot_MF2DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apricot_MF2DD,
mediumType, blocks, blockSize);
return MediaType.Apricot_35;
case 640 when mediumType == 0x01:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MF1DD_8, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF1DD_8,
mediumType, blocks, blockSize);
return MediaType.DOS_35_SS_DD_8;
case 640:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MD2DD_8, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD2DD_8,
mediumType, blocks, blockSize);
return MediaType.DOS_525_DS_DD_8;
case 720 when mediumType == 0x01:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MF1DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF1DD,
mediumType, blocks, blockSize);
return MediaType.DOS_35_SS_DD_9;
case 720:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MD2DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD2DD,
mediumType, blocks, blockSize);
return MediaType.DOS_525_DS_DD_9;
case 800:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Apple_MF1DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_MF1DD,
mediumType, blocks, blockSize);
return MediaType.AppleSonySS;
case 1280:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MF2DD_8, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD_8,
mediumType, blocks, blockSize);
return MediaType.DOS_35_DS_DD_8;
case 1440:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MF2DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD,
mediumType, blocks, blockSize);
return MediaType.DOS_35_DS_DD_9;
case 1640:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_FDFORMAT_MF2DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FDFORMAT_MF2DD,
mediumType, blocks, blockSize);
return MediaType.FDFORMAT_35_DD;
case 1760:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Amiga_MF2DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Amiga_MF2DD,
mediumType, blocks, blockSize);
return MediaType.CBM_AMIGA_35_DD;
case 2242:
@@ -432,51 +408,43 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_99_15;
case 2400:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MD2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD2HD,
mediumType, blocks, blockSize);
return MediaType.DOS_525_HD;
case 2788:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_FDFORMAT_MD2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FDFORMAT_MD2HD,
mediumType, blocks, blockSize);
return MediaType.FDFORMAT_525_HD;
case 2880:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MF2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2HD,
mediumType, blocks, blockSize);
return MediaType.DOS_35_HD;
case 3360:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DMF_MF2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DMF_MF2HD,
mediumType, blocks, blockSize);
return MediaType.DMF;
case 3444:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_FDFORMAT_MF2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FDFORMAT_MF2HD,
mediumType, blocks, blockSize);
return MediaType.FDFORMAT_35_HD;
case 3520:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Amiga_MF2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Amiga_MF2HD,
mediumType, blocks, blockSize);
return MediaType.CBM_AMIGA_35_HD;
case 5760:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM_MF2ED, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2ED,
mediumType, blocks, blockSize);
return MediaType.DOS_35_ED;
case 40662 when mediumType == 0x20:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Floptical, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Floptical,
mediumType, blocks, blockSize);
return MediaType.Floptical;
case 65536 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal):
@@ -484,8 +452,7 @@ public static partial class MediaTypeFromDevice
return MediaType.FD32MB;
case 78882 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_PocketZIP);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PocketZIP);
return MediaType.PocketZip;
case 86700 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
@@ -493,8 +460,7 @@ public static partial class MediaTypeFromDevice
return MediaType.SQ400;
case 87040 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Bernoulli2_44);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_44);
return MediaType.Bernoulli44;
case 173456 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
@@ -502,8 +468,7 @@ public static partial class MediaTypeFromDevice
return MediaType.SQ800;
case 175856 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Bernoulli2_90);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_90);
return MediaType.Bernoulli90;
case 196608 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase):
@@ -538,8 +503,8 @@ public static partial class MediaTypeFromDevice
return MediaType.SQ2000;
case 393380 when model.ToLowerInvariant().StartsWith("hifd", StringComparison.Ordinal):
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HiFD,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HiFD, blocks,
blockSize);
return MediaType.HiFD;
case 429975 when mediumType is 0x01 or 0x02:
@@ -642,8 +607,8 @@ public static partial class MediaTypeFromDevice
return MediaType.Orb;
case 625134256 when model.ToLowerInvariant().StartsWith("rdx", StringComparison.Ordinal):
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_RDX320,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_RDX320, blocks,
blockSize);
return MediaType.RDX320;
}
@@ -654,9 +619,8 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 800 when mediumType == 0x02:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Acorn_MF2DD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MF2DD,
mediumType, blocks, blockSize);
return MediaType.ACORN_35_DS_DD;
case 1220:
@@ -665,14 +629,12 @@ public static partial class MediaTypeFromDevice
return MediaType.IBM53FD_1024;
case 1232 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal):
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LS_PC98_MF2HD);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS_PC98_MF2HD);
return MediaType.NEC_35_HD_8;
case 1232:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Sharp_MF2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Sharp_MF2HD,
mediumType, blocks, blockSize);
return MediaType.SHARP_35;
case 1268:
@@ -681,9 +643,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_69_8;
case 1280:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_PC98_MD2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PC98_MD2HD,
mediumType, blocks, blockSize);
return MediaType.NEC_525_HD;
case 1316:
@@ -692,9 +653,8 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_99_8;
case 1600 when mediumType == 0x02:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Acorn_MF2HD, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MF2HD,
mediumType, blocks, blockSize);
return MediaType.ACORN_35_DS_HD;
case 314569 when mediumType is 0x01 or 0x02:
@@ -847,9 +807,8 @@ public static partial class MediaTypeFromDevice
return MediaType.UDO;
case 3668759 when mediumType is 0x01 or 0x02:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_UDO2, mediumType,
blocks, blockSize);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_UDO2,
mediumType, blocks, blockSize);
return MediaType.UDO2_WORM;
case 3669724 when mediumType is 0x01 or 0x02:

9
MediaTypeFromDevice/FromScsi.cs
View File

@@ -94,20 +94,17 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 57312:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType, blocks, blockSize);
return MediaType.MD60;
case 70464:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD74_MDDATA,
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD74_MDDATA,
scsiPeripheralType, blocks, blockSize);
return MediaType.MD74;
case 76096:
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD80_MDDATA,
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD80_MDDATA,
scsiPeripheralType, blocks, blockSize);
return MediaType.MD80;

188
MediaTypeFromDevice/FromSsc.cs
View File

@@ -109,9 +109,8 @@ public static partial class MediaTypeFromDevice
case 0x40:
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO_ult,
mediumType, densityCode);
return MediaType.LTO;
}
@@ -130,9 +129,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2_ult,
mediumType, densityCode);
return MediaType.LTO2;
}
@@ -144,18 +142,16 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2_ult,
mediumType, densityCode);
return MediaType.LTO2;
}
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9840A, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9840A,
mediumType, densityCode);
return MediaType.T9840A;
}
@@ -167,9 +163,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9940A, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9940A,
mediumType, densityCode);
return MediaType.T9940A;
}
@@ -189,9 +184,8 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9940B, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9940B,
mediumType, densityCode);
return MediaType.T9940B;
}
@@ -203,9 +197,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9940C, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9940C,
mediumType, densityCode);
return MediaType.T9840C;
}
@@ -225,9 +218,8 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9840D, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9840D,
mediumType, densityCode);
return MediaType.T9840D;
}
@@ -239,9 +231,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000A, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000A,
mediumType, densityCode);
return MediaType.T10000A;
}
@@ -253,9 +244,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000B, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000B,
mediumType, densityCode);
return MediaType.T10000B;
}
@@ -267,9 +257,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000C, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000C,
mediumType, densityCode);
return MediaType.T10000C;
}
@@ -281,9 +270,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000D, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000D,
mediumType, densityCode);
return MediaType.T10000D;
}
@@ -323,9 +311,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO3, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO3,
mediumType, densityCode);
return MediaType.LTO3WORM;
}
@@ -337,9 +324,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO4, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO4,
mediumType, densityCode);
return MediaType.LTO4WORM;
}
@@ -351,9 +337,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO5, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO5,
mediumType, densityCode);
return MediaType.LTO5WORM;
}
@@ -372,9 +357,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO_ult,
mediumType, densityCode);
return MediaType.LTO;
}
@@ -401,9 +385,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2_ult,
mediumType, densityCode);
return MediaType.LTO2;
}
@@ -431,9 +414,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS3_dat, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS3_dat,
mediumType, densityCode);
return MediaType.DDS3;
}
@@ -453,9 +435,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS4_alt, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS4_alt,
mediumType, densityCode);
return MediaType.DDS4;
}
@@ -475,9 +456,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DAT72_dat, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DAT72_dat,
mediumType, densityCode);
return MediaType.DAT72;
}
@@ -518,9 +498,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO3, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO3,
mediumType, densityCode);
return MediaType.LTO3WORM;
}
@@ -561,9 +540,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO4, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO4,
mediumType, densityCode);
return MediaType.LTO4WORM;
}
@@ -583,9 +561,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS2_dat, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS2_dat,
mediumType, densityCode);
return MediaType.DDS2;
}
@@ -626,9 +603,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO5, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO5,
mediumType, densityCode);
return MediaType.LTO5WORM;
}
@@ -648,9 +624,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO6_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO6_ult,
mediumType, densityCode);
return MediaType.LTO6;
}
@@ -692,9 +667,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO7_ult, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO7_ult,
mediumType, densityCode);
return MediaType.LTO7;
}
@@ -744,9 +718,8 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592,
mediumType, densityCode);
return MediaType.IBM3592;
}
@@ -785,9 +758,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592,
mediumType, densityCode);
return MediaType.IBM3592;
}
@@ -828,9 +800,8 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592,
mediumType, densityCode);
return MediaType.IBM3592;
}
@@ -889,9 +860,8 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592,
mediumType, densityCode);
return MediaType.IBM3592;
}
@@ -945,9 +915,8 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIII, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIII,
mediumType, densityCode);
return MediaType.DLTtapeIII;
}
@@ -981,9 +950,8 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIII, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIII,
mediumType, densityCode);
return MediaType.DLTtapeIII;
}
@@ -1003,8 +971,8 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_80m,
mediumType, densityCode);
Localization.SCSI_Media_Type_Description_Exatape_80m, mediumType,
densityCode);
return MediaType.Exatape80m;
}
@@ -1030,8 +998,8 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_80m,
mediumType, densityCode);
Localization.SCSI_Media_Type_Description_Exatape_80m, mediumType,
densityCode);
return MediaType.Exatape80m;
}
@@ -1077,9 +1045,8 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIV, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIV,
mediumType, densityCode);
return MediaType.DLTtapeIV;
}
@@ -1131,9 +1098,8 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIV, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIV,
mediumType, densityCode);
return MediaType.DLTtapeIV;
}
@@ -1232,9 +1198,8 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_SDLT2, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SDLT2,
mediumType, densityCode);
return MediaType.SDLT2;
}
@@ -1258,9 +1223,8 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_Media_Type_Description_VStape, mediumType,
densityCode);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_VStape,
mediumType, densityCode);
return MediaType.VStapeI;
}

6
Partition.cs
View File

@@ -91,12 +91,10 @@ public struct Partition : IEquatable<Partition>, IComparable<Partition>
/// <inheritdoc />
public int CompareTo(Partition other)
{
if(Start == other.Start &&
End == other.End)
if(Start == other.Start && End == other.End)
return 0;
if(Start > other.Start ||
End > other.End)
if(Start > other.Start || End > other.End)
return 1;
return -1;

15
Structs/Devices/SCSI/Inquiry.cs
View File

@@ -273,8 +273,7 @@ public struct Inquiry
if(SCSIInquiryResponse == null)
return null;
if(SCSIInquiryResponse.Length < 36 &&
SCSIInquiryResponse.Length != 5)
if(SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes,
@@ -401,8 +400,7 @@ public struct Inquiry
decoded.KreonVersion = new byte[5];
Array.Copy(SCSIInquiryResponse, 42, decoded.KreonVersion, 0, 5);
if(decoded.KreonSpace == 0x20 &&
decoded.KreonIdentifier.SequenceEqual("KREON"u8.ToArray()))
if(decoded.KreonSpace == 0x20 && decoded.KreonIdentifier.SequenceEqual("KREON"u8.ToArray()))
decoded.KreonPresent = true;
}
@@ -705,9 +703,7 @@ public struct Inquiry
Array.Copy(decoded.KreonVersion, 0, buffer, 42, 5);
}
if(decoded.HP_WORM ||
decoded.HP_WORMVersion > 0 ||
decoded.HP_OBDR != null)
if(decoded.HP_WORM || decoded.HP_WORMVersion > 0 || decoded.HP_OBDR != null)
{
length = 49;
@@ -733,10 +729,7 @@ public struct Inquiry
Array.Copy(decoded.VendorSpecific, 0, buffer, 36, 20);
}
if(decoded.Reserved3 > 0 ||
decoded.Clocking > 0 ||
decoded.QAS ||
decoded.IUS)
if(decoded.Reserved3 > 0 || decoded.Clocking > 0 || decoded.QAS || decoded.IUS)
{
length = 57;
buffer[56] = (byte)(decoded.Reserved3 << 4);

9
Structs/Devices/SCSI/Modes/2A.cs
View File

@@ -462,10 +462,7 @@ public class ModePage_2A
pageResponse[17] += 0x02;
}
if(decoded.TestWrite ||
decoded.MaxWriteSpeed > 0 ||
decoded.CurrentWriteSpeed > 0 ||
decoded.ReadBarcode)
if(decoded.TestWrite || decoded.MaxWriteSpeed > 0 || decoded.CurrentWriteSpeed > 0 || decoded.ReadBarcode)
{
length = 22;
@@ -518,9 +515,7 @@ public class ModePage_2A
pageResponse[23] = (byte)(decoded.CMRSupported & 0xFF);
}
if(decoded.BUF ||
decoded.RotationControlSelected > 0 ||
decoded.CurrentWriteSpeedSelected > 0)
if(decoded.BUF || decoded.RotationControlSelected > 0 || decoded.CurrentWriteSpeedSelected > 0)
{
length = 32;