sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add more decoding (including full BeatmapMetadata)

Browse Source
This commit is contained in:
Drew DeVault
2016-10-07 15:36:20 -04:00
committed by Dean Herbert
parent 2a3f047895
commit 32ab8f97bb
6 changed files with 206 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
View File

@ -2,6 +2,7 @@
using System.IO; using System.IO;
using NUnit.Framework; using NUnit.Framework;
using osu.Game.Beatmaps.IO; using osu.Game.Beatmaps.IO;
using osu.Game.GameModes.Play;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
namespace osu.Game.Tests.Beatmaps.IO namespace osu.Game.Tests.Beatmaps.IO
@ -40,6 +41,27 @@ namespace osu.Game.Tests.Beatmaps.IO
foreach (var map in expected) foreach (var map in expected)
Assert.Contains(map, maps); Assert.Contains(map, maps);
} }
}
[Test]
public void TestReadMetadata()
{
using (var osz = File.OpenRead(Resource.GetPath("241526 Soleily - Renatus.osz")))
{
var reader = new OszArchiveReader(osz);
var meta = reader.ReadMetadata();
Assert.AreEqual(241526, meta.BeatmapSetID);
Assert.AreEqual("Soleily", meta.Artist);
Assert.AreEqual("Soleily", meta.ArtistUnicode);
Assert.AreEqual("03. Renatus - Soleily 192kbps.mp3", meta.AudioFile);
Assert.AreEqual("Deif", meta.Author);
Assert.AreEqual("machinetop_background.jpg", meta.BackgroundFile);
Assert.AreEqual(164471, meta.PreviewTime);
Assert.AreEqual(string.Empty, meta.Source);
Assert.AreEqual("MBC7 Unisphere 地球ヤバイEP Chikyu Yabai", meta.Tags);
Assert.AreEqual("Renatus", meta.Title);
Assert.AreEqual("Renatus", meta.TitleUnicode);
}
} }
} }
} }

2
osu.Game/Beatmaps/Beatmap.cs
View File

@ -4,6 +4,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Game.GameModes.Play;
using osu.Game.Users; using osu.Game.Users;
using SQLite; using SQLite;
@ -26,6 +27,7 @@ namespace osu.Game.Beatmaps
public BeatmapMetadata Metadata { get; set; } public BeatmapMetadata Metadata { get; set; }
[Ignore] [Ignore]
public BaseDifficulty BaseDifficulty { get; set; } public BaseDifficulty BaseDifficulty { get; set; }
public PlayMode Mode { get; set; }
public string Version { get; set; } public string Version { get; set; }
} }
} }

1
osu.Game/Beatmaps/BeatmapMetadata.cs
View File

@ -19,7 +19,6 @@ namespace osu.Game.Beatmaps
public string Author { get; set; } public string Author { get; set; }
public string Source { get; set; } public string Source { get; set; }
public string Tags { get; set; } public string Tags { get; set; }
public PlayMode Mode { get; set; }
public int PreviewTime { get; set; } public int PreviewTime { get; set; }
public string AudioFile { get; set; } public string AudioFile { get; set; }
public string BackgroundFile { get; set; } public string BackgroundFile { get; set; }

14
osu.Game/Beatmaps/Events/EventType.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
namespace osu.Game.Beatmaps.Events
{
public enum EventType
{
Background = 0,
Video = 1,
Break = 2,
Colour = 3,
Sprite = 4,
Sample = 5,
Animation = 6
}
}

271
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -1,131 +1,192 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using osu.Game.Beatmaps.Events;
using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Game.GameModes.Play; using osu.Game.GameModes.Play;
namespace osu.Game.Beatmaps.Formats namespace osu.Game.Beatmaps.Formats
{ {
public class OsuLegacyDecoder : BeatmapDecoder public class OsuLegacyDecoder : BeatmapDecoder
{ {
public static void Register() public static void Register()
{ {
AddDecoder<OsuLegacyDecoder>("osu file format v14"); AddDecoder<OsuLegacyDecoder>("osu file format v14");
AddDecoder<OsuLegacyDecoder>("osu file format v13"); AddDecoder<OsuLegacyDecoder>("osu file format v13");
AddDecoder<OsuLegacyDecoder>("osu file format v12"); AddDecoder<OsuLegacyDecoder>("osu file format v12");
AddDecoder<OsuLegacyDecoder>("osu file format v11"); AddDecoder<OsuLegacyDecoder>("osu file format v11");
AddDecoder<OsuLegacyDecoder>("osu file format v10"); AddDecoder<OsuLegacyDecoder>("osu file format v10");
// TODO: Not sure how far back to go, or differences between versions // TODO: Not sure how far back to go, or differences between versions
} }
private enum Section private enum Section
{ {
None, None,
General, General,
Editor, Editor,
Metadata, Metadata,
Difficulty, Difficulty,
Events, Events,
TimingPoints, TimingPoints,
Colours, Colours,
HitObjects,
} }
}
private void HandleGeneral(Beatmap beatmap, string key, string val)
private void HandleGeneral(Beatmap beatmap, string key, string val) {
{ switch (key)
switch (key) {
case "AudioFilename":
beatmap.Metadata.AudioFile = val; beatmap.Metadata.AudioFile = val;
case "AudioFilename": break;
beatmap.Metadata.AudioFile = val; case "AudioLeadIn":
// TODO // TODO
case "AudioLeadIn": break;
// TODO case "PreviewTime":
break; beatmap.Metadata.PreviewTime = int.Parse(val);
case "PreviewTime": break;
beatmap.Metadata.PreviewTime = int.Parse(val); case "Countdown":
break;
case "Countdown":
// TODO
// TODO // TODO
case "SampleSet": break;
// TODO case "SampleSet":
// TODO // TODO
case "StackLeniency": break;
// TODO case "StackLeniency":
break;
case "Mode":
beatmap.Metadata.Mode = (PlayMode)int.Parse(val);
// TODO // TODO
case "LetterboxInBreaks": break;
// TODO case "Mode":
beatmap.Mode = (PlayMode)int.Parse(val);
break;
case "LetterboxInBreaks":
// TODO // TODO
case "SpecialStyle": break;
// TODO case "SpecialStyle":
break; // TODO
case "WidescreenStoryboard": break;
// TODO case "WidescreenStoryboard":
// TODO
break;
}
}
private void HandleMetadata(Beatmap beatmap, string key, string val)
{
switch (key)
{
case "Title":
beatmap.Metadata.Title = val;
break;
case "TitleUnicode":
beatmap.Metadata.TitleUnicode = val;
break;
case "Artist":
beatmap.Metadata.Artist = val;
break;
case "ArtistUnicode":
beatmap.Metadata.ArtistUnicode = val;
break;
case "Creator":
beatmap.Metadata.Author = val;
break;
case "Version":
beatmap.Version = val;
break;
case "Source":
beatmap.Metadata.Source = val;
break;
case "Tags":
beatmap.Metadata.Tags = val;
break;
case "BeatmapID":
beatmap.BeatmapID = int.Parse(val);
break;
case "BeatmapSetID":
beatmap.BeatmapSetID = int.Parse(val);
beatmap.Metadata.BeatmapSetID = int.Parse(val);
break;
}
}
private void HandleEvents(Beatmap beatmap, string val)
{
if (val.StartsWith("//"))
return;
string[] split = val.Split(',');
EventType type;
int _type;
if (!int.TryParse(split[0], out _type))
{
if (!Enum.TryParse(split[0], out type))
throw new InvalidDataException($@"Unknown event type {split[0]}");
}
else
type = (EventType)_type;
// TODO: Parse and store the rest of the event
if (type == EventType.Background)
beatmap.Metadata.BackgroundFile = split[2].Trim('"');
} }
public override Beatmap Decode(TextReader stream) public override Beatmap Decode(TextReader stream)
{
public override Beatmap Decode(TextReader stream) var beatmap = new Beatmap
{ {
var beatmap = new Beatmap Metadata = new BeatmapMetadata(),
{ BaseDifficulty = new BaseDifficulty(),
Metadata = new BeatmapMetadata(), HitObjects = new List<HitObject>(),
HitObjects = new List<HitObject>(), ControlPoints = new List<ControlPoint>(),
ControlPoints = new List<ControlPoint>(), };
}; var section = Section.None;
string line;
while (true) while (true)
string line; {
while (true) line = stream.ReadLine();
if (line == null) if (line == null)
line = stream.ReadLine(); break;
if (line == null) line = line.Trim();
break; if (string.IsNullOrEmpty(line))
line = line.Trim(); continue;
if (string.IsNullOrEmpty(line))
continue; if (line.StartsWith("[") && line.EndsWith("]"))
{
if (line.StartsWith("[") && line.EndsWith("]")) if (!Enum.TryParse(line.Substring(1, line.Length - 2), out section))
{ throw new InvalidDataException($@"Unknown osu section {line}");
if (!Enum.TryParse(line.Substring(1, line.Length - 2), out section)) continue;
throw new InvalidOperationException($@"Unknown osu section {line}"); }
continue;
} string val = line, key = null;
if (section != Section.Events && section != Section.TimingPoints
&& section != Section.HitObjects) && section != Section.HitObjects)
if (section != Section.Events && section != Section.TimingPoints {
&& section != Section.HitObjects) key = val.Remove(val.IndexOf(':')).Trim();
val = val.Substring(val.IndexOf(':') + 1).Trim(); val = val.Substring(val.IndexOf(':') + 1).Trim();
key = val.Remove(val.IndexOf(':')).Trim(); }
val = val.Substring(val.IndexOf(':') + 1).Trim(); switch (section)
} {
switch (section) case Section.General:
{ HandleGeneral(beatmap, key, val);
case Section.General: break;
HandleGeneral(beatmap, key, val); case Section.Editor:
break;
case Section.Editor:
// TODO
// TODO // TODO
case Section.Metadata: break;
// TODO case Section.Metadata:
break; HandleMetadata(beatmap, key, val);
case Section.Difficulty: break;
// TODO case Section.Difficulty:
// TODO // TODO
case Section.Events: break;
// TODO case Section.Events:
HandleEvents(beatmap, val);
break;
case Section.TimingPoints:
// TODO // TODO
case Section.TimingPoints: break;
// TODO case Section.HitObjects:
// TODO // TODO
case Section.HitObjects: break;
// TODO }
break; }
} return beatmap;
} }
return beatmap; }
} }

2
osu.Game/osu.Game.csproj
View File

@ -169,6 +169,7 @@
<Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" /> <Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
<Compile Include="Beatmaps\IO\OszArchiveReader.cs" /> <Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
<Compile Include="Beatmaps\BaseDifficulty.cs" /> <Compile Include="Beatmaps\BaseDifficulty.cs" />
<Compile Include="Beatmaps\Events\EventType.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj"> <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
@ -191,6 +192,7 @@
<Folder Include="Database\" /> <Folder Include="Database\" />
<Folder Include="Beatmaps\Formats\" /> <Folder Include="Beatmaps\Formats\" />
<Folder Include="Beatmaps\IO\" /> <Folder Include="Beatmaps\IO\" />
<Folder Include="Beatmaps\Events\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.