From b066dfabf216414571f7c713b53a644c03301302 Mon Sep 17 00:00:00 2001 From: Timerix22 <87668556+Timerix22@users.noreply.github.com> Date: Mon, 19 Jul 2021 21:35:11 +0300 Subject: [PATCH] Delete .old 0 directory --- .old 0/dtlauncher-client/App.config | 6 - .old 0/dtlauncher-client/Program.cs | 153 ------------------ .../Properties/AssemblyInfo.cs | 35 ---- .../dtlauncher-client.csproj | 52 ------ .old 0/dtlauncher-server/App.config | 6 - .old 0/dtlauncher-server/Program.cs | 145 ----------------- .../Properties/AssemblyInfo.cs | 35 ---- .../dtlauncher-server.csproj | 56 ------- .old 0/dtlauncher.sln | 36 ----- 9 files changed, 524 deletions(-) delete mode 100644 .old 0/dtlauncher-client/App.config delete mode 100644 .old 0/dtlauncher-client/Program.cs delete mode 100644 .old 0/dtlauncher-client/Properties/AssemblyInfo.cs delete mode 100644 .old 0/dtlauncher-client/dtlauncher-client.csproj delete mode 100644 .old 0/dtlauncher-server/App.config delete mode 100644 .old 0/dtlauncher-server/Program.cs delete mode 100644 .old 0/dtlauncher-server/Properties/AssemblyInfo.cs delete mode 100644 .old 0/dtlauncher-server/dtlauncher-server.csproj delete mode 100644 .old 0/dtlauncher.sln diff --git a/.old 0/dtlauncher-client/App.config b/.old 0/dtlauncher-client/App.config deleted file mode 100644 index 193aecc..0000000 --- a/.old 0/dtlauncher-client/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.old 0/dtlauncher-client/Program.cs b/.old 0/dtlauncher-client/Program.cs deleted file mode 100644 index 211d681..0000000 --- a/.old 0/dtlauncher-client/Program.cs +++ /dev/null @@ -1,153 +0,0 @@ -using DTLib; -using System; -using System.IO; -using System.Net; -using System.Net.Sockets; -using System.Threading; - -namespace dtlauncher_client -{ - class Program - { - static ConsoleGUI gui = new ConsoleGUI(90, 30); - static Socket mainSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); - static string logfile = $"logs\\client-{DateTime.UtcNow}.log".Replace(':', '-').Replace(' ', '_'); - static bool enter = false; - - static void Main() - { - try - { - Console.Title = "dtlauncher"; - gui.ReadFromFile("gui\\start_tab.gui"); - gui.ShowAll(); - NetWork.Log += Log; - // подключение к серверу - /*mainSocket.Connect(new IPEndPoint(Dns.GetHostAddresses( - FileWork.ReadFromConfig("client.cfg", "central server ip"))[0], - Convert.ToInt32(FileWork.ReadFromConfig("client.cfg", "central server port")))); - mainSocket.ReceiveTimeout = 5000; - gui.ChangeLine(3, 4, 'y', "trying to connect to the main server..."); - string recieved = mainSocket.Request("new user connection try").ToStr(); - if (recieved != "new user connection created") - throw new Exception("can't connect to the main server"); - gui.ChangeLine(3, 5, 'g', "connected to the main server"); - //NetWork.RequestServersList(mainSocket); - gui.ResetCursor();*/ - Input(); - } - catch (Exception e) - { - Log("r", "\nerror:\n" + e.Message + "\n" + e.StackTrace + '\n'); - Console.ReadLine(); - } - } - - static string inputText = ""; - static void Input() - { - while (true) - { - ConsoleKeyInfo readKeyResult = Console.ReadKey(true); // Считывание ввода - switch (readKeyResult.Key) - { - case ConsoleKey.F1: - gui.ReadFromFile("gui\\files_tab.gui"); - for (sbyte i = 3; i < 89; i++) - gui.ChangeColor(i, 1, 'w'); - for (sbyte i = 3; i < 13; i++) - gui.ChangeColor(i, 1, 'c'); - gui.UpdateAll(); - break; - case ConsoleKey.F2: - gui.ReadFromFile("gui\\servers_tab.gui"); - for (sbyte i = 3; i < 89; i++) - gui.ChangeColor(i, 1, 'w'); - for (sbyte i = 19; i < 31; i++) - gui.ChangeColor(i, 1, 'c'); - gui.UpdateAll(); - break; - case ConsoleKey.F3: - gui.ReadFromFile("gui\\settings_tab.gui"); - for (sbyte i = 3; i < 89; i++) - gui.ChangeColor(i, 1, 'w'); - for (sbyte i = 37; i < 50; i++) - gui.ChangeColor(i, 1, 'c'); - gui.UpdateAll(); - break; - case ConsoleKey.F4: - return; - case ConsoleKey.F5: - Console.Clear(); - gui.ShowAll(); - break; - case ConsoleKey.F6: - break; - /*case ConsoleKey.F7: - break; - case ConsoleKey.F8: - break; - case ConsoleKey.F9: - break; - case ConsoleKey.F10: - break; - case ConsoleKey.F11: - break; - case ConsoleKey.F12: - break; - case ConsoleKey.UpArrow: - break; - case ConsoleKey.DownArrow: - break; - case ConsoleKey.LeftArrow: - break; - case ConsoleKey.RightArrow: - break; - case ConsoleKey.PageUp: - break; - case ConsoleKey.PageDown: - break; - case ConsoleKey.Home: - break; - case ConsoleKey.End: - break; - case ConsoleKey.Escape: - break; - case ConsoleKey.Enter: - enter = true; - break; - case ConsoleKey.Backspace: - if (inputText.Length > 0) - inputText = inputText.Remove(inputText.Length - 1); - break;*/ - default: - inputText += readKeyResult.KeyChar; - break; - } - } - } - static void Log(string color, string msg) - { - ColoredText.WriteColored(color, msg); - FileWork.Log(logfile, msg); - } - - static void Log(string[] input) - { - if (input.Length % 2 == 0) - { - ColoredText.WriteColored(input); - string str = ""; - for (ushort i = 0; i < input.Length; i++) - { - str += input[++i]; - } - FileWork.Log(logfile, str); - } - else - { - throw new Exception("error in Log(): every text string must have color string before"); - } - } - } -} diff --git a/.old 0/dtlauncher-client/Properties/AssemblyInfo.cs b/.old 0/dtlauncher-client/Properties/AssemblyInfo.cs deleted file mode 100644 index a46c9ad..0000000 --- a/.old 0/dtlauncher-client/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// Общие сведения об этой сборке предоставляются следующим набором -// набора атрибутов. Измените значения этих атрибутов для изменения сведений, -// связанные с этой сборкой. -[assembly: AssemblyTitle("dtlauncher-client")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("dtlauncher-client")] -[assembly: AssemblyCopyright("Copyright © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми -// для компонентов COM. Если необходимо обратиться к типу в этой сборке через -// из модели COM задайте для атрибута ComVisible этого типа значение true. -[assembly: ComVisible(false)] - -// Следующий GUID представляет идентификатор typelib, если этот проект доступен из модели COM -[assembly: Guid("eab95dec-0d9b-4e17-8875-0159358ac240")] - -// Сведения о версии сборки состоят из указанных ниже четырех значений: -// -// Основной номер версии -// Дополнительный номер версии -// Номер сборки -// Номер редакции -// -// Можно задать все значения или принять номера сборки и редакции по умолчанию -// используя "*", как показано ниже: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/.old 0/dtlauncher-client/dtlauncher-client.csproj b/.old 0/dtlauncher-client/dtlauncher-client.csproj deleted file mode 100644 index 541ab01..0000000 --- a/.old 0/dtlauncher-client/dtlauncher-client.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - - Debug - AnyCPU - {EAB95DEC-0D9B-4E17-8875-0159358AC240} - Exe - dtlauncher_client - dtlauncher-client - v4.8 - 512 - true - true - - - AnyCPU - none - true - bin\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - {ce793497-2d5c-42d8-b311-e9b32af9cdfb} - DTLib - - - - - del /f /q dtlauncher-client.exe.config - - \ No newline at end of file diff --git a/.old 0/dtlauncher-server/App.config b/.old 0/dtlauncher-server/App.config deleted file mode 100644 index 193aecc..0000000 --- a/.old 0/dtlauncher-server/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.old 0/dtlauncher-server/Program.cs b/.old 0/dtlauncher-server/Program.cs deleted file mode 100644 index f0e9b2d..0000000 --- a/.old 0/dtlauncher-server/Program.cs +++ /dev/null @@ -1,145 +0,0 @@ -using DTLib; -using System; -using System.Net; -using System.Net.Sockets; -using System.Threading; -using static DTLib.NetWork; - -namespace dtlauncher_server -{ - class Program - { - static ConsoleGUI gui = new ConsoleGUI(90, 30); - static string logfile = $"logs\\client-{DateTime.UtcNow}.log".Replace(':', '-').Replace(' ', '_'); - static Socket mainSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); - //static Dictionary users = new Dictionary(); - - static void Main(string[] args) - { - while (true) - { - try - { - Console.Title = "dtlauncher server"; - gui.ReadFromFile("gui\\main.gui"); - gui.ShowAll(); - NetWork.Log += Log; - Log("b", $"<{FileWork.ReadFromConfig("server.cfg", "server ip")}> : <{Convert.ToInt32(FileWork.ReadFromConfig("server.cfg", "server port"))}>\n"); - mainSocket.Bind(new IPEndPoint(IPAddress.Parse( - FileWork.ReadFromConfig("server.cfg", "server ip")), - Convert.ToInt32(FileWork.ReadFromConfig("server.cfg", "server port")))); - Log("g", "server started succesfully\n"); - //Thread userCheckThread = new Thread(CloseUnusedUserThreads); - //userCheckThread.Start(); - try - { - mainSocket.Listen(200); - while (true) - { - var userSocket = mainSocket.Accept(); - var userThread = new Thread(new ParameterizedThreadStart(UserStart)); - //users.Add(userSocket, userThread); - userThread.Start(userSocket); - } - } - catch (Exception ex) - { - Log("r", $"handler error:\n message:\n {ex.Message}\nmethod:\n {ex.TargetSite}\n"); - } - } - catch (Exception ex) - { - if (mainSocket.IsBound) mainSocket.CloseSocket(); - Log("r", $"Main() error:\n message:\n {ex.Message}\nmethod:\n {ex.TargetSite}\n"); - } - Thread.Sleep(1500); - } - } - - static void Log(string color, string msg) - { - ColoredText.WriteColored(color, msg); - FileWork.Log(logfile, msg); - } - - static void Log(string[] input) - { - if (input.Length % 2 == 0) - { - ColoredText.WriteColored(input); - string str = ""; - for (ushort i = 0; i < input.Length; i++) - { - str += input[++i]; - } - FileWork.Log(logfile, str); - } - else - { - throw new Exception("error in Log(): every text string must have color string before"); - } - } - - static void UserStart(dynamic _handlerSocket) - { - Socket handlerSocket = (Socket)_handlerSocket; - try - { - string recieved = handlerSocket.GetData().ToStr(); - if (recieved == "new user connection try") - { - handlerSocket.Send("new user connection created".ToBytes()); - while (true) - { - recieved = handlerSocket.GetData().ToStr(); - switch (recieved) - { - // ответ на NetWork.Ping() - case "ping": - handlerSocket.Send("pong".ToBytes()); - break; - // отправка списка активных серверов - case "requesting servers list": - - break; - case "requesting file": - recieved = handlerSocket.GetData().ToStr(); - break; - default: - throw new Exception("unknown request: " + recieved); - } - } - } - - else - { - throw new Exception("incorrect connection try"); - } - - } - catch (Exception ex) - { - Log("y", $"UserStart() error:\n message:\n {ex.Message}\n"); - handlerSocket.CloseSocket(); - Thread.CurrentThread.Abort(); - } - } - - /*static void CloseUnusedUserThreads() - { - while (true) - { - foreach (Socket s in users.Keys) - { - if (!NetWork.Ping(s)) - { - Log("y", "closing unused user thread\n"); - users[s].Abort(); - users.Remove(s); - } - } - Thread.Sleep(300000); - } - }*/ - } -} diff --git a/.old 0/dtlauncher-server/Properties/AssemblyInfo.cs b/.old 0/dtlauncher-server/Properties/AssemblyInfo.cs deleted file mode 100644 index 13ba653..0000000 --- a/.old 0/dtlauncher-server/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// Общие сведения об этой сборке предоставляются следующим набором -// набора атрибутов. Измените значения этих атрибутов для изменения сведений, -// связанные с этой сборкой. -[assembly: AssemblyTitle("dtlauncher-server")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("dtlauncher-server")] -[assembly: AssemblyCopyright("Copyright © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми -// для компонентов COM. Если необходимо обратиться к типу в этой сборке через -// из модели COM задайте для атрибута ComVisible этого типа значение true. -[assembly: ComVisible(false)] - -// Следующий GUID представляет идентификатор typelib, если этот проект доступен из модели COM -[assembly: Guid("4f183e7c-a23d-4f5f-933c-f9f32bdc403a")] - -// Сведения о версии сборки состоят из указанных ниже четырех значений: -// -// Основной номер версии -// Дополнительный номер версии -// Номер сборки -// Номер редакции -// -// Можно задать все значения или принять номера сборки и редакции по умолчанию -// используя "*", как показано ниже: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/.old 0/dtlauncher-server/dtlauncher-server.csproj b/.old 0/dtlauncher-server/dtlauncher-server.csproj deleted file mode 100644 index 38fca35..0000000 --- a/.old 0/dtlauncher-server/dtlauncher-server.csproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Debug - AnyCPU - {4F183E7C-A23D-4F5F-933C-F9F32BDC403A} - Exe - dtlauncher_server - dtlauncher-server - v4.8 - 512 - true - true - - - AnyCPU - none - true - bin\ - DEBUG;TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - {ce793497-2d5c-42d8-b311-e9b32af9cdfb} - DTLib - - - - - - - - - del /f /q dtlauncher-server.exe.config - - \ No newline at end of file diff --git a/.old 0/dtlauncher.sln b/.old 0/dtlauncher.sln deleted file mode 100644 index 85d73f0..0000000 --- a/.old 0/dtlauncher.sln +++ /dev/null @@ -1,36 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dtlauncher-client", "dtlauncher-client\dtlauncher-client.csproj", "{EAB95DEC-0D9B-4E17-8875-0159358AC240}" - ProjectSection(ProjectDependencies) = postProject - {CE793497-2D5C-42D8-B311-E9B32AF9CDFB} = {CE793497-2D5C-42D8-B311-E9B32AF9CDFB} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dtlauncher-server", "dtlauncher-server\dtlauncher-server.csproj", "{4F183E7C-A23D-4F5F-933C-F9F32BDC403A}" - ProjectSection(ProjectDependencies) = postProject - {CE793497-2D5C-42D8-B311-E9B32AF9CDFB} = {CE793497-2D5C-42D8-B311-E9B32AF9CDFB} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib", "..\DTLib\DTLib.csproj", "{CE793497-2D5C-42D8-B311-E9B32AF9CDFB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Build|Any CPU = Build|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EAB95DEC-0D9B-4E17-8875-0159358AC240}.Build|Any CPU.ActiveCfg = Build|Any CPU - {EAB95DEC-0D9B-4E17-8875-0159358AC240}.Build|Any CPU.Build.0 = Build|Any CPU - {4F183E7C-A23D-4F5F-933C-F9F32BDC403A}.Build|Any CPU.ActiveCfg = Build|Any CPU - {4F183E7C-A23D-4F5F-933C-F9F32BDC403A}.Build|Any CPU.Build.0 = Build|Any CPU - {CE793497-2D5C-42D8-B311-E9B32AF9CDFB}.Build|Any CPU.ActiveCfg = Build|Any CPU - {CE793497-2D5C-42D8-B311-E9B32AF9CDFB}.Build|Any CPU.Build.0 = Build|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E6569C0C-DD32-4F7D-AD4C-DBC5434D2F8C} - EndGlobalSection -EndGlobal