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

Remove unnecessary branching around EF logic

Browse Source
This commit is contained in:
Dean Herbert
2021-10-22 14:48:20 +09:00
parent 93482414d6
commit eef9949a0a
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,8 +510,6 @@ namespace osu.Game.Database
/// <param name="model">The item to operate on.</param> /// <param name="model">The item to operate on.</param>
/// <param name="file">The existing file to be deleted.</param> /// <param name="file">The existing file to be deleted.</param>
public void DeleteFile(TModel model, TFileModel file) public void DeleteFile(TModel model, TFileModel file)
{
if (model.ID > 0)
{ {
using (var usage = ContextFactory.GetForWrite()) using (var usage = ContextFactory.GetForWrite())
{ {
@ -531,12 +529,6 @@ namespace osu.Game.Database
model.Files.Remove(file); model.Files.Remove(file);
} }
} }
else
{
Files.Dereference(file.FileInfo);
model.Files.Remove(file);
}
}
/// <summary> /// <summary>
/// Add a new file. /// Add a new file.
@ -545,8 +537,6 @@ namespace osu.Game.Database
/// <param name="contents">The new file contents.</param> /// <param name="contents">The new file contents.</param>
/// <param name="filename">The filename for the new file.</param> /// <param name="filename">The filename for the new file.</param>
public void AddFile(TModel model, Stream contents, string filename) public void AddFile(TModel model, Stream contents, string filename)
{
if (model.ID > 0)
{ {
using (ContextFactory.GetForWrite()) using (ContextFactory.GetForWrite())
{ {
@ -555,21 +545,11 @@ namespace osu.Game.Database
Filename = filename, Filename = filename,
FileInfo = Files.Add(contents) FileInfo = Files.Add(contents)
}); });
}
if (model.ID > 0)
Update(model); 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)
});
}
}
/// <summary> /// <summary>
/// Perform an update of the specified item. /// Perform an update of the specified item.