Change the URL for WiiTDB.zip. Now it only gets XML data for games on your drive rather than getting info for all 1500+ games every time. It is getting them based on the first 4 chars of the ID and there is a 2000 char limit on the URL set by lustar's over protective girlfriend so that translates to a 393 game limit on the XML downloaded from within the app. In case you didn't know, the xml is updated when you either update the full channel or "update all" with the dol.

also fixed one of the code dumps from the gameinfo page.
This commit is contained in:
giantpune 2009-07-15 00:57:37 +00:00
parent 6937ff5a51
commit 1d48d64f72
23 changed files with 85 additions and 30 deletions

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"POT-Creation-Date: 2009-07-14 16:35-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
<pd><ViewState><e p="gui\source\mload" x="true"></e><e p="gui\source\settings" x="true"></e><e p="gui\source" x="true"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libwbfs" x="true"></e><e p="gui\source\libwiigui" x="true"></e><e p="gui\source\patches" x="true"></e><e p="gui\source\prompts" x="true"></e><e p="gui\source\network" x="true"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="false"></e><e p="gui" x="true"></e><e p="gui\source\language" x="true"></e></ViewState></pd>
<pd><ViewState><e p="gui\source\mload" x="true"></e><e p="gui\source\settings" x="true"></e><e p="gui\source" x="true"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libwbfs" x="true"></e><e p="gui\source\libwiigui" x="true"></e><e p="gui\source\patches" x="true"></e><e p="gui\source\prompts" x="true"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\network" x="true"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="false"></e><e p="gui" x="true"></e><e p="gui\source\language" x="true"></e></ViewState></pd>

View File

@ -294,8 +294,9 @@ void GuiText::Draw()
int linenum = 0;
int lastSpace = -1;
int lastSpaceIndex = -1;
wchar_t * tmptext[20];
wchar_t * tmptext[55];
totalLines=0;
while(ch < strlen)
{
if(i == 0)
@ -351,7 +352,7 @@ void GuiText::Draw()
i=0;
for(j=firstLine-1; j < numLines+firstLine-1; j++)
{
if (j<linenum)
if (j<linenum-(firstLine-1))
(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[j], c, style);
i++;
}

View File

@ -216,6 +216,7 @@ int CheckUpdate()
}
if(revnumber > currentrev)
//if(revnumber > 1)//for testing updates
return revnumber;
else
return -1;

View File

@ -179,7 +179,7 @@ void WindowCredits()
//to be ready to be in a full channel
snprintf(svnTmp,sizeof(svnTmp), "%s", SVN_REV);
char SvnRev[30];
snprintf(SvnRev,sizeof(SvnRev), "Rev%s IOS%u (Rev %u)", svnTmp, IOS_GetVersion(), IOS_GetRevision());
snprintf(SvnRev,sizeof(SvnRev), "Rev%sc IOS%u (Rev %u)", svnTmp, IOS_GetVersion(), IOS_GetRevision());
#endif
@ -2365,10 +2365,26 @@ int ProgressUpdateWindow()
}
}
//make the URL to get XML based on our games
char XMLurl[2010];
char filename[10];
strncat (XMLurl, "http://wiitdb.com/wiitdb.zip?ID=", 32);
unsigned int i;
for (i = 0; i < gameCnt ; i++)
{
struct discHdr* header = &gameList[i];
if (i<393){
snprintf (filename,sizeof(filename),"%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3]);
strncat (XMLurl, filename, 4);
if ((i!=gameCnt-1)&&(i<392))
strncat (XMLurl, ",",1);
}
}
if(IsNetworkInit() && ret >= 0) {
int newrev = CheckUpdate();
if(newrev > 0) {
sprintf(msg, "Rev%i %s.", newrev, tr("available"));
@ -2388,7 +2404,7 @@ int ProgressUpdateWindow()
u8 * blockbuffer = new unsigned char[BLOCKSIZE];
for (s32 i = 0; i < filesize; i += BLOCKSIZE) {
usleep(100);
prTxt.SetTextf("%i%%", 100*i/filesize);
prTxt.SetTextf("%i%%", (100*i/filesize)+1);
if ((Settings.wsprompt == yes) && (CFG.widescreen)) {
progressbarImg.SetTile(80*i/filesize);
} else {
@ -2448,7 +2464,7 @@ int ProgressUpdateWindow()
fclose(pfile);
free(file.data);
}
file = downloadfile("http://wiitdb.com/wiitdb.zip");
file = downloadfile(XMLurl);
if(file.data != NULL){
sprintf(xmliconpath, "%swiitdb.zip", Settings.titlestxt_path);
pfile = fopen(xmliconpath, "wb");
@ -2596,6 +2612,33 @@ int ProgressUpdateWindow()
}
}
if(stat(Settings.titlestxt_path, &st) != 0) {
if(subfoldercreate(Settings.titlestxt_path) != 1) {
WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"));
ret = -1;
failed = -1;
}
}
//make the URL to get XML based on our games
char XMLurl[2010];
char filename[10];
strncat (XMLurl, "http://wiitdb.com/wiitdb.zip?ID=", 32);
unsigned int i;
for (i = 0; i < gameCnt ; i++)
{
struct discHdr* header = &gameList[i];
if (i<393){
snprintf (filename,sizeof(filename),"%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3]);
strncat (XMLurl, filename, 4);
if ((i!=gameCnt-1)&&(i<392))
strncat (XMLurl, ",",1);
}
}
char dolpath[150];
// char dolpathsuccess[150];//use coverspath as a folder for the update wad so we dont make a new folder and have to delete it
snprintf(dolpath, sizeof(dolpath), "%sULNR.wad", Settings.covers_path);
@ -2626,10 +2669,10 @@ int ProgressUpdateWindow()
int newrev = CheckUpdate();
if(newrev > 0) {
FILE * pfile;
sprintf(msg, "Rev%i %s.", newrev, tr("available"));
int choice = WindowPrompt(msg, 0, tr("Update"));
if(choice == 1 || choice == 2) {
if(choice == 1) {
titleTxt.SetTextf("%s USB Loader GX", tr("Updating"));
msgTxt.SetPosition(0,100);
promptWindow.Append(&progressbarEmptyImg);
@ -2637,9 +2680,19 @@ int ProgressUpdateWindow()
promptWindow.Append(&progressbarOutlineImg);
promptWindow.Append(&prTxt);
msgTxt.SetTextf("%s Rev%i wad.", tr("Downloading"), newrev);//download the wad but it is saved as a genaric file.
struct block file = downloadfile(XMLurl);
char xmliconpath[100];
if(file.data != NULL){
sprintf(xmliconpath, "%swiitdb.zip", Settings.titlestxt_path);
pfile = fopen(xmliconpath, "wb");
fwrite(file.data,1,file.size,pfile);
fclose(pfile);
free(file.data);
s32 filesize = download_request("http://www.techjawa.com/usbloadergx/ULNR.file");//for some reason it didn't download completely when saved as a wad.
if(filesize > 0) {
FILE * pfile;
pfile = fopen(dolpath, "wb");//here we save the txt as a wad
u8 * blockbuffer = new unsigned char[BLOCKSIZE];
for (s32 i = 0; i < filesize; i += BLOCKSIZE) {