From 541cd972e1e19ba641b1e3397bb1b073d53121bc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Sep 2023 13:36:07 +0900 Subject: [PATCH] Rename `ArchiveReader` implementations to read better --- osu.Game/Beatmaps/BeatmapImporter.cs | 2 +- osu.Game/Database/ImportTask.cs | 6 +++--- .../{LegacyByteArrayReader.cs => ByteArrayArchiveReader.cs} | 4 ++-- ...yDirectoryArchiveReader.cs => DirectoryArchiveReader.cs} | 6 +++--- ...egacyFileArchiveReader.cs => SingleFileArchiveReader.cs} | 6 +++--- osu.Game/Screens/Play/Player.cs | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename osu.Game/IO/Archives/{LegacyByteArrayReader.cs => ByteArrayArchiveReader.cs} (84%) rename osu.Game/IO/Archives/{LegacyDirectoryArchiveReader.cs => DirectoryArchiveReader.cs} (85%) rename osu.Game/IO/Archives/{LegacyFileArchiveReader.cs => SingleFileArchiveReader.cs} (83%) diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs index 14719da1bc..b497b8e8dc 100644 --- a/osu.Game/Beatmaps/BeatmapImporter.cs +++ b/osu.Game/Beatmaps/BeatmapImporter.cs @@ -319,7 +319,7 @@ namespace osu.Game.Beatmaps { DateTimeOffset dateAdded = DateTimeOffset.UtcNow; - if (reader is LegacyDirectoryArchiveReader legacyReader) + if (reader is DirectoryArchiveReader legacyReader) { var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase)); diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs index 962eab9fa5..cbc5c9005c 100644 --- a/osu.Game/Database/ImportTask.cs +++ b/osu.Game/Database/ImportTask.cs @@ -58,7 +58,7 @@ namespace osu.Game.Database } // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out). - return new LegacyByteArrayReader(Stream.ReadAllBytesToArray(), Path); + return new ByteArrayArchiveReader(Stream.ReadAllBytesToArray(), Path); } /// @@ -80,9 +80,9 @@ namespace osu.Game.Database if (ZipUtils.IsZipArchive(path)) return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path)); if (Directory.Exists(path)) - return new LegacyDirectoryArchiveReader(path); + return new DirectoryArchiveReader(path); if (File.Exists(path)) - return new LegacyFileArchiveReader(path); + return new SingleFileArchiveReader(path); throw new InvalidFormatException($"{path} is not a valid archive"); } diff --git a/osu.Game/IO/Archives/LegacyByteArrayReader.cs b/osu.Game/IO/Archives/ByteArrayArchiveReader.cs similarity index 84% rename from osu.Game/IO/Archives/LegacyByteArrayReader.cs rename to osu.Game/IO/Archives/ByteArrayArchiveReader.cs index 06db02b335..0e2dee3456 100644 --- a/osu.Game/IO/Archives/LegacyByteArrayReader.cs +++ b/osu.Game/IO/Archives/ByteArrayArchiveReader.cs @@ -9,11 +9,11 @@ namespace osu.Game.IO.Archives /// /// Allows reading a single file from the provided byte array. /// - public class LegacyByteArrayReader : ArchiveReader + public class ByteArrayArchiveReader : ArchiveReader { private readonly byte[] content; - public LegacyByteArrayReader(byte[] content, string filename) + public ByteArrayArchiveReader(byte[] content, string filename) : base(filename) { this.content = content; diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/DirectoryArchiveReader.cs similarity index 85% rename from osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs rename to osu.Game/IO/Archives/DirectoryArchiveReader.cs index 1503705022..f2012b7b49 100644 --- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs +++ b/osu.Game/IO/Archives/DirectoryArchiveReader.cs @@ -8,13 +8,13 @@ using System.Linq; namespace osu.Game.IO.Archives { /// - /// Reads an archive from a directory on disk. + /// Reads an archive directly from a directory on disk. /// - public class LegacyDirectoryArchiveReader : ArchiveReader + public class DirectoryArchiveReader : ArchiveReader { private readonly string path; - public LegacyDirectoryArchiveReader(string path) + public DirectoryArchiveReader(string path) : base(Path.GetFileName(path)) { // re-get full path to standardise with Directory.GetFiles return values below. diff --git a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs b/osu.Game/IO/Archives/SingleFileArchiveReader.cs similarity index 83% rename from osu.Game/IO/Archives/LegacyFileArchiveReader.cs rename to osu.Game/IO/Archives/SingleFileArchiveReader.cs index c317cae5fc..79d9c5de71 100644 --- a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs +++ b/osu.Game/IO/Archives/SingleFileArchiveReader.cs @@ -7,14 +7,14 @@ using System.IO; namespace osu.Game.IO.Archives { /// - /// Reads a file on disk as an archive. + /// Reads a single file on disk as an archive. /// Note: In this case, the file is not an extractable archive, use instead. /// - public class LegacyFileArchiveReader : ArchiveReader + public class SingleFileArchiveReader : ArchiveReader { private readonly string path; - public LegacyFileArchiveReader(string path) + public SingleFileArchiveReader(string path) : base(Path.GetFileName(path)) { // re-get full path to standardise diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 8c5828fc92..60806a73c5 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -1144,14 +1144,14 @@ namespace osu.Game.Screens.Play if (DrawableRuleset.ReplayScore != null) return Task.CompletedTask; - LegacyByteArrayReader replayReader = null; + ByteArrayArchiveReader replayReader = null; if (score.ScoreInfo.Ruleset.IsLegacyRuleset()) { using (var stream = new MemoryStream()) { new LegacyScoreEncoder(score, GameplayState.Beatmap).Encode(stream); - replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr"); + replayReader = new ByteArrayArchiveReader(stream.ToArray(), "replay.osr"); } }