The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-09-30 19:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

added 2 more servers to get images from. they are cycled to spread the load. if an image is missing on one, we try the others.

Browse Source 
changed a bit the way that the screensaver is called
This commit is contained in:
giantpune 2009-06-29 19:15:11 +00:00
parent a741b58732
commit 92ae470725
3 changed files with 83 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/menu.cpp
View File

@ -155,7 +155,7 @@ UpdateGUI (void *arg)
return 0; return 0;
} }
} }
switch (Settings.screensaver) switch (Settings.screensaver)
{ {
case 1: case 1:
@ -1198,9 +1198,10 @@ int MenuDiscList()
// screensaver is called when wiimote shuts down, depending on the wiimotet idletime // screensaver is called when wiimote shuts down, depending on the wiimotet idletime
if(!IsWpadConnected() && check !=0) if(!IsWpadConnected() && check !=0)
{ check++; { check++;
if(check==100) //to allow time for the wii to turn off and not show teh screensaver int screensaverIsOn=0;
WindowScreensaver(); if(check==100) //to allow time for the wii to turn off and not show the screensaver
check=0; screensaverIsOn=WindowScreensaver();
if (screensaverIsOn==1)check=0;
} }
} }

143
source/prompts/PromptWindows.cpp
View File

@ -321,7 +321,7 @@ void WindowCredits()
* WindowScreensaver * WindowScreensaver
* Display screensaver * Display screensaver
***************************************************************************/ ***************************************************************************/
void WindowScreensaver() int WindowScreensaver()
{ {
int i = 0; int i = 0;
bool exit = false; bool exit = false;
@ -367,6 +367,7 @@ void WindowScreensaver()
mainWindow->Remove(&screensaverWindow); mainWindow->Remove(&screensaverWindow);
mainWindow->SetState(STATE_DEFAULT); mainWindow->SetState(STATE_DEFAULT);
ResumeGui(); ResumeGui();
return 1;
} }
/**************************************************************************** /****************************************************************************
@ -1714,6 +1715,7 @@ void SearchMissingImages(int choice2)
bool found1 = false;/////add Ids of games that are missing covers to cntMissFiles bool found1 = false;/////add Ids of games that are missing covers to cntMissFiles
bool found2 = false; bool found2 = false;
bool found3 = false;
for (i = 0; i < gameCnt && cntMissFiles < 500; i++) for (i = 0; i < gameCnt && cntMissFiles < 500; i++)
{ {
struct discHdr* header = &gameList[i]; struct discHdr* header = &gameList[i];
@ -1721,10 +1723,14 @@ void SearchMissingImages(int choice2)
snprintf (filename,sizeof(filename),"%c%c%c.png", header->id[0], header->id[1], header->id[2]); snprintf (filename,sizeof(filename),"%c%c%c.png", header->id[0], header->id[1], header->id[2]);
found2 = findfile(filename, Settings.covers_path); found2 = findfile(filename, Settings.covers_path);
snprintf (filename,sizeof(filename),"%c%c%c%c.png", header->id[0], header->id[1], header->id[2], header->id[3]);
found3 = findfile(filename, Settings.covers_path);
snprintf(filename,sizeof(filename),"%c%c%c%c%c%c.png",header->id[0], header->id[1], header->id[2], snprintf(filename,sizeof(filename),"%c%c%c%c%c%c.png",header->id[0], header->id[1], header->id[2],
header->id[3], header->id[4], header->id[5]); //full id header->id[3], header->id[4], header->id[5]); //full id
found1 = findfile(filename, Settings.covers_path); found1 = findfile(filename, Settings.covers_path);
if (!found1 && !found2) //if could not find any image if (!found1 && !found2 && !found3) //if could not find any image
{ {
snprintf(missingFiles[cntMissFiles],11,"%s",filename); snprintf(missingFiles[cntMissFiles],11,"%s",filename);
cntMissFiles++; cntMissFiles++;
@ -1987,7 +1993,7 @@ ProgressDownloadWindow(int choice2)
titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
titleTxt.SetPosition(0,60); titleTxt.SetPosition(0,60);
GuiText msgTxt(NULL, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); GuiText msgTxt(NULL, 20, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255});
msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
msgTxt.SetPosition(0,130); msgTxt.SetPosition(0,130);
@ -2031,6 +2037,28 @@ ProgressDownloadWindow(int choice2)
mainWindow->ChangeFocus(&promptWindow); mainWindow->ChangeFocus(&promptWindow);
ResumeGui(); ResumeGui();
int serverCnt3d=3,serverCntDisc=2,serverCnt2d=3, offset=0, tries=0, m=0;
char server3d[serverCnt3d][75];
char serverDisc[serverCntDisc][75];
char server2d[serverCnt2d][75];
snprintf(server3d[m], sizeof(server3d[m]), "http://boxart.rowdyruff.net/3d/");m++;
snprintf(server3d[m], sizeof(server3d[m]), "http://gxload.joschtex.com/3d/");m++;
snprintf(server3d[m], sizeof(server3d[m]), "http://wiicover.gateflorida.com/3d/");m++;
m=0;
snprintf(serverDisc[m], sizeof(serverDisc[m]), "http://gxload.joschtex.com/disc/");m++;
//snprintf(serverDisc[k], sizeof(serverDisc[k]), "http://awiibit.com/BoxArt160x160/");k++;
snprintf(serverDisc[m], sizeof(serverDisc[m]), "http://wiicover.gateflorida.com/disc/");m++;
m=0;
snprintf(server2d[m], sizeof(server2d[m]), "http://wiicover.gateflorida.com/2d/");m++;
snprintf(server2d[m], sizeof(server2d[m]), "http://boxart.rowdyruff.net/flat/");m++;
snprintf(server2d[m], sizeof(server2d[m]), "http://gxload.joschtex.com/2d/");m++;
//check if directory exist and if not create one //check if directory exist and if not create one
struct stat st; struct stat st;
if(stat(Settings.covers_path, &st) != 0) { if(stat(Settings.covers_path, &st) != 0) {
@ -2045,10 +2073,10 @@ ProgressDownloadWindow(int choice2)
cntMissFiles = 0; cntMissFiles = 0;
} }
} }
int server = 1, serverCnt=2; //int server = 1;
while (i < cntMissFiles) while (i < cntMissFiles)
{ {
tries=0;
prTxt.SetTextf("%i%%", 100*i/cntMissFiles); prTxt.SetTextf("%i%%", 100*i/cntMissFiles);
if ((Settings.wsprompt == yes) && (CFG.widescreen)) if ((Settings.wsprompt == yes) && (CFG.widescreen))
@ -2066,60 +2094,48 @@ ProgressDownloadWindow(int choice2)
msg2Txt.SetTextf("%s", missingFiles[i]); msg2Txt.SetTextf("%s", missingFiles[i]);
//download boxart image //download boxart image
char imgPath[100]; char imgPath[100];
char URLFile[100]; char URLFile[100];
struct block file = downloadfile(URLFile); struct block file = downloadfile(URLFile);
if (choice2 == 2) if (choice2 == 2)
{ {
//if (server==1)sprintf(URLFile,"http://boxart.rowdyruff.net/3d/%s",missingFiles[i]); // For 3D Covers while(tries<serverCnt3d){
sprintf(URLFile,"http://gxload.joschtex.com/3d/%s",missingFiles[i]); // For 3D Covers sprintf(URLFile,"%s%s",server3d[(offset+tries)%serverCnt3d],missingFiles[i]);
sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[i]); sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[i]);
file = downloadfile(URLFile);
if (!(file.size == 36864 || file.size <= 1024 || file.size <= 1174 || file.size == 7386 || file.data == NULL))break;
tries++;
}
/*file = downloadfile(URLFile);//reject known bad images
if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.data == NULL) {
if (server==2)sprintf(URLFile,"http://boxart.rowdyruff.net/3d/%s",missingFiles[i]); // For 3D Covers
else if (server==1)sprintf(URLFile,"http://gxload.joschtex.com/3d/%s",missingFiles[i]); // For 3D Covers
}*/
} }
if(choice2 == 3) if(choice2 == 3)
{ {
if ((server==1)||(server==1))sprintf(URLFile,"http://gxload.joschtex.com/disc/%s",missingFiles[i]); while(tries<serverCntDisc){
sprintf(URLFile,"%s%s",serverDisc[(offset+tries)%serverCntDisc],missingFiles[i]);
sprintf(imgPath,"%s%s", Settings.disc_path, missingFiles[i]); sprintf(imgPath,"%s%s", Settings.disc_path, missingFiles[i]);
file = downloadfile(URLFile);
if (!(file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.size <= 1174 || file.data == NULL))break;
tries++;
}
} }
if(choice2 == 1) if(choice2 == 1)
{ {
//if (server==1)sprintf(URLFile,"http://boxart.rowdyruff.net/flat/%s",missingFiles[i]); while(tries<serverCnt2d){
sprintf(URLFile,"http://gxload.joschtex.com/2d/%s",missingFiles[i]); sprintf(URLFile,"%s%s",server2d[(offset+tries)%serverCnt2d],missingFiles[i]);
sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[i]); sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[i]);
file = downloadfile(URLFile);
/*file = downloadfile(URLFile);//reject known bad images if (!(file.size == 36864 || file.size <= 1024 || file.size <= 1174 || file.size == 7386 || file.data == NULL))break;
tries++;
if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.data == NULL) { }
if (server==2)sprintf(URLFile,"http://boxart.rowdyruff.net/flat/%s",missingFiles[i]);
else if (server==1)sprintf(URLFile,"http://gxload.joschtex.com/2d/%s",missingFiles[i]);
}*/
} }
//server++;
offset++;
msgTxt.SetTextf("%s",URLFile); msgTxt.SetTextf("%s",URLFile);
msg2Txt.SetTextf("%s", missingFiles[i]); msg2Txt.SetTextf("%s", missingFiles[i]);
//if (server>serverCnt)server=1; if (file.size == 36864 || file.size <= 1024 || file.size <= 1174 || file.size == 7386 || file.data == NULL) {
file = downloadfile(URLFile);//reject known bad images
if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.data == NULL) {
cntNotFound++; cntNotFound++;
i++; i++;
} }
@ -2151,42 +2167,37 @@ ProgressDownloadWindow(int choice2)
char URLFile[100]; char URLFile[100];
struct block file = downloadfile(URLFile); struct block file = downloadfile(URLFile);
if (choice2 == 2) if (choice2 == 2)
{ {
//if (server==1)sprintf(URLFile,"http://boxart.rowdyruff.net/3d/%s",missingFiles[0]); // For 3D Covers while(tries<serverCnt3d){
sprintf(URLFile,"http://gxload.joschtex.com/3d/%s",missingFiles[0]); // For 3D Covers sprintf(URLFile,"%s%s",server2d[(offset+tries)%serverCnt3d],missingFiles[0]);
sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[i]); sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[0]);
file = downloadfile(URLFile);
if (!(file.size == 36864 || file.size <= 1024 || file.size <= 1174 || file.size == 7386 || file.data == NULL))break;
tries++;
}
/*file = downloadfile(URLFile);//reject known bad images
if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.data == NULL) {
if (server==2)sprintf(URLFile,"http://boxart.rowdyruff.net/3d/%s",missingFiles[0]); // For 3D Covers
else if (server==1)sprintf(URLFile,"http://gxload.joschtex.com/3d/%s",missingFiles[0]); // For 3D Covers
}*/
} }
if(choice2 == 3) if(choice2 == 3)
{ {
if ((server==1)||(server==1))sprintf(URLFile,"http://gxload.joschtex.com/disc/%s",missingFiles[0]); while(tries<serverCntDisc){
sprintf(imgPath,"%s%s", Settings.disc_path, missingFiles[i]); sprintf(URLFile,"%s%s",serverDisc[(offset+tries)%serverCntDisc],missingFiles[0]);
sprintf(imgPath,"%s%s", Settings.disc_path, missingFiles[0]);
file = downloadfile(URLFile);
if (!(file.size == 36864 || file.size <= 1024 || file.size <= 1174 || file.size == 7386 || file.data == NULL))break;
tries++;
}
} }
if(choice2 == 1) if(choice2 == 1)
{ {
//if (server==1)sprintf(URLFile,"http://boxart.rowdyruff.net/flat/%s",missingFiles[0]); while(tries<serverCnt2d){
sprintf(URLFile,"http://gxload.joschtex.com/2d/%s",missingFiles[0]); sprintf(URLFile,"%s%s",server2d[(offset+tries)%serverCnt2d],missingFiles[0]);
sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[i]); sprintf(imgPath,"%s%s", Settings.covers_path, missingFiles[0]);
file = downloadfile(URLFile);
/*file = downloadfile(URLFile);//reject known bad images if (!(file.size == 36864 || file.size <= 1024 || file.size <= 1174 || file.size == 7386 || file.data == NULL))break;
tries++;
if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.data == NULL) { }
if (server==2)sprintf(URLFile,"http://boxart.rowdyruff.net/flat/%s",missingFiles[0]);
(server==1)sprintf(URLFile,"http://gxload.joschtex.com/2d/%s",missingFiles[0]);
}*/
} }
file = downloadfile(URLFile); if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.size <= 1174 || file.data == NULL) {
if (file.size == 36864 || file.size <= 1024 || file.size == 7386 || file.data == NULL) {
} else { } else {
if(file.data != NULL) if(file.data != NULL)
{ {

2
source/prompts/PromptWindows.h
View File

@ -22,6 +22,6 @@ int ProgressWindow(const char *title, const char *msg);
int ProgressDownloadWindow(int choice2); int ProgressDownloadWindow(int choice2);
int ProgressUpdateWindow(); int ProgressUpdateWindow();
char * GetMissingFiles(); char * GetMissingFiles();
void WindowScreensaver(); int WindowScreensaver();
#endif #endif