chylex/Query
1
0
Fork 0
mirror of https://github.com/chylex/Query.git synced 2025-05-19 16:34:06 +02:00
Code

Reformat code

Browse Source
This commit is contained in:
chylex 2024-07-29 17:02:09 +02:00
parent 9a386d25f4
commit a283fe7c9e
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
35 changed files with 1529 additions and 1542 deletions

136
AppCalc/App.cs
View File

@ -6,182 +6,188 @@ using System.Text;
using System.Text.RegularExpressions;
using Base;
namespace AppCalc{
public sealed class App : IApp{
namespace AppCalc {
public sealed class App : IApp {
private static readonly Regex RegexValidCharacters = new Regex(@"^[\s\d\.\-+*/%^]+$", RegexOptions.Compiled);
private static readonly Regex RegexTokenSeparator = new Regex(@"((?<!\d)-?(((\d+)?\.\d+(\.\.\.)?)|\d+))|[^\d\s]", RegexOptions.ExplicitCapture | RegexOptions.Compiled);
private static readonly Regex RegexRecurringDecimal = new Regex(@"\b(?:(\d+?\.\d{0,}?)(\d+?)\2+|([\d+?\.]*))\b", RegexOptions.Compiled);
private static readonly char[] SplitSpace = { ' ' };
public string[] RecognizedNames => new string[]{
public string[] RecognizedNames => new string[] {
"calc",
"calculate",
"calculator"
};
public MatchConfidence GetConfidence(Command cmd){
public MatchConfidence GetConfidence(Command cmd) {
return RegexValidCharacters.IsMatch(cmd.Text) ? MatchConfidence.Possible : MatchConfidence.None;
}
string IApp.ProcessCommand(Command cmd){
string IApp.ProcessCommand(Command cmd) {
return ParseAndProcessExpression(cmd.Text);
}
private static string ParseAndProcessExpression(string text){
private static string ParseAndProcessExpression(string text) {
// text = RegexBalancedParentheses.Replace(text, match => " "+ParseAndProcessExpression(match.Groups[1].Value)+" "); // parens are handled as apps
string expression = RegexTokenSeparator.Replace(text, match => " "+match.Value+" ");
string expression = RegexTokenSeparator.Replace(text, match => " " + match.Value + " ");
string[] tokens = expression.Split(SplitSpace, StringSplitOptions.RemoveEmptyEntries);
decimal result = ProcessExpression(tokens);
if (Math.Abs(result-decimal.Round(result)) < 0.0000000000000000000000000010M){
if (Math.Abs(result - decimal.Round(result)) < 0.0000000000000000000000000010M) {
return decimal.Round(result).ToString(CultureInfo.InvariantCulture);
}
string res = result.ToString(CultureInfo.InvariantCulture);
bool hasDecimalPoint = decimal.Round(result) != result;
if (res.Length == 30 && hasDecimalPoint && res.IndexOf('.') < 15){ // Length 30 uses all available bytes
res = res.Substring(0, res.Length-1);
if (res.Length == 30 && hasDecimalPoint && res.IndexOf('.') < 15) { // Length 30 uses all available bytes
res = res.Substring(0, res.Length - 1);
Match match = RegexRecurringDecimal.Match(res);
if (match.Groups[2].Success){
if (match.Groups[2].Success) {
string repeating = match.Groups[2].Value;
StringBuilder build = new StringBuilder(34);
build.Append(match.Groups[1].Value);
do{
do {
build.Append(repeating);
}while(build.Length+repeating.Length <= res.Length);
} while (build.Length + repeating.Length <= res.Length);
return build.Append(repeating.Substring(0, 1+build.Length-res.Length)).Append("...").ToString();
return build.Append(repeating.Substring(0, 1 + build.Length - res.Length)).Append("...").ToString();
}
}
else if (hasDecimalPoint){
else if (hasDecimalPoint) {
res = res.TrimEnd('0');
}
return res;
}
private static decimal ProcessExpression(string[] tokens){
private static decimal ProcessExpression(string[] tokens) {
bool isPostfix;
if (tokens.Length < 3){
if (tokens.Length < 3) {
isPostfix = false;
}
else{
try{
else {
try {
ParseNumberToken(tokens[0]);
}catch(CommandException){
} catch (CommandException) {
throw new CommandException("Prefix notation is not supported.");
}
try{
try {
ParseNumberToken(tokens[1]);
isPostfix = true;
}catch(CommandException){
} catch (CommandException) {
isPostfix = false;
}
}
if (isPostfix){
if (isPostfix) {
return ProcessPostfixExpression(tokens);
}
else{
else {
return ProcessPostfixExpression(ConvertInfixToPostfix(tokens));
}
}
private static IEnumerable<string> ConvertInfixToPostfix(IEnumerable<string> tokens){
private static IEnumerable<string> ConvertInfixToPostfix(IEnumerable<string> tokens) {
Stack<string> operators = new Stack<string>();
foreach(string token in tokens){
if (Operators.With2Operands.Contains(token)){
foreach (string token in tokens) {
if (Operators.With2Operands.Contains(token)) {
int currentPrecedence = Operators.GetPrecedence(token);
bool currentRightAssociative = Operators.IsRightAssociative(token);
while(operators.Count > 0){
while (operators.Count > 0) {
int topPrecedence = Operators.GetPrecedence(operators.Peek());
if ((currentRightAssociative && currentPrecedence < topPrecedence) || (!currentRightAssociative && currentPrecedence <= topPrecedence)){
if ((currentRightAssociative && currentPrecedence < topPrecedence) || (!currentRightAssociative && currentPrecedence <= topPrecedence)) {
yield return operators.Pop();
}
else{
else {
break;
}
}
operators.Push(token);
}
else{
else {
yield return ParseNumberToken(token).ToString(CultureInfo.InvariantCulture);
}
}
while(operators.Count > 0){
while (operators.Count > 0) {
yield return operators.Pop();
}
}
private static decimal ProcessPostfixExpression(IEnumerable<string> tokens){
private static decimal ProcessPostfixExpression(IEnumerable<string> tokens) {
Stack<decimal> stack = new Stack<decimal>();
foreach(string token in tokens){
foreach (string token in tokens) {
decimal operand1, operand2;
if (token == "-" && stack.Count == 1){
if (token == "-" && stack.Count == 1) {
operand2 = stack.Pop();
operand1 = 0M;
}
else if (Operators.With2Operands.Contains(token)){
if (stack.Count < 2){
else if (Operators.With2Operands.Contains(token)) {
if (stack.Count < 2) {
throw new CommandException("Incorrect syntax, not enough numbers in stack.");
}
operand2 = stack.Pop();
operand1 = stack.Pop();
}
else{
else {
operand1 = operand2 = 0M;
}
switch(token){
case "+": stack.Push(operand1+operand2); break;
case "-": stack.Push(operand1-operand2); break;
case "*": stack.Push(operand1*operand2); break;
switch (token) {
case "+":
stack.Push(operand1 + operand2);
break;
case "-":
stack.Push(operand1 - operand2);
break;
case "*":
stack.Push(operand1 * operand2);
break;
case "/":
if (operand2 == 0M){
if (operand2 == 0M) {
throw new CommandException("Cannot divide by zero.");
}
stack.Push(operand1/operand2);
stack.Push(operand1 / operand2);
break;
case "%":
if (operand2 == 0M){
if (operand2 == 0M) {
throw new CommandException("Cannot divide by zero.");
}
stack.Push(operand1%operand2);
stack.Push(operand1 % operand2);
break;
case "^":
if (operand1 == 0M && operand2 == 0M){
if (operand1 == 0M && operand2 == 0M) {
throw new CommandException("Cannot evaluate 0 to the power of 0.");
}
else if (operand1 < 0M && Math.Abs(operand2) < 1M){
else if (operand1 < 0M && Math.Abs(operand2) < 1M) {
throw new CommandException("Cannot evaluate a root of a negative number.");
}
try{
stack.Push((decimal)Math.Pow((double)operand1, (double)operand2));
}catch(OverflowException ex){
try {
stack.Push((decimal) Math.Pow((double) operand1, (double) operand2));
} catch (OverflowException ex) {
throw new CommandException("Number overflow.", ex);
}
@ -193,42 +199,42 @@ namespace AppCalc{
}
}
if (stack.Count != 1){
if (stack.Count != 1) {
throw new CommandException("Incorrect syntax, too many numbers in stack.");
}
return stack.Pop();
}
private static decimal ParseNumberToken(string token){
private static decimal ParseNumberToken(string token) {
string str = token;
if (str.StartsWith("-.")){
str = "-0"+str.Substring(1);
if (str.StartsWith("-.")) {
str = "-0" + str.Substring(1);
}
else if (str[0] == '.'){
str = "0"+str;
else if (str[0] == '.') {
str = "0" + str;
}
if (str.EndsWith("...")){
string truncated = str.Substring(0, str.Length-3);
if (str.EndsWith("...")) {
string truncated = str.Substring(0, str.Length - 3);
if (truncated.IndexOf('.') != -1){
if (truncated.IndexOf('.') != -1) {
str = truncated;
}
}
decimal value;
if (decimal.TryParse(str, NumberStyles.Float, CultureInfo.InvariantCulture, out value)){
if (value.ToString(CultureInfo.InvariantCulture) != str){
throw new CommandException("Provided number is outside of decimal range: "+token);
if (decimal.TryParse(str, NumberStyles.Float, CultureInfo.InvariantCulture, out value)) {
if (value.ToString(CultureInfo.InvariantCulture) != str) {
throw new CommandException("Provided number is outside of decimal range: " + token);
}
return value;
}
else{
throw new CommandException("Invalid token, expected a number: "+token);
else {
throw new CommandException("Invalid token, expected a number: " + token);
}
}
}

10
AppCalc/Operators.cs
View File

@ -1,9 +1,9 @@
namespace AppCalc{
internal static class Operators{
namespace AppCalc {
static class Operators {
internal static readonly string[] With2Operands = { "+", "-", "*", "/", "%", "^" };
internal static int GetPrecedence(string token){
switch(token){
internal static int GetPrecedence(string token) {
switch (token) {
case "^":
return 4;
@ -21,7 +21,7 @@
}
}
internal static bool IsRightAssociative(string token){
internal static bool IsRightAssociative(string token) {
return token == "^";
}
}

16
AppConv/App.cs
View File

@ -4,8 +4,8 @@ using AppConv.General;
using AppConv.Units;
using Base;
namespace AppConv{
public sealed class App : IApp{
namespace AppConv {
public sealed class App : IApp {
private static readonly IUnitType[] Processors = {
new Temperature(),
new Weight(),
@ -17,29 +17,29 @@ namespace AppConv{
new Radix()
};
public string[] RecognizedNames => new string[]{
public string[] RecognizedNames => new string[] {
"conv",
"convert"
};
public MatchConfidence GetConfidence(Command cmd){
public MatchConfidence GetConfidence(Command cmd) {
return cmd.Text.IndexOf(" to ", StringComparison.InvariantCultureIgnoreCase) != -1 ? MatchConfidence.Possible : MatchConfidence.None;
}
public string ProcessCommand(Command cmd){
string[] data = cmd.Text.Split(new string[]{ " to " }, 2, StringSplitOptions.None);
public string ProcessCommand(Command cmd) {
string[] data = cmd.Text.Split(new string[] { " to " }, 2, StringSplitOptions.None);
string src = data[0].Trim();
string dst = data[1].Trim();
if (src.Length == 0 || dst.Length == 0){
if (src.Length == 0 || dst.Length == 0) {
throw new CommandException("Unrecognized conversion app syntax.");
}
string result = string.Empty;
IUnitType used = Processors.FirstOrDefault(processor => processor.TryProcess(src, dst, out result));
if (used == null){
if (used == null) {
throw new CommandException("Could not recognize conversion units.");
}

84
AppConv/General/DecimalUnitConverterBase.cs
View File

@ -3,121 +3,109 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
namespace AppConv.General{
internal abstract class DecimalUnitConverterBase<T> : IUnitType where T : struct{
internal sealed class DecimalFuncMap : Dictionary<T, Func<decimal, decimal>>{
public DecimalFuncMap(){}
public DecimalFuncMap(int capacity) : base(capacity){}
namespace AppConv.General {
abstract class DecimalUnitConverterBase<T> : IUnitType where T : struct {
internal sealed class DecimalFuncMap : Dictionary<T, Func<decimal, decimal>> {
public DecimalFuncMap() {}
public DecimalFuncMap(int capacity) : base(capacity) {}
}
internal sealed class NameMap : Dictionary<string, T>{
public NameMap(){}
public NameMap(int capacity) : base(capacity){}
internal sealed class NameMap : Dictionary<string, T> {
public NameMap() {}
public NameMap(int capacity) : base(capacity) {}
}
protected abstract NameMap Names { get; }
protected abstract DecimalFuncMap ConvertTo { get; }
protected abstract DecimalFuncMap ConvertFrom { get; }
protected virtual int Precision{
get{
return 0;
}
}
protected virtual int Precision => 0;
protected virtual bool CaseCheck{
get{
return false;
}
}
protected virtual bool CaseCheck => false;
protected virtual NumberStyles NumberStyle{
get{
return NumberStyles.Float & ~NumberStyles.AllowLeadingSign;
}
}
protected virtual NumberStyles NumberStyle => NumberStyles.Float & ~NumberStyles.AllowLeadingSign;
protected virtual string ProcessSrc(string src){
protected virtual string ProcessSrc(string src) {
return src;
}
protected virtual string ProcessDst(string dst){
protected virtual string ProcessDst(string dst) {
return dst;
}
protected abstract bool IsValueInvalid(T value);
protected virtual decimal Convert(decimal value, T from, T to){
protected virtual decimal Convert(decimal value, T from, T to) {
return ConvertFrom[to](ConvertTo[from](value));
}
protected virtual string Format(decimal value){
if (Precision > 0){
protected virtual string Format(decimal value) {
if (Precision > 0) {
decimal truncated = decimal.Truncate(value);
if (value == truncated){
if (value == truncated) {
return truncated.ToString(CultureInfo.InvariantCulture);
}
}
int decimalPlaces = Precision;
if (Math.Abs(value) < 1M){
double fractionalPart = (double)Math.Abs(value%1M);
int fractionalZeroCount = -(int)Math.Ceiling(Math.Log(fractionalPart, 10D));
if (Math.Abs(value) < 1M) {
double fractionalPart = (double) Math.Abs(value % 1M);
int fractionalZeroCount = -(int) Math.Ceiling(Math.Log(fractionalPart, 10D));
decimalPlaces = Math.Min(28, fractionalZeroCount+Precision);
decimalPlaces = Math.Min(28, fractionalZeroCount + Precision);
}
string result = decimal.Round(value, decimalPlaces, MidpointRounding.ToEven).ToString(CultureInfo.InvariantCulture);
if (decimalPlaces > 0){
if (decimalPlaces > 0) {
result = result.TrimEnd('0').TrimEnd('.');
}
return result;
}
public bool TryProcess(string src, string dst, out string result){
public bool TryProcess(string src, string dst, out string result) {
src = ProcessSrc(src);
dst = ProcessDst(dst);
KeyValuePair<string, T>[] pairs = new KeyValuePair<string, T>[2];
var pairs = new KeyValuePair<string, T>[2];
for(int index = 0; index < 2; index++){
for (int index = 0; index < 2; index++) {
string str = index == 0 ? src : dst;
if (CaseCheck){
List<KeyValuePair<string, T>> list = Names.Where(kvp => str.EndsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase) && (str.Length == kvp.Key.Length || !char.IsLetter(str[str.Length-kvp.Key.Length-1]))).ToList();
if (CaseCheck) {
List<KeyValuePair<string, T>> list = Names.Where(kvp => str.EndsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase) && (str.Length == kvp.Key.Length || !char.IsLetter(str[str.Length - kvp.Key.Length - 1]))).ToList();
if (list.Count == 1){
if (list.Count == 1) {
pairs[index] = list[0];
}
else{
else {
pairs[index] = list.FirstOrDefault(kvp => str.EndsWith(kvp.Key, StringComparison.InvariantCulture));
}
}
else{
pairs[index] = Names.FirstOrDefault(kvp => str.EndsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase) && (str.Length == kvp.Key.Length || !char.IsLetter(str[str.Length-kvp.Key.Length-1])));
else {
pairs[index] = Names.FirstOrDefault(kvp => str.EndsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase) && (str.Length == kvp.Key.Length || !char.IsLetter(str[str.Length - kvp.Key.Length - 1])));
}
if (IsValueInvalid(pairs[index].Value)){
if (IsValueInvalid(pairs[index].Value)) {
result = string.Empty;
return false;
}
if (index == 0){
src = src.Substring(0, src.Length-pairs[index].Key.Length).TrimEnd();
if (index == 0) {
src = src.Substring(0, src.Length - pairs[index].Key.Length).TrimEnd();
}
}
decimal value;
if (decimal.TryParse(src, NumberStyle, CultureInfo.InvariantCulture, out value)){
if (decimal.TryParse(src, NumberStyle, CultureInfo.InvariantCulture, out value)) {
result = Format(Convert(value, pairs[0].Value, pairs[1].Value));
return true;
}
else{
else {
result = string.Empty;
return false;
}

52
AppConv/General/DecimalUnitConverterSimple.cs
View File

@ -1,7 +1,7 @@
using System;
namespace AppConv.General{
internal abstract class DecimalUnitConverterSimple<T> : DecimalUnitConverterBase<T> where T : struct{
namespace AppConv.General {
abstract class DecimalUnitConverterSimple<T> : DecimalUnitConverterBase<T> where T : struct {
// ReSharper disable once StaticMemberInGenericType
private static readonly Func<decimal, decimal> FuncNoChange = val => val;
@ -11,38 +11,18 @@ namespace AppConv.General{
private int invalidUnitObject = -1;
protected sealed override NameMap Names{
get{
return UnitNames;
}
}
protected sealed override NameMap Names => UnitNames;
protected sealed override DecimalFuncMap ConvertFrom{
get{
return MapFrom;
}
}
protected sealed override DecimalFuncMap ConvertFrom => MapFrom;
protected sealed override DecimalFuncMap ConvertTo{
get{
return MapTo;
}
}
protected sealed override DecimalFuncMap ConvertTo => MapTo;
protected override int Precision{
get{
return 3;
}
}
protected override int Precision => 3;
protected override bool CaseCheck{
get{
return true;
}
}
protected override bool CaseCheck => true;
protected void AddUnit(T unitObject, params string[] names){
foreach(string name in names){
protected void AddUnit(T unitObject, params string[] names) {
foreach (string name in names) {
UnitNames.Add(name, unitObject);
}
@ -50,17 +30,17 @@ namespace AppConv.General{
ConvertTo.Add(unitObject, FuncNoChange);
}
protected void SetUnitFactor(T unitObject, decimal factor){
ConvertFrom[unitObject] = val => val*factor;
ConvertTo[unitObject] = val => val/factor;
protected void SetUnitFactor(T unitObject, decimal factor) {
ConvertFrom[unitObject] = val => val * factor;
ConvertTo[unitObject] = val => val / factor;
}
protected void SetInvalidUnitObject(T unitObject){
this.invalidUnitObject = (int)(object)unitObject;
protected void SetInvalidUnitObject(T unitObject) {
invalidUnitObject = (int) (object) unitObject;
}
protected sealed override bool IsValueInvalid(T value){
return (int)(object)value == invalidUnitObject;
protected sealed override bool IsValueInvalid(T value) {
return (int) (object) value == invalidUnitObject;
}
}
}

4
AppConv/General/IUnitType.cs
View File

@ -1,5 +1,5 @@
namespace AppConv.General{
internal interface IUnitType{
namespace AppConv.General {
interface IUnitType {
bool TryProcess(string src, string dst, out string result);
}
}

21
AppConv/Units/Angle.cs
View File

@ -2,24 +2,23 @@
using AppConv.General;
namespace AppConv.Units {
internal class Angle : DecimalUnitConverterSimple<Angle.Units>{
internal enum Units{
Invalid = 0, Degree, Radian, Gradian
class Angle : DecimalUnitConverterSimple<Angle.Units> {
internal enum Units {
Invalid = 0,
Degree,
Radian,
Gradian
}
protected override int Precision{
get{
return 4;
}
}
protected override int Precision => 4;
public Angle(){
public Angle() {
AddUnit(Units.Degree, "deg", "degree", "degrees", "arc degree", "arc degrees", "arcdegree", "arcdegrees", "°");
AddUnit(Units.Radian, "rad", "radian", "radians");
AddUnit(Units.Gradian, "grad", "grade", "gon", "gradian", "gradians");
SetUnitFactor(Units.Radian, (decimal)Math.PI/180M);
SetUnitFactor(Units.Gradian, 10M/9M);
SetUnitFactor(Units.Radian, (decimal) Math.PI / 180M);
SetUnitFactor(Units.Gradian, 10M / 9M);
SetInvalidUnitObject(Units.Invalid);
}

25
AppConv/Units/Area.cs
View File

@ -1,12 +1,27 @@
using AppConv.General;
namespace AppConv.Units{
internal class Area : DecimalUnitConverterSimple<Area.Units>{
internal enum Units{
Invalid = 0, SquareMM, SquareCM, SquareDM, SquareM, SquareKM, SquareMile, SquareYard, SquareFoot, SquareInch, Acre, Centiare, Deciare, Are, Decare, Hectare
namespace AppConv.Units {
class Area : DecimalUnitConverterSimple<Area.Units> {
internal enum Units {
Invalid = 0,
SquareMM,
SquareCM,
SquareDM,
SquareM,
SquareKM,
SquareMile,
SquareYard,
SquareFoot,
SquareInch,
Acre,
Centiare,
Deciare,
Are,
Decare,
Hectare
}
public Area(){
public Area() {
AddUnit(Units.SquareMM, "mm2", "square mm", "square millimeter", "square millimeters", "square millimetre", "square millimetres");
AddUnit(Units.SquareCM, "cm2", "square cm", "square centimeter", "square centimeters", "square centimetre", "square centimetres");
AddUnit(Units.SquareDM, "dm2", "square dm", "square decimeter", "square decimeters", "square decimetre", "square decimetres");

37
AppConv/Units/Length.cs
View File

@ -4,16 +4,21 @@ using System.Linq;
using AppConv.General;
using AppConv.Utils;
namespace AppConv.Units{
internal class Length : DecimalUnitConverterSimple<Length.Units>{
internal enum Units{
Invalid = 0, Meter, Inch, Foot, Yard, Mile
namespace AppConv.Units {
class Length : DecimalUnitConverterSimple<Length.Units> {
internal enum Units {
Invalid = 0,
Meter,
Inch,
Foot,
Yard,
Mile
}
private static readonly string[] NamesInch = { "in", "inch", "inches", "\"", "''" };
private static readonly string[] NamesFoot = { "ft", "foot", "feet", "'" };
public Length(){
public Length() {
AddUnit(Units.Meter, "m", "meter", "metre", "meters", "metres");
AddUnit(Units.Inch, NamesInch);
AddUnit(Units.Foot, NamesFoot);
@ -27,10 +32,10 @@ namespace AppConv.Units{
SetInvalidUnitObject(Units.Invalid);
SI.AddSupport(typeof(Units), Units.Meter, new []{ "m" }, new []{ "meter", "metre", "meters", "metres" }, ConvertFrom, ConvertTo, Names);
SI.AddSupport(typeof(Units), Units.Meter, new [] { "m" }, new [] { "meter", "metre", "meters", "metres" }, ConvertFrom, ConvertTo, Names);
}
protected override string ProcessSrc(string src){
protected override string ProcessSrc(string src) {
string updatedStr = src;
updatedStr = updatedStr.Replace("&", " ");
@ -38,7 +43,7 @@ namespace AppConv.Units{
string inchName = NamesInch.FirstOrDefault(name => src.IndexOf(name, StringComparison.OrdinalIgnoreCase) != -1);
if (inchName == null){
if (inchName == null) {
return src;
}
@ -47,38 +52,38 @@ namespace AppConv.Units{
string footName = NamesFoot.FirstOrDefault(name => updatedStr.IndexOf(name, StringComparison.OrdinalIgnoreCase) != -1);
if (footName == null){
if (footName == null) {
return src;
}
int footIndex = updatedStr.IndexOf(footName, StringComparison.OrdinalIgnoreCase);
updatedStr = updatedStr.Remove(footIndex, footName.Length).Insert(footIndex, new string(' ', footName.Length));
string[] tokens = updatedStr.Split(new char[]{ ' ' }, StringSplitOptions.RemoveEmptyEntries);
string[] tokens = updatedStr.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
decimal[] numbers = new decimal[2];
int numberIndex = 0;
foreach(string token in tokens){
foreach (string token in tokens) {
decimal number;
if (decimal.TryParse(token.Trim(), NumberStyle, CultureInfo.InvariantCulture, out number)){
if (numberIndex < numbers.Length){
if (decimal.TryParse(token.Trim(), NumberStyle, CultureInfo.InvariantCulture, out number)) {
if (numberIndex < numbers.Length) {
numbers[numberIndex++] = number;
}
else{
else {
return src;
}
}
}
if (numberIndex != numbers.Length){
if (numberIndex != numbers.Length) {
return src;
}
decimal srcFeet = numbers[footIndex < inchIndex ? 0 : 1];
decimal srcInches = numbers[inchIndex < footIndex ? 0 : 1];
return srcInches+srcFeet*12M+" in";
return srcInches + srcFeet * 12M + " in";
}
}
}

52
AppConv/Units/Radix.cs
View File

@ -5,9 +5,9 @@ using AppConv.General;
using AppConv.Utils;
using Base;
namespace AppConv.Units{
internal class Radix : IUnitType{
private static readonly Dictionary<string, int> RadixDescriptions = new Dictionary<string, int>{
namespace AppConv.Units {
class Radix : IUnitType {
private static readonly Dictionary<string, int> RadixDescriptions = new Dictionary<string, int> {
{ "UNARY", 1 },
{ "BINARY", 2 },
{ "BIN", 2 },
@ -29,17 +29,17 @@ namespace AppConv.Units{
{ "HEX", 16 }
};
static Radix(){
for(int baseNumber = 1; baseNumber <= 16; baseNumber++){
RadixDescriptions.Add("RADIX "+baseNumber, baseNumber);
RadixDescriptions.Add("BASE "+baseNumber, baseNumber);
static Radix() {
for (int baseNumber = 1; baseNumber <= 16; baseNumber++) {
RadixDescriptions.Add("RADIX " + baseNumber, baseNumber);
RadixDescriptions.Add("BASE " + baseNumber, baseNumber);
}
}
public bool TryProcess(string src, string dst, out string result){
public bool TryProcess(string src, string dst, out string result) {
int targetBase;
if (!RadixDescriptions.TryGetValue(dst.ToUpperInvariant(), out targetBase)){
if (!RadixDescriptions.TryGetValue(dst.ToUpperInvariant(), out targetBase)) {
result = string.Empty;
return false;
}
@ -47,37 +47,37 @@ namespace AppConv.Units{
string contents;
int sourceBase;
if (!ParseSrc(src, out contents, out sourceBase)){
if (!ParseSrc(src, out contents, out sourceBase)) {
result = string.Empty;
return false;
}
if (contents[0] == '-'){
if (contents[0] == '-') {
throw new CommandException("Negative numbers are not supported.");
}
else if (!RadixConversion.IsBaseValid(sourceBase) || !RadixConversion.IsBaseValid(targetBase)){
else if (!RadixConversion.IsBaseValid(sourceBase) || !RadixConversion.IsBaseValid(targetBase)) {
throw new CommandException("Only bases between 1 and 16 allowed.");
}
else if (!RadixConversion.IsNumberValid(contents, sourceBase)){
throw new CommandException("The input is not a valid base "+sourceBase+" number: "+contents);
else if (!RadixConversion.IsNumberValid(contents, sourceBase)) {
throw new CommandException("The input is not a valid base " + sourceBase + " number: " + contents);
}
if (sourceBase == targetBase){
if (sourceBase == targetBase) {
result = src;
return true;
}
try{
try {
result = RadixConversion.Do(contents, sourceBase, targetBase);
}catch(OverflowException){
} catch (OverflowException) {
throw new CommandException("The number has overflown.");
}
return true;
}
private static bool ParseSrc(string src, out string sourceContent, out int sourceBase){
if (src.All(chr => chr >= '0' && chr <= '9')){
private static bool ParseSrc(string src, out string sourceContent, out int sourceBase) {
if (src.All(chr => chr >= '0' && chr <= '9')) {
sourceContent = src;
sourceBase = 10;
return true;
@ -85,13 +85,13 @@ namespace AppConv.Units{
string upper = src.ToUpperInvariant();
if (upper.StartsWith("0X")){
if (upper.StartsWith("0X")) {
sourceContent = upper.Substring(2);
sourceBase = 16;
return true;
}
if (upper.StartsWith("0B")){
if (upper.StartsWith("0B")) {
sourceContent = upper.Substring(2);
sourceBase = 2;
return true;
@ -99,18 +99,18 @@ namespace AppConv.Units{
int fromIndex = src.IndexOf("FROM", StringComparison.InvariantCultureIgnoreCase);
if (fromIndex != -1){
if (fromIndex != -1) {
src = src.Remove(fromIndex, 4);
}
foreach(KeyValuePair<string, int> kvp in RadixDescriptions){
if (src.StartsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase)){
foreach (KeyValuePair<string, int> kvp in RadixDescriptions) {
if (src.StartsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase)) {
sourceContent = src.Substring(kvp.Key.Length).Trim();
sourceBase = kvp.Value;
return true;
}
else if (src.EndsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase)){
sourceContent = src.Substring(0, src.Length-kvp.Key.Length).Trim();
else if (src.EndsWith(kvp.Key, StringComparison.InvariantCultureIgnoreCase)) {
sourceContent = src.Substring(0, src.Length - kvp.Key.Length).Trim();
sourceBase = kvp.Value;
return true;
}

22
AppConv/Units/Storage.cs
View File

@ -3,12 +3,14 @@ using AppConv.General;
using AppConv.Utils;
namespace AppConv.Units {
internal class Storage : DecimalUnitConverterSimple<Storage.Units>{
internal enum Units{
Invalid = 0, Byte, Bit
class Storage : DecimalUnitConverterSimple<Storage.Units> {
internal enum Units {
Invalid = 0,
Byte,
Bit
}
public Storage(){
public Storage() {
AddUnit(Units.Byte, "B", "byte", "bytes");
AddUnit(Units.Bit, "b", "bit", "bits");
@ -16,14 +18,14 @@ namespace AppConv.Units {
SetInvalidUnitObject(Units.Invalid);
SI.ExtededProperties bitConversionProperties = new SI.ExtededProperties{
FactorPredicate = factor => factor > 0 && factor%3 == 0,
FromFunctionGenerator = exponent => () => (decimal)Math.Pow(1024, -(int)(exponent/3)),
ToFunctionGenerator = exponent => () => (decimal)Math.Pow(1024, (int)(exponent/3))
var bitConversionProperties = new SI.ExtededProperties {
FactorPredicate = factor => factor > 0 && factor % 3 == 0,
FromFunctionGenerator = exponent => () => (decimal) Math.Pow(1024, -(int) (exponent / 3)),
ToFunctionGenerator = exponent => () => (decimal) Math.Pow(1024, (int) (exponent / 3))
};
SI.AddSupportCustom(typeof(Units), Units.Byte, new []{ "B" }, new []{ "byte", "bytes" }, ConvertFrom, ConvertTo, Names, bitConversionProperties);
SI.AddSupportCustom(typeof(Units), Units.Bit, new []{ "b" }, new []{ "bit", "bits" }, ConvertFrom, ConvertTo, Names, bitConversionProperties);
SI.AddSupportCustom(typeof(Units), Units.Byte, new [] { "B" }, new [] { "byte", "bytes" }, ConvertFrom, ConvertTo, Names, bitConversionProperties);
SI.AddSupportCustom(typeof(Units), Units.Bit, new [] { "b" }, new [] { "bit", "bits" }, ConvertFrom, ConvertTo, Names, bitConversionProperties);
}
}
}

86
AppConv/Units/Temperature.cs
View File

@ -3,13 +3,21 @@ using System.Text.RegularExpressions;
using AppConv.General;
using Base.Utils;
namespace AppConv.Units{
internal class Temperature : DecimalUnitConverterBase<Temperature.Units>{
internal enum Units{
Invalid = 0, Celsius, Kelvin, Fahrenheit, Rankine, Delisle, Newton, Reaumur, Romer
namespace AppConv.Units {
class Temperature : DecimalUnitConverterBase<Temperature.Units> {
internal enum Units {
Invalid = 0,
Celsius,
Kelvin,
Fahrenheit,
Rankine,
Delisle,
Newton,
Reaumur,
Romer
}
private static readonly NameMap UnitNames = new NameMap(21){
private static readonly NameMap UnitNames = new NameMap(21) {
{ "C", Units.Celsius },
{ "Celsius", Units.Celsius },
{ "K", Units.Kelvin },
@ -33,69 +41,49 @@ namespace AppConv.Units{
{ "Rømer", Units.Romer }
};
private static readonly DecimalFuncMap FromCelsius = new DecimalFuncMap(8){
private static readonly DecimalFuncMap FromCelsius = new DecimalFuncMap(8) {
{ Units.Celsius, val => val },
{ Units.Kelvin, val => val+273.15M },
{ Units.Fahrenheit, val => val*1.8M+32M },
{ Units.Rankine, val => (val+273.15M)*1.8M },
{ Units.Delisle, val => (100M-val)*1.5M },
{ Units.Newton, val => val*0.33M },
{ Units.Reaumur, val => val*0.8M },
{ Units.Romer, val => val*0.525M+7.5M }
{ Units.Kelvin, val => val + 273.15M },
{ Units.Fahrenheit, val => val * 1.8M + 32M },
{ Units.Rankine, val => (val + 273.15M) * 1.8M },
{ Units.Delisle, val => (100M - val) * 1.5M },
{ Units.Newton, val => val * 0.33M },
{ Units.Reaumur, val => val * 0.8M },
{ Units.Romer, val => val * 0.525M + 7.5M }
};
private static readonly DecimalFuncMap ToCelsius = new DecimalFuncMap(8){
private static readonly DecimalFuncMap ToCelsius = new DecimalFuncMap(8) {
{ Units.Celsius, val => val },
{ Units.Kelvin, val => val-273.15M },
{ Units.Fahrenheit, val => (val-32M)*5M/9M },
{ Units.Rankine, val => (val-491.67M)*5M/9M },
{ Units.Delisle, val => 100M-val*2M/3M },
{ Units.Newton, val => val*100M/33M },
{ Units.Reaumur, val => val*1.25M },
{ Units.Romer, val => (val-7.5M)*40M/21M }
{ Units.Kelvin, val => val - 273.15M },
{ Units.Fahrenheit, val => (val - 32M) * 5M / 9M },
{ Units.Rankine, val => (val - 491.67M) * 5M / 9M },
{ Units.Delisle, val => 100M - val * 2M / 3M },
{ Units.Newton, val => val * 100M / 33M },
{ Units.Reaumur, val => val * 1.25M },
{ Units.Romer, val => (val - 7.5M) * 40M / 21M }
};
private static readonly Regex RegexCleanup = new Regex("deg(?:rees?)?|°", RegexUtils.Text);
protected override NameMap Names{
get{
return UnitNames;
}
}
protected override NameMap Names => UnitNames;
protected override DecimalFuncMap ConvertFrom{
get{
return FromCelsius;
}
}
protected override DecimalFuncMap ConvertFrom => FromCelsius;
protected override DecimalFuncMap ConvertTo{
get{
return ToCelsius;
}
}
protected override DecimalFuncMap ConvertTo => ToCelsius;
protected override int Precision{
get{
return 2;
}
}
protected override int Precision => 2;
protected override NumberStyles NumberStyle{
get{
return NumberStyles.Float;
}
}
protected override NumberStyles NumberStyle => NumberStyles.Float;
protected override string ProcessSrc(string src){
protected override string ProcessSrc(string src) {
return RegexCleanup.Replace(src, "");
}
protected override string ProcessDst(string dst){
protected override string ProcessDst(string dst) {
return RegexCleanup.Replace(dst, "");
}
protected override bool IsValueInvalid(Units value){
protected override bool IsValueInvalid(Units value) {
return value == Units.Invalid;
}
}

18
AppConv/Units/Volume.cs
View File

@ -1,13 +1,19 @@
using AppConv.General;
using AppConv.Utils;
namespace AppConv.Units{
internal class Volume : DecimalUnitConverterSimple<Volume.Units>{
internal enum Units{
Invalid = 0, Liter, CubicMM, CubicCM, CubicDM, CubicM, CubicKM
namespace AppConv.Units {
class Volume : DecimalUnitConverterSimple<Volume.Units> {
internal enum Units {
Invalid = 0,
Liter,
CubicMM,
CubicCM,
CubicDM,
CubicM,
CubicKM
}
public Volume(){
public Volume() {
AddUnit(Units.Liter, "l", "liter", "liters", "litre", "litres");
AddUnit(Units.CubicMM, "mm3", "cubic mm", "cubic millimeter", "cubic millimeters", "cubic millimetre", "cubic millimetres");
AddUnit(Units.CubicCM, "cm3", "cubic cm", "cubic centimeter", "cubic centimeters", "cubic centimetre", "cubic centimetres");
@ -22,7 +28,7 @@ namespace AppConv.Units{
SetInvalidUnitObject(Units.Invalid);
SI.AddSupport(typeof(Units), Units.Liter, new []{ "l" }, new []{ "liter", "litre", "liters", "litres" }, ConvertFrom, ConvertTo, Names);
SI.AddSupport(typeof(Units), Units.Liter, new [] { "l" }, new [] { "liter", "litre", "liters", "litres" }, ConvertFrom, ConvertTo, Names);
}
}
}

14
AppConv/Units/Weight.cs
View File

@ -2,12 +2,16 @@
using AppConv.Utils;
namespace AppConv.Units {
internal class Weight : DecimalUnitConverterSimple<Weight.Units>{
internal enum Units{
Invalid = 0, Gram, Pound, Ounce, Stone
class Weight : DecimalUnitConverterSimple<Weight.Units> {
internal enum Units {
Invalid = 0,
Gram,
Pound,
Ounce,
Stone
}
public Weight(){
public Weight() {
AddUnit(Units.Gram, "g", "gram", "grams");
AddUnit(Units.Pound, "lb", "lbs", "pound", "pounds");
AddUnit(Units.Ounce, "oz", "ounce", "ounces");
@ -19,7 +23,7 @@ namespace AppConv.Units {
SetInvalidUnitObject(Units.Invalid);
SI.AddSupport(typeof(Units), Units.Gram, new []{ "g" }, new []{ "gram", "grams" }, ConvertFrom, ConvertTo, Names);
SI.AddSupport(typeof(Units), Units.Gram, new [] { "g" }, new [] { "gram", "grams" }, ConvertFrom, ConvertTo, Names);
}
}
}

52
AppConv/Utils/RadixConversion.cs
View File

@ -3,75 +3,75 @@ using System.Globalization;
using System.Linq;
using System.Text;
namespace AppConv.Utils{
internal static class RadixConversion{
namespace AppConv.Utils {
static class RadixConversion {
private const string Characters = "0123456789ABCDEF";
public static bool IsBaseValid(int checkedBase){
public static bool IsBaseValid(int checkedBase) {
return checkedBase >= 1 && checkedBase <= 16;
}
public static bool IsNumberValid(string contents, int checkedBase){
if (checkedBase == 1){
public static bool IsNumberValid(string contents, int checkedBase) {
if (checkedBase == 1) {
return contents.All(chr => chr == '1');
}
if (IsBaseValid(checkedBase)){
if (IsBaseValid(checkedBase)) {
return contents.Select(chr => Characters.IndexOf(char.ToUpper(chr))).All(index => index != -1 && index < checkedBase);
}
return false;
}
public static string Do(string contents, int fromBase, int toBase){ // TODO biginteger
if (fromBase == 1){
public static string Do(string contents, int fromBase, int toBase) { // TODO biginteger
if (fromBase == 1) {
contents = contents.Length.ToString(CultureInfo.InvariantCulture);
fromBase = 10;
}
long wip;
if (fromBase == 10){
if (fromBase == 10) {
wip = long.Parse(contents, NumberStyles.None, CultureInfo.InvariantCulture);
}
else{
else {
wip = 0;
for(int chr = 0; chr < contents.Length; chr++){
for (int chr = 0; chr < contents.Length; chr++) {
int index = Characters.IndexOf(char.ToUpperInvariant(contents[chr]));
if (index > 0){
wip += index*(long)Math.Pow(fromBase, contents.Length-chr-1);
if (index > 0) {
wip += index * (long) Math.Pow(fromBase, contents.Length - chr - 1);
if (wip < 0){
if (wip < 0) {
throw new OverflowException();
}
}
}
}
if (toBase == 1){
if (wip <= int.MaxValue){
return new string('1', (int)wip);
if (toBase == 1) {
if (wip <= int.MaxValue) {
return new string('1', (int) wip);
}
else{
else {
throw new OverflowException();
}
}
else if (wip < toBase){
return Characters[(int)wip].ToString();
else if (wip < toBase) {
return Characters[(int) wip].ToString();
}
else{
StringBuilder converted = new StringBuilder();
else {
var converted = new StringBuilder();
while(wip >= toBase){
int index = (int)(wip%toBase);
while (wip >= toBase) {
int index = (int) (wip % toBase);
converted.Insert(0, Characters[index]);
wip = wip/toBase;
wip = wip / toBase;
}
return converted.Insert(0, Characters[(int)wip]).ToString();
return converted.Insert(0, Characters[(int) wip]).ToString();
}
}
}

50
AppConv/Utils/SI.cs
View File

@ -2,9 +2,9 @@
using System.Collections.Generic;
using AppConv.General;
namespace AppConv.Utils{
internal static class SI{
private static readonly List<Tuple<string, string, int>> Factors = new List<Tuple<string, string, int>>{
namespace AppConv.Utils {
static class SI {
private static readonly List<Tuple<string, string, int>> Factors = new List<Tuple<string, string, int>> {
new Tuple<string, string, int>("yotta", "Y", 24),
new Tuple<string, string, int>("zetta", "Z", 21),
new Tuple<string, string, int>("exa", "E", 18),
@ -27,60 +27,60 @@ namespace AppConv.Utils{
new Tuple<string, string, int>("yocto", "y", -24)
};
public static void AddSupport<T>(Type enumType, T unitObject, string[] unitShortNames, string[] unitLongNames, DecimalUnitConverterBase<T>.DecimalFuncMap funcFrom, DecimalUnitConverterBase<T>.DecimalFuncMap funcTo, DecimalUnitConverterBase<T>.NameMap nameMap) where T : struct{
int enumCounter = 1000+Factors.Count*(int)(object)unitObject;
public static void AddSupport<T>(Type enumType, T unitObject, string[] unitShortNames, string[] unitLongNames, DecimalUnitConverterBase<T>.DecimalFuncMap funcFrom, DecimalUnitConverterBase<T>.DecimalFuncMap funcTo, DecimalUnitConverterBase<T>.NameMap nameMap) where T : struct {
int enumCounter = 1000 + Factors.Count * (int) (object) unitObject;
Func<decimal, decimal> convertFrom = funcFrom[unitObject];
Func<decimal, decimal> convertTo = funcTo[unitObject];
foreach(Tuple<string, string, int> factor in Factors){
T enumObject = (T)(object)enumCounter++;
foreach (Tuple<string, string, int> factor in Factors) {
T enumObject = (T) (object) enumCounter++;
int exponent = factor.Item3;
foreach(string unitShortName in unitShortNames){
nameMap.Add(factor.Item2+unitShortName, enumObject);
foreach (string unitShortName in unitShortNames) {
nameMap.Add(factor.Item2 + unitShortName, enumObject);
}
foreach(string unitLongName in unitLongNames){
nameMap.Add(factor.Item1+unitLongName, enumObject);
foreach (string unitLongName in unitLongNames) {
nameMap.Add(factor.Item1 + unitLongName, enumObject);
}
funcFrom.Add(enumObject, val => convertFrom(val)*(decimal)Math.Pow(10, -exponent));
funcTo.Add(enumObject, val => convertTo(val)*(decimal)Math.Pow(10, exponent));
funcFrom.Add(enumObject, val => convertFrom(val) * (decimal) Math.Pow(10, -exponent));
funcTo.Add(enumObject, val => convertTo(val) * (decimal) Math.Pow(10, exponent));
}
}
public static void AddSupportCustom<T>(Type enumType, T unitObject, string[] unitShortNames, string[] unitLongNames, DecimalUnitConverterBase<T>.DecimalFuncMap funcFrom, DecimalUnitConverterBase<T>.DecimalFuncMap funcTo, DecimalUnitConverterBase<T>.NameMap nameMap, ExtededProperties extendedProps) where T : struct{
int enumCounter = 1000+Factors.Count*(int)(object)unitObject;
public static void AddSupportCustom<T>(Type enumType, T unitObject, string[] unitShortNames, string[] unitLongNames, DecimalUnitConverterBase<T>.DecimalFuncMap funcFrom, DecimalUnitConverterBase<T>.DecimalFuncMap funcTo, DecimalUnitConverterBase<T>.NameMap nameMap, ExtededProperties extendedProps) where T : struct {
int enumCounter = 1000 + Factors.Count * (int) (object) unitObject;
Func<decimal, decimal> convertFrom = funcFrom[unitObject];
Func<decimal, decimal> convertTo = funcTo[unitObject];
foreach(Tuple<string, string, int> factor in Factors){
if (extendedProps.FactorPredicate != null && !extendedProps.FactorPredicate(factor.Item3)){
foreach (Tuple<string, string, int> factor in Factors) {
if (extendedProps.FactorPredicate != null && !extendedProps.FactorPredicate(factor.Item3)) {
continue;
}
T enumObject = (T)(object)enumCounter++;
T enumObject = (T) (object) enumCounter++;
int exponent = factor.Item3;
foreach(string unitShortName in unitShortNames){
nameMap.Add(factor.Item2+unitShortName, enumObject);
foreach (string unitShortName in unitShortNames) {
nameMap.Add(factor.Item2 + unitShortName, enumObject);
}
foreach(string unitLongName in unitLongNames){
nameMap.Add(factor.Item1+unitLongName, enumObject);
foreach (string unitLongName in unitLongNames) {
nameMap.Add(factor.Item1 + unitLongName, enumObject);
}
Func<decimal> genFrom = extendedProps.FromFunctionGenerator(exponent);
Func<decimal> genTo = extendedProps.ToFunctionGenerator(exponent);
funcFrom.Add(enumObject, val => convertFrom(val)*genFrom());
funcTo.Add(enumObject, val => convertTo(val)*genTo());
funcFrom.Add(enumObject, val => convertFrom(val) * genFrom());
funcTo.Add(enumObject, val => convertTo(val) * genTo());
}
}
internal class ExtededProperties{
internal class ExtededProperties {
public Predicate<int> FactorPredicate { get; set; }
public Func<int, Func<decimal>> FromFunctionGenerator { get; set; }
public Func<int, Func<decimal>> ToFunctionGenerator { get; set; }

12
AppMeme/App.cs
View File

@ -1,24 +1,24 @@
using System.Collections.Generic;
using Base;
namespace AppMeme{
public sealed class App : IApp{
private static readonly Dictionary<string, string> Map = new Dictionary<string, string>{
namespace AppMeme {
public sealed class App : IApp {
private static readonly Dictionary<string, string> Map = new Dictionary<string, string> {
{ "shrug", @"¯\_(ツ)_/¯" },
{ "lenny", @"( ͡° ͜ʖ ͡°)" },
{ "flip", @"(╯°□°）╯︵ ┻━┻" },
{ "tableflip", @"(╯°□°）╯︵ ┻━┻" }
};
public string[] RecognizedNames => new string[]{
public string[] RecognizedNames => new string[] {
"meme"
};
public MatchConfidence GetConfidence(Command cmd){
public MatchConfidence GetConfidence(Command cmd) {
return Map.ContainsKey(cmd.Text) ? MatchConfidence.Full : MatchConfidence.None;
}
public string ProcessCommand(Command cmd){
public string ProcessCommand(Command cmd) {
return Map[cmd.Text];
}
}

10
AppWindows/App.cs
View File

@ -2,24 +2,24 @@
using AppSys.Handlers;
using Base;
namespace AppSys{
public sealed class App : IApp{
namespace AppSys {
public sealed class App : IApp {
private static readonly IHandler[] Handlers = {
new HandlerProcesses(),
new HandlerApps()
};
public string[] RecognizedNames => new string[]{
public string[] RecognizedNames => new string[] {
"sys",
"os",
"win"
};
public MatchConfidence GetConfidence(Command cmd){
public MatchConfidence GetConfidence(Command cmd) {
return Handlers.Any(handler => handler.Matches(cmd)) ? MatchConfidence.Full : MatchConfidence.None;
}
public string ProcessCommand(Command cmd){
public string ProcessCommand(Command cmd) {
return Handlers.First(handler => handler.Matches(cmd)).Handle(cmd);
}
}

39
AppWindows/Handlers/HandlerApps.cs
View File

@ -5,32 +5,34 @@ using System.IO;
using Base;
namespace AppSys.Handlers {
internal class HandlerApps : IHandler{
class HandlerApps : IHandler {
private static readonly string PathSystem = Environment.GetFolderPath(Environment.SpecialFolder.System);
private static readonly Dictionary<string, ProcessStartInfo> Mappings = new Dictionary<string, ProcessStartInfo>{
{ "audio", new ProcessStartInfo{
private static readonly Dictionary<string, ProcessStartInfo> Mappings = new Dictionary<string, ProcessStartInfo> {
{
"audio", new ProcessStartInfo {
FileName = Path.Combine(PathSystem, "control.exe"),
Arguments = "mmsys.cpl"
} },
{ "programs", new ProcessStartInfo{
}
}, {
"programs", new ProcessStartInfo {
FileName = Path.Combine(PathSystem, "control.exe"),
Arguments = "appwiz.cpl"
} },
{ "system", new ProcessStartInfo{
}
}, {
"system", new ProcessStartInfo {
FileName = Path.Combine(PathSystem, "control.exe"),
Arguments = "sysdm.cpl"
} },
{ "environment", new ProcessStartInfo{
}
}, {
"environment", new ProcessStartInfo {
FileName = Path.Combine(PathSystem, "rundll32.exe"),
Arguments = "sysdm.cpl,EditEnvironmentVariables"
} }
}
}
};
private static readonly Dictionary<string, string> Substitutions = new Dictionary<string, string>{
private static readonly Dictionary<string, string> Substitutions = new Dictionary<string, string> {
{ "sounds", "audio" },
{ "apps", "programs" },
{ "appwiz", "programs" },
@ -40,18 +42,19 @@ namespace AppSys.Handlers {
{ "variables", "environment" }
};
public bool Matches(Command cmd){
public bool Matches(Command cmd) {
return Mappings.ContainsKey(cmd.Text) || Substitutions.ContainsKey(cmd.Text);
}
public string Handle(Command cmd){
public string Handle(Command cmd) {
string key;
if (!Substitutions.TryGetValue(cmd.Text, out key)){
if (!Substitutions.TryGetValue(cmd.Text, out key)) {
key = cmd.Text;
}
using(Process.Start(Mappings[key])){}
using (Process.Start(Mappings[key])) {}
return null;
}
}

28
AppWindows/Handlers/HandlerProcesses.cs
View File

@ -3,43 +3,43 @@ using System.Diagnostics;
using System.Text;
using Base;
namespace AppSys.Handlers{
internal class HandlerProcesses : IHandler{
public bool Matches(Command cmd){
namespace AppSys.Handlers {
class HandlerProcesses : IHandler {
public bool Matches(Command cmd) {
return cmd.Text.StartsWith("kill ", StringComparison.InvariantCultureIgnoreCase);
}
public string Handle(Command cmd){
public string Handle(Command cmd) {
string[] processNames = cmd.Text.Substring("kill ".Length).Split(',', ';');
int succeeded = 0, failed = 0;
foreach(string processName in processNames){
try{
Process[] processes = Process.GetProcessesByName(processName.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase) ? processName.Substring(0, processName.Length-4) : processName);
foreach (string processName in processNames) {
try {
Process[] processes = Process.GetProcessesByName(processName.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase) ? processName.Substring(0, processName.Length - 4) : processName);
foreach(Process process in processes){
try{
foreach (Process process in processes) {
try {
process.Kill();
++succeeded;
}catch{
} catch {
++failed;
}
process.Close();
}
}catch{
} catch {
++failed;
}
}
if (succeeded == 0 && failed == 0 && (cmd.Text.Equals("kill me", StringComparison.InvariantCultureIgnoreCase) || cmd.Text.StartsWith("kill me ", StringComparison.InvariantCultureIgnoreCase) || cmd.Text.StartsWith("kill me,", StringComparison.InvariantCultureIgnoreCase))){
if (succeeded == 0 && failed == 0 && (cmd.Text.Equals("kill me", StringComparison.InvariantCultureIgnoreCase) || cmd.Text.StartsWith("kill me ", StringComparison.InvariantCultureIgnoreCase) || cmd.Text.StartsWith("kill me,", StringComparison.InvariantCultureIgnoreCase))) {
return "No.";
}
StringBuilder build = new StringBuilder();
var build = new StringBuilder();
build.Append("Killed ").Append(succeeded).Append(" process").Append(succeeded == 1 ? "" : "es");
if (failed > 0){
if (failed > 0) {
build.Append(", failed ").Append(failed);
}

4
AppWindows/IHandler.cs
View File

@ -1,7 +1,7 @@
using Base;
namespace AppSys{
internal interface IHandler{
namespace AppSys {
interface IHandler {
bool Matches(Command cmd);
string Handle(Command cmd);
}

26
Base/Command.cs
View File

@ -2,24 +2,24 @@
using System.Text.RegularExpressions;
using Base.Utils;
namespace Base{
public sealed class Command{
namespace Base {
public sealed class Command {
private static readonly Regex RegexBalancedBrackets = new Regex(RegexUtils.Balance(@"\[", @"\]"), RegexOptions.Compiled);
private static readonly Regex RegexBalancedParentheses = new Regex(RegexUtils.Balance(@"\(", @"\)"), RegexOptions.Compiled);
public string Text { get; private set; }
public string PotentialAppName{
get{
public string PotentialAppName {
get {
int firstSpace = Text.IndexOf(' ');
if (firstSpace == -1){
if (firstSpace == -1) {
return null;
}
string firstToken = Text.Substring(0, firstSpace);
if (!firstToken.All(char.IsLetter)){
if (!firstToken.All(char.IsLetter)) {
return null;
}
@ -27,17 +27,13 @@ namespace Base{
}
}
public bool IsSingleToken{
get{
return Text.IndexOf(' ') == -1;
}
public bool IsSingleToken => Text.IndexOf(' ') == -1;
public Command(string text) {
Text = text;
}
public Command(string text){
this.Text = text;
}
public Command ReplaceBrackets(MatchEvaluator evaluator){
public Command ReplaceBrackets(MatchEvaluator evaluator) {
return new Command(RegexBalancedParentheses.Replace(RegexBalancedBrackets.Replace(Text, evaluator), evaluator));
}
}

8
Base/CommandEventArgs.cs
View File

@ -1,11 +1,11 @@
using System;
namespace Base{
public class CommandEventArgs : EventArgs{
namespace Base {
public class CommandEventArgs : EventArgs {
public Command Command { get; private set; }
public CommandEventArgs(string text){
this.Command = new Command(text);
public CommandEventArgs(string text) {
Command = new Command(text);
}
}
}

8
Base/CommandException.cs
View File

@ -1,8 +1,8 @@
using System;
namespace Base{
public class CommandException : Exception{
public CommandException(string message) : base(message){}
public CommandException(string message, Exception innerException) : base(message,innerException){}
namespace Base {
public class CommandException : Exception {
public CommandException(string message) : base(message) {}
public CommandException(string message, Exception innerException) : base(message, innerException) {}
}
}

4
Base/IApp.cs
View File

@ -1,5 +1,5 @@
namespace Base{
public interface IApp{
namespace Base {
public interface IApp {
string[] RecognizedNames { get; }
MatchConfidence GetConfidence(Command cmd);

4
Base/MatchConfidence.cs
View File

@ -1,5 +1,5 @@
namespace Base{
public enum MatchConfidence{
namespace Base {
public enum MatchConfidence {
None = 0,
Low = 1,
Possible = 2,

6
Base/Utils/RegexUtils.cs
View File

@ -1,11 +1,11 @@
using System.Text;
using System.Text.RegularExpressions;
namespace Base.Utils{
public static class RegexUtils{
namespace Base.Utils {
public static class RegexUtils {
public static readonly RegexOptions Text = RegexOptions.CultureInvariant | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture | RegexOptions.Compiled;
public static string Balance(string escapedStart, string escapedEnd){ // \(((?>[^()]+|\((?<n>)|\)(?<-n>))+(?(n)(?!)))\)
public static string Balance(string escapedStart, string escapedEnd) { // \(((?>[^()]+|\((?<n>)|\)(?<-n>))+(?(n)(?!)))\)
return new StringBuilder()
.Append(escapedStart)
.Append(@"((?>[^")

25
Query/Controls/QueryHistoryLog.cs
View File

@ -2,32 +2,35 @@
using System.Drawing;
using System.Windows.Forms;
namespace Query.Controls{
sealed partial class QueryHistoryLog : UserControl{
public enum EntryType{
UserInput, CommandResult, Information, Error
namespace Query.Controls {
sealed partial class QueryHistoryLog : UserControl {
public enum EntryType {
UserInput,
CommandResult,
Information,
Error
}
private static readonly Dictionary<EntryType, Color> EntryColorMap = new Dictionary<EntryType, Color>{
private static readonly Dictionary<EntryType, Color> EntryColorMap = new Dictionary<EntryType, Color> {
{ EntryType.UserInput, Color.FromArgb(160, 160, 160) },
{ EntryType.CommandResult, Color.FromArgb(240, 240, 240) },
{ EntryType.Information, Color.FromArgb(160, 255, 140) },
{ EntryType.Error, Color.FromArgb(255, 40, 40) }
};
public QueryHistoryLog(){
public QueryHistoryLog() {
InitializeComponent();
}
public void AddEntry(string text, EntryType type){
int width = container.Width-SystemInformation.VerticalScrollBarWidth;
public void AddEntry(string text, EntryType type) {
int width = container.Width - SystemInformation.VerticalScrollBarWidth;
Label label = new Label{
Label label = new Label {
AutoSize = true,
Font = container.Font,
ForeColor = EntryColorMap[type],
Text = text,
Margin = new Padding(0,1,0,1),
Margin = new Padding(0, 1, 0, 1),
MaximumSize = new Size(width, 0),
Width = width
};
@ -36,7 +39,7 @@ namespace Query.Controls{
container.AutoScrollPosition = new Point(0, container.VerticalScroll.Maximum);
}
public void ClearEntries(){
public void ClearEntries() {
container.Controls.Clear();
}
}

56
Query/Controls/QueryTextBox.cs
View File

@ -5,27 +5,27 @@ using System.Windows.Forms;
using Base;
using Query.Core;
namespace Query.Controls{
sealed partial class QueryTextBox : UserControl{
namespace Query.Controls {
sealed partial class QueryTextBox : UserControl {
public event EventHandler<CommandEventArgs> CommandRan;
private CommandHistory history;
private Action<string> log;
public QueryTextBox(){
public QueryTextBox() {
InitializeComponent();
}
public void Setup(CommandHistory historyObj, Action<string> logFunc){
this.history = historyObj;
this.log = logFunc;
public void Setup(CommandHistory historyObj, Action<string> logFunc) {
history = historyObj;
log = logFunc;
}
private void OnCommandRan(){
private void OnCommandRan() {
CommandRan?.Invoke(this, new CommandEventArgs(tb.Text));
}
private sealed class CustomTextBox : TextBox{
private sealed class CustomTextBox : TextBox {
private string lastInputStr = string.Empty;
private int lastInputPos = 0;
@ -33,20 +33,20 @@ namespace Query.Controls{
private bool lastArrowShift;
private int historyOffset;
public CustomTextBox(){
public CustomTextBox() {
TextChanged += CustomTextBox_TextChanged;
}
protected override void OnKeyDown(KeyEventArgs e){
QueryTextBox input = (QueryTextBox)Parent;
protected override void OnKeyDown(KeyEventArgs e) {
QueryTextBox input = (QueryTextBox) Parent;
CommandHistory history = input.history;
Keys key = e.KeyCode;
bool handled = false;
switch(key){
switch (key) {
case Keys.Enter:
if (Text != string.Empty){
if (Text != string.Empty) {
input.OnCommandRan();
Text = string.Empty;
@ -57,14 +57,14 @@ namespace Query.Controls{
break;
case Keys.Up:
if (lastArrowShift != e.Shift){
if (lastArrowShift != e.Shift) {
lastArrowShift = e.Shift;
historyOffset = 0;
}
--historyOffset;
if (InsertFromHistory(e.Shift ? history.Results : history.Queries)){
if (InsertFromHistory(e.Shift ? history.Results : history.Queries)) {
++historyOffset;
}
@ -72,14 +72,14 @@ namespace Query.Controls{
break;
case Keys.Down:
if (lastArrowShift != e.Shift){
if (lastArrowShift != e.Shift) {
lastArrowShift = e.Shift;
historyOffset = 0;
}
++historyOffset;
if (InsertFromHistory(e.Shift ? history.Results : history.Queries)){
if (InsertFromHistory(e.Shift ? history.Results : history.Queries)) {
--historyOffset;
}
@ -87,8 +87,8 @@ namespace Query.Controls{
break;
case Keys.C:
if (e.Modifiers == Keys.Control){
if (SelectionLength == 0 && history.Results.Count > 0){
if (e.Modifiers == Keys.Control) {
if (SelectionLength == 0 && history.Results.Count > 0) {
Clipboard.SetText(history.Results.Last(), TextDataFormat.UnicodeText);
input.log("Copied to clipboard.");
handled = true;
@ -98,7 +98,7 @@ namespace Query.Controls{
break;
}
if (!handled && key != Keys.ControlKey && key != Keys.ShiftKey && key != Keys.Menu){
if (!handled && key != Keys.ControlKey && key != Keys.ShiftKey && key != Keys.Menu) {
doResetHistoryMemory = true;
}
@ -106,40 +106,40 @@ namespace Query.Controls{
base.OnKeyDown(e);
}
protected override void OnKeyUp(KeyEventArgs e){
protected override void OnKeyUp(KeyEventArgs e) {
base.OnKeyUp(e);
if (doResetHistoryMemory){
if (doResetHistoryMemory) {
doResetHistoryMemory = false;
ResetHistoryMemory();
}
}
private void CustomTextBox_TextChanged(object sender, EventArgs e){
private void CustomTextBox_TextChanged(object sender, EventArgs e) {
ResetHistoryMemory();
}
// Management
private void ResetHistoryMemory(){
private void ResetHistoryMemory() {
lastInputStr = Text;
lastInputPos = SelectionStart;
historyOffset = 0;
}
private bool InsertFromHistory(IList<string> collection){
if (collection.Count == 0){
private bool InsertFromHistory(IList<string> collection) {
if (collection.Count == 0) {
return true;
}
int index = collection.Count + historyOffset;
bool wasClamped = false;
if (index < 0){
if (index < 0) {
index = 0;
wasClamped = true;
}
else if (index >= collection.Count){
else if (index >= collection.Count) {
index = collection.Count - 1;
wasClamped = true;
}

22
Query/Core/CommandHistory.cs
View File

@ -1,31 +1,23 @@
using System.Collections.Generic;
namespace Query.Core{
sealed class CommandHistory{
namespace Query.Core {
sealed class CommandHistory {
private readonly List<string> queries = new List<string>();
private readonly List<string> results = new List<string>();
public IList<string> Queries{
get{
return queries;
}
}
public IList<string> Queries => queries;
public IList<string> Results{
get{
return results;
}
}
public IList<string> Results => results;
public void AddQuery(string text){
public void AddQuery(string text) {
queries.Add(text);
}
public void AddResult(string text){
public void AddResult(string text) {
results.Add(text);
}
public void Clear(){
public void Clear() {
queries.Clear();
results.Clear();
}

34
Query/Core/CommandProcessor.cs
View File

@ -3,59 +3,59 @@ using System.Collections.Generic;
using System.Linq;
using Base;
namespace Query.Core{
sealed class CommandProcessor{
namespace Query.Core {
sealed class CommandProcessor {
private readonly Dictionary<string, IApp> appNames = new Dictionary<string, IApp>(8);
private readonly HashSet<IApp> appSet = new HashSet<IApp>();
public Func<string, bool> SingleTokenProcessor { get; set; }
public void AddApp<T>() where T : IApp, new(){
public void AddApp<T>() where T : IApp, new() {
IApp app = new T();
foreach(string name in app.RecognizedNames){
foreach (string name in app.RecognizedNames) {
appNames.Add(name, app);
appSet.Add(app);
}
}
public string Run(Command cmd){
public string Run(Command cmd) {
cmd = cmd.ReplaceBrackets(match => Run(new Command(match.Groups[1].Value)));
string appName = cmd.PotentialAppName;
IApp app;
if (appName != null && appNames.TryGetValue(appName.ToLowerInvariant(), out app)){
return app.ProcessCommand(new Command(cmd.Text.Substring(appName.Length+1)));
if (appName != null && appNames.TryGetValue(appName.ToLowerInvariant(), out app)) {
return app.ProcessCommand(new Command(cmd.Text.Substring(appName.Length + 1)));
}
if (cmd.IsSingleToken && SingleTokenProcessor != null && SingleTokenProcessor(cmd.Text)){
if (cmd.IsSingleToken && SingleTokenProcessor != null && SingleTokenProcessor(cmd.Text)) {
return null;
}
var list = appSet.Select(iapp => new { App = iapp, Confidence = iapp.GetConfidence(cmd) }).OrderByDescending(obj => obj.Confidence).Where(obj => obj.Confidence != MatchConfidence.None).ToList();
if (list.Count == 0){
if (list.Count == 0) {
throw new CommandException("Could not find any suitable app, please write the app name and press Up Arrow.");
}
else if (list.Count == 1){
else if (list.Count == 1) {
app = list[0].App;
}
else{
List<IApp> plausible = new List<IApp>{ list[0].App };
else {
List<IApp> plausible = new List<IApp> { list[0].App };
MatchConfidence topConfidence = list[0].Confidence;
for(int index = 1; index < list.Count; index++){
if (list[index].Confidence == topConfidence){
for (int index = 1; index < list.Count; index++) {
if (list[index].Confidence == topConfidence) {
plausible.Add(list[index].App);
}
}
if (plausible.Count == 1){
if (plausible.Count == 1) {
app = plausible.First();
}
else{
throw new CommandException("Command is ambiguous, please write the app name and press Up Arrow. Suggested apps: "+string.Join(", ",plausible.Select(iapp => iapp.RecognizedNames.First())));
else {
throw new CommandException("Command is ambiguous, please write the app name and press Up Arrow. Suggested apps: " + string.Join(", ", plausible.Select(iapp => iapp.RecognizedNames.First())));
}
}

24
Query/Core/KeyboardHook.cs
View File

@ -2,38 +2,38 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
namespace Query.Core{
sealed class KeyboardHook{
namespace Query.Core {
sealed class KeyboardHook {
public event EventHandler Triggered;
// ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
private readonly NativeMethods.HookProc keyboardHookDelegate;
private IntPtr keyboardHook;
public KeyboardHook(){
public KeyboardHook() {
keyboardHookDelegate = KeyboardHookProc;
}
public void StartHook(){
if (keyboardHook != IntPtr.Zero){
public void StartHook() {
if (keyboardHook != IntPtr.Zero) {
NativeMethods.UnhookWindowsHookEx(keyboardHook);
}
keyboardHook = NativeMethods.SetWindowsHookEx(NativeMethods.WH_KEYBOARD_LL, keyboardHookDelegate, IntPtr.Zero, 0);
}
public void StopHook(){
if (keyboardHook != IntPtr.Zero){
public void StopHook() {
if (keyboardHook != IntPtr.Zero) {
NativeMethods.UnhookWindowsHookEx(keyboardHook);
keyboardHook = IntPtr.Zero;
}
}
private IntPtr KeyboardHookProc(int nCode, IntPtr wParam, IntPtr lParam){
if (wParam == (IntPtr)NativeMethods.WM_KEYDOWN){
Keys key = (Keys)Marshal.ReadInt32(lParam);
private IntPtr KeyboardHookProc(int nCode, IntPtr wParam, IntPtr lParam) {
if (wParam == (IntPtr) NativeMethods.WM_KEYDOWN) {
Keys key = (Keys) Marshal.ReadInt32(lParam);
if ((key == Keys.LWin || key == Keys.RWin) && Control.ModifierKeys.HasFlag(Keys.Control)){
if ((key == Keys.LWin || key == Keys.RWin) && Control.ModifierKeys.HasFlag(Keys.Control)) {
Triggered?.Invoke(this, EventArgs.Empty);
return NativeMethods.HookHandled;
}
@ -42,7 +42,7 @@ namespace Query.Core{
return NativeMethods.CallNextHookEx(keyboardHook, nCode, wParam, lParam);
}
private static class NativeMethods{
private static class NativeMethods {
public const int WH_KEYBOARD_LL = 13;
public const int WM_KEYDOWN = 0x0100;
public const int WM_KEYUP = 0x0101;

54
Query/MainForm.cs
View File

@ -5,8 +5,8 @@ using Base;
using Query.Controls;
using Query.Core;
namespace Query{
partial class MainForm : Form{
namespace Query {
partial class MainForm : Form {
private readonly CommandProcessor processor;
private readonly CommandHistory history;
@ -15,10 +15,10 @@ namespace Query{
private bool isLoaded;
public MainForm(){
public MainForm() {
InitializeComponent();
processor = new CommandProcessor{
processor = new CommandProcessor {
SingleTokenProcessor = ProcessSingleToken
};
@ -33,7 +33,7 @@ namespace Query{
keyboardHook = new KeyboardHook();
keyboardHook.Triggered += keyboardHook_Triggered;
focusTimer = new Timer{
focusTimer = new Timer {
Interval = 1
};
@ -43,57 +43,57 @@ namespace Query{
queryBox.CommandRan += queryBox_CommandRan;
}
private void SetShown(bool show){
if (show){
private void SetShown(bool show) {
if (show) {
focusTimer.Start();
}
else{
else {
Hide();
}
}
private void MainForm_Shown(object sender, EventArgs e){
private void MainForm_Shown(object sender, EventArgs e) {
Rectangle screenRect = Screen.PrimaryScreen.WorkingArea;
Location = new Point(screenRect.X + screenRect.Width - Width, screenRect.Y + screenRect.Height - Height);
if (!isLoaded){
if (!isLoaded) {
isLoaded = true;
keyboardHook.StartHook();
}
}
private void MainForm_Deactivate(object sender, EventArgs e){
private void MainForm_Deactivate(object sender, EventArgs e) {
SetShown(false);
}
private void MainForm_Disposed(object sender, EventArgs e){
private void MainForm_Disposed(object sender, EventArgs e) {
keyboardHook.StopHook();
}
private void trayIcon_Click(object sender, EventArgs e){
if (((MouseEventArgs)e).Button == MouseButtons.Left){
private void trayIcon_Click(object sender, EventArgs e) {
if (((MouseEventArgs) e).Button == MouseButtons.Left) {
SetShown(true);
}
}
private void showToolStripMenuItem_Click(object sender, EventArgs e){
private void showToolStripMenuItem_Click(object sender, EventArgs e) {
SetShown(true);
}
private void hookToolStripMenuItem_Click(object sender, EventArgs e){
private void hookToolStripMenuItem_Click(object sender, EventArgs e) {
keyboardHook.StopHook();
keyboardHook.StartHook();
}
private void exitToolStripMenuItem_Click(object sender, EventArgs e){
private void exitToolStripMenuItem_Click(object sender, EventArgs e) {
Application.Exit();
}
private void keyboardHook_Triggered(object sender, EventArgs e){
private void keyboardHook_Triggered(object sender, EventArgs e) {
SetShown(!Visible);
}
private void focusTimer_Tick(object sender, EventArgs e){
private void focusTimer_Tick(object sender, EventArgs e) {
WindowState = FormWindowState.Minimized;
Show();
Activate();
@ -103,27 +103,27 @@ namespace Query{
focusTimer.Stop();
}
private void queryBox_CommandRan(object sender, CommandEventArgs e){
try{
private void queryBox_CommandRan(object sender, CommandEventArgs e) {
try {
string result = processor.Run(e.Command);
if (result != null){
queryLog.AddEntry("> "+e.Command.Text, QueryHistoryLog.EntryType.UserInput);
if (result != null) {
queryLog.AddEntry("> " + e.Command.Text, QueryHistoryLog.EntryType.UserInput);
history.AddQuery(e.Command.Text);
queryLog.AddEntry(result, QueryHistoryLog.EntryType.CommandResult);
history.AddResult(result);
}
}catch(CommandException ex){
queryLog.AddEntry("> "+e.Command.Text, QueryHistoryLog.EntryType.UserInput);
} catch (CommandException ex) {
queryLog.AddEntry("> " + e.Command.Text, QueryHistoryLog.EntryType.UserInput);
history.AddQuery(e.Command.Text);
queryLog.AddEntry(ex.Message, QueryHistoryLog.EntryType.Error);
}
}
private bool ProcessSingleToken(string token){
switch(token){
private bool ProcessSingleToken(string token) {
switch (token) {
case "exit":
case "quit":
Application.Exit();

4
Query/MainForm.resx
View File

@ -168,7 +168,7 @@
JP8kJCT/JCQk/yQkJP8kJCT/JCQk/yQkJP8AAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAA
AEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAA
AEE=
</value>
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -214,6 +214,6 @@
JP8kJCT/JCQk/yQkJP8kJCT/JCQk/yQkJP8AAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAA
AEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAA
AEE=
</value>
</value>
</data>
</root>

6
Query/Program.cs
View File

@ -1,10 +1,10 @@
using System;
using System.Windows.Forms;
namespace Query{
static class Program{
namespace Query {
static class Program {
[STAThread]
private static void Main(){
private static void Main() {
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new MainForm());