diff --git a/Enums/Images.cs b/Enums/Images.cs
index a3c226c..90d538e 100644
--- a/Enums/Images.cs
+++ b/Enums/Images.cs
@@ -37,6 +37,7 @@
// ****************************************************************************/
using System;
+using System.Diagnostics.CodeAnalysis;
namespace Aaru.CommonTypes.Enums
{
@@ -110,6 +111,7 @@ namespace Aaru.CommonTypes.Enums
}
/// Metadata present for each media.
+ [SuppressMessage("ReSharper", "InconsistentNaming")]
public enum MediaTagType
{
/// CD table of contents
diff --git a/Extents/ExtentsByte.cs b/Extents/ExtentsByte.cs
index f43d4f5..39f5d61 100644
--- a/Extents/ExtentsByte.cs
+++ b/Extents/ExtentsByte.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsByte
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsByte() => backend = new List>();
+ public ExtentsByte() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsByte(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsByte(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(byte item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(byte item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,7 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
{
start = extent.Item1;
diff --git a/Extents/ExtentsInt.cs b/Extents/ExtentsInt.cs
index dda4894..dc6eff2 100644
--- a/Extents/ExtentsInt.cs
+++ b/Extents/ExtentsInt.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsInt
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsInt() => backend = new List>();
+ public ExtentsInt() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsInt(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsInt(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(int item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(int item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,7 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
{
start = extent.Item1;
diff --git a/Extents/ExtentsLong.cs b/Extents/ExtentsLong.cs
index a1bd4db..1612ebb 100644
--- a/Extents/ExtentsLong.cs
+++ b/Extents/ExtentsLong.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsLong
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsLong() => backend = new List>();
+ public ExtentsLong() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsLong(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsLong(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(long item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(long item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,7 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
{
start = extent.Item1;
diff --git a/Extents/ExtentsSByte.cs b/Extents/ExtentsSByte.cs
index a070afd..154d159 100644
--- a/Extents/ExtentsSByte.cs
+++ b/Extents/ExtentsSByte.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsSByte
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsSByte() => backend = new List>();
+ public ExtentsSByte() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsSByte(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsSByte(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(sbyte item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(sbyte item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,8 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)
+ )
{
start = extent.Item1;
diff --git a/Extents/ExtentsShort.cs b/Extents/ExtentsShort.cs
index ce43fd2..3d381c0 100644
--- a/Extents/ExtentsShort.cs
+++ b/Extents/ExtentsShort.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsShort
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsShort() => backend = new List>();
+ public ExtentsShort() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsShort(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsShort(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(short item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(short item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,8 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)
+ )
{
start = extent.Item1;
diff --git a/Extents/ExtentsUInt.cs b/Extents/ExtentsUInt.cs
index bb9ad11..fc8cfae 100644
--- a/Extents/ExtentsUInt.cs
+++ b/Extents/ExtentsUInt.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsUInt
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsUInt() => backend = new List>();
+ public ExtentsUInt() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsUInt(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsUInt(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(uint item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(uint item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,7 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
{
start = extent.Item1;
diff --git a/Extents/ExtentsULong.cs b/Extents/ExtentsULong.cs
index 953577f..32a19ae 100644
--- a/Extents/ExtentsULong.cs
+++ b/Extents/ExtentsULong.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsULong
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsULong() => backend = new List>();
+ public ExtentsULong() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsULong(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsULong(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(ulong item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(ulong item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,7 +234,8 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)
+ )
{
start = extent.Item1;
diff --git a/Extents/ExtentsUShort.cs b/Extents/ExtentsUShort.cs
index c3ef1b3..59c0ccf 100644
--- a/Extents/ExtentsUShort.cs
+++ b/Extents/ExtentsUShort.cs
@@ -45,17 +45,17 @@ namespace Aaru.CommonTypes.Extents
/// Implements extents for
public class ExtentsUShort
{
- List> backend;
+ List> _backend;
/// Initialize an empty list of extents
- public ExtentsUShort() => backend = new List>();
+ public ExtentsUShort() => _backend = new List>();
/// Initializes extents with an specific list
/// List of extents as tuples "start, end"
- public ExtentsUShort(IEnumerable> list) => backend = list.OrderBy(t => t.Item1).ToList();
+ public ExtentsUShort(IEnumerable> list) => _backend = list.OrderBy(t => t.Item1).ToList();
/// Gets a count of how many extents are stored
- public int Count => backend.Count;
+ public int Count => _backend.Count;
/// Adds the specified number to the corresponding extent, or creates a new one
///
@@ -65,59 +65,59 @@ namespace Aaru.CommonTypes.Extents
Tuple removeTwo = null;
Tuple itemToAdd = null;
- for(int i = 0; i < backend.Count; i++)
+ for(int 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
- if(item == backend[i].Item1 - 1)
+ if(item == _backend[i].Item1 - 1)
{
- removeOne = backend[i];
+ removeOne = _backend[i];
if(i > 0 &&
- item == backend[i - 1].Item2 + 1)
+ item == _backend[i - 1].Item2 + 1)
{
- removeTwo = backend[i - 1];
- itemToAdd = new Tuple(backend[i - 1].Item1, backend[i].Item2);
+ removeTwo = _backend[i - 1];
+ itemToAdd = new Tuple(_backend[i - 1].Item1, _backend[i].Item2);
}
else
- itemToAdd = new Tuple(item, backend[i].Item2);
+ itemToAdd = new Tuple(item, _backend[i].Item2);
break;
}
// Expands existing extent end
- if(item != backend[i].Item2 + 1)
+ if(item != _backend[i].Item2 + 1)
continue;
- removeOne = backend[i];
+ 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(backend[i].Item1, backend[i + 1].Item2);
+ removeTwo = _backend[i + 1];
+ itemToAdd = new Tuple(_backend[i].Item1, _backend[i + 1].Item2);
}
else
- itemToAdd = new Tuple(backend[i].Item1, item);
+ itemToAdd = new Tuple(_backend[i].Item1, item);
break;
}
if(itemToAdd != null)
{
- backend.Remove(removeOne);
- backend.Remove(removeTwo);
- backend.Add(itemToAdd);
+ _backend.Remove(removeOne);
+ _backend.Remove(removeTwo);
+ _backend.Add(itemToAdd);
}
else
- backend.Add(new Tuple(item, item));
+ _backend.Add(new Tuple(item, item));
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
}
/// Adds a new extent
@@ -144,10 +144,10 @@ namespace Aaru.CommonTypes.Extents
/// Checks if the specified item is contained by an extent on this instance
/// Item to seach for
/// true if any of the extents on this instance contains the item
- public bool Contains(ushort item) => backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
+ public bool Contains(ushort item) => _backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
/// Removes all extents from this instance
- public void Clear() => backend.Clear();
+ public void Clear() => _backend.Clear();
/// Removes an item from the extents in this instance
/// Item to remove
@@ -158,7 +158,7 @@ namespace Aaru.CommonTypes.Extents
Tuple toAddOne = null;
Tuple toAddTwo = null;
- foreach(Tuple extent in backend)
+ foreach(Tuple extent in _backend)
{
// Extent is contained and not a border
if(item > extent.Item1 &&
@@ -205,16 +205,16 @@ namespace Aaru.CommonTypes.Extents
if(toRemove == null)
return false;
- backend.Remove(toRemove);
+ _backend.Remove(toRemove);
if(toAddOne != null)
- backend.Add(toAddOne);
+ _backend.Add(toAddOne);
if(toAddTwo != null)
- backend.Add(toAddTwo);
+ _backend.Add(toAddTwo);
// Sort
- backend = backend.OrderBy(t => t.Item1).ToList();
+ _backend = _backend.OrderBy(t => t.Item1).ToList();
return true;
}
@@ -224,7 +224,7 @@ namespace Aaru.CommonTypes.Extents
/// T2 is last element
///
/// Array of
- public Tuple[] ToArray() => backend.ToArray();
+ public Tuple[] ToArray() => _backend.ToArray();
/// Gets the first element of the extent that contains the specified item
/// Item
@@ -234,8 +234,8 @@ namespace Aaru.CommonTypes.Extents
{
start = 0;
- foreach(Tuple extent in backend.Where(extent =>
- item >= extent.Item1 && item <= extent.Item2))
+ foreach(Tuple extent in _backend.Where(extent => item >= extent.Item1 &&
+ item <= extent.Item2))
{
start = extent.Item1;
diff --git a/Geometry.cs b/Geometry.cs
index fb9c10e..015dfb3 100644
--- a/Geometry.cs
+++ b/Geometry.cs
@@ -42,7 +42,7 @@ namespace Aaru.CommonTypes
{
public static class Geometry
{
- static readonly (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding
+ public static readonly (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding
encoding, bool variableSectorsPerTrack, MediaType type)[] KnownGeometries =
{
(32, 1, 8, 319, MediaEncoding.FM, false, MediaType.IBM23FD),
diff --git a/Interop/PlatformID.cs b/Interop/PlatformID.cs
index d51b684..0bdba92 100644
--- a/Interop/PlatformID.cs
+++ b/Interop/PlatformID.cs
@@ -36,9 +36,12 @@
// Copyright © 2011-2020 Natalia Portillo
// ****************************************************************************/
+using System.Diagnostics.CodeAnalysis;
+
namespace Aaru.CommonTypes.Interop
{
/// Contains an arbitrary list of OSes, even if .NET does not run on them
+ [SuppressMessage("ReSharper", "InconsistentNaming")]
public enum PlatformID
{
/// Win32s
diff --git a/Metadata/Statistics.cs b/Metadata/Statistics.cs
index 412aff0..4029931 100644
--- a/Metadata/Statistics.cs
+++ b/Metadata/Statistics.cs
@@ -37,6 +37,7 @@
// ****************************************************************************/
using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
using System.Xml.Serialization;
namespace Aaru.CommonTypes.Metadata
@@ -182,6 +183,7 @@ namespace Aaru.CommonTypes.Metadata
public string Bus { get; set; }
}
+ [SuppressMessage("ReSharper", "InconsistentNaming")]
public class NameValueStats
{
[XmlAttribute]
@@ -190,6 +192,7 @@ namespace Aaru.CommonTypes.Metadata
public long Value { get; set; }
}
+ [SuppressMessage("ReSharper", "InconsistentNaming")]
public class OsStats
{
[XmlAttribute]
diff --git a/Structs/Devices/SCSI/Modes/2A.cs b/Structs/Devices/SCSI/Modes/2A.cs
index 37d95a4..c806281 100644
--- a/Structs/Devices/SCSI/Modes/2A.cs
+++ b/Structs/Devices/SCSI/Modes/2A.cs
@@ -464,6 +464,7 @@ namespace Aaru.CommonTypes.Structs.Devices.SCSI.Modes
}
}
+ [SuppressMessage("ReSharper", "InconsistentNaming")]
public struct ModePage_2A_WriteDescriptor
{
public byte RotationControl;
diff --git a/Structs/Filesystems.cs b/Structs/Filesystems.cs
index ad26d5d..d3a7454 100644
--- a/Structs/Filesystems.cs
+++ b/Structs/Filesystems.cs
@@ -38,6 +38,7 @@
// ****************************************************************************/
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
namespace Aaru.CommonTypes.Structs
@@ -263,6 +264,7 @@ namespace Aaru.CommonTypes.Structs
}
/// Errors
+ [SuppressMessage("ReSharper", "InconsistentNaming")]
public enum Errno
{
/// No error happened