starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-24 07:54:39 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

CSharpier

Browse Source
This commit is contained in:
Lars Vahlenberg
2024-01-02 21:25:40 +01:00
parent f8a0069a5d
commit 8b02795d69
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SharpCompress/Archives/Rar/RarArchiveEntry.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
@@ -42,7 +41,10 @@ public class RarArchiveEntry : RarEntry, IArchiveEntry
get
{
CheckIncomplete();
return BitConverter.ToUInt32( parts.Select(fp => fp.FileHeader).Single(fh => !fh.IsSplitAfter).FileCrc, 0);
return BitConverter.ToUInt32(
parts.Select(fp => fp.FileHeader).Single(fh => !fh.IsSplitAfter).FileCrc,
0
);
}
}

2
src/SharpCompress/Common/Rar/RarEntry.cs
View File

@@ -20,7 +20,7 @@ public abstract class RarEntry : Entry
/// <summary>
/// The File's 32 bit CRC Hash
/// </summary>
public override long Crc => BitConverter.ToUInt32( FileHeader.FileCrc, 0 );
public override long Crc => BitConverter.ToUInt32(FileHeader.FileCrc, 0);
/// <summary>
/// The path of the file internal to the Rar Archive.

4
src/SharpCompress/Readers/Rar/RarReader.cs
View File

@@ -75,7 +75,9 @@ public abstract class RarReader : AbstractReader<RarReaderEntry, RarVolume>
if (Entry.FileHeader.FileCrc.Length > 5)
{
return CreateEntryStream(new RarBLAKE2spStream(UnpackV2017.Value, Entry.FileHeader, stream));
return CreateEntryStream(
new RarBLAKE2spStream(UnpackV2017.Value, Entry.FileHeader, stream)
);
}
return CreateEntryStream(new RarCrcStream(UnpackV2017.Value, Entry.FileHeader, stream));

6
tests/SharpCompress.Test/Rar/RarReaderTests.cs
View File

@@ -186,15 +186,13 @@ public class RarReaderTests : ReaderTests
public void Rar_EncryptedFileOnly_Reader() => ReadRar("Rar.encrypted_filesOnly.rar", "test");
[Fact]
public void Rar5_EncryptedFileOnly_Reader() =>
ReadRar("Rar5.encrypted_filesOnly.rar", "test");
public void Rar5_EncryptedFileOnly_Reader() => ReadRar("Rar5.encrypted_filesOnly.rar", "test");
[Fact]
public void Rar_Encrypted_Reader() => ReadRar("Rar.Encrypted.rar", "test");
[Fact]
public void Rar5_Encrypted_Reader() =>
ReadRar("Rar5.encrypted_filesOnly.rar", "test");
public void Rar5_Encrypted_Reader() => ReadRar("Rar5.encrypted_filesOnly.rar", "test");
private void ReadRar(string testArchive, string password) =>
Read(testArchive, CompressionType.Rar, new ReaderOptions { Password = password });