audlegacy: src/audacious/playlist.c comparison

comparison src/audacious/playlist.c @ 3863:dd5c459c5f2d

fix search and select. (bugzilla #29)

author	William Pitcock <nenolod@atheme.org>
date	Sun, 28 Oct 2007 09:19:29 -0500
parents	2c92b8947057
children	e48f2f4c116d

comparison

equal deleted inserted replaced

-:39bbef13fa41
+:dd5c459c5f2d
 {
 GList *entry_list = NULL, *found_list = NULL, *sel_list = NULL;
 gboolean is_first_search = TRUE;
 gint num_of_entries_found = 0;
 const gchar *regex_pattern;
-const gchar *track_name = tuple_get_string( tuple, FIELD_TITLE, NULL );
+const gchar *track_name;
-const gchar *album_name = tuple_get_string( tuple, FIELD_ALBUM, NULL );
+const gchar *album_name;
-const gchar *performer = tuple_get_string( tuple, FIELD_PERFORMER, NULL );
+const gchar *performer;
-const gchar *file_name = tuple_get_string( tuple, FIELD_FILE_NAME, NULL );
+const gchar *file_name;
 #if defined(USE_REGEX_ONIGURUMA)
 /* set encoding for Oniguruma regex to UTF-8 */
 reg_set_encoding( REG_POSIX_ENCODING_UTF8 );
 onig_set_default_syntax( ONIG_SYNTAX_POSIX_BASIC );
 #endif
 PLAYLIST_LOCK(playlist);
-if ( (regex_pattern = tuple_get_string(tuple, FIELD_TITLE, NULL)) != NULL )
+if ( (regex_pattern = tuple_get_string(tuple, FIELD_TITLE, NULL)) != NULL &&
+(*regex_pattern != '\0') )
 {
 /* match by track_name */
 regex_t regex;
 #if defined(USE_REGEX_PCRE)
 if ( regcomp( &regex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 )
 if ( is_first_search == TRUE ) entry_list = playlist->entries;
 else entry_list = found_list; /* use found_list */
 for ( ; entry_list ; entry_list = g_list_next(entry_list) )
 {
 PlaylistEntry *entry = entry_list->data;
-if ( ( entry->tuple != NULL ) && ( track_name != NULL ) &&
+if ( entry->tuple != NULL )
-( regexec( &regex , track_name , 0 , NULL , 0 ) == 0 ) )
 {
-tfound_list = g_list_append( tfound_list , entry );
+track_name = tuple_get_string( entry->tuple, FIELD_TITLE, NULL );
+if (( track_name != NULL ) &&
+( regexec( &regex , track_name , 0 , NULL , 0 ) == 0 ) )
+{
+tfound_list = g_list_append( tfound_list , entry );
+}
 }
 }
 g_list_free( found_list ); /* wipe old found_list */
 found_list = tfound_list; /* move tfound_list in found_list */
 regfree( &regex );
 }
 is_first_search = FALSE;
 }
-if ( (regex_pattern = tuple_get_string(tuple, FIELD_ALBUM, NULL)) != NULL )
+if ( (regex_pattern = tuple_get_string(tuple, FIELD_ALBUM, NULL)) != NULL &&
+(*regex_pattern != '\0') )
 {
 /* match by album_name */
 regex_t regex;
 #if defined(USE_REGEX_PCRE)
 if ( regcomp( &regex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 )
 if ( is_first_search == TRUE ) entry_list = playlist->entries;
 else entry_list = found_list; /* use found_list */
 for ( ; entry_list ; entry_list = g_list_next(entry_list) )
 {
 PlaylistEntry *entry = entry_list->data;
-if ( ( entry->tuple != NULL ) && ( album_name != NULL ) &&
+if ( entry->tuple != NULL )
-( regexec( &regex , album_name , 0 , NULL , 0 ) == 0 ) )
 {
-tfound_list = g_list_append( tfound_list , entry );
+album_name = tuple_get_string( entry->tuple, FIELD_ALBUM, NULL );
+if ( ( album_name != NULL ) &&
+( regexec( &regex , album_name , 0 , NULL , 0 ) == 0 ) )
+{
+tfound_list = g_list_append( tfound_list , entry );
+}
 }
 }
 g_list_free( found_list ); /* wipe old found_list */
 found_list = tfound_list; /* move tfound_list in found_list */
 regfree( &regex );
 }
 is_first_search = FALSE;
 }
-if ( (regex_pattern = tuple_get_string(tuple, FIELD_ARTIST, NULL)) != NULL )
+if ( (regex_pattern = tuple_get_string(tuple, FIELD_ARTIST, NULL)) != NULL &&
+(*regex_pattern != '\0') )
 {
 /* match by performer */
 regex_t regex;
 #if defined(USE_REGEX_PCRE)
 if ( regcomp( &regex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 )
 if ( is_first_search == TRUE ) entry_list = playlist->entries;
 else entry_list = found_list; /* use found_list */
 for ( ; entry_list ; entry_list = g_list_next(entry_list) )
 {
 PlaylistEntry *entry = entry_list->data;
-if ( ( entry->tuple != NULL ) && ( performer != NULL ) &&
+if ( entry->tuple != NULL )
-( regexec( &regex , performer , 0 , NULL , 0 ) == 0 ) )
 {
-tfound_list = g_list_append( tfound_list , entry );
+performer = tuple_get_string( entry->tuple, FIELD_ARTIST, NULL );
+if ( ( entry->tuple != NULL ) && ( performer != NULL ) &&
+( regexec( &regex , performer , 0 , NULL , 0 ) == 0 ) )
+{
+tfound_list = g_list_append( tfound_list , entry );
+}
 }
 }
 g_list_free( found_list ); /* wipe old found_list */
 found_list = tfound_list; /* move tfound_list in found_list */
 regfree( &regex );
 }
 is_first_search = FALSE;
 }
-if ( (regex_pattern = tuple_get_string(tuple, FIELD_FILE_NAME, NULL)) != NULL )
+if ( (regex_pattern = tuple_get_string(tuple, FIELD_FILE_NAME, NULL)) != NULL &&
+(*regex_pattern != '\0') )
 {
 /* match by file_name */
 regex_t regex;
 #if defined(USE_REGEX_PCRE)
 if ( regcomp( &regex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 )
 if ( is_first_search == TRUE ) entry_list = playlist->entries;
 else entry_list = found_list; /* use found_list */
 for ( ; entry_list ; entry_list = g_list_next(entry_list) )
 {
 PlaylistEntry *entry = entry_list->data;
-if ( ( entry->tuple != NULL ) && ( file_name != NULL ) &&
+if ( entry->tuple != NULL )
-( regexec( &regex , file_name , 0 , NULL , 0 ) == 0 ) )
 {
-tfound_list = g_list_append( tfound_list , entry );
+file_name = tuple_get_string( entry->tuple, FIELD_FILE_NAME, NULL );
+if ( ( file_name != NULL ) &&
+( regexec( &regex , file_name , 0 , NULL , 0 ) == 0 ) )
+{
+tfound_list = g_list_append( tfound_list , entry );
+}
 }
 }
 g_list_free( found_list ); /* wipe old found_list */
 found_list = tfound_list; /* move tfound_list in found_list */
 regfree( &regex );

Mercurial > audlegacy

comparison src/audacious/playlist.c @ 3863:dd5c459c5f2d