OwnChar/Library
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Pascal
2024-06-11 06:59:34 +02:00
parent ff4c352dee
commit 6fd51f4b7a
26 changed files with 444 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OwnChar/Data/IDataManager.cs
View File

@@ -1,9 +1,9 @@
using OwnChar.Model;
namespace OwnChar.Data
namespace OwnChar.Data;
public interface IDataManager
{
public interface IDataManager
{
// Login
abstract UserAccount? Login(string username, string password);
abstract bool Logout(UserAccount? account);
@@ -16,5 +16,4 @@ namespace OwnChar.Data
// Group management
abstract UserProfile? GetOwner(Group group);
abstract IEnumerable<UserProfile>? GetMembers(Group group);
}
}

7
OwnChar/Data/IDataProvider.cs
View File

@@ -1,9 +1,9 @@
using OwnChar.Model;
namespace OwnChar.Data
namespace OwnChar.Data;
public interface IDataProvider
{
public interface IDataProvider
{
// General
abstract bool IsInitialized();
@@ -25,5 +25,4 @@ namespace OwnChar.Data
abstract IEnumerable<UserProfile>? GetGroupMembers(Group group);
abstract UserProfile? GetOwner(Group group);
abstract UserProfile? GetOwner(Character character);
}
}

7
OwnChar/Data/Managers/ClientDataManager.cs
View File

@@ -1,6 +1,5 @@
namespace OwnChar.Data.Managers
namespace OwnChar.Data.Managers;
public class ClientDataManager
{
public class ClientDataManager
{
}
}

7
OwnChar/Data/Managers/DefaultDataManager.cs
View File

@@ -1,9 +1,9 @@
using OwnChar.Model;
namespace OwnChar.Data.Managers
namespace OwnChar.Data.Managers;
public class DefaultDataManager(IDataProvider dataProvider) : IDataManager
{
public class DefaultDataManager(IDataProvider dataProvider) : IDataManager
{
private const string defaultUsername = "admin";
private const string defaultPassword = "admin";
@@ -75,5 +75,4 @@ namespace OwnChar.Data.Managers
DataProvider.Delete(account);
return true;
}
}
}

8
OwnChar/Data/Providers/JsonFile/JsonFile.cs
View File

@@ -1,12 +1,10 @@
using OwnChar.Data.Providers.JsonFile.Model;
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile
namespace OwnChar.Data.Providers.JsonFile;
public class JsonFile
{
public class JsonFile
{
public List<JsonUserAccount> UserAccounts { get; } = [];
public List<JsonCharacter> Characters { get; } = [];
public List<JsonGroup> Groups { get; } = [];
}
}

10
OwnChar/Data/Providers/JsonFile/JsonFileDataProvider.cs
View File

@@ -1,12 +1,11 @@
using Newtonsoft.Json;
using OwnChar.Data.Providers.JsonFile.Model;
using OwnChar.Model;
using System.Net.NetworkInformation;
namespace OwnChar.Data.Providers.JsonFile
namespace OwnChar.Data.Providers.JsonFile;
public class JsonFileDataProvider : IDataProvider
{
public class JsonFileDataProvider : IDataProvider
{
public JsonFile JsonFile { get; protected set; }
public string JsonFilePath { get; protected set; }
@@ -77,7 +76,7 @@ namespace OwnChar.Data.Providers.JsonFile
if (!JsonFile.Groups.Contains(group))
JsonFile.Groups.Add(group);
}
else if(obj is JsonUserAccount account)
else if (obj is JsonUserAccount account)
{
if (!JsonFile.UserAccounts.Contains(account))
JsonFile.UserAccounts.Add(account);
@@ -217,5 +216,4 @@ namespace OwnChar.Data.Providers.JsonFile
return jcharacter.Owner;
return null;
}
}
}

7
OwnChar/Data/Providers/JsonFile/Model/JsonCharacter.cs
View File

@@ -1,11 +1,10 @@
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile.Model
namespace OwnChar.Data.Providers.JsonFile.Model;
public class JsonCharacter : Character
{
public class JsonCharacter : Character
{
public virtual JsonUserProfile? Owner { get; set; }
public virtual List<JsonProp> Properties { get; } = [];
public virtual List<JsonPropCat> PropertyCategories { get; } = [];
}
}

7
OwnChar/Data/Providers/JsonFile/Model/JsonGroup.cs
View File

@@ -1,11 +1,10 @@
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile.Model
namespace OwnChar.Data.Providers.JsonFile.Model;
public class JsonGroup : Group
{
public class JsonGroup : Group
{
public virtual JsonUserProfile? Owner { get; set; }
public virtual List<JsonUserProfile> Members { get; } = [];
public virtual List<JsonCharacter> Characters { get; } = [];
}
}

7
OwnChar/Data/Providers/JsonFile/Model/JsonProp.cs
View File

@@ -1,9 +1,8 @@
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile.Model
namespace OwnChar.Data.Providers.JsonFile.Model;
public class JsonProp : Property
{
public class JsonProp : Property
{
public virtual JsonPropCat? Category { get; set; } = null;
}
}

7
OwnChar/Data/Providers/JsonFile/Model/JsonPropCat.cs
View File

@@ -1,8 +1,7 @@
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile.Model
namespace OwnChar.Data.Providers.JsonFile.Model;
public class JsonPropCat : PropertyCategory
{
public class JsonPropCat : PropertyCategory
{
}
}

7
OwnChar/Data/Providers/JsonFile/Model/JsonUserAccount.cs
View File

@@ -2,13 +2,12 @@
using Newtonsoft.Json.Converters;
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile.Model
namespace OwnChar.Data.Providers.JsonFile.Model;
public class JsonUserAccount : UserAccount
{
public class JsonUserAccount : UserAccount
{
public virtual JsonUserProfile? Profile { get; set; }
[JsonConverter(typeof(StringEnumConverter))]
public override UserType Type { get => base.Type; set => base.Type = value; }
}
}

7
OwnChar/Data/Providers/JsonFile/Model/JsonUserProfile.cs
View File

@@ -1,8 +1,7 @@
using OwnChar.Model;
namespace OwnChar.Data.Providers.JsonFile.Model
namespace OwnChar.Data.Providers.JsonFile.Model;
public class JsonUserProfile : UserProfile
{
public class JsonUserProfile : UserProfile
{
}
}

7
OwnChar/Manager/CharacterManager.cs
View File

@@ -1,9 +1,9 @@
using OwnChar.Model;
namespace OwnChar.Manager
namespace OwnChar.Manager;
public class CharacterManager(OwnCharManager manager)
{
public class CharacterManager(OwnCharManager manager)
{
public OwnCharManager Manager { get; } = manager;
public IEnumerable<Character>? GetCharacters(Group? group)
@@ -15,5 +15,4 @@ namespace OwnChar.Manager
{
throw new NotImplementedException();
}
}
}

7
OwnChar/Manager/Exceptions/LoginException.cs
View File

@@ -1,6 +1,5 @@
namespace OwnChar.Manager.Exceptions
namespace OwnChar.Manager.Exceptions;
public class LoginException(string message) : Exception(message)
{
public class LoginException(string message) : Exception(message)
{
}
}

7
OwnChar/Manager/GroupsManager.cs
View File

@@ -1,9 +1,9 @@
using OwnChar.Model;
namespace OwnChar.Manager
namespace OwnChar.Manager;
public class GroupsManager(OwnCharManager manager)
{
public class GroupsManager(OwnCharManager manager)
{
public OwnCharManager Manager { get; } = manager;
public UserProfile? GetOwner(Group? group)
@@ -17,5 +17,4 @@ namespace OwnChar.Manager
ArgumentNullException.ThrowIfNull(group, nameof(group));
return Manager.DataManager?.GetMembers(group);
}
}
}

7
OwnChar/Manager/OwnCharManager.cs
View File

@@ -3,10 +3,10 @@ using OwnChar.Manager.Exceptions;
using OwnChar.Model;
using Pilz.Cryptography;
namespace OwnChar.Manager
namespace OwnChar.Manager;
public class OwnCharManager
{
public class OwnCharManager
{
// User
public bool IsLoggedIn => CurrentUser != null;
public UserAccount? CurrentUser { get; private set; }
@@ -56,5 +56,4 @@ namespace OwnChar.Manager
{
return DataManager?.Logout(CurrentUser) ?? true;
}
}
}

7
OwnChar/Manager/UserManager.cs
View File

@@ -1,10 +1,10 @@
using OwnChar.Model;
using Pilz.Cryptography;
namespace OwnChar.Manager
namespace OwnChar.Manager;
public class UserManager(OwnCharManager manager)
{
public class UserManager(OwnCharManager manager)
{
public OwnCharManager Manager { get; } = manager;
public UserProfile? GetOwnUserProfile()
@@ -26,5 +26,4 @@ namespace OwnChar.Manager
ArgumentNullException.ThrowIfNull(account, nameof(account));
return Manager.DataManager?.DeleteUserAccount(account) ?? false;
}
}
}

7
OwnChar/Model/Character.cs
View File

@@ -1,7 +1,6 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public abstract class Character : IOwnCharObject
{
public abstract class Character : IOwnCharObject
{
public virtual string? Name { get; set; }
}
}

7
OwnChar/Model/Group.cs
View File

@@ -1,8 +1,7 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public abstract class Group : IOwnCharObject
{
public abstract class Group : IOwnCharObject
{
public virtual string? Name { get; set; }
public virtual bool IsInternal { get; set; }
}
}

7
OwnChar/Model/IOwnCharObject.cs
View File

@@ -1,6 +1,5 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public interface IOwnCharObject
{
public interface IOwnCharObject
{
}
}

7
OwnChar/Model/Property.cs
View File

@@ -1,8 +1,7 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public abstract class Property : IOwnCharObject
{
public abstract class Property : IOwnCharObject
{
public virtual string? Name { get; set; }
public virtual object? Value { get; set; }
}
}

7
OwnChar/Model/PropertyCategory.cs
View File

@@ -1,7 +1,6 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public abstract class PropertyCategory : IOwnCharObject
{
public abstract class PropertyCategory : IOwnCharObject
{
public virtual string? Name { get; set; }
}
}

7
OwnChar/Model/UserAccount.cs
View File

@@ -1,10 +1,9 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public abstract class UserAccount : IOwnCharObject
{
public abstract class UserAccount : IOwnCharObject
{
public virtual string? Username { get; set; }
public virtual string? Password { get; set; }
public virtual string? Email { get; set; }
public virtual UserType Type { get; set; }
}
}

7
OwnChar/Model/UserProfile.cs
View File

@@ -1,7 +1,6 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public abstract class UserProfile : IOwnCharObject
{
public abstract class UserProfile : IOwnCharObject
{
public virtual string? Name { get; set; }
}
}

7
OwnChar/Model/UserType.cs
View File

@@ -1,9 +1,8 @@
namespace OwnChar.Model
namespace OwnChar.Model;
public enum UserType
{
public enum UserType
{
Guest,
User,
Admin
}
}

7
OwnChar/Utils.cs
View File

@@ -1,13 +1,12 @@
using Pilz.Cryptography;
namespace OwnChar
namespace OwnChar;
public static class Utils
{
public static class Utils
{
public static string HashPassword(string username, SecureString password)
{
// TODO: Implement a good hasing algorythmus (like MD5) BEFORE going productive!
return (username + ":" + password).GetHashCode().ToString();
}
}
}