From 22cd18f73389058339840d06b6fcff01c4ed9f31 Mon Sep 17 00:00:00 2001
From: Timerix22 <timerix11@gmail.com>
Date: Thu, 17 Mar 2022 23:42:51 +0300
Subject: [PATCH] DtsodV22 removed

---
 DTLib/Dtsod/DtsodDict.cs             |  41 ++-
 DTLib/Dtsod/DtsodFunctions.cs        |  37 +++
 DTLib/Dtsod/DtsodV22.cs              | 445 ---------------------------
 DTLib/Dtsod/DtsodVersionConverter.cs |  16 -
 DTLib/Dtsod/IDtsod.cs                |   2 +-
 DTLib/Network/FSP.cs                 |   2 +-
 6 files changed, 79 insertions(+), 464 deletions(-)
 create mode 100644 DTLib/Dtsod/DtsodFunctions.cs
 delete mode 100644 DTLib/Dtsod/DtsodV22.cs
 delete mode 100644 DTLib/Dtsod/DtsodVersionConverter.cs

diff --git a/DTLib/Dtsod/DtsodDict.cs b/DTLib/Dtsod/DtsodDict.cs
index 2599fb4..34a7398 100644
--- a/DTLib/Dtsod/DtsodDict.cs
+++ b/DTLib/Dtsod/DtsodDict.cs
@@ -1,6 +1,6 @@
 namespace DTLib.Dtsod;
 
-public class DtsodDict<TKey, TVal> : IDictionary<TKey, TVal>
+public class DtsodDict<TKey, TVal> : IDictionary<TKey, TVal>, IDictionary
 {
     // да, вместо собственной реализации интерфейса это ссылки на Dictionary
     readonly Dictionary<TKey, TVal> baseDict;
@@ -41,12 +41,51 @@ public class DtsodDict<TKey, TVal> : IDictionary<TKey, TVal>
        => ((ICollection<KeyValuePair<TKey, TVal>>)baseDict).Add(pair);
 
 
+    public void CopyTo(Array array, int index)
+    {
+        ((ICollection) baseDict).CopyTo(array, index);
+    }
+
     public int Count => baseDict.Count;
+    public bool IsSynchronized => ((ICollection) baseDict).IsSynchronized;
+
+    public object SyncRoot => ((ICollection) baseDict).SyncRoot;
+
     public ICollection<TKey> Keys => baseDict.Keys;
+    ICollection IDictionary.Values => ((IDictionary) baseDict).Values;
+
+    ICollection IDictionary.Keys => ((IDictionary) baseDict).Keys;
+
     public ICollection<TVal> Values => baseDict.Values;
     public bool IsReadOnly { get; } = false;
+    public object this[object key]
+    {
+        get => ((IDictionary) baseDict)[key];
+        set => ((IDictionary) baseDict)[key] = value;
+    }
+
+    public void Add(object key, object value)
+    {
+        ((IDictionary) baseDict).Add(key, value);
+    }
 
     public virtual void Clear() => baseDict.Clear();
+    public bool Contains(object key)
+    {
+        return ((IDictionary) baseDict).Contains(key);
+    }
+
+    IDictionaryEnumerator IDictionary.GetEnumerator()
+    {
+        return ((IDictionary) baseDict).GetEnumerator();
+    }
+
+    public void Remove(object key)
+    {
+        ((IDictionary) baseDict).Remove(key);
+    }
+
+    public bool IsFixedSize => ((IDictionary) baseDict).IsFixedSize;
 
     public virtual bool ContainsKey(TKey key) => baseDict.ContainsKey(key);
 
diff --git a/DTLib/Dtsod/DtsodFunctions.cs b/DTLib/Dtsod/DtsodFunctions.cs
new file mode 100644
index 0000000..4c302b8
--- /dev/null
+++ b/DTLib/Dtsod/DtsodFunctions.cs
@@ -0,0 +1,37 @@
+namespace DTLib.Dtsod;
+
+public static class DtsodFunctions
+{
+    public static IDtsod ConvertVersion(IDtsod src, DtsodVersion targetVersion)
+        => targetVersion switch
+        {
+            DtsodVersion.V21 => new DtsodV21(src.ToDictionary()),
+            DtsodVersion.V22 => throw new NotImplementedException("DtsodV22 is deprecated"),
+            DtsodVersion.V23 => new DtsodV23(src.ToDictionary()),
+#if DEBUG
+            DtsodVersion.V30 => new DtsodV30(src.ToDictionary()),
+#endif
+            _ => throw new Exception($"DtsodFunctions.Convert() error: unknown target version <{targetVersion}>"),
+        };
+
+    // заменяет дефолтные значения на пользовательские
+    public static DtsodV23 UpdateByDefault(DtsodV23 old, DtsodV23 updatedDefault)
+    {
+        DtsodV23 updated = new();
+        foreach (KeyValuePair<string,dynamic> p in updatedDefault)
+        {
+            if (old.TryGetValue(p.Key, out var oldValue))
+            {
+                if (oldValue.GetType() != p.Value.GetType())
+                    throw new Exception(
+                        "uncompatible config value type\n  " +
+                        $"launcher.dtsod: {p.Key}:{oldValue} is {oldValue.GetType()}, " +
+                        $"must be {p.Value.GetType()}");
+                else updated.Add(p.Key,oldValue);
+            }
+            else updated.Add(p.Key,p.Value);
+        }
+
+        return updated;
+    }
+}
diff --git a/DTLib/Dtsod/DtsodV22.cs b/DTLib/Dtsod/DtsodV22.cs
deleted file mode 100644
index b568d10..0000000
--- a/DTLib/Dtsod/DtsodV22.cs
+++ /dev/null
@@ -1,445 +0,0 @@
-namespace DTLib.Dtsod;
-
-// v22
-// метод ToString() теперь деконструирует объект в текст, а не возвращает параметр text из конструктора
-// деконструкция листов не работает из-за костыльного определения типов данных
-
-public class DtsodV22 : Dictionary<string, DtsodV22.ValueStruct>, IDtsod
-{
-    public DtsodVersion Version { get; } = DtsodVersion.V22;
-
-    public IDictionary<string, dynamic> ToDictionary()
-    {
-        Dictionary<string, dynamic> newdict = new();
-        foreach (KeyValuePair<string, ValueStruct> pair in this)
-            newdict.Add(pair.Key, pair.Value.Value);
-        return newdict;
-    }
-
-    public struct ValueStruct
-    {
-        public dynamic Value;
-        public ValueTypes Type;
-        public bool IsList;
-        public ValueStruct(ValueTypes type, dynamic value, bool isList)
-        {
-            Value = value;
-            Type = type;
-            IsList = isList;
-        }
-    }
-
-    public enum ValueTypes
-    {
-        List,
-        Complex,
-        String,
-        Short,
-        Int,
-        Long,
-        UShort,
-        UInt,
-        ULong,
-        Double,
-        Null,
-        Bool,
-        Unknown
-    }
-
-    public DtsodV22() { }
-
-    public DtsodV22(string text)
-    {
-        foreach (KeyValuePair<string, ValueStruct> pair in Parse(text))
-            Add(pair.Key, pair.Value);
-    }
-
-    public DtsodV22(Dictionary<string, ValueStruct> dict)
-    {
-        foreach (KeyValuePair<string, ValueStruct> pair in dict)
-            Add(pair.Key, pair.Value);
-    }
-
-    // выдаёт Exception
-    public new dynamic this[string key]
-    {
-        get => TryGetValue(key, out dynamic value) ? value : throw new Exception($"Dtsod[{key}] key not found");
-        set
-        {
-            if (!TrySetValue(key, value)) throw new Exception($"Dtsod[{key}] key not found");
-        }
-    }
-
-    // не выдаёт KeyNotFoundException
-    public bool TryGetValue(string key, out dynamic value)
-    {
-        try
-        {
-            value = base[key].Value;
-            return true;
-        }
-        catch (KeyNotFoundException)
-        {
-            value = null;
-            return false;
-        }
-    }
-    public bool TrySetValue(string key, dynamic value)
-    {
-        try
-        {
-            bool isList = value is IList;
-            base[key] = new(base[key].Type, value, isList);
-            return true;
-        }
-        catch (KeyNotFoundException)
-        { return false; }
-    }
-
-    DtsodV22 Parse(string text)
-    {
-        Dictionary<string, ValueStruct> parsed = new();
-        int i = 0;
-        for (; i < text.Length; i++)
-            ReadName();
-        return new DtsodV22(parsed);
-
-        // СЛОМАНО
-        /*void ReadCommentLine()
-        {
-            for (; i < text.Length && text[i] != '\n'; i++) Debug("h", text[i].ToString());
-        }*/
-
-        void ReadName()
-        {
-
-            bool isListElem = false;
-            dynamic value;
-            StringBuilder defaultNameBuilder = new();
-
-            for (; i < text.Length; i++)
-            {
-                switch (text[i])
-                {
-                    case ' ':
-                    case '\t':
-                    case '\r':
-                    case '\n':
-                        break;
-                    case ':':
-                        i++;
-                        string name = defaultNameBuilder.ToString();
-                        value = ReadValue(out ValueTypes type, out bool isList);
-                        if (isListElem)
-                        {
-                            if (!parsed.ContainsKey(name))
-                                parsed.Add(name, new(type, new List<dynamic>(), isList));
-                            parsed[name].Value.Add(value);
-                        }
-                        else parsed.Add(name, new(type, value, isList));
-                        return;
-                    // строка, начинающаяся с # будет считаться комментом
-                    case '#':
-                        //ReadCommentLine();
-                        break;
-                    case '}':
-                        throw new Exception("Parse.ReadName() error: unexpected '}' at " + i + " char");
-                    // если $ перед названием параметра поставить, значение value добавится в лист с названием name
-                    case '$':
-                        if (defaultNameBuilder.ToString().Length != 0)
-                            throw new Exception("Parse.ReadName() error: unexpected '$' at " + i + " char");
-                        isListElem = true;
-                        break;
-                    case ';':
-                        throw new Exception("Parse.ReadName() error: unexpected ';' at " + i + " char");
-                    default:
-                        defaultNameBuilder.Append(text[i]);
-                        break;
-                }
-            }
-        }
-
-        dynamic ReadValue(out ValueTypes outType, out bool isList)
-        {
-            ValueTypes type = ValueTypes.Unknown;
-            isList = false;
-            dynamic value = null;
-
-            string ReadString()
-            {
-                i++;
-                StringBuilder valueBuilder = new();
-                valueBuilder.Append('"');
-                for (; text[i] != '"' || text[i - 1] == '\\'; i++)
-                {
-                    valueBuilder.Append(text[i]);
-                }
-                valueBuilder.Append('"');
-                type = ValueTypes.String;
-                return valueBuilder.ToString();
-            }
-
-            List<dynamic> ReadList()
-            {
-                i++;
-                List<dynamic> output = new();
-                StringBuilder valueBuilder = new();
-                for (; text[i] != ']'; i++)
-                {
-                    switch (text[i])
-                    {
-                        case ' ':
-                        case '\t':
-                        case '\r':
-                        case '\n':
-                            break;
-                        case ',':
-                            ParseValueToRightType(valueBuilder.ToString());
-                            output.Add(value);
-                            valueBuilder.Clear();
-                            break;
-                        default:
-                            valueBuilder.Append(text[i]);
-                            break;
-                    }
-                }
-                if (valueBuilder.Length > 0)
-                {
-                    ParseValueToRightType(valueBuilder.ToString());
-                    output.Add(value);
-                }
-                type = ValueTypes.List;
-                return output;
-            }
-
-            Dictionary<string, ValueStruct> ReadComplex()
-            {
-                StringBuilder valueBuilder = new();
-                int balance = 1;
-                i++;
-                for (; balance != 0; i++)
-                {
-                    switch (text[i])
-                    {
-                        case '"':
-                            valueBuilder.Append(ReadString());
-                            break;
-                        case '}':
-                            balance--;
-                            if (balance != 0)
-                                valueBuilder.Append(text[i]);
-                            break;
-                        case '{':
-                            balance++;
-                            valueBuilder.Append(text[i]);
-                            break;
-                        default:
-                            valueBuilder.Append(text[i]);
-                            break;
-                    }
-                }
-                i--;   // i++ в for выполняется даже когда balance == 0, то есть text[i] получается == ;, что ломает всё
-                type = ValueTypes.Complex;
-                return Parse(valueBuilder.ToString());
-            }
-
-            void ParseValueToRightType(string stringValue)
-            {
-                switch (stringValue)
-                {
-
-                    // bool
-                    case "true":
-                    case "false":
-                        type = ValueTypes.Bool;
-                        value = stringValue.ToBool();
-                        break;
-                    // null
-                    case "null":
-                        type = ValueTypes.Null;
-                        value = null;
-                        break;
-                    default:
-                        if (stringValue.Contains('"'))
-                        {
-                            type = ValueTypes.String;
-                            value = stringValue.Remove(stringValue.Length - 1).Remove(0, 1);
-                        }
-                        // double
-                        else if (stringValue.Contains('.'))
-                        {
-                            type = ValueTypes.Double;
-                            value = stringValue.ToDouble();
-                        }
-                        // ushort; ulong; uint
-                        else if (stringValue.Length > 2 && stringValue[stringValue.Length - 2] == 'u')
-                        {
-                            switch (stringValue[stringValue.Length - 1])
-                            {
-                                case 's':
-                                    type = ValueTypes.UShort;
-                                    value = stringValue.Remove(stringValue.Length - 2).ToUShort();
-                                    break;
-                                case 'i':
-                                    type = ValueTypes.UInt;
-                                    value = stringValue.Remove(stringValue.Length - 2).ToUInt();
-                                    break;
-                                case 'l':
-                                    type = ValueTypes.ULong;
-                                    value = stringValue.Remove(stringValue.Length - 2).ToULong();
-                                    break;
-                                default:
-                                    throw new Exception($"Dtsod.Parse.ReadValue() error: value <{stringValue}> has wrong type");
-                            }
-                        }
-                        // short; long; int
-                        else
-                            switch (stringValue[stringValue.Length - 1])
-                            {
-                                case 's':
-                                    type = ValueTypes.Short;
-                                    value = stringValue.Remove(stringValue.Length - 1).ToShort();
-                                    break;
-                                case 'l':
-                                    type = ValueTypes.Long;
-                                    value = stringValue.Remove(stringValue.Length - 1).ToLong();
-                                    break;
-                                default:
-                                    type = ValueTypes.Int;
-                                    value = stringValue.ToInt();
-                                    break;
-                            }
-                        break;
-                }
-            }
-
-            StringBuilder defaultValueBuilder = new();
-            for (; i < text.Length; i++)
-            {
-                switch (text[i])
-                {
-                    case ' ':
-                    case '\t':
-                    case '\r':
-                    case '\n':
-                        break;
-                    case '"':
-                        value = ReadString();
-                        break;
-                    case '[':
-                        value = ReadList();
-                        break;
-                    case '{':
-                        value = ReadComplex();
-                        break;
-                    case ';':
-                        switch (type)
-                        {
-                            case ValueTypes.String:
-                                ParseValueToRightType(value);
-                                break;
-                            case ValueTypes.Unknown:
-                                ParseValueToRightType(defaultValueBuilder.ToString());
-                                break;
-                            case ValueTypes.List:
-                                isList = true;
-                                break;
-                        }
-                        outType = type;
-                        return value;
-                    // строка, начинающаяся с # будет считаться комментом
-                    case '#':
-                        //ReadCommentLine();
-                        break;
-                    default:
-                        defaultValueBuilder.Append(text[i]);
-                        break;
-                }
-            }
-            throw new Exception("Dtsod.Parse.ReadValue error: wtf it's the end of function");
-        }
-    }
-
-    public override string ToString() => Deconstruct(this);
-
-    ushort tabCount = 0;
-    string Deconstruct(DtsodV22 dtsod)
-    {
-        StringBuilder outBuilder = new();
-        foreach (string key in dtsod.Keys)
-        {
-            outBuilder.Append('\t', tabCount);
-            outBuilder.Append(key);
-            outBuilder.Append(": ");
-            dtsod.TryGetValue(key, out ValueStruct value);
-            switch (value.Type)
-            {
-                case ValueTypes.List:
-                    outBuilder.Append('[').Append(StringConverter.MergeToString((IEnumerable<object>)value.Value, ",")).Append(']');
-                    //outBuilder.Append("\"list deconstruction is'nt implemented yet\"");
-                    break;
-                case ValueTypes.Complex:
-                    outBuilder.Append('\n');
-                    outBuilder.Append('\t', tabCount);
-                    outBuilder.Append("{\n");
-                    tabCount++;
-                    outBuilder.Append(Deconstruct(value.Value));
-                    tabCount--;
-                    outBuilder.Append('\t', tabCount);
-                    outBuilder.Append('}');
-                    break;
-                case ValueTypes.String:
-                    outBuilder.Append('\"');
-                    outBuilder.Append(value.Value.ToString());
-                    outBuilder.Append('\"');
-                    break;
-                case ValueTypes.Short:
-                    outBuilder.Append(value.Value.ToString());
-                    outBuilder.Append('s');
-                    break;
-                case ValueTypes.Int:
-                    outBuilder.Append(value.Value.ToString());
-                    break;
-                case ValueTypes.Long:
-                    outBuilder.Append(value.Value.ToString());
-                    outBuilder.Append('l');
-                    break;
-                case ValueTypes.UShort:
-                    outBuilder.Append(value.Value.ToString());
-                    outBuilder.Append("us");
-                    break;
-                case ValueTypes.UInt:
-                    outBuilder.Append(value.Value.ToString());
-                    outBuilder.Append("ui");
-                    break;
-                case ValueTypes.ULong:
-                    outBuilder.Append(value.Value.ToString());
-                    outBuilder.Append("ul");
-                    break;
-                case ValueTypes.Double:
-                    outBuilder.Append(value.Value.ToString(System.Globalization.CultureInfo.InvariantCulture));
-                    break;
-                case ValueTypes.Null:
-                    outBuilder.Append("null");
-                    break;
-                case ValueTypes.Bool:
-                    outBuilder.Append(value.Value.ToString().ToLower());
-                    break;
-                default:
-                    throw new Exception($"Dtsod.Deconstruct() error: unknown type: {value.Type}");
-            }
-
-            outBuilder.Append(";\n");
-        }
-        return outBuilder.ToString();
-    }
-
-    public void Add(KeyValuePair<string, ValueStruct> a) => Add(a.Key, a.Value);
-
-    public DtsodV22 Extend(DtsodV22 newPart)
-    {
-        foreach (KeyValuePair<string, ValueStruct> pair in newPart)
-            Add(pair.Key, pair.Value);
-        return this;
-    }
-}
diff --git a/DTLib/Dtsod/DtsodVersionConverter.cs b/DTLib/Dtsod/DtsodVersionConverter.cs
deleted file mode 100644
index 13d6bbc..0000000
--- a/DTLib/Dtsod/DtsodVersionConverter.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace DTLib.Dtsod;
-
-public static class DtsodVersionConverter
-{
-    public static IDtsod Convert(IDtsod src, DtsodVersion targetVersion)
-        => targetVersion switch
-        {
-            DtsodVersion.V21 => new DtsodV21(src.ToDictionary()),
-            DtsodVersion.V22 => throw new NotImplementedException("Converting dtsods to V22 isn't implemented"),
-            DtsodVersion.V23 => new DtsodV23(src.ToDictionary()),
-#if DEBUG
-            DtsodVersion.V30 => new DtsodV30(src.ToDictionary()),
-#endif
-            _ => throw new Exception($"DtsodVersionConverter.Convert() error: unknown target version <{targetVersion}>"),
-        };
-}
diff --git a/DTLib/Dtsod/IDtsod.cs b/DTLib/Dtsod/IDtsod.cs
index b372db8..3c4058c 100644
--- a/DTLib/Dtsod/IDtsod.cs
+++ b/DTLib/Dtsod/IDtsod.cs
@@ -3,6 +3,6 @@
 public interface IDtsod
 {
     public DtsodVersion Version { get; }
-
     public IDictionary<string, dynamic> ToDictionary();
+    public dynamic this[string s] { get; set; }
 }
diff --git a/DTLib/Network/FSP.cs b/DTLib/Network/FSP.cs
index 6aac678..4c48d60 100644
--- a/DTLib/Network/FSP.cs
+++ b/DTLib/Network/FSP.cs
@@ -139,7 +139,7 @@ public class FSP
         if (!dirOnServer.EndsWith("\\"))
             dirOnServer += "\\";
         Debug("b", "downloading manifest <", "c", dirOnServer + "manifest.dtsod", "b", ">");
-        var manifest = new DtsodV22(DownloadFileToMemory(dirOnServer + "manifest.dtsod").BytesToString());
+        var manifest = new DtsodV23(DownloadFileToMemory(dirOnServer + "manifest.dtsod").BytesToString());
         Debug("g", $"found {manifest.Values.Count} files in manifest");
         var hasher = new Hasher();
         foreach (string fileOnServer in manifest.Keys)