Skip to content

Fix asset import command failing when trying to update assets #944

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

Merged
jvyden merged 1 commit into from
Sep 18, 2025
Merged

Fix asset import command failing when trying to update assets #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions Refresh.Core/Importing/AssetImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public void ImportFromDataStore(GameDatabaseProvider databaseProvider, IDataStor
{
using GameDatabaseContext database = databaseProvider.GetContext();

List<GameAsset> assets = new(assetHashes.Length / taskCount);
List<GameAsset> assetsToAdd = new(assetHashes.Length / taskCount);
List<GameAsset> assetsToUpdate = new(assetHashes.Length / taskCount);

while (hashesToProcess.TryTake(out string? path))
{
Expand All @@ -63,19 +64,22 @@ public void ImportFromDataStore(GameDatabaseProvider databaseProvider, IDataStor
{
newAsset.OriginalUploader = oldAsset.OriginalUploader;
newAsset.UploadDate = oldAsset.UploadDate;
assetsToUpdate.Add(newAsset);
Interlocked.Increment(ref updatedAssets);
}
else
{
assetsToAdd.Add(newAsset);
Interlocked.Increment(ref newAssets);
}

assets.Add(newAsset);
this.Info($"[{Interlocked.Increment(ref processed)}/{assetHashes.Length}] Processed {newAsset.AssetType} asset {hash} ({AssetSafetyLevelExtensions.FromAssetType(newAsset.AssetType, newAsset.AssetFormat)})");
}

database.AddOrUpdateAssetsInDatabase(assets);


database.ChangeTracker.Clear(); // Updating assets will throw otherwise
database.AddAssetsToDatabase(assetsToAdd);
database.UpdateAssetsInDatabase(assetsToUpdate);

return Task.CompletedTask;
}, TaskCreationOptions.LongRunning);
}
Expand Down
18 changes: 12 additions & 6 deletions Refresh.Database/GameDatabaseContext.Assets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,18 @@ public void AddAssetToDatabase(GameAsset asset) =>
{
this.GameAssets.Add(asset);
});

public void AddOrUpdateAssetsInDatabase(IEnumerable<GameAsset> assets) =>
this.Write(() =>
{
this.GameAssets.AddRange(assets, true);
});

public void AddAssetsToDatabase(IEnumerable<GameAsset> assets)
{
this.GameAssets.AddRange(assets);
this.SaveChanges();
}

public void UpdateAssetsInDatabase(IEnumerable<GameAsset> assets)
{
this.GameAssets.UpdateRange(assets);
this.SaveChanges();
}

public void SetMainlineIconHash(GameAsset asset, string hash) =>
this.Write(() =>
Expand Down