The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 13:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved file formatting

Browse Source
This commit is contained in:
wiidev 2020-04-12 20:25:10 +01:00
parent a85d33ffd7
commit 4d6f75112b
1 changed files with 103 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
source/menu/menu_download.cpp
View File

@ -82,52 +82,52 @@ void CMenu::_showSettings()
m_btnMgr.show(m_downloadLblPrio); m_btnMgr.show(m_downloadLblPrio);
m_btnMgr.show(m_downloadBtnPrioM); m_btnMgr.show(m_downloadBtnPrioM);
m_btnMgr.show(m_downloadBtnPrioP); m_btnMgr.show(m_downloadBtnPrioP);
m_btnMgr.show(m_downloadLblRegion); m_btnMgr.show(m_downloadLblRegion);
if( m_downloadPrioVal&C_TYPE_EN ) if( m_downloadPrioVal&C_TYPE_EN )
m_btnMgr.show(m_downloadBtnENs); m_btnMgr.show(m_downloadBtnENs);
else else
m_btnMgr.show(m_downloadBtnEN); m_btnMgr.show(m_downloadBtnEN);
if( m_downloadPrioVal&C_TYPE_JA ) if( m_downloadPrioVal&C_TYPE_JA )
m_btnMgr.show(m_downloadBtnJAs); m_btnMgr.show(m_downloadBtnJAs);
else else
m_btnMgr.show(m_downloadBtnJA); m_btnMgr.show(m_downloadBtnJA);
if( m_downloadPrioVal&C_TYPE_FR ) if( m_downloadPrioVal&C_TYPE_FR )
m_btnMgr.show(m_downloadBtnFRs); m_btnMgr.show(m_downloadBtnFRs);
else else
m_btnMgr.show(m_downloadBtnFR); m_btnMgr.show(m_downloadBtnFR);
if( m_downloadPrioVal&C_TYPE_DE ) if( m_downloadPrioVal&C_TYPE_DE )
m_btnMgr.show(m_downloadBtnDEs); m_btnMgr.show(m_downloadBtnDEs);
else else
m_btnMgr.show(m_downloadBtnDE); m_btnMgr.show(m_downloadBtnDE);
if( m_downloadPrioVal&C_TYPE_ES ) if( m_downloadPrioVal&C_TYPE_ES )
m_btnMgr.show(m_downloadBtnESs); m_btnMgr.show(m_downloadBtnESs);
else else
m_btnMgr.show(m_downloadBtnES); m_btnMgr.show(m_downloadBtnES);
if( m_downloadPrioVal&C_TYPE_IT ) if( m_downloadPrioVal&C_TYPE_IT )
m_btnMgr.show(m_downloadBtnITs); m_btnMgr.show(m_downloadBtnITs);
else else
m_btnMgr.show(m_downloadBtnIT); m_btnMgr.show(m_downloadBtnIT);
if( m_downloadPrioVal&C_TYPE_NL ) if( m_downloadPrioVal&C_TYPE_NL )
m_btnMgr.show(m_downloadBtnNLs); m_btnMgr.show(m_downloadBtnNLs);
else else
m_btnMgr.show(m_downloadBtnNL); m_btnMgr.show(m_downloadBtnNL);
if( m_downloadPrioVal&C_TYPE_PT ) if( m_downloadPrioVal&C_TYPE_PT )
m_btnMgr.show(m_downloadBtnPTs); m_btnMgr.show(m_downloadBtnPTs);
else else
m_btnMgr.show(m_downloadBtnPT); m_btnMgr.show(m_downloadBtnPT);
if( m_downloadPrioVal&C_TYPE_RU ) if( m_downloadPrioVal&C_TYPE_RU )
m_btnMgr.show(m_downloadBtnRUs); m_btnMgr.show(m_downloadBtnRUs);
else else
m_btnMgr.show(m_downloadBtnRU); m_btnMgr.show(m_downloadBtnRU);
if( m_downloadPrioVal&C_TYPE_KO ) if( m_downloadPrioVal&C_TYPE_KO )
m_btnMgr.show(m_downloadBtnKOs); m_btnMgr.show(m_downloadBtnKOs);
else else
@ -137,16 +137,16 @@ void CMenu::_showSettings()
m_btnMgr.show(m_downloadBtnZHCNs); m_btnMgr.show(m_downloadBtnZHCNs);
else else
m_btnMgr.show(m_downloadBtnZHCN); m_btnMgr.show(m_downloadBtnZHCN);
if( m_downloadPrioVal&C_TYPE_AU ) if( m_downloadPrioVal&C_TYPE_AU )
m_btnMgr.show(m_downloadBtnAUs); m_btnMgr.show(m_downloadBtnAUs);
else else
m_btnMgr.show(m_downloadBtnAU); m_btnMgr.show(m_downloadBtnAU);
// //
if( m_downloadPrioVal&C_TYPE_ONOR ) if( m_downloadPrioVal&C_TYPE_ONOR )
{ {
m_btnMgr.setText(m_downloadLblPrio, _t("dl24", L"Custom only")); m_btnMgr.setText(m_downloadLblPrio, _t("dl24", L"Custom only"));
} }
else else
{ {
@ -158,7 +158,7 @@ void CMenu::_showSettings()
{ {
m_btnMgr.setText(m_downloadLblPrio, _t("dl23", L"Custom/Custom")); m_btnMgr.setText(m_downloadLblPrio, _t("dl23", L"Custom/Custom"));
} }
else else
{ {
m_btnMgr.setText(m_downloadLblPrio, _t("dl22", L"Custom/Original")); m_btnMgr.setText(m_downloadLblPrio, _t("dl22", L"Custom/Original"));
} }
@ -221,7 +221,7 @@ void CMenu::_showDownload(void)
m_btnMgr.show(m_downloadBtnBanners); m_btnMgr.show(m_downloadBtnBanners);
for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i)
if(m_downloadLblUser[i] != -1) if(m_downloadLblUser[i] != -1)
m_btnMgr.show(m_downloadLblUser[i]); m_btnMgr.show(m_downloadLblUser[i]);
} }
int count, countFlat; int count, countFlat;
@ -265,8 +265,8 @@ void CMenu::_download(string gameId, int dl_type)
{ {
if(m_btnMgr.selected(m_downloadBtnAll) || dl_type == 1) if(m_btnMgr.selected(m_downloadBtnAll) || dl_type == 1)
{ {
m_refreshGameList = true;// not needed instead just initcf() m_refreshGameList = true; // Not needed instead just initcf()
m_btnMgr.hide(m_downloadLblCovers); m_btnMgr.hide(m_downloadLblCovers);
m_btnMgr.hide(m_downloadBtnAll); m_btnMgr.hide(m_downloadBtnAll);
m_btnMgr.hide(m_downloadLblGameTDBDownload); m_btnMgr.hide(m_downloadLblGameTDBDownload);
@ -276,14 +276,14 @@ void CMenu::_download(string gameId, int dl_type)
m_btnMgr.hide(m_downloadLblBanners); m_btnMgr.hide(m_downloadLblBanners);
m_btnMgr.hide(m_downloadBtnBanners); m_btnMgr.hide(m_downloadBtnBanners);
m_btnMgr.hide(m_downloadBtnBack); m_btnMgr.hide(m_downloadBtnBack);
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_wbfsPBar, 0.f, true);
m_btnMgr.setText(m_wbfsLblMessage, L"0%"); m_btnMgr.setText(m_wbfsLblMessage, L"0%");
m_btnMgr.setText(m_wbfsLblDialog, L""); m_btnMgr.setText(m_wbfsLblDialog, L"");
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_wbfsPBar);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_wbfsLblMessage);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_wbfsLblDialog);
_start_pThread(); _start_pThread();
int ret = _coverDownloader(); int ret = _coverDownloader();
_stop_pThread(); _stop_pThread();
@ -308,13 +308,13 @@ void CMenu::_download(string gameId, int dl_type)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg30", L"No covers missing.")); m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg30", L"No covers missing."));
dl_finished = true; dl_finished = true;
dl_type = 0; dl_type = 0;
//maybe show back button // Maybe show back button
//m_btnMgr.show(m_downloadBtnBack); //m_btnMgr.show(m_downloadBtnBack);
} }
if(m_btnMgr.selected(m_downloadBtnBanners) || dl_type == 2) if(m_btnMgr.selected(m_downloadBtnBanners) || dl_type == 2)
{ {
//m_refreshGameList = true; //m_refreshGameList = true;
m_btnMgr.hide(m_downloadLblCovers); m_btnMgr.hide(m_downloadLblCovers);
m_btnMgr.hide(m_downloadBtnAll); m_btnMgr.hide(m_downloadBtnAll);
m_btnMgr.hide(m_downloadLblGameTDBDownload); m_btnMgr.hide(m_downloadLblGameTDBDownload);
@ -324,14 +324,14 @@ void CMenu::_download(string gameId, int dl_type)
m_btnMgr.hide(m_downloadLblBanners); m_btnMgr.hide(m_downloadLblBanners);
m_btnMgr.hide(m_downloadBtnBanners); m_btnMgr.hide(m_downloadBtnBanners);
m_btnMgr.hide(m_downloadBtnBack); m_btnMgr.hide(m_downloadBtnBack);
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_wbfsPBar, 0.f, true);
m_btnMgr.setText(m_wbfsLblMessage, L"0%"); m_btnMgr.setText(m_wbfsLblMessage, L"0%");
m_btnMgr.setText(m_wbfsLblDialog, L""); m_btnMgr.setText(m_wbfsLblDialog, L"");
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_wbfsPBar);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_wbfsLblMessage);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_wbfsLblDialog);
_start_pThread(); _start_pThread();
int ret = _bannerDownloader(); int ret = _bannerDownloader();
_stop_pThread(); _stop_pThread();
@ -346,19 +346,19 @@ void CMenu::_download(string gameId, int dl_type)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg14", L"Done.")); m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg14", L"Done."));
} }
else if(ret == -1) else if(ret == -1)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg34", L"Banner URL not set properly!"));//banner url not set m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg34", L"Banner URL not set properly!")); // Banner URL not set
else if(ret == -2) else if(ret == -2)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg2", L"Network initialization failed!")); m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg2", L"Network initialization failed!"));
else if(ret == -3) else if(ret == -3)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg33", L"No banners missing."));// no banners missing m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg33", L"No banners missing.")); // No banners missing
dl_finished = true; dl_finished = true;
dl_type = 0; dl_type = 0;
//maybe show back button // Maybe show back button
//m_btnMgr.show(m_downloadBtnBack); //m_btnMgr.show(m_downloadBtnBack);
} }
else if(m_btnMgr.selected(m_downloadBtnGameTDBDownload)) else if(m_btnMgr.selected(m_downloadBtnGameTDBDownload))
{ {
m_refreshGameList = true;// to refresh titles m_refreshGameList = true; // To refresh titles
m_btnMgr.hide(m_downloadLblCovers); m_btnMgr.hide(m_downloadLblCovers);
m_btnMgr.hide(m_downloadBtnAll); m_btnMgr.hide(m_downloadBtnAll);
m_btnMgr.hide(m_downloadBtnMissing); m_btnMgr.hide(m_downloadBtnMissing);
@ -369,14 +369,14 @@ void CMenu::_download(string gameId, int dl_type)
m_btnMgr.hide(m_downloadLblBanners); m_btnMgr.hide(m_downloadLblBanners);
m_btnMgr.hide(m_downloadBtnBanners); m_btnMgr.hide(m_downloadBtnBanners);
m_btnMgr.hide(m_downloadBtnBack); m_btnMgr.hide(m_downloadBtnBack);
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_wbfsPBar, 0.f, true);
m_btnMgr.setText(m_wbfsLblMessage, L"0%"); m_btnMgr.setText(m_wbfsLblMessage, L"0%");
m_btnMgr.setText(m_wbfsLblDialog, L""); m_btnMgr.setText(m_wbfsLblDialog, L"");
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_wbfsPBar);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_wbfsLblMessage);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_wbfsLblDialog);
_start_pThread(); _start_pThread();
int ret = _gametdbDownloaderAsync(); int ret = _gametdbDownloaderAsync();
_stop_pThread(); _stop_pThread();
@ -402,7 +402,7 @@ void CMenu::_download(string gameId, int dl_type)
else if(m_btnMgr.selected(m_downloadBtnCoverSet)) else if(m_btnMgr.selected(m_downloadBtnCoverSet))
{ {
settingsmenu = true; settingsmenu = true;
_showSettings(); _showSettings();
} }
else if(m_btnMgr.selected(m_downloadBtnBack)) else if(m_btnMgr.selected(m_downloadBtnBack))
{ {
@ -667,7 +667,7 @@ void CMenu::_initDownloadMenu()
_setHideAnim(m_downloadPBar, "DOWNLOAD/PROGRESS_BAR", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadPBar, "DOWNLOAD/PROGRESS_BAR", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnCancel, "DOWNLOAD/CANCEL_BTN", 0, 0, 1.f, -1.f); _setHideAnim(m_downloadBtnCancel, "DOWNLOAD/CANCEL_BTN", 0, 0, 1.f, -1.f);
// Cover settings // Cover settings
_setHideAnim(m_downloadLblSetTitle, "DOWNLOAD/SETTITLE", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadLblSetTitle, "DOWNLOAD/SETTITLE", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadLblCoverPrio, "DOWNLOAD/COVERPRIO", 50, 0, -2.f, 0.f); _setHideAnim(m_downloadLblCoverPrio, "DOWNLOAD/COVERPRIO", 50, 0, -2.f, 0.f);
_setHideAnim(m_downloadLblPrio, "DOWNLOAD/PRIO_BTN", -50, 0, 1.f, 0.f); _setHideAnim(m_downloadLblPrio, "DOWNLOAD/PRIO_BTN", -50, 0, 1.f, 0.f);
@ -712,15 +712,15 @@ void CMenu::_textDownload(void)
m_btnMgr.setText(m_downloadLblCovers, _t("dl8", L"Covers")); m_btnMgr.setText(m_downloadLblCovers, _t("dl8", L"Covers"));
m_btnMgr.setText(m_downloadBtnAll, _t("dl6", L"Download")); m_btnMgr.setText(m_downloadBtnAll, _t("dl6", L"Download"));
m_btnMgr.setText(m_downloadLblCoverSet, _t("dl15", L"Cover download settings")); m_btnMgr.setText(m_downloadLblCoverSet, _t("dl15", L"Cover download settings"));
m_btnMgr.setText(m_downloadBtnCoverSet, _t("dl16", L"Set")); m_btnMgr.setText(m_downloadBtnCoverSet, _t("dl16", L"Set"));
m_btnMgr.setText(m_downloadLblGameTDBDownload, _t("dl12", L"GameTDB")); m_btnMgr.setText(m_downloadLblGameTDBDownload, _t("dl12", L"GameTDB"));
m_btnMgr.setText(m_downloadBtnGameTDBDownload, _t("dl6", L"Download")); m_btnMgr.setText(m_downloadBtnGameTDBDownload, _t("dl6", L"Download"));
m_btnMgr.setText(m_downloadLblBanners, _t("dl26", L"GC Custom Banners")); m_btnMgr.setText(m_downloadLblBanners, _t("dl26", L"GC Custom Banners"));
m_btnMgr.setText(m_downloadBtnBanners, _t("dl6", L"Download")); m_btnMgr.setText(m_downloadBtnBanners, _t("dl6", L"Download"));
m_btnMgr.setText(m_downloadLblGameTDB, _t("dl10", L"Please donate\nto GameTDB.com")); m_btnMgr.setText(m_downloadLblGameTDB, _t("dl10", L"Please donate\nto GameTDB.com"));
m_btnMgr.setText(m_downloadBtnCancel, _t("dl1", L"Cancel")); m_btnMgr.setText(m_downloadBtnCancel, _t("dl1", L"Cancel"));
m_btnMgr.setText(m_downloadLblSetTitle, _t("dl17", L"Cover Download Settings")); m_btnMgr.setText(m_downloadLblSetTitle, _t("dl17", L"Cover Download Settings"));
m_btnMgr.setText(m_downloadLblCoverPrio, _t("dl13", L"Download order")); m_btnMgr.setText(m_downloadLblCoverPrio, _t("dl13", L"Download order"));
m_btnMgr.setText(m_downloadLblRegion, _t("dl14", L"Select regions to check for covers:")); m_btnMgr.setText(m_downloadLblRegion, _t("dl14", L"Select regions to check for covers:"));
@ -752,7 +752,7 @@ s32 CMenu::_networkComplete(s32 ok, void *usrData)
networkInit = ok == 0; networkInit = ok == 0;
m->m_thrdNetwork = false; m->m_thrdNetwork = false;
if(networkInit) if(networkInit)
wolfSSL_Init(); wolfSSL_Init();
@ -786,7 +786,7 @@ int CMenu::_initNetwork()
{ {
while(net_get_status() == -EBUSY && m_thrdNetwork == true) while(net_get_status() == -EBUSY && m_thrdNetwork == true)
{ {
usleep(100);// Async initialization may be busy, wait to see if it succeeds. usleep(100); // Async initialization may be busy, wait to see if it succeeds.
} }
if(networkInit) if(networkInit)
return 0; return 0;
@ -892,7 +892,7 @@ static string makeURL(const string format, const string gameId, const string cou
{ {
string url = format; string url = format;
if(url.find(TAG_LOC) != url.npos) if(url.find(TAG_LOC) != url.npos)
url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str()); url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str());
if(url.find(TAG_CONSOLE) != url.npos) if(url.find(TAG_CONSOLE) != url.npos)
url.replace(url.find(TAG_CONSOLE), strlen(TAG_CONSOLE), "wii"); url.replace(url.find(TAG_CONSOLE), strlen(TAG_CONSOLE), "wii");
@ -999,15 +999,15 @@ int CMenu::_coverDownloader()
c_gameTDB.OpenFile(fmt("%s/wiitdb.xml", m_settingsDir.c_str())); c_gameTDB.OpenFile(fmt("%s/wiitdb.xml", m_settingsDir.c_str()));
c_gameTDB.SetLanguageCode(m_curLanguage.c_str()); c_gameTDB.SetLanguageCode(m_curLanguage.c_str());
} }
vector<string> fmtURLBox = stringToVector(m_cfg.getString("GENERAL", "url_full_covers", FMT_BPIC_URL), '|'); vector<string> fmtURLBox = stringToVector(m_cfg.getString("GENERAL", "url_full_covers", FMT_BPIC_URL), '|');
vector<string> fmtURLFlat = stringToVector(m_cfg.getString("GENERAL", "url_flat_covers", FMT_PIC_URL), '|'); vector<string> fmtURLFlat = stringToVector(m_cfg.getString("GENERAL", "url_flat_covers", FMT_PIC_URL), '|');
vector<string> fmtURLCBox = stringToVector(m_cfg.getString("GENERAL", "url_custom_full_covers", FMT_CBPIC_URL), '|'); vector<string> fmtURLCBox = stringToVector(m_cfg.getString("GENERAL", "url_custom_full_covers", FMT_CBPIC_URL), '|');
vector<string> fmtURLCFlat = stringToVector(m_cfg.getString("GENERAL", "url_custom_flat_covers", FMT_CPIC_URL), '|'); vector<string> fmtURLCFlat = stringToVector(m_cfg.getString("GENERAL", "url_custom_flat_covers", FMT_CPIC_URL), '|');
vector<string> coverIDList; vector<string> coverIDList;
/* create list of cover ID's that need downloading */ /* Create list of cover ID's that need downloading */
if(dl_gameID.empty()) if(dl_gameID.empty())
{ {
for(u32 i = 0; i < m_gameList.size(); ++i) for(u32 i = 0; i < m_gameList.size(); ++i)
@ -1022,7 +1022,7 @@ int CMenu::_coverDownloader()
coverIDList.push_back(dl_gameID); coverIDList.push_back(dl_gameID);
n = coverIDList.size(); n = coverIDList.size();
m_thrdTotal = n * 3;// 3 = download cover, save png, and make wfc m_thrdTotal = n * 3; // 3 = Download cover, save png and make wfc
if(m_thrdTotal == 0) if(m_thrdTotal == 0)
{ {
@ -1032,7 +1032,7 @@ int CMenu::_coverDownloader()
return -3; return -3;
} }
/* initialize network connection */ /* Initialize network connection */
m_thrdMessage = _t("dlmsg1", L"Initializing network..."); m_thrdMessage = _t("dlmsg1", L"Initializing network...");
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
if(_initNetwork() < 0) if(_initNetwork() < 0)
@ -1043,7 +1043,7 @@ int CMenu::_coverDownloader()
return -2; return -2;
} }
/* download covers in the list */ /* Download covers in the list */
u32 CoverType = 0; u32 CoverType = 0;
string url; string url;
char path[256]; char path[256];
@ -1056,20 +1056,20 @@ int CMenu::_coverDownloader()
bool custom = false; bool custom = false;
int c_altCase = 0; int c_altCase = 0;
/* try downloading the cover 4 times but a different type each time.*/ /* Try downloading the cover 4 times but a different type each time.*/
for(int p = 0; p < 4; ++p) for(int p = 0; p < 4; ++p)
{ {
/* the cover type (BOX, CBOX, FLAT, CFLAT) is different each time based on m_downloadPrioVal */ /* The cover type (BOX, CBOX, FLAT, CFLAT) is different each time based on m_downloadPrioVal */
switch(p) switch(p)
{ {
case 0: case 0:
CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? CBOX : BOX; CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? CBOX : BOX;
break; break;
case 1: case 1:
CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? (m_downloadPrioVal & C_TYPE_PRIOB ? CFLAT : BOX) : (m_downloadPrioVal & C_TYPE_PRIOB ? CBOX : FLAT); CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? (m_downloadPrioVal & C_TYPE_PRIOB ? CFLAT : BOX) : (m_downloadPrioVal & C_TYPE_PRIOB ? CBOX : FLAT);
break; break;
case 2: case 2:
CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? (m_downloadPrioVal & C_TYPE_PRIOB ? BOX : CFLAT) : (m_downloadPrioVal & C_TYPE_PRIOB ? FLAT : CBOX); CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? (m_downloadPrioVal & C_TYPE_PRIOB ? BOX : CFLAT) : (m_downloadPrioVal & C_TYPE_PRIOB ? FLAT : CBOX);
break; break;
case 3: case 3:
CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? FLAT : CFLAT; CoverType = m_downloadPrioVal & C_TYPE_PRIOA ? FLAT : CFLAT;
@ -1083,11 +1083,11 @@ int CMenu::_coverDownloader()
original = false; original = false;
if(!success && original) if(!success && original)
{ {
/* each fmtURL may have more than one URL */ /* Each fmtURL may have more than one URL */
for(u8 j = 0; !success && j < fmtURLBox.size(); ++j) for(u8 j = 0; !success && j < fmtURLBox.size(); ++j)
{ {
url = makeURL(fmtURLBox[j], coverID, countryCode(coverID)); url = makeURL(fmtURLBox[j], coverID, countryCode(coverID));
m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
struct download file = {}; struct download file = {};
@ -1095,7 +1095,7 @@ int CMenu::_coverDownloader()
for(int o = 0; o < 12; ++o) for(int o = 0; o < 12; ++o)
{ {
bool tdl = false;// tdl = try download bool tdl = false; // tdl = try download
if(file.size > 0)// && checkPNGBuf(file.data)) if(file.size > 0)// && checkPNGBuf(file.data))
break; break;
switch( o ) switch( o )
@ -1180,32 +1180,30 @@ int CMenu::_coverDownloader()
case ZHCN: case ZHCN:
break; break;
} }
if(tdl)// try another download if(tdl) // Try another download
{ {
m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
downloadfile(url.c_str(), &file); downloadfile(url.c_str(), &file);
} }
} }
/* if none of the downloads succeeded */ /* If none of the downloads succeeded */
if(file.size == 0)// || !checkPNGBuf(file.data)) if(file.size == 0)// || !checkPNGBuf(file.data))
continue; continue;
/* a download succeeded */ /* Download succeeded - save png */
/* save cover png */
strncpy(path, fmt("%s/%s.png", m_boxPicDir.c_str(), coverID.c_str()), 255); strncpy(path, fmt("%s/%s.png", m_boxPicDir.c_str(), coverID.c_str()), 255);
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path); m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path);
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
fsop_WriteFile(path, file.data, file.size); fsop_WriteFile(path, file.data, file.size);
MEM2_free(file.data); MEM2_free(file.data);
/* make cover cache file (wfc) */ /* Make cover cache file (wfc) */
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s.wfc"), coverID.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s.wfc"), coverID.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, true);//it may fail CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, true); // Might fail if OOM
++count; ++count;
update_pThread(1); update_pThread(1);
@ -1219,7 +1217,7 @@ int CMenu::_coverDownloader()
c_altCase = c_gameTDB.GetCaseVersions(coverID.c_str()); c_altCase = c_gameTDB.GetCaseVersions(coverID.c_str());
if(!success && c_gameTDB.IsLoaded() && c_altCase > 1 && custom) if(!success && c_gameTDB.IsLoaded() && c_altCase > 1 && custom)
{ {
/* each fmtURL may have more than one URL */ /* Each fmtURL may have more than one URL */
for(u8 j = 0; !success && j < fmtURLCBox.size(); ++j) for(u8 j = 0; !success && j < fmtURLCBox.size(); ++j)
{ {
url = makeURL(fmtURLCBox[j], coverID, countryCode(coverID)); url = makeURL(fmtURLCBox[j], coverID, countryCode(coverID));
@ -1228,7 +1226,7 @@ int CMenu::_coverDownloader()
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
struct download file = {}; struct download file = {};
downloadfile(url.c_str(), &file); downloadfile(url.c_str(), &file);
for(int o = 0; o < 12; ++o) for(int o = 0; o < 12; ++o)
{ {
bool tdl = false; bool tdl = false;
@ -1308,7 +1306,7 @@ int CMenu::_coverDownloader()
break; break;
case AU: case AU:
if(coverID[3] == 'W' && m_downloadPrioVal&C_TYPE_ZHCN) if(coverID[3] == 'W' && m_downloadPrioVal&C_TYPE_ZHCN)
{ {
url = makeURL(fmtURLCBox[j], coverID, "ZH"); url = makeURL(fmtURLCBox[j], coverID, "ZH");
tdl = true; tdl = true;
} }
@ -1325,28 +1323,26 @@ int CMenu::_coverDownloader()
} }
} }
/* if none of the downloads succeeded */ /* If none of the downloads succeeded */
if(file.size <= 0)// || !checkPNGBuf(file.data)) if(file.size <= 0)// || !checkPNGBuf(file.data))
continue; continue;
/* a download succeeded */ /* Download succeeded - save png */
/* save cover png */
strncpy(path, fmt("%s/%s.png", m_boxPicDir.c_str(), coverID.c_str()), 255); strncpy(path, fmt("%s/%s.png", m_boxPicDir.c_str(), coverID.c_str()), 255);
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path); m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path);
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
fsop_WriteFile(path, file.data, file.size); fsop_WriteFile(path, file.data, file.size);
MEM2_free(file.data); MEM2_free(file.data);
/* make cover cache file (wfc) */ /* Make cover cache file (wfc) */
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s.wfc"), coverID.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s.wfc"), coverID.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, true);//it may fail CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, true); // Might fail if OOM
update_pThread(1);
++count; ++count;
update_pThread(1);
success = true; success = true;
} }
} }
@ -1356,10 +1352,11 @@ int CMenu::_coverDownloader()
original = false; original = false;
if(!success && original) if(!success && original)
{ {
/* Each fmtURL may have more than one URL */
for(u8 j = 0; !success && j < fmtURLFlat.size(); ++j) for(u8 j = 0; !success && j < fmtURLFlat.size(); ++j)
{ {
url = makeURL(fmtURLFlat[j], coverID, countryCode(coverID)); url = makeURL(fmtURLFlat[j], coverID, countryCode(coverID));
m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
struct download file = {}; struct download file = {};
@ -1460,22 +1457,23 @@ int CMenu::_coverDownloader()
} }
} }
/* If none of the downloads succeeded */
if(file.size <= 0)// || !checkPNGBuf(file.data)) if(file.size <= 0)// || !checkPNGBuf(file.data))
continue; continue;
/*download succeeded - save png */ /* Download succeeded - save png */
strncpy(path, fmt("%s/%s.png", m_picDir.c_str(), coverID.c_str()), 255); strncpy(path, fmt("%s/%s.png", m_picDir.c_str(), coverID.c_str()), 255);
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path); m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path);
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
fsop_WriteFile(path, file.data, file.size); fsop_WriteFile(path, file.data, file.size);
MEM2_free(file.data); MEM2_free(file.data);
/* make cover cache file (wfc) */ /* Make cover cache file (wfc) */
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s"), sfmt("%s.wfc", coverID.c_str())); m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s"), sfmt("%s.wfc", coverID.c_str()));
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, false);//it may fail CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, false); // Might fail if OOM
++countFlat; ++countFlat;
update_pThread(1); update_pThread(1);
@ -1488,15 +1486,16 @@ int CMenu::_coverDownloader()
custom = true; custom = true;
if(!success && c_gameTDB.IsLoaded() && c_altCase > 1 && custom) if(!success && c_gameTDB.IsLoaded() && c_altCase > 1 && custom)
{ {
/* Each fmtURL may have more than one URL */
for(u8 j = 0; !success && j < fmtURLCFlat.size(); ++j) for(u8 j = 0; !success && j < fmtURLCFlat.size(); ++j)
{ {
url = makeURL(fmtURLCFlat[j], coverID, countryCode(coverID)); url = makeURL(fmtURLCFlat[j], coverID, countryCode(coverID));
m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
struct download file = {}; struct download file = {};
downloadfile(url.c_str(), &file); downloadfile(url.c_str(), &file);
for(int o = 0; o < 12; ++o) for(int o = 0; o < 12; ++o)
{ {
bool tdl = false; bool tdl = false;
@ -1591,27 +1590,27 @@ int CMenu::_coverDownloader()
m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str()); m_thrdMessage = wfmt(_fmt("dlmsg3", L"Downloading %i/%i from %s"), i + 1, n, url.c_str());
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
LWP_MutexUnlock(m_mutex); LWP_MutexUnlock(m_mutex);
downloadfile(url.c_str(), &file); downloadfile(url.c_str(), &file);
} }
} }
/* If none of the downloads succeeded */
if(file.size <= 0)// || !checkPNGBuf(file.data)) if(file.size <= 0)// || !checkPNGBuf(file.data))
continue; continue;
/* save png */ /* Download succeeded - save png */
strncpy(path, fmt("%s/%s.png", m_picDir.c_str(), coverID.c_str()), 255); strncpy(path, fmt("%s/%s.png", m_picDir.c_str(), coverID.c_str()), 255);
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path); m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), path);
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
fsop_WriteFile(path, file.data, file.size); fsop_WriteFile(path, file.data, file.size);
MEM2_free(file.data); MEM2_free(file.data);
/* make wfc */ /* Make cover cache file (wfc) */
update_pThread(1); update_pThread(1);
m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s"), sfmt("%s.wfc", coverID.c_str())); m_thrdMessage = wfmt(_fmt("dlmsg10", L"Making %s"), sfmt("%s.wfc", coverID.c_str()));
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, false);//it may fail CoverFlow.cacheCoverFile(fmt("%s/%s.wfc", m_cacheDir.c_str(), coverID.c_str()), path, false); // Might fail if OOM
++countFlat; ++countFlat;
update_pThread(1); update_pThread(1);
@ -1624,7 +1623,7 @@ int CMenu::_coverDownloader()
if(!success) if(!success)
update_pThread(3); update_pThread(3);
} }
/* cover list done and downloading complete */ /* Cover list done and downloading complete */
if(c_gameTDB.IsLoaded()) if(c_gameTDB.IsLoaded())
c_gameTDB.CloseFile(); c_gameTDB.CloseFile();
coverIDList.clear(); coverIDList.clear();
@ -1637,8 +1636,8 @@ int CMenu::_coverDownloader()
int CMenu::_gametdbDownloaderAsync() int CMenu::_gametdbDownloaderAsync()
{ {
const string &langCode = m_loc.getString(m_curLanguage, "gametdb_code", "EN"); const string &langCode = m_loc.getString(m_curLanguage, "gametdb_code", "EN");
m_thrdTotal = 3;// download, save, and unzip m_thrdTotal = 3; // Download, save and unzip
m_thrdMessage = _t("dlmsg1", L"Initializing network..."); m_thrdMessage = _t("dlmsg1", L"Initializing network...");
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
if(_initNetwork() < 0) if(_initNetwork() < 0)
@ -1657,17 +1656,17 @@ int CMenu::_gametdbDownloaderAsync()
} }
else else
{ {
update_pThread(1);//its downloaded update_pThread(1); // It's downloaded
bool res = false; bool res = false;
char *zippath = fmt_malloc("%s/wiitdb.zip", m_settingsDir.c_str()); char *zippath = fmt_malloc("%s/wiitdb.zip", m_settingsDir.c_str());
if(zippath != NULL) if(zippath != NULL)
{ {
gprintf("Writing file to '%s'\n", zippath); gprintf("Writing file to '%s'\n", zippath);
fsop_deleteFile(zippath); fsop_deleteFile(zippath);
m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), "wiitdb.zip"); m_thrdMessage = wfmt(_fmt("dlmsg4", L"Saving %s"), "wiitdb.zip");
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
res = fsop_WriteFile(zippath, file.data, file.size); res = fsop_WriteFile(zippath, file.data, file.size);
MEM2_free(file.data); MEM2_free(file.data);
} }
@ -1680,15 +1679,15 @@ int CMenu::_gametdbDownloaderAsync()
} }
else else
{ {
update_pThread(1);//its saved update_pThread(1); // It's saved
gprintf("Extracting zip file: "); gprintf("Extracting zip file: ");
m_thrdMessage = wfmt(_fmt("dlmsg24", L"Extracting %s"), "wiitdb.zip"); m_thrdMessage = wfmt(_fmt("dlmsg24", L"Extracting %s"), "wiitdb.zip");
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
ZipFile zFile(zippath); ZipFile zFile(zippath);
bool zres = zFile.ExtractAll(m_settingsDir.c_str()); bool zres = zFile.ExtractAll(m_settingsDir.c_str());
gprintf(zres ? "success\n" : "failed\n"); gprintf(zres ? "success\n" : "failed\n");
//may add if zres failed return -4 extraction failed // May add if zres failed return -4 extraction failed
// We don't need the zipfile anymore // We don't need the zipfile anymore
fsop_deleteFile(zippath); fsop_deleteFile(zippath);
@ -1696,8 +1695,8 @@ int CMenu::_gametdbDownloaderAsync()
// We should always remove the offsets file to make sure it's reloaded // We should always remove the offsets file to make sure it's reloaded
fsop_deleteFile(fmt("%s/gametdb_offsets.bin", m_settingsDir.c_str())); fsop_deleteFile(fmt("%s/gametdb_offsets.bin", m_settingsDir.c_str()));
update_pThread(1);//its extracted update_pThread(1); // It's extracted
// Update cache // Update cache
m_cfg.setBool(WII_DOMAIN, "update_cache", true); m_cfg.setBool(WII_DOMAIN, "update_cache", true);
@ -1724,7 +1723,7 @@ int CMenu::_bannerDownloader()
string gameDir(fmt(gc_games_dir, DeviceName[currentPartition])); string gameDir(fmt(gc_games_dir, DeviceName[currentPartition]));
string cacheDir(fmt("%s/%s_gamecube.db", m_listCacheDir.c_str(), DeviceName[currentPartition])); string cacheDir(fmt("%s/%s_gamecube.db", m_listCacheDir.c_str(), DeviceName[currentPartition]));
m_cacheList.CreateList(COVERFLOW_GAMECUBE, gameDir, stringToVector(".iso|.ciso|root", '|'), cacheDir, false); m_cacheList.CreateList(COVERFLOW_GAMECUBE, gameDir, stringToVector(".iso|.ciso|root", '|'), cacheDir, false);
for(u32 i = 0; i < m_cacheList.size(); ++i) for(u32 i = 0; i < m_cacheList.size(); ++i)
{ {
if(!fsop_FileExist(fmt("%s/%s.bnr", m_customBnrDir.c_str(), m_cacheList[i].id))) if(!fsop_FileExist(fmt("%s/%s.bnr", m_customBnrDir.c_str(), m_cacheList[i].id)))
@ -1734,16 +1733,16 @@ int CMenu::_bannerDownloader()
} }
else else
BnrIDList.push_back(dl_gameID); BnrIDList.push_back(dl_gameID);
n = BnrIDList.size(); n = BnrIDList.size();
m_thrdTotal = n; m_thrdTotal = n;
if(n == 0) if(n == 0)
{ {
BnrIDList.clear(); BnrIDList.clear();
return -3; return -3;
} }
const char *banner_url = NULL; const char *banner_url = NULL;
const char *banner_url_id3 = NULL; const char *banner_url_id3 = NULL;
const char *GAME_BNR_ID = "{gameid}"; const char *GAME_BNR_ID = "{gameid}";
@ -1761,7 +1760,7 @@ int CMenu::_bannerDownloader()
BnrIDList.clear(); BnrIDList.clear();
return -2; return -2;
} }
for(u32 i = 0; i < BnrIDList.size(); ++i) for(u32 i = 0; i < BnrIDList.size(); ++i)
{ {
string base_url_id6 = base_url; string base_url_id6 = base_url;
@ -1787,7 +1786,7 @@ int CMenu::_bannerDownloader()
downloadfile(banner_url_id3, &file); downloadfile(banner_url_id3, &file);
} }
/* minimum 50kb */ /* Minimum 50kb */
if(file.size > 51200 && file.data[0] != '<') if(file.size > 51200 && file.data[0] != '<')
{ {
fsop_WriteFile(fmt("%s/%s.bnr", m_customBnrDir.c_str(), BnrIDList[i].c_str()), file.data, file.size); fsop_WriteFile(fmt("%s/%s.bnr", m_customBnrDir.c_str(), BnrIDList[i].c_str()), file.data, file.size);
@ -1804,7 +1803,7 @@ int CMenu::_bannerDownloader()
/**************************************************************************************/ /**************************************************************************************/
const char *url_dl = NULL; const char *url_dl = NULL;
void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size)// nothing uses this void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing uses this
{ {
m_file = NULL; m_file = NULL;
m_filesize = 0; m_filesize = 0;