diff --git a/ConsoleGUI/Container.cs b/ConsoleGUI/Container.cs index 981eae3..5a0bcbc 100644 --- a/ConsoleGUI/Container.cs +++ b/ConsoleGUI/Container.cs @@ -22,7 +22,7 @@ namespace DTLib.ConsoleGUI void ParseLayoutFile(string layout_file) { - DtsodV22 layout = new(File.ReadAllText(layout_file)); + DtsodV23 layout = new(File.ReadAllText(layout_file)); AnchorPoint = (layout[Name]["anchor"][0], layout[Name]["anchor"][1]); Width = layout[Name]["width"]; Height = layout[Name]["height"]; diff --git a/DTLib.csproj b/DTLib.csproj index 1ff8a22..97598e4 100644 --- a/DTLib.csproj +++ b/DTLib.csproj @@ -40,6 +40,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/Network/FSP.cs b/Network/FSP.cs index 0100036..075e09f 100644 --- a/Network/FSP.cs +++ b/Network/FSP.cs @@ -168,7 +168,7 @@ namespace DTLib.Network if (!dirOnClient.EndsWith("\\")) dirOnClient += "\\"; if (!dirOnServer.EndsWith("\\")) dirOnServer += "\\"; Debug("b", "downloading manifest <", "c", dirOnServer + "manifest.dtsod", "b", ">\n"); - var manifest = new DtsodV22(DownloadFileToMemory(dirOnServer + "manifest.dtsod").ToStr()); + var manifest = new DtsodV23(DownloadFileToMemory(dirOnServer + "manifest.dtsod").ToStr()); Debug("g", $"found {manifest.Values.Count} files in manifest\n"); var hasher = new Hasher(); foreach (string fileOnServer in manifest.Keys) @@ -211,7 +211,7 @@ namespace DTLib.Network } } - public static void CreateManifest(string dir) + public static DtsodV23 CreateManifest(string dir) { if (!dir.EndsWith("\\")) dir += "\\"; Log($"b", $"creating manifest of {dir}\n"); @@ -227,15 +227,15 @@ namespace DTLib.Network manifestBuilder.Append(hash.HashToString()); manifestBuilder.Append("\";\n"); } - File.WriteAllText(dir + "manifest.dtsod", manifestBuilder.ToString()); - Log($"g", $" manifest of {dir} created\n"); + Debug($"g", $" manifest of {dir} created\n"); + return new DtsodV23(manifestBuilder.ToString()); } - void Debug(params string[] msg) + static void Debug(params string[] msg) { if (debug) Log(msg); } - void DebugNoTime(params string[] msg) + static void DebugNoTime(params string[] msg) { if (debug) LogNoTime(msg); } diff --git a/Network/Package.cs b/Network/Package.cs index 18ff8a8..87aabac 100644 --- a/Network/Package.cs +++ b/Network/Package.cs @@ -53,5 +53,11 @@ namespace DTLib.Network var rec = socket.GetPackage().ToStr(); if (rec != answer) throw new Exception($"GetAnswer() error: invalid answer: <{rec}>"); } + + public static byte[] RequestPackage(this Socket socket, byte[] request) + { + socket.SendPackage(request); + return socket.GetPackage(); + } } } diff --git a/TImer.cs b/TImer.cs index cb154ec..90c4d42 100644 --- a/TImer.cs +++ b/TImer.cs @@ -23,9 +23,10 @@ namespace DTLib method(); } while (Repeat); }); - TimerThread.Start(); } + public void Start() => TimerThread.Start(); + // завершение потока public void Stop() {