Merge pull request #15591 from peppy/fix-android-score-imports

Fix android score imports not working

osu.Game/Database/ImportTask.cs

@@ -47,10 +47,30 @@ namespace osu.Game.Database
         /// </summary>
         public ArchiveReader GetReader()
         {
-            if (Stream != null)
+            return Stream != null
-                return new ZipArchiveReader(Stream, Path);
+                ? getReaderFrom(Stream)
+                : getReaderFrom(Path);
+        }
 
-            return getReaderFrom(Path);
+        /// <summary>
+        /// Creates an <see cref="ArchiveReader"/> from a stream.
+        /// </summary>
+        /// <param name="stream">A seekable stream containing the archive content.</param>
+        /// <returns>A reader giving access to the archive's content.</returns>
+        private ArchiveReader getReaderFrom(Stream stream)
+        {
+            if (!(stream is MemoryStream memoryStream))
+            {
+                // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
+                byte[] buffer = new byte[stream.Length];
+                stream.Read(buffer, 0, (int)stream.Length);
+                memoryStream = new MemoryStream(buffer);
+            }
+
+            if (ZipUtils.IsZipArchive(memoryStream))
+                return new ZipArchiveReader(memoryStream, Path);
+
+            return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
         }
 
         /// <summary>

osu.Game/IO/Archives/LegacyByteArrayReader.cs

@@ -7,7 +7,7 @@ using System.IO;
 namespace osu.Game.IO.Archives
 {
     /// <summary>
-    /// Allows reading a single file from the provided stream.
+    /// Allows reading a single file from the provided byte array.
     /// </summary>
     public class LegacyByteArrayReader : ArchiveReader
     {

osu.Game/Utils/ZipUtils.cs

@@ -9,6 +9,34 @@ namespace osu.Game.Utils
 {
     public static class ZipUtils
     {
+        public static bool IsZipArchive(MemoryStream stream)
+        {
+            try
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+
+                using (var arc = ZipArchive.Open(stream))
+                {
+                    foreach (var entry in arc.Entries)
+                    {
+                        using (entry.OpenEntryStream())
+                        {
+                        }
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+            finally
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+            }
+        }
+
         public static bool IsZipArchive(string path)
         {
             if (!File.Exists(path))