// --- ---------- -------------------------------------------------------------
// JLH 01/28/2010 Created this file
// JLH 02/16/2010 Moved RomIdentifier stuff to its own file
+// JLH 03/02/2010 Added .ZIP file fishing
//
#include "filethread.h"
#include <QtGui>
#include "crc32.h"
+#include "file.h"
#include "filedb.h"
#include "settings.h"
#endif
QFileInfo fileInfo = list.at(i);
- QFile file(romDir.filePath(fileInfo.fileName()));
- uint8 * buffer = new uint8[fileInfo.size()];
- if (file.open(QIODevice::ReadOnly))
+ // ZIP files are special: They contain more than just the software now... ;-)
+ // So now we fish around inside them to pull out the stuff we want.
+ // Probably also need more stringent error checking as well... :-O
+ if (fileInfo.suffix().compare("zip", Qt::CaseInsensitive) == 0)
{
- file.read((char *)buffer, fileInfo.size());
- uint32 crc = crc32_calcCheckSum(buffer, fileInfo.size());
- file.close();
+ uint8 * buffer = NULL;
+ uint32 size = GetFileFromZIP(fileInfo.canonicalFilePath().toAscii(), FT_SOFTWARE, buffer);
- uint32 index = FindCRCIndexInFileList(crc);
+ if (size > 0)
+ {
+//printf("FileThread: About to calc checksum on file with size %u... (buffer=%08X)\n", size, buffer);
+ uint32 crc = crc32_calcCheckSum(buffer, size);
+ uint32 index = FindCRCIndexInFileList(crc);
+ delete[] buffer;
// Mebbe we should pass a index AND a QImage here???
- if (index != 0xFFFFFFFF && !(romList[index].flags & FF_BIOS))
- emit FoundAFile(index);
+/*
+Let's think about this... What *do* we need to send out?
+we need the filename for sure. image file if it exists.
+do we need the index? I think we're only using it to pull the label from the subdir...
+we might need it if we want to pull ROM flags from the fileDB...
+*/
+ if (index != 0xFFFFFFFF && !(romList[index].flags & FF_BIOS))
+ {
+ QImage img;
+ size = GetFileFromZIP(fileInfo.canonicalFilePath().toAscii(), FT_LABEL, buffer);
+
+ if (size > 0)
+ {
+ img.loadFromData(buffer, size);
+ delete[] buffer;
+ }
+//printf("FileThread: Attempted to load image. Size: %u x %u...\n", img.width(), img.height());
+
+// emit FoundAFile(index);
+ emit FoundAFile2(index, fileInfo.canonicalFilePath(), &img);
+ }
+ }
}
+ else
+ {
+ QFile file(romDir.filePath(fileInfo.fileName()));
- delete[] buffer;
+ if (file.open(QIODevice::ReadOnly))
+ {
+ uint8 * buffer = new uint8[fileInfo.size()];
+ file.read((char *)buffer, fileInfo.size());
+ file.close();
+ uint32 crc = crc32_calcCheckSum(buffer, fileInfo.size());
+ uint32 index = FindCRCIndexInFileList(crc);
+ delete[] buffer;
+
+// Mebbe we should pass a index AND a QImage here???
+ if (index != 0xFFFFFFFF && !(romList[index].flags & FF_BIOS))
+// emit FoundAFile(index);
+ emit FoundAFile2(index, fileInfo.canonicalFilePath(), 0);
+ }
+ }
}
}