Added more readers

Author: Ceiridge

DynmapFilesToSQLite/Converter/Converter.cs

@@ -8,9 +8,14 @@
 namespace DynmapFilesToSQLite.Converter {
     public class Converter {
         public static void Convert(DirectoryInfo tilesFolder, DirectoryInfo markersFolder, FileInfo outputFile, bool useJPG) {
+            MapTypesReader mapTypesReader = new MapTypesReader(tilesFolder);
+
             List<DynReader> readers = new List<DynReader>();
             readers.Add(new MarkerIconsReader(markersFolder));
+            readers.Add(new MarkerFilesReader(markersFolder));
             readers.Add(new FacesReader(new DirectoryInfo(Path.Combine(tilesFolder.FullName, "faces"))));
+            readers.Add(new SchemaVersionWriter(null));
+            readers.Add(mapTypesReader);
 
             SQLiteWriter writer = new SQLiteWriter(outputFile);
             writer.CreateTables();

DynmapFilesToSQLite/Converter/Reader/impl/MapTypesReader.cs

@@ -0,0 +1,49 @@
+using Microsoft.Data.Sqlite;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace DynmapFilesToSQLite.Converter.Reader.impl {
+    public class MapTypesReader : DynReader {
+        public List<MapType> mapTypes = new List<MapType>();
+
+        public MapTypesReader(DirectoryInfo myDir) : base(myDir) { }
+
+        public override void ExecuteSqliteCommands(SqliteTransaction transaction) {
+            List<DirectoryInfo> worldNames = new List<DirectoryInfo>();
+            worldNames.AddRange(myDir.EnumerateDirectories().Where(dir => {
+                return !dir.Name.Equals("_markers_") && !dir.Name.Equals("faces");
+            }));
+
+            foreach(DirectoryInfo world in worldNames) {
+                foreach(DirectoryInfo mapId in world.EnumerateDirectories()) {
+                    MapType type;
+                    mapTypes.Add(type = new MapType {
+                        mapId = mapId.Name,
+                        worldName = world.Name,
+                        variant = "STANDARD"
+                    });
+
+                    SqliteCommand cmd = new SqliteCommand();
+                    cmd.CommandText = "INSERT INTO Maps VALUES (@ID, @WorldID, @MapID, @Variant);";
+
+                    cmd.Parameters.AddWithValue("@ID", mapTypes.Count);
+                    cmd.Parameters.AddWithValue("@WorldID", type.worldName);
+                    cmd.Parameters.AddWithValue("@MapID", type.mapId);
+                    cmd.Parameters.AddWithValue("@Variant", type.variant);
+
+                    cmd.Transaction = transaction;
+                    cmd.Connection = transaction.Connection;
+                    cmd.ExecuteNonQuery();
+
+                    Console.WriteLine("Added new map type: " + mapTypes.Count);
+                }
+            }
+        }
+
+        public struct MapType {
+            public string worldName, mapId, variant;
+        }
+    }
+}

DynmapFilesToSQLite/Converter/Reader/impl/MarkerFilesReader.cs

@@ -0,0 +1,30 @@
+using Microsoft.Data.Sqlite;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace DynmapFilesToSQLite.Converter.Reader.impl {
+    public class MarkerFilesReader : DynReader {
+        public MarkerFilesReader(DirectoryInfo myDir) : base(myDir) { }
+
+        public override void ExecuteSqliteCommands(SqliteTransaction transaction) {
+            var markers = myDir.EnumerateFiles().Where(file => file.Name.EndsWith(".json"));
+
+            foreach (FileInfo markerInfo in markers) {
+                SqliteCommand cmd = new SqliteCommand();
+                cmd.CommandText = "INSERT INTO MarkerFiles VALUES (@Name, @ContentText);";
+
+                string name = markerInfo.Name.Substring(0, markerInfo.Name.Length - 5);
+                cmd.Parameters.AddWithValue("@Name", name);
+                cmd.Parameters.AddWithValue("@ContentText", File.ReadAllText(markerInfo.FullName, Encoding.UTF8));
+
+                cmd.Transaction = transaction;
+                cmd.Connection = transaction.Connection;
+                cmd.ExecuteNonQuery();
+
+                Console.WriteLine("Command executed for " + name + " marker");
+            }
+        }
+    }
+}

DynmapFilesToSQLite/Converter/Reader/impl/SchemaVersionWriter.cs

@@ -0,0 +1,23 @@
+using Microsoft.Data.Sqlite;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace DynmapFilesToSQLite.Converter.Reader.impl {
+    public class SchemaVersionWriter : DynReader {
+        public SchemaVersionWriter(DirectoryInfo myDir) : base(myDir) { }
+
+        public override void ExecuteSqliteCommands(SqliteTransaction transaction) {
+            SqliteCommand cmd = new SqliteCommand();
+            cmd.CommandText = "INSERT INTO SchemaVersion VALUES (@Version);";
+
+            cmd.Parameters.AddWithValue("@Version", 1); // yes this is the old one, so on newer versions, an automatic conversion should hopefully take place? that's not my problem at least...
+
+            cmd.Transaction = transaction;
+            cmd.Connection = transaction.Connection;
+            cmd.ExecuteNonQuery();
+
+            Console.WriteLine("Schema version written");
+        }
+    }
+}

DynmapFilesToSQLite/DynmapFilesToSQLite.csproj

@@ -81,7 +81,10 @@
     <Compile Include="Converter\Converter.cs" />
     <Compile Include="Converter\Reader\DynReader.cs" />
     <Compile Include="Converter\Reader\impl\FacesReader.cs" />
+    <Compile Include="Converter\Reader\impl\MapTypesReader.cs" />
+    <Compile Include="Converter\Reader\impl\MarkerFilesReader.cs" />
     <Compile Include="Converter\Reader\impl\MarkerIconsReader.cs" />
+    <Compile Include="Converter\Reader\impl\SchemaVersionWriter.cs" />
     <Compile Include="Converter\SQLiteWriter.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />