Fixed naming conventions
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using AMWD.Common.Packing.Tar.Interfaces;
|
||||
@@ -7,8 +8,11 @@ namespace AMWD.Common.Packing.Tar.Utils
|
||||
{
|
||||
internal class TarHeader : ITarHeader
|
||||
{
|
||||
private readonly byte[] buffer = new byte[512];
|
||||
private long headerChecksum;
|
||||
private static readonly byte[] _spaces = Encoding.ASCII.GetBytes(" ");
|
||||
private readonly byte[] _buffer = new byte[512];
|
||||
|
||||
private string _fileName;
|
||||
private long _headerChecksum;
|
||||
|
||||
public TarHeader()
|
||||
{
|
||||
@@ -18,63 +22,51 @@ namespace AMWD.Common.Packing.Tar.Utils
|
||||
GroupId = 61; // 101 dec
|
||||
}
|
||||
|
||||
private string fileName;
|
||||
protected readonly DateTime TheEpoch = new DateTime(1970, 1, 1, 0, 0, 0);
|
||||
public EntryType EntryType { get; set; }
|
||||
private static byte[] spaces = Encoding.ASCII.GetBytes(" ");
|
||||
|
||||
public virtual string FileName
|
||||
{
|
||||
get
|
||||
{
|
||||
return fileName.Replace("\0", string.Empty);
|
||||
}
|
||||
get => _fileName.Replace("\0", string.Empty);
|
||||
set
|
||||
{
|
||||
if (value.Length > 100)
|
||||
{
|
||||
throw new TarException("A file name can not be more than 100 chars long");
|
||||
}
|
||||
fileName = value;
|
||||
|
||||
_fileName = value;
|
||||
}
|
||||
}
|
||||
|
||||
public int Mode { get; set; }
|
||||
|
||||
public string ModeString
|
||||
{
|
||||
get { return Convert.ToString(Mode, 8).PadLeft(7, '0'); }
|
||||
}
|
||||
=> Convert.ToString(Mode, 8).PadLeft(7, '0');
|
||||
|
||||
public int UserId { get; set; }
|
||||
|
||||
public virtual string UserName
|
||||
{
|
||||
get { return UserId.ToString(); }
|
||||
set { UserId = Int32.Parse(value); }
|
||||
get => UserId.ToString();
|
||||
set => UserId = int.Parse(value);
|
||||
}
|
||||
|
||||
public string UserIdString
|
||||
{
|
||||
get { return Convert.ToString(UserId, 8).PadLeft(7, '0'); }
|
||||
}
|
||||
=> Convert.ToString(UserId, 8).PadLeft(7, '0');
|
||||
|
||||
public int GroupId { get; set; }
|
||||
|
||||
public virtual string GroupName
|
||||
{
|
||||
get { return GroupId.ToString(); }
|
||||
set { GroupId = Int32.Parse(value); }
|
||||
get => GroupId.ToString();
|
||||
set => GroupId = int.Parse(value);
|
||||
}
|
||||
|
||||
public string GroupIdString
|
||||
{
|
||||
get { return Convert.ToString(GroupId, 8).PadLeft(7, '0'); }
|
||||
}
|
||||
=> Convert.ToString(GroupId, 8).PadLeft(7, '0');
|
||||
|
||||
public long SizeInBytes { get; set; }
|
||||
|
||||
public string SizeString
|
||||
{
|
||||
get { return Convert.ToString(SizeInBytes, 8).PadLeft(11, '0'); }
|
||||
}
|
||||
=> Convert.ToString(SizeInBytes, 8).PadLeft(11, '0');
|
||||
|
||||
public DateTime LastModification { get; set; }
|
||||
|
||||
@@ -82,71 +74,63 @@ namespace AMWD.Common.Packing.Tar.Utils
|
||||
{
|
||||
get
|
||||
{
|
||||
return Convert.ToString((long)(LastModification - TheEpoch).TotalSeconds, 8).PadLeft(11, '0');
|
||||
long unixTime = ((DateTimeOffset)DateTime.SpecifyKind(LastModification, DateTimeKind.Utc)).ToUnixTimeSeconds();
|
||||
return Convert.ToString(unixTime, 8).PadLeft(11, '0');
|
||||
}
|
||||
}
|
||||
|
||||
public string HeaderChecksumString
|
||||
{
|
||||
get { return Convert.ToString(headerChecksum, 8).PadLeft(6, '0'); }
|
||||
}
|
||||
=> Convert.ToString(_headerChecksum, 8).PadLeft(6, '0');
|
||||
|
||||
public virtual int HeaderSize
|
||||
{
|
||||
get { return 512; }
|
||||
}
|
||||
public virtual int HeaderSize => 512;
|
||||
|
||||
public byte[] GetBytes()
|
||||
{
|
||||
return buffer;
|
||||
}
|
||||
public byte[] GetBytes() => _buffer.ToArray();
|
||||
|
||||
public virtual bool UpdateHeaderFromBytes()
|
||||
{
|
||||
FileName = Encoding.ASCII.GetString(buffer, 0, 100);
|
||||
// thanks to Shasha Alperocivh. Trimming nulls.
|
||||
Mode = Convert.ToInt32(Encoding.ASCII.GetString(buffer, 100, 7).Trim(), 8);
|
||||
UserId = Convert.ToInt32(Encoding.ASCII.GetString(buffer, 108, 7).Trim(), 8);
|
||||
GroupId = Convert.ToInt32(Encoding.ASCII.GetString(buffer, 116, 7).Trim(), 8);
|
||||
FileName = Encoding.ASCII.GetString(_buffer, 0, 100);
|
||||
|
||||
EntryType = (EntryType)buffer[156];
|
||||
// Thanks to Shasha Alperocivh. Trimming nulls.
|
||||
Mode = Convert.ToInt32(Encoding.ASCII.GetString(_buffer, 100, 7).Trim(), 8);
|
||||
UserId = Convert.ToInt32(Encoding.ASCII.GetString(_buffer, 108, 7).Trim(), 8);
|
||||
GroupId = Convert.ToInt32(Encoding.ASCII.GetString(_buffer, 116, 7).Trim(), 8);
|
||||
|
||||
if ((buffer[124] & 0x80) == 0x80) // if size in binary
|
||||
EntryType = (EntryType)_buffer[156];
|
||||
|
||||
if ((_buffer[124] & 0x80) == 0x80) // if size in binary
|
||||
{
|
||||
long sizeBigEndian = BitConverter.ToInt64(buffer, 0x80);
|
||||
long sizeBigEndian = BitConverter.ToInt64(_buffer, 0x80);
|
||||
SizeInBytes = IPAddress.NetworkToHostOrder(sizeBigEndian);
|
||||
}
|
||||
else
|
||||
{
|
||||
SizeInBytes = Convert.ToInt64(Encoding.ASCII.GetString(buffer, 124, 11), 8);
|
||||
SizeInBytes = Convert.ToInt64(Encoding.ASCII.GetString(_buffer, 124, 11), 8);
|
||||
}
|
||||
long unixTimeStamp = Convert.ToInt64(Encoding.ASCII.GetString(buffer, 136, 11), 8);
|
||||
LastModification = TheEpoch.AddSeconds(unixTimeStamp);
|
||||
long unixTimeStamp = Convert.ToInt64(Encoding.ASCII.GetString(_buffer, 136, 11), 8);
|
||||
LastModification = DateTimeOffset.FromUnixTimeSeconds(unixTimeStamp).DateTime;
|
||||
|
||||
var storedChecksum = Convert.ToInt32(Encoding.ASCII.GetString(buffer, 148, 6));
|
||||
RecalculateChecksum(buffer);
|
||||
if (storedChecksum == headerChecksum)
|
||||
{
|
||||
int storedChecksum = Convert.ToInt32(Encoding.ASCII.GetString(_buffer, 148, 6));
|
||||
RecalculateChecksum(_buffer);
|
||||
if (storedChecksum == _headerChecksum)
|
||||
return true;
|
||||
}
|
||||
|
||||
RecalculateAltChecksum(buffer);
|
||||
return storedChecksum == headerChecksum;
|
||||
RecalculateAltChecksum(_buffer);
|
||||
return storedChecksum == _headerChecksum;
|
||||
}
|
||||
|
||||
private void RecalculateAltChecksum(byte[] buf)
|
||||
{
|
||||
spaces.CopyTo(buf, 148);
|
||||
headerChecksum = 0;
|
||||
_spaces.CopyTo(buf, 148);
|
||||
_headerChecksum = 0;
|
||||
foreach (byte b in buf)
|
||||
{
|
||||
if ((b & 0x80) == 0x80)
|
||||
{
|
||||
headerChecksum -= b ^ 0x80;
|
||||
_headerChecksum -= b ^ 0x80;
|
||||
}
|
||||
else
|
||||
{
|
||||
headerChecksum += b;
|
||||
_headerChecksum += b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -154,41 +138,42 @@ namespace AMWD.Common.Packing.Tar.Utils
|
||||
public virtual byte[] GetHeaderValue()
|
||||
{
|
||||
// Clean old values
|
||||
Array.Clear(buffer, 0, buffer.Length);
|
||||
Array.Clear(_buffer, 0, _buffer.Length);
|
||||
|
||||
if (string.IsNullOrEmpty(FileName)) throw new TarException("FileName can not be empty.");
|
||||
if (FileName.Length >= 100) throw new TarException("FileName is too long. It must be less than 100 bytes.");
|
||||
if (string.IsNullOrEmpty(FileName))
|
||||
throw new TarException("FileName can not be empty.");
|
||||
|
||||
if (FileName.Length >= 100)
|
||||
throw new TarException("FileName is too long. It must be less than 100 bytes.");
|
||||
|
||||
// Fill header
|
||||
Encoding.ASCII.GetBytes(FileName.PadRight(100, '\0')).CopyTo(buffer, 0);
|
||||
Encoding.ASCII.GetBytes(ModeString).CopyTo(buffer, 100);
|
||||
Encoding.ASCII.GetBytes(UserIdString).CopyTo(buffer, 108);
|
||||
Encoding.ASCII.GetBytes(GroupIdString).CopyTo(buffer, 116);
|
||||
Encoding.ASCII.GetBytes(SizeString).CopyTo(buffer, 124);
|
||||
Encoding.ASCII.GetBytes(LastModificationString).CopyTo(buffer, 136);
|
||||
Encoding.ASCII.GetBytes(FileName.PadRight(100, '\0')).CopyTo(_buffer, 0);
|
||||
Encoding.ASCII.GetBytes(ModeString).CopyTo(_buffer, 100);
|
||||
Encoding.ASCII.GetBytes(UserIdString).CopyTo(_buffer, 108);
|
||||
Encoding.ASCII.GetBytes(GroupIdString).CopyTo(_buffer, 116);
|
||||
Encoding.ASCII.GetBytes(SizeString).CopyTo(_buffer, 124);
|
||||
Encoding.ASCII.GetBytes(LastModificationString).CopyTo(_buffer, 136);
|
||||
|
||||
// buffer[156] = 20;
|
||||
buffer[156] = ((byte)EntryType);
|
||||
_buffer[156] = ((byte)EntryType);
|
||||
|
||||
RecalculateChecksum(buffer);
|
||||
RecalculateChecksum(_buffer);
|
||||
|
||||
// Write checksum
|
||||
Encoding.ASCII.GetBytes(HeaderChecksumString).CopyTo(buffer, 148);
|
||||
Encoding.ASCII.GetBytes(HeaderChecksumString).CopyTo(_buffer, 148);
|
||||
|
||||
return buffer;
|
||||
return _buffer;
|
||||
}
|
||||
|
||||
protected virtual void RecalculateChecksum(byte[] buf)
|
||||
{
|
||||
// Set default value for checksum. That is 8 spaces.
|
||||
spaces.CopyTo(buf, 148);
|
||||
_spaces.CopyTo(buf, 148);
|
||||
|
||||
// Calculate checksum
|
||||
headerChecksum = 0;
|
||||
_headerChecksum = 0;
|
||||
foreach (byte b in buf)
|
||||
{
|
||||
headerChecksum += b;
|
||||
}
|
||||
_headerChecksum += b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user