RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 08:12:41 +00: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
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
10 changed files with 37 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -110,7 +110,7 @@ namespace osu.Desktop.VisualTests.Tests
Beatmap = beatmap;
}
protected override BeatmapArchiveReader GetReader() => null;
protected override ArchiveReader GetReader() => null;
}
}
}

2
osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs
View File

@ -13,7 +13,7 @@ namespace osu.Desktop.Beatmaps.IO
/// <summary>
/// Reads an extracted legacy beatmap from disk.
/// </summary>
public class LegacyFilesystemReader : BeatmapArchiveReader
public class LegacyFilesystemReader : ArchiveReader
{
public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));

5
osu.Desktop/OsuGameDesktop.cs
View File

@ -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)
{

3
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

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

26
osu.Game/IO/ArchiveReader.cs → osu.Game/Beatmaps/IO/ArchiveReader.cs
View File

@ -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<byte[]>
{
protected class Reader
private class Reader
{
public Func<Storage, string, bool> Test { get; set; }
public Type Type { get; set; }
}
protected static List<Reader> Readers { get; } = new List<Reader>();
private static List<Reader> readers { get; } = new List<Reader>();
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<T>(Func<Storage, string, bool> test) where T : ArchiveReader
{
Readers.Add(new Reader { Test = test, Type = typeof(T) });
readers.Add(new Reader { Test = test, Type = typeof(T) });
}
/// <summary>
/// Reads the beatmap metadata from this archive.
/// </summary>
public abstract BeatmapMetadata ReadMetadata();
/// <summary>
/// Gets a list of beatmap file names.
/// </summary>
public string[] BeatmapFilenames { get; protected set; }
/// <summary>
/// The storyboard filename. Null if no storyboard is present.
/// </summary>
public string StoryboardFilename { get; protected set; }
/// <summary>
/// Opens a stream for reading a specific file from this archive.
/// </summary>

44
osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs
View File

@ -1,44 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// 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;
}
}
/// <summary>
/// Reads the beatmap metadata from this archive.
/// </summary>
public abstract BeatmapMetadata ReadMetadata();
/// <summary>
/// Gets a list of beatmap file names.
/// </summary>
public string[] BeatmapFilenames { get; protected set; }
/// <summary>
/// The storyboard filename. Null if no storyboard is present.
/// </summary>
public string StoryboardFilename { get; protected set; }
}
}

4
osu.Game/Beatmaps/IO/OszArchiveReader.cs
View File

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

4
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -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

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

3
osu.Game/osu.Game.csproj
View File

@ -238,7 +238,7 @@
<Compile Include="Users\User.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
<Compile Include="Database\BeatmapDatabase.cs" />
<Compile Include="Beatmaps\IO\BeatmapArchiveReader.cs" />
<Compile Include="Beatmaps\IO\ArchiveReader.cs" />
<Compile Include="Beatmaps\Formats\BeatmapDecoder.cs" />
<Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
<Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
@ -326,7 +326,6 @@
<Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
<Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
<Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
<Compile Include="IO\ArchiveReader.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">