From fd53d102646fd3e26250ca5c69c5bab54c156714 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Mon, 6 Mar 2017 23:56:08 +0100 Subject: [PATCH 01/15] Refactor ArchiveReader for extensibility --- .../Beatmaps/IO/LegacyFilesystemReader.cs | 2 +- osu.Game/Beatmaps/IO/ArchiveReader.cs | 24 ++---------- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 39 +++++++++++++++++++ osu.Game/Beatmaps/IO/OszArchiveReader.cs | 2 +- osu.Game/Beatmaps/WorkingBeatmap.cs | 4 +- osu.Game/Database/BeatmapDatabase.cs | 10 ++--- osu.Game/osu.Game.csproj | 3 +- 7 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index b8bfb63a08..632a33f670 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -13,7 +13,7 @@ namespace osu.Desktop.Beatmaps.IO /// /// Reads an extracted legacy beatmap from disk. /// - public class LegacyFilesystemReader : ArchiveReader + public class LegacyFilesystemReader : BeatmapArchiveReader { public static void Register() => AddReader((storage, path) => Directory.Exists(path)); diff --git a/osu.Game/Beatmaps/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs index bbf4de20f5..ba84402782 100644 --- a/osu.Game/Beatmaps/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -6,23 +6,22 @@ using System.Collections.Generic; using System.IO; using osu.Framework.IO.Stores; using osu.Framework.Platform; -using osu.Game.Database; namespace osu.Game.Beatmaps.IO { public abstract class ArchiveReader : IDisposable, IResourceStore { - private class Reader + protected class Reader { public Func Test { get; set; } public Type Type { get; set; } } - private static List readers { get; } = new List(); + protected static List Readers { get; } = new List(); public static ArchiveReader GetReader(Storage storage, string path) { - foreach (var reader in readers) + foreach (var reader in Readers) { if (reader.Test(storage, path)) return (ArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); @@ -32,24 +31,9 @@ namespace osu.Game.Beatmaps.IO protected static void AddReader(Func test) where T : ArchiveReader { - readers.Add(new Reader { Test = test, Type = typeof(T) }); + 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 string[] BeatmapFilenames { get; protected set; } - - /// - /// The storyboard filename. Null if no storyboard is present. - /// - public string StoryboardFilename { get; protected set; } - /// /// Opens a stream for reading a specific file from this archive. /// diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs new file mode 100644 index 0000000000..8cff2c121f --- /dev/null +++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs @@ -0,0 +1,39 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using System.IO; +using osu.Framework.Platform; +using osu.Game.Database; + +namespace osu.Game.Beatmaps.IO +{ + public abstract class BeatmapArchiveReader : ArchiveReader + { + + public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path) + { + foreach (var reader in Readers) + { + if (reader.Test(storage, path)) + return (BeatmapArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); + } + throw new IOException(@"Unknown file format"); + } + + /// + /// Reads the beatmap metadata from this archive. + /// + public abstract BeatmapMetadata ReadMetadata(); + + /// + /// Gets a list of beatmap file names. + /// + public string[] BeatmapFilenames { get; protected set; } + + /// + /// The storyboard filename. Null if no storyboard is present. + /// + public string StoryboardFilename { get; protected set; } + } +} \ No newline at end of file diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index 8a1d071cfc..802fe7784b 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -9,7 +9,7 @@ using osu.Game.Database; namespace osu.Game.Beatmaps.IO { - public sealed class OszArchiveReader : ArchiveReader + public sealed class OszArchiveReader : BeatmapArchiveReader { public static void Register() { diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 9393c2b0e9..4254652765 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps public readonly bool WithStoryboard; - protected abstract ArchiveReader GetReader(); + protected abstract BeatmapArchiveReader GetReader(); protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false) { @@ -87,7 +87,7 @@ namespace osu.Game.Beatmaps set { lock (beatmapLock) beatmap = value; } } - private ArchiveReader trackReader; + private BeatmapArchiveReader trackReader; private Track track; private object trackLock = new object(); public Track Track diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index 03f904b7e8..1be0757e00 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -176,7 +176,7 @@ namespace osu.Game.Database BeatmapMetadata metadata; - using (var reader = ArchiveReader.GetReader(storage, path)) + using (var reader = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path)) metadata = reader.ReadMetadata(); if (File.Exists(path)) // Not always the case, i.e. for LegacyFilesystemReader @@ -216,7 +216,7 @@ namespace osu.Game.Database Metadata = metadata }; - using (var reader = ArchiveReader.GetReader(storage, path)) + using (var reader = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path)) { string[] mapNames = reader.BeatmapFilenames; foreach (var name in mapNames) @@ -261,12 +261,12 @@ namespace osu.Game.Database BeatmapSetRemoved?.Invoke(beatmapSet); } - public ArchiveReader GetReader(BeatmapSetInfo beatmapSet) + public BeatmapArchiveReader GetReader(BeatmapSetInfo beatmapSet) { if (string.IsNullOrEmpty(beatmapSet.Path)) return null; - return ArchiveReader.GetReader(storage, beatmapSet.Path); + return BeatmapArchiveReader.GetBeatmapArchiveReader(storage, beatmapSet.Path); } public BeatmapSetInfo GetBeatmapSet(int id) @@ -348,7 +348,7 @@ namespace osu.Game.Database this.database = database; } - protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo); + protected override BeatmapArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo); } } } diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index f38c2f7ba0..10d82396a7 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -223,7 +223,7 @@ - + @@ -311,6 +311,7 @@ + From a29748915177fe68d68b65b91fc2fe77216422b8 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Tue, 7 Mar 2017 00:03:04 +0100 Subject: [PATCH 02/15] Fix test --- osu.Desktop.VisualTests/Tests/TestCasePlayer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index 1bb8144fc4..e284ea1c47 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -99,7 +99,7 @@ namespace osu.Desktop.VisualTests.Tests Beatmap = beatmap; } - protected override ArchiveReader GetReader() => null; + protected override BeatmapArchiveReader GetReader() => null; } } } From aee7b05bae19495e18837e6a734ae16e56dc37ff Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Tue, 7 Mar 2017 00:10:33 +0100 Subject: [PATCH 03/15] ArchiveManager decoupling --- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs index 8cff2c121f..9134b9b2ae 100644 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using osu.Framework.Logging; using osu.Framework.Platform; using osu.Game.Database; @@ -13,12 +14,15 @@ namespace osu.Game.Beatmaps.IO public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path) { - foreach (var reader in Readers) + try { - if (reader.Test(storage, path)) - return (BeatmapArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); + return (BeatmapArchiveReader)GetReader(storage, path); + } + catch (InvalidCastException e) + { + Logger.Error(e, "A tricky ArchiveReader instance passed the test to be a BeatmapArhiveReader, but it's really not"); + throw e; } - throw new IOException(@"Unknown file format"); } /// From 2c7a9d2f77b997e1bdeeb52de2d017d9a63f7159 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Tue, 7 Mar 2017 08:47:50 +0100 Subject: [PATCH 04/15] Remove unnecessary using --- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs index 9134b9b2ae..409345e0c6 100644 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs @@ -2,7 +2,6 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.IO; using osu.Framework.Logging; using osu.Framework.Platform; using osu.Game.Database; From 9f40a888ec378a5dce0321206d59164e4e27b2a1 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Wed, 8 Mar 2017 21:55:38 +0100 Subject: [PATCH 05/15] 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 @@ namespace osu.Game.Beatmaps.IO 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 @@ namespace osu.Game.Database { 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); From f969c3b7b3344852b4656211baeec70a8b81300a Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Thu, 9 Mar 2017 21:00:13 +0100 Subject: [PATCH 06/15] Fix test --- osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index ae936f3f49..69434505ce 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -106,7 +106,7 @@ namespace osu.Game.Tests.Beatmaps.IO private string prepareTempCopy(string path) { - var temp = Path.GetTempFileName(); + var temp = Path.GetTempPath()+Guid.NewGuid()+".osz"; return new FileInfo(path).CopyTo(temp, true).FullName; } From faecaa297aefbe655580c6bb3b7d4ca6e3d43483 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Thu, 9 Mar 2017 21:07:21 +0100 Subject: [PATCH 07/15] Fix warnings --- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 2 +- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs index 409345e0c6..a1a7149f2e 100644 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs @@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps.IO catch (InvalidCastException e) { Logger.Error(e, "A tricky ArchiveReader instance passed the test to be a BeatmapArhiveReader, but it's really not"); - throw e; + throw; } } diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index c7953245a7..bf5174f7f9 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.IO AddReader((storage, path) => { using (var stream = storage.GetStream(path)) - return (Path.GetExtension(path) == ".osz") && ZipFile.IsZipFile(stream, false); + return Path.GetExtension(path) == ".osz" && ZipFile.IsZipFile(stream, false); }); OsuLegacyDecoder.Register(); } From 35ddca78f53e4bcd8c3ff625e74e11e96c771751 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 13 Mar 2017 14:50:55 +0900 Subject: [PATCH 08/15] Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter). --- .../Objects/CatchConverter.cs | 40 ---------------- .../osu.Game.Modes.Catch.csproj | 1 - .../Objects/ManiaConverter.cs | 48 ------------------- .../osu.Game.Modes.Mania.csproj | 1 - .../Objects/TaikoConverter.cs | 39 --------------- .../osu.Game.Modes.Taiko.csproj | 1 - osu.Game/Modes/Objects/HitObjectConverter.cs | 25 ---------- osu.Game/osu.Game.csproj | 1 - 8 files changed, 156 deletions(-) delete mode 100644 osu.Game.Modes.Catch/Objects/CatchConverter.cs delete mode 100644 osu.Game.Modes.Mania/Objects/ManiaConverter.cs delete mode 100644 osu.Game.Modes.Taiko/Objects/TaikoConverter.cs delete mode 100644 osu.Game/Modes/Objects/HitObjectConverter.cs diff --git a/osu.Game.Modes.Catch/Objects/CatchConverter.cs b/osu.Game.Modes.Catch/Objects/CatchConverter.cs deleted file mode 100644 index 31ddc73f61..0000000000 --- a/osu.Game.Modes.Catch/Objects/CatchConverter.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System.Collections.Generic; -using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu.Objects; -using osu.Game.Beatmaps; - -namespace osu.Game.Modes.Catch.Objects -{ - internal class CatchConverter : HitObjectConverter - { - public override List Convert(Beatmap beatmap) - { - List output = new List(); - - foreach (HitObject i in beatmap.HitObjects) - { - CatchBaseHit h = i as CatchBaseHit; - - if (h == null) - { - OsuHitObject o = i as OsuHitObject; - - if (o == null) throw new HitObjectConvertException(@"Catch", i); - - h = new Fruit - { - StartTime = o.StartTime, - Position = o.Position.X, - }; - } - - output.Add(h); - } - - return output; - } - } -} diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj index 10abb312fc..4646d0cd6c 100644 --- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj +++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj @@ -50,7 +50,6 @@ - diff --git a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs deleted file mode 100644 index 7e1183c0e3..0000000000 --- a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using System.Collections.Generic; -using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu.Objects; -using osu.Game.Beatmaps; - -namespace osu.Game.Modes.Mania.Objects -{ - internal class ManiaConverter : HitObjectConverter - { - private readonly int columns; - - public ManiaConverter(int columns) - { - this.columns = columns; - } - - public override List Convert(Beatmap beatmap) - { - List output = new List(); - - foreach (HitObject i in beatmap.HitObjects) - { - ManiaBaseHit h = i as ManiaBaseHit; - - if (h == null) - { - OsuHitObject o = i as OsuHitObject; - - if (o == null) throw new HitObjectConvertException(@"Mania", i); - - h = new Note - { - StartTime = o.StartTime, - Column = (int)Math.Round(o.Position.X / 512 * columns) - }; - } - - output.Add(h); - } - - return output; - } - } -} diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj index 66e46f9e48..88bf879bcc 100644 --- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj +++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj @@ -52,7 +52,6 @@ - diff --git a/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs b/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs deleted file mode 100644 index 3a0e07e390..0000000000 --- a/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System.Collections.Generic; -using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu.Objects; -using osu.Game.Beatmaps; - -namespace osu.Game.Modes.Taiko.Objects -{ - internal class TaikoConverter : HitObjectConverter - { - public override List Convert(Beatmap beatmap) - { - List output = new List(); - - foreach (HitObject i in beatmap.HitObjects) - { - TaikoBaseHit h = i as TaikoBaseHit; - - if (h == null) - { - OsuHitObject o = i as OsuHitObject; - - if (o == null) throw new HitObjectConvertException(@"Taiko", i); - - h = new TaikoBaseHit - { - StartTime = o.StartTime, - }; - } - - output.Add(h); - } - - return output; - } - } -} diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index 0089e84532..2cc45682ef 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -51,7 +51,6 @@ - diff --git a/osu.Game/Modes/Objects/HitObjectConverter.cs b/osu.Game/Modes/Objects/HitObjectConverter.cs deleted file mode 100644 index d7c6113af1..0000000000 --- a/osu.Game/Modes/Objects/HitObjectConverter.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Game.Beatmaps; -using System; -using System.Collections.Generic; - -namespace osu.Game.Modes.Objects -{ - public abstract class HitObjectConverter - where T : HitObject - { - public abstract List Convert(Beatmap beatmap); - } - - public class HitObjectConvertException : Exception - { - public HitObject Input { get; } - public HitObjectConvertException(string modeName, HitObject input) - : base($@"Can't convert from {input.GetType().Name} to {modeName} HitObject!") - { - Input = input; - } - } -} diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 3d4a763cb8..cc1b6a2832 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -114,7 +114,6 @@ - From caa6e9c82b3d60f1f1ac4c7f560676e427b62816 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Mon, 13 Mar 2017 11:29:24 +0100 Subject: [PATCH 09/15] General improvements --- osu.Desktop/OsuGameDesktop.cs | 5 +++-- osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 3 ++- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 3 ++- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 2 +- osu.Game/Database/BeatmapDatabase.cs | 2 +- osu.Game/{Beatmaps => }/IO/ArchiveReader.cs | 0 osu.Game/osu.Game.csproj | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) rename osu.Game/{Beatmaps => }/IO/ArchiveReader.cs (100%) diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index 3b827f2809..a05925654d 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -12,6 +12,7 @@ using System.Drawing; using System.IO; using System.Threading.Tasks; using osu.Game.Screens.Menu; +using osu.Game.Beatmaps.IO; namespace osu.Desktop { @@ -57,7 +58,7 @@ namespace osu.Desktop var dropData = (object[])e.Data.GetData(DataFormats.FileDrop); var filePaths = dropData.Select(f => f.ToString()).ToArray(); - if (filePaths.All(f => Path.GetExtension(f) == @".osz")) + if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OszExtension)) Task.Run(() => BeatmapDatabase.Import(filePaths)); else if (filePaths.All(f => Path.GetExtension(f) == @".osr")) Task.Run(() => @@ -67,7 +68,7 @@ namespace osu.Desktop }); } - private static readonly string[] allowed_extensions = { @".osz", @".osr" }; + private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OszExtension, @".osr" }; private void dragEnter(DragEventArgs e) { diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 69434505ce..5239286b56 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -17,6 +17,7 @@ using osu.Game.Modes.Catch; using osu.Game.Modes.Mania; using osu.Game.Modes.Osu; using osu.Game.Modes.Taiko; +using osu.Game.Beatmaps.IO; namespace osu.Game.Tests.Beatmaps.IO { @@ -106,7 +107,7 @@ namespace osu.Game.Tests.Beatmaps.IO private string prepareTempCopy(string path) { - var temp = Path.GetTempPath()+Guid.NewGuid()+".osz"; + var temp = Path.GetTempPath() + Guid.NewGuid() + BeatmapArchiveReader.OszExtension; return new FileInfo(path).CopyTo(temp, true).FullName; } diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs index a1a7149f2e..d274d45694 100644 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs @@ -10,6 +10,7 @@ namespace osu.Game.Beatmaps.IO { public abstract class BeatmapArchiveReader : ArchiveReader { + public const string OszExtension = @".osz"; public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path) { @@ -19,7 +20,7 @@ namespace osu.Game.Beatmaps.IO } catch (InvalidCastException e) { - Logger.Error(e, "A tricky ArchiveReader instance passed the test to be a BeatmapArhiveReader, but it's really not"); + Logger.Error(e, "A tricky " + $@"{nameof(ArchiveReader)}" + " instance passed the test to be a " + $@"{nameof(BeatmapArchiveReader)}" + ", but it's really not"); throw; } } diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index bf5174f7f9..60d379db61 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.IO AddReader((storage, path) => { using (var stream = storage.GetStream(path)) - return Path.GetExtension(path) == ".osz" && ZipFile.IsZipFile(stream, false); + return Path.GetExtension(path) == OszExtension && ZipFile.IsZipFile(stream, false); }); OsuLegacyDecoder.Register(); } diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index d50d00c6b3..c7b02acae1 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -186,7 +186,7 @@ namespace osu.Game.Database { hash = input.GetMd5Hash(); input.Seek(0, SeekOrigin.Begin); - path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash+".osz"); + path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash + BeatmapArchiveReader.OszExtension); if (!storage.Exists(path)) using (var output = storage.GetStream(path, FileAccess.Write)) input.CopyTo(output); diff --git a/osu.Game/Beatmaps/IO/ArchiveReader.cs b/osu.Game/IO/ArchiveReader.cs similarity index 100% rename from osu.Game/Beatmaps/IO/ArchiveReader.cs rename to osu.Game/IO/ArchiveReader.cs diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index d81cb2daff..8ae8c3d88e 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -327,7 +327,7 @@ - + From c84a9d56f5051aca638bcd57b956d2a470da5b16 Mon Sep 17 00:00:00 2001 From: Alex Amadori Date: Mon, 13 Mar 2017 11:36:21 +0100 Subject: [PATCH 10/15] Fix namespace, comply with naming rules --- osu.Desktop/OsuGameDesktop.cs | 4 ++-- osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 2 +- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 3 ++- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 2 +- osu.Game/Database/BeatmapDatabase.cs | 2 +- osu.Game/IO/ArchiveReader.cs | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index a05925654d..a09f9860cb 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -58,7 +58,7 @@ namespace osu.Desktop var dropData = (object[])e.Data.GetData(DataFormats.FileDrop); var filePaths = dropData.Select(f => f.ToString()).ToArray(); - if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OszExtension)) + if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OSZ_EXTENSION)) Task.Run(() => BeatmapDatabase.Import(filePaths)); else if (filePaths.All(f => Path.GetExtension(f) == @".osr")) Task.Run(() => @@ -68,7 +68,7 @@ namespace osu.Desktop }); } - private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OszExtension, @".osr" }; + private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OSZ_EXTENSION, @".osr" }; private void dragEnter(DragEventArgs e) { diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 5239286b56..a6ab6a989b 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -107,7 +107,7 @@ namespace osu.Game.Tests.Beatmaps.IO private string prepareTempCopy(string path) { - var temp = Path.GetTempPath() + Guid.NewGuid() + BeatmapArchiveReader.OszExtension; + var temp = Path.GetTempPath() + Guid.NewGuid() + BeatmapArchiveReader.OSZ_EXTENSION; return new FileInfo(path).CopyTo(temp, true).FullName; } diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs index d274d45694..0fab05df49 100644 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs @@ -5,12 +5,13 @@ using System; using osu.Framework.Logging; using osu.Framework.Platform; using osu.Game.Database; +using osu.Game.IO; namespace osu.Game.Beatmaps.IO { public abstract class BeatmapArchiveReader : ArchiveReader { - public const string OszExtension = @".osz"; + public const string OSZ_EXTENSION = @".osz"; public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path) { diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index 60d379db61..8c3e4d702c 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.IO AddReader((storage, path) => { using (var stream = storage.GetStream(path)) - return Path.GetExtension(path) == OszExtension && ZipFile.IsZipFile(stream, false); + return Path.GetExtension(path) == OSZ_EXTENSION && ZipFile.IsZipFile(stream, false); }); OsuLegacyDecoder.Register(); } diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index c7b02acae1..a9fe30a5e9 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -186,7 +186,7 @@ namespace osu.Game.Database { hash = input.GetMd5Hash(); input.Seek(0, SeekOrigin.Begin); - path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash + BeatmapArchiveReader.OszExtension); + path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash + BeatmapArchiveReader.OSZ_EXTENSION); if (!storage.Exists(path)) using (var output = storage.GetStream(path, FileAccess.Write)) input.CopyTo(output); diff --git a/osu.Game/IO/ArchiveReader.cs b/osu.Game/IO/ArchiveReader.cs index ba84402782..8eaecdeabc 100644 --- a/osu.Game/IO/ArchiveReader.cs +++ b/osu.Game/IO/ArchiveReader.cs @@ -7,7 +7,7 @@ using System.IO; using osu.Framework.IO.Stores; using osu.Framework.Platform; -namespace osu.Game.Beatmaps.IO +namespace osu.Game.IO { public abstract class ArchiveReader : IDisposable, IResourceStore { From db104d04d3e38544517116310f38e4ec7ae19ce3 Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Tue, 14 Mar 2017 03:15:53 +0800 Subject: [PATCH 11/15] Use AutoGenerateBindingRedirects instead of explicit app.config. --- osu.Desktop.Deploy/App.config | 12 ----------- osu.Desktop.Tests/app.config | 16 --------------- osu.Desktop.Tests/osu.Desktop.Tests.csproj | 1 - osu.Desktop.VisualTests/app.config | 16 --------------- .../osu.Desktop.VisualTests.csproj | 2 +- osu.Desktop/app.config | 20 ------------------- osu.Desktop/osu.Desktop.csproj | 2 +- osu.Game.Modes.Mania/app.config | 16 --------------- .../osu.Game.Modes.Mania.csproj | 1 - osu.Game.Modes.Osu/app.config | 16 --------------- osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj | 1 - osu.Game.Tests/app.config | 16 --------------- osu.Game.Tests/osu.Game.Tests.csproj | 1 - osu.Game/app.config | 16 --------------- osu.Game/osu.Game.csproj | 1 - 15 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 osu.Desktop.Tests/app.config delete mode 100644 osu.Desktop.VisualTests/app.config delete mode 100644 osu.Desktop/app.config delete mode 100644 osu.Game.Modes.Mania/app.config delete mode 100644 osu.Game.Modes.Osu/app.config delete mode 100644 osu.Game.Tests/app.config delete mode 100644 osu.Game/app.config diff --git a/osu.Desktop.Deploy/App.config b/osu.Desktop.Deploy/App.config index bd464a0453..d1da144f50 100644 --- a/osu.Desktop.Deploy/App.config +++ b/osu.Desktop.Deploy/App.config @@ -21,16 +21,4 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.Tests/app.config b/osu.Desktop.Tests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Desktop.Tests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj index 07495311e0..e89308bbb9 100644 --- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj +++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj @@ -100,7 +100,6 @@ osu.licenseheader - diff --git a/osu.Desktop.VisualTests/app.config b/osu.Desktop.VisualTests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Desktop.VisualTests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index bea56b5cd0..81ee7185bb 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -23,6 +23,7 @@ false LocalIntranet v4.5 + true publish\ true Disk @@ -114,7 +115,6 @@ osu.licenseheader - diff --git a/osu.Desktop/app.config b/osu.Desktop/app.config deleted file mode 100644 index 1ff0a7f133..0000000000 --- a/osu.Desktop/app.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 7e85f09d8c..48e0db1d99 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -23,6 +23,7 @@ false LocalIntranet v4.5 + true publish\ true Disk @@ -153,7 +154,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game.Modes.Mania/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj index 88bf879bcc..2e281f54bb 100644 --- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj +++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj @@ -81,7 +81,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Osu/app.config b/osu.Game.Modes.Osu/app.config deleted file mode 100644 index 88af66254d..0000000000 --- a/osu.Game.Modes.Osu/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj index c214c881d8..47f94b1026 100644 --- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj +++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj @@ -100,7 +100,6 @@ osu.licenseheader - diff --git a/osu.Game.Tests/app.config b/osu.Game.Tests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game.Tests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 96682dd1ce..d01aa77e02 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -52,7 +52,6 @@ osu.licenseheader - diff --git a/osu.Game/app.config b/osu.Game/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 74f98bbc0e..6c060328a4 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -342,7 +342,6 @@ osu.licenseheader - From 14a22f032f55f6d9efaa06187b7a36f6c8105c5a Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Tue, 14 Mar 2017 04:35:43 +0800 Subject: [PATCH 12/15] Fix beatmap panel removal. --- osu.Game/Screens/Select/CarouselContainer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs index e7fba05036..6a5bb2dc94 100644 --- a/osu.Game/Screens/Select/CarouselContainer.cs +++ b/osu.Game/Screens/Select/CarouselContainer.cs @@ -57,6 +57,7 @@ namespace osu.Game.Screens.Select public void RemoveGroup(BeatmapGroup group) { groups.Remove(group); + panels.Remove(group.Header); foreach (var p in group.BeatmapPanels) panels.Remove(p); From 3913a0a9ee688551e9a5d7154d6e0948c178988c Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Tue, 14 Mar 2017 04:59:44 +0800 Subject: [PATCH 13/15] Fix removal of the last one beatmap. --- osu.Game/Overlays/MusicController.cs | 20 +++++++++++++------- osu.Game/Screens/Select/BeatmapInfoWedge.cs | 12 +++++++++--- osu.Game/Screens/Select/PlaySongSelect.cs | 7 +++---- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 1b4692f50e..5c9adb6b20 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -210,7 +210,7 @@ namespace osu.Game.Overlays } } }; - + this.beatmaps = beatmaps; trackManager = osuGame.Audio.Track; preferUnicode = config.GetBindable(OsuConfig.ShowUnicode); @@ -247,6 +247,8 @@ namespace osu.Game.Overlays if (current.Track.HasCompleted && !current.Track.Looping) next(); } + else + playButton.Icon = FontAwesome.fa_play_circle_o; } private void preferUnicode_changed(object sender, EventArgs e) @@ -337,12 +339,16 @@ namespace osu.Game.Overlays Task.Run(() => { if (beatmap?.Beatmap == null) - //todo: we may need to display some default text here (currently in the constructor). - return; - - BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; - title.Text = unicodeString(metadata.Title, metadata.TitleUnicode); - artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode); + { + title.Text = @"Nothing to play"; + artist.Text = @"Nothing to play"; + } + else + { + BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; + title.Text = unicodeString(metadata.Title, metadata.TitleUnicode); + artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode); + } }); MusicControllerBackground newBackground; diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index bc3b16079c..eac12f7370 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -16,7 +16,6 @@ using osu.Game.Database; using osu.Framework.Graphics.Colour; using osu.Game.Beatmaps.Drawables; using System.Linq; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.MathUtils; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; @@ -56,8 +55,15 @@ namespace osu.Game.Screens.Select public void UpdateBeatmap(WorkingBeatmap beatmap) { if (beatmap?.BeatmapInfo == null) + { + FadeOut(250); + beatmapInfoContainer?.FadeOut(250); + beatmapInfoContainer?.Expire(); + beatmapInfoContainer = null; return; + } + FadeIn(250); var lastContainer = beatmapInfoContainer; float newDepth = lastContainer?.Depth + 1 ?? 0; @@ -84,7 +90,7 @@ namespace osu.Game.Screens.Select })); //get statistics fromt he current ruleset. - Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).ForEach(s => labels.Add(new InfoLabel(s))); + labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s))); } (beatmapInfoContainer = new BufferedContainer @@ -191,7 +197,7 @@ namespace osu.Game.Screens.Select private string getBPMRange(Beatmap beatmap) { - double bpmMax = beatmap.BPMMaximum; + double bpmMax = beatmap.BPMMaximum; double bpmMin = beatmap.BPMMinimum; if (Precision.AlmostEquals(bpmMin, bpmMax)) return Math.Round(bpmMin) + "bpm"; diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 86f9bc30cf..09ba794122 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -326,8 +326,7 @@ namespace osu.Game.Screens.Select backgroundModeBeatmap.FadeTo(1, 250); } - if (beatmap != null) - beatmapInfoWedge.UpdateBeatmap(beatmap); + beatmapInfoWedge.UpdateBeatmap(beatmap); } /// @@ -337,11 +336,11 @@ namespace osu.Game.Screens.Select { base.OnBeatmapChanged(beatmap); - beatmap.Mods.BindTo(modSelect.SelectedMods); + beatmap?.Mods.BindTo(modSelect.SelectedMods); //todo: change background in selectionChanged instead; support per-difficulty backgrounds. changeBackground(beatmap); - carousel.SelectBeatmap(beatmap.BeatmapInfo); + carousel.SelectBeatmap(beatmap?.BeatmapInfo); } /// From e1bd168c1609c2289551c7b2c38a47abf6c99af5 Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Tue, 14 Mar 2017 07:22:46 +0800 Subject: [PATCH 14/15] Remaining GameMode -> Screen. --- osu.Desktop/OsuGameDesktop.cs | 4 ++-- osu.Game/OsuGame.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index a09f9860cb..478919272e 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -31,9 +31,9 @@ namespace osu.Desktop base.LoadComplete(); versionManager.LoadAsync(this); - ModeChanged += m => + ScreenChanged += s => { - if (!versionManager.IsAlive && m is Intro) + if (!versionManager.IsAlive && s is Intro) Add(versionManager); }; } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 79ffcfcadf..8aa3a63d26 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -258,13 +258,13 @@ namespace osu.Game return false; } - public event Action ModeChanged; + public event Action ScreenChanged; private Container mainContent; private Container overlayContent; - private void modeChanged(Screen newScreen) + private void screenChanged(Screen newScreen) { //central game mode change logic. if ((newScreen as OsuScreen)?.ShowOverlays != true) @@ -281,7 +281,7 @@ namespace osu.Game if (newScreen is MainMenu) Cursor.FadeIn(100); - ModeChanged?.Invoke(newScreen); + ScreenChanged?.Invoke(newScreen); if (newScreen == null) Exit(); @@ -315,12 +315,12 @@ namespace osu.Game newScreen.ModePushed += screenAdded; newScreen.Exited += screenRemoved; - modeChanged(newScreen); + screenChanged(newScreen); } private void screenRemoved(Screen newScreen) { - modeChanged(newScreen); + screenChanged(newScreen); } } } From ba10c3a8db89f6325b717cf2ea06192aefac6e65 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 11:46:34 +0900 Subject: [PATCH 15/15] Revert "Merge pull request #441 from tacchinotacchi/archive-reader" This reverts commit 6f20473e65960e059727dee5dc075fc356d07c1b, reversing changes made to c76a495d3d4269931ec5f2bd830ba619747e5b3e. --- .../Tests/TestCasePlayer.cs | 2 +- .../Beatmaps/IO/LegacyFilesystemReader.cs | 2 +- osu.Desktop/OsuGameDesktop.cs | 5 +-- .../Beatmaps/IO/ImportBeatmapTest.cs | 3 +- osu.Game/{ => Beatmaps}/IO/ArchiveReader.cs | 26 ++++++++--- osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs | 44 ------------------- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 4 +- osu.Game/Beatmaps/WorkingBeatmap.cs | 4 +- osu.Game/Database/BeatmapDatabase.cs | 12 ++--- osu.Game/osu.Game.csproj | 3 +- 10 files changed, 37 insertions(+), 68 deletions(-) rename osu.Game/{ => Beatmaps}/IO/ArchiveReader.cs (65%) delete mode 100644 osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index 0b876ed171..ee58d934a4 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -110,7 +110,7 @@ namespace osu.Desktop.VisualTests.Tests Beatmap = beatmap; } - protected override BeatmapArchiveReader GetReader() => null; + protected override ArchiveReader GetReader() => null; } } } diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index 19aa9ca4a6..0ef448cafe 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -13,7 +13,7 @@ namespace osu.Desktop.Beatmaps.IO /// /// Reads an extracted legacy beatmap from disk. /// - public class LegacyFilesystemReader : BeatmapArchiveReader + public class LegacyFilesystemReader : ArchiveReader { public static void Register() => AddReader((storage, path) => Directory.Exists(path)); diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index 478919272e..27f58c27e1 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -12,7 +12,6 @@ using System.Drawing; using System.IO; using System.Threading.Tasks; using osu.Game.Screens.Menu; -using osu.Game.Beatmaps.IO; namespace osu.Desktop { @@ -58,7 +57,7 @@ namespace osu.Desktop var dropData = (object[])e.Data.GetData(DataFormats.FileDrop); var filePaths = dropData.Select(f => f.ToString()).ToArray(); - if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OSZ_EXTENSION)) + if (filePaths.All(f => Path.GetExtension(f) == @".osz")) Task.Run(() => BeatmapDatabase.Import(filePaths)); else if (filePaths.All(f => Path.GetExtension(f) == @".osr")) Task.Run(() => @@ -68,7 +67,7 @@ namespace osu.Desktop }); } - private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OSZ_EXTENSION, @".osr" }; + private static readonly string[] allowed_extensions = { @".osz", @".osr" }; private void dragEnter(DragEventArgs e) { diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index a6ab6a989b..ae936f3f49 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -17,7 +17,6 @@ using osu.Game.Modes.Catch; using osu.Game.Modes.Mania; using osu.Game.Modes.Osu; using osu.Game.Modes.Taiko; -using osu.Game.Beatmaps.IO; namespace osu.Game.Tests.Beatmaps.IO { @@ -107,7 +106,7 @@ namespace osu.Game.Tests.Beatmaps.IO private string prepareTempCopy(string path) { - var temp = Path.GetTempPath() + Guid.NewGuid() + BeatmapArchiveReader.OSZ_EXTENSION; + var temp = Path.GetTempFileName(); return new FileInfo(path).CopyTo(temp, true).FullName; } diff --git a/osu.Game/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs similarity index 65% rename from osu.Game/IO/ArchiveReader.cs rename to osu.Game/Beatmaps/IO/ArchiveReader.cs index 8eaecdeabc..bbf4de20f5 100644 --- a/osu.Game/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -6,22 +6,23 @@ using System.Collections.Generic; using System.IO; using osu.Framework.IO.Stores; using osu.Framework.Platform; +using osu.Game.Database; -namespace osu.Game.IO +namespace osu.Game.Beatmaps.IO { public abstract class ArchiveReader : IDisposable, IResourceStore { - protected class Reader + private class Reader { public Func Test { get; set; } public Type Type { get; set; } } - protected static List Readers { get; } = new List(); + private static List readers { get; } = new List(); public static ArchiveReader GetReader(Storage storage, string path) { - foreach (var reader in Readers) + foreach (var reader in readers) { if (reader.Test(storage, path)) return (ArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); @@ -31,9 +32,24 @@ namespace osu.Game.IO protected static void AddReader(Func test) where T : ArchiveReader { - Readers.Add(new Reader { Test = test, Type = typeof(T) }); + 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 string[] BeatmapFilenames { get; protected set; } + + /// + /// The storyboard filename. Null if no storyboard is present. + /// + public string StoryboardFilename { get; protected set; } + /// /// Opens a stream for reading a specific file from this archive. /// diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs deleted file mode 100644 index 0fab05df49..0000000000 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using osu.Framework.Logging; -using osu.Framework.Platform; -using osu.Game.Database; -using osu.Game.IO; - -namespace osu.Game.Beatmaps.IO -{ - public abstract class BeatmapArchiveReader : ArchiveReader - { - public const string OSZ_EXTENSION = @".osz"; - - public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path) - { - try - { - return (BeatmapArchiveReader)GetReader(storage, path); - } - catch (InvalidCastException e) - { - Logger.Error(e, "A tricky " + $@"{nameof(ArchiveReader)}" + " instance passed the test to be a " + $@"{nameof(BeatmapArchiveReader)}" + ", but it's really not"); - throw; - } - } - - /// - /// Reads the beatmap metadata from this archive. - /// - public abstract BeatmapMetadata ReadMetadata(); - - /// - /// Gets a list of beatmap file names. - /// - public string[] BeatmapFilenames { get; protected set; } - - /// - /// The storyboard filename. Null if no storyboard is present. - /// - public string StoryboardFilename { get; protected set; } - } -} \ No newline at end of file diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index 8c3e4d702c..8a1d071cfc 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -9,14 +9,14 @@ using osu.Game.Database; namespace osu.Game.Beatmaps.IO { - public sealed class OszArchiveReader : BeatmapArchiveReader + public sealed class OszArchiveReader : ArchiveReader { public static void Register() { AddReader((storage, path) => { using (var stream = storage.GetStream(path)) - return Path.GetExtension(path) == OSZ_EXTENSION && ZipFile.IsZipFile(stream, false); + return ZipFile.IsZipFile(stream, false); }); OsuLegacyDecoder.Register(); } diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 545fc9f398..1d4047ea45 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -32,7 +32,7 @@ namespace osu.Game.Beatmaps public readonly bool WithStoryboard; - protected abstract BeatmapArchiveReader GetReader(); + protected abstract ArchiveReader GetReader(); protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false) { @@ -100,7 +100,7 @@ namespace osu.Game.Beatmaps set { lock (beatmapLock) beatmap = value; } } - private BeatmapArchiveReader trackReader; + private ArchiveReader trackReader; private Track track; private object trackLock = new object(); public Track Track diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index a9fe30a5e9..871251b882 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -177,7 +177,7 @@ namespace osu.Game.Database BeatmapMetadata metadata; - using (var reader = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path)) + using (var reader = ArchiveReader.GetReader(storage, path)) metadata = reader.ReadMetadata(); if (File.Exists(path)) // Not always the case, i.e. for LegacyFilesystemReader @@ -186,7 +186,7 @@ namespace osu.Game.Database { hash = input.GetMd5Hash(); input.Seek(0, SeekOrigin.Begin); - path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash + BeatmapArchiveReader.OSZ_EXTENSION); + path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash); if (!storage.Exists(path)) using (var output = storage.GetStream(path, FileAccess.Write)) input.CopyTo(output); @@ -216,7 +216,7 @@ namespace osu.Game.Database Metadata = metadata }; - using (var archive = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path)) + using (var archive = ArchiveReader.GetReader(storage, path)) { string[] mapNames = archive.BeatmapFilenames; foreach (var name in mapNames) @@ -268,12 +268,12 @@ namespace osu.Game.Database BeatmapSetRemoved?.Invoke(beatmapSet); } - public BeatmapArchiveReader GetReader(BeatmapSetInfo beatmapSet) + public ArchiveReader GetReader(BeatmapSetInfo beatmapSet) { if (string.IsNullOrEmpty(beatmapSet.Path)) return null; - return BeatmapArchiveReader.GetBeatmapArchiveReader(storage, beatmapSet.Path); + return ArchiveReader.GetReader(storage, beatmapSet.Path); } public BeatmapSetInfo GetBeatmapSet(int id) @@ -354,7 +354,7 @@ namespace osu.Game.Database this.database = database; } - protected override BeatmapArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo); + protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo); } } } diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 6c060328a4..4a8f41b1ac 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -238,7 +238,7 @@ - + @@ -326,7 +326,6 @@ -