WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 03:59:36 +00:00
Code Issues Projects Releases Wiki Activity

File system refactor, bug fixes

Browse Source
This commit is contained in:
elasota
2021-03-07 04:24:13 -05:00
parent 6715bcb030
commit 3917e1a370
70 changed files with 2417 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unpacktool/CompactProParser.cpp
View File

@@ -201,8 +201,8 @@ ArchiveItemList *CompactProParser::ParseDirectory(uint32_t numEntries, IFileRead
item.m_dataForkDesc.m_compressionMethod = (fileEntry.m_flags & 4) ? CompressionMethods::kCompactProLZHRLE : CompressionMethods::kCompactProRLE;
}
item.m_macProperties.m_creationDate = fileEntry.m_creationDate;
item.m_macProperties.m_modifiedDate = fileEntry.m_modificationDate;
item.m_macProperties.m_createdTimeMacEpoch = fileEntry.m_creationDate;
item.m_macProperties.m_modifiedTimeMacEpoch = fileEntry.m_modificationDate;
memcpy(item.m_macProperties.m_fileCreator, fileEntry.m_fileCreator, 4);
memcpy(item.m_macProperties.m_fileType, fileEntry.m_fileType, 4);
item.m_macProperties.m_finderFlags = fileEntry.m_finderFlags;

4
unpacktool/StuffIt5Parser.cpp
View File

@@ -237,8 +237,8 @@ static void ConvertItem(const StuffIt5Block &block, ArchiveItem &item)
item.m_children = ConvertToItemList(block.m_children);
else
{
item.m_macProperties.m_creationDate = block.m_header.m_creationDate;
item.m_macProperties.m_modifiedDate = block.m_header.m_modificationDate;
item.m_macProperties.m_createdTimeMacEpoch = block.m_header.m_creationDate;
item.m_macProperties.m_modifiedTimeMacEpoch = block.m_header.m_modificationDate;
memcpy(item.m_macProperties.m_fileCreator, block.m_annex1.m_fileCreator, 4);
memcpy(item.m_macProperties.m_fileType, block.m_annex1.m_fileType, 4);
item.m_macProperties.m_finderFlags = block.m_annex1.m_finderFlags;

4
unpacktool/StuffItParser.cpp
View File

@@ -98,8 +98,8 @@ struct StuffItHeader
void ParseMacFileInfo(ArchiveItem &item, const uint8_t *header, IFileReader::FilePos_t filePos)
{
item.m_macProperties.m_creationDate = ParseUInt32BE(header + SITFH_CREATIONDATE);
item.m_macProperties.m_modifiedDate = ParseUInt32BE(header + SITFH_MODDATE);
item.m_macProperties.m_createdTimeMacEpoch = ParseUInt32BE(header + SITFH_CREATIONDATE);
item.m_macProperties.m_modifiedTimeMacEpoch = ParseUInt32BE(header + SITFH_MODDATE);
memcpy(item.m_macProperties.m_fileCreator, header + SITFH_CREATOR, 4);
memcpy(item.m_macProperties.m_fileType, header + SITFH_FTYPE, 4);
item.m_macProperties.m_finderFlags = ParseUInt16BE(header + SITFH_FNDRFLAGS);

51
unpacktool/unpacktool.cpp
View File

@@ -5,6 +5,7 @@
#include "StuffItParser.h"
#include "StuffIt5Parser.h"
#include "CompactProParser.h"
#include "CFileStream.h"
#include "UTF8.h"
#include "UTF16.h"
@@ -24,6 +25,8 @@
#include "CSInputBuffer.h"
#include "WindowsUnicodeToolShim.h"
#include "CombinedTimestamp.h"
#include <string.h>
#include <Windows.h>
@@ -207,7 +210,7 @@ void MakeIntermediateDirectories(const std::string &path)
}
}
int RecursiveExtractFiles(int depth, ArchiveItemList *itemList, const std::string &path, IFileReader &reader);
int RecursiveExtractFiles(int depth, ArchiveItemList *itemList, const std::string &path, IFileReader &reader, const PortabilityLayer::CombinedTimestamp &ts);
int ExtractSingleFork(const ArchiveCompressedChunkDesc &chunkDesc, const std::string &path, IFileReader &reader)
{
@@ -321,7 +324,7 @@ int ExtractSingleFork(const ArchiveCompressedChunkDesc &chunkDesc, const std::st
return 0;
}
int ExtractFile(const ArchiveItem &item, const std::string &path, IFileReader &reader)
int ExtractFile(const ArchiveItem &item, const std::string &path, IFileReader &reader, const PortabilityLayer::CombinedTimestamp &ts)
{
PortabilityLayer::MacFilePropertiesSerialized mfps;
mfps.Serialize(item.m_macProperties);
@@ -337,14 +340,16 @@ int ExtractFile(const ArchiveItem &item, const std::string &path, IFileReader &r
return -1;
}
if (fwrite(mfps.m_data, 1, PortabilityLayer::MacFilePropertiesSerialized::kSize, metadataF) != PortabilityLayer::MacFilePropertiesSerialized::kSize)
PortabilityLayer::CFileStream metadataStream(metadataF);
if (mfps.WriteAsPackage(metadataStream, ts))
{
fprintf(stderr, "A problem occurred writing metadata");
fclose(metadataF);
metadataStream.Close();
return -1;
}
fclose(metadataF);
metadataStream.Close();
int returnCode = ExtractSingleFork(item.m_dataForkDesc, dataPath, reader);
if (returnCode)
@@ -357,7 +362,7 @@ int ExtractFile(const ArchiveItem &item, const std::string &path, IFileReader &r
return 0;
}
int ExtractItem(int depth, const ArchiveItem &item, const std::string &dirPath, IFileReader &reader)
int ExtractItem(int depth, const ArchiveItem &item, const std::string &dirPath, IFileReader &reader, const PortabilityLayer::CombinedTimestamp &ts)
{
std::string path(reinterpret_cast<const char*>(item.m_fileNameUTF8.data()), item.m_fileNameUTF8.size());
@@ -377,24 +382,24 @@ int ExtractItem(int depth, const ArchiveItem &item, const std::string &dirPath,
path.append("\\");
int returnCode = RecursiveExtractFiles(depth + 1, item.m_children, path, reader);
int returnCode = RecursiveExtractFiles(depth + 1, item.m_children, path, reader, ts);
if (returnCode)
return returnCode;
return 0;
}
else
return ExtractFile(item, path, reader);
return ExtractFile(item, path, reader, ts);
}
int RecursiveExtractFiles(int depth, ArchiveItemList *itemList, const std::string &path, IFileReader &reader)
int RecursiveExtractFiles(int depth, ArchiveItemList *itemList, const std::string &path, IFileReader &reader, const PortabilityLayer::CombinedTimestamp &ts)
{
const std::vector<ArchiveItem> &items = itemList->m_items;
const size_t numChildren = items.size();
for (size_t i = 0; i < numChildren; i++)
{
int returnCode = ExtractItem(depth, items[i], path, reader);
int returnCode = ExtractItem(depth, items[i], path, reader, ts);
if (returnCode)
return returnCode;
}
@@ -404,9 +409,9 @@ int RecursiveExtractFiles(int depth, ArchiveItemList *itemList, const std::strin
int toolMain(int argc, const char **argv)
{
if (argc != 3)
if (argc != 4)
{
fprintf(stderr, "Usage: unpacktool <archive file> <destination>");
fprintf(stderr, "Usage: unpacktool <archive file> <timestamp.ts> <destination>");
return -1;
}
@@ -418,6 +423,24 @@ int toolMain(int argc, const char **argv)
return -1;
}
FILE *tsFile = fopen_utf8(argv[2], "rb");
if (!tsFile)
{
fprintf(stderr, "Could not open timestamp file");
return -1;
}
PortabilityLayer::CombinedTimestamp ts;
if (!fread(&ts, sizeof(ts), 1, tsFile))
{
fprintf(stderr, "Could not read timestamp");
return -1;
}
fclose(tsFile);
CFileReader reader(inputArchive);
IArchiveParser *parsers[] =
@@ -448,12 +471,12 @@ int toolMain(int argc, const char **argv)
printf("Decompressing files...\n");
std::string currentPath = argv[2];
std::string currentPath = argv[3];
TerminateDirectoryPath(currentPath);
MakeIntermediateDirectories(currentPath);
int returnCode = RecursiveExtractFiles(0, archiveItemList, currentPath, reader);
int returnCode = RecursiveExtractFiles(0, archiveItemList, currentPath, reader, ts);
delete archiveItemList;

4
unpacktool/unpacktool.vcxproj
View File

@@ -40,8 +40,9 @@
<Import Project="..\PortabilityLayer.props" />
<Import Project="..\Common.props" />
<Import Project="..\MacRomanConversion.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
<Import Project="..\Debug.props" />
<Import Project="..\GpCommon.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -50,6 +51,7 @@
<Import Project="..\MacRomanConversion.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
<Import Project="..\Release.props" />
<Import Project="..\GpCommon.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />