Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xpevo cleanup #220

Merged
merged 12 commits into from
Oct 4, 2023
Merged

Xpevo cleanup #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ddfbfd7
fix matchtracker module tests being in the wrong directory
snixtho Oct 2, 2023
0f02070
remove xpevo specific modules
snixtho Oct 2, 2023
7157fb3
remove references from xpevo admin and geardown module
snixtho Oct 2, 2023
b48205e
Initial cleanup of the World Record module
snixtho Oct 2, 2023
d07c9aa
remove sponsors module
snixtho Oct 2, 2023
5d0a536
from internal modules as well
snixtho Oct 2, 2023
78f19a7
initial cleanup of spectator target info module
snixtho Oct 2, 2023
bb5c4d6
initial scoreboard service cleanup
snixtho Oct 2, 2023
87ab214
at least some cleanup of liveranking
snixtho Oct 2, 2023
4a7a03b
remove xpevo seeding
snixtho Oct 2, 2023
a1ed3d4
fix add map tests as the method works differently now
snixtho Oct 2, 2023
6cfc638
fix sonarcloud, ignoring live ranking module as it will be re-written
snixtho Oct 3, 2023
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
35 changes: 7 additions & 28 deletions EvoSC.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchTrackerModule", "src\M
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchReadyModule", "src\Modules\MatchReadyModule\MatchReadyModule.csproj", "{0538B9AB-B556-45BF-8230-53087BA9D353}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchTrackerModule.Tests", "MatchTrackerModule.Tests\MatchTrackerModule.Tests.csproj", "{1EBEC855-5BF7-43D3-BABF-A09343B8693A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeardownModule", "src\Modules\GeardownModule\GeardownModule.csproj", "{D7916D8A-57D2-4CDC-ABA6-03C7FA5BB3D0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XPEvoAdminControl", "src\Modules\XPEvoAdminControl\XPEvoAdminControl.csproj", "{D0E37AF5-BBF2-4D8B-AEDB-43265DB37AD9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scoreboard", "src\Modules\Scoreboard\Scoreboard.csproj", "{CD032D37-3BC8-4DE8-8C5B-45A0DE36932E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NextMapModule", "src\Modules\NextMapModule\NextMapModule.csproj", "{64688FA7-136C-4BB9-B716-4E96DD0AA82F}"
Expand All @@ -98,7 +92,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NextMapModule.Tests", "test
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchRankingModule", "src\Modules\MatchRankingModule\MatchRankingModule.csproj", "{A3D8F2EB-59E4-44AB-B036-4BC0DB7D2774}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpectatorTargetInfo", "src\Modules\SpectatorTargetInfo\SpectatorTargetInfo.csproj", "{FCC3C10E-9CA8-4DF1-A508-339678846032}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpectatorTargetInfoModule", "src\Modules\SpectatorTargetInfoModule\SpectatorTargetInfoModule.csproj", "{FCC3C10E-9CA8-4DF1-A508-339678846032}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASayModule", "src\Modules\ASayModule\ASayModule.csproj", "{570CEDDA-7EBC-486D-BD5D-0A1C39DD69F8}"
EndProject
Expand All @@ -108,7 +102,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchReadyModule.Tests", "t
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModuleManagerModule", "src\Modules\ModuleManagerModule\ModuleManagerModule.csproj", "{65F795D5-058D-4F8D-B8E0-BE3F64E14CDF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SponsorsModule", "src\Modules\SponsorsModule\SponsorsModule.csproj", "{1F628FDD-289C-48C3-B736-B5A13D7EC9F2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchTrackerModule.Tests", "tests\Modules\MatchTrackerModule.Tests\MatchTrackerModule.Tests.csproj", "{9EF4D340-0C49-4A15-9BCF-6CD9508AA7DE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -286,18 +280,6 @@ Global
{0538B9AB-B556-45BF-8230-53087BA9D353}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0538B9AB-B556-45BF-8230-53087BA9D353}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0538B9AB-B556-45BF-8230-53087BA9D353}.Release|Any CPU.Build.0 = Release|Any CPU
{1EBEC855-5BF7-43D3-BABF-A09343B8693A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EBEC855-5BF7-43D3-BABF-A09343B8693A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EBEC855-5BF7-43D3-BABF-A09343B8693A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EBEC855-5BF7-43D3-BABF-A09343B8693A}.Release|Any CPU.Build.0 = Release|Any CPU
{D7916D8A-57D2-4CDC-ABA6-03C7FA5BB3D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7916D8A-57D2-4CDC-ABA6-03C7FA5BB3D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7916D8A-57D2-4CDC-ABA6-03C7FA5BB3D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7916D8A-57D2-4CDC-ABA6-03C7FA5BB3D0}.Release|Any CPU.Build.0 = Release|Any CPU
{D0E37AF5-BBF2-4D8B-AEDB-43265DB37AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0E37AF5-BBF2-4D8B-AEDB-43265DB37AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0E37AF5-BBF2-4D8B-AEDB-43265DB37AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0E37AF5-BBF2-4D8B-AEDB-43265DB37AD9}.Release|Any CPU.Build.0 = Release|Any CPU
{570CEDDA-7EBC-486D-BD5D-0A1C39DD69F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{570CEDDA-7EBC-486D-BD5D-0A1C39DD69F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{570CEDDA-7EBC-486D-BD5D-0A1C39DD69F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -314,10 +296,10 @@ Global
{65F795D5-058D-4F8D-B8E0-BE3F64E14CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65F795D5-058D-4F8D-B8E0-BE3F64E14CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65F795D5-058D-4F8D-B8E0-BE3F64E14CDF}.Release|Any CPU.Build.0 = Release|Any CPU
{1F628FDD-289C-48C3-B736-B5A13D7EC9F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F628FDD-289C-48C3-B736-B5A13D7EC9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F628FDD-289C-48C3-B736-B5A13D7EC9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F628FDD-289C-48C3-B736-B5A13D7EC9F2}.Release|Any CPU.Build.0 = Release|Any CPU
{9EF4D340-0C49-4A15-9BCF-6CD9508AA7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EF4D340-0C49-4A15-9BCF-6CD9508AA7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EF4D340-0C49-4A15-9BCF-6CD9508AA7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EF4D340-0C49-4A15-9BCF-6CD9508AA7DE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -361,13 +343,10 @@ Global
{A533CF48-1BE5-4F0E-A636-941ED63DF9ED} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
{CBE9F195-758F-470D-B3BF-6B012C8216CC} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{0538B9AB-B556-45BF-8230-53087BA9D353} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{1EBEC855-5BF7-43D3-BABF-A09343B8693A} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
{D7916D8A-57D2-4CDC-ABA6-03C7FA5BB3D0} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{D0E37AF5-BBF2-4D8B-AEDB-43265DB37AD9} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{570CEDDA-7EBC-486D-BD5D-0A1C39DD69F8} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{1D3B25FA-F807-4428-A520-878A582DCF28} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{42BCE01C-EBEF-4DB6-A61C-35B63C915AD3} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
{65F795D5-058D-4F8D-B8E0-BE3F64E14CDF} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{1F628FDD-289C-48C3-B736-B5A13D7EC9F2} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
{9EF4D340-0C49-4A15-9BCF-6CD9508AA7DE} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
EndGlobalSection
EndGlobal
9 changes: 0 additions & 9 deletions MatchTrackerModule.Tests/UnitTest1.cs
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions src/EvoSC.Common/Database/Migrations/202309211312_XPEvoValues.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/EvoSC.Common/Database/Migrations/202309221512_Snix.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/EvoSC.Common/Services/MapService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ public async Task<IMap> AddMapAsync(MapStream mapStream)
await _matchSettings.EditMatchSettingsAsync(Path.GetFileNameWithoutExtension(_config.Path.DefaultMatchSettings),
builder => builder.AddMap($"EvoSC/{fileName}"));

/*await _serverClient.Remote.InsertMapAsync($"EvoSC/{fileName}");
await _serverClient.Remote.SaveMatchSettingsAsync($"MatchSettings/{_config.Path.DefaultMatchSettings}"); */

return map;
}

Expand Down
8 changes: 4 additions & 4 deletions src/EvoSC.Common/Util/RaceTime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Runtime.Serialization;
using System.Globalization;
using EvoSC.Common.Interfaces.Util;

namespace EvoSC.Common.Util;
Expand Down Expand Up @@ -31,15 +31,15 @@ public static IRaceTime FromMilliseconds(int totalMilliseconds)

public override string ToString()
{
var milli = Milliseconds.ToString().PadLeft(3, '0');
var seconds = Seconds.ToString().PadLeft(2, '0');
var milli = Milliseconds.ToString(CultureInfo.InvariantCulture).PadLeft(3, '0');
var seconds = Seconds.ToString(CultureInfo.InvariantCulture).PadLeft(2, '0');

if (Minutes == 0 && Hours == 0)
{
return $"{seconds}.{milli}";
}

var minutes = Minutes.ToString().PadLeft(2, '0');
var minutes = Minutes.ToString(CultureInfo.InvariantCulture).PadLeft(2, '0');

return Hours == 0 ? $"{minutes}:{seconds}.{milli}" : $"{Hours}:{minutes}:{seconds}.{milli}";
}
Expand Down
5 changes: 1 addition & 4 deletions src/EvoSC/EvoSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<ProjectReference Include="..\EvoSC.Manialinks\EvoSC.Manialinks.csproj" />
<ProjectReference Include="..\EvoSC.Modules\EvoSC.Modules.csproj" />
<ProjectReference Include="..\Modules\ExampleModule\ExampleModule.csproj" />
<ProjectReference Include="..\Modules\GeardownModule\GeardownModule.csproj" />
<ProjectReference Include="..\Modules\LiveRankingModule\LiveRankingModule.csproj" />
<ProjectReference Include="..\Modules\MatchRankingModule\MatchRankingModule.csproj" />
<ProjectReference Include="..\Modules\MatchReadyModule\MatchReadyModule.csproj" />
Expand All @@ -46,7 +45,7 @@
<ProjectReference Include="..\Modules\MapsModule\MapsModule.csproj" />
<ProjectReference Include="..\Modules\MatchManagerModule\MatchManagerModule.csproj" />
<ProjectReference Include="..\Modules\ASayModule\ASayModule.csproj" />
<ProjectReference Include="..\Modules\SpectatorTargetInfo\SpectatorTargetInfo.csproj" />
<ProjectReference Include="..\Modules\SpectatorTargetInfoModule\SpectatorTargetInfoModule.csproj" />
<ProjectReference Include="..\Modules\SponsorsModule\SponsorsModule.csproj" />
<ProjectReference Include="..\Modules\WorldRecordModule\WorldRecordModule.csproj" />
<ProjectReference Include="..\Modules\MotdModule\MotdModule.csproj" />
Expand All @@ -57,7 +56,6 @@
<ProjectReference Include="..\Modules\CurrentMapModule\CurrentMapModule.csproj" />
<ProjectReference Include="..\Modules\OpenPlanetModule\OpenPlanetModule.csproj" />
<ProjectReference Include="..\Modules\ModuleManagerModule\ModuleManagerModule.csproj" />
<ProjectReference Include="..\Modules\XPEvoAdminControl\XPEvoAdminControl.csproj" />
</ItemGroup>

<ItemGroup>
Expand All @@ -67,7 +65,6 @@
<ItemGroup>
<Folder Include="bin\Debug\net7.0\config\" />
<ProjectReference Include="..\Modules\ASayModule\ASayModule.csproj" />
<ProjectReference Include="..\Modules\SpectatorTargetInfo\SpectatorTargetInfo.csproj" />
<ProjectReference Include="..\Modules\WorldRecordModule\WorldRecordModule.csproj" />
<ProjectReference Include="..\Modules\XPEvoAdminControl\XPEvoAdminControl.csproj" />
</ItemGroup>
Expand Down
10 changes: 2 additions & 8 deletions src/EvoSC/InternalModules.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using EvoSC.Common.Interfaces;
using EvoSC.Modules.Evo.GeardownModule;
using EvoSC.Modules.Interfaces;
using EvoSC.Modules.Official.OpenPlanetModule;
using EvoSC.Modules.Official.CurrentMapModule;
Expand All @@ -18,11 +17,9 @@
using EvoSC.Modules.Official.PlayerRecords;
using EvoSC.Modules.Official.Scoreboard;
using EvoSC.Modules.Official.SetName;
using EvoSC.Modules.Official.SponsorsModule;
using EvoSC.Modules.Official.SpectatorTargetInfoModule;
using EvoSC.Modules.Official.WorldRecordModule;
using EvoSC.Modules.Official.XPEvoAdminControl;
using FluentMigrator.Runner.Exceptions;
using SpectatorTargetInfo;

namespace EvoSC;

Expand All @@ -44,14 +41,11 @@ public static class InternalModules
typeof(OpenPlanetModule),
typeof(MatchTrackerModule),
typeof(MatchReadyModule),
typeof(GeardownModule),
typeof(XPEvoAdminControl),
typeof(NextMapModule),
typeof(LiveRankingModule),
typeof(MatchRankingModule),
typeof(ASayModule),
typeof(SpectatorTargetInfoModule),
typeof(SponsorsModule)
typeof(SpectatorTargetInfoModule)
};

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CurrentMapModule/Services/CurrentMapService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private async Task ShowManialinkAsync(string mapUId)
{
var dbMap = await _mapRepository.GetMapByUidAsync(mapUId);
var author = "";
var worldRecord = await _worldRecordService.GetRecord();
var worldRecord = await _worldRecordService.GetRecordAsync();
if (dbMap.Author.NickName == dbMap.Author.AccountId)
{
var serverMap = await _client.Remote.GetCurrentMapInfoAsync();
Expand Down
86 changes: 0 additions & 86 deletions src/Modules/GeardownModule/Controllers/EventsController.cs
View file
Open in desktop

This file was deleted.

Loading
Loading