Skip to content

Commit

Permalink
Improved handling of long game lists.
Browse files Browse the repository at this point in the history
  • Loading branch information
@phulshof
phulshof committed Jan 26, 2015
1 parent a3912bd commit b2bc50c
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 31 deletions.
2 changes: 0 additions & 2 deletions emulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ int resume_all( void ) {
return -6;
if( submenu_resume() != 0 )
return -7;
if( game_list_resume() != 0 )
return -8;
sound_resume();
if( snap_resume() != 0 )
return -9;
Expand Down
126 changes: 109 additions & 17 deletions game.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,108 @@ struct game *game_first( void ) {
return game_filter_start;
}


// This function expects list_start to point to the start of the list
struct game *game_list_sort_nr_games( struct game *list_start, int nr_games )
{

// 1 game list
if ( nr_games == 1 )
return list_start;

//Define left list
struct game *left = list_start;

// Define right list
struct game *right = list_start;
int i;
for ( i = 1; i <= nr_games/2; i++ ) // Find the start of the 2nd half
right = right->all_next;
right->all_prev->all_next = NULL; // Disconnect the left list
right->all_prev = NULL; // Disconnect the right list

// Sort the lists
left = game_list_sort_nr_games( left, nr_games/2 );
right = game_list_sort_nr_games( right, nr_games-nr_games/2 );

// Merge the sorted lists
struct game *result;

// Determine the start of the merged list
if ( strcasecmp( left->name, right->name ) < 0 ) // left < right
{
result = left;
left = left->all_next;
}
else
{
result = right;
right = right->all_next;
}

// Merge the rest of the sorted lists
struct game *loop_game = result;
while ( left != NULL || right != NULL )
{
if ( right == NULL || (left != NULL && (strcasecmp( left->name, right->name ) < 0)) )
{
loop_game->all_next = left;
left->all_prev = loop_game;
loop_game = loop_game->all_next;
left = left->all_next;
}
else
{
loop_game->all_next = right;
right->all_prev = loop_game;
loop_game = loop_game->all_next;
right = right->all_next;
}
}

// Return the sorted list
return result;

}


struct game *game_list_sort( struct game *list_start )
{

struct game *loop_game;
int nr_games = 0;

// Check for empty list
if ( list_start == NULL )
return NULL;

// Disconnect the start and end of the list
list_start->all_prev->all_next = NULL;
list_start->all_prev = NULL;

// Count number of games in the list
for ( loop_game = list_start; loop_game != NULL; loop_game = loop_game->all_next )
{
nr_games++;
}

// Sort the list
struct game *result_game = game_list_sort_nr_games( list_start, nr_games );

// Reconnect the start and end of the list
loop_game = result_game;
while ( loop_game->all_next )
loop_game = loop_game->all_next;
loop_game->all_next = result_game;
result_game->all_prev = loop_game;

// Return the sorted list
return result_game;

}



void game_add( struct game *game, struct game *after ) {
if( after == NULL ) {
game->all_prev = game;
Expand Down Expand Up @@ -163,7 +265,7 @@ int game_add_category( struct game *game, char *name, char *value ) {

int game_list_create( void ) {
struct game *game = NULL;
struct game *prev = NULL;
struct game *last = NULL;
struct config_game *config_game = config_get()->games;

if( !config_game )
Expand Down Expand Up @@ -300,25 +402,15 @@ int game_list_create( void ) {
} while( category != category_first() );
}

/* insert into list (sort by name) */
prev = game_start;
if( game_start ) {
prev = game_start->all_prev;
while( strcasecmp( prev->name, game->name ) > 0 ) {
prev = prev->all_prev;
if( prev == game_start->all_prev ) break;
}
}
game_add( game, prev );
if( !game_start || strcasecmp( game->name, game_start->name ) < 0 ) {
game_start = game;
}
game->next = game->all_next;
game->prev = game->all_prev;
/* insert into list */
game_add( game, last );
if ( !game_start )
game_start = game;
last = game;
}
config_game = config_game->next;
}

game_start = game_list_sort( game_start );
game_list_unfilter();

/* if( game_start ) {
Expand Down
60 changes: 48 additions & 12 deletions location.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include "location.h"
#include "config.h"

Expand Down Expand Up @@ -172,8 +173,7 @@ int location_get_match( const char *type, const char *filename, char *path ) {
struct location *location = location_get_first( type );
char search[CONFIG_FILE_NAME_LENGTH];
char *pos = NULL;
DIR *dir = NULL;
struct dirent *dentry;
char check_path[CONFIG_FILE_NAME_LENGTH];
int found = 0;

if( type && filename ) {
Expand All @@ -194,19 +194,55 @@ int location_get_match( const char *type, const char *filename, char *path ) {
strcat( search, "." );

while( location && !found ) {
if( (dir = opendir( location->directory )) ) {
while( (dentry = readdir( dir )) ) {
#ifdef __WIN32__
if( strncasecmp( dentry->d_name, search, strlen(search) ) == 0 ) {
snprintf( path, CONFIG_FILE_NAME_LENGTH, "%s\\%s", location->directory, dentry->d_name );
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s\\%spng", location->directory, search );
#else
if( strncasecmp( dentry->d_name, search, strlen(search) ) == 0 ) {
snprintf( path, CONFIG_FILE_NAME_LENGTH, "%s/%s", location->directory, dentry->d_name );
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s/%spng", location->directory, search );
#endif
found++;
}
}
closedir( dir );
if ( access( check_path, 0 ) == 0 )
{
strcpy( path, check_path );
found++;
}
#ifdef __WIN32__
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s\\%sjpg", location->directory, search );
#else
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s/%sjpg", location->directory, search );
#endif
if ( access( check_path, 0 ) == 0 )
{
strcpy( path, check_path );
found++;
}
#ifdef __WIN32__
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s\\%smp3", location->directory, search );
#else
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s/%smp3", location->directory, search );
#endif
if ( access( check_path, 0 ) == 0 )
{
strcpy( path, check_path );
found++;
}
#ifdef __WIN32__
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s\\%sflv", location->directory, search );
#else
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s/%sflv", location->directory, search );
#endif
if ( access( check_path, 0 ) == 0 )
{
strcpy( path, check_path );
found++;
}
#ifdef __WIN32__
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s\\%smp4", location->directory, search );
#else
snprintf( check_path, CONFIG_FILE_NAME_LENGTH, "%s/%smp4", location->directory, search );
#endif
if ( access( check_path, 0 ) == 0 )
{
strcpy( path, check_path );
found++;
}
location = location->next;
}
Expand Down

0 comments on commit b2bc50c

Please sign in to comment.