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

Refactor ArchiveReader for extensibility

Browse Source
This commit is contained in:
Alex Amadori
2017-03-06 23:56:08 +01:00
parent f0126e8c76
commit fd53d10264
7 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Database/BeatmapDatabase.cs
View File

@ -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);
}
}
}