diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index e899673fef..bb26d2d63b 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -18,36 +18,36 @@ namespace osu.Desktop.Beatmaps.IO AddReader((storage, path) => Directory.Exists(path)); } - private string BasePath { get; set; } - private string[] Beatmaps { get; set; } - private Beatmap FirstMap { get; set; } + private string basePath { get; set; } + private string[] beatmaps { 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) + basePath = path; + beatmaps = Directory.GetFiles(basePath, "*.osu").Select(f => Path.GetFileName(f)).ToArray(); + if (beatmaps.Length == 0) throw new FileNotFoundException("This directory contains no beatmaps"); - using (var stream = new StreamReader(ReadFile(Beatmaps[0]))) + using (var stream = new StreamReader(ReadFile(beatmaps[0]))) { var decoder = BeatmapDecoder.GetDecoder(stream); - FirstMap = decoder.Decode(stream); + firstMap = decoder.Decode(stream); } } public override string[] ReadBeatmaps() { - return Beatmaps; + return beatmaps; } public override Stream ReadFile(string name) { - return File.OpenRead(Path.Combine(BasePath, name)); + return File.OpenRead(Path.Combine(basePath, name)); } public override BeatmapMetadata ReadMetadata() { - return FirstMap.Metadata; + return firstMap.Metadata; } public override void Dispose() diff --git a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs index 2fb653a767..d6c792e06c 100644 --- a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs @@ -6,18 +6,18 @@ namespace osu.Game.Beatmaps.Formats { public abstract class BeatmapDecoder { - private static Dictionary Decoders { get; set; } = new Dictionary(); + private static Dictionary decoders { get; set; } = new Dictionary(); public static BeatmapDecoder GetDecoder(TextReader stream) { var line = stream.ReadLine().Trim(); - if (!Decoders.ContainsKey(line)) + if (!decoders.ContainsKey(line)) throw new IOException("Unknown file format"); - return (BeatmapDecoder)Activator.CreateInstance(Decoders[line]); + return (BeatmapDecoder)Activator.CreateInstance(decoders[line]); } protected static void AddDecoder(string magic) where T : BeatmapDecoder { - Decoders[magic] = typeof(T); + decoders[magic] = typeof(T); } public abstract Beatmap Decode(TextReader stream); diff --git a/osu.Game/Beatmaps/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs index 2324236ba1..292973a275 100644 --- a/osu.Game/Beatmaps/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -13,11 +13,11 @@ namespace osu.Game.Beatmaps.IO public Type Type { get; set; } } - private static List Readers { get; set; } = new List(); + private static List readers { get; set; } = new List(); public static ArchiveReader GetReader(BasicStorage storage, string path) { - foreach (var reader in Readers) + foreach (var reader in readers) { if (reader.Test(storage, path)) return (ArchiveReader)Activator.CreateInstance(reader.Type); @@ -27,7 +27,7 @@ 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) }); } /// diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index e75215949f..c61a49cb03 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -23,32 +23,32 @@ namespace osu.Game.Beatmaps.IO OsuLegacyDecoder.Register(); } - private ZipFile Archive { get; set; } - private string[] Beatmaps { get; set; } - private Beatmap FirstMap { get; set; } + private ZipFile archive { get; set; } + private string[] beatmaps { get; set; } + private Beatmap firstMap { get; set; } - public OszArchiveReader(Stream archive) + public OszArchiveReader(Stream archiveStream) { - Archive = ZipFile.Read(archive); - Beatmaps = Archive.Entries.Where(e => e.FileName.EndsWith(".osu")) + archive = ZipFile.Read(archiveStream); + beatmaps = archive.Entries.Where(e => e.FileName.EndsWith(".osu")) .Select(e => e.FileName).ToArray(); - if (Beatmaps.Length == 0) + if (beatmaps.Length == 0) throw new FileNotFoundException("This directory contains no beatmaps"); - using (var stream = new StreamReader(ReadFile(Beatmaps[0]))) + using (var stream = new StreamReader(ReadFile(beatmaps[0]))) { var decoder = BeatmapDecoder.GetDecoder(stream); - FirstMap = decoder.Decode(stream); + firstMap = decoder.Decode(stream); } } public override string[] ReadBeatmaps() { - return Beatmaps; + return beatmaps; } public override Stream ReadFile(string name) { - ZipEntry entry = Archive.Entries.SingleOrDefault(e => e.FileName == name); + ZipEntry entry = archive.Entries.SingleOrDefault(e => e.FileName == name); if (entry == null) throw new FileNotFoundException(); return entry.OpenReader(); @@ -56,11 +56,11 @@ namespace osu.Game.Beatmaps.IO public override BeatmapMetadata ReadMetadata() { - return FirstMap.Metadata; + return firstMap.Metadata; } public override void Dispose() { - Archive.Dispose(); + archive.Dispose(); } } } \ No newline at end of file diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index c7f09ebadb..36f8776eb0 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -11,23 +11,23 @@ namespace osu.Game.Database { public class BeatmapDatabase { - private static SQLiteConnection Connection { get; set; } + private static SQLiteConnection connection { get; set; } public BeatmapDatabase(BasicStorage storage) { - if (Connection == null) + if (connection == null) { - Connection = storage.GetDatabase(@"beatmaps"); - Connection.CreateTable(); - Connection.CreateTable(); - Connection.CreateTable(); - Connection.CreateTable(); + connection = storage.GetDatabase(@"beatmaps"); + connection.CreateTable(); + connection.CreateTable(); + connection.CreateTable(); + connection.CreateTable(); } } public void AddBeatmap(ArchiveReader input) { var metadata = input.ReadMetadata(); - if (Connection.Table().Count(b => b.BeatmapSetID == metadata.BeatmapSetID) != 0) + if (connection.Table().Count(b => b.BeatmapSetID == metadata.BeatmapSetID) != 0) return; string[] mapNames = input.ReadBeatmaps(); var beatmapSet = new BeatmapSet { BeatmapSetID = metadata.BeatmapSetID }; @@ -39,12 +39,12 @@ namespace osu.Game.Database var decoder = BeatmapDecoder.GetDecoder(stream); var beatmap = decoder.Decode(stream); maps.Add(beatmap); - beatmap.BaseDifficultyID = Connection.Insert(beatmap.BaseDifficulty); + beatmap.BaseDifficultyID = connection.Insert(beatmap.BaseDifficulty); } } - beatmapSet.BeatmapMetadataID = Connection.Insert(metadata); - Connection.Insert(beatmapSet); - Connection.InsertAll(maps); + beatmapSet.BeatmapMetadataID = connection.Insert(metadata); + connection.Insert(beatmapSet); + connection.InsertAll(maps); } } } \ No newline at end of file