sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add skin.ini write support to allow for more correct hashing

Browse Source
This commit is contained in:
Dean Herbert
2021-10-20 15:22:47 +09:00
parent 08f3bc3f44
commit 789c715f13
3 changed files with 162 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game/Database/ArchiveModelManager.cs
View File

@ -507,18 +507,26 @@ namespace osu.Game.Database
/// <param name="file">The existing file to be deleted.</param>
public void DeleteFile(TModel model, TFileModel file)
{
using (var usage = ContextFactory.GetForWrite())
if (model.ID > 0)
{
// Dereference the existing file info, since the file model will be removed.
if (file.FileInfo != null)
using (var usage = ContextFactory.GetForWrite())
{
Files.Dereference(file.FileInfo);
// Dereference the existing file info, since the file model will be removed.
if (file.FileInfo != null)
{
Files.Dereference(file.FileInfo);
// This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
// Definitely can be removed once we rework the database backend.
usage.Context.Set<TFileModel>().Remove(file);
// This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
// Definitely can be removed once we rework the database backend.
usage.Context.Set<TFileModel>().Remove(file);
}
model.Files.Remove(file);
}
}
else
{
Files.Dereference(file.FileInfo);
model.Files.Remove(file);
}
}
@ -531,15 +539,28 @@ namespace osu.Game.Database
/// <param name="filename">The filename for the new file.</param>
public void AddFile(TModel model, Stream contents, string filename)
{
using (ContextFactory.GetForWrite())
if (model.ID > 0)
{
using (ContextFactory.GetForWrite())
{
model.Files.Add(new TFileModel
{
Filename = filename,
FileInfo = Files.Add(contents)
});
Update(model);
}
}
else
{
// This function may be called during the import process.
// Should not exist like this once we have switched to realm.
model.Files.Add(new TFileModel
{
Filename = filename,
FileInfo = Files.Add(contents)
});
Update(model);
}
}