Removed old code

Author: Przemog1

src/nbl/system/CArchiveLoaderZip.cpp

@@ -386,254 +386,6 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core:
 		return createArchiveFromZIP(std::move(file), password);
 	}
 }
-#if 0
-core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core::smart_refctd_ptr<system::IFile>&& file, const std::string_view& password) const
-{
-	if (!file)
-		return nullptr;
-
-	uint16_t sig;
-	{
-		IFile::success_t success;
-		file->read(success,&sig,0,sizeof(sig));
-		if (!success)
-			return nullptr;
-	}
-
-	std::shared_ptr<core::vector<IFileArchive::SFileList::SEntry>> items = std::make_shared<core::vector<IFileArchive::SFileList::SEntry>>();
-	core::vector<SZIPFileHeader> itemsMetadata;
-	// load file entries
-	{
-		const bool isGZip = sig==0x8b1fu;
-
-		//
-		auto addItem = [&items,&itemsMetadata](const std::string& _path, const size_t offset, const SZIPFileHeader& meta) -> void
-		{
-			// we need to have a filename or we skip
-			if (_path.empty())
-				return;
-
-			auto& item = items->emplace_back();
-			item.pathRelativeToArchive = _path;
-			item.size = meta.DataDescriptor.UncompressedSize;
-			item.offset = offset;
-			item.ID = itemsMetadata.size();
-			item.allocatorType = meta.CompressionMethod ? IFileArchive::EAT_VIRTUAL_ALLOC:IFileArchive::EAT_NULL;
-			itemsMetadata.push_back(meta);
-		};
-
-		//
-		size_t offset = 0ull;
-		auto readStringFromFile = [&file,&offset](auto charCallback) -> bool
-		{
-			char c = 0x45; // make sure we start with non-zero char
-			while (c)
-			{
-				IFile::success_t success;
-				file->read(success,&c,offset,sizeof(c));
-				if (!success)
-					return false;
-				offset += success.getBytesToProcess();
-				charCallback(c);
-			}
-			// if string is not null terminated, something went wrong reading the file
-			return !c;
-		};
-		
-		//
-		std::string filename;
-		filename.reserve(ISystem::MAX_FILENAME_LENGTH);
-		if (isGZip)
-		{
-			SGZIPMemberHeader gzipHeader;
-			{
-				IFile::success_t success;
-				file->read(success,&gzipHeader,0ull,sizeof(gzipHeader));
-				if (!success)
-					return nullptr;
-				offset += success.getBytesToProcess();
-			}
-
-			//! The gzip file format seems to think that there can be multiple files in a gzip file
-			//! TODO: But OLD Irrlicht Impl doesn't honor it!?
-			if (gzipHeader.sig!=0x8b1fu)
-				return nullptr;
-			
-			// now get the file info
-			if (gzipHeader.flags&EGZF_EXTRA_FIELDS)
-			{
-				// read lenth of extra data
-				uint16_t dataLen;
-				IFile::success_t success;
-				file->read(success,&dataLen,offset,sizeof(dataLen));
-				if (!success)
-					return nullptr;
-				offset += success.getBytesToProcess();
-				// skip the extra data
-				offset += dataLen;
-			}
-			//
-			if (gzipHeader.flags&EGZF_FILE_NAME)
-			{
-				filename.clear();
-				if (!readStringFromFile([&](const char c){filename.push_back(c);}))
-					return nullptr;
-			}
-			//
-			if (gzipHeader.flags&EGZF_COMMENT)
-			{
-				if (!readStringFromFile([](const char c){}))
-					return nullptr;
-			}
-			// skip crc16
-			if (gzipHeader.flags&EGZF_CRC16)
-				offset += 2;
-
-
-			SZIPFileHeader header;
-			memset(&header,0,sizeof(SZIPFileHeader));
-			header.FilenameLength = filename.length();
-			header.CompressionMethod = gzipHeader.compressionMethod;
-			header.DataDescriptor.CompressedSize = file->getSize()-(offset+sizeof(uint64_t));
-
-			const size_t itemOffset = offset;
-			
-			offset += header.DataDescriptor.CompressedSize;
-			// read CRC
-			{
-				IFile::success_t success;
-				file->read(success,&header.DataDescriptor.CRC32,offset,sizeof(header.DataDescriptor.CRC32));
-				if (!success)
-					return nullptr;
-				offset += success.getBytesToProcess();
-			}
-			// read uncompressed size
-			{
-				IFile::success_t success;
-				file->read(success,&header.DataDescriptor.UncompressedSize,offset,sizeof(header.DataDescriptor.UncompressedSize));
-				if (!success)
-					return nullptr;
-				offset += success.getBytesToProcess();
-			}
-
-			//
-			addItem(filename,itemOffset,header);
-		}
-		else
-		{
-			while (true)
-			{
-				SZIPFileHeader zipHeader;
-				{
-					IFile::success_t success;
-					file->read(success,&zipHeader,offset,sizeof(zipHeader));
-					if (!success)
-						break;
-					offset += success.getBytesToProcess();
-				}
-
-				if (zipHeader.Sig!=0x04034b50u)
-					break;
-
-				filename.resize(zipHeader.FilenameLength);
-				{
-					IFile::success_t success;
-					file->read(success,filename.data(),offset,zipHeader.FilenameLength);
-					if (!success)
-						break;
-					offset += success.getBytesToProcess();
-				}
-
-				// AES encryption
-				if ((zipHeader.GeneralBitFlag&ZIP_FILE_ENCRYPTED) && (zipHeader.CompressionMethod==99))
-				{
-					SZipFileExtraHeader extraHeader;
-					SZipFileAESExtraData data;
-
-					size_t localOffset = offset;
-					offset += zipHeader.ExtraFieldLength;
-					while (true)
-					{
-						{
-							IFile::success_t success;
-							file->read(success,&extraHeader,localOffset,sizeof(extraHeader));
-							if (!success)
-								break;
-							localOffset += success.getBytesToProcess();
-							if (localOffset>offset)
-								break;
-						}
-
-						if (extraHeader.ID!=0x9901u)
-							continue;
-
-						{
-							IFile::success_t success;
-							file->read(success,&data,localOffset,sizeof(data));
-							if (!success)
-								break;
-							localOffset += success.getBytesToProcess();
-							if (localOffset>offset)
-								break;
-						}
-						if (data.Vendor[0]=='A' && data.Vendor[1]=='E')
-						{
-							#ifdef _NBL_COMPILE_WITH_ZIP_ENCRYPTION_
-							// encode values into Sig
-							// AE-Version | Strength | ActualMode
-							zipHeader.Sig =
-								((data.Version & 0xff) << 24) |
-								(data.EncryptionStrength << 16) |
-								(data.CompressionMode);
-							break;
-							#else
-							filename.clear(); // no support, can't decrypt
-							#endif
-						}
-					}
-				}
-				else
-					offset += zipHeader.ExtraFieldLength;
-
-				// if bit 3 was set, use CentralDirectory for setup
-				if (zipHeader.GeneralBitFlag&ZIP_INFO_IN_DATA_DESCRIPTOR)
-				{
-					SZIPFileCentralDirEnd dirEnd;
-					dirEnd.Sig = 0u;
-
-					// First place where the end record could be stored
-					offset = file->getSize()-sizeof(SZIPFileCentralDirEnd)+1ull;
-					while (dirEnd.Sig!=SZIPFileCentralDirEnd::ExpectedSig)
-					{
-						IFile::success_t success;
-						file->read(success,&dirEnd,--offset,sizeof(dirEnd));
-						if (!success)
-							return nullptr;
-					}
-					items->reserve(dirEnd.TotalEntries);
-					itemsMetadata.reserve(dirEnd.TotalEntries);
-					offset = dirEnd.Offset;
-					#if 0
-					while (scanCentralDirectoryHeader(offset)) {}
-					#endif
-					assert(false); // if you ever hit this, msg @devsh
-					break;
-				}
-			
-				addItem(filename,offset,zipHeader);
-				// move forward length of data
-				offset += zipHeader.DataDescriptor.CompressedSize;
-			}
-		}
-	}
-
-	assert(items->size()==itemsMetadata.size());
-	if (items->empty())
-		return nullptr;
-
-	return core::make_smart_refctd_ptr<CArchive>(std::move(file),core::smart_refctd_ptr(m_logger.get()), items, std::move(itemsMetadata));
-}
-#endif
 
 CFileArchive::file_buffer_t CArchiveLoaderZip::CArchive::getFileBuffer(const IFileArchive::SFileList::found_t& item)
 {