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

Silence exception and provide more log output when import fails due to empty .osu files

Browse Source
This commit is contained in:
Dean Herbert 2022-06-20 16:07:10 +09:00
parent e82d948acc
commit d38defada4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Beatmaps/BeatmapImporter.cs
View File

@ -177,8 +177,17 @@ namespace osu.Game.Beatmaps
} }
Beatmap beatmap; Beatmap beatmap;
using (var stream = new LineBufferedReader(reader.GetStream(mapName))) using (var stream = new LineBufferedReader(reader.GetStream(mapName)))
{
if (stream.PeekLine() == null)
{
Logger.Log($"No content found in first .osu file of beatmap archive ({reader.Name} / {mapName})", LoggingTarget.Database);
return null;
}
beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream); beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
}
return new BeatmapSetInfo return new BeatmapSetInfo
{ {

2
osu.Game/Beatmaps/Formats/Decoder.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Beatmaps.Formats
} }
if (line == null) if (line == null)
throw new IOException("Unknown file format (null)"); throw new IOException("Unknown file format (no content)");
var decoder = typedDecoders.Where(d => line.StartsWith(d.Key, StringComparison.InvariantCulture)).Select(d => d.Value).FirstOrDefault(); var decoder = typedDecoders.Where(d => line.StartsWith(d.Key, StringComparison.InvariantCulture)).Select(d => d.Value).FirstOrDefault();