kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: some build & linter warnings

Browse Source
This commit is contained in:
ZavaruKitsu
2022-10-08 19:15:51 +03:00
parent 3f0d109fe2
commit a731e2a8d0
159 changed files with 2738 additions and 3742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TelegramBotBase/States/JSONStateMachine.cs
+18 -25
View File
@@ -1,8 +1,6 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Runtime.Serialization.Formatters;
using System.Text;
using System;
using System.IO;
using Newtonsoft.Json;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using TelegramBotBase.Form;
@@ -13,9 +11,9 @@ namespace TelegramBotBase.States
/// <summary>
/// Is used for all complex data types. Use if other default machines are not working.
/// </summary>
public class JSONStateMachine : IStateMachine
public class JsonStateMachine : IStateMachine
{
public String FilePath { get; set; }
public string FilePath { get; set; }
public bool Overwrite { get; set; }
@@ -27,35 +25,30 @@ namespace TelegramBotBase.States
/// <param name="file">Path of the file and name where to save the session details.</param>
/// <param name="fallbackStateForm">Type of Form which will be saved instead of Form which has <seealso cref="Attributes.IgnoreState"/> attribute declared. Needs to be subclass of <seealso cref="Form.FormBase"/>.</param>
/// <param name="overwrite">Declares of the file could be overwritten.</param>
public JSONStateMachine(String file, Type fallbackStateForm = null, bool overwrite = true)
public JsonStateMachine(string file, Type fallbackStateForm = null, bool overwrite = true)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}
FallbackStateForm = fallbackStateForm;
this.FallbackStateForm = fallbackStateForm;
if (this.FallbackStateForm != null && !this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
{
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
}
this.FilePath = file;
this.Overwrite = overwrite;
FilePath = file ?? throw new ArgumentNullException(nameof(file));
Overwrite = overwrite;
}
public StateContainer LoadFormStates()
{
try
{
var content = System.IO.File.ReadAllText(FilePath);
var content = File.ReadAllText(FilePath);
var sc = Newtonsoft.Json.JsonConvert.DeserializeObject<StateContainer>(content, new JsonSerializerSettings
var sc = JsonConvert.DeserializeObject<StateContainer>(content, new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
}) as StateContainer;
});
return sc;
}
@@ -69,25 +62,25 @@ namespace TelegramBotBase.States
public void SaveFormStates(SaveStatesEventArgs e)
{
if (System.IO.File.Exists(FilePath))
if (File.Exists(FilePath))
{
if (!this.Overwrite)
if (!Overwrite)
{
throw new Exception("File exists already.");
}
System.IO.File.Delete(FilePath);
File.Delete(FilePath);
}
try
{
var content = Newtonsoft.Json.JsonConvert.SerializeObject(e.States, Formatting.Indented, new JsonSerializerSettings
var content = JsonConvert.SerializeObject(e.States, Formatting.Indented, new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
});
System.IO.File.WriteAllText(FilePath, content);
File.WriteAllText(FilePath, content);
}
catch
{
TelegramBotBase/States/SimpleJSONStateMachine.cs
+17 -24
View File
@@ -1,8 +1,6 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Runtime.Serialization.Formatters;
using System.Text;
using System;
using System.IO;
using Newtonsoft.Json;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using TelegramBotBase.Form;
@@ -13,9 +11,9 @@ namespace TelegramBotBase.States
/// <summary>
/// Is used for simple object structures like classes, lists or basic datatypes without generics and other compiler based data types.
/// </summary>
public class SimpleJSONStateMachine : IStateMachine
public class SimpleJsonStateMachine : IStateMachine
{
public String FilePath { get; set; }
public string FilePath { get; set; }
public bool Overwrite { get; set; }
@@ -27,31 +25,26 @@ namespace TelegramBotBase.States
/// <param name="file">Path of the file and name where to save the session details.</param>
/// <param name="fallbackStateForm">Type of Form which will be saved instead of Form which has <seealso cref="Attributes.IgnoreState"/> attribute declared. Needs to be subclass of <seealso cref="Form.FormBase"/>.</param>
/// <param name="overwrite">Declares of the file could be overwritten.</param>
public SimpleJSONStateMachine(String file, Type fallbackStateForm = null, bool overwrite = true)
public SimpleJsonStateMachine(string file, Type fallbackStateForm = null, bool overwrite = true)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}
FallbackStateForm = fallbackStateForm;
this.FallbackStateForm = fallbackStateForm;
if (this.FallbackStateForm != null && !this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
{
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
}
this.FilePath = file;
this.Overwrite = overwrite;
FilePath = file ?? throw new ArgumentNullException(nameof(file));
Overwrite = overwrite;
}
public StateContainer LoadFormStates()
{
try
{
var content = System.IO.File.ReadAllText(FilePath);
var content = File.ReadAllText(FilePath);
var sc = Newtonsoft.Json.JsonConvert.DeserializeObject<StateContainer>(content) as StateContainer;
var sc = JsonConvert.DeserializeObject<StateContainer>(content);
return sc;
}
@@ -65,21 +58,21 @@ namespace TelegramBotBase.States
public void SaveFormStates(SaveStatesEventArgs e)
{
if (System.IO.File.Exists(FilePath))
if (File.Exists(FilePath))
{
if (!this.Overwrite)
if (!Overwrite)
{
throw new Exception("File exists already.");
}
System.IO.File.Delete(FilePath);
File.Delete(FilePath);
}
try
{
var content = Newtonsoft.Json.JsonConvert.SerializeObject(e.States, Formatting.Indented);
var content = JsonConvert.SerializeObject(e.States, Formatting.Indented);
System.IO.File.WriteAllText(FilePath, content);
File.WriteAllText(FilePath, content);
}
catch
{
TelegramBotBase/States/XMLStateMachine.cs
+14 -22
View File
@@ -1,10 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using TelegramBotBase.Form;
@@ -12,9 +9,9 @@ using TelegramBotBase.Interfaces;
namespace TelegramBotBase.States
{
public class XMLStateMachine : IStateMachine
public class XmlStateMachine : IStateMachine
{
public String FilePath { get; set; }
public string FilePath { get; set; }
public bool Overwrite { get; set; }
@@ -26,35 +23,30 @@ namespace TelegramBotBase.States
/// <param name="file">Path of the file and name where to save the session details.</param>
/// <param name="fallbackStateForm">Type of Form which will be saved instead of Form which has <seealso cref="Attributes.IgnoreState"/> attribute declared. Needs to be subclass of <seealso cref="Form.FormBase"/>.</param>
/// <param name="overwrite">Declares of the file could be overwritten.</param>
public XMLStateMachine(String file, Type fallbackStateForm = null, bool overwrite = true)
public XmlStateMachine(string file, Type fallbackStateForm = null, bool overwrite = true)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}
FallbackStateForm = fallbackStateForm;
this.FallbackStateForm = fallbackStateForm;
if (this.FallbackStateForm != null && !this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
{
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
}
this.FilePath = file;
this.Overwrite = overwrite;
FilePath = file ?? throw new ArgumentNullException(nameof(file));
Overwrite = overwrite;
}
public StateContainer LoadFormStates()
{
try
{
DataContractSerializer serializer = new DataContractSerializer(typeof(StateContainer));
var serializer = new DataContractSerializer(typeof(StateContainer));
using (var reader = new StreamReader(FilePath))
{
using (var xml = new XmlTextReader(reader))
{
StateContainer sc = serializer.ReadObject(xml) as StateContainer;
var sc = serializer.ReadObject(xml) as StateContainer;
return sc;
}
}
@@ -69,21 +61,21 @@ namespace TelegramBotBase.States
public void SaveFormStates(SaveStatesEventArgs e)
{
if (System.IO.File.Exists(FilePath))
if (File.Exists(FilePath))
{
if (!this.Overwrite)
if (!Overwrite)
{
throw new Exception("File exists already.");
}
System.IO.File.Delete(FilePath);
File.Delete(FilePath);
}
try
{
DataContractSerializer serializer = new DataContractSerializer(typeof(StateContainer));
var serializer = new DataContractSerializer(typeof(StateContainer));
using (var sw = new StreamWriter(this.FilePath))
using (var sw = new StreamWriter(FilePath))
{
using (var writer = new XmlTextWriter(sw))
{