Major changes
Changed the whole project struture justfile was adjusted to reflect the changes Add Tests Minor changes to .gitignore
This commit is contained in:
parent
10ba654b09
commit
9ad8012052
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,3 @@
|
|||||||
.vscode/
|
.vscode/
|
||||||
obj/
|
[Oo]bj/
|
||||||
bin/
|
[Bb]in/
|
||||||
|
11
justfile
11
justfile
@ -5,10 +5,15 @@ run:
|
|||||||
@dotnet run
|
@dotnet run
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@dotnet build pacserver.csproj
|
@dotnet build src/Pacserver/pacserver.csproj
|
||||||
|
@dotnet build src/Pacserver.Tests/Pacserver.Tests.csproj
|
||||||
|
|
||||||
publish: format
|
publish: format
|
||||||
@dotnet publish --configuration Release pacserver.csproj
|
@dotnet publish --configuration Release src/Pacserver/pacserver.csproj
|
||||||
|
|
||||||
format:
|
format:
|
||||||
@dotnet format
|
@dotnet format src/Pacserver
|
||||||
|
@dotnet format src/Pacserver.Tests
|
||||||
|
|
||||||
|
test: build
|
||||||
|
@dotnet test src/Pacserver.Tests
|
||||||
|
28
src/Pacserver.Tests/Pacserver.Tests.csproj
Normal file
28
src/Pacserver.Tests/Pacserver.Tests.csproj
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
|
||||||
|
<IsPackable>false</IsPackable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
|
||||||
|
<PackageReference Include="xunit" Version="2.4.2" />
|
||||||
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="coverlet.collector" Version="3.1.2">
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Pacserver\pacserver.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
1
src/Pacserver.Tests/Usings.cs
Normal file
1
src/Pacserver.Tests/Usings.cs
Normal file
@ -0,0 +1 @@
|
|||||||
|
global using Xunit;
|
13
src/Pacserver.Tests/pacmanCache_Test.cs
Normal file
13
src/Pacserver.Tests/pacmanCache_Test.cs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
using Pacserver.Utils;
|
||||||
|
|
||||||
|
namespace Pacserver.Tests;
|
||||||
|
|
||||||
|
public class pacmanCache_Test {
|
||||||
|
[Fact]
|
||||||
|
public void doesPacmanCacheExist() {
|
||||||
|
string result = PacserverUtils.determinePacmanCacheDirectory();
|
||||||
|
|
||||||
|
Assert.Equivalent(result, "/var/cache/pacman/pkg/");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,13 +1,14 @@
|
|||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
public class Pacserver {
|
namespace Pacserver.Utils;
|
||||||
|
public class PacserverUtils {
|
||||||
public static string pacmanCacheDirectory { get; set; } = string.Empty;
|
public static string pacmanCacheDirectory { get; set; } = string.Empty;
|
||||||
public static string determinePacmanCacheDirectory() {
|
public static string determinePacmanCacheDirectory() {
|
||||||
string defaultPacmanCacheDirectory = "/var/cache/pacman/pkg/";
|
string defaultPacmanCacheDirectory = "/var/cache/pacman/pkg/";
|
||||||
|
|
||||||
Regex regex = new Regex(@"\/(?:[\w.-]+\/)*[\w.-]+(?:\.\w+)*\/?$"); // https://regex101.com/r/GwWeui/2
|
Regex regex = new Regex(@"\/(?:[\w.-]+\/)*[\w.-]+(?:\.\w+)*\/?$"); // https://regex101.com/r/GwWeui/2
|
||||||
string? line;
|
string? line;
|
||||||
StreamReader file = new StreamReader(@"/etc/pacman.conf");
|
StreamReader file = new StreamReader("/etc/pacman.conf");
|
||||||
while ((line = file.ReadLine()) is not null) {
|
while ((line = file.ReadLine()) is not null) {
|
||||||
if (line.Contains("CacheDir")) {
|
if (line.Contains("CacheDir")) {
|
||||||
Match match = regex.Match(line);
|
Match match = regex.Match(line);
|
||||||
@ -16,8 +17,6 @@ public class Pacserver {
|
|||||||
} else {
|
} else {
|
||||||
throw new Exception("Could not determine where pacman cache is! Would normally be found here " + defaultPacmanCacheDirectory);
|
throw new Exception("Could not determine where pacman cache is! Would normally be found here " + defaultPacmanCacheDirectory);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
throw new Exception("Pacman config has no CacheDir specified!");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
file.Close();
|
file.Close();
|
@ -1,4 +1,6 @@
|
|||||||
public class Program {
|
using Pacserver.Utils;
|
||||||
|
|
||||||
|
public class Program {
|
||||||
static void Main(string[] args) {
|
static void Main(string[] args) {
|
||||||
if (args.Length == 0) {
|
if (args.Length == 0) {
|
||||||
Console.ForegroundColor = ConsoleColor.Red;
|
Console.ForegroundColor = ConsoleColor.Red;
|
||||||
@ -7,7 +9,7 @@
|
|||||||
} else {
|
} else {
|
||||||
switch (args[0]) {
|
switch (args[0]) {
|
||||||
case "determinePacmanCacheDirectory":
|
case "determinePacmanCacheDirectory":
|
||||||
Console.WriteLine(Pacserver.determinePacmanCacheDirectory());
|
Console.WriteLine(PacserverUtils.determinePacmanCacheDirectory());
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
Console.ForegroundColor = ConsoleColor.Yellow;
|
32
src/pacserver.sln
Normal file
32
src/pacserver.sln
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.0.31903.59
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pacserver", "Pacserver\pacserver.csproj", "{2B605458-AFBE-4A78-B4EA-9562C82BC932}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pacserver.Tests", "Pacserver.Tests\Pacserver.Tests.csproj", "{0B504958-E66D-4E32-AB22-19F94713AFCD}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{6FCF1241-CE3C-4A4A-8625-866A4E8E7623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{6FCF1241-CE3C-4A4A-8625-866A4E8E7623}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{6FCF1241-CE3C-4A4A-8625-866A4E8E7623}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{6FCF1241-CE3C-4A4A-8625-866A4E8E7623}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{2B605458-AFBE-4A78-B4EA-9562C82BC932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{2B605458-AFBE-4A78-B4EA-9562C82BC932}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{2B605458-AFBE-4A78-B4EA-9562C82BC932}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{2B605458-AFBE-4A78-B4EA-9562C82BC932}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{0B504958-E66D-4E32-AB22-19F94713AFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0B504958-E66D-4E32-AB22-19F94713AFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0B504958-E66D-4E32-AB22-19F94713AFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{0B504958-E66D-4E32-AB22-19F94713AFCD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
Loading…
x
Reference in New Issue
Block a user