Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

confirmed working for linux

Browse Source 
fixed the database access issue
This commit is contained in:
RaidMax 2018-08-01 21:09:22 -05:00
parent 4ec16d3aa2
commit 396e5c9215
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/Server.cs
View File

@ -802,7 +802,7 @@ namespace IW4MAdmin
// hopefully fix wine drive name mangling // hopefully fix wine drive name mangling
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
logPath = Regex.Replace(logPath, @"[A-Z]:", ""); logPath = Regex.Replace($"{Path.DirectorySeparatorChar}{logPath}", @"[A-Z]:", "");
} }
if (!File.Exists(logPath)) if (!File.Exists(logPath))

5
SharedLibraryCore/Database/DatabaseContext.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using System.Runtime.InteropServices;
namespace SharedLibraryCore.Database namespace SharedLibraryCore.Database
{ {
@ -37,6 +38,10 @@ namespace SharedLibraryCore.Database
if (string.IsNullOrEmpty(_ConnectionString)) if (string.IsNullOrEmpty(_ConnectionString))
{ {
string currentPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase); string currentPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase);
// allows the application to find the database file
currentPath = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
$"{Path.DirectorySeparatorChar}{currentPath}" :
currentPath;
var connectionStringBuilder = new SqliteConnectionStringBuilder { DataSource = $"{currentPath}{Path.DirectorySeparatorChar}Database.db".Substring(6) }; var connectionStringBuilder = new SqliteConnectionStringBuilder { DataSource = $"{currentPath}{Path.DirectorySeparatorChar}Database.db".Substring(6) };
var connectionString = connectionStringBuilder.ToString(); var connectionString = connectionStringBuilder.ToString();
var connection = new SqliteConnection(connectionString); var connection = new SqliteConnection(connectionString);