h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 04:02:59 +08:00
Code Issues Releases Wiki Activity

Merge pull request #15856 from peppy/simplify-replace-file

Browse Source 
Remove the ability to specify a filename in `ReplaceFile`
This commit is contained in:
Dan Balasescu 2021-11-29 20:49:38 +09:00 committed by GitHub
commit 823552a5e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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> #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) 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="model">The item to operate on.</param>
/// <param name="file">The existing file to be replaced.</param> /// <param name="file">The existing file to be replaced.</param>
/// <param name="contents">The new file contents.</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)
public void ReplaceFile(TModel model, TFileModel file, Stream contents, string filename = null)
{ {
using (ContextFactory.GetForWrite()) using (ContextFactory.GetForWrite())
{ {
DeleteFile(model, file); 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="model">The item to operate on.</param>
/// <param name="file">The existing file to be replaced.</param> /// <param name="file">The existing file to be replaced.</param>
/// <param name="contents">The new file contents.</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);
void ReplaceFile(TModel model, TFileModel file, Stream contents, string filename = null);
/// <summary> /// <summary>
/// Delete an existing file. /// Delete an existing file.

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

@ -78,8 +78,8 @@ namespace osu.Game.Screens.Edit.Setup
using (var stream = info.OpenRead()) using (var stream = info.OpenRead())
{ {
if (oldFile != null) if (oldFile != null)
beatmaps.ReplaceFile(set, oldFile, stream, info.Name); beatmaps.DeleteFile(set, oldFile);
else
beatmaps.AddFile(set, stream, info.Name); beatmaps.AddFile(set, stream, info.Name);
} }
@ -105,8 +105,7 @@ namespace osu.Game.Screens.Edit.Setup
using (var stream = info.OpenRead()) using (var stream = info.OpenRead())
{ {
if (oldFile != null) if (oldFile != null)
beatmaps.ReplaceFile(set, oldFile, stream, info.Name); beatmaps.DeleteFile(set, oldFile);
else
beatmaps.AddFile(set, stream, info.Name); beatmaps.AddFile(set, stream, 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); var oldFile = skin.SkinInfo.Files.FirstOrDefault(f => f.Filename == filename);
if (oldFile != null) if (oldFile != null)
skinModelManager.ReplaceFile(skin.SkinInfo, oldFile, streamContent, oldFile.Filename); skinModelManager.ReplaceFile(skin.SkinInfo, oldFile, streamContent);
else else
skinModelManager.AddFile(skin.SkinInfo, streamContent, filename); skinModelManager.AddFile(skin.SkinInfo, streamContent, filename);
} }