jump to last file, improved auto update, make folders if not present

This commit is contained in:
dborth 2009-12-23 00:38:11 +00:00
parent 0e5d796a44
commit db140261aa
8 changed files with 110 additions and 48 deletions

View File

@ -472,6 +472,8 @@ int BrowserLoadFile()
if(!IsValidROM())
goto done;
strcpy(loadedFile, browserList[browser.selIndex].filename);
// store the filename (w/o ext) - used for sram/freeze naming
StripExt(Memory.ROMFilename, browserList[browser.selIndex].filename);

View File

@ -33,6 +33,7 @@
#include "gcunzip.h"
#include "menu.h"
#include "filebrowser.h"
#include "gui/gui.h"
#define THREAD_SLEEP 100
@ -57,6 +58,7 @@ static lwp_t parsethread = LWP_THREAD_NULL;
static DIR_ITER * dirIter = NULL;
static bool parseHalt = true;
bool ParseDirEntries();
int selectLoadedFile = 0;
// device thread
static lwp_t devicethread = LWP_THREAD_NULL;
@ -527,10 +529,42 @@ bool ParseDirEntries()
// Sort the file list
if(i >= 0)
{
browser.numEntries += i;
qsort(browserList, browser.numEntries, sizeof(BROWSERENTRY), FileSortCallback);
qsort(browserList, browser.numEntries+i, sizeof(BROWSERENTRY), FileSortCallback);
}
// try to find and select the last loaded file
if(selectLoadedFile == 1 && res != 0 && loadedFile[0] != 0 && browser.dir[0] != 0)
{
int indexFound = -1;
for(int j=1; j < browser.numEntries + i; j++)
{
if(strcmp(browserList[j].filename, loadedFile) == 0)
{
indexFound = j;
break;
}
}
// move to this file
if(indexFound > 0)
{
if(indexFound > FILE_PAGESIZE)
{
browser.pageIndex = (ceil(indexFound/FILE_PAGESIZE*1.0)) * FILE_PAGESIZE;
if(browser.pageIndex + FILE_PAGESIZE > browser.numEntries + i)
{
browser.pageIndex = browser.numEntries + i - FILE_PAGESIZE;
}
}
browser.selIndex = indexFound;
}
selectLoadedFile = 2; // selecting done
}
browser.numEntries += i;
if(res != 0 || parseHalt)
{
dirclose(dirIter); // close directory

View File

@ -47,5 +47,6 @@ extern unsigned char savebuffer[SAVEBUFFERSIZE];
extern FILE * file;
extern bool unmountRequired[];
extern bool isMounted[];
extern int selectLoadedFile;
#endif

View File

@ -963,6 +963,7 @@ static int MenuGameSelection()
#endif
// populate initial directory listing
selectLoadedFile = 1;
OpenGameList();
gameBrowser.ResetState();
@ -973,6 +974,13 @@ static int MenuGameSelection()
{
usleep(THREAD_SLEEP);
if(selectLoadedFile == 2)
{
selectLoadedFile = 0;
mainWindow->ChangeFocus(&gameBrowser);
gameBrowser.TriggerUpdate();
}
// update gameWindow based on arrow buttons
// set MENU_EXIT if A button pressed on a game
for(i=0; i < FILE_PAGESIZE; i++)

View File

@ -47,7 +47,7 @@ bool updateFound = false; // true if an app update was found
void UpdateCheck()
{
// we can only check for the update if we have internet + SD
if(!updateChecked && networkInit && isMounted[DEVICE_SD])
if(!updateChecked && networkInit && (isMounted[DEVICE_SD] || isMounted[DEVICE_USB]))
{
static char url[128];
int retval;
@ -135,43 +135,45 @@ static bool unzipArchive(char * zipfilepath, char * unzipfolderpath)
bool DownloadUpdate()
{
bool result = false;
if(strlen(updateURL) > 0)
if(strlen(updateURL) == 0 || strlen(appPath) == 0)
goto done;
if(!ChangeInterface(appPath, NOTSILENT))
goto done;
// stop checking if devices were removed/inserted
// since we're saving a file
HaltDeviceThread();
int device;
FindDevice(appPath, &device);
FILE * hfile;
char updateFile[50];
sprintf(updateFile, "%s%s Update.zip", pathPrefix[device], APPNAME);
hfile = fopen (updateFile, "wb");
if (hfile > 0)
{
// stop checking if devices were removed/inserted
// since we're saving a file
HaltDeviceThread();
FILE * hfile;
char updateFile[50];
sprintf(updateFile, "sd:/%s Update.zip", APPNAME);
hfile = fopen (updateFile, "wb");
if (hfile > 0)
{
int retval;
retval = http_request(updateURL, hfile, NULL, (1024*1024*5));
fclose (hfile);
}
bool unzipResult = unzipArchive(updateFile, (char *)"sd:/");
remove(updateFile); // delete update file
if(unzipResult)
{
result = true;
InfoPrompt("Update successful!");
}
else
{
result = false;
ErrorPrompt("Update failed!");
}
updateFound = false; // updating is finished (successful or not!)
// go back to checking if devices were inserted/removed
ResumeDeviceThread();
int retval;
retval = http_request(updateURL, hfile, NULL, (1024*1024*5));
fclose (hfile);
}
result = unzipArchive(updateFile, (char *)pathPrefix[device]);
remove(updateFile); // delete update file
// go back to checking if devices were inserted/removed
ResumeDeviceThread();
done:
if(result)
InfoPrompt("Update successful!");
else
ErrorPrompt("Update failed!");
updateFound = false; // updating is finished (successful or not!)
return result;
}

View File

@ -11,6 +11,7 @@
#include <gccore.h>
#include <stdio.h>
#include <string.h>
#include <sys/dir.h>
#include <ogcsys.h>
#include <mxml.h>
@ -357,12 +358,13 @@ SavePrefs (bool silent)
if(prefpath[0] != 0)
{
strcpy(filepath, prefpath);
sprintf(filepath, "%s/%s", prefpath, PREF_FILE_NAME);
FindDevice(filepath, &device);
}
else if(appPath[0] != 0)
{
sprintf(filepath, "%s/%s", appPath, PREF_FILE_NAME);
strcpy(prefpath, appPath);
FindDevice(filepath, &device);
}
else
@ -372,7 +374,18 @@ SavePrefs (bool silent)
if(device == 0)
return false;
sprintf(filepath, "%s%s", pathPrefix[device], APPFOLDER);
if (!diropen(filepath))
{
mkdir(filepath, 0777);
sprintf(filepath, "%s%s/roms", pathPrefix[device], APPFOLDER);
mkdir(filepath, 0777);
sprintf(filepath, "%s%s/saves", pathPrefix[device], APPFOLDER);
mkdir(filepath, 0777);
}
sprintf(filepath, "%s%s/%s", pathPrefix[device], APPFOLDER, PREF_FILE_NAME);
sprintf(prefpath, "%s%s", pathPrefix[device], APPFOLDER);
}
if(device == 0)
@ -405,10 +418,12 @@ SavePrefs (bool silent)
* Load Preferences from specified filepath
***************************************************************************/
bool
LoadPrefsFromMethod (char * filepath)
LoadPrefsFromMethod (char * path)
{
bool retval = false;
int offset = 0;
char filepath[MAXPATHLEN];
sprintf(filepath, "%s/%s", path, PREF_FILE_NAME);
AllocSaveBuffer ();
@ -420,9 +435,7 @@ LoadPrefsFromMethod (char * filepath)
FreeSaveBuffer ();
if(retval)
{
strcpy(prefpath, filepath);
}
strcpy(prefpath, path);
return retval;
}
@ -444,13 +457,13 @@ bool LoadPrefs()
#ifdef HW_RVL
numDevices = 3;
sprintf(filepath[0], "%s/%s", appPath, PREF_FILE_NAME);
sprintf(filepath[1], "sd:/%s/%s", APPFOLDER, PREF_FILE_NAME);
sprintf(filepath[2], "usb:/%s/%s", APPFOLDER, PREF_FILE_NAME);
sprintf(filepath[0], "%s", appPath);
sprintf(filepath[1], "sd:/%s", APPFOLDER);
sprintf(filepath[2], "usb:/%s", APPFOLDER);
#else
numDevices = 2;
sprintf(filepath[0], "carda:/%s/%s", APPFOLDER, PREF_FILE_NAME);
sprintf(filepath[1], "cardb:/%s/%s", APPFOLDER, PREF_FILE_NAME);
sprintf(filepath[0], "carda:/%s", APPFOLDER);
sprintf(filepath[1], "cardb:/%s", APPFOLDER);
#endif
for(int i=0; i<numDevices; i++)

View File

@ -62,6 +62,7 @@ int ShutdownRequested = 0;
int ResetRequested = 0;
int ExitRequested = 0;
char appPath[1024] = { 0 };
char loadedFile[1024] = { 0 };
extern "C" {
extern void __exception_setreload(int t);

View File

@ -99,6 +99,7 @@ extern int ConfigRequested;
extern int ShutdownRequested;
extern int ExitRequested;
extern char appPath[];
extern char loadedFile[];
extern FreeTypeGX *fontSystem[];
void WiiSetupCheats();