ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix code style in dearchiver impl

This commit is contained in:
YoshiRulz 2021-01-21 20:55:07 +10:00
parent d3917de1b3
commit 99d027cc63
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
View File

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

15
src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs
View File

@ -1,7 +1,9 @@
using System.IO;
using System.Linq;
#nullable enable
using System.Collections.Generic;
using BizHawk.Common;
using SharpCompress.Archives;
namespace BizHawk.Client.Common
@ -27,13 +29,10 @@ namespace BizHawk.Client.Common
return true; // no exception? good enough
}
public SharpCompressArchiveFile Construct(string path) => new SharpCompressArchiveFile(path);
public SharpCompressArchiveFile Construct(string path) => new(path);
public static readonly SharpCompressDearchivalMethod Instance = new SharpCompressDearchivalMethod();
//don't try any .tar.* formats, they don't work
static readonly IReadOnlyCollection<string> archiveExts = new[] { ".zip", ".7z", ".rar", ".gz" };
public static readonly SharpCompressDearchivalMethod Instance = new();
public IReadOnlyCollection<string> AllowedArchiveExtensions { get { return archiveExts; } }
public IReadOnlyCollection<string> AllowedArchiveExtensions { get; } = new[] { ".zip", ".7z", ".rar", ".gz" }; // don't try any .tar.* formats, they don't work
}
}