From 11643d2e0954d25fed7881a22a08ee41416decbe Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 13 Feb 2017 18:30:47 +0900 Subject: [PATCH] Remove unnecessary methods and local variables. --- .../Beatmaps/IO/LegacyFilesystemReader.cs | 20 ++++--------------- .../Beatmaps/IO/OszArchiveReaderTest.cs | 2 +- osu.Game/Beatmaps/IO/ArchiveReader.cs | 15 ++++++++------ osu.Game/Beatmaps/IO/OszArchiveReader.cs | 20 ++++--------------- osu.Game/Beatmaps/WorkingBeatmap.cs | 1 + osu.Game/Database/BeatmapDatabase.cs | 4 ++-- 6 files changed, 21 insertions(+), 41 deletions(-) diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index 420141e9a1..132f14ddb5 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -20,34 +20,22 @@ namespace osu.Desktop.Beatmaps.IO public static void Register() => AddReader((storage, path) => Directory.Exists(path)); private string basePath { get; set; } - private string[] beatmaps { get; set; } - private string storyboard { get; set; } private Beatmap firstMap { get; set; } public LegacyFilesystemReader(string path) { basePath = path; - beatmaps = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray(); - if (beatmaps.Length == 0) + BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray(); + if (BeatmapFilenames.Length == 0) throw new FileNotFoundException(@"This directory contains no beatmaps"); - storyboard = Directory.GetFiles(basePath, @"*.osb").Select(f => Path.GetFileName(f)).FirstOrDefault(); - using (var stream = new StreamReader(GetStream(beatmaps[0]))) + StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(f => Path.GetFileName(f)).FirstOrDefault(); + using (var stream = new StreamReader(GetStream(BeatmapFilenames[0]))) { var decoder = BeatmapDecoder.GetDecoder(stream); firstMap = decoder.Decode(stream); } } - public override string[] ReadBeatmaps() - { - return beatmaps; - } - - public override string ReadStoryboard() - { - return storyboard; - } - public override Stream GetStream(string name) { return File.OpenRead(Path.Combine(basePath, name)); diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs index a09d0c2f86..037c0185b8 100644 --- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs @@ -39,7 +39,7 @@ namespace osu.Game.Tests.Beatmaps.IO "Soleily - Renatus (MMzz) [Muzukashii].osu", "Soleily - Renatus (MMzz) [Oni].osu" }; - var maps = reader.ReadBeatmaps(); + var maps = reader.BeatmapFilenames; foreach (var map in expected) Assert.Contains(map, maps); } diff --git a/osu.Game/Beatmaps/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs index a944e7589a..cb5f936939 100644 --- a/osu.Game/Beatmaps/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.IO } private static List readers { get; } = new List(); - + public static ArchiveReader GetReader(BasicStorage storage, string path) { foreach (var reader in readers) @@ -29,24 +29,27 @@ namespace osu.Game.Beatmaps.IO } throw new IOException(@"Unknown file format"); } - + protected static void AddReader(Func test) where T : ArchiveReader { readers.Add(new Reader { Test = test, Type = typeof(T) }); } - + /// /// Reads the beatmap metadata from this archive. /// public abstract BeatmapMetadata ReadMetadata(); + /// /// Gets a list of beatmap file names. /// - public abstract string[] ReadBeatmaps(); + public string[] BeatmapFilenames { get; protected set; } + /// - /// Gets the storyboard file name. + /// The storyboard filename. Null if no storyboard is present. /// - public abstract string ReadStoryboard(); + public string StoryboardFilename { get; protected set; } + /// /// Opens a stream for reading a specific file from this archive. /// diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index f9b7fb2cf8..273e0c1fb9 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -25,37 +25,25 @@ namespace osu.Game.Beatmaps.IO private Stream archiveStream; private ZipFile archive; - private string[] beatmaps; - private string storyboard; private Beatmap firstMap; public OszArchiveReader(Stream archiveStream) { this.archiveStream = archiveStream; archive = ZipFile.Read(archiveStream); - beatmaps = archive.Entries.Where(e => e.FileName.EndsWith(@".osu")) + BeatmapFilenames = archive.Entries.Where(e => e.FileName.EndsWith(@".osu")) .Select(e => e.FileName).ToArray(); - if (beatmaps.Length == 0) + if (BeatmapFilenames.Length == 0) throw new FileNotFoundException(@"This directory contains no beatmaps"); - storyboard = archive.Entries.Where(e => e.FileName.EndsWith(@".osb")) + StoryboardFilename = archive.Entries.Where(e => e.FileName.EndsWith(@".osb")) .Select(e => e.FileName).FirstOrDefault(); - using (var stream = new StreamReader(GetStream(beatmaps[0]))) + using (var stream = new StreamReader(GetStream(BeatmapFilenames[0]))) { var decoder = BeatmapDecoder.GetDecoder(stream); firstMap = decoder.Decode(stream); } } - public override string[] ReadBeatmaps() - { - return beatmaps; - } - - public override string ReadStoryboard() - { - return storyboard; - } - public override Stream GetStream(string name) { ZipEntry entry = archive.Entries.SingleOrDefault(e => e.FileName == name); diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 7f1cf236ac..62223ec879 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -68,6 +68,7 @@ namespace osu.Game.Beatmaps beatmap = decoder?.Decode(stream); } + if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null) using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile))) decoder?.Decode(stream, beatmap); diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index a81c1fe552..9c7e70f8eb 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -125,7 +125,7 @@ namespace osu.Game.Database using (var reader = ArchiveReader.GetReader(storage, path)) { - string[] mapNames = reader.ReadBeatmaps(); + string[] mapNames = reader.BeatmapFilenames; foreach (var name in mapNames) { using (var stream = new StreamReader(reader.GetStream(name))) @@ -139,7 +139,7 @@ namespace osu.Game.Database beatmapSet.Beatmaps.Add(beatmap.BeatmapInfo); } - beatmapSet.StoryboardFile = reader.ReadStoryboard(); + beatmapSet.StoryboardFile = reader.StoryboardFilename; } }