yanczi/VoidArchive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Działa pakowanie zgodne z plikiem konfiguracyjnym

Browse source
This commit is contained in:
yanczi 2025-11-12 07:38:48 +01:00
parent 621b4b6eb7
commit 00d4b00209
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
CreateCargo.cpp
View file

@ -43,8 +43,6 @@ bool CreateCargo::Create(const std::string& path, const int16_t& flag)
catalogPath = path; catalogPath = path;
methodFlags = flag; methodFlags = flag;
std::cout << "#1 FLAG: " << flag << " - " << methodFlags << std::endl;
//Sprawdzanie pakowanego kontentu //Sprawdzanie pakowanego kontentu
if (!std::filesystem::is_directory(path)) if (!std::filesystem::is_directory(path))
{ {
@ -102,11 +100,6 @@ bool CreateCargo::Create(const std::string& path, const int16_t& flag)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CreateCargo::GetFileList(const std::string& path) bool CreateCargo::GetFileList(const std::string& path)
{ {
for (const auto& el : encList)
{
std::cout << el << std::endl;
}
for (const auto& entry : std::filesystem::directory_iterator(path)) for (const auto& entry : std::filesystem::directory_iterator(path))
{ {
std::string tmpPath = entry.path().string(); std::string tmpPath = entry.path().string();
@ -119,29 +112,27 @@ bool CreateCargo::GetFileList(const std::string& path)
std::string fileRef = RemoveStartPath(PathToUnixLike(tmpPath)); std::string fileRef = RemoveStartPath(PathToUnixLike(tmpPath));
if (CheckIgnorePath(tmpPath)) if (CheckIgnorePath(tmpPath))
{ {
std::cout << "FLAG: " << methodFlags << std::endl;
PathConf pc; PathConf pc;
if (methodFlags > -1) if (methodFlags > -1)
{ {
std::cout << "NO FLAG" << std::endl;
pc.path = PathToUnixLike(tmpPath); pc.path = PathToUnixLike(tmpPath);
pc.parameter = methodFlags; pc.parameter = methodFlags;
filesPaths.push_back(pc); filesPaths.push_back(pc);
} }
else else
{ {
if (!FindOnTheList(ignoreList, fileRef)) if (!FindOnTheList(ignoreList, fileRef) || !CheckFileExtension(fileRef, ignoreList))
{ {
if (FindOnTheList(zipList, fileRef)) if (FindOnTheList(zipList, fileRef) || CheckFileExtension(fileRef, zipList))
{ {
pc.parameter = FindOnTheList(encList, fileRef) ? 3 : 1; pc.parameter = FindOnTheList(encList, fileRef) || CheckFileExtension(fileRef, encList) ? 3 : 1;
} }
else else
{ {
pc.parameter = FindOnTheList(encList, fileRef) ? 2 : 0; pc.parameter = FindOnTheList(encList, fileRef) || CheckFileExtension(fileRef, encList) ? 2 : 0;
} }
pc.path = PathToUnixLike(tmpPath); pc.path = PathToUnixLike(tmpPath);
std::cout << pc.parameter << std::endl; std::cout << pc.path << " - " << pc.parameter << std::endl;
filesPaths.push_back(pc); filesPaths.push_back(pc);
} }
} }
@ -333,10 +324,20 @@ void CreateCargo::ExtPatternAndPathDetection(const std::vector<std::string>& dat
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Sprawdzanie rozsze¿eñ plików // Sprawdzanie rozsze¿eñ plików
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CreateCargo::CheckFileExtension(const std::filesystem::path& p, const std::vector<std::string>& patterns) { bool CreateCargo::CheckFileExtension(const std::string& p, const std::vector<std::string>& patterns) {
std::string ext = UpperString(p.extension().string()); std::filesystem::path _p = p;
std::string ext = "*" + UpperString(_p.extension().string());
return FindOnTheList(patterns, ext); for (const auto& e : patterns)
{
std::string element = UpperString(e);
if (element == ext)
{
return true;
}
}
return false;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
CreateCargo.h
View file

@ -120,7 +120,7 @@ private:
bool CheckIgnorePath(const std::string&); bool CheckIgnorePath(const std::string&);
// Sprawdzanie rozsze¿eñ plików // Sprawdzanie rozsze¿eñ plików
bool CheckFileExtension(const std::filesystem::path&, const std::vector<std::string>&); bool CheckFileExtension(const std::string&, const std::vector<std::string>&);
// Zamieñ ca³y ci¹g na du¿e litery // Zamieñ ca³y ci¹g na du¿e litery
std::string UpperString(std::string); std::string UpperString(std::string);