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

Revert "Merge pull request #441 from tacchinotacchi/archive-reader"

Browse Source 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
This commit is contained in:
Dean Herbert
2017-03-14 11:46:34 +09:00
parent 29eeebefb0
commit ba10c3a8db
10 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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