(PS3) Fix indenting in ps3/file_browser.c
This commit is contained in:
Twinaphex
parent
e7419d2fa5
commit
29f1138ec6
|
|
@ -21,144 +21,150 @@
|
||||||
|
|
||||||
static int less_than_key(const void * a, const void * b)
|
static int less_than_key(const void * a, const void * b)
|
||||||
{
|
{
|
||||||
DirectoryEntry * a_dir = (DirectoryEntry*)a;
|
DirectoryEntry * a_dir = (DirectoryEntry*)a;
|
||||||
DirectoryEntry * b_dir = (DirectoryEntry*)b;
|
DirectoryEntry * b_dir = (DirectoryEntry*)b;
|
||||||
|
|
||||||
/* compare a directory to a file directory is always lesser than*/
|
/* compare a directory to a file directory is always lesser than*/
|
||||||
if ((a_dir->d_type == CELL_FS_TYPE_DIRECTORY && b_dir->d_type == CELL_FS_TYPE_REGULAR))
|
if ((a_dir->d_type == CELL_FS_TYPE_DIRECTORY && b_dir->d_type == CELL_FS_TYPE_REGULAR))
|
||||||
return -1;
|
return -1;
|
||||||
else if (a_dir->d_type == CELL_FS_TYPE_REGULAR && b_dir->d_type == CELL_FS_TYPE_DIRECTORY)
|
else if (a_dir->d_type == CELL_FS_TYPE_REGULAR && b_dir->d_type == CELL_FS_TYPE_DIRECTORY)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
return strcasecmp(a_dir->d_name, b_dir->d_name);
|
return strcasecmp(a_dir->d_name, b_dir->d_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char * filebrowser_get_extension(const char * filename)
|
static const char * filebrowser_get_extension(const char * filename)
|
||||||
{
|
{
|
||||||
const char * ext = strrchr(filename, '.');
|
const char * ext = strrchr(filename, '.');
|
||||||
if (ext)
|
|
||||||
return ext+1;
|
if (ext)
|
||||||
else
|
return ext+1;
|
||||||
return "";
|
else
|
||||||
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
static void filebrowser_clear_current_entries(filebrowser_t * filebrowser)
|
static void filebrowser_clear_current_entries(filebrowser_t * filebrowser)
|
||||||
{
|
{
|
||||||
for(uint32_t i = 0; i < MAX_FILE_LIMIT_CFS; i++)
|
for(uint32_t i = 0; i < MAX_FILE_LIMIT_CFS; i++)
|
||||||
{
|
{
|
||||||
filebrowser->cur[filebrowser->file_count].d_type = 0;
|
filebrowser->cur[filebrowser->file_count].d_type = 0;
|
||||||
filebrowser->cur[filebrowser->file_count].d_namlen = 0;
|
filebrowser->cur[filebrowser->file_count].d_namlen = 0;
|
||||||
strcpy(filebrowser->cur[filebrowser->file_count].d_name, "\0");
|
strcpy(filebrowser->cur[filebrowser->file_count].d_name, "\0");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool filebrowser_parse_directory(filebrowser_t * filebrowser, const char * path, const char * extensions)
|
static bool filebrowser_parse_directory(filebrowser_t * filebrowser,
|
||||||
|
const char * path, const char * extensions)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
/* bad path*/
|
/* bad path*/
|
||||||
if (strcmp(path,"") == 0)
|
if (strcmp(path,"") == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* delete old path*/
|
/* delete old path*/
|
||||||
filebrowser_clear_current_entries(filebrowser);
|
filebrowser_clear_current_entries(filebrowser);
|
||||||
|
|
||||||
if (cellFsOpendir(path, &fd) == CELL_FS_SUCCEEDED)
|
if (cellFsOpendir(path, &fd) == CELL_FS_SUCCEEDED)
|
||||||
{
|
{
|
||||||
uint64_t nread = 0;
|
uint64_t nread = 0;
|
||||||
|
|
||||||
strcpy(filebrowser->dir[filebrowser->directory_stack_size], path);
|
strcpy(filebrowser->dir[filebrowser->directory_stack_size], path);
|
||||||
|
|
||||||
filebrowser->file_count = 0;
|
filebrowser->file_count = 0;
|
||||||
|
filebrowser->currently_selected = 0;
|
||||||
|
|
||||||
filebrowser->currently_selected = 0;
|
CellFsDirent dirent;
|
||||||
|
|
||||||
CellFsDirent dirent;
|
while (cellFsReaddir(fd, &dirent, &nread) == CELL_FS_SUCCEEDED)
|
||||||
while (cellFsReaddir(fd, &dirent, &nread) == CELL_FS_SUCCEEDED)
|
{
|
||||||
{
|
if (nread == 0)
|
||||||
if (nread == 0)
|
break;
|
||||||
break;
|
|
||||||
|
|
||||||
if ((dirent.d_type != CELL_FS_TYPE_REGULAR) && (dirent.d_type != CELL_FS_TYPE_DIRECTORY))
|
if ((dirent.d_type != CELL_FS_TYPE_REGULAR) && (dirent.d_type != CELL_FS_TYPE_DIRECTORY))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (dirent.d_type == CELL_FS_TYPE_DIRECTORY && !(strcmp(dirent.d_name, ".")))
|
if (dirent.d_type == CELL_FS_TYPE_DIRECTORY && !(strcmp(dirent.d_name, ".")))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (dirent.d_type == CELL_FS_TYPE_REGULAR)
|
if (dirent.d_type == CELL_FS_TYPE_REGULAR)
|
||||||
{
|
{
|
||||||
char tmp_extensions[512];
|
char tmp_extensions[512];
|
||||||
strncpy(tmp_extensions, extensions, sizeof(tmp_extensions));
|
strncpy(tmp_extensions, extensions, sizeof(tmp_extensions));
|
||||||
const char * current_extension = filebrowser_get_extension(dirent.d_name);
|
const char * current_extension = filebrowser_get_extension(dirent.d_name);
|
||||||
bool found_rom = false;
|
bool found_rom = false;
|
||||||
|
|
||||||
if(current_extension)
|
if(current_extension)
|
||||||
{
|
{
|
||||||
char * pch = strtok(tmp_extensions, "|");
|
char * pch = strtok(tmp_extensions, "|");
|
||||||
while (pch != NULL)
|
while (pch != NULL)
|
||||||
{
|
{
|
||||||
if(strcmp(current_extension, pch) == 0)
|
if(strcmp(current_extension, pch) == 0)
|
||||||
{
|
{
|
||||||
found_rom = true;
|
found_rom = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
pch = strtok(NULL, "|");
|
pch = strtok(NULL, "|");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!found_rom)
|
if(!found_rom)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filebrowser->cur[filebrowser->file_count].d_type = dirent.d_type;
|
||||||
|
filebrowser->cur[filebrowser->file_count].d_namlen = dirent.d_namlen;
|
||||||
|
strcpy(filebrowser->cur[filebrowser->file_count].d_name, dirent.d_name);
|
||||||
|
|
||||||
filebrowser->cur[filebrowser->file_count].d_type = dirent.d_type;
|
++filebrowser->file_count;
|
||||||
filebrowser->cur[filebrowser->file_count].d_namlen = dirent.d_namlen;
|
}
|
||||||
strcpy(filebrowser->cur[filebrowser->file_count].d_name, dirent.d_name);
|
|
||||||
|
|
||||||
++filebrowser->file_count;
|
cellFsClosedir(fd);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
|
||||||
cellFsClosedir(fd);
|
qsort(filebrowser->cur, filebrowser->file_count, sizeof(DirectoryEntry), less_than_key);
|
||||||
}
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
|
|
||||||
qsort(filebrowser->cur, filebrowser->file_count, sizeof(DirectoryEntry), less_than_key);
|
return true;
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void filebrowser_new(filebrowser_t * filebrowser, const char * start_dir, const char * extensions)
|
void filebrowser_new(filebrowser_t * filebrowser, const char * start_dir,
|
||||||
|
const char * extensions)
|
||||||
{
|
{
|
||||||
filebrowser->directory_stack_size = 0;
|
filebrowser->directory_stack_size = 0;
|
||||||
strncpy(filebrowser->extensions, extensions, sizeof(filebrowser->extensions));
|
strncpy(filebrowser->extensions, extensions, sizeof(filebrowser->extensions));
|
||||||
|
|
||||||
filebrowser_parse_directory(filebrowser, start_dir, filebrowser->extensions);
|
filebrowser_parse_directory(filebrowser, start_dir, filebrowser->extensions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void filebrowser_reset_start_directory(filebrowser_t * filebrowser, const char * start_dir, const char * extensions)
|
void filebrowser_reset_start_directory(filebrowser_t * filebrowser, const char * start_dir,
|
||||||
|
const char * extensions)
|
||||||
{
|
{
|
||||||
filebrowser_clear_current_entries(filebrowser);
|
filebrowser_clear_current_entries(filebrowser);
|
||||||
filebrowser->directory_stack_size = 0;
|
filebrowser->directory_stack_size = 0;
|
||||||
strncpy(filebrowser->extensions, extensions, sizeof(filebrowser->extensions));
|
strncpy(filebrowser->extensions, extensions, sizeof(filebrowser->extensions));
|
||||||
|
|
||||||
filebrowser_parse_directory(filebrowser, start_dir, filebrowser->extensions);
|
filebrowser_parse_directory(filebrowser, start_dir, filebrowser->extensions);
|
||||||
}
|
}
|
||||||
|
|
||||||
void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, bool with_extension)
|
void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path,
|
||||||
|
bool with_extension)
|
||||||
{
|
{
|
||||||
filebrowser->directory_stack_size++;
|
filebrowser->directory_stack_size++;
|
||||||
if(with_extension)
|
|
||||||
filebrowser_parse_directory(filebrowser, path, filebrowser->extensions);
|
if(with_extension)
|
||||||
else
|
filebrowser_parse_directory(filebrowser, path, filebrowser->extensions);
|
||||||
filebrowser_parse_directory(filebrowser, path, "empty");
|
else
|
||||||
|
filebrowser_parse_directory(filebrowser, path, "empty");
|
||||||
}
|
}
|
||||||
|
|
||||||
void filebrowser_pop_directory (filebrowser_t * filebrowser)
|
void filebrowser_pop_directory (filebrowser_t * filebrowser)
|
||||||
{
|
{
|
||||||
if (filebrowser->directory_stack_size > 0)
|
if (filebrowser->directory_stack_size > 0)
|
||||||
filebrowser->directory_stack_size--;
|
filebrowser->directory_stack_size--;
|
||||||
|
|
||||||
filebrowser_parse_directory(filebrowser, filebrowser->dir[filebrowser->directory_stack_size], filebrowser->extensions);
|
filebrowser_parse_directory(filebrowser, filebrowser->dir[filebrowser->directory_stack_size],
|
||||||
|
filebrowser->extensions);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,19 +56,19 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint8_t d_type;
|
uint8_t d_type;
|
||||||
uint8_t d_namlen;
|
uint8_t d_namlen;
|
||||||
char d_name[CELL_FS_MAX_FS_FILE_NAME_LENGTH+1];
|
char d_name[CELL_FS_MAX_FS_FILE_NAME_LENGTH+1];
|
||||||
} DirectoryEntry;
|
} DirectoryEntry;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
uint32_t file_count; /* amount of files in current dir*/
|
uint32_t file_count; /* amount of files in current dir*/
|
||||||
uint32_t currently_selected; /* currently select browser entry*/
|
uint32_t currently_selected; /* currently select browser entry*/
|
||||||
uint32_t directory_stack_size;
|
uint32_t directory_stack_size;
|
||||||
char dir[128][CELL_FS_MAX_FS_PATH_LENGTH]; /* info of the current directory*/
|
char dir[128][CELL_FS_MAX_FS_PATH_LENGTH]; /* info of the current directory*/
|
||||||
DirectoryEntry cur[MAX_FILE_LIMIT_CFS]; /* current file listing*/
|
DirectoryEntry cur[MAX_FILE_LIMIT_CFS]; /* current file listing*/
|
||||||
char extensions[512]; /* allowed extensions*/
|
char extensions[512]; /* allowed extensions*/
|
||||||
} filebrowser_t;
|
} filebrowser_t;
|
||||||
|
|
||||||
void filebrowser_new(filebrowser_t * filebrowser, const char * start_dir, const char * extensions);
|
void filebrowser_new(filebrowser_t * filebrowser, const char * start_dir, const char * extensions);
|
||||||
|
|
@ -82,30 +82,30 @@ void filebrowser_pop_directory (filebrowser_t * filebrowser);
|
||||||
|
|
||||||
#define FILEBROWSER_INCREMENT_ENTRY(filebrowser) \
|
#define FILEBROWSER_INCREMENT_ENTRY(filebrowser) \
|
||||||
{ \
|
{ \
|
||||||
filebrowser.currently_selected++; \
|
filebrowser.currently_selected++; \
|
||||||
if (filebrowser.currently_selected >= filebrowser.file_count) \
|
if (filebrowser.currently_selected >= filebrowser.file_count) \
|
||||||
filebrowser.currently_selected = 0; \
|
filebrowser.currently_selected = 0; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FILEBROWSER_INCREMENT_ENTRY_POINTER(filebrowser) \
|
#define FILEBROWSER_INCREMENT_ENTRY_POINTER(filebrowser) \
|
||||||
{ \
|
{ \
|
||||||
filebrowser->currently_selected++; \
|
filebrowser->currently_selected++; \
|
||||||
if (filebrowser->currently_selected >= filebrowser->file_count) \
|
if (filebrowser->currently_selected >= filebrowser->file_count) \
|
||||||
filebrowser->currently_selected = 0; \
|
filebrowser->currently_selected = 0; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FILEBROWSER_DECREMENT_ENTRY(filebrowser) \
|
#define FILEBROWSER_DECREMENT_ENTRY(filebrowser) \
|
||||||
{ \
|
{ \
|
||||||
filebrowser.currently_selected--; \
|
filebrowser.currently_selected--; \
|
||||||
if (filebrowser.currently_selected >= filebrowser.file_count) \
|
if (filebrowser.currently_selected >= filebrowser.file_count) \
|
||||||
filebrowser.currently_selected = filebrowser.file_count - 1; \
|
filebrowser.currently_selected = filebrowser.file_count - 1; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FILEBROWSER_DECREMENT_ENTRY_POINTER(filebrowser) \
|
#define FILEBROWSER_DECREMENT_ENTRY_POINTER(filebrowser) \
|
||||||
{ \
|
{ \
|
||||||
filebrowser->currently_selected--; \
|
filebrowser->currently_selected--; \
|
||||||
if (filebrowser->currently_selected >= filebrowser->file_count) \
|
if (filebrowser->currently_selected >= filebrowser->file_count) \
|
||||||
filebrowser->currently_selected = filebrowser->file_count - 1; \
|
filebrowser->currently_selected = filebrowser->file_count - 1; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FILEBROWSER_GET_CURRENT_FILENAME(filebrowser) (filebrowser.cur[filebrowser.currently_selected].d_name)
|
#define FILEBROWSER_GET_CURRENT_FILENAME(filebrowser) (filebrowser.cur[filebrowser.currently_selected].d_name)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue