447832dd81
* Updated the GameApplication to mount the engine.pak This allows loading the autoexec.cfg and bootstrap.game.<config>.<platform>.setreg from the engine.pak files The engine.pak is searched for in the following order: <ExecutableDirectory>/engine.pak, followed by <ProjectCacheRoot>/engine.pak Removed a lot of unused APIs from the AZ::IO::Archive feature suite Updated many of the AZ::IO::Archive classes to use AZ::IO::Path internally. The logic to search for files within an Archive has been updated to use AZ::IO::Path and to remove case-insensitve string comparisons Somehow removed the CryFile dependency on anything Cry Updated the Settings Registry to support reading from the FileIOBase and therefore Archive files in the GameLauncher via the `SetUseFileIO` function Removed AzFramework Dependency on md5 3rdParty library Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Linux build fix Added an include of <stdio.h> before the <rapidxml/rapidxml.h> include as it usesnprintf. Added `static` to the constexpr constants in ExtractFileDescription in SettingsRegistryImpl.cpp to fix clang compile issue Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the case used to mount the Engine PAK file in the GameApplication to be Engine.pak to match the other locations where it is mounted Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the proper FFont call to FileIOBase::Size to supply the correct integer type of AZ::u64 instead of size_t This fixes building on platforms where size_t is type defined to be unsigned long Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed segmentation fault in Archive::Unregister when outputing the filename of the Archive file being closed Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix calls to OpenPack in the Legacy LevelSystem The LevelSystem was calling the incorrect overload of OpenPack that accepts BindRoot for the mounted level.pak instead of the overload that that passes a memory block object. This was causing the level pak files to be mounted using an invalid directory, causing file accesses inside the level pak to fail. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the error messages in the ZipDir CacheFactory class to use AZ_Warning directly Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the ArchiveFileIO m_trackedFiles container to store mapped type as an AZ::IO::Path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
111 lines
3.3 KiB
C++
111 lines
3.3 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
|
|
*
|
|
*/
|
|
|
|
|
|
// Declaration of the class that can be used to search for the entries
|
|
// in a zip dir cache
|
|
|
|
#pragma once
|
|
|
|
#include <AzCore/std/string/fixed_string.h>
|
|
#include <AzFramework/Archive/ZipDirTree.h>
|
|
|
|
namespace AZ::IO::ZipDir
|
|
{
|
|
class FileEntryTree;
|
|
// create this structure and loop:
|
|
// FindData fd (pZip);
|
|
// for (fd.FindFirst("*.cgf"); fd.GetFileEntry(); fd.FindNext())
|
|
// {} // inside the loop, use GetFileEntry() and GetFileName() to get the file entry and name records
|
|
class FindData
|
|
{
|
|
public:
|
|
|
|
FindData(FileEntryTree* pRoot)
|
|
: m_pRoot(pRoot)
|
|
{
|
|
}
|
|
|
|
// returns the directory to which the current object belongs
|
|
FileEntryTree* GetParentDir() {return m_pDirHeader; }
|
|
protected:
|
|
// initializes everything until the point where the file must be searched for
|
|
// after this call returns successfully (with true returned), the m_szWildcard
|
|
// contains the file name/wildcard and m_pDirHeader contains the directory where
|
|
// the file (s) are to be found
|
|
bool PreFind(AZ::IO::PathView szWildcard);
|
|
|
|
// matches the file wildcard in the m_szWildcard to the given file/dir name
|
|
bool MatchWildcard(AZ::IO::PathView szName);
|
|
|
|
// the directory inside which the current object (file or directory) is being searched
|
|
FileEntryTree* m_pDirHeader{};
|
|
|
|
FileEntryTree* m_pRoot{}; // the root of the zip file in which to search
|
|
|
|
// the actual wildcard being used in the current scan - the file name wildcard only!
|
|
AZ::IO::FixedMaxPath m_szWildcard;
|
|
};
|
|
|
|
class FindFile
|
|
: public FindData
|
|
{
|
|
public:
|
|
FindFile(CachePtr pCache)
|
|
: FindData(pCache->GetRoot())
|
|
{
|
|
}
|
|
FindFile(FileEntryTree* pRoot)
|
|
: FindData(pRoot)
|
|
{
|
|
}
|
|
// if bExactFile is passed, only the file is searched, and besides with the exact name as passed (no wildcards)
|
|
bool FindFirst(AZ::IO::PathView szWildcard);
|
|
|
|
FileEntry* FindExact(AZ::IO::PathView szPath);
|
|
|
|
// goes on to the next file entry
|
|
bool FindNext();
|
|
|
|
FileEntry* GetFileEntry();
|
|
AZStd::string_view GetFileName();
|
|
|
|
protected:
|
|
bool SkipNonMatchingFiles();
|
|
FileEntryTree::FileMap::iterator m_itFile; // the current file iterator inside the parent directory
|
|
};
|
|
|
|
class FindDir
|
|
: public FindData
|
|
{
|
|
public:
|
|
FindDir(CachePtr pCache)
|
|
: FindData(pCache->GetRoot())
|
|
{
|
|
}
|
|
FindDir(FileEntryTree* pRoot)
|
|
: FindData(pRoot)
|
|
{
|
|
}
|
|
// if bExactFile is passed, only the file is searched, and besides with the exact name as passed (no wildcards)
|
|
bool FindFirst(AZ::IO::PathView szWildcard);
|
|
|
|
FileEntryTree* FindExact(AZ::IO::PathView szPath);
|
|
|
|
// goes on to the next file entry
|
|
bool FindNext();
|
|
|
|
FileEntryTree* GetDirEntry();
|
|
AZStd::string_view GetDirName();
|
|
|
|
protected:
|
|
bool SkipNonMatchingDirs();
|
|
FileEntryTree::SubdirMap::iterator m_itDir; // the current sub-directory iterator
|
|
};
|
|
}
|