VOXELCOLLECTION: fixed issue #568

the same file could come from several different archives and would have been overwritten each time - but also opened a few times
vengi-voxel · Jan 10, 2025 · f36020e · f36020e
1 parent 8be626c
commit f36020e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/modules/voxelcollection/Downloader.cpp b/src/modules/voxelcollection/Downloader.cpp
@@ -169,7 +169,7 @@ bool Downloader::handleArchive(const io::ArchivePtr &archive, const VoxelFile &a
 		subFile.license = archiveFile.license;
 		subFile.licenseUrl = archiveFile.licenseUrl;
 		subFile.thumbnailUrl = archiveFile.thumbnailUrl;
-		subFile.fullPath = core::string::path(core::string::extractDir(archiveFile.fullPath), f.fullPath);
+		subFile.fullPath = core::string::path(core::string::extractDir(archiveFile.fullPath), core::string::extractFilename(archiveFile.fullPath), f.fullPath);
 		subFile.downloaded = true;
 
 		if (supportedFileExtension(subFile.name)) {
@@ -184,7 +184,6 @@ bool Downloader::handleArchive(const io::ArchivePtr &archive, const VoxelFile &a
 						   archiveFile.fullPath.c_str());
 				continue;
 			}
-			// TODO: remove this as we might have clashes here with existing files
 			if (archive->write(subFile.targetFile(), *rs)) {
 				files.push_back(subFile);
 			} else {
@@ -199,7 +198,6 @@ bool Downloader::handleArchive(const io::ArchivePtr &archive, const VoxelFile &a
 						   archiveFile.fullPath.c_str());
 				continue;
 			}
-			// TODO: remove this as we might have clashes here with existing files
 			if (archive->write(subFile.targetFile(), *rs)) {
 				handleArchive(archive, subFile, files, shouldQuit);
 			} else {