h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Merge branch 'simplify-replace-file' into realm-integration/compiled

Browse Source
This commit is contained in:
Dean Herbert 2021-11-29 18:28:02 +09:00
commit 1cfcd33b07
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -288,9 +288,9 @@ namespace osu.Game.Beatmaps
#region Implementation of IModelFileManager<in BeatmapSetInfo,in BeatmapSetFileInfo>
public void ReplaceFile(BeatmapSetInfo model, BeatmapSetFileInfo file, Stream contents, string filename = null)
public void ReplaceFile(BeatmapSetInfo model, BeatmapSetFileInfo file, Stream contents)
{
beatmapModelManager.ReplaceFile(model, file, contents, filename);
beatmapModelManager.ReplaceFile(model, file, contents);
}
public void DeleteFile(BeatmapSetInfo model, BeatmapSetFileInfo file)

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

@ -453,13 +453,12 @@ namespace osu.Game.Database
/// <param name="model">The item to operate on.</param>
/// <param name="file">The existing file to be replaced.</param>
/// <param name="contents">The new file contents.</param>
/// <param name="filename">An optional filename for the new file. Will use the previous filename if not specified.</param>
public void ReplaceFile(TModel model, TFileModel file, Stream contents, string filename = null)
public void ReplaceFile(TModel model, TFileModel file, Stream contents)
{
using (ContextFactory.GetForWrite())
{
DeleteFile(model, file);
AddFile(model, contents, filename ?? file.Filename);
AddFile(model, contents, file.Filename);
}
}

3
osu.Game/Database/IModelFileManager.cs
View File

@ -15,8 +15,7 @@ namespace osu.Game.Database
/// <param name="model">The item to operate on.</param>
/// <param name="file">The existing file to be replaced.</param>
/// <param name="contents">The new file contents.</param>
/// <param name="filename">An optional filename for the new file. Will use the previous filename if not specified.</param>
void ReplaceFile(TModel model, TFileModel file, Stream contents, string filename = null);
void ReplaceFile(TModel model, TFileModel file, Stream contents);
/// <summary>
/// Delete an existing file.

11
osu.Game/Screens/Edit/Setup/ResourcesSection.cs
View File

@ -78,9 +78,9 @@ namespace osu.Game.Screens.Edit.Setup
using (var stream = info.OpenRead())
{
if (oldFile != null)
beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
else
beatmaps.AddFile(set, stream, info.Name);
beatmaps.DeleteFile(set, oldFile);
beatmaps.AddFile(set, stream, info.Name);
}
working.Value.Metadata.BackgroundFile = info.Name;
@ -105,9 +105,8 @@ namespace osu.Game.Screens.Edit.Setup
using (var stream = info.OpenRead())
{
if (oldFile != null)
beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
else
beatmaps.AddFile(set, stream, info.Name);
beatmaps.DeleteFile(set, oldFile);
beatmaps.AddFile(set, stream, info.Name);
}
working.Value.Metadata.AudioFile = info.Name;

2
osu.Game/Skinning/SkinManager.cs
View File

@ -171,7 +171,7 @@ namespace osu.Game.Skinning
var oldFile = skin.SkinInfo.Files.FirstOrDefault(f => f.Filename == filename);
if (oldFile != null)
skinModelManager.ReplaceFile(skin.SkinInfo, oldFile, streamContent, oldFile.Filename);
skinModelManager.ReplaceFile(skin.SkinInfo, oldFile, streamContent);
else
skinModelManager.AddFile(skin.SkinInfo, streamContent, filename);
}