Skip to content

Commit 6097ebf

Browse files
RamType0RamType0
committed
Improve customization experience
1 parent 6d086ec commit 6097ebf

11 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎VpmRepository.Build/Build.cs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Nuke.Common.Tools.DotNet;
1010
using Nuke.Common.Utilities.Collections;
1111
using static Nuke.Common.EnvironmentInfo;
12-
//using static Nuke.Common.IO.FileSystemTasks;
1312
using static Nuke.Common.IO.PathConstruction;
1413
using static Nuke.Common.Tools.DotNet.DotNetTasks;
1514
using Nuke.Common.CI.GitHubActions;
@@ -23,9 +22,7 @@
2322
using System.Security.Cryptography;
2423
using System.Buffers;
2524
using System.Text.Json;
26-
using System.IO;
2725
using Nuke.Common.Utilities;
28-
using System.Text.Json.Serialization;
2926
using System.Net.Http.Json;
3027
[GitHubActions(
3128
"build-repository",
@@ -83,14 +80,12 @@ GitHubClient GitHubClient
8380
WriteIndented = IsLocalBuild,
8481
};
8582

86-
const string RepositoryManifestFileName = "index.json";
87-
88-
static VpmRepositorySettings Settings { get; } = new()
83+
static VpmRepositoryBuildSettings Settings { get; } = new()
8984
{
9085
Id = "com.ramtype0.vpm-repository",
91-
Name = "Ram.Type-0 VPM Repository",
86+
Name = GlobalSettings.RepositoryName,
9287
Author = "Ram.Type-0",
93-
Url = new(IsLocalBuild ? "https://ramtype0.github.io/VpmRepository/index.json" : $"https://{GitHubActions.RepositoryOwner}.github.io/{GitHubActions.Repository.Split('/')[1]}/{RepositoryManifestFileName}"),
88+
Url = new(IsLocalBuild ? $"https://ramtype0.github.io/VpmRepository/{GlobalSettings.PublishedRepositoryManifestFileName}" : $"https://{GitHubActions.RepositoryOwner}.github.io/{GitHubActions.Repository.Split('/')[1]}/{GlobalSettings.PublishedRepositoryManifestFileName}"),
9489
GitHubRepositories =
9590
{
9691
["RamType0"] = ["Meshia.MeshSimplification"],
@@ -102,7 +97,7 @@ GitHubClient GitHubClient
10297
Target RefreshVpmRepositoryManifest => _ => _
10398
.Executes(async () =>
10499
{
105-
AbsolutePath vpmRepositoryManifestJsonPath = (WorkingDirectory / "VpmRepository.Web" / "wwwroot" / RepositoryManifestFileName);
100+
AbsolutePath vpmRepositoryManifestJsonPath = (WorkingDirectory / "VpmRepository.Web" / "wwwroot" / GlobalSettings.PublishedRepositoryManifestFileName);
106101

107102
VpmRepositoryManifest? existingVpmRepositoryManifest = null;
108103
if (vpmRepositoryManifestJsonPath.FileExists())

VpmRepository.Build/VpmRepositorySettings.cs renamed to VpmRepository.Build/VpmRepositoryBuildSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Threading.Tasks;
99
using Version = SemanticVersioning.Version;
1010
namespace VpmRepository.Build;
11-
public record VpmRepositorySettings
11+
public record VpmRepositoryBuildSettings
1212
{
1313
public required string Name { get; init; }
1414
public required string Id { get; init; }

‎VpmRepository.Shared/GlobalSettings.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace VpmRepository;
2+
3+
public static class GlobalSettings
4+
{
5+
public const string RepositoryName = "Ram.Type-0 VPM Repository";
6+
public const string PublishedRepositoryManifestFileName = "index.json";
7+
}

‎VpmRepository.Shared/PackageManifest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Text.Json;
22
using System.Text.Json.Nodes;
33
using System.Text.Json.Serialization;
4-
using System.Text.RegularExpressions;
54
using SemanticVersion = SemanticVersioning.Version;
65
using SemanticVersionRange = SemanticVersioning.Range;
76
namespace VpmRepository;

‎VpmRepository.Shared/SemanticVersionJsonConverter.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Text.Json;
33
using System.Text.Json.Serialization;
44
using SemanticVersion = SemanticVersioning.Version;
5-
using SemanticVersionRange = SemanticVersioning.Range;
65
namespace VpmRepository;
76

87
public sealed class SemanticVersionJsonConverter : JsonConverter<SemanticVersion>

‎VpmRepository.Shared/UpmPackageManifestNameVersionEqualityComparer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ public sealed class UpmPackageManifestNameVersionEqualityComparer : IEqualityCom
55
public static UpmPackageManifestNameVersionEqualityComparer Instance { get; } = new UpmPackageManifestNameVersionEqualityComparer();
66
public bool Equals(UpmPackageManifest? x, UpmPackageManifest? y)
77
{
8-
if(x is null && y is null)
8+
if (x is null && y is null)
99
{
1010
return true;
1111
}
12-
if(x is null || y is null)
12+
if (x is null || y is null)
1313
{
1414
return false;
1515
}

‎VpmRepository.Shared/VpmPackageManifest.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Text.Json;
2-
using System.Text.Json.Nodes;
3-
using System.Text.Json.Serialization;
1+
using System.Text.Json.Serialization;
42
using SemanticVersionRange = SemanticVersioning.Range;
53
namespace VpmRepository;
64

‎VpmRepository.Web/Layout/MainLayout.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<MudLayout>
99
<MudAppBar>
1010
<MudText Typo="Typo.h5">
11-
Ram.Type-0 VPM Repository
11+
@GlobalSettings.RepositoryName
1212
</MudText>
1313
</MudAppBar>
1414
<MudMainContent Class="ma-4">

‎VpmRepository.Web/Pages/Home.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
PackageModel[]? packages;
169169
protected override async Task OnInitializedAsync()
170170
{
171-
vpmRepositoryManifestTask = HttpClient.GetFromJsonAsync<VpmRepositoryManifest>("index.json", Json.JsonSerializerOptions);
171+
vpmRepositoryManifestTask = HttpClient.GetFromJsonAsync<VpmRepositoryManifest>(GlobalSettings.PublishedRepositoryManifestFileName, Json.JsonSerializerOptions);
172172
var vpmRepositoryManifest = await vpmRepositoryManifestTask;
173173
if(vpmRepositoryManifest is not null)
174174
{

‎VpmRepository.Web/Shared/AddToVccButton.razor‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
@using System.Net
22
@inject NavigationManager NavigationManager
33

4-
<MudButton Href="@url" Variant="Variant.Filled" Color="Color.Primary">
4+
<MudButton Href="@href" Variant="Variant.Filled" Color="Color.Primary">
55
Add to VCC
66
</MudButton>
77

88
@code {
9-
string url = "";
9+
[Parameter]
10+
public string VpmRepositoryManifestUrl { get; set; } = GlobalSettings.PublishedRepositoryManifestFileName;
11+
string href = "";
1012

1113
protected override void OnInitialized()
1214
{
13-
var vpmRepositoryManifestUrl = NavigationManager.ToAbsoluteUri("index.json").AbsoluteUri;
14-
url = $"vcc://vpm/addRepo?url={WebUtility.UrlEncode(vpmRepositoryManifestUrl)}";
15+
var vpmRepositoryManifestUrl = NavigationManager.ToAbsoluteUri(VpmRepositoryManifestUrl).AbsoluteUri;
16+
href = $"vcc://vpm/addRepo?url={WebUtility.UrlEncode(vpmRepositoryManifestUrl)}";
1517
}
1618
}

0 commit comments

Comments
 (0)