fix: extractZipFile is not part of Client but more generic.

This solve a crash from mainmenu while extracting the zip

2 files changed, 0 insertions, 68 deletions

diff --git a/src/client/client.cpp b/src/client/client.cpp
index c0da27e44..00ae8f6b8 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -725,72 +725,6 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
 	return false;
 }
 
-bool Client::extractZipFile(const char *filename, const std::string &destination)
-{
-	auto fs = m_rendering_engine->get_filesystem();
-
-	if (!fs->addFileArchive(filename, false, false, io::EFAT_ZIP)) {
-		return false;
-	}
-
-	sanity_check(fs->getFileArchiveCount() > 0);
-
-	/**********************************************************************/
-	/* WARNING this is not threadsafe!!                                   */
-	/**********************************************************************/
-	io::IFileArchive* opened_zip = fs->getFileArchive(fs->getFileArchiveCount() - 1);
-
-	const io::IFileList* files_in_zip = opened_zip->getFileList();
-
-	unsigned int number_of_files = files_in_zip->getFileCount();
-
-	for (unsigned int i=0; i < number_of_files; i++) {
-		std::string fullpath = destination;
-		fullpath += DIR_DELIM;
-		fullpath += files_in_zip->getFullFileName(i).c_str();
-		std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
-
-		if (!files_in_zip->isDirectory(i)) {
-			if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
-				fs->removeFileArchive(fs->getFileArchiveCount()-1);
-				return false;
-			}
-
-			io::IReadFile* toread = opened_zip->createAndOpenFile(i);
-
-			FILE *targetfile = fopen(fullpath.c_str(),"wb");
-
-			if (targetfile == NULL) {
-				fs->removeFileArchive(fs->getFileArchiveCount()-1);
-				return false;
-			}
-
-			char read_buffer[1024];
-			long total_read = 0;
-
-			while (total_read < toread->getSize()) {
-
-				unsigned int bytes_read =
-						toread->read(read_buffer,sizeof(read_buffer));
-				if ((bytes_read == 0 ) ||
-					(fwrite(read_buffer, 1, bytes_read, targetfile) != bytes_read))
-				{
-					fclose(targetfile);
-					fs->removeFileArchive(fs->getFileArchiveCount() - 1);
-					return false;
-				}
-				total_read += bytes_read;
-			}
-
-			fclose(targetfile);
-		}
-
-	}
-
-	fs->removeFileArchive(fs->getFileArchiveCount() - 1);
-	return true;
-}
-
 // Virtual methods from con::PeerHandler
 void Client::peerAdded(con::Peer *peer)
 {
diff --git a/src/client/client.h b/src/client/client.h
index c9a72b1b3..85ca24049 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -384,8 +384,6 @@ public:
 	bool loadMedia(const std::string &data, const std::string &filename,
 		bool from_media_push = false);
 
-	bool extractZipFile(const char *filename, const std::string &destination);
-
 	// Send a request for conventional media transfer
 	void request_media(const std::vector<std::string> &file_requests);