Updates to the Utilities Library

Utilities/ByteUtils/BigEndianReader.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 

Utilities/ByteUtils/BigEndianWriter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 

Utilities/ByteUtils/ByteReader.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 

Utilities/ByteUtils/ByteUtils.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
@@ -33,6 +32,35 @@ namespace Utilities
             return true;
         }
 
+        public static byte[] XOR(byte[] array1, byte[] array2)
+        {
+            if (array1.Length == array2.Length)
+            {
+                return XOR(array1, 0, array2, 0, array1.Length);
+            }
+            else
+            {
+                throw new ArgumentException("Arrays must be of equal length");
+            }
+        }
+
+        public static byte[] XOR(byte[] array1, int offset1, byte[] array2, int offset2, int length)
+        {
+            if (offset1 + length <= array1.Length && offset2 + length <= array2.Length)
+            {
+                byte[] result = new byte[length];
+                for (int index = 0; index < length; index++)
+                {
+                    result[index] = (byte)(array1[offset1 + index] ^ array2[offset2 + index]);
+                }
+                return result;
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+        }
+
         public static long CopyStream(Stream input, Stream output)
         {
             // input may not support seeking, so don't use input.Position
@@ -41,7 +69,7 @@ namespace Utilities
 
         public static long CopyStream(Stream input, Stream output, long count)
         {
-            const int MaxBufferSize = 4194304; // 4 MB
+            const int MaxBufferSize = 1048576; // 1 MB
             int bufferSize = (int)Math.Min(MaxBufferSize, count);
             byte[] buffer = new byte[bufferSize];
             long totalBytesRead = 0;

Utilities/ByteUtils/ByteWriter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 

Utilities/ByteUtils/LittleEndianReader.cs

@@ -1,23 +1,41 @@
 using System;
-using System.Collections.Generic;
+using System.IO;
 using System.Text;
 
 namespace Utilities
 {
     public class LittleEndianReader
     {
+        public static short ReadInt16(byte[] buffer, ref int offset)
+        {
+            offset += 2;
+            return LittleEndianConverter.ToInt16(buffer, offset - 2);
+        }
+
         public static ushort ReadUInt16(byte[] buffer, ref int offset)
         {
             offset += 2;
             return LittleEndianConverter.ToUInt16(buffer, offset - 2);
         }
 
+        public static int ReadInt32(byte[] buffer, ref int offset)
+        {
+            offset += 4;
+            return LittleEndianConverter.ToInt32(buffer, offset - 4);
+        }
+
         public static uint ReadUInt32(byte[] buffer, ref int offset)
         {
             offset += 4;
             return LittleEndianConverter.ToUInt32(buffer, offset - 4);
         }
 
+        public static long ReadInt64(byte[] buffer, ref int offset)
+        {
+            offset += 8;
+            return LittleEndianConverter.ToInt64(buffer, offset - 8);
+        }
+
         public static ulong ReadUInt64(byte[] buffer, ref int offset)
         {
             offset += 8;
@@ -29,5 +47,54 @@ namespace Utilities
             offset += 16;
             return LittleEndianConverter.ToGuid(buffer, offset - 16);
         }
+
+        public static short ReadInt16(Stream stream)
+        {
+            byte[] buffer = new byte[2];
+            stream.Read(buffer, 0, 2);
+            return LittleEndianConverter.ToInt16(buffer, 0);
+        }
+
+        public static ushort ReadUInt16(Stream stream)
+        {
+            byte[] buffer = new byte[2];
+            stream.Read(buffer, 0, 2);
+            return LittleEndianConverter.ToUInt16(buffer, 0);
+        }
+
+        public static int ReadInt32(Stream stream)
+        {
+            byte[] buffer = new byte[4];
+            stream.Read(buffer, 0, 4);
+            return LittleEndianConverter.ToInt32(buffer, 0);
+        }
+
+        public static uint ReadUInt32(Stream stream)
+        {
+            byte[] buffer = new byte[4];
+            stream.Read(buffer, 0, 4);
+            return LittleEndianConverter.ToUInt32(buffer, 0);
+        }
+
+        public static long ReadInt64(Stream stream)
+        {
+            byte[] buffer = new byte[8];
+            stream.Read(buffer, 0, 8);
+            return LittleEndianConverter.ToInt64(buffer, 0);
+        }
+
+        public static ulong ReadUInt64(Stream stream)
+        {
+            byte[] buffer = new byte[8];
+            stream.Read(buffer, 0, 8);
+            return LittleEndianConverter.ToUInt64(buffer, 0);
+        }
+
+        public static Guid ReadGuidBytes(Stream stream)
+        {
+            byte[] buffer = new byte[16];
+            stream.Read(buffer, 0, 16);
+            return LittleEndianConverter.ToGuid(buffer, 0);
+        }
     }
 }

Utilities/ByteUtils/LittleEndianWriter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 

Utilities/Generics/KeyValuePairList.cs

@@ -7,10 +7,10 @@ namespace Utilities
     {
         public bool ContainsKey(TKey key)
         {
-            return (this.IndexOf(key) != -1);
+            return (this.IndexOfKey(key) != -1);
         }
 
-        public int IndexOf(TKey key)
+        public int IndexOfKey(TKey key)
         {
             for (int index = 0; index < this.Count; index++)
             {

Utilities/Generics/SortedList.cs

@@ -0,0 +1,163 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Utilities
+{
+    public class SortedList<T> : ICollection<T>
+    {
+        private List<T> m_innerList;
+        private Comparer<T> m_comparer;
+
+        public SortedList() : this(Comparer<T>.Default)
+        {
+        }
+
+        public SortedList(Comparer<T> comparer)
+        {
+            m_innerList = new List<T>();
+            m_comparer = comparer;
+        }
+
+        public void Add(T item)
+        {
+            int insertIndex = FindIndexForSortedInsert(m_innerList, m_comparer, item);
+            m_innerList.Insert(insertIndex, item);
+        }
+
+        public bool Contains(T item)
+        {
+            return IndexOf(item) != -1;
+        }
+
+        /// <summary>
+        /// Searches for the specified object and returns the zero-based index of the first occurrence within the entire SortedList<T>
+        /// </summary>
+        public int IndexOf(T item)
+        {
+            int insertIndex = FindIndexForSortedInsert(m_innerList, m_comparer, item);
+            if (insertIndex == m_innerList.Count)
+            {
+                return -1;
+            }
+            if (m_comparer.Compare(item, m_innerList[insertIndex]) == 0)
+            {
+                int index = insertIndex;
+                while (index > 0 && m_comparer.Compare(item, m_innerList[index - 1]) == 0)
+                {
+                    index--;
+                }
+                return index;
+            }
+            return -1;
+        }
+
+        public bool Remove(T item)
+        {
+            int index = IndexOf(item);
+            if (index >= 0)
+            {
+                m_innerList.RemoveAt(index);
+                return true;
+            }
+            return false;
+        }
+
+        public void RemoveAt(int index)
+        {
+            m_innerList.RemoveAt(index);
+        }
+
+        public void CopyTo(T[] array)
+        {
+            m_innerList.CopyTo(array);
+        }
+
+        public void CopyTo(T[] array, int arrayIndex)
+        {
+            m_innerList.CopyTo(array, arrayIndex);
+        }
+
+        public void Clear()
+        {
+            m_innerList.Clear();
+        }
+
+        public T this[int index]
+        {
+            get
+            {
+                return m_innerList[index];
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return m_innerList.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return m_innerList.GetEnumerator();
+        }
+
+        public int Count
+        {
+            get
+            {
+                return m_innerList.Count;
+            }
+        }
+
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public static int FindIndexForSortedInsert(List<T> list, Comparer<T> comparer, T item)
+        {
+            if (list.Count == 0)
+            {
+                return 0;
+            }
+
+            int lowerIndex = 0;
+            int upperIndex = list.Count - 1;
+            int comparisonResult;
+            while (lowerIndex < upperIndex)
+            {
+                int middleIndex = (lowerIndex + upperIndex) / 2;
+                T middle = list[middleIndex];
+                comparisonResult = comparer.Compare(middle, item);
+                if (comparisonResult == 0)
+                {
+                    return middleIndex;
+                }
+                else if (comparisonResult > 0) // middle > item
+                {
+                    upperIndex = middleIndex - 1;
+                }
+                else // middle < item
+                {
+                    lowerIndex = middleIndex + 1;
+                }
+            }
+
+            // At this point any entry following 'middle' is greater than 'item',
+            // and any entry preceding 'middle' is lesser than 'item'.
+            // So we either put 'item' before or after 'middle'.
+            comparisonResult = comparer.Compare(list[lowerIndex], item);
+            if (comparisonResult < 0) // middle < item
+            {
+                return lowerIndex + 1;
+            }
+            else
+            {
+                return lowerIndex;
+            }
+        }
+    }
+}

Utilities/Strings/QuotedStringUtils.cs

@@ -97,17 +97,29 @@ namespace Utilities
 
         public static List<string> SplitIgnoreQuotedSeparators(string str, char separator)
         {
+            return SplitIgnoreQuotedSeparators(str, separator, StringSplitOptions.None);
+        }
+
+        public static List<string> SplitIgnoreQuotedSeparators(string str, char separator, StringSplitOptions options)
+        {
             List<string> result = new List<string>();
             int nextEntryIndex = 0;
             int separatorIndex = IndexOfUnquotedChar(str, separator);
             while (separatorIndex >= nextEntryIndex)
             {
-                result.Add(str.Substring(nextEntryIndex, separatorIndex - nextEntryIndex));
-
+                string entry = str.Substring(nextEntryIndex, separatorIndex - nextEntryIndex);
+                if (options != StringSplitOptions.RemoveEmptyEntries || entry != String.Empty)
+                {
+                    result.Add(entry);
+                }
                 nextEntryIndex = separatorIndex + 1;
                 separatorIndex = IndexOfUnquotedChar(str, separator, nextEntryIndex);
             }
-            result.Add(str.Substring(nextEntryIndex));
+            string lastEntry = str.Substring(nextEntryIndex);
+            if (options != StringSplitOptions.RemoveEmptyEntries || lastEntry != String.Empty)
+            {
+                result.Add(lastEntry);
+            }
             return result;
         }
     }

Utilities/Utilities.csproj

@@ -45,6 +45,7 @@
     <Compile Include="Generics\BlockingQueue.cs" />
     <Compile Include="Generics\KeyValuePairList.cs" />
     <Compile Include="Generics\Map.cs" />
+    <Compile Include="Generics\SortedList.cs" />
     <Compile Include="IFileSystem\FileSystem.cs" />
     <Compile Include="IFileSystem\FileSystemEntry.cs" />
     <Compile Include="IFileSystem\IFileSystem.cs" />