Skip to content

Commit 896e92e

Browse files
erri120erri120
committed
Remove old download code and associated files
1 parent db52a70 commit 896e92e

File tree

64 files changed

+17
-1754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+17
-1754
lines changed

‎NexusMods.App.sln

-14
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
9494
EndProject
9595
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.CrossPlatform.Tests", "tests\NexusMods.CrossPlatform.Tests\NexusMods.CrossPlatform.Tests.csproj", "{FE0B804A-949E-44E7-9531-B16664ACEC01}"
9696
EndProject
97-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Networking.Downloaders", "src\Networking\NexusMods.Networking.Downloaders\NexusMods.Networking.Downloaders.csproj", "{3FBDEE15-9892-40EF-9593-6353068FAF48}"
98-
EndProject
9997
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Games.Generic.Tests", "tests\Games\NexusMods.Games.Generic.Tests\NexusMods.Games.Generic.Tests.csproj", "{AA95B93F-23AC-46D5-83B3-2E7AE4BD309C}"
10098
EndProject
10199
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Games.FOMOD.UI", "src\Games\NexusMods.Games.FOMOD.UI\NexusMods.Games.FOMOD.UI.csproj", "{500CE772-93C3-4DA9-9AB3-E9E9EC0A9429}"
@@ -154,8 +152,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Themes.NexusFluen
154152
EndProject
155153
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Extensions.DynamicData", "src\Extensions\NexusMods.Extensions.DynamicData\NexusMods.Extensions.DynamicData.csproj", "{8F783E71-49E6-4504-97E4-D5D28E7ED949}"
156154
EndProject
157-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Abstractions.HttpDownloader", "src\Abstractions\NexusMods.Abstractions.HttpDownloader\NexusMods.Abstractions.HttpDownloader.csproj", "{646D370F-F790-492A-B79E-1A95E4A8D411}"
158-
EndProject
159155
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Abstractions.Loadouts", "src\Abstractions\NexusMods.Abstractions.Loadouts\NexusMods.Abstractions.Loadouts.csproj", "{4AE9CD2B-1CFB-418E-A2EA-129A2C2B8D9E}"
160156
EndProject
161157
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexusMods.Abstractions.Loadouts.Synchronizers", "src\Abstractions\NexusMods.Abstractions.Loadouts.Synchronizers\NexusMods.Abstractions.Loadouts.Synchronizers.csproj", "{77E545C9-64BF-4CA0-9F24-A2DA64C268FB}"
@@ -416,10 +412,6 @@ Global
416412
{FE0B804A-949E-44E7-9531-B16664ACEC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
417413
{FE0B804A-949E-44E7-9531-B16664ACEC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
418414
{FE0B804A-949E-44E7-9531-B16664ACEC01}.Release|Any CPU.Build.0 = Release|Any CPU
419-
{3FBDEE15-9892-40EF-9593-6353068FAF48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
420-
{3FBDEE15-9892-40EF-9593-6353068FAF48}.Debug|Any CPU.Build.0 = Debug|Any CPU
421-
{3FBDEE15-9892-40EF-9593-6353068FAF48}.Release|Any CPU.ActiveCfg = Release|Any CPU
422-
{3FBDEE15-9892-40EF-9593-6353068FAF48}.Release|Any CPU.Build.0 = Release|Any CPU
423415
{AA95B93F-23AC-46D5-83B3-2E7AE4BD309C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
424416
{AA95B93F-23AC-46D5-83B3-2E7AE4BD309C}.Debug|Any CPU.Build.0 = Debug|Any CPU
425417
{AA95B93F-23AC-46D5-83B3-2E7AE4BD309C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -516,10 +508,6 @@ Global
516508
{8F783E71-49E6-4504-97E4-D5D28E7ED949}.Debug|Any CPU.Build.0 = Debug|Any CPU
517509
{8F783E71-49E6-4504-97E4-D5D28E7ED949}.Release|Any CPU.ActiveCfg = Release|Any CPU
518510
{8F783E71-49E6-4504-97E4-D5D28E7ED949}.Release|Any CPU.Build.0 = Release|Any CPU
519-
{646D370F-F790-492A-B79E-1A95E4A8D411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
520-
{646D370F-F790-492A-B79E-1A95E4A8D411}.Debug|Any CPU.Build.0 = Debug|Any CPU
521-
{646D370F-F790-492A-B79E-1A95E4A8D411}.Release|Any CPU.ActiveCfg = Release|Any CPU
522-
{646D370F-F790-492A-B79E-1A95E4A8D411}.Release|Any CPU.Build.0 = Release|Any CPU
523511
{4AE9CD2B-1CFB-418E-A2EA-129A2C2B8D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
524512
{4AE9CD2B-1CFB-418E-A2EA-129A2C2B8D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
525513
{4AE9CD2B-1CFB-418E-A2EA-129A2C2B8D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -823,7 +811,6 @@ Global
823811
{060613B7-92CA-418B-99CC-CA30C0D977DB} = {70D38D24-79AE-4600-8E83-17F3C11BA81F}
824812
{CB61A764-B3BB-42C0-8CDB-DBE57FB80DF5} = {CF7454A5-0EBB-46E7-9A10-614380DB95D9}
825813
{FE0B804A-949E-44E7-9531-B16664ACEC01} = {52AF9D62-7D5B-4AD0-BA12-86F2AA67428B}
826-
{3FBDEE15-9892-40EF-9593-6353068FAF48} = {D7E9D8F5-8AC8-4ADA-B219-C549084AD84C}
827814
{AA95B93F-23AC-46D5-83B3-2E7AE4BD309C} = {05B06AC1-7F2B-492F-983E-5BC63CDBF20D}
828815
{500CE772-93C3-4DA9-9AB3-E9E9EC0A9429} = {70D38D24-79AE-4600-8E83-17F3C11BA81F}
829816
{63BC2EE7-18E5-4887-913A-4843DBBE2C8D} = {05B06AC1-7F2B-492F-983E-5BC63CDBF20D}
@@ -855,7 +842,6 @@ Global
855842
{9B49FEF2-0218-4147-940F-90843731A4A1} = {E7BAE287-D505-4D6D-A090-665A64309B2D}
856843
{F63AF576-7A7C-4CF1-ADD7-6E95829E5C95} = {9B49FEF2-0218-4147-940F-90843731A4A1}
857844
{8F783E71-49E6-4504-97E4-D5D28E7ED949} = {3C8B4F7A-1964-4166-9E5A-2490BB0DF102}
858-
{646D370F-F790-492A-B79E-1A95E4A8D411} = {0CB73565-1207-4A56-A79F-6A8E9BBD795C}
859845
{4AE9CD2B-1CFB-418E-A2EA-129A2C2B8D9E} = {0CB73565-1207-4A56-A79F-6A8E9BBD795C}
860846
{77E545C9-64BF-4CA0-9F24-A2DA64C268FB} = {0CB73565-1207-4A56-A79F-6A8E9BBD795C}
861847
{4334BE5B-C476-415D-B4FA-183723C4D4D5} = {0CB73565-1207-4A56-A79F-6A8E9BBD795C}

‎src/Abstractions/NexusMods.Abstractions.HttpDownloader/HttpDownloaderState.cs

-9
This file was deleted.

‎src/Abstractions/NexusMods.Abstractions.HttpDownloader/IHttpDownloader.cs

-51
This file was deleted.

‎src/Abstractions/NexusMods.Abstractions.HttpDownloader/NexusMods.Abstractions.HttpDownloader.csproj

-14
This file was deleted.

‎src/Games/NexusMods.Games.TestHarness/NexusMods.Games.TestHarness.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<ProjectReference Include="..\..\Abstractions\NexusMods.Abstractions.GuidedInstallers\NexusMods.Abstractions.GuidedInstallers.csproj" />
9-
<ProjectReference Include="..\..\Abstractions\NexusMods.Abstractions.HttpDownloader\NexusMods.Abstractions.HttpDownloader.csproj" />
109
<ProjectReference Include="..\..\Networking\NexusMods.Networking.NexusWebApi\NexusMods.Networking.NexusWebApi.csproj" />
1110
<ProjectReference Include="..\..\NexusMods.StandardGameLocators\NexusMods.StandardGameLocators.csproj" />
1211
<ProjectReference Include="..\NexusMods.Games.AdvancedInstaller.UI\NexusMods.Games.AdvancedInstaller.UI.csproj" />

‎src/Games/NexusMods.Games.TestHarness/Verbs/StressTest.cs

+5-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using NexusMods.Abstractions.GameLocators;
33
using NexusMods.Abstractions.Games;
44
using NexusMods.Abstractions.GuidedInstallers;
5-
using NexusMods.Abstractions.HttpDownloader;
65
using NexusMods.Abstractions.Library;
76
using NexusMods.Abstractions.NexusWebApi;
87
using NexusMods.Abstractions.NexusWebApi.Types;
@@ -32,10 +31,10 @@ internal static async Task<int> RunStressTest(
3231
[Injected] INexusGraphQLClient nexusGqlClient,
3332
[Injected] IGameDomainToGameIdMappingCache domainToIdCache,
3433
[Injected] TemporaryFileManager temporaryFileManager,
35-
[Injected] IHttpDownloader downloader,
3634
[Injected] ILibraryService libraryService,
3735
[Injected] IEnumerable<IGameLocator> gameLocators,
3836
[Injected] IGuidedInstaller optionSelector,
37+
[Injected] NexusModsLibrary nexusModsLibrary,
3938
[Injected] CancellationToken token)
4039
{
4140
var manualLocator = gameLocators.OfType<ManuallyAddedLocator>().First();
@@ -78,13 +77,11 @@ await renderer.Text("Downloading {0} {1} {2} - {3}", mod.ModId,
7877
file.Name,
7978
size);
8079

81-
var urls = await nexusApiClient.DownloadLinksAsync(domain, mod.ModId, uid.FileId, token);
82-
await using var tmpPath = temporaryFileManager.CreateFile();
8380

84-
var cts = new CancellationTokenSource();
85-
cts.CancelAfter(TimeSpan.FromMinutes(20));
81+
await using var tmpPath = temporaryFileManager.CreateFile();
8682

87-
hash = await downloader.DownloadAsync(urls.Data.Select(d => d.Uri), tmpPath, token: cts.Token);
83+
var downloadJob = await nexusModsLibrary.CreateDownloadJob(tmpPath, game.GameId, mod.ModId, uid.FileId, cancellationToken: CancellationToken.None);
84+
var libraryFile = await libraryService.AddDownload(downloadJob);
8885

8986
await renderer.Text("Installing {0} {1} {2} - {3}", mod.ModId,
9087
uid.FileId,
@@ -93,8 +90,7 @@ await renderer.Text("Installing {0} {1} {2} - {3}", mod.ModId,
9390

9491
var list = await game.Synchronizer.CreateLoadout(install);
9592

96-
var localFile = await libraryService.AddLocalFile(tmpPath);
97-
await libraryService.InstallItem(localFile.AsLibraryFile().AsLibraryItem(), list.LoadoutId);
93+
await libraryService.InstallItem(libraryFile.AsLibraryItem(), list.LoadoutId);
9894

9995
results.Add((file.Name, mod.ModId, uid.FileId, hash, true, null));
10096
await renderer.Text("Installed {0} {1} {2} - {3}", mod.ModId, uid.FileId,

‎src/Networking/NexusMods.Networking.Downloaders/DownloadService.cs

-107
This file was deleted.

‎src/Networking/NexusMods.Networking.Downloaders/DownloadSettings.cs

-67
This file was deleted.

‎src/Networking/NexusMods.Networking.Downloaders/FodyWeavers.xml

-3
This file was deleted.

‎src/Networking/NexusMods.Networking.Downloaders/FodyWeavers.xsd

-26
This file was deleted.

0 commit comments

Comments
 (0)