Skip to content

Commit bc2babd

Browse files
committed
Renamed IFileManager to IDataAccess
extracted out IDataAccess to be more extensible in case need to swap it out for database access. renamed all instance to be more appropriate.
1 parent 6df89a8 commit bc2babd

File tree

6 files changed

+39
-28
lines changed

6 files changed

+39
-28
lines changed

src/HyperMC/HyperMcView.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ public partial class HyperMcView : Form, IViewHost
2626
{
2727

2828
private readonly IForgeClient _forgeClient;
29-
private readonly IFileManager _fileManager;
29+
private readonly IDataAccess _dataAccess;
3030
private readonly IUserSettings _settings;
3131
private readonly SettingView _settingView;
3232

33-
public HyperMcView(IForgeClient forgeClient, IFileManager fileManager, IUserSettings settings, SettingView settingView)
33+
public HyperMcView(IForgeClient forgeClient, IDataAccess dataAccess, IUserSettings settings, SettingView settingView)
3434
{
3535
InitializeComponent();
3636

3737
_forgeClient = forgeClient;
38-
_fileManager = fileManager;
38+
_dataAccess = dataAccess;
3939
_settings = settings;
4040
_settingView = settingView;
4141

@@ -46,7 +46,7 @@ public HyperMcView(IForgeClient forgeClient, IFileManager fileManager, IUserSett
4646
private async void HyperMcView_Load(object sender, EventArgs e)
4747
{
4848
SetView(new ControlView(pnl_MainArea));
49-
var mods = await _fileManager.ReadFile<ModpackData[]>(_settings.ModPacksFile);
49+
var mods = await _dataAccess.LoadData<ModpackData[]>(_settings.ModPacksFile);
5050
if (mods != null)
5151
{
5252
foreach (var mod in mods)
@@ -127,7 +127,7 @@ private async void ModpacksUpdated(object? sender, NotifyCollectionChangedEventA
127127
}
128128

129129
SortModpacks();
130-
await _fileManager.WriteToFile(_modpacks.ToArray(), _settings.ModPacksFile);
130+
await _dataAccess.SaveData(_modpacks.ToArray(), _settings.ModPacksFile);
131131
}
132132

133133
private ModpackBox CreateModpackBox(ModpackData data)

src/HyperMC/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private static void ConfigureServices(IServiceCollection services)
4949
.AddSingleton<IUserSettings, UserSettings>();
5050

5151
services.AddTransient<SettingView>()
52-
.AddTransient<IFileManager, FileManager>();
52+
.AddTransient<IDataAccess, FileDataAccess>();
5353

5454
services.AddForgeClient();
5555
}

src/HyperMC/Services/FileManager.cs renamed to src/HyperMC/Services/FileDataAccess.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
namespace Hypermc.Services
1010
{
11-
public class FileManager : IFileManager
11+
public class FileDataAccess : IDataAccess
1212
{
13-
public async Task<T> ReadFile<T>(string file)
13+
public async Task<T> LoadData<T>(string file)
1414
{
1515
if (File.Exists(file))
1616
{
@@ -22,10 +22,19 @@ public async Task<T> ReadFile<T>(string file)
2222
return default(T);
2323
}
2424

25-
public async Task WriteToFile<T>(T data, string file)
25+
public async Task SaveData<T>(T data, string file)
2626
{
2727
string settingsToSave = JsonSerializer.Serialize(data);
2828
await File.WriteAllTextAsync(file, settingsToSave);
2929
}
30+
31+
public Task<List<T>> LoadData<T, U>(string query, U parameters, string connectionStringName)
32+
{
33+
return null;
34+
}
35+
public Task SaveData<T>(string query, T parameters, string connectionStringName)
36+
{
37+
return null;
38+
}
3039
}
3140
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace Hypermc.Services
8+
{
9+
public interface IDataAccess
10+
{
11+
Task SaveData<T>(T data, string file);
12+
Task<T> LoadData<T>(string file);
13+
Task<List<T>> LoadData<T, U>(string query, U parameters, string connectionStringName);
14+
Task SaveData<T>(string query, T parameters, string connectionStringName);
15+
}
16+
}

src/HyperMC/Services/IFileManager.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/HyperMC/Settings/UserSettings.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ public class UserSettings : IUserSettings
1515
{
1616
private readonly string _appPath;
1717
private readonly string _settingsFile;
18-
private readonly IFileManager _fileManager;
18+
private readonly IDataAccess _dataAccess;
1919

2020
public string MinecraftPath { get; private set; }
2121
public string ModPacksPath { get; private set; }
2222
public string ModPacksFile { get; }
2323

24-
public UserSettings(IFileManager fileManager, IConfiguration config)
24+
public UserSettings(IDataAccess dataAccess, IConfiguration config)
2525
{
2626
var settings = config.GetSection(nameof(ApplicationSettings)).Get<ApplicationSettings>();
2727
_appPath = string.Format(settings.AppPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
2828
_settingsFile = string.Format(settings.SettingsFile, _appPath);
2929

30-
_fileManager = fileManager;
30+
_dataAccess = dataAccess;
3131

3232
MinecraftPath = string.Format(settings.DeafultMinecraftPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
3333
ModPacksPath = string.Format(settings.DefaultModPacksPath, MinecraftPath);
@@ -46,7 +46,7 @@ public async Task Initialize()
4646
Directory.CreateDirectory(ModPacksPath);
4747
}
4848

49-
var settings = await _fileManager.ReadFile<UserSettings>(_settingsFile);
49+
var settings = await _dataAccess.LoadData<UserSettings>(_settingsFile);
5050

5151
if (settings != null)
5252
{
@@ -60,7 +60,7 @@ public async Task UpdateSettings(string mcPath, string modPath)
6060
MinecraftPath = mcPath;
6161
ModPacksPath = modPath;
6262

63-
await _fileManager.WriteToFile(this, _settingsFile);
63+
await _dataAccess.SaveData(this, _settingsFile);
6464
}
6565
}
6666
}

0 commit comments

Comments
 (0)