ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link it up to onOpenFile()

This commit is contained in:
U-RAYYAN-PC\Rayyan 2020-07-22 15:15:56 +01:00
parent 0009a3ffd1
commit 96e0e37156
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontend/qt_sdl/main.cpp
View File

@ -1403,15 +1403,6 @@ QString MainWindow::loadErrorStr(int error)
} }
} }
std::string getFileExt(const std::string& s) {
size_t i = s.rfind('.', s.length());
if (i != std::string::npos) {
return(s.substr(i+1, s.length() - i));
}
return("");
}
std::string extractROM(char* zipName, std::string zipDir){ std::string extractROM(char* zipName, std::string zipDir){
//Open the ZIP archive //Open the ZIP archive
int err = 0; int err = 0;
@ -1432,10 +1423,8 @@ std::string extractROM(char* zipName, std::string zipDir){
zip_close(z); zip_close(z);
//Write the file (binary mode) //Write the file (binary mode)
if(!std::ofstream(zipDir + "/" + st.name, std::ofstream::binary).write(contents, st.size)) std::ofstream(zipDir + "/" + st.name, std::ofstream::binary).write(contents, st.size);
{
std::cerr << "Error writing file" << '\n';
}
return zipDir + "/" + st.name; return zipDir + "/" + st.name;
} }
@ -1443,10 +1432,22 @@ void MainWindow::onOpenFile()
{ {
emuThread->emuPause(); emuThread->emuPause();
bool romExtracted = false; //No use yet but may be useful later
QString filename = QFileDialog::getOpenFileName(this, QString filename = QFileDialog::getOpenFileName(this,
"Open ROM", "Open ROM",
Config::LastROMFolder, Config::LastROMFolder,
"DS ROMs (*.nds *.dsi *.srl);;GBA ROMs (*.gba);;Any file (*.*)"); "DS ROMs (*.nds *.dsi *.srl *.zip);;GBA ROMs (*.gba *.zip);;Any file (*.*)");
QFileInfo filenameExtLoc = filename;
if (filenameExtLoc.completeSuffix().toUtf8() == "zip")
{
printf("Extracting ROM from ZIP...\n");
std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data());
printf("Done.\n");
filename = QString::fromUtf8(extractRomLoc.c_str());
romExtracted = true;
}
if (filename.isEmpty()) if (filename.isEmpty())
{ {
emuThread->emuUnpause(); emuThread->emuUnpause();