fec77632ef
* Fix issues with seedlist for AutomatedTesting Fixes error reporting so it will show the file hint in the tool. Removes any missing assets from the .seed file. Remove an unnecessary dependency from AutomatedTesting dependencies file. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Make ArchiveComponent use AZ::IO::IArchive Initial changes that will get the sychronous calls in ArchiveComponent to use IArchive interface rather than external zip/7z tools. Some of the asynchronous api are still in place, anything that wasn't being used has been removed for now. This may change later if we move towards all the api being asynchronous. Until then, we can't remove the reliance upon the external archive tools completely. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Updates AZStd::thread constructors Adds a variadic constructor which forwards args to the functor. Because of our thread_desc extension, there was confusion on the arugments, so the args were reordered to take the thread_desc first, before the functor and args. Also the thread_desc is taken as reference rather than by pointer. Update callsites to account for this change. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Async operation of ArchiveComponent api This sets up the ArchiveComponent to operate asynchronously. It uses promise/future to transfer results to caller. This is still broken, there's a few things that need to get fixed up, but this is a good checkpoint for the work as it solidifies the api, cleans up a bunch of unused code, and compiles. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Removes the platform-specific ArchiveComponen These are no longer needed, as they control the direct interaction with host OS tools like 7za.exe or /bin/zip. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Removes the platform-specific files from cmake Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Removes the 7za.exe (and legal notice) This tool is no longer needed in the repo. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fixes usage of IArchive::GetFullPath() This changed to return a PathView, updated to reflect that. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix promises and threads Make sure promises are only set exactly once. This meant reworking some of the initial error checking. Detach threads when created. Adds [[nodiscard]] to the functions that return a future. Since threads are detached, the future is the main way to get communication from the thread. Clean up interface, add comments. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * More edits to thread creation Changes to thread construction to account for parameter change. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix some remaining issues with ArchiveComponent Put created threads inside a container, then join them at Deactivate. Fix asset bundler case when injecting a file with no working directory. Fix thread constructor that applies args to a function. Fix lambdas to take string args by value rather than reference. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fixes some remaining bugs in ArchiveComponent Open archive as read-only during extract & list operations. Fixes paths issues. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix initialize of opaque thread handle in thread_UnixLike.h Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed unused variable in AssetBundleComponent.cpp to fix compiler warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix some issues with archives File paths in the CDR and the local headers need to match, but there were issues with path separators and case that made it possible to get invalid headers errors in some archives. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Adds some new ArchiveComponent unit tests Adds new tests for extraction of archive and adding files from a file list to an archive. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix file data offset issues when opening archives When opening an INestedArchive it would run through the CDR headers to create file entries in the zip cache. The offsets to the compressed data were being calculated incorrectly because they were using the CDR headers rather than jumping to the local file headers and getting offsets from those sizes. Removed and refactored some archive validation flow and zip cache factory init methods to either init default or init w/ additional validation checks. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Addresses PR feedback Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address more points of feedback in PR Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address additional PR feedback Fixes up some error checks and uses of strings vs paths. Enable archive component tests on Linux so we can see if they will pass. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address PR feedback Change the INestedArchive interface to list files as AZ::IO::Path. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Disabling the ArchiveComponent tests on Linux They failed so we will revisit them to attempt a fix. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Rename a member variable to be more accurate Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address feedback on PR Bump version of Archive Components for serialize context. Improve error messages during archive open and validation. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Revert recent changes Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
109 lines
4.4 KiB
C++
109 lines
4.4 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
|
|
|
|
#pragma once
|
|
|
|
#include <AzFramework/Archive/INestedArchive.h>
|
|
#include <AzFramework/Archive/IArchive.h>
|
|
#include <AzFramework/Archive/ZipDirCache.h>
|
|
|
|
namespace AZ::IO
|
|
{
|
|
struct NestedArchiveSortByName
|
|
{
|
|
bool operator()(const INestedArchive* left, const INestedArchive* right) const
|
|
{
|
|
return left->GetFullPath() < right->GetFullPath();
|
|
}
|
|
bool operator()(AZStd::string_view left, const INestedArchive* right) const
|
|
{
|
|
return AZ::IO::PathView(left) < right->GetFullPath();
|
|
}
|
|
bool operator()(const INestedArchive* left, AZStd::string_view right) const
|
|
{
|
|
return left->GetFullPath() < AZ::IO::PathView(right);
|
|
}
|
|
};
|
|
|
|
class NestedArchive
|
|
: public INestedArchive
|
|
{
|
|
public:
|
|
AZ_CLASS_ALLOCATOR(NestedArchive, AZ::SystemAllocator, 0);
|
|
|
|
NestedArchive(IArchive* pArchive, AZStd::string_view strBindRoot, ZipDir::CachePtr pCache, uint32_t nFlags = 0);
|
|
~NestedArchive() override;
|
|
|
|
auto GetRootFolderHandle() -> Handle override;
|
|
|
|
// Adds a new file to the zip or update an existing one
|
|
// adds a directory (creates several nested directories if needed)
|
|
// compression methods supported are 0 (store) and 8 (deflate) , compression level is 0..9 or -1 for default (like in zlib)
|
|
int UpdateFile(AZStd::string_view szRelativePath, const void* pUncompressed, uint64_t nSize, uint32_t nCompressionMethod = ZipFile::METHOD_STORE,
|
|
int nCompressionLevel = -1, CompressionCodec::Codec codec = CompressionCodec::Codec::ZLIB) override;
|
|
|
|
// Adds a new file to the zip or update an existing one if it is not compressed - just stored - start a big file
|
|
int StartContinuousFileUpdate(AZStd::string_view szRelativePath, uint64_t nSize) override;
|
|
|
|
// Adds a new file to the zip or update an existing segment if it is not compressed - just stored
|
|
// adds a directory (creates several nested directories if needed)
|
|
// Arguments:
|
|
// nOverwriteSeekPos - std::numeric_limits<uint64_t>::max(i.e uint64_t(-1)) means the seek pos should not be overwritten
|
|
int UpdateFileContinuousSegment(AZStd::string_view szRelativePath, uint64_t nSize, const void* pUncompressed, uint64_t nSegmentSize, uint64_t nOverwriteSeekPos) override;
|
|
|
|
int UpdateFileCRC(AZStd::string_view szRelativePath, AZ::Crc32 dwCRC) override;
|
|
|
|
// deletes the file from the archive
|
|
int RemoveFile(AZStd::string_view szRelativePath) override;
|
|
|
|
// deletes the directory, with all its descendants (files and subdirectories)
|
|
int RemoveDir(AZStd::string_view szRelativePath) override;
|
|
|
|
// deletes all files from the archive
|
|
int RemoveAll() override;
|
|
|
|
// lists all the files in the archive
|
|
int ListAllFiles(AZStd::vector<AZ::IO::Path>& outFileEntries) override;
|
|
|
|
// finds the file; you don't have to close the returned handle
|
|
Handle FindFile(AZStd::string_view szRelativePath) override;
|
|
|
|
// returns the size of the file (unpacked) by the handle
|
|
uint64_t GetFileSize(Handle fileHandle) override;
|
|
|
|
// reads the file into the preallocated buffer (must be at least the size of GetFileSize())
|
|
int ReadFile(Handle fileHandle, void* pBuffer) override;
|
|
|
|
// returns the full path to the archive file
|
|
AZ::IO::PathView GetFullPath() const override;
|
|
|
|
uint32_t GetFlags() const override;
|
|
bool SetFlags(uint32_t nFlagsToSet) override;
|
|
bool ResetFlags(uint32_t nFlagsToReset) override;
|
|
|
|
bool SetPackAccessible(bool bAccessible) override;
|
|
|
|
ZipDir::Cache* GetCache();
|
|
|
|
protected:
|
|
// returns the pointer to the relative file path to be passed
|
|
// to the underlying Cache pointer. Uses the given buffer to construct the path.
|
|
// returns nullptr if the file path is invalid
|
|
AZ::IO::FixedMaxPathString AdjustPath(AZStd::string_view szRelativePath);
|
|
|
|
|
|
ZipDir::CachePtr m_pCache;
|
|
// the binding root may be empty string - in this case, the absolute path binding won't work
|
|
AZ::IO::Path m_strBindRoot;
|
|
IArchive* m_archive{};
|
|
uint32_t m_nFlags{};
|
|
};
|
|
|
|
}
|