From 6cc4b0e28ff9b218a1656495286ad543408179d6 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:21:52 -0500
Subject: [PATCH] SharpCompressArchiveFile: fix support for solid rar

---
 .../SharpCompressArchiveFile.cs               | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs b/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
index c5fef258bd..d58dfc279c 100644
--- a/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
+++ b/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,24 +12,41 @@ namespace BizHawk.Client.Common
 	/// <see cref="SharpCompressDearchivalMethod"/>
 	public class SharpCompressArchiveFile : IHawkArchiveFile
 	{
-		private IArchive? _archive;
+		private IArchive _archive;
 
-		private IEnumerable<IArchiveEntry> ArchiveFiles => (_archive ?? throw new ObjectDisposedException(nameof(SharpCompressArchiveFile))).Entries.Where(e => !e.IsDirectory);
+		private IEnumerable<IArchiveEntry> EnumerateArchiveFiles()
+		{
+			if (_archive == null)
+				throw new ObjectDisposedException(nameof(SharpCompressArchiveFile));
+			return _archive.Entries.Where(e => !e.IsDirectory);
+		}
 
-		public SharpCompressArchiveFile(string path) => _archive = ArchiveFactory.Open(path);
+		public SharpCompressArchiveFile(string path)
+		{
+			var readerOptions = new SharpCompress.Readers.ReaderOptions();
+			_archive = ArchiveFactory.Open(path, readerOptions);
+		}
 
 		public void Dispose()
 		{
-			_archive?.Dispose();
+			_archive.Dispose();
 			_archive = null;
 		}
 
 		public void ExtractFile(int index, Stream stream)
-		{
-			using var entryStream = ArchiveFiles.ElementAt(index).OpenEntryStream();
+		{
+			var reader = _archive.ExtractAllEntries();
+			for(int i=0;i<=index;i++)
+				reader.MoveToNextEntry();
+
+			using var entryStream = reader.OpenEntryStream();
 			entryStream.CopyTo(stream);
 		}
 
-		public List<HawkArchiveFileItem> Scan() => ArchiveFiles.Select((e, i) => new HawkArchiveFileItem(e.Key.Replace('\\', '/'), e.Size, i, i)).ToList();
+		public List<HawkArchiveFileItem> Scan()
+		{
+			var files = EnumerateArchiveFiles();
+			return files.Select((e, i) => new HawkArchiveFileItem(e.Key.Replace('\\', '/'), e.Size, i, i)).ToList();
+		}
 	}
 }