From b1d7a83ee26d8b8df0e98d7215745560ebb123ff Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Wed, 9 Aug 2017 21:54:19 +0200
Subject: [PATCH 01/19] Refactoring, move classes to namespaces

---
 UnitTestProject/UnitTest1.cs                  |  2 ++
 .../{ => Databases}/CollectionDb.cs           | 12 ++++-----
 osu-database-reader/{ => Databases}/OsuDb.cs  |  6 +++--
 .../{ => Databases/Parts}/BeatmapEntry.cs     |  8 +++---
 .../{ => Databases/Parts}/Player.cs           | 11 +++-----
 .../{ => Databases/Parts}/Replay.cs           | 13 ++++------
 .../{ => Databases/Parts}/Structs.cs          |  8 ++----
 .../{ => Databases}/PresenceDb.cs             | 12 ++++-----
 .../{ => Databases}/ScoresDb.cs               |  8 +++---
 .../CustomBinaryReader.cs}                    | 26 +++++++++----------
 .../osu-database-reader.csproj                | 18 ++++++-------
 11 files changed, 56 insertions(+), 68 deletions(-)
 rename osu-database-reader/{ => Databases}/CollectionDb.cs (78%)
 rename osu-database-reader/{ => Databases}/OsuDb.cs (88%)
 rename osu-database-reader/{ => Databases/Parts}/BeatmapEntry.cs (96%)
 rename osu-database-reader/{ => Databases/Parts}/Player.cs (84%)
 rename osu-database-reader/{ => Databases/Parts}/Replay.cs (85%)
 rename osu-database-reader/{ => Databases/Parts}/Structs.cs (60%)
 rename osu-database-reader/{ => Databases}/PresenceDb.cs (70%)
 rename osu-database-reader/{ => Databases}/ScoresDb.cs (84%)
 rename osu-database-reader/{CustomReader.cs => IO/CustomBinaryReader.cs} (66%)

diff --git a/UnitTestProject/UnitTest1.cs b/UnitTestProject/UnitTest1.cs
index d92b4cb..a953349 100644
--- a/UnitTestProject/UnitTest1.cs
+++ b/UnitTestProject/UnitTest1.cs
@@ -5,6 +5,8 @@
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using osu_database_reader;
+using osu_database_reader.Databases;
+using osu_database_reader.Databases.Parts;
 
 namespace UnitTestProject
 {
diff --git a/osu-database-reader/CollectionDb.cs b/osu-database-reader/Databases/CollectionDb.cs
similarity index 78%
rename from osu-database-reader/CollectionDb.cs
rename to osu-database-reader/Databases/CollectionDb.cs
index 899dd2f..53f402e 100644
--- a/osu-database-reader/CollectionDb.cs
+++ b/osu-database-reader/Databases/CollectionDb.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using osu_database_reader.Databases.Parts;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases
 {
     public class CollectionDb
     {
@@ -15,7 +13,7 @@ public class CollectionDb
 
         public static CollectionDb Read(string path) {
             var db = new CollectionDb();
-            using (CustomReader r = new CustomReader(File.OpenRead(path))) {
+            using (CustomBinaryReader r = new CustomBinaryReader(File.OpenRead(path))) {
                 db.OsuVersion = r.ReadInt32();
                 int amount = r.ReadInt32();
 
diff --git a/osu-database-reader/OsuDb.cs b/osu-database-reader/Databases/OsuDb.cs
similarity index 88%
rename from osu-database-reader/OsuDb.cs
rename to osu-database-reader/Databases/OsuDb.cs
index 3ce0779..96b5b78 100644
--- a/osu-database-reader/OsuDb.cs
+++ b/osu-database-reader/Databases/OsuDb.cs
@@ -2,8 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using osu_database_reader.Databases.Parts;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases
 {
     public class OsuDb
     {
@@ -18,7 +20,7 @@ public class OsuDb
 
         public static OsuDb Read(string path) {
             OsuDb db = new OsuDb();
-            using (CustomReader r = new CustomReader(File.OpenRead(path))) {
+            using (CustomBinaryReader r = new CustomBinaryReader(File.OpenRead(path))) {
                 db.OsuVersion = r.ReadInt32();
                 db.FolderCount = r.ReadInt32();
                 db.AccountUnlocked = r.ReadBoolean();
diff --git a/osu-database-reader/BeatmapEntry.cs b/osu-database-reader/Databases/Parts/BeatmapEntry.cs
similarity index 96%
rename from osu-database-reader/BeatmapEntry.cs
rename to osu-database-reader/Databases/Parts/BeatmapEntry.cs
index 28629ee..d8d9680 100644
--- a/osu-database-reader/BeatmapEntry.cs
+++ b/osu-database-reader/Databases/Parts/BeatmapEntry.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases.Parts
 {
     public class BeatmapEntry
     {
@@ -42,7 +42,7 @@ public class BeatmapEntry
         public int Unknown2;
         public byte ManiaScrollSpeed;
 
-        public static BeatmapEntry ReadFromReader(CustomReader r, bool readLength = true, int version = 20160729) {
+        public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength = true, int version = 20160729) {
             BeatmapEntry e = new BeatmapEntry();
 
             int length = 0;
diff --git a/osu-database-reader/Player.cs b/osu-database-reader/Databases/Parts/Player.cs
similarity index 84%
rename from osu-database-reader/Player.cs
rename to osu-database-reader/Databases/Parts/Player.cs
index 80c3960..89400e2 100644
--- a/osu-database-reader/Player.cs
+++ b/osu-database-reader/Databases/Parts/Player.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases.Parts
 {
     public class Player
     {
@@ -19,7 +16,7 @@ public class Player
         public int GlobalRank;
         public DateTime Unknown1;   //TODO: name this. Last update time?
 
-        public static Player ReadFromReader(CustomReader r) {
+        public static Player ReadFromReader(CustomBinaryReader r) {
             Player p = new Player();
 
             p.PlayerId = r.ReadInt32();
diff --git a/osu-database-reader/Replay.cs b/osu-database-reader/Databases/Parts/Replay.cs
similarity index 85%
rename from osu-database-reader/Replay.cs
rename to osu-database-reader/Databases/Parts/Replay.cs
index 00a9ada..dda7c80 100644
--- a/osu-database-reader/Replay.cs
+++ b/osu-database-reader/Databases/Parts/Replay.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases.Parts
 {
     public class Replay //used for both scores.db and .osr files
     {
@@ -24,13 +21,13 @@ namespace osu_database_reader
 
         public static Replay Read(string path) {
             Replay replay;
-            using (CustomReader r = new CustomReader(File.OpenRead(path))) {
+            using (CustomBinaryReader r = new CustomBinaryReader(File.OpenRead(path))) {
                 replay = ReadFromReader(r); //scoreid should not be needed
             }
             return replay;
         }
 
-        public static Replay ReadFromReader(CustomReader r, bool readScoreId = false) {
+        public static Replay ReadFromReader(CustomBinaryReader r, bool readScoreId = false) {
             Replay replay = new Replay {
                 GameMode = (GameMode) r.ReadByte(),
                 OsuVersion = r.ReadInt32(),
diff --git a/osu-database-reader/Structs.cs b/osu-database-reader/Databases/Parts/Structs.cs
similarity index 60%
rename from osu-database-reader/Structs.cs
rename to osu-database-reader/Databases/Parts/Structs.cs
index 709c156..e20d395 100644
--- a/osu-database-reader/Structs.cs
+++ b/osu-database-reader/Databases/Parts/Structs.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases.Parts
 {
     public struct TimingPoint
     {
diff --git a/osu-database-reader/PresenceDb.cs b/osu-database-reader/Databases/PresenceDb.cs
similarity index 70%
rename from osu-database-reader/PresenceDb.cs
rename to osu-database-reader/Databases/PresenceDb.cs
index 3a3cbc4..d2ade50 100644
--- a/osu-database-reader/PresenceDb.cs
+++ b/osu-database-reader/Databases/PresenceDb.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using osu_database_reader.Databases.Parts;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases
 {
     public class PresenceDb
     {
@@ -15,7 +13,7 @@ public class PresenceDb
 
         public static PresenceDb Read(string path) {
             var db = new PresenceDb();
-            using (CustomReader r = new CustomReader(File.OpenRead(path))) {
+            using (CustomBinaryReader r = new CustomBinaryReader(File.OpenRead(path))) {
                 db.OsuVersion = r.ReadInt32();
                 int amount = r.ReadInt32();
 
diff --git a/osu-database-reader/ScoresDb.cs b/osu-database-reader/Databases/ScoresDb.cs
similarity index 84%
rename from osu-database-reader/ScoresDb.cs
rename to osu-database-reader/Databases/ScoresDb.cs
index d1b533e..5747959 100644
--- a/osu-database-reader/ScoresDb.cs
+++ b/osu-database-reader/Databases/ScoresDb.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using osu_database_reader.Databases.Parts;
+using osu_database_reader.IO;
 
-namespace osu_database_reader
+namespace osu_database_reader.Databases
 {
     public class ScoresDb
     {
@@ -16,7 +16,7 @@ public class ScoresDb
 
         public static ScoresDb Read(string path) {
             var db = new ScoresDb();
-            using (CustomReader r = new CustomReader(File.OpenRead(path)))
+            using (CustomBinaryReader r = new CustomBinaryReader(File.OpenRead(path)))
             {
                 db.OsuVersion = r.ReadInt32();
                 int amount = r.ReadInt32();
diff --git a/osu-database-reader/CustomReader.cs b/osu-database-reader/IO/CustomBinaryReader.cs
similarity index 66%
rename from osu-database-reader/CustomReader.cs
rename to osu-database-reader/IO/CustomBinaryReader.cs
index 3e0c4e7..c69910b 100644
--- a/osu-database-reader/CustomReader.cs
+++ b/osu-database-reader/IO/CustomBinaryReader.cs
@@ -1,18 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using osu_database_reader.Databases.Parts;
 
-namespace osu_database_reader
+namespace osu_database_reader.IO
 {
-    public class CustomReader : BinaryReader
+    public class CustomBinaryReader : BinaryReader
     {
-        public CustomReader(Stream input) : base(input) {}
-        public CustomReader(Stream input, Encoding encoding) : base(input, encoding) {}
-        public CustomReader(Stream input, Encoding encoding, bool leaveOpen) : base(input, encoding, leaveOpen) {}
+        public CustomBinaryReader(Stream input) : base(input) {}
+        public CustomBinaryReader(Stream input, Encoding encoding) : base(input, encoding) {}
+        public CustomBinaryReader(Stream input, Encoding encoding, bool leaveOpen) : base(input, encoding, leaveOpen) {}
 
         public byte[] ReadBytes() {     // an overload to ReadBytes(int count)
             int length = ReadInt32();
@@ -26,23 +24,23 @@ public override string ReadString() {
             if (b == 0x0B)
                 return base.ReadString();
             else if (b == 0x00)
-                return string.Empty;
+                return null;
             else
-                throw new Exception($"Continuation byte is not 0x00 or 0x11, but is 0x{b.ToString("X2")} (position: {BaseStream.Position})");
+                throw new Exception($"Type byte is not 0x00 or 0x11, but is 0x{b:X2} (position: {BaseStream.Position})");
         }
 
         public DateTime ReadDateTime() {
-            long idk = ReadInt64();
-            return new DateTime(idk, DateTimeKind.Utc);
+            long ticks = ReadInt64();
+            return new DateTime(ticks, DateTimeKind.Utc);
         }
 
         public Dictionary<Mods, double> ReadModsDoubleDictionary() {
             int length = ReadInt32();
             Dictionary<Mods, double> dicks = new Dictionary<Mods, double>();
             for (int i = 0; i < length; i++) {
-                ReadByte(); //type (0x08)
+                ReadByte(); //type (0x08, Int32)
                 int key = ReadInt32();
-                ReadByte(); //type (0x0D)
+                ReadByte(); //type (0x0D, Double)
                 double value = ReadDouble();
                 dicks.Add((Mods)key, value);
             }
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index 2166c2f..df39508 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -40,17 +40,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BeatmapEntry.cs" />
-    <Compile Include="CollectionDb.cs" />
-    <Compile Include="CustomReader.cs" />
+    <Compile Include="Databases\Parts\BeatmapEntry.cs" />
+    <Compile Include="Databases\CollectionDb.cs" />
+    <Compile Include="IO\CustomBinaryReader.cs" />
     <Compile Include="Enums.cs" />
-    <Compile Include="OsuDb.cs" />
-    <Compile Include="Player.cs" />
-    <Compile Include="PresenceDb.cs" />
+    <Compile Include="Databases\OsuDb.cs" />
+    <Compile Include="Databases\Parts\Player.cs" />
+    <Compile Include="Databases\PresenceDb.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Replay.cs" />
-    <Compile Include="ScoresDb.cs" />
-    <Compile Include="Structs.cs" />
+    <Compile Include="Databases\Parts\Replay.cs" />
+    <Compile Include="Databases\ScoresDb.cs" />
+    <Compile Include="Databases\Parts\Structs.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From d93c859eff8e776f34c5c3978afd760a763fdb6a Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Wed, 9 Aug 2017 22:01:04 +0200
Subject: [PATCH 02/19] Rename the "Databases" namespace to "BinaryFiles"

---
 UnitTestProject/UnitTest1.cs                     |  4 ++--
 .../{Databases => BinaryFiles}/CollectionDb.cs   |  4 ++--
 .../{Databases => BinaryFiles}/OsuDb.cs          |  4 ++--
 .../Parts/BeatmapEntry.cs                        |  2 +-
 .../{Databases => BinaryFiles}/Parts/Player.cs   |  2 +-
 .../{Databases => BinaryFiles}/Parts/Replay.cs   |  2 +-
 .../{Databases => BinaryFiles}/Parts/Structs.cs  |  2 +-
 .../{Databases => BinaryFiles}/PresenceDb.cs     |  4 ++--
 .../{Databases => BinaryFiles}/ScoresDb.cs       |  4 ++--
 osu-database-reader/IO/CustomBinaryReader.cs     |  2 +-
 osu-database-reader/osu-database-reader.csproj   | 16 ++++++++--------
 11 files changed, 23 insertions(+), 23 deletions(-)
 rename osu-database-reader/{Databases => BinaryFiles}/CollectionDb.cs (92%)
 rename osu-database-reader/{Databases => BinaryFiles}/OsuDb.cs (95%)
 rename osu-database-reader/{Databases => BinaryFiles}/Parts/BeatmapEntry.cs (99%)
 rename osu-database-reader/{Databases => BinaryFiles}/Parts/Player.cs (96%)
 rename osu-database-reader/{Databases => BinaryFiles}/Parts/Replay.cs (97%)
 rename osu-database-reader/{Databases => BinaryFiles}/Parts/Structs.cs (84%)
 rename osu-database-reader/{Databases => BinaryFiles}/PresenceDb.cs (89%)
 rename osu-database-reader/{Databases => BinaryFiles}/ScoresDb.cs (93%)

diff --git a/UnitTestProject/UnitTest1.cs b/UnitTestProject/UnitTest1.cs
index a953349..a9b2edc 100644
--- a/UnitTestProject/UnitTest1.cs
+++ b/UnitTestProject/UnitTest1.cs
@@ -5,8 +5,8 @@
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using osu_database_reader;
-using osu_database_reader.Databases;
-using osu_database_reader.Databases.Parts;
+using osu_database_reader.BinaryFiles;
+using osu_database_reader.BinaryFiles.Parts;
 
 namespace UnitTestProject
 {
diff --git a/osu-database-reader/Databases/CollectionDb.cs b/osu-database-reader/BinaryFiles/CollectionDb.cs
similarity index 92%
rename from osu-database-reader/Databases/CollectionDb.cs
rename to osu-database-reader/BinaryFiles/CollectionDb.cs
index 53f402e..86083d8 100644
--- a/osu-database-reader/Databases/CollectionDb.cs
+++ b/osu-database-reader/BinaryFiles/CollectionDb.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
-using osu_database_reader.Databases.Parts;
+using osu_database_reader.BinaryFiles.Parts;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases
+namespace osu_database_reader.BinaryFiles
 {
     public class CollectionDb
     {
diff --git a/osu-database-reader/Databases/OsuDb.cs b/osu-database-reader/BinaryFiles/OsuDb.cs
similarity index 95%
rename from osu-database-reader/Databases/OsuDb.cs
rename to osu-database-reader/BinaryFiles/OsuDb.cs
index 96b5b78..bfdf897 100644
--- a/osu-database-reader/Databases/OsuDb.cs
+++ b/osu-database-reader/BinaryFiles/OsuDb.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using osu_database_reader.Databases.Parts;
+using osu_database_reader.BinaryFiles.Parts;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases
+namespace osu_database_reader.BinaryFiles
 {
     public class OsuDb
     {
diff --git a/osu-database-reader/Databases/Parts/BeatmapEntry.cs b/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
similarity index 99%
rename from osu-database-reader/Databases/Parts/BeatmapEntry.cs
rename to osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
index d8d9680..b24bac5 100644
--- a/osu-database-reader/Databases/Parts/BeatmapEntry.cs
+++ b/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases.Parts
+namespace osu_database_reader.BinaryFiles.Parts
 {
     public class BeatmapEntry
     {
diff --git a/osu-database-reader/Databases/Parts/Player.cs b/osu-database-reader/BinaryFiles/Parts/Player.cs
similarity index 96%
rename from osu-database-reader/Databases/Parts/Player.cs
rename to osu-database-reader/BinaryFiles/Parts/Player.cs
index 89400e2..784877d 100644
--- a/osu-database-reader/Databases/Parts/Player.cs
+++ b/osu-database-reader/BinaryFiles/Parts/Player.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases.Parts
+namespace osu_database_reader.BinaryFiles.Parts
 {
     public class Player
     {
diff --git a/osu-database-reader/Databases/Parts/Replay.cs b/osu-database-reader/BinaryFiles/Parts/Replay.cs
similarity index 97%
rename from osu-database-reader/Databases/Parts/Replay.cs
rename to osu-database-reader/BinaryFiles/Parts/Replay.cs
index dda7c80..bffabec 100644
--- a/osu-database-reader/Databases/Parts/Replay.cs
+++ b/osu-database-reader/BinaryFiles/Parts/Replay.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases.Parts
+namespace osu_database_reader.BinaryFiles.Parts
 {
     public class Replay //used for both scores.db and .osr files
     {
diff --git a/osu-database-reader/Databases/Parts/Structs.cs b/osu-database-reader/BinaryFiles/Parts/Structs.cs
similarity index 84%
rename from osu-database-reader/Databases/Parts/Structs.cs
rename to osu-database-reader/BinaryFiles/Parts/Structs.cs
index e20d395..9f6a5ed 100644
--- a/osu-database-reader/Databases/Parts/Structs.cs
+++ b/osu-database-reader/BinaryFiles/Parts/Structs.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace osu_database_reader.Databases.Parts
+namespace osu_database_reader.BinaryFiles.Parts
 {
     public struct TimingPoint
     {
diff --git a/osu-database-reader/Databases/PresenceDb.cs b/osu-database-reader/BinaryFiles/PresenceDb.cs
similarity index 89%
rename from osu-database-reader/Databases/PresenceDb.cs
rename to osu-database-reader/BinaryFiles/PresenceDb.cs
index d2ade50..65f2e10 100644
--- a/osu-database-reader/Databases/PresenceDb.cs
+++ b/osu-database-reader/BinaryFiles/PresenceDb.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
-using osu_database_reader.Databases.Parts;
+using osu_database_reader.BinaryFiles.Parts;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases
+namespace osu_database_reader.BinaryFiles
 {
     public class PresenceDb
     {
diff --git a/osu-database-reader/Databases/ScoresDb.cs b/osu-database-reader/BinaryFiles/ScoresDb.cs
similarity index 93%
rename from osu-database-reader/Databases/ScoresDb.cs
rename to osu-database-reader/BinaryFiles/ScoresDb.cs
index 5747959..6a6a12d 100644
--- a/osu-database-reader/Databases/ScoresDb.cs
+++ b/osu-database-reader/BinaryFiles/ScoresDb.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using osu_database_reader.Databases.Parts;
+using osu_database_reader.BinaryFiles.Parts;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.Databases
+namespace osu_database_reader.BinaryFiles
 {
     public class ScoresDb
     {
diff --git a/osu-database-reader/IO/CustomBinaryReader.cs b/osu-database-reader/IO/CustomBinaryReader.cs
index c69910b..fa2cecf 100644
--- a/osu-database-reader/IO/CustomBinaryReader.cs
+++ b/osu-database-reader/IO/CustomBinaryReader.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using osu_database_reader.Databases.Parts;
+using osu_database_reader.BinaryFiles.Parts;
 
 namespace osu_database_reader.IO
 {
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index df39508..835e053 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -40,17 +40,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Databases\Parts\BeatmapEntry.cs" />
-    <Compile Include="Databases\CollectionDb.cs" />
+    <Compile Include="BinaryFiles\Parts\BeatmapEntry.cs" />
+    <Compile Include="BinaryFiles\CollectionDb.cs" />
     <Compile Include="IO\CustomBinaryReader.cs" />
     <Compile Include="Enums.cs" />
-    <Compile Include="Databases\OsuDb.cs" />
-    <Compile Include="Databases\Parts\Player.cs" />
-    <Compile Include="Databases\PresenceDb.cs" />
+    <Compile Include="BinaryFiles\OsuDb.cs" />
+    <Compile Include="BinaryFiles\Parts\Player.cs" />
+    <Compile Include="BinaryFiles\PresenceDb.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Databases\Parts\Replay.cs" />
-    <Compile Include="Databases\ScoresDb.cs" />
-    <Compile Include="Databases\Parts\Structs.cs" />
+    <Compile Include="BinaryFiles\Parts\Replay.cs" />
+    <Compile Include="BinaryFiles\ScoresDb.cs" />
+    <Compile Include="BinaryFiles\Parts\Structs.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 8d604e7a201d33cf644b6d1f95b62c4de3af4bdd Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Wed, 9 Aug 2017 22:25:23 +0200
Subject: [PATCH 03/19] Remove unneeded code, fix code style in places, add
 resharper stuff

---
 UnitTestProject/UnitTest1.cs                  | 23 ++++++++++---------
 osu-database-reader.sln.DotSettings           |  5 ++++
 .../BinaryFiles/CollectionDb.cs               |  1 -
 osu-database-reader/BinaryFiles/OsuDb.cs      |  3 +--
 .../BinaryFiles/Parts/BeatmapEntry.cs         |  2 +-
 .../BinaryFiles/Parts/Player.cs               |  6 ++---
 osu-database-reader/BinaryFiles/PresenceDb.cs |  1 -
 osu-database-reader/BinaryFiles/ScoresDb.cs   |  6 ++---
 8 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 osu-database-reader.sln.DotSettings

diff --git a/UnitTestProject/UnitTest1.cs b/UnitTestProject/UnitTest1.cs
index a9b2edc..c893c76 100644
--- a/UnitTestProject/UnitTest1.cs
+++ b/UnitTestProject/UnitTest1.cs
@@ -36,20 +36,21 @@ public void ReadOsuDb() {
         public void ReadCollectionDb() {
             CollectionDb db = CollectionDb.Read(OsuPath + "collection.db");
             Debug.WriteLine("Version: " + db.OsuVersion);
-            Debug.WriteLine("Amount of collections: " + db.AmountOfCollections);
-            foreach (var c in db.Collections)
+            Debug.WriteLine("Amount of collections: " + db.Collections.Count);
+            foreach (var c in db.Collections) {
                 Debug.WriteLine($" - Collection {c.Name} with {c.Md5Hashes.Count} item" + (c.Md5Hashes.Count == 1 ? "" : "s"));
+            }
         }
 
         [TestMethod]
         public void ReadScoresDb() {
             ScoresDb db = ScoresDb.Read(OsuPath + "scores.db");
             Debug.WriteLine("Version: " + db.OsuVersion);
-            Debug.WriteLine("Amount of beatmaps: " + db.AmountOfBeatmaps);
-            Debug.WriteLine("Amount of scores: " + db.AmountOfScores);
+            Debug.WriteLine("Amount of beatmaps: " + db.Beatmaps.Count);
+            Debug.WriteLine("Amount of scores: " + db.Scores.Count());
 
             string[] keys = db.Beatmaps.Keys.ToArray();
-            for (int i = 0; i < Math.Min(25, db.AmountOfBeatmaps); i++) {   //print 25 at most
+            for (int i = 0; i < Math.Min(25, keys.Length); i++) {   //print 25 at most
                 string md5 = keys[i];
                 List<Replay> replays = db.Beatmaps[md5];
 
@@ -65,9 +66,9 @@ public void ReadScoresDb() {
         public void ReadPresenceDb() {
             var db = PresenceDb.Read(OsuPath + "presence.db");
             Debug.WriteLine("Version: " + db.OsuVersion);
-            Debug.WriteLine("Amount of scores: " + db.AmountOfPlayers);
+            Debug.WriteLine("Amount of scores: " + db.Players.Count);
 
-            for (int i = 0; i < Math.Min(db.AmountOfPlayers, 10); i++) {    //10 at most
+            for (int i = 0; i < Math.Min(db.Players.Count, 10); i++) {    //10 at most
                 var p = db.Players[i];
                 Debug.WriteLine($"Player {p.PlayerName} lives at long {p.Longitude} and lat {p.Latitude}. Some DateTime: {p.Unknown1}. Rank: {p.PlayerRank}. {p.GameMode}, #{p.GlobalRank}, id {p.PlayerId}");
             }
@@ -78,11 +79,11 @@ public void ReadReplay() {
             //get random path
             string path = OsuPath + "Replays\\";
             string[] files = Directory.GetFiles(path);
+            
+            if (files == null || files.Length == 0)
+                Assert.Inconclusive("No replays in your replay folder!");
 
-            Assert.IsNotNull(files);
-            Assert.AreNotEqual(files.Length, 0, "No replays in your replay folder!");
-
-            for (int i = 0; i < Math.Max(files.Length, 10); i++) {  //10 at most
+            for (int i = 0; i < Math.Min(files.Length, 10); i++) {  //10 at most
                 var r = Replay.Read(files[i]);
                 Debug.WriteLine("Version: " + r.OsuVersion);
                 Debug.WriteLine("Beatmap hash: " + r.BeatmapHash);
diff --git a/osu-database-reader.sln.DotSettings b/osu-database-reader.sln.DotSettings
new file mode 100644
index 0000000..46afbfd
--- /dev/null
+++ b/osu-database-reader.sln.DotSettings
@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AR/@EntryIndexedValue">AR</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HP/@EntryIndexedValue">HP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OD/@EntryIndexedValue">OD</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/osu-database-reader/BinaryFiles/CollectionDb.cs b/osu-database-reader/BinaryFiles/CollectionDb.cs
index 86083d8..8a59aa0 100644
--- a/osu-database-reader/BinaryFiles/CollectionDb.cs
+++ b/osu-database-reader/BinaryFiles/CollectionDb.cs
@@ -8,7 +8,6 @@ namespace osu_database_reader.BinaryFiles
     public class CollectionDb
     {
         public int OsuVersion;
-        public int AmountOfCollections => Collections.Count;
         public List<Collection> Collections = new List<Collection>();
 
         public static CollectionDb Read(string path) {
diff --git a/osu-database-reader/BinaryFiles/OsuDb.cs b/osu-database-reader/BinaryFiles/OsuDb.cs
index bfdf897..0c59789 100644
--- a/osu-database-reader/BinaryFiles/OsuDb.cs
+++ b/osu-database-reader/BinaryFiles/OsuDb.cs
@@ -33,9 +33,8 @@ public static OsuDb Read(string path) {
                     int currentIndex = (int)r.BaseStream.Position;
                     int entryLength = r.ReadInt32();
 
-                    var entry = BeatmapEntry.ReadFromReader(r, false, db.OsuVersion);
+                    db.Beatmaps.Add(BeatmapEntry.ReadFromReader(r, false, db.OsuVersion));
 
-                    db.Beatmaps.Add(entry);
                     if (r.BaseStream.Position != currentIndex + entryLength + 4) {
                         Debug.Fail($"Length doesn't match, {r.BaseStream.Position} instead of expected {currentIndex + entryLength + 4}");
                     }
diff --git a/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs b/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
index b24bac5..f0e6004 100644
--- a/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
+++ b/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
@@ -141,7 +141,7 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             //Debug.WriteLine("Mania scroll speed: " + e.ManiaScrollSpeed);
 
             int endPosition = (int) r.BaseStream.Position;
-            Debug.Assert(!readLength || length == endPosition - startPosition); //TODO: could throw error here
+            Debug.Assert(!readLength || length == endPosition - startPosition); //could throw error here
             //Debug.WriteLine("---");
 
             return e;
diff --git a/osu-database-reader/BinaryFiles/Parts/Player.cs b/osu-database-reader/BinaryFiles/Parts/Player.cs
index 784877d..4bf59b2 100644
--- a/osu-database-reader/BinaryFiles/Parts/Player.cs
+++ b/osu-database-reader/BinaryFiles/Parts/Player.cs
@@ -22,11 +22,11 @@ public static Player ReadFromReader(CustomBinaryReader r) {
             p.PlayerId = r.ReadInt32();
             p.PlayerName = r.ReadString();
             p.UtcOffset = r.ReadByte();
-            p.CountryByte = r.ReadByte();   //TODO: turn into enum?
+            p.CountryByte = r.ReadByte();   //TODO: create Country enum
 
             byte b = r.ReadByte();
-            p.PlayerRank = (PlayerRank) (b & -225);
-            p.GameMode = (GameMode)((b & 224) >> 5);
+            p.PlayerRank = (PlayerRank)(b & 0b0001_1111);
+            p.GameMode = (GameMode)((b & 0b1110_0000) >> 5);
             Debug.Assert((byte)p.GameMode <= 3, $"GameMode is byte {(byte)p.GameMode}, should be between 0 and 3");
 
             p.Longitude = r.ReadSingle();
diff --git a/osu-database-reader/BinaryFiles/PresenceDb.cs b/osu-database-reader/BinaryFiles/PresenceDb.cs
index 65f2e10..cbd915d 100644
--- a/osu-database-reader/BinaryFiles/PresenceDb.cs
+++ b/osu-database-reader/BinaryFiles/PresenceDb.cs
@@ -8,7 +8,6 @@ namespace osu_database_reader.BinaryFiles
     public class PresenceDb
     {
         public int OsuVersion;
-        public int AmountOfPlayers => Players.Count;
         public List<Player> Players = new List<Player>();
 
         public static PresenceDb Read(string path) {
diff --git a/osu-database-reader/BinaryFiles/ScoresDb.cs b/osu-database-reader/BinaryFiles/ScoresDb.cs
index 6a6a12d..2d0eda6 100644
--- a/osu-database-reader/BinaryFiles/ScoresDb.cs
+++ b/osu-database-reader/BinaryFiles/ScoresDb.cs
@@ -11,8 +11,7 @@ public class ScoresDb
     {
         public int OsuVersion;
         public Dictionary<string, List<Replay>> Beatmaps = new Dictionary<string, List<Replay>>();
-        public int AmountOfBeatmaps => Beatmaps.Count;
-        public int AmountOfScores => Beatmaps.Sum(a => a.Value.Count);
+        public IEnumerable<Replay> Scores => Beatmaps.SelectMany(a => a.Value);
 
         public static ScoresDb Read(string path) {
             var db = new ScoresDb();
@@ -27,8 +26,9 @@ public static ScoresDb Read(string path) {
                     Tuple<string, List<Replay>> tuple = new Tuple<string, List<Replay>>(md5, new List<Replay>());
 
                     int amount2 = r.ReadInt32();
-                    for (int j = 0; j < amount2; j++)
+                    for (int j = 0; j < amount2; j++) {
                         tuple.Item2.Add(Replay.ReadFromReader(r, true));
+                    }
 
                     db.Beatmaps.Add(tuple.Item1, tuple.Item2);
                 }

From 90a2f6c92a396ffe37cb22fc367196904ce782c9 Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Wed, 9 Aug 2017 23:51:10 +0200
Subject: [PATCH 04/19] Add very, very basic beatmap reading

---
 UnitTestProject/UnitTest2.cs                  | 47 ++++++++++++
 UnitTestProject/UnitTestProject.csproj        |  1 +
 osu-database-reader/Enums.cs                  | 14 ++++
 osu-database-reader/IO/CustomStreamReader.cs  | 74 +++++++++++++++++++
 osu-database-reader/TextFiles/BeatmapFile.cs  | 64 ++++++++++++++++
 .../osu-database-reader.csproj                |  3 +
 6 files changed, 203 insertions(+)
 create mode 100644 UnitTestProject/UnitTest2.cs
 create mode 100644 osu-database-reader/IO/CustomStreamReader.cs
 create mode 100644 osu-database-reader/TextFiles/BeatmapFile.cs

diff --git a/UnitTestProject/UnitTest2.cs b/UnitTestProject/UnitTest2.cs
new file mode 100644
index 0000000..aa752ed
--- /dev/null
+++ b/UnitTestProject/UnitTest2.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using osu_database_reader.TextFiles;
+
+namespace UnitTestProject
+{
+    [TestClass]
+    public class UnitTest2
+    {
+        private static readonly string OsuPath;
+
+        static UnitTest2()
+        {
+            OsuPath = $@"C:\Users\{Environment.UserName}\AppData\Local\osu!\";
+        }
+
+        [TestMethod]
+        public void ReadBeatmap()
+        {
+            //most people should have this map
+            string beatmap = OsuPath + @"Songs\41823 The Quick Brown Fox - The Big Black\The Quick Brown Fox - The Big Black (Blue Dragon) [WHO'S AFRAID OF THE BIG BLACK].osu";
+
+            if (!File.Exists(beatmap))
+                Assert.Inconclusive("Hardcoded beatmap not found at location " + beatmap);
+
+            var bm = BeatmapFile.Read(beatmap);
+            Debug.WriteLine("Beatmap version: " + bm.BeatmapVersion);
+
+            Assert.IsTrue(bm.SectionGeneral.Count >= 2);   //disco prince only has 2
+            Assert.IsTrue(bm.SectionMetadata.Count >= 4);  //disco prince only has 4
+            Assert.IsTrue(bm.SectionDifficulty.Count >= 5);//disco prince only has 5
+
+            try {
+                string[] required = {"Title", "Artist", "Creator", "Version"};
+                foreach (var item in required) {
+                    if (!bm.SectionMetadata.ContainsKey(item))
+                        Assert.Fail("Important key missing: " + item);
+                    Debug.WriteLine($"{item}: {bm.SectionMetadata[item] ?? "(null)"}"); //null is fine
+                }
+            } catch (Exception e) {
+                Assert.Fail("Exception while enumerating important fields: " + e.Message);
+            }
+        }
+    }
+}
diff --git a/UnitTestProject/UnitTestProject.csproj b/UnitTestProject/UnitTestProject.csproj
index f940f3b..ef8368b 100644
--- a/UnitTestProject/UnitTestProject.csproj
+++ b/UnitTestProject/UnitTestProject.csproj
@@ -52,6 +52,7 @@
   <ItemGroup>
     <Compile Include="UnitTest1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTest2.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-database-reader\osu-database-reader.csproj">
diff --git a/osu-database-reader/Enums.cs b/osu-database-reader/Enums.cs
index 1a1ab28..7081cdd 100644
--- a/osu-database-reader/Enums.cs
+++ b/osu-database-reader/Enums.cs
@@ -86,4 +86,18 @@ public enum Mods : int
         Key3            = 134217728,
         Key2            = 268435456
     }
+
+    public enum BeatmapSection
+    {
+        // ReSharper disable once InconsistentNaming
+        _EndOfFile,
+        General,
+        Editor,
+        Metadata,
+        Difficulty,
+        Events,
+        TimingPoints,
+        Colours,
+        HitObjects,
+    }
 }
diff --git a/osu-database-reader/IO/CustomStreamReader.cs b/osu-database-reader/IO/CustomStreamReader.cs
new file mode 100644
index 0000000..1b92844
--- /dev/null
+++ b/osu-database-reader/IO/CustomStreamReader.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace osu_database_reader.IO
+{
+    public class CustomStreamReader : StreamReader
+    {
+        //automatically generated constructors
+        public CustomStreamReader(Stream stream) : base(stream) { }
+        public CustomStreamReader(Stream stream, bool detectEncodingFromByteOrderMarks) : base(stream, detectEncodingFromByteOrderMarks) { }
+        public CustomStreamReader(Stream stream, Encoding encoding) : base(stream, encoding) { }
+        public CustomStreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks) : base(stream, encoding, detectEncodingFromByteOrderMarks) { }
+        public CustomStreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize) : base(stream, encoding, detectEncodingFromByteOrderMarks, bufferSize) { }
+        public CustomStreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize, bool leaveOpen) : base(stream, encoding, detectEncodingFromByteOrderMarks, bufferSize, leaveOpen) { }
+        public CustomStreamReader(string path) : base(path) { }
+        public CustomStreamReader(string path, bool detectEncodingFromByteOrderMarks) : base(path, detectEncodingFromByteOrderMarks) { }
+        public CustomStreamReader(string path, Encoding encoding) : base(path, encoding) { }
+        public CustomStreamReader(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks) : base(path, encoding, detectEncodingFromByteOrderMarks) { }
+        public CustomStreamReader(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize) : base(path, encoding, detectEncodingFromByteOrderMarks, bufferSize) { }
+
+        public BeatmapSection ReadUntilSectionStart()
+        {
+            while (!EndOfStream) {
+                string str = ReadLine();
+                if (string.IsNullOrWhiteSpace(str)) continue;
+
+                string stripped = str.TrimStart('[').TrimEnd(']');
+                if (Enum.TryParse<BeatmapSection>(stripped, out var a)) {
+                    return a;
+                }
+                else {  //oh shit
+                    throw new Exception("Unrecognized beatmap section: " + stripped);
+                }
+            }
+
+            //we reached an end of stream
+            return BeatmapSection._EndOfFile;
+        }
+
+        public Dictionary<string, string> ReadBasicSection(bool extraSpaceAfterColon = true, bool extraSpaceBeforeColon = false)
+        {
+            var dic = new Dictionary<string, string>();
+
+            string line;
+            while (!string.IsNullOrWhiteSpace(line = ReadLine())) {
+                if (!line.Contains(':'))
+                    throw new Exception("Invalid key/value line: " + line);
+
+                int i = line.IndexOf(':');
+
+                string key = line.Substring(0, i);
+                string value = line.Substring(i + 1);
+
+                //This is just so we can recreate files properly in the future.
+                //It is very likely not needed at all, but it makes me sleep 
+                //better at night knowing everything is 100% correct.
+                if (extraSpaceBeforeColon && key.EndsWith(" ")) key = key.Substring(0, key.Length - 1);
+                if (extraSpaceAfterColon && value.StartsWith(" ")) value = value.Substring(1);
+                
+                dic.Add(key, value);
+            }
+
+            return dic;
+        }
+
+        public void SkipSection()
+        {
+            while (!string.IsNullOrWhiteSpace(ReadLine())) { }
+        }
+    }
+}
diff --git a/osu-database-reader/TextFiles/BeatmapFile.cs b/osu-database-reader/TextFiles/BeatmapFile.cs
new file mode 100644
index 0000000..8258adf
--- /dev/null
+++ b/osu-database-reader/TextFiles/BeatmapFile.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using osu_database_reader.IO;
+
+namespace osu_database_reader.TextFiles
+{
+    public class BeatmapFile
+    {
+        public int BeatmapVersion;
+
+        public Dictionary<string, string> SectionGeneral;
+        public Dictionary<string, string> SectionEditor;
+        public Dictionary<string, string> SectionMetadata;
+        public Dictionary<string, string> SectionDifficulty;
+        public Dictionary<string, string> SectionColours;
+
+        public static BeatmapFile Read(string path)
+        {
+            var file = new BeatmapFile();
+
+            using (var r = new CustomStreamReader(path)) {
+                if (!int.TryParse(r.ReadLine()?.Replace("osu file format v", string.Empty), out file.BeatmapVersion))
+                    throw new Exception("Not a valid beatmap"); //very simple check, could be better
+
+                BeatmapSection bs;
+                while ((bs = r.ReadUntilSectionStart()) != BeatmapSection._EndOfFile) {
+                    switch (bs) {
+                        case BeatmapSection.General:
+                            file.SectionGeneral = r.ReadBasicSection();
+                            break;
+                        case BeatmapSection.Editor:
+                            file.SectionEditor = r.ReadBasicSection();
+                            break;
+                        case BeatmapSection.Metadata:
+                            file.SectionMetadata = r.ReadBasicSection(false);
+                            break;
+                        case BeatmapSection.Difficulty:
+                            file.SectionDifficulty = r.ReadBasicSection(false);
+                            break;
+                        case BeatmapSection.Events:
+                            //TODO
+                            r.SkipSection();
+                            break;
+                        case BeatmapSection.TimingPoints:
+                            //TODO
+                            r.SkipSection();
+                            break;
+                        case BeatmapSection.Colours:
+                            file.SectionColours = r.ReadBasicSection(true, true);
+                            break;
+                        case BeatmapSection.HitObjects:
+                            //TODO
+                            r.SkipSection();
+                            break;
+                        default:
+                            throw new ArgumentOutOfRangeException();
+                    }
+                }
+            }
+
+            return file;
+        }
+    }
+}
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index 835e053..d83ffea 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -47,11 +47,14 @@
     <Compile Include="BinaryFiles\OsuDb.cs" />
     <Compile Include="BinaryFiles\Parts\Player.cs" />
     <Compile Include="BinaryFiles\PresenceDb.cs" />
+    <Compile Include="IO\CustomStreamReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="BinaryFiles\Parts\Replay.cs" />
     <Compile Include="BinaryFiles\ScoresDb.cs" />
     <Compile Include="BinaryFiles\Parts\Structs.cs" />
+    <Compile Include="TextFiles\BeatmapFile.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

From 02ae5b132e8f0591d42027a28d5e80004ed9d20d Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Thu, 10 Aug 2017 15:47:53 +0200
Subject: [PATCH 05/19] Add HitObjects reading

---
 UnitTestProject/UnitTest2.cs                  | 75 ++++++++++++++++---
 osu-database-reader/IO/CustomStreamReader.cs  |  1 +
 osu-database-reader/TextFiles/BeatmapFile.cs  |  9 ++-
 .../TextFiles/HitObjects/Enums.cs             | 37 +++++++++
 .../TextFiles/HitObjects/HitObject.cs         | 75 +++++++++++++++++++
 .../TextFiles/HitObjects/HitObjectCircle.cs   | 13 ++++
 .../TextFiles/HitObjects/HitObjectSlider.cs   | 39 ++++++++++
 .../TextFiles/HitObjects/HitObjectSpinner.cs  | 14 ++++
 .../TextFiles/HitObjects/Structs.cs           | 19 +++++
 .../osu-database-reader.csproj                |  6 ++
 10 files changed, 275 insertions(+), 13 deletions(-)
 create mode 100644 osu-database-reader/TextFiles/HitObjects/Enums.cs
 create mode 100644 osu-database-reader/TextFiles/HitObjects/HitObject.cs
 create mode 100644 osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs
 create mode 100644 osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs
 create mode 100644 osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs
 create mode 100644 osu-database-reader/TextFiles/HitObjects/Structs.cs

diff --git a/UnitTestProject/UnitTest2.cs b/UnitTestProject/UnitTest2.cs
index aa752ed..8ca77d1 100644
--- a/UnitTestProject/UnitTest2.cs
+++ b/UnitTestProject/UnitTest2.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using osu_database_reader.TextFiles;
+using osu_database_reader.TextFiles.HitObjects;
 
 namespace UnitTestProject
 {
@@ -17,13 +19,14 @@ static UnitTest2()
         }
 
         [TestMethod]
-        public void ReadBeatmap()
+        public void ReadBigBlack()
         {
             //most people should have this map
             string beatmap = OsuPath + @"Songs\41823 The Quick Brown Fox - The Big Black\The Quick Brown Fox - The Big Black (Blue Dragon) [WHO'S AFRAID OF THE BIG BLACK].osu";
 
             if (!File.Exists(beatmap))
                 Assert.Inconclusive("Hardcoded beatmap not found at location " + beatmap);
+            //TODO: check file to not be modified. if it is: inconclusive
 
             var bm = BeatmapFile.Read(beatmap);
             Debug.WriteLine("Beatmap version: " + bm.BeatmapVersion);
@@ -32,16 +35,66 @@ public void ReadBeatmap()
             Assert.IsTrue(bm.SectionMetadata.Count >= 4);  //disco prince only has 4
             Assert.IsTrue(bm.SectionDifficulty.Count >= 5);//disco prince only has 5
 
-            try {
-                string[] required = {"Title", "Artist", "Creator", "Version"};
-                foreach (var item in required) {
-                    if (!bm.SectionMetadata.ContainsKey(item))
-                        Assert.Fail("Important key missing: " + item);
-                    Debug.WriteLine($"{item}: {bm.SectionMetadata[item] ?? "(null)"}"); //null is fine
-                }
-            } catch (Exception e) {
-                Assert.Fail("Exception while enumerating important fields: " + e.Message);
-            }
+            //check General
+            Assert.AreEqual(bm.SectionGeneral["AudioFilename"], "02 The Big Black.mp3");
+            Assert.AreEqual(bm.SectionGeneral["AudioLeadIn"], "0");
+            Assert.AreEqual(bm.SectionGeneral["PreviewTime"], "18957");
+            
+            //check MetaData
+            Assert.AreEqual(bm.SectionMetadata["Title"], "The Big Black");
+            Assert.AreEqual(bm.SectionMetadata["Artist"], "The Quick Brown Fox");
+            Assert.AreEqual(bm.SectionMetadata["Creator"], "Blue Dragon");
+            Assert.AreEqual(bm.SectionMetadata["Version"], "WHO'S AFRAID OF THE BIG BLACK");
+            Assert.AreEqual(bm.SectionMetadata["Source"], string.Empty);
+            Assert.AreEqual(bm.SectionMetadata["Tags"], "Onosakihito speedcore renard lapfox");
+
+            //check Difficulty
+            Assert.AreEqual(bm.SectionDifficulty["HPDrainRate"], "5");
+            Assert.AreEqual(bm.SectionDifficulty["CircleSize"], "4");
+            Assert.AreEqual(bm.SectionDifficulty["OverallDifficulty"], "7");
+            Assert.AreEqual(bm.SectionDifficulty["SliderMultiplier"], "1.8");
+
+            //check Events
+            //TODO
+
+            //check TimingPoints
+            //TODO
+
+            //check Colours
+            //TODO
+
+            //check HitObjects
+            Assert.AreEqual(bm.HitObjects.Count, 746);
+            Assert.AreEqual(bm.HitObjects.Count(a => a is HitObjectCircle), 410);
+            Assert.AreEqual(bm.HitObjects.Count(a => a is HitObjectSlider), 334);
+            Assert.AreEqual(bm.HitObjects.Count(a => a is HitObjectSpinner), 2);
+
+            //56,56,6966,1,4
+            HitObjectCircle firstCircle = (HitObjectCircle) bm.HitObjects.First(a => a.Type.HasFlag(HitObjectType.Normal));
+            Assert.AreEqual(firstCircle.X, 56);
+            Assert.AreEqual(firstCircle.Y, 56);
+            Assert.AreEqual(firstCircle.Time, 6966);
+            Assert.AreEqual(firstCircle.HitSound, HitSound.Finish);
+
+            //178,50,7299,2,0,B|210:0|300:0|332:50,1,180,2|0
+            HitObjectSlider firstSlider = (HitObjectSlider)bm.HitObjects.First(a => a.Type.HasFlag(HitObjectType.Slider));
+            Assert.AreEqual(firstSlider.X, 178);
+            Assert.AreEqual(firstSlider.Y, 50);
+            Assert.AreEqual(firstSlider.Time, 7299);
+            Assert.AreEqual(firstSlider.HitSound, HitSound.None);
+            Assert.AreEqual(firstSlider.CurveType, CurveType.Bezier);
+            Assert.AreEqual(firstSlider.Points.Count, 3);
+            Assert.AreEqual(firstSlider.RepeatCount, 1);
+            Assert.AreEqual(firstSlider.Length, 180);
+
+            //256,192,60254,12,4,61587
+            HitObjectSpinner firstSpinner = (HitObjectSpinner)bm.HitObjects.First(a => a.Type.HasFlag(HitObjectType.Spinner));
+            Assert.AreEqual(firstSpinner.X, 256);
+            Assert.AreEqual(firstSpinner.Y, 192);
+            Assert.AreEqual(firstSpinner.Time, 60254);
+            Assert.AreEqual(firstSpinner.HitSound, HitSound.Finish);
+            Assert.AreEqual(firstSpinner.EndTime, 61587);
+            Assert.IsTrue(firstSpinner.IsNewCombo);
         }
     }
 }
diff --git a/osu-database-reader/IO/CustomStreamReader.cs b/osu-database-reader/IO/CustomStreamReader.cs
index 1b92844..4324c97 100644
--- a/osu-database-reader/IO/CustomStreamReader.cs
+++ b/osu-database-reader/IO/CustomStreamReader.cs
@@ -66,6 +66,7 @@ public Dictionary<string, string> ReadBasicSection(bool extraSpaceAfterColon = t
             return dic;
         }
 
+        [Obsolete("This method should never be used; all sections must be parsed.")]
         public void SkipSection()
         {
             while (!string.IsNullOrWhiteSpace(ReadLine())) { }
diff --git a/osu-database-reader/TextFiles/BeatmapFile.cs b/osu-database-reader/TextFiles/BeatmapFile.cs
index 8258adf..8ab63f4 100644
--- a/osu-database-reader/TextFiles/BeatmapFile.cs
+++ b/osu-database-reader/TextFiles/BeatmapFile.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using osu_database_reader.IO;
+using osu_database_reader.TextFiles.HitObjects;
 
 namespace osu_database_reader.TextFiles
 {
@@ -14,6 +15,8 @@ public class BeatmapFile
         public Dictionary<string, string> SectionDifficulty;
         public Dictionary<string, string> SectionColours;
 
+        public List<HitObject> HitObjects = new List<HitObject>();
+
         public static BeatmapFile Read(string path)
         {
             var file = new BeatmapFile();
@@ -49,8 +52,10 @@ public static BeatmapFile Read(string path)
                             file.SectionColours = r.ReadBasicSection(true, true);
                             break;
                         case BeatmapSection.HitObjects:
-                            //TODO
-                            r.SkipSection();
+                            string line;
+                            while (!string.IsNullOrEmpty(line = r.ReadLine())) {
+                                file.HitObjects.Add(HitObject.FromString(line));
+                            }
                             break;
                         default:
                             throw new ArgumentOutOfRangeException();
diff --git a/osu-database-reader/TextFiles/HitObjects/Enums.cs b/osu-database-reader/TextFiles/HitObjects/Enums.cs
new file mode 100644
index 0000000..e28a2fc
--- /dev/null
+++ b/osu-database-reader/TextFiles/HitObjects/Enums.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader.TextFiles.HitObjects
+{
+    [Flags]
+    public enum HitObjectType
+    {
+        Normal         = 0b0000_0001,   //I should really become consistent with these baseX styles
+        Slider         = 0b0000_0010,
+        NewCombo       = 0b0000_0100,
+        Spinner        = 0b0000_1000,
+        ColourHax      = 0b0111_0000,
+        Hold           = 0b1000_0000,
+    };
+
+    [Flags]
+    public enum HitSound
+    {
+        None    = 0,
+        Normal  = 1,
+        Whistle = 2,
+        Finish  = 4,
+        Clap    = 8,
+    }
+
+    public enum CurveType
+    {
+        Linear,
+        Catmull,
+        Bezier,
+        Perfect
+    }
+}
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObject.cs b/osu-database-reader/TextFiles/HitObjects/HitObject.cs
new file mode 100644
index 0000000..3c0c807
--- /dev/null
+++ b/osu-database-reader/TextFiles/HitObjects/HitObject.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using osu_database_reader.IO;
+
+namespace osu_database_reader.TextFiles.HitObjects
+{
+    public abstract class HitObject
+    {
+        //nfi so parsing works on all cultures
+        private static readonly NumberFormatInfo NumberFormat = new CultureInfo(@"en-US", false).NumberFormat;
+
+        public int X, Y;  //based on a 512x384 field
+        public int Time;
+        public HitObjectType Type;
+        public HitSound HitSound;
+
+        public bool IsNewCombo => Type.HasFlag(HitObjectType.NewCombo);
+
+        //automatically returns the correct type
+        public static HitObject FromString(string s)
+        {
+            string[] split = s.Split(',');
+            HitObjectType t = (HitObjectType) int.Parse(split[3]);
+
+            HitObject h = null;
+            switch (t & (HitObjectType)0b1000_1011) {
+                case HitObjectType.Normal:
+                    h = new HitObjectCircle();
+                    if (split.Length > 5)
+                        (h as HitObjectCircle).SoundSampleData = split[5];
+                    break;
+                case HitObjectType.Slider:
+                    h = new HitObjectSlider();
+                    (h as HitObjectSlider).ParseSliderSegments(split[5]);
+                    (h as HitObjectSlider).RepeatCount = int.Parse(split[6]);
+                    if (split.Length > 7)
+                        (h as HitObjectSlider).Length = double.Parse(split[7], NumberFormat);
+                    //if (split.Length > 8)
+                    //    (h as HitObjectSlider).HitSoundData = split[8];
+                    //if (split.Length > 9)
+                    //    (h as HitObjectSlider).SoundSampleData = split[9];
+                    //if (split.Length > 10)
+                    //    (h as HitObjectSlider).MoreSoundSampleData = split[10];
+                    break;
+                case HitObjectType.Spinner:
+                    h = new HitObjectSpinner();
+                    (h as HitObjectSpinner).EndTime = int.Parse(split[5]);
+                    if (split.Length > 6)
+                        (h as HitObjectSpinner).SoundSampleData = split[6];
+                    break;
+                case HitObjectType.Hold:
+                    throw new NotImplementedException("Hold notes are not yet parsed.");
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(t), "Bad hitobject type");
+            }
+
+            //note: parsed as decimal but cast to int in osu!
+            if (h != null) {
+                h.X = int.Parse(split[0], NumberFormat);
+                h.Y = int.Parse(split[1], NumberFormat);
+                h.Time = int.Parse(split[2], NumberFormat);
+                h.Type = t;
+                h.HitSound = (HitSound)int.Parse(split[4]);
+            }
+            else Debug.Fail("unhandled hitobject type");
+
+            return h;
+        }
+    }
+}
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs b/osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs
new file mode 100644
index 0000000..1adc5f8
--- /dev/null
+++ b/osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader.TextFiles.HitObjects
+{
+    public class HitObjectCircle : HitObject
+    {
+        public string SoundSampleData;  //TODO: parse all sound sample data
+    }
+}
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs b/osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs
new file mode 100644
index 0000000..f0145b6
--- /dev/null
+++ b/osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader.TextFiles.HitObjects
+{
+    public class HitObjectSlider : HitObject
+    {
+        public CurveType CurveType;
+        public List<Vector2> Points = new List<Vector2>();  //does not include initial point!
+        public int RepeatCount;
+        public double Length; //seems to be length in o!p, so it doesn't have to be calculated?
+
+        public void ParseSliderSegments(string sliderString)
+        {
+            string[] split = sliderString.Split('|');
+            foreach (var s in split) {
+                if (s.Length == 1) {   //curve type
+                    switch (s[0]) {
+                        case 'L': CurveType = CurveType.Linear;  break;
+                        case 'C': CurveType = CurveType.Catmull; break;
+                        case 'P': CurveType = CurveType.Perfect; break;
+                        case 'B': CurveType = CurveType.Bezier;  break;
+                    }
+                    continue;
+                }
+                string[] split2 = s.Split(':');
+                Debug.Assert(split2.Length == 2);
+
+                Points.Add(new Vector2(
+                    int.Parse(split2[0]), 
+                    int.Parse(split2[1])));
+            }
+        }
+    }
+}
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs b/osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs
new file mode 100644
index 0000000..29540b4
--- /dev/null
+++ b/osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader.TextFiles.HitObjects
+{
+    public class HitObjectSpinner : HitObject
+    {
+        public int EndTime;
+        public string SoundSampleData;
+    }
+}
diff --git a/osu-database-reader/TextFiles/HitObjects/Structs.cs b/osu-database-reader/TextFiles/HitObjects/Structs.cs
new file mode 100644
index 0000000..033f6d4
--- /dev/null
+++ b/osu-database-reader/TextFiles/HitObjects/Structs.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader.TextFiles.HitObjects
+{
+    public struct Vector2
+    {
+        public int X, Y;
+
+        public Vector2(int x, int y)
+        {
+            X = x;
+            Y = y;
+        }
+    }
+}
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index d83ffea..c87cb48 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -53,6 +53,12 @@
     <Compile Include="BinaryFiles\ScoresDb.cs" />
     <Compile Include="BinaryFiles\Parts\Structs.cs" />
     <Compile Include="TextFiles\BeatmapFile.cs" />
+    <Compile Include="TextFiles\HitObjects\Enums.cs" />
+    <Compile Include="TextFiles\HitObjects\HitObject.cs" />
+    <Compile Include="TextFiles\HitObjects\HitObjectCircle.cs" />
+    <Compile Include="TextFiles\HitObjects\HitObjectSlider.cs" />
+    <Compile Include="TextFiles\HitObjects\HitObjectSpinner.cs" />
+    <Compile Include="TextFiles\HitObjects\Structs.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

From e5cb48a9fb88841d516df894c6430baa80293a30 Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Thu, 10 Aug 2017 16:02:40 +0200
Subject: [PATCH 06/19] Make CustomStreamReader pseudo-handle hitobject parsing

---
 osu-database-reader/IO/CustomStreamReader.cs | 9 +++++++++
 osu-database-reader/TextFiles/BeatmapFile.cs | 5 +----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu-database-reader/IO/CustomStreamReader.cs b/osu-database-reader/IO/CustomStreamReader.cs
index 4324c97..39704d7 100644
--- a/osu-database-reader/IO/CustomStreamReader.cs
+++ b/osu-database-reader/IO/CustomStreamReader.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using osu_database_reader.TextFiles.HitObjects;
 
 namespace osu_database_reader.IO
 {
@@ -66,6 +67,14 @@ public Dictionary<string, string> ReadBasicSection(bool extraSpaceAfterColon = t
             return dic;
         }
 
+        public IEnumerable<HitObject> ReadHitObjects()
+        {
+            string line;
+            while (!string.IsNullOrEmpty(line = ReadLine())) {
+                yield return HitObject.FromString(line);
+            }
+        }
+
         [Obsolete("This method should never be used; all sections must be parsed.")]
         public void SkipSection()
         {
diff --git a/osu-database-reader/TextFiles/BeatmapFile.cs b/osu-database-reader/TextFiles/BeatmapFile.cs
index 8ab63f4..1c1579b 100644
--- a/osu-database-reader/TextFiles/BeatmapFile.cs
+++ b/osu-database-reader/TextFiles/BeatmapFile.cs
@@ -52,10 +52,7 @@ public static BeatmapFile Read(string path)
                             file.SectionColours = r.ReadBasicSection(true, true);
                             break;
                         case BeatmapSection.HitObjects:
-                            string line;
-                            while (!string.IsNullOrEmpty(line = r.ReadLine())) {
-                                file.HitObjects.Add(HitObject.FromString(line));
-                            }
+                            file.HitObjects.AddRange(r.ReadHitObjects());
                             break;
                         default:
                             throw new ArgumentOutOfRangeException();

From 36c58f8db45fa5cb03b3262fddc29aedf7c9be27 Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Thu, 10 Aug 2017 17:34:17 +0200
Subject: [PATCH 07/19] Fuck stortboards, tbh

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4e5b829..feedf81 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ Allows for parsing/reading osu!'s database files
 
 In the future, this will read more file formats, and likely write them too.
 
+NOTE: No parsing for storyboards, use [osuElements](https://github.com/JasperDeSutter/osuElements) for that.
+
 ### Currently finished:
 * reading osu!.db
 * reading collection.db

From 5edacaec007c01d22b62d8ed55dff6b993a8cb96 Mon Sep 17 00:00:00 2001
From: HoLLy <dario.db@hotmail.com>
Date: Thu, 10 Aug 2017 18:56:49 +0200
Subject: [PATCH 08/19] Add TimingPoints parsing, minor changes

---
 UnitTestProject/UnitTest2.cs                  |  6 ++-
 .../BinaryFiles/Parts/Structs.cs              | 48 ++++++++++++++++++-
 osu-database-reader/Constants.cs              | 15 ++++++
 osu-database-reader/IO/CustomBinaryReader.cs  | 11 +----
 osu-database-reader/IO/CustomStreamReader.cs  |  9 ++++
 osu-database-reader/TextFiles/BeatmapFile.cs  |  5 +-
 .../TextFiles/HitObjects/HitObject.cs         | 15 +++---
 .../osu-database-reader.csproj                |  1 +
 8 files changed, 87 insertions(+), 23 deletions(-)
 create mode 100644 osu-database-reader/Constants.cs

diff --git a/UnitTestProject/UnitTest2.cs b/UnitTestProject/UnitTest2.cs
index 8ca77d1..8c84ce5 100644
--- a/UnitTestProject/UnitTest2.cs
+++ b/UnitTestProject/UnitTest2.cs
@@ -58,7 +58,11 @@ public void ReadBigBlack()
             //TODO
 
             //check TimingPoints
-            //TODO
+            Assert.AreEqual(bm.TimingPoints.Count, 5);
+            Assert.AreEqual(bm.TimingPoints[0].Time, 6966);
+            Assert.AreEqual(bm.TimingPoints[1].Kiai, true);
+            Assert.AreEqual(bm.TimingPoints[2].MsPerQuarter, -100); //means no timing change
+            Assert.AreEqual(bm.TimingPoints[3].TimingChange, false);
 
             //check Colours
             //TODO
diff --git a/osu-database-reader/BinaryFiles/Parts/Structs.cs b/osu-database-reader/BinaryFiles/Parts/Structs.cs
index 9f6a5ed..b8bab52 100644
--- a/osu-database-reader/BinaryFiles/Parts/Structs.cs
+++ b/osu-database-reader/BinaryFiles/Parts/Structs.cs
@@ -1,11 +1,55 @@
 using System.Collections.Generic;
+using System.IO;
 
 namespace osu_database_reader.BinaryFiles.Parts
 {
-    public struct TimingPoint
+    public class TimingPoint
     {
         public double Time, MsPerQuarter;
-        public bool NotInherited;
+        public bool TimingChange;
+
+        //only in .osu files
+        public int? TimingSignature; // x/4 (eg. 4/4, 3/4)
+        public int? SampleSet;
+        public int? CustomSampleSet;
+        public int? SampleVolume;
+        public bool? Kiai;
+
+        public static TimingPoint FromString(string line)
+        {
+            TimingPoint t = new TimingPoint();
+
+            string[] splitted = line.Split(',');
+
+            t.Time = double.Parse(splitted[0], Constants.NumberFormat);
+            t.MsPerQuarter = double.Parse(splitted[1], Constants.NumberFormat);
+
+            int temp;
+
+            //lots of checks that are probably not needed. idc you're not my real dad.
+            if (splitted.Length > 2) t.TimingSignature = (temp = int.Parse(splitted[2])) == 0 ? 4 : temp;
+            if (splitted.Length > 3) t.SampleSet = int.Parse(splitted[3]);
+            if (splitted.Length > 4) t.CustomSampleSet = int.Parse(splitted[4]);
+            if (splitted.Length > 5) t.SampleVolume = int.Parse(splitted[5]);
+            if (splitted.Length > 6) t.TimingChange = int.Parse(splitted[6]) == 1;
+            if (splitted.Length > 7) {
+                temp = int.Parse(splitted[7]);
+                t.Kiai = (temp & 1) != 0;
+            }
+
+            return t;
+        }
+
+        public static TimingPoint ReadFromReader(BinaryReader r)
+        {
+            TimingPoint t = new TimingPoint
+            {
+                MsPerQuarter = r.ReadDouble(),
+                Time = r.ReadDouble(),
+                TimingChange = r.ReadByte() != 0
+            };
+            return t;
+        }
     }
 
     public struct Collection
diff --git a/osu-database-reader/Constants.cs b/osu-database-reader/Constants.cs
new file mode 100644
index 0000000..f3b9eea
--- /dev/null
+++ b/osu-database-reader/Constants.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader
+{
+    internal class Constants
+    {
+        //nfi so parsing works on all cultures
+        public static readonly NumberFormatInfo NumberFormat = new CultureInfo(@"en-US", false).NumberFormat;
+    }
+}
diff --git a/osu-database-reader/IO/CustomBinaryReader.cs b/osu-database-reader/IO/CustomBinaryReader.cs
index fa2cecf..abd88fb 100644
--- a/osu-database-reader/IO/CustomBinaryReader.cs
+++ b/osu-database-reader/IO/CustomBinaryReader.cs
@@ -50,17 +50,10 @@ public Dictionary<Mods, double> ReadModsDoubleDictionary() {
         public List<TimingPoint> ReadTimingPointList() {
             List<TimingPoint> list = new List<TimingPoint>();
             int length = ReadInt32();
-            for (int i = 0; i < length; i++) list.Add(ReadTimingPoint());
+            for (int i = 0; i < length; i++) list.Add(TimingPoint.ReadFromReader(this));
             return list;
         }
 
-        private TimingPoint ReadTimingPoint() {
-            TimingPoint t = new TimingPoint {
-                MsPerQuarter = ReadDouble(),
-                Time = ReadDouble(),
-                NotInherited = ReadByte() != 0
-            };
-            return t;
-        }
+        
     }
 }
diff --git a/osu-database-reader/IO/CustomStreamReader.cs b/osu-database-reader/IO/CustomStreamReader.cs
index 39704d7..5c34272 100644
--- a/osu-database-reader/IO/CustomStreamReader.cs
+++ b/osu-database-reader/IO/CustomStreamReader.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using osu_database_reader.BinaryFiles.Parts;
 using osu_database_reader.TextFiles.HitObjects;
 
 namespace osu_database_reader.IO
@@ -75,6 +76,14 @@ public IEnumerable<HitObject> ReadHitObjects()
             }
         }
 
+        public IEnumerable<TimingPoint> ReadTimingPoints()
+        {
+            string line;
+            while (!string.IsNullOrEmpty(line = ReadLine())) {
+                yield return TimingPoint.FromString(line);
+            }
+        }
+
         [Obsolete("This method should never be used; all sections must be parsed.")]
         public void SkipSection()
         {
diff --git a/osu-database-reader/TextFiles/BeatmapFile.cs b/osu-database-reader/TextFiles/BeatmapFile.cs
index 1c1579b..945d199 100644
--- a/osu-database-reader/TextFiles/BeatmapFile.cs
+++ b/osu-database-reader/TextFiles/BeatmapFile.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using osu_database_reader.BinaryFiles.Parts;
 using osu_database_reader.IO;
 using osu_database_reader.TextFiles.HitObjects;
 
@@ -15,6 +16,7 @@ public class BeatmapFile
         public Dictionary<string, string> SectionDifficulty;
         public Dictionary<string, string> SectionColours;
 
+        public List<TimingPoint> TimingPoints = new List<TimingPoint>();
         public List<HitObject> HitObjects = new List<HitObject>();
 
         public static BeatmapFile Read(string path)
@@ -45,8 +47,7 @@ public static BeatmapFile Read(string path)
                             r.SkipSection();
                             break;
                         case BeatmapSection.TimingPoints:
-                            //TODO
-                            r.SkipSection();
+                            file.TimingPoints.AddRange(r.ReadTimingPoints());
                             break;
                         case BeatmapSection.Colours:
                             file.SectionColours = r.ReadBasicSection(true, true);
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObject.cs b/osu-database-reader/TextFiles/HitObjects/HitObject.cs
index 3c0c807..75d5bd8 100644
--- a/osu-database-reader/TextFiles/HitObjects/HitObject.cs
+++ b/osu-database-reader/TextFiles/HitObjects/HitObject.cs
@@ -11,9 +11,6 @@ namespace osu_database_reader.TextFiles.HitObjects
 {
     public abstract class HitObject
     {
-        //nfi so parsing works on all cultures
-        private static readonly NumberFormatInfo NumberFormat = new CultureInfo(@"en-US", false).NumberFormat;
-
         public int X, Y;  //based on a 512x384 field
         public int Time;
         public HitObjectType Type;
@@ -25,7 +22,7 @@ public abstract class HitObject
         public static HitObject FromString(string s)
         {
             string[] split = s.Split(',');
-            HitObjectType t = (HitObjectType) int.Parse(split[3]);
+            HitObjectType t = (HitObjectType) int.Parse(split[3], Constants.NumberFormat);
 
             HitObject h = null;
             switch (t & (HitObjectType)0b1000_1011) {
@@ -37,9 +34,9 @@ public static HitObject FromString(string s)
                 case HitObjectType.Slider:
                     h = new HitObjectSlider();
                     (h as HitObjectSlider).ParseSliderSegments(split[5]);
-                    (h as HitObjectSlider).RepeatCount = int.Parse(split[6]);
+                    (h as HitObjectSlider).RepeatCount = int.Parse(split[6], Constants.NumberFormat);
                     if (split.Length > 7)
-                        (h as HitObjectSlider).Length = double.Parse(split[7], NumberFormat);
+                        (h as HitObjectSlider).Length = double.Parse(split[7], Constants.NumberFormat);
                     //if (split.Length > 8)
                     //    (h as HitObjectSlider).HitSoundData = split[8];
                     //if (split.Length > 9)
@@ -61,9 +58,9 @@ public static HitObject FromString(string s)
 
             //note: parsed as decimal but cast to int in osu!
             if (h != null) {
-                h.X = int.Parse(split[0], NumberFormat);
-                h.Y = int.Parse(split[1], NumberFormat);
-                h.Time = int.Parse(split[2], NumberFormat);
+                h.X = int.Parse(split[0], Constants.NumberFormat);
+                h.Y = int.Parse(split[1], Constants.NumberFormat);
+                h.Time = int.Parse(split[2], Constants.NumberFormat);
                 h.Type = t;
                 h.HitSound = (HitSound)int.Parse(split[4]);
             }
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index c87cb48..23faf3d 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -42,6 +42,7 @@
   <ItemGroup>
     <Compile Include="BinaryFiles\Parts\BeatmapEntry.cs" />
     <Compile Include="BinaryFiles\CollectionDb.cs" />
+    <Compile Include="Constants.cs" />
     <Compile Include="IO\CustomBinaryReader.cs" />
     <Compile Include="Enums.cs" />
     <Compile Include="BinaryFiles\OsuDb.cs" />

From c0c0ef74bb2297d074d8516d2d281c3b2ad039fa Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 19:40:37 +0200
Subject: [PATCH 09/19] Hopefully final refactor for now

---
 UnitTestProject/UnitTest1.cs                  |  2 +-
 UnitTestProject/UnitTest2.cs                  |  3 ++-
 .../BinaryFiles/CollectionDb.cs               |  2 +-
 osu-database-reader/BinaryFiles/OsuDb.cs      |  2 +-
 osu-database-reader/BinaryFiles/PresenceDb.cs |  6 ++---
 osu-database-reader/BinaryFiles/ScoresDb.cs   |  2 +-
 .../Beatmaps}/BeatmapEntry.cs                 |  2 +-
 .../Components/Beatmaps/Collection.cs         | 10 ++++++++
 .../Beatmaps/TimingPoint.cs}                  | 14 ++++-------
 .../HitObjects/HitObject.cs                   |  8 +------
 .../Components/HitObjects/HitObjectCircle.cs  |  7 ++++++
 .../HitObjects/HitObjectSlider.cs             |  8 ++-----
 .../Components/HitObjects/HitObjectSpinner.cs |  8 +++++++
 .../Player/PlayerPresence.cs}                 |  8 +++----
 .../Parts => Components/Player}/Replay.cs     | 12 +++++-----
 osu-database-reader/Components/Vector2.cs     | 13 +++++++++++
 osu-database-reader/Constants.cs              |  2 +-
 .../HitObjects/Enums.cs => Enums_Beatmaps.cs} |  6 +----
 .../{Enums.cs => Enums_General.cs}            |  1 -
 osu-database-reader/IO/CustomBinaryReader.cs  |  2 +-
 osu-database-reader/IO/CustomStreamReader.cs  |  4 ++--
 osu-database-reader/TextFiles/BeatmapFile.cs  |  4 ++--
 .../TextFiles/HitObjects/HitObjectCircle.cs   | 13 -----------
 .../TextFiles/HitObjects/HitObjectSpinner.cs  | 14 -----------
 .../TextFiles/HitObjects/Structs.cs           | 19 ---------------
 .../osu-database-reader.csproj                | 23 ++++++++++---------
 26 files changed, 84 insertions(+), 111 deletions(-)
 rename osu-database-reader/{BinaryFiles/Parts => Components/Beatmaps}/BeatmapEntry.cs (99%)
 create mode 100644 osu-database-reader/Components/Beatmaps/Collection.cs
 rename osu-database-reader/{BinaryFiles/Parts/Structs.cs => Components/Beatmaps/TimingPoint.cs} (86%)
 rename osu-database-reader/{TextFiles => Components}/HitObjects/HitObject.cs (92%)
 create mode 100644 osu-database-reader/Components/HitObjects/HitObjectCircle.cs
 rename osu-database-reader/{TextFiles => Components}/HitObjects/HitObjectSlider.cs (87%)
 create mode 100644 osu-database-reader/Components/HitObjects/HitObjectSpinner.cs
 rename osu-database-reader/{BinaryFiles/Parts/Player.cs => Components/Player/PlayerPresence.cs} (84%)
 rename osu-database-reader/{BinaryFiles/Parts => Components/Player}/Replay.cs (83%)
 create mode 100644 osu-database-reader/Components/Vector2.cs
 rename osu-database-reader/{TextFiles/HitObjects/Enums.cs => Enums_Beatmaps.cs} (80%)
 rename osu-database-reader/{Enums.cs => Enums_General.cs} (98%)
 delete mode 100644 osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs
 delete mode 100644 osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs
 delete mode 100644 osu-database-reader/TextFiles/HitObjects/Structs.cs

diff --git a/UnitTestProject/UnitTest1.cs b/UnitTestProject/UnitTest1.cs
index c893c76..ca8fb41 100644
--- a/UnitTestProject/UnitTest1.cs
+++ b/UnitTestProject/UnitTest1.cs
@@ -6,7 +6,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using osu_database_reader;
 using osu_database_reader.BinaryFiles;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Player;
 
 namespace UnitTestProject
 {
diff --git a/UnitTestProject/UnitTest2.cs b/UnitTestProject/UnitTest2.cs
index 8c84ce5..c816c7c 100644
--- a/UnitTestProject/UnitTest2.cs
+++ b/UnitTestProject/UnitTest2.cs
@@ -3,8 +3,9 @@
 using System.IO;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using osu_database_reader;
+using osu_database_reader.Components.HitObjects;
 using osu_database_reader.TextFiles;
-using osu_database_reader.TextFiles.HitObjects;
 
 namespace UnitTestProject
 {
diff --git a/osu-database-reader/BinaryFiles/CollectionDb.cs b/osu-database-reader/BinaryFiles/CollectionDb.cs
index 8a59aa0..8219002 100644
--- a/osu-database-reader/BinaryFiles/CollectionDb.cs
+++ b/osu-database-reader/BinaryFiles/CollectionDb.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Beatmaps;
 using osu_database_reader.IO;
 
 namespace osu_database_reader.BinaryFiles
diff --git a/osu-database-reader/BinaryFiles/OsuDb.cs b/osu-database-reader/BinaryFiles/OsuDb.cs
index 0c59789..b967e2d 100644
--- a/osu-database-reader/BinaryFiles/OsuDb.cs
+++ b/osu-database-reader/BinaryFiles/OsuDb.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Beatmaps;
 using osu_database_reader.IO;
 
 namespace osu_database_reader.BinaryFiles
diff --git a/osu-database-reader/BinaryFiles/PresenceDb.cs b/osu-database-reader/BinaryFiles/PresenceDb.cs
index cbd915d..3402d1c 100644
--- a/osu-database-reader/BinaryFiles/PresenceDb.cs
+++ b/osu-database-reader/BinaryFiles/PresenceDb.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Player;
 using osu_database_reader.IO;
 
 namespace osu_database_reader.BinaryFiles
@@ -8,7 +8,7 @@ namespace osu_database_reader.BinaryFiles
     public class PresenceDb
     {
         public int OsuVersion;
-        public List<Player> Players = new List<Player>();
+        public List<PlayerPresence> Players = new List<PlayerPresence>();
 
         public static PresenceDb Read(string path) {
             var db = new PresenceDb();
@@ -17,7 +17,7 @@ public static PresenceDb Read(string path) {
                 int amount = r.ReadInt32();
 
                 for (int i = 0; i < amount; i++) {
-                    db.Players.Add(Player.ReadFromReader(r));
+                    db.Players.Add(PlayerPresence.ReadFromReader(r));
                 }
             }
 
diff --git a/osu-database-reader/BinaryFiles/ScoresDb.cs b/osu-database-reader/BinaryFiles/ScoresDb.cs
index 2d0eda6..70929bb 100644
--- a/osu-database-reader/BinaryFiles/ScoresDb.cs
+++ b/osu-database-reader/BinaryFiles/ScoresDb.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Player;
 using osu_database_reader.IO;
 
 namespace osu_database_reader.BinaryFiles
diff --git a/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs b/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
similarity index 99%
rename from osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
rename to osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
index f0e6004..343b8ed 100644
--- a/osu-database-reader/BinaryFiles/Parts/BeatmapEntry.cs
+++ b/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.BinaryFiles.Parts
+namespace osu_database_reader.Components.Beatmaps
 {
     public class BeatmapEntry
     {
diff --git a/osu-database-reader/Components/Beatmaps/Collection.cs b/osu-database-reader/Components/Beatmaps/Collection.cs
new file mode 100644
index 0000000..118270a
--- /dev/null
+++ b/osu-database-reader/Components/Beatmaps/Collection.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace osu_database_reader.Components.Beatmaps
+{
+    public struct Collection
+    {
+        public string Name;
+        public List<string> Md5Hashes;
+    }
+}
diff --git a/osu-database-reader/BinaryFiles/Parts/Structs.cs b/osu-database-reader/Components/Beatmaps/TimingPoint.cs
similarity index 86%
rename from osu-database-reader/BinaryFiles/Parts/Structs.cs
rename to osu-database-reader/Components/Beatmaps/TimingPoint.cs
index b8bab52..d54d31e 100644
--- a/osu-database-reader/BinaryFiles/Parts/Structs.cs
+++ b/osu-database-reader/Components/Beatmaps/TimingPoint.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 
-namespace osu_database_reader.BinaryFiles.Parts
+namespace osu_database_reader.Components.Beatmaps
 {
     public class TimingPoint
     {
@@ -32,7 +31,8 @@ public static TimingPoint FromString(string line)
             if (splitted.Length > 4) t.CustomSampleSet = int.Parse(splitted[4]);
             if (splitted.Length > 5) t.SampleVolume = int.Parse(splitted[5]);
             if (splitted.Length > 6) t.TimingChange = int.Parse(splitted[6]) == 1;
-            if (splitted.Length > 7) {
+            if (splitted.Length > 7)
+            {
                 temp = int.Parse(splitted[7]);
                 t.Kiai = (temp & 1) != 0;
             }
@@ -51,10 +51,4 @@ public static TimingPoint ReadFromReader(BinaryReader r)
             return t;
         }
     }
-
-    public struct Collection
-    {
-        public string Name;
-        public List<string> Md5Hashes;
-    }
 }
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObject.cs b/osu-database-reader/Components/HitObjects/HitObject.cs
similarity index 92%
rename from osu-database-reader/TextFiles/HitObjects/HitObject.cs
rename to osu-database-reader/Components/HitObjects/HitObject.cs
index 75d5bd8..cc9d941 100644
--- a/osu-database-reader/TextFiles/HitObjects/HitObject.cs
+++ b/osu-database-reader/Components/HitObjects/HitObject.cs
@@ -1,13 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu_database_reader.IO;
 
-namespace osu_database_reader.TextFiles.HitObjects
+namespace osu_database_reader.Components.HitObjects
 {
     public abstract class HitObject
     {
diff --git a/osu-database-reader/Components/HitObjects/HitObjectCircle.cs b/osu-database-reader/Components/HitObjects/HitObjectCircle.cs
new file mode 100644
index 0000000..03f7753
--- /dev/null
+++ b/osu-database-reader/Components/HitObjects/HitObjectCircle.cs
@@ -0,0 +1,7 @@
+namespace osu_database_reader.Components.HitObjects
+{
+    public class HitObjectCircle : HitObject
+    {
+        public string SoundSampleData;  //TODO: parse all sound sample data
+    }
+}
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs b/osu-database-reader/Components/HitObjects/HitObjectSlider.cs
similarity index 87%
rename from osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs
rename to osu-database-reader/Components/HitObjects/HitObjectSlider.cs
index f0145b6..1b73a1e 100644
--- a/osu-database-reader/TextFiles/HitObjects/HitObjectSlider.cs
+++ b/osu-database-reader/Components/HitObjects/HitObjectSlider.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu_database_reader.TextFiles.HitObjects
+namespace osu_database_reader.Components.HitObjects
 {
     public class HitObjectSlider : HitObject
     {
diff --git a/osu-database-reader/Components/HitObjects/HitObjectSpinner.cs b/osu-database-reader/Components/HitObjects/HitObjectSpinner.cs
new file mode 100644
index 0000000..02d9599
--- /dev/null
+++ b/osu-database-reader/Components/HitObjects/HitObjectSpinner.cs
@@ -0,0 +1,8 @@
+namespace osu_database_reader.Components.HitObjects
+{
+    public class HitObjectSpinner : HitObject
+    {
+        public int EndTime;
+        public string SoundSampleData;
+    }
+}
diff --git a/osu-database-reader/BinaryFiles/Parts/Player.cs b/osu-database-reader/Components/Player/PlayerPresence.cs
similarity index 84%
rename from osu-database-reader/BinaryFiles/Parts/Player.cs
rename to osu-database-reader/Components/Player/PlayerPresence.cs
index 4bf59b2..515cd53 100644
--- a/osu-database-reader/BinaryFiles/Parts/Player.cs
+++ b/osu-database-reader/Components/Player/PlayerPresence.cs
@@ -2,9 +2,9 @@
 using System.Diagnostics;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.BinaryFiles.Parts
+namespace osu_database_reader.Components.Player
 {
-    public class Player
+    public class PlayerPresence
     {
         public int PlayerId;
         public string PlayerName;
@@ -16,8 +16,8 @@ public class Player
         public int GlobalRank;
         public DateTime Unknown1;   //TODO: name this. Last update time?
 
-        public static Player ReadFromReader(CustomBinaryReader r) {
-            Player p = new Player();
+        public static PlayerPresence ReadFromReader(CustomBinaryReader r) {
+            PlayerPresence p = new PlayerPresence();
 
             p.PlayerId = r.ReadInt32();
             p.PlayerName = r.ReadString();
diff --git a/osu-database-reader/BinaryFiles/Parts/Replay.cs b/osu-database-reader/Components/Player/Replay.cs
similarity index 83%
rename from osu-database-reader/BinaryFiles/Parts/Replay.cs
rename to osu-database-reader/Components/Player/Replay.cs
index bffabec..a5a8f5f 100644
--- a/osu-database-reader/BinaryFiles/Parts/Replay.cs
+++ b/osu-database-reader/Components/Player/Replay.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using osu_database_reader.IO;
 
-namespace osu_database_reader.BinaryFiles.Parts
+namespace osu_database_reader.Components.Player
 {
     public class Replay //used for both scores.db and .osr files
     {
@@ -14,10 +14,10 @@ namespace osu_database_reader.BinaryFiles.Parts
         public ushort Combo;
         public bool FullCombo;
         public Mods Mods;
-        public string LifeGraph;    //not present in scores.db, TODO: parse this when implementing .osr
+        public string LifeGraphData;//null in scores.db, TODO: parse this when implementing .osr
         public DateTime TimePlayed;
-        public byte[] ReplayData;   //not present in scores.db
-        public long ScoreId;
+        public byte[] ReplayData;   //null in scores.db
+        public long? ScoreId;
 
         public static Replay Read(string path) {
             Replay replay;
@@ -46,10 +46,10 @@ public static Replay ReadFromReader(CustomBinaryReader r, bool readScoreId = fal
                 Combo = r.ReadUInt16(),
                 FullCombo = r.ReadBoolean(),
                 Mods = (Mods) r.ReadInt32(),
-                LifeGraph = r.ReadString(),
+                LifeGraphData = r.ReadString(),
                 TimePlayed = r.ReadDateTime(),
                 ReplayData = r.ReadBytes(),
-                ScoreId = readScoreId ? r.ReadInt64() : -1
+                ScoreId = readScoreId ? r.ReadInt64() : (long?)null
             };
 
             return replay;
diff --git a/osu-database-reader/Components/Vector2.cs b/osu-database-reader/Components/Vector2.cs
new file mode 100644
index 0000000..ba83f6c
--- /dev/null
+++ b/osu-database-reader/Components/Vector2.cs
@@ -0,0 +1,13 @@
+namespace osu_database_reader.Components
+{
+    public struct Vector2
+    {
+        public int X, Y;
+
+        public Vector2(int x, int y)
+        {
+            X = x;
+            Y = y;
+        }
+    }
+}
diff --git a/osu-database-reader/Constants.cs b/osu-database-reader/Constants.cs
index f3b9eea..16abdab 100644
--- a/osu-database-reader/Constants.cs
+++ b/osu-database-reader/Constants.cs
@@ -7,7 +7,7 @@
 
 namespace osu_database_reader
 {
-    internal class Constants
+    internal static class Constants
     {
         //nfi so parsing works on all cultures
         public static readonly NumberFormatInfo NumberFormat = new CultureInfo(@"en-US", false).NumberFormat;
diff --git a/osu-database-reader/TextFiles/HitObjects/Enums.cs b/osu-database-reader/Enums_Beatmaps.cs
similarity index 80%
rename from osu-database-reader/TextFiles/HitObjects/Enums.cs
rename to osu-database-reader/Enums_Beatmaps.cs
index e28a2fc..cd51b0d 100644
--- a/osu-database-reader/TextFiles/HitObjects/Enums.cs
+++ b/osu-database-reader/Enums_Beatmaps.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu_database_reader.TextFiles.HitObjects
+namespace osu_database_reader
 {
     [Flags]
     public enum HitObjectType
diff --git a/osu-database-reader/Enums.cs b/osu-database-reader/Enums_General.cs
similarity index 98%
rename from osu-database-reader/Enums.cs
rename to osu-database-reader/Enums_General.cs
index 7081cdd..107db00 100644
--- a/osu-database-reader/Enums.cs
+++ b/osu-database-reader/Enums_General.cs
@@ -89,7 +89,6 @@ public enum Mods : int
 
     public enum BeatmapSection
     {
-        // ReSharper disable once InconsistentNaming
         _EndOfFile,
         General,
         Editor,
diff --git a/osu-database-reader/IO/CustomBinaryReader.cs b/osu-database-reader/IO/CustomBinaryReader.cs
index abd88fb..26e2056 100644
--- a/osu-database-reader/IO/CustomBinaryReader.cs
+++ b/osu-database-reader/IO/CustomBinaryReader.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Beatmaps;
 
 namespace osu_database_reader.IO
 {
diff --git a/osu-database-reader/IO/CustomStreamReader.cs b/osu-database-reader/IO/CustomStreamReader.cs
index 5c34272..34cc775 100644
--- a/osu-database-reader/IO/CustomStreamReader.cs
+++ b/osu-database-reader/IO/CustomStreamReader.cs
@@ -3,8 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using osu_database_reader.BinaryFiles.Parts;
-using osu_database_reader.TextFiles.HitObjects;
+using osu_database_reader.Components.Beatmaps;
+using osu_database_reader.Components.HitObjects;
 
 namespace osu_database_reader.IO
 {
diff --git a/osu-database-reader/TextFiles/BeatmapFile.cs b/osu-database-reader/TextFiles/BeatmapFile.cs
index 945d199..46ad558 100644
--- a/osu-database-reader/TextFiles/BeatmapFile.cs
+++ b/osu-database-reader/TextFiles/BeatmapFile.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using osu_database_reader.BinaryFiles.Parts;
+using osu_database_reader.Components.Beatmaps;
+using osu_database_reader.Components.HitObjects;
 using osu_database_reader.IO;
-using osu_database_reader.TextFiles.HitObjects;
 
 namespace osu_database_reader.TextFiles
 {
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs b/osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs
deleted file mode 100644
index 1adc5f8..0000000
--- a/osu-database-reader/TextFiles/HitObjects/HitObjectCircle.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace osu_database_reader.TextFiles.HitObjects
-{
-    public class HitObjectCircle : HitObject
-    {
-        public string SoundSampleData;  //TODO: parse all sound sample data
-    }
-}
diff --git a/osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs b/osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs
deleted file mode 100644
index 29540b4..0000000
--- a/osu-database-reader/TextFiles/HitObjects/HitObjectSpinner.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace osu_database_reader.TextFiles.HitObjects
-{
-    public class HitObjectSpinner : HitObject
-    {
-        public int EndTime;
-        public string SoundSampleData;
-    }
-}
diff --git a/osu-database-reader/TextFiles/HitObjects/Structs.cs b/osu-database-reader/TextFiles/HitObjects/Structs.cs
deleted file mode 100644
index 033f6d4..0000000
--- a/osu-database-reader/TextFiles/HitObjects/Structs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace osu_database_reader.TextFiles.HitObjects
-{
-    public struct Vector2
-    {
-        public int X, Y;
-
-        public Vector2(int x, int y)
-        {
-            X = x;
-            Y = y;
-        }
-    }
-}
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index 23faf3d..5445db0 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -40,26 +40,27 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BinaryFiles\Parts\BeatmapEntry.cs" />
+    <Compile Include="Components\Beatmaps\BeatmapEntry.cs" />
     <Compile Include="BinaryFiles\CollectionDb.cs" />
+    <Compile Include="Components\Beatmaps\TimingPoint.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="IO\CustomBinaryReader.cs" />
-    <Compile Include="Enums.cs" />
+    <Compile Include="Enums_General.cs" />
     <Compile Include="BinaryFiles\OsuDb.cs" />
-    <Compile Include="BinaryFiles\Parts\Player.cs" />
+    <Compile Include="Components\Player\PlayerPresence.cs" />
     <Compile Include="BinaryFiles\PresenceDb.cs" />
     <Compile Include="IO\CustomStreamReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BinaryFiles\Parts\Replay.cs" />
+    <Compile Include="Components\Player\Replay.cs" />
     <Compile Include="BinaryFiles\ScoresDb.cs" />
-    <Compile Include="BinaryFiles\Parts\Structs.cs" />
+    <Compile Include="Components\Beatmaps\Collection.cs" />
     <Compile Include="TextFiles\BeatmapFile.cs" />
-    <Compile Include="TextFiles\HitObjects\Enums.cs" />
-    <Compile Include="TextFiles\HitObjects\HitObject.cs" />
-    <Compile Include="TextFiles\HitObjects\HitObjectCircle.cs" />
-    <Compile Include="TextFiles\HitObjects\HitObjectSlider.cs" />
-    <Compile Include="TextFiles\HitObjects\HitObjectSpinner.cs" />
-    <Compile Include="TextFiles\HitObjects\Structs.cs" />
+    <Compile Include="Enums_Beatmaps.cs" />
+    <Compile Include="Components\HitObjects\HitObject.cs" />
+    <Compile Include="Components\HitObjects\HitObjectCircle.cs" />
+    <Compile Include="Components\HitObjects\HitObjectSlider.cs" />
+    <Compile Include="Components\HitObjects\HitObjectSpinner.cs" />
+    <Compile Include="Components\Vector2.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

From 8c4a813136f65d815620244b2b4ee15c93feb903 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 20:26:31 +0200
Subject: [PATCH 10/19] Improve unit tests

---
 UnitTestProject/SharedCode.cs                 | 64 +++++++++++++++++++
 .../{UnitTest1.cs => TestsBinary.cs}          | 37 ++++++-----
 .../{UnitTest2.cs => TestsText.cs}            | 24 ++++---
 UnitTestProject/UnitTestProject.csproj        |  5 +-
 4 files changed, 103 insertions(+), 27 deletions(-)
 create mode 100644 UnitTestProject/SharedCode.cs
 rename UnitTestProject/{UnitTest1.cs => TestsBinary.cs} (80%)
 rename UnitTestProject/{UnitTest2.cs => TestsText.cs} (83%)

diff --git a/UnitTestProject/SharedCode.cs b/UnitTestProject/SharedCode.cs
new file mode 100644
index 0000000..cb6fa70
--- /dev/null
+++ b/UnitTestProject/SharedCode.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTestProject
+{
+    public static class SharedCode
+    {
+        public static readonly string PathOsu;
+
+        static SharedCode()
+        {
+            //find osu! installation
+            if (!Directory.Exists(PathOsu = $@"C:\Users\{Environment.UserName}\AppData\Local\osu!\")    //current install dir
+                && !Directory.Exists(PathOsu = $@"C:\Program Files (x86)\osu!\")    //old install dir (x64-based)
+                && !Directory.Exists(PathOsu = $@"C:\Program Files\osu!\")) {       //old install dir (x86-based)
+                PathOsu = string.Empty; //if none of the previous paths exist
+            }
+            //TODO: dev to create file with custom location
+        }
+
+        public static void PreTestCheck()
+        {
+            if (string.IsNullOrEmpty(PathOsu))
+                Assert.Inconclusive("osu! installation directory not found.");
+        }
+
+        public static string GetRelativeFile(string rel, bool shouldError = false)
+        {
+            string absolute = Path.Combine(PathOsu, rel);
+            if (!File.Exists(absolute)) {
+                if (shouldError)
+                    Assert.Fail($"File does not exist: {absolute}");
+                else
+                    Assert.Inconclusive($"File does not exist: {absolute}");
+            }
+            return absolute;
+        }
+
+        public static string GetRelativeDirectory(string rel, bool shouldError = false)
+        {
+            string absolute = Path.Combine(PathOsu, rel);
+            if (!Directory.Exists(absolute))
+            {
+                if (shouldError)
+                    Assert.Fail($"File does not exist: {absolute}");
+                else
+                    Assert.Inconclusive($"File does not exist: {absolute}");
+            }
+            return absolute;
+        }
+
+        public static bool VerifyFileChecksum(string path, string md5)
+        {
+            string hash = string.Join(string.Empty, MD5.Create().ComputeHash(File.OpenRead(path)).Select(a => a.ToString("X2")));
+            return hash == md5.ToUpper();
+        }
+    }
+}
diff --git a/UnitTestProject/UnitTest1.cs b/UnitTestProject/TestsBinary.cs
similarity index 80%
rename from UnitTestProject/UnitTest1.cs
rename to UnitTestProject/TestsBinary.cs
index ca8fb41..8ba5709 100644
--- a/UnitTestProject/UnitTest1.cs
+++ b/UnitTestProject/TestsBinary.cs
@@ -11,17 +11,18 @@
 namespace UnitTestProject
 {
     [TestClass]
-    public class UnitTest1
+    public class TestsBinary
     {
-        private static readonly string OsuPath;
-
-        static UnitTest1() {
-            OsuPath = $@"C:\Users\{Environment.UserName}\AppData\Local\osu!\";
+        [TestInitialize]
+        public void Init()
+        {
+            SharedCode.PreTestCheck();
         }
 
         [TestMethod]
-        public void ReadOsuDb() {
-            OsuDb db = OsuDb.Read(OsuPath + "osu!.db");
+        public void ReadOsuDb()
+        {
+            OsuDb db = OsuDb.Read(SharedCode.GetRelativeFile("osu!.db"));
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of beatmaps: " + db.AmountOfBeatmaps);
             Debug.WriteLine($"Account name: {db.AccountName} (account {(db.AccountUnlocked ? "unlocked" : "locked, unlocked at "+db.AccountUnlockDate)})");
@@ -33,8 +34,9 @@ public void ReadOsuDb() {
         }
 
         [TestMethod]
-        public void ReadCollectionDb() {
-            CollectionDb db = CollectionDb.Read(OsuPath + "collection.db");
+        public void ReadCollectionDb()
+        {
+            CollectionDb db = CollectionDb.Read(SharedCode.GetRelativeFile("collection.db"));
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of collections: " + db.Collections.Count);
             foreach (var c in db.Collections) {
@@ -43,8 +45,9 @@ public void ReadCollectionDb() {
         }
 
         [TestMethod]
-        public void ReadScoresDb() {
-            ScoresDb db = ScoresDb.Read(OsuPath + "scores.db");
+        public void ReadScoresDb()
+        {
+            ScoresDb db = ScoresDb.Read(SharedCode.GetRelativeFile("scores.db"));
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of beatmaps: " + db.Beatmaps.Count);
             Debug.WriteLine("Amount of scores: " + db.Scores.Count());
@@ -63,8 +66,9 @@ public void ReadScoresDb() {
         }
 
         [TestMethod]
-        public void ReadPresenceDb() {
-            var db = PresenceDb.Read(OsuPath + "presence.db");
+        public void ReadPresenceDb()
+        {
+            var db = PresenceDb.Read(SharedCode.GetRelativeFile("presence.db"));
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of scores: " + db.Players.Count);
 
@@ -75,9 +79,10 @@ public void ReadPresenceDb() {
         }
 
         [TestMethod]
-        public void ReadReplay() {
-            //get random path
-            string path = OsuPath + "Replays\\";
+        public void ReadReplay()
+        {
+            //get random file
+            string path = SharedCode.GetRelativeDirectory("Replays");
             string[] files = Directory.GetFiles(path);
             
             if (files == null || files.Length == 0)
diff --git a/UnitTestProject/UnitTest2.cs b/UnitTestProject/TestsText.cs
similarity index 83%
rename from UnitTestProject/UnitTest2.cs
rename to UnitTestProject/TestsText.cs
index c816c7c..a031222 100644
--- a/UnitTestProject/UnitTest2.cs
+++ b/UnitTestProject/TestsText.cs
@@ -10,23 +10,24 @@
 namespace UnitTestProject
 {
     [TestClass]
-    public class UnitTest2
+    public class TestsText
     {
-        private static readonly string OsuPath;
-
-        static UnitTest2()
+        [TestInitialize]
+        public void Init()
         {
-            OsuPath = $@"C:\Users\{Environment.UserName}\AppData\Local\osu!\";
+            SharedCode.PreTestCheck();
         }
 
         [TestMethod]
-        public void ReadBigBlack()
+        public void VerifyBigBlack()
         {
             //most people should have this map
-            string beatmap = OsuPath + @"Songs\41823 The Quick Brown Fox - The Big Black\The Quick Brown Fox - The Big Black (Blue Dragon) [WHO'S AFRAID OF THE BIG BLACK].osu";
+            string beatmap = SharedCode.GetRelativeFile(@"Songs\41823 The Quick Brown Fox - The Big Black\The Quick Brown Fox - The Big Black (Blue Dragon) [WHO'S AFRAID OF THE BIG BLACK].osu");
 
             if (!File.Exists(beatmap))
-                Assert.Inconclusive("Hardcoded beatmap not found at location " + beatmap);
+                Assert.Inconclusive("Hardcoded path does not exist:  " + beatmap);
+            if (!SharedCode.VerifyFileChecksum(beatmap, "2D687E5EE79F3862AD0C60651471CDCC"))
+                Assert.Inconclusive("Beatmap was modified.");
             //TODO: check file to not be modified. if it is: inconclusive
 
             var bm = BeatmapFile.Read(beatmap);
@@ -66,7 +67,12 @@ public void ReadBigBlack()
             Assert.AreEqual(bm.TimingPoints[3].TimingChange, false);
 
             //check Colours
-            //TODO
+            //Combo1 : 249,91,9
+            //(...)
+            //Combo5 : 255,255,128
+            Assert.AreEqual(bm.SectionColours["Combo1"], "249,91,91");
+            Assert.AreEqual(bm.SectionColours["Combo5"], "255,255,128");
+            Assert.AreEqual(bm.SectionColours.Count, 5);
 
             //check HitObjects
             Assert.AreEqual(bm.HitObjects.Count, 746);
diff --git a/UnitTestProject/UnitTestProject.csproj b/UnitTestProject/UnitTestProject.csproj
index ef8368b..a63cf77 100644
--- a/UnitTestProject/UnitTestProject.csproj
+++ b/UnitTestProject/UnitTestProject.csproj
@@ -50,9 +50,10 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Compile Include="UnitTest1.cs" />
+    <Compile Include="SharedCode.cs" />
+    <Compile Include="TestsBinary.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnitTest2.cs" />
+    <Compile Include="TestsText.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-database-reader\osu-database-reader.csproj">

From 30d1c0abdf785e7fb637aa73a8dd7c94172ed7aa Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 20:44:30 +0200
Subject: [PATCH 11/19] Add new (failing) test

---
 UnitTestProject/TestsCombined.cs       | 42 ++++++++++++++++++++++++++
 UnitTestProject/UnitTestProject.csproj |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 UnitTestProject/TestsCombined.cs

diff --git a/UnitTestProject/TestsCombined.cs b/UnitTestProject/TestsCombined.cs
new file mode 100644
index 0000000..7a327dc
--- /dev/null
+++ b/UnitTestProject/TestsCombined.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using osu_database_reader.BinaryFiles;
+using osu_database_reader.TextFiles;
+
+namespace UnitTestProject
+{
+    [TestClass]
+    public class TestsCombined
+    {
+        [TestInitialize]
+        public void Init()
+        {
+            SharedCode.PreTestCheck();
+        }
+
+        [TestMethod]
+        public void CheckBeatmapsAgainstDatabase()
+        {
+            string pathSongs = SharedCode.GetRelativeDirectory("Songs");
+            OsuDb db = OsuDb.Read(SharedCode.GetRelativeFile("osu!.db"));
+
+            for (var i = 0; i < Math.Max(db.Beatmaps.Count, 25); i++) {
+                var entry = db.Beatmaps[i];
+
+                //read beatmap
+                BeatmapFile bm = BeatmapFile.Read(SharedCode.GetRelativeFile($"Songs/{entry.FolderName}/{entry.BeatmapFileName}", true));
+                
+                Assert.AreEqual(entry.Artist, bm.SectionMetadata["Artist"]);
+                Assert.AreEqual(entry.Difficulty, bm.SectionMetadata["Version"]);
+                Assert.AreEqual(entry.Creator, bm.SectionMetadata["Creator"]);
+                Assert.AreEqual(entry.Title, bm.SectionMetadata["Title"]);
+
+                //TODO: more, but check if the entries are present in the beatmap
+            }
+        }
+    }
+}
diff --git a/UnitTestProject/UnitTestProject.csproj b/UnitTestProject/UnitTestProject.csproj
index a63cf77..281ccf1 100644
--- a/UnitTestProject/UnitTestProject.csproj
+++ b/UnitTestProject/UnitTestProject.csproj
@@ -53,6 +53,7 @@
     <Compile Include="SharedCode.cs" />
     <Compile Include="TestsBinary.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestsCombined.cs" />
     <Compile Include="TestsText.cs" />
   </ItemGroup>
   <ItemGroup>

From 16eb8816bdaa5f66783c896eb25d1bd75f4f9a44 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 20:55:54 +0200
Subject: [PATCH 12/19] Officially say we can read beatmaps

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index feedf81..fb5cf78 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ NOTE: No parsing for storyboards, use [osuElements](https://github.com/JasperDeS
 * reading scores.db
 * reading presence.db
 * reading replays
+* reading osu! beatmaps
 
 ### Planned:
-* reading osu! beatmaps (maybe?)
 * writing osu!.db
 * writing collection.db
 * writing scores.db

From 3cf51329b8196b82b89cf745997f4fabdf908b55 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 21:24:05 +0200
Subject: [PATCH 13/19] Minor changes and bugfixes in unit tests

---
 UnitTestProject/SharedCode.cs    |  8 ++++----
 UnitTestProject/TestsBinary.cs   |  7 +++----
 UnitTestProject/TestsCombined.cs | 15 +++++++--------
 UnitTestProject/TestsText.cs     |  6 +++---
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/UnitTestProject/SharedCode.cs b/UnitTestProject/SharedCode.cs
index cb6fa70..1be8c29 100644
--- a/UnitTestProject/SharedCode.cs
+++ b/UnitTestProject/SharedCode.cs
@@ -17,8 +17,8 @@ static SharedCode()
         {
             //find osu! installation
             if (!Directory.Exists(PathOsu = $@"C:\Users\{Environment.UserName}\AppData\Local\osu!\")    //current install dir
-                && !Directory.Exists(PathOsu = $@"C:\Program Files (x86)\osu!\")    //old install dir (x64-based)
-                && !Directory.Exists(PathOsu = $@"C:\Program Files\osu!\")) {       //old install dir (x86-based)
+                && !Directory.Exists(PathOsu = @"C:\Program Files (x86)\osu!\")     //old install dir (x64-based)
+                && !Directory.Exists(PathOsu = @"C:\Program Files\osu!\")) {        //old install dir (x86-based)
                 PathOsu = string.Empty; //if none of the previous paths exist
             }
             //TODO: dev to create file with custom location
@@ -48,9 +48,9 @@ public static string GetRelativeDirectory(string rel, bool shouldError = false)
             if (!Directory.Exists(absolute))
             {
                 if (shouldError)
-                    Assert.Fail($"File does not exist: {absolute}");
+                    Assert.Fail($"Directory does not exist: {absolute}");
                 else
-                    Assert.Inconclusive($"File does not exist: {absolute}");
+                    Assert.Inconclusive($"Directory does not exist: {absolute}");
             }
             return absolute;
         }
diff --git a/UnitTestProject/TestsBinary.cs b/UnitTestProject/TestsBinary.cs
index 8ba5709..497def4 100644
--- a/UnitTestProject/TestsBinary.cs
+++ b/UnitTestProject/TestsBinary.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using osu_database_reader;
 using osu_database_reader.BinaryFiles;
 using osu_database_reader.Components.Player;
 
@@ -25,7 +24,7 @@ public void ReadOsuDb()
             OsuDb db = OsuDb.Read(SharedCode.GetRelativeFile("osu!.db"));
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of beatmaps: " + db.AmountOfBeatmaps);
-            Debug.WriteLine($"Account name: {db.AccountName} (account {(db.AccountUnlocked ? "unlocked" : "locked, unlocked at "+db.AccountUnlockDate)})");
+            Debug.WriteLine($"Account name: \"{db.AccountName}\" (account {(db.AccountUnlocked ? "not locked" : "locked, unlocked at " + db.AccountUnlockDate)})");
             Debug.WriteLine("Account rank: " + db.AccountRank);
             for (int i = 0; i < Math.Min(10, db.AmountOfBeatmaps); i++) {   //print 10 at most
                 var b = db.Beatmaps[i];
@@ -40,7 +39,7 @@ public void ReadCollectionDb()
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of collections: " + db.Collections.Count);
             foreach (var c in db.Collections) {
-                Debug.WriteLine($" - Collection {c.Name} with {c.Md5Hashes.Count} item" + (c.Md5Hashes.Count == 1 ? "" : "s"));
+                Debug.WriteLine($" - Collection {c.Name} has {c.Md5Hashes.Count} item" + (c.Md5Hashes.Count == 1 ? "" : "s"));
             }
         }
 
@@ -85,7 +84,7 @@ public void ReadReplay()
             string path = SharedCode.GetRelativeDirectory("Replays");
             string[] files = Directory.GetFiles(path);
             
-            if (files == null || files.Length == 0)
+            if (files.Length == 0)
                 Assert.Inconclusive("No replays in your replay folder!");
 
             for (int i = 0; i < Math.Min(files.Length, 10); i++) {  //10 at most
diff --git a/UnitTestProject/TestsCombined.cs b/UnitTestProject/TestsCombined.cs
index 7a327dc..7d1a420 100644
--- a/UnitTestProject/TestsCombined.cs
+++ b/UnitTestProject/TestsCombined.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using osu_database_reader.BinaryFiles;
 using osu_database_reader.TextFiles;
@@ -19,17 +16,19 @@ public void Init()
         }
 
         [TestMethod]
-        public void CheckBeatmapsAgainstDatabase()
+        public void CheckBeatmapsAgainstDb()
         {
-            string pathSongs = SharedCode.GetRelativeDirectory("Songs");
             OsuDb db = OsuDb.Read(SharedCode.GetRelativeFile("osu!.db"));
 
-            for (var i = 0; i < Math.Max(db.Beatmaps.Count, 25); i++) {
+            for (var i = 0; i < Math.Min(db.Beatmaps.Count, 50); i++) {
                 var entry = db.Beatmaps[i];
 
+                Debug.WriteLine($"Going to read beatmap at /{entry.FolderName}/{entry.BeatmapFileName}");
+
                 //read beatmap
                 BeatmapFile bm = BeatmapFile.Read(SharedCode.GetRelativeFile($"Songs/{entry.FolderName}/{entry.BeatmapFileName}", true));
-                
+                //BUG: this can still fail when maps use the hold note (used in some mania maps?)
+
                 Assert.AreEqual(entry.Artist, bm.SectionMetadata["Artist"]);
                 Assert.AreEqual(entry.Difficulty, bm.SectionMetadata["Version"]);
                 Assert.AreEqual(entry.Creator, bm.SectionMetadata["Creator"]);
diff --git a/UnitTestProject/TestsText.cs b/UnitTestProject/TestsText.cs
index a031222..ecdcc7f 100644
--- a/UnitTestProject/TestsText.cs
+++ b/UnitTestProject/TestsText.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -31,7 +30,8 @@ public void VerifyBigBlack()
             //TODO: check file to not be modified. if it is: inconclusive
 
             var bm = BeatmapFile.Read(beatmap);
-            Debug.WriteLine("Beatmap version: " + bm.BeatmapVersion);
+
+            Assert.AreEqual(bm.BeatmapVersion, 9);
 
             Assert.IsTrue(bm.SectionGeneral.Count >= 2);   //disco prince only has 2
             Assert.IsTrue(bm.SectionMetadata.Count >= 4);  //disco prince only has 4
@@ -42,7 +42,7 @@ public void VerifyBigBlack()
             Assert.AreEqual(bm.SectionGeneral["AudioLeadIn"], "0");
             Assert.AreEqual(bm.SectionGeneral["PreviewTime"], "18957");
             
-            //check MetaData
+            //check Metadata
             Assert.AreEqual(bm.SectionMetadata["Title"], "The Big Black");
             Assert.AreEqual(bm.SectionMetadata["Artist"], "The Quick Brown Fox");
             Assert.AreEqual(bm.SectionMetadata["Creator"], "Blue Dragon");

From 65ad012614fb580dc7a8e86cbeacf58dd3bc33a2 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 22:02:26 +0200
Subject: [PATCH 14/19] Refactor, add properties to get common beatmap
 properties, change test

---
 UnitTestProject/TestsBinary.cs                |  2 +-
 UnitTestProject/TestsCombined.cs              | 12 +++++---
 UnitTestProject/TestsText.cs                  | 30 +++++++++----------
 .../Components/Beatmaps/BeatmapEntry.cs       | 26 ++++++++--------
 osu-database-reader/Extensions.cs             | 18 +++++++++++
 osu-database-reader/TextFiles/BeatmapFile.cs  | 21 +++++++++++--
 .../osu-database-reader.csproj                |  1 +
 7 files changed, 74 insertions(+), 36 deletions(-)
 create mode 100644 osu-database-reader/Extensions.cs

diff --git a/UnitTestProject/TestsBinary.cs b/UnitTestProject/TestsBinary.cs
index 497def4..7412bbe 100644
--- a/UnitTestProject/TestsBinary.cs
+++ b/UnitTestProject/TestsBinary.cs
@@ -28,7 +28,7 @@ public void ReadOsuDb()
             Debug.WriteLine("Account rank: " + db.AccountRank);
             for (int i = 0; i < Math.Min(10, db.AmountOfBeatmaps); i++) {   //print 10 at most
                 var b = db.Beatmaps[i];
-                Debug.WriteLine($"{b.Artist} - {b.Title} [{b.Difficulty}]");
+                Debug.WriteLine($"{b.Artist} - {b.Title} [{b.Version}]");
             }
         }
 
diff --git a/UnitTestProject/TestsCombined.cs b/UnitTestProject/TestsCombined.cs
index 7d1a420..025479f 100644
--- a/UnitTestProject/TestsCombined.cs
+++ b/UnitTestProject/TestsCombined.cs
@@ -29,10 +29,14 @@ public void CheckBeatmapsAgainstDb()
                 BeatmapFile bm = BeatmapFile.Read(SharedCode.GetRelativeFile($"Songs/{entry.FolderName}/{entry.BeatmapFileName}", true));
                 //BUG: this can still fail when maps use the hold note (used in some mania maps?)
 
-                Assert.AreEqual(entry.Artist, bm.SectionMetadata["Artist"]);
-                Assert.AreEqual(entry.Difficulty, bm.SectionMetadata["Version"]);
-                Assert.AreEqual(entry.Creator, bm.SectionMetadata["Creator"]);
-                Assert.AreEqual(entry.Title, bm.SectionMetadata["Title"]);
+                Assert.IsTrue(bm.SectionGeneral.Count >= 2);   //disco prince only has 2
+                Assert.IsTrue(bm.SectionMetadata.Count >= 4);  //disco prince only has 4
+                Assert.IsTrue(bm.SectionDifficulty.Count >= 5);//disco prince only has 5
+
+                Assert.AreEqual(entry.Artist, bm.Artist);
+                Assert.AreEqual(entry.Version, bm.Version);
+                Assert.AreEqual(entry.Creator, bm.Creator);
+                Assert.AreEqual(entry.Title, bm.Title);
 
                 //TODO: more, but check if the entries are present in the beatmap
             }
diff --git a/UnitTestProject/TestsText.cs b/UnitTestProject/TestsText.cs
index ecdcc7f..7e74307 100644
--- a/UnitTestProject/TestsText.cs
+++ b/UnitTestProject/TestsText.cs
@@ -31,30 +31,28 @@ public void VerifyBigBlack()
 
             var bm = BeatmapFile.Read(beatmap);
 
-            Assert.AreEqual(bm.BeatmapVersion, 9);
-
-            Assert.IsTrue(bm.SectionGeneral.Count >= 2);   //disco prince only has 2
-            Assert.IsTrue(bm.SectionMetadata.Count >= 4);  //disco prince only has 4
-            Assert.IsTrue(bm.SectionDifficulty.Count >= 5);//disco prince only has 5
-
+            Assert.AreEqual(bm.FileFormatVersion, 9);
+            
             //check General
             Assert.AreEqual(bm.SectionGeneral["AudioFilename"], "02 The Big Black.mp3");
             Assert.AreEqual(bm.SectionGeneral["AudioLeadIn"], "0");
             Assert.AreEqual(bm.SectionGeneral["PreviewTime"], "18957");
             
             //check Metadata
-            Assert.AreEqual(bm.SectionMetadata["Title"], "The Big Black");
-            Assert.AreEqual(bm.SectionMetadata["Artist"], "The Quick Brown Fox");
-            Assert.AreEqual(bm.SectionMetadata["Creator"], "Blue Dragon");
-            Assert.AreEqual(bm.SectionMetadata["Version"], "WHO'S AFRAID OF THE BIG BLACK");
-            Assert.AreEqual(bm.SectionMetadata["Source"], string.Empty);
-            Assert.AreEqual(bm.SectionMetadata["Tags"], "Onosakihito speedcore renard lapfox");
+            Assert.AreEqual(bm.Title, "The Big Black");
+            Assert.AreEqual(bm.Artist, "The Quick Brown Fox");
+            Assert.AreEqual(bm.Creator, "Blue Dragon");
+            Assert.AreEqual(bm.Version, "WHO'S AFRAID OF THE BIG BLACK");
+            Assert.AreEqual(bm.Source, string.Empty);
+            Assert.IsTrue(Enumerable.SequenceEqual(bm.Tags, new[] { "Onosakihito", "speedcore", "renard", "lapfox" }));
 
             //check Difficulty
-            Assert.AreEqual(bm.SectionDifficulty["HPDrainRate"], "5");
-            Assert.AreEqual(bm.SectionDifficulty["CircleSize"], "4");
-            Assert.AreEqual(bm.SectionDifficulty["OverallDifficulty"], "7");
-            Assert.AreEqual(bm.SectionDifficulty["SliderMultiplier"], "1.8");
+            Assert.AreEqual(bm.HPDrainRate, 5f);
+            Assert.AreEqual(bm.CircleSize, 4f);
+            Assert.AreEqual(bm.OverallDifficulty, 7f);
+            Assert.AreEqual(bm.ApproachRate, 10f);
+            Assert.AreEqual(bm.SliderMultiplier, 1.8f);
+            Assert.AreEqual(bm.SliderTickRate, 2f);
 
             //check Events
             //TODO
diff --git a/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs b/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
index 343b8ed..9aa2496 100644
--- a/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
+++ b/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
@@ -10,14 +10,14 @@ public class BeatmapEntry
         public string Artist, ArtistUnicode;
         public string Title, TitleUnicode;
         public string Creator;  //mapper
-        public string Difficulty;   //called "Version" in the .osu format
+        public string Version;  //called "Version" in the .osu format
         public string AudioFileName;
         public string BeatmapChecksum;
         public string BeatmapFileName;
         public SubmissionStatus RankedStatus;
         public ushort CountHitCircles, CountSliders, CountSpinners;
         public DateTime LastModifiedTime;
-        public float DiffAR, DiffCS, DiffHP, DiffOD;
+        public float ApproachRate, CircleSize, HPDrainRate, OveralDifficulty;
         public double SliderVelocity;
         public Dictionary<Mods, double> DiffStarRatingStandard, DiffStarRatingTaiko, DiffStarRatingCtB, DiffStarRatingMania;
         public int DrainTimeSeconds;   //NOTE: in s
@@ -54,12 +54,12 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             e.Title = r.ReadString();
             e.TitleUnicode = r.ReadString();
             e.Creator = r.ReadString();
-            e.Difficulty = r.ReadString();
+            e.Version = r.ReadString();
             e.AudioFileName = r.ReadString();
             e.BeatmapChecksum = r.ReadString(); //always 32 in length, so the 2 preceding bytes in the file are practically wasting space
             e.BeatmapFileName = r.ReadString();
 
-            //Debug.WriteLine($"{e.Artist} - {e.Title} [{e.Difficulty}]");
+            //Debug.WriteLine($"{e.Artist} - {e.Title} [{e.Version}]");
 
             e.RankedStatus = (SubmissionStatus)r.ReadByte();
             e.CountHitCircles = r.ReadUInt16();
@@ -70,19 +70,19 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             //Debug.WriteLine("Last modified: " + e.LastModifiedTime + ", ranked status is " + e.RankedStatus);
 
             if (version >= 20140609) {
-                e.DiffAR = r.ReadSingle();
-                e.DiffCS = r.ReadSingle();
-                e.DiffHP = r.ReadSingle();
-                e.DiffOD = r.ReadSingle();
+                e.ApproachRate = r.ReadSingle();
+                e.CircleSize = r.ReadSingle();
+                e.HPDrainRate = r.ReadSingle();
+                e.OveralDifficulty = r.ReadSingle();
             }
             else {
-                e.DiffAR = r.ReadByte();
-                e.DiffCS = r.ReadByte();
-                e.DiffHP = r.ReadByte();
-                e.DiffOD = r.ReadByte();
+                e.ApproachRate = r.ReadByte();
+                e.CircleSize = r.ReadByte();
+                e.HPDrainRate = r.ReadByte();
+                e.OveralDifficulty = r.ReadByte();
             }
 
-            //Debug.WriteLine($"AR: {e.DiffAR} CS: {e.DiffCS} HP: {e.DiffHP} OD: {e.DiffOD}");
+            //Debug.WriteLine($"AR: {e.ApproachRate} CS: {e.CircleSize} HP: {e.HPDrainRate} OD: {e.OveralDifficulty}");
 
             e.SliderVelocity = r.ReadDouble();
 
diff --git a/osu-database-reader/Extensions.cs b/osu-database-reader/Extensions.cs
new file mode 100644
index 0000000..7465d3b
--- /dev/null
+++ b/osu-database-reader/Extensions.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu_database_reader
+{
+    internal static class Extensions
+    {
+        public static string GetValueOrNull(this Dictionary<string, string> dic, string key)
+        {
+            return dic.ContainsKey(key) 
+                ? dic[key] 
+                : null;
+        }
+    }
+}
diff --git a/osu-database-reader/TextFiles/BeatmapFile.cs b/osu-database-reader/TextFiles/BeatmapFile.cs
index 46ad558..a4573a6 100644
--- a/osu-database-reader/TextFiles/BeatmapFile.cs
+++ b/osu-database-reader/TextFiles/BeatmapFile.cs
@@ -8,7 +8,7 @@ namespace osu_database_reader.TextFiles
 {
     public class BeatmapFile
     {
-        public int BeatmapVersion;
+        public int FileFormatVersion;
 
         public Dictionary<string, string> SectionGeneral;
         public Dictionary<string, string> SectionEditor;
@@ -19,12 +19,29 @@ public class BeatmapFile
         public List<TimingPoint> TimingPoints = new List<TimingPoint>();
         public List<HitObject> HitObjects = new List<HitObject>();
 
+        //making some stuff easier to access
+        public string Artist        => SectionMetadata.GetValueOrNull("Artist");
+        public string ArtistUnicode => SectionMetadata.GetValueOrNull("ArtistUnicode");
+        public string Creator       => SectionMetadata.GetValueOrNull("Creator");
+        public string Title         => SectionMetadata.GetValueOrNull("Title");
+        public string TitleUnicode  => SectionMetadata.GetValueOrNull("TitleUnicode");
+        public string Version       => SectionMetadata.GetValueOrNull("Version");
+        public string Source        => SectionMetadata.GetValueOrNull("Source");
+        public string[] Tags        => SectionMetadata.GetValueOrNull("Tags")?.Split(' ');
+
+        public float ApproachRate      => float.Parse(SectionDifficulty.GetValueOrNull("ApproachRate"), Constants.NumberFormat);
+        public float HPDrainRate       => float.Parse(SectionDifficulty.GetValueOrNull("HPDrainRate"), Constants.NumberFormat);
+        public float CircleSize        => float.Parse(SectionDifficulty.GetValueOrNull("CircleSize"), Constants.NumberFormat);
+        public float OverallDifficulty => float.Parse(SectionDifficulty.GetValueOrNull("OverallDifficulty"), Constants.NumberFormat);
+        public float SliderMultiplier  => float.Parse(SectionDifficulty.GetValueOrNull("SliderMultiplier"), Constants.NumberFormat);
+        public float SliderTickRate    => float.Parse(SectionDifficulty.GetValueOrNull("SliderTickRate"), Constants.NumberFormat);
+
         public static BeatmapFile Read(string path)
         {
             var file = new BeatmapFile();
 
             using (var r = new CustomStreamReader(path)) {
-                if (!int.TryParse(r.ReadLine()?.Replace("osu file format v", string.Empty), out file.BeatmapVersion))
+                if (!int.TryParse(r.ReadLine()?.Replace("osu file format v", string.Empty), out file.FileFormatVersion))
                     throw new Exception("Not a valid beatmap"); //very simple check, could be better
 
                 BeatmapSection bs;
diff --git a/osu-database-reader/osu-database-reader.csproj b/osu-database-reader/osu-database-reader.csproj
index 5445db0..a9531bd 100644
--- a/osu-database-reader/osu-database-reader.csproj
+++ b/osu-database-reader/osu-database-reader.csproj
@@ -44,6 +44,7 @@
     <Compile Include="BinaryFiles\CollectionDb.cs" />
     <Compile Include="Components\Beatmaps\TimingPoint.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Extensions.cs" />
     <Compile Include="IO\CustomBinaryReader.cs" />
     <Compile Include="Enums_General.cs" />
     <Compile Include="BinaryFiles\OsuDb.cs" />

From c9aae02b9b00b26e02321cc4a6695df576c15786 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 22:19:34 +0200
Subject: [PATCH 15/19] Last-minute changes

---
 UnitTestProject/TestsBinary.cs                |  6 ++---
 .../BinaryFiles/CollectionDb.cs               |  4 +--
 osu-database-reader/BinaryFiles/OsuDb.cs      |  1 -
 .../Components/Beatmaps/BeatmapEntry.cs       | 25 ++++---------------
 .../Components/Beatmaps/Collection.cs         |  2 +-
 osu-database-reader/Constants.cs              |  7 +-----
 osu-database-reader/Enums_Beatmaps.cs         | 13 ++++++++++
 osu-database-reader/Enums_General.cs          | 17 -------------
 osu-database-reader/Extensions.cs             |  6 +----
 .../Properties/AssemblyInfo.cs                |  1 -
 10 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/UnitTestProject/TestsBinary.cs b/UnitTestProject/TestsBinary.cs
index 7412bbe..09ca827 100644
--- a/UnitTestProject/TestsBinary.cs
+++ b/UnitTestProject/TestsBinary.cs
@@ -23,10 +23,10 @@ public void ReadOsuDb()
         {
             OsuDb db = OsuDb.Read(SharedCode.GetRelativeFile("osu!.db"));
             Debug.WriteLine("Version: " + db.OsuVersion);
-            Debug.WriteLine("Amount of beatmaps: " + db.AmountOfBeatmaps);
+            Debug.WriteLine("Amount of beatmaps: " + db.Beatmaps.Count);
             Debug.WriteLine($"Account name: \"{db.AccountName}\" (account {(db.AccountUnlocked ? "not locked" : "locked, unlocked at " + db.AccountUnlockDate)})");
             Debug.WriteLine("Account rank: " + db.AccountRank);
-            for (int i = 0; i < Math.Min(10, db.AmountOfBeatmaps); i++) {   //print 10 at most
+            for (int i = 0; i < Math.Min(10, db.Beatmaps.Count); i++) {   //print 10 at most
                 var b = db.Beatmaps[i];
                 Debug.WriteLine($"{b.Artist} - {b.Title} [{b.Version}]");
             }
@@ -39,7 +39,7 @@ public void ReadCollectionDb()
             Debug.WriteLine("Version: " + db.OsuVersion);
             Debug.WriteLine("Amount of collections: " + db.Collections.Count);
             foreach (var c in db.Collections) {
-                Debug.WriteLine($" - Collection {c.Name} has {c.Md5Hashes.Count} item" + (c.Md5Hashes.Count == 1 ? "" : "s"));
+                Debug.WriteLine($" - Collection {c.Name} has {c.BeatmapHashes.Count} item" + (c.BeatmapHashes.Count == 1 ? "" : "s"));
             }
         }
 
diff --git a/osu-database-reader/BinaryFiles/CollectionDb.cs b/osu-database-reader/BinaryFiles/CollectionDb.cs
index 8219002..d45841d 100644
--- a/osu-database-reader/BinaryFiles/CollectionDb.cs
+++ b/osu-database-reader/BinaryFiles/CollectionDb.cs
@@ -18,10 +18,10 @@ public static CollectionDb Read(string path) {
 
                 for (int i = 0; i < amount; i++) {
                     var c = new Collection();
-                    c.Md5Hashes = new List<string>();
+                    c.BeatmapHashes = new List<string>();
                     c.Name = r.ReadString();
                     int amount2 = r.ReadInt32();
-                    for (int j = 0; j < amount2; j++) c.Md5Hashes.Add(r.ReadString());
+                    for (int j = 0; j < amount2; j++) c.BeatmapHashes.Add(r.ReadString());
 
                     db.Collections.Add(c);
                 }
diff --git a/osu-database-reader/BinaryFiles/OsuDb.cs b/osu-database-reader/BinaryFiles/OsuDb.cs
index b967e2d..606fce1 100644
--- a/osu-database-reader/BinaryFiles/OsuDb.cs
+++ b/osu-database-reader/BinaryFiles/OsuDb.cs
@@ -14,7 +14,6 @@ public class OsuDb
         public bool AccountUnlocked;
         public DateTime AccountUnlockDate;
         public string AccountName;
-        public int AmountOfBeatmaps => Beatmaps.Count;
         public List<BeatmapEntry> Beatmaps;
         public PlayerRank AccountRank;
 
diff --git a/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs b/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
index 9aa2496..03c74ab 100644
--- a/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
+++ b/osu-database-reader/Components/Beatmaps/BeatmapEntry.cs
@@ -10,7 +10,7 @@ public class BeatmapEntry
         public string Artist, ArtistUnicode;
         public string Title, TitleUnicode;
         public string Creator;  //mapper
-        public string Version;  //called "Version" in the .osu format
+        public string Version;  //difficulty name
         public string AudioFileName;
         public string BeatmapChecksum;
         public string BeatmapFileName;
@@ -20,8 +20,8 @@ public class BeatmapEntry
         public float ApproachRate, CircleSize, HPDrainRate, OveralDifficulty;
         public double SliderVelocity;
         public Dictionary<Mods, double> DiffStarRatingStandard, DiffStarRatingTaiko, DiffStarRatingCtB, DiffStarRatingMania;
-        public int DrainTimeSeconds;   //NOTE: in s
-        public int TotalTime;   //NOTE: in ms
+        public int DrainTimeSeconds;    //NOTE: in s
+        public int TotalTime;           //NOTE: in ms
         public int AudioPreviewTime;    //NOTE: in ms
         public List<TimingPoint> TimingPoints;
         public int BeatmapId, BeatmapSetId, ThreadId;
@@ -36,7 +36,7 @@ public class BeatmapEntry
         public DateTime LastPlayed;
         public bool IsOsz2;
         public string FolderName;
-        public DateTime LastCheckAgainstOsuRepo;    //wtf
+        public DateTime LastCheckAgainstOsuRepo;
         public bool IgnoreBeatmapSounds, IgnoreBeatmapSkin, DisableStoryBoard, DisableVideo, VisualOverride;
         public short OldUnknown1;   //unused
         public int Unknown2;
@@ -59,16 +59,12 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             e.BeatmapChecksum = r.ReadString(); //always 32 in length, so the 2 preceding bytes in the file are practically wasting space
             e.BeatmapFileName = r.ReadString();
 
-            //Debug.WriteLine($"{e.Artist} - {e.Title} [{e.Version}]");
-
             e.RankedStatus = (SubmissionStatus)r.ReadByte();
             e.CountHitCircles = r.ReadUInt16();
             e.CountSliders = r.ReadUInt16();
             e.CountSpinners = r.ReadUInt16();
             e.LastModifiedTime = r.ReadDateTime();
 
-            //Debug.WriteLine("Last modified: " + e.LastModifiedTime + ", ranked status is " + e.RankedStatus);
-
             if (version >= 20140609) {
                 e.ApproachRate = r.ReadSingle();
                 e.CircleSize = r.ReadSingle();
@@ -82,8 +78,6 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
                 e.OveralDifficulty = r.ReadByte();
             }
 
-            //Debug.WriteLine($"AR: {e.ApproachRate} CS: {e.CircleSize} HP: {e.HPDrainRate} OD: {e.OveralDifficulty}");
-
             e.SliderVelocity = r.ReadDouble();
 
             if (version >= 20140609) {
@@ -100,7 +94,7 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             e.TimingPoints = r.ReadTimingPointList();
             e.BeatmapId = r.ReadInt32();
             e.BeatmapSetId = r.ReadInt32();
-            e.ThreadId = r.ReadInt32(); //no idea what this is
+            e.ThreadId = r.ReadInt32();
 
             e.GradeStandard = (Ranking)r.ReadByte();
             e.GradeTaiko = (Ranking)r.ReadByte();
@@ -111,8 +105,6 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             e.StackLeniency = r.ReadSingle();
             e.GameMode = (GameMode)r.ReadByte();
 
-            //Debug.WriteLine("gamemode: " + e.GameMode);
-
             e.SongSource = r.ReadString();
             e.SongTags = r.ReadString();
             e.OffsetOnline = r.ReadInt16();
@@ -120,14 +112,10 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             e.Unplayed = r.ReadBoolean();
             e.LastPlayed = r.ReadDateTime();
 
-            //Debug.WriteLine("Last played: " + e.LastPlayed);
-
             e.IsOsz2 = r.ReadBoolean();
             e.FolderName = r.ReadString();
             e.LastCheckAgainstOsuRepo = r.ReadDateTime();
 
-            //Debug.WriteLine("Last osu! repo check: " + e.LastCheckAgainstOsuRepo);
-
             e.IgnoreBeatmapSounds = r.ReadBoolean();
             e.IgnoreBeatmapSkin = r.ReadBoolean();
             e.DisableStoryBoard = r.ReadBoolean();
@@ -138,11 +126,8 @@ public static BeatmapEntry ReadFromReader(CustomBinaryReader r, bool readLength
             e.Unknown2 = r.ReadInt32();
             e.ManiaScrollSpeed = r.ReadByte();
 
-            //Debug.WriteLine("Mania scroll speed: " + e.ManiaScrollSpeed);
-
             int endPosition = (int) r.BaseStream.Position;
             Debug.Assert(!readLength || length == endPosition - startPosition); //could throw error here
-            //Debug.WriteLine("---");
 
             return e;
         }
diff --git a/osu-database-reader/Components/Beatmaps/Collection.cs b/osu-database-reader/Components/Beatmaps/Collection.cs
index 118270a..903fccc 100644
--- a/osu-database-reader/Components/Beatmaps/Collection.cs
+++ b/osu-database-reader/Components/Beatmaps/Collection.cs
@@ -5,6 +5,6 @@ namespace osu_database_reader.Components.Beatmaps
     public struct Collection
     {
         public string Name;
-        public List<string> Md5Hashes;
+        public List<string> BeatmapHashes;
     }
 }
diff --git a/osu-database-reader/Constants.cs b/osu-database-reader/Constants.cs
index 16abdab..5d65bd1 100644
--- a/osu-database-reader/Constants.cs
+++ b/osu-database-reader/Constants.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Globalization;
 
 namespace osu_database_reader
 {
diff --git a/osu-database-reader/Enums_Beatmaps.cs b/osu-database-reader/Enums_Beatmaps.cs
index cd51b0d..ced5aae 100644
--- a/osu-database-reader/Enums_Beatmaps.cs
+++ b/osu-database-reader/Enums_Beatmaps.cs
@@ -30,4 +30,17 @@ public enum CurveType
         Bezier,
         Perfect
     }
+
+    public enum BeatmapSection
+    {
+        _EndOfFile,
+        General,
+        Editor,
+        Metadata,
+        Difficulty,
+        Events,
+        TimingPoints,
+        Colours,
+        HitObjects,
+    }
 }
diff --git a/osu-database-reader/Enums_General.cs b/osu-database-reader/Enums_General.cs
index 107db00..850602b 100644
--- a/osu-database-reader/Enums_General.cs
+++ b/osu-database-reader/Enums_General.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace osu_database_reader
 {
@@ -86,17 +82,4 @@ public enum Mods : int
         Key3            = 134217728,
         Key2            = 268435456
     }
-
-    public enum BeatmapSection
-    {
-        _EndOfFile,
-        General,
-        Editor,
-        Metadata,
-        Difficulty,
-        Events,
-        TimingPoints,
-        Colours,
-        HitObjects,
-    }
 }
diff --git a/osu-database-reader/Extensions.cs b/osu-database-reader/Extensions.cs
index 7465d3b..9813549 100644
--- a/osu-database-reader/Extensions.cs
+++ b/osu-database-reader/Extensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace osu_database_reader
 {
diff --git a/osu-database-reader/Properties/AssemblyInfo.cs b/osu-database-reader/Properties/AssemblyInfo.cs
index 719fce5..61befcb 100644
--- a/osu-database-reader/Properties/AssemblyInfo.cs
+++ b/osu-database-reader/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

From 19a2c265d7464aa1455680573221a4d49be78906 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 22:28:09 +0200
Subject: [PATCH 16/19] Good job HoLLy, you're great at writing complete
 sentences.

---
 UnitTestProject/SharedCode.cs | 2 +-
 UnitTestProject/TestsText.cs  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/UnitTestProject/SharedCode.cs b/UnitTestProject/SharedCode.cs
index 1be8c29..a2422e5 100644
--- a/UnitTestProject/SharedCode.cs
+++ b/UnitTestProject/SharedCode.cs
@@ -21,7 +21,7 @@ static SharedCode()
                 && !Directory.Exists(PathOsu = @"C:\Program Files\osu!\")) {        //old install dir (x86-based)
                 PathOsu = string.Empty; //if none of the previous paths exist
             }
-            //TODO: dev to create file with custom location
+            //TODO: allow dev to create file with custom location
         }
 
         public static void PreTestCheck()
diff --git a/UnitTestProject/TestsText.cs b/UnitTestProject/TestsText.cs
index 7e74307..a1df249 100644
--- a/UnitTestProject/TestsText.cs
+++ b/UnitTestProject/TestsText.cs
@@ -27,7 +27,6 @@ public void VerifyBigBlack()
                 Assert.Inconclusive("Hardcoded path does not exist:  " + beatmap);
             if (!SharedCode.VerifyFileChecksum(beatmap, "2D687E5EE79F3862AD0C60651471CDCC"))
                 Assert.Inconclusive("Beatmap was modified.");
-            //TODO: check file to not be modified. if it is: inconclusive
 
             var bm = BeatmapFile.Read(beatmap);
 

From 478e09314292f6b6eb83ce839c2c9f32ea7c19c5 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 22:30:55 +0200
Subject: [PATCH 17/19] Oh right I have CodeFactor now!

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fb5cf78..766c97f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[![CodeFactor](https://www.codefactor.io/repository/github/holly-hacker/osu-database-reader/badge)](https://www.codefactor.io/repository/github/holly-hacker/osu-database-reader)
 # osu-database-reader
 Allows for parsing/reading osu!'s database files
 

From 3d270604487f1b8fe24d79548e30e880bd169e74 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 22:34:24 +0200
Subject: [PATCH 18/19] Attempt to make CodeFactor happier (minor code
 cleaning)

Woah this is like having a girlfriend. Except girlfriends don't care about code, usually. I wouldn't know.
---
 UnitTestProject/TestsCombined.cs                | 6 +++---
 osu-database-reader/Components/Player/Replay.cs | 4 ++--
 osu-database-reader/IO/CustomBinaryReader.cs    | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/UnitTestProject/TestsCombined.cs b/UnitTestProject/TestsCombined.cs
index 025479f..7414160 100644
--- a/UnitTestProject/TestsCombined.cs
+++ b/UnitTestProject/TestsCombined.cs
@@ -29,9 +29,9 @@ public void CheckBeatmapsAgainstDb()
                 BeatmapFile bm = BeatmapFile.Read(SharedCode.GetRelativeFile($"Songs/{entry.FolderName}/{entry.BeatmapFileName}", true));
                 //BUG: this can still fail when maps use the hold note (used in some mania maps?)
 
-                Assert.IsTrue(bm.SectionGeneral.Count >= 2);   //disco prince only has 2
-                Assert.IsTrue(bm.SectionMetadata.Count >= 4);  //disco prince only has 4
-                Assert.IsTrue(bm.SectionDifficulty.Count >= 5);//disco prince only has 5
+                Assert.IsTrue(bm.SectionGeneral.Count >= 2);       //disco prince only has 2
+                Assert.IsTrue(bm.SectionMetadata.Count >= 4);      //disco prince only has 4
+                Assert.IsTrue(bm.SectionDifficulty.Count >= 5);    //disco prince only has 5
 
                 Assert.AreEqual(entry.Artist, bm.Artist);
                 Assert.AreEqual(entry.Version, bm.Version);
diff --git a/osu-database-reader/Components/Player/Replay.cs b/osu-database-reader/Components/Player/Replay.cs
index a5a8f5f..13cb86c 100644
--- a/osu-database-reader/Components/Player/Replay.cs
+++ b/osu-database-reader/Components/Player/Replay.cs
@@ -14,9 +14,9 @@ namespace osu_database_reader.Components.Player
         public ushort Combo;
         public bool FullCombo;
         public Mods Mods;
-        public string LifeGraphData;//null in scores.db, TODO: parse this when implementing .osr
+        public string LifeGraphData;    //null in scores.db, TODO: parse this when implementing .osr
         public DateTime TimePlayed;
-        public byte[] ReplayData;   //null in scores.db
+        public byte[] ReplayData;       //null in scores.db
         public long? ScoreId;
 
         public static Replay Read(string path) {
diff --git a/osu-database-reader/IO/CustomBinaryReader.cs b/osu-database-reader/IO/CustomBinaryReader.cs
index 26e2056..62ae8a7 100644
--- a/osu-database-reader/IO/CustomBinaryReader.cs
+++ b/osu-database-reader/IO/CustomBinaryReader.cs
@@ -53,7 +53,5 @@ public List<TimingPoint> ReadTimingPointList() {
             for (int i = 0; i < length; i++) list.Add(TimingPoint.ReadFromReader(this));
             return list;
         }
-
-        
     }
 }

From 80bd4b04f9ee2644f0ba6b1f4b816f2c78e20036 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Aug 2017 22:38:23 +0200
Subject: [PATCH 19/19] Make CodeFactor happy at the cost of my own happiness
 (code unfolding)

---
 .../Components/HitObjects/HitObjectSlider.cs     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu-database-reader/Components/HitObjects/HitObjectSlider.cs b/osu-database-reader/Components/HitObjects/HitObjectSlider.cs
index 1b73a1e..f1bca0e 100644
--- a/osu-database-reader/Components/HitObjects/HitObjectSlider.cs
+++ b/osu-database-reader/Components/HitObjects/HitObjectSlider.cs
@@ -16,10 +16,18 @@ public void ParseSliderSegments(string sliderString)
             foreach (var s in split) {
                 if (s.Length == 1) {   //curve type
                     switch (s[0]) {
-                        case 'L': CurveType = CurveType.Linear;  break;
-                        case 'C': CurveType = CurveType.Catmull; break;
-                        case 'P': CurveType = CurveType.Perfect; break;
-                        case 'B': CurveType = CurveType.Bezier;  break;
+                        case 'L':
+                            CurveType = CurveType.Linear;
+                            break;
+                        case 'C':
+                            CurveType = CurveType.Catmull;
+                            break;
+                        case 'P':
+                            CurveType = CurveType.Perfect;
+                            break;
+                        case 'B':
+                            CurveType = CurveType.Bezier;
+                            break;
                     }
                     continue;
                 }