Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ yarn-error.log
*.sublime-workspace
Gridly.csproj.lscache
Gridly.csproj.user
Gridly.sln.*

# Visual Studio Code
!.vscode/settings.json
Expand Down
Empty file removed Assets/Db/.gitkeep
Empty file.
5 changes: 2 additions & 3 deletions Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Gridly.Repositories;
using Gridly.Services;
using Gridly.Data;
using System.Data;

var appDirectory = Path.GetDirectoryName(Environment.ProcessPath) ?? AppContext.BaseDirectory;
Directory.SetCurrentDirectory(appDirectory);
Expand All @@ -20,14 +19,14 @@

builder.Services.AddScoped<DbInitializer>();
builder.Services.AddScoped(sp =>
sp.GetRequiredService<IDbConnectionServices>().CreateConnection());
sp.GetRequiredService<IDbConnectionServices>().CreateConnection());
builder.Services.AddScoped<IDbConnectionServices,DbConnectionServices>();
builder.Services.AddScoped<IVersionEndPoint, VersionEndPoint>();
builder.Services.AddScoped<ICardRepository,CardRepository>();
builder.Services.AddScoped<ISettingsRepository,SettingsRepository>();
builder.Services.AddScoped<IIconRepository,IconRepository>();
builder.Services.AddScoped<IIconConnectedRepository,IconConnectedRepository>();

builder.Services.AddSingleton<IDbConnectionServices,DbConnectionServices>();
builder.Services.AddSingleton<IMemoryCashingService, MemoryCashingServices>();
builder.Services.AddSingleton<IHttpClientServices, HttpClientServices>();
builder.Services.AddSingleton<IFileService, FileService>();
Expand Down
9 changes: 2 additions & 7 deletions Services/DbConnectionServices.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,14 @@ public DbConnectionServices(IConfiguration configuration, IHostEnvironment envir
{
throw new InvalidOperationException("Connection string 'GridlyDb' is missing.");
}

var sqliteBuilder = new SqliteConnectionStringBuilder(configuredConnectionString);
if (!Path.IsPathRooted(sqliteBuilder.DataSource))
{
sqliteBuilder.DataSource = Path.Combine(environment.ContentRootPath, sqliteBuilder.DataSource);
}

sqliteBuilder.DataSource = Path.Combine(environment.ContentRootPath, sqliteBuilder.DataSource);
var dbDirectory = Path.GetDirectoryName(sqliteBuilder.DataSource);
if (!string.IsNullOrWhiteSpace(dbDirectory))
{
Directory.CreateDirectory(dbDirectory);
}

connectionString = sqliteBuilder.ConnectionString;
}

Expand Down
Loading