From 9f40a888ec378a5dce0321206d59164e4e27b2a1 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Wed, 8 Mar 2017 21:55:38 +0100 Subject: [PATCH] Update BeatmapArchiveReader's test --- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 2 +- osu.Game/Database/BeatmapDatabase.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index 802fe7784b..c7953245a7 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -16,7 +16,7 @@ public static void Register() AddReader((storage, path) => { using (var stream = storage.GetStream(path)) - return ZipFile.IsZipFile(stream, false); + return (Path.GetExtension(path) == ".osz") && ZipFile.IsZipFile(stream, false); }); OsuLegacyDecoder.Register(); } diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index c5b3130a77..d50d00c6b3 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -186,7 +186,7 @@ private BeatmapSetInfo getBeatmapSet(string path) { hash = input.GetMd5Hash(); input.Seek(0, SeekOrigin.Begin); - path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash); + path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash+".osz"); if (!storage.Exists(path)) using (var output = storage.GetStream(path, FileAccess.Write)) input.CopyTo(output);