Merge remote-tracking branch 'origin/master' into netstandard

osu.Game/IO/Archives/ArchiveReader.cs

@@ -0,0 +1,47 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.IO.Archives
+{
+    public abstract class ArchiveReader : IDisposable, IResourceStore<byte[]>
+    {
+        /// <summary>
+        /// Opens a stream for reading a specific file from this archive.
+        /// </summary>
+        public abstract Stream GetStream(string name);
+
+        public abstract void Dispose();
+
+        /// <summary>
+        /// The name of this archive (usually the containing filename).
+        /// </summary>
+        public readonly string Name;
+
+        protected ArchiveReader(string name)
+        {
+            Name = name;
+        }
+
+        public abstract IEnumerable<string> Filenames { get; }
+
+        public virtual byte[] Get(string name)
+        {
+            using (Stream input = GetStream(name))
+            {
+                if (input == null)
+                    return null;
+
+                byte[] buffer = new byte[input.Length];
+                input.Read(buffer, 0, buffer.Length);
+                return buffer;
+            }
+        }
+
+        public abstract Stream GetUnderlyingStream();
+    }
+}

osu.Game/IO/Archives/LegacyFilesystemReader.cs

@@ -0,0 +1,34 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using osu.Framework.IO.File;
+
+namespace osu.Game.IO.Archives
+{
+    /// <summary>
+    /// Reads an extracted legacy beatmap from disk.
+    /// </summary>
+    public class LegacyFilesystemReader : ArchiveReader
+    {
+        private readonly string path;
+
+        public LegacyFilesystemReader(string path) : base(Path.GetFileName(path))
+        {
+            this.path = path;
+        }
+
+        public override Stream GetStream(string name) => File.OpenRead(Path.Combine(path, name));
+
+        public override void Dispose()
+        {
+            // no-op
+        }
+
+        public override IEnumerable<string> Filenames => Directory.GetFiles(path, "*", SearchOption.AllDirectories).Select(f => FileSafety.GetRelativePath(f, path)).ToArray();
+
+        public override Stream GetUnderlyingStream() => null;
+    }
+}

osu.Game/IO/Archives/ZipArchiveReader.cs

@@ -0,0 +1,50 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Archives.Zip;
+
+namespace osu.Game.IO.Archives
+{
+    public sealed class ZipArchiveReader : ArchiveReader
+    {
+        private readonly Stream archiveStream;
+        private readonly ZipArchive archive;
+
+        public ZipArchiveReader(Stream archiveStream, string name = null)
+            : base(name)
+        {
+            this.archiveStream = archiveStream;
+            archive = ZipArchive.Open(archiveStream);
+        }
+
+        public override Stream GetStream(string name)
+        {
+            ZipArchiveEntry entry = archive.Entries.SingleOrDefault(e => e.Key == name);
+            if (entry == null)
+                throw new FileNotFoundException();
+
+            // allow seeking
+            MemoryStream copy = new MemoryStream();
+
+            using (Stream s = entry.OpenEntryStream())
+                s.CopyTo(copy);
+
+            copy.Position = 0;
+
+            return copy;
+        }
+
+        public override void Dispose()
+        {
+            archive.Dispose();
+            archiveStream.Dispose();
+        }
+
+        public override IEnumerable<string> Filenames => archive.Entries.Select(e => e.Key).ToArray();
+
+        public override Stream GetUnderlyingStream() => archiveStream;
+    }
+}