diff --git a/src/.vs/DiscordCLI/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DiscordCLI/DesignTimeBuild/.dtbcache.v2 index da0d655..72da1cf 100644 Binary files a/src/.vs/DiscordCLI/DesignTimeBuild/.dtbcache.v2 and b/src/.vs/DiscordCLI/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/.vs/DiscordCLI/v16/.suo b/src/.vs/DiscordCLI/v16/.suo index 55f3551..1cb8282 100644 Binary files a/src/.vs/DiscordCLI/v16/.suo and b/src/.vs/DiscordCLI/v16/.suo differ diff --git a/src/DiscordCLI/DiscordCLI.csproj b/src/DiscordCLI/DiscordCLI.csproj index 3e1729e..2c2821a 100644 --- a/src/DiscordCLI/DiscordCLI.csproj +++ b/src/DiscordCLI/DiscordCLI.csproj @@ -3,9 +3,9 @@ Exe net5.0 - 0.0.4.0 - 0.0.4.0 - 0.0.4.0 + 0.0.4.1 + 0.0.4.1 + 0.0.4.1 diff --git a/src/DiscordCLI/InputManager.cs b/src/DiscordCLI/InputManager.cs index c499e27..de9c83e 100644 --- a/src/DiscordCLI/InputManager.cs +++ b/src/DiscordCLI/InputManager.cs @@ -21,6 +21,13 @@ namespace DiscordCLI commandsManager = commandsMan; } + private static IEnumerable GetFlags(Enum input) + { + foreach (Enum value in Enum.GetValues(input.GetType())) + if (input.HasFlag(value)) + yield return value; + } + public async Task ReadInput() { int inputListIndex = 0; @@ -43,29 +50,33 @@ namespace DiscordCLI if (!char.IsControl(keyInfo.KeyChar)) Input += keyInfo.KeyChar.ToString(); - if (keyInfo.Key == ConsoleKey.Backspace && Input.Length > 0) + System.Diagnostics.Debug.WriteLine(inputListIndex); + System.Diagnostics.Debug.WriteLine(previousInputs.Count - inputListIndex - 1); + if (keyInfo.KeyChar == (int)ConsoleKey.Backspace && Input.Length > 0) { Input = Input.Remove(Input.Length - 1); } else if (keyInfo.Key == ConsoleKey.UpArrow) { + int previousLength = Input.Length; if (previousInputs.Count > 0) Input = previousInputs[previousInputs.Count - inputListIndex - 1]; - if (inputListIndex < previousInputs.Count - 1) + if (inputListIndex < previousInputs.Count - 2) inputListIndex++; Console.CursorLeft = infoString.Length - 1; - Console.Write(Input + new string(' ', Console.WindowWidth - infoString.Length - 1)); + Console.Write(Input + new string(' ', Math.Max(previousLength - Input.Length, 0))); } else if (keyInfo.Key == ConsoleKey.DownArrow) { + int previousLength = Input.Length; if (previousInputs.Count > 0) Input = previousInputs[previousInputs.Count - inputListIndex - 1]; if (inputListIndex > 0) inputListIndex--; Console.CursorLeft = infoString.Length - 1; - Console.Write(Input + new string(' ', Console.WindowWidth - infoString.Length - 1)); + Console.Write(Input + new string(' ', Math.Max(previousLength - Input.Length, 0))); } Console.Write(keyInfo.KeyChar); diff --git a/src/DiscordCLI/Properties/PublishProfiles/DiscordCLI.pubxml.user b/src/DiscordCLI/Properties/PublishProfiles/DiscordCLI.pubxml.user index 8e9397c..e3efa6c 100644 --- a/src/DiscordCLI/Properties/PublishProfiles/DiscordCLI.pubxml.user +++ b/src/DiscordCLI/Properties/PublishProfiles/DiscordCLI.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-05-29T16:25:28.6698849Z;True|2021-05-29T17:53:55.7039453+02:00;True|2021-05-29T17:07:22.9610987+02:00;True|2021-05-29T16:21:45.0240481+02:00; + True|2021-05-31T17:23:33.4240354Z;True|2021-05-31T19:20:39.6710032+02:00;True|2021-05-29T18:25:28.6698849+02:00;True|2021-05-29T17:53:55.7039453+02:00;True|2021-05-29T17:07:22.9610987+02:00;True|2021-05-29T16:21:45.0240481+02:00; \ No newline at end of file diff --git a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.deps.json b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.deps.json index a2f755a..bdc1fb4 100644 --- a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.deps.json +++ b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v5.0": { - "DiscordCLI/0.0.4.0": { + "DiscordCLI/0.0.4.1": { "dependencies": { "AlwaysUpToDate": "1.0.0.3", "ColorMineStandard": "1.0.0", @@ -1013,7 +1013,7 @@ } }, "libraries": { - "DiscordCLI/0.0.4.0": { + "DiscordCLI/0.0.4.1": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.dll b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.dll index 335e064..540651f 100644 Binary files a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.dll and b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.dll differ diff --git a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.exe b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.exe index 5a3dbe5..d40c6b8 100644 Binary files a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.exe and b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.exe differ diff --git a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.pdb b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.pdb index 8078a5c..1e078bb 100644 Binary files a/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.pdb and b/src/DiscordCLI/bin/Debug/net5.0/DiscordCLI.pdb differ diff --git a/src/DiscordCLI/bin/Debug/net5.0/ref/DiscordCLI.dll b/src/DiscordCLI/bin/Debug/net5.0/ref/DiscordCLI.dll index 141203c..5ff77d9 100644 Binary files a/src/DiscordCLI/bin/Debug/net5.0/ref/DiscordCLI.dll and b/src/DiscordCLI/bin/Debug/net5.0/ref/DiscordCLI.dll differ diff --git a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.deps.json b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.deps.json index a2f755a..bdc1fb4 100644 --- a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.deps.json +++ b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v5.0": { - "DiscordCLI/0.0.4.0": { + "DiscordCLI/0.0.4.1": { "dependencies": { "AlwaysUpToDate": "1.0.0.3", "ColorMineStandard": "1.0.0", @@ -1013,7 +1013,7 @@ } }, "libraries": { - "DiscordCLI/0.0.4.0": { + "DiscordCLI/0.0.4.1": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.dll b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.dll index 454e12b..11b9f1f 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.dll and b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.dll differ diff --git a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.exe b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.exe index 5a3dbe5..d40c6b8 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.exe and b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.exe differ diff --git a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.pdb b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.pdb index 8e7ed52..cfce7e7 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.pdb and b/src/DiscordCLI/bin/Release/net5.0/DiscordCLI.pdb differ diff --git a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI.zip b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI.zip index 5a5ff80..7f0fe5b 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI.zip and b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI.zip differ diff --git a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.deps.json b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.deps.json index a2f755a..bdc1fb4 100644 --- a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.deps.json +++ b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v5.0": { - "DiscordCLI/0.0.4.0": { + "DiscordCLI/0.0.4.1": { "dependencies": { "AlwaysUpToDate": "1.0.0.3", "ColorMineStandard": "1.0.0", @@ -1013,7 +1013,7 @@ } }, "libraries": { - "DiscordCLI/0.0.4.0": { + "DiscordCLI/0.0.4.1": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.dll b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.dll index 454e12b..11b9f1f 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.dll and b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.dll differ diff --git a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.exe b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.exe index 5a3dbe5..d40c6b8 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.exe and b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.exe differ diff --git a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.pdb b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.pdb index 8e7ed52..cfce7e7 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.pdb and b/src/DiscordCLI/bin/Release/net5.0/publish/DiscordCLI/DiscordCLI.pdb differ diff --git a/src/DiscordCLI/bin/Release/net5.0/ref/DiscordCLI.dll b/src/DiscordCLI/bin/Release/net5.0/ref/DiscordCLI.dll index b1f0c80..218ca32 100644 Binary files a/src/DiscordCLI/bin/Release/net5.0/ref/DiscordCLI.dll and b/src/DiscordCLI/bin/Release/net5.0/ref/DiscordCLI.dll differ diff --git a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfo.cs b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfo.cs index a59dc2c..a365361 100644 --- a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfo.cs +++ b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfo.cs @@ -13,11 +13,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DiscordCLI")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.4.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.4.0")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.4.1")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.4.1")] [assembly: System.Reflection.AssemblyProductAttribute("DiscordCLI")] [assembly: System.Reflection.AssemblyTitleAttribute("DiscordCLI")] -[assembly: System.Reflection.AssemblyVersionAttribute("0.0.4.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("0.0.4.1")] // Von der MSBuild WriteCodeFragment-Klasse generiert. diff --git a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfoInputs.cache b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfoInputs.cache index e522cba..4e479ff 100644 --- a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfoInputs.cache +++ b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.AssemblyInfoInputs.cache @@ -1 +1 @@ -dedb7a4646bba9201d29c4cc7211a4881d770e52 +5d54ca63148aa381a54ca3c8c4317ef16b1d9b46 diff --git a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.csprojAssemblyReference.cache b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.csprojAssemblyReference.cache index 8993966..e0888e3 100644 Binary files a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.csprojAssemblyReference.cache and b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.csprojAssemblyReference.cache differ diff --git a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.dll b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.dll index 335e064..540651f 100644 Binary files a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.dll and b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.dll differ diff --git a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.pdb b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.pdb index 8078a5c..1e078bb 100644 Binary files a/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.pdb and b/src/DiscordCLI/obj/Debug/net5.0/DiscordCLI.pdb differ diff --git a/src/DiscordCLI/obj/Debug/net5.0/apphost.exe b/src/DiscordCLI/obj/Debug/net5.0/apphost.exe index 5a3dbe5..d40c6b8 100644 Binary files a/src/DiscordCLI/obj/Debug/net5.0/apphost.exe and b/src/DiscordCLI/obj/Debug/net5.0/apphost.exe differ diff --git a/src/DiscordCLI/obj/Debug/net5.0/ref/DiscordCLI.dll b/src/DiscordCLI/obj/Debug/net5.0/ref/DiscordCLI.dll index 141203c..5ff77d9 100644 Binary files a/src/DiscordCLI/obj/Debug/net5.0/ref/DiscordCLI.dll and b/src/DiscordCLI/obj/Debug/net5.0/ref/DiscordCLI.dll differ diff --git a/src/DiscordCLI/obj/DiscordCLI.csproj.nuget.dgspec.json b/src/DiscordCLI/obj/DiscordCLI.csproj.nuget.dgspec.json index 6dd65f1..1b34922 100644 --- a/src/DiscordCLI/obj/DiscordCLI.csproj.nuget.dgspec.json +++ b/src/DiscordCLI/obj/DiscordCLI.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "C:\\Users\\David\\Google Drive\\Programmieren\\DiscordCLI\\src\\DiscordCLI\\DiscordCLI.csproj": { - "version": "0.0.4", + "version": "0.0.4.1", "restore": { "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DiscordCLI\\src\\DiscordCLI\\DiscordCLI.csproj", "projectName": "DiscordCLI", diff --git a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfo.cs b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfo.cs index c0f20b0..16642f2 100644 --- a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfo.cs +++ b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfo.cs @@ -13,11 +13,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DiscordCLI")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.4.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.4.0")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.4.1")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.4.1")] [assembly: System.Reflection.AssemblyProductAttribute("DiscordCLI")] [assembly: System.Reflection.AssemblyTitleAttribute("DiscordCLI")] -[assembly: System.Reflection.AssemblyVersionAttribute("0.0.4.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("0.0.4.1")] // Von der MSBuild WriteCodeFragment-Klasse generiert. diff --git a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfoInputs.cache b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfoInputs.cache index 1c4a2a8..ec26d32 100644 --- a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfoInputs.cache +++ b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.AssemblyInfoInputs.cache @@ -1 +1 @@ -e7a28f44480e6d7c3cc5ae26796c4ed1fed24767 +6f8b673dc0e2a6469765cef6ee1a51714e2481b8 diff --git a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.dll b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.dll index 454e12b..11b9f1f 100644 Binary files a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.dll and b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.dll differ diff --git a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.pdb b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.pdb index 8e7ed52..cfce7e7 100644 Binary files a/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.pdb and b/src/DiscordCLI/obj/Release/net5.0/DiscordCLI.pdb differ diff --git a/src/DiscordCLI/obj/Release/net5.0/apphost.exe b/src/DiscordCLI/obj/Release/net5.0/apphost.exe index 5a3dbe5..d40c6b8 100644 Binary files a/src/DiscordCLI/obj/Release/net5.0/apphost.exe and b/src/DiscordCLI/obj/Release/net5.0/apphost.exe differ diff --git a/src/DiscordCLI/obj/Release/net5.0/ref/DiscordCLI.dll b/src/DiscordCLI/obj/Release/net5.0/ref/DiscordCLI.dll index b1f0c80..218ca32 100644 Binary files a/src/DiscordCLI/obj/Release/net5.0/ref/DiscordCLI.dll and b/src/DiscordCLI/obj/Release/net5.0/ref/DiscordCLI.dll differ diff --git a/src/DiscordCLI/obj/project.assets.json b/src/DiscordCLI/obj/project.assets.json index a72a9ca..d92ae24 100644 --- a/src/DiscordCLI/obj/project.assets.json +++ b/src/DiscordCLI/obj/project.assets.json @@ -5937,7 +5937,7 @@ "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { - "version": "0.0.4", + "version": "0.0.4.1", "restore": { "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DiscordCLI\\src\\DiscordCLI\\DiscordCLI.csproj", "projectName": "DiscordCLI", diff --git a/src/DiscordCLI/obj/project.nuget.cache b/src/DiscordCLI/obj/project.nuget.cache index c3bcf4f..7305a1b 100644 --- a/src/DiscordCLI/obj/project.nuget.cache +++ b/src/DiscordCLI/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "sDgX8qm8cSHJ0TDjQxLzYI0BGqd9ZbIQHKZL5+1wc6kCWhLM7an1Y8nmm5tii35pK9ispeNnJ+CPKEl6Y5a2Cg==", + "dgSpecHash": "L9MGn2vBA5FHai7RpURceOlcyJRpaPmCH6WoFdI8BFX4WsXHQqzhn9SXfp8GGFc0a4rAQ5egDzz1WCys0WIbrw==", "success": true, "projectFilePath": "C:\\Users\\David\\Google Drive\\Programmieren\\DiscordCLI\\src\\DiscordCLI\\DiscordCLI.csproj", "expectedPackageFiles": [ diff --git a/update/DiscordCLI.zip b/update/DiscordCLI.zip index b824a08..7f0fe5b 100644 Binary files a/update/DiscordCLI.zip and b/update/DiscordCLI.zip differ diff --git a/update/updateInfo.json b/update/updateInfo.json index 0179c1c..aa649a1 100644 --- a/update/updateInfo.json +++ b/update/updateInfo.json @@ -1,4 +1,4 @@ { - "Version":"0.0.4.0", + "Version":"0.0.4.1", "FileUrl":"http://github.com/Stone-Red-Code/DiscordCLI/blob/develop/update/DiscordCLI.zip?raw=true" }