X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fsubtitles.c;h=dbd54788693eab608ae23733446f4f8dbbe8ea33;hb=eb2afbaa76f379729ce4136d6475dc6d6f58a1da;hp=caf75ab77159bd28cbb719763976e24ee12e93e5;hpb=7e2851ea846272c71709886cb9843735a72a1a66;p=vlc diff --git a/src/input/subtitles.c b/src/input/subtitles.c index caf75ab771..dbd5478869 100644 --- a/src/input/subtitles.c +++ b/src/input/subtitles.c @@ -1,7 +1,7 @@ /***************************************************************************** * subtitles.c ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2006 the VideoLAN team * $Id$ * * Authors: Derk-Jan Hartman @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -29,24 +29,24 @@ #include #include -#include +#include +#include #ifdef HAVE_DIRENT_H # include -#else -# include "../extras/dirent.h" #endif -#include +#ifdef HAVE_LIMITS_H +# include +#endif -/** - * What's between a directory and a filename? - */ -#if defined( WIN32 ) - #define DIRECTORY_SEPARATOR '\\' -#else - #define DIRECTORY_SEPARATOR '/' +#ifdef HAVE_UNISTD_H +# include #endif +#include + +#include +#include "input_internal.h" /** * We are not going to autodetect more subtitle files than this. @@ -55,9 +55,9 @@ /** - * The possible extentions for subtitle files we support + * The possible extensions for subtitle files we support */ -static const char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "txt", "ssa", "idx", NULL}; +static const char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "txt", "ssa", "idx", NULL }; /* extensions from unsupported types */ /* rt, aqt, jss, js, ass */ @@ -76,7 +76,7 @@ static void strcpy_trim( char *d, char *s ) *d = tolower(*s); s++; d++; } - if (*s == 0) break; + if( *s == 0 ) break; /* trim excess whitespace */ while( *s && !isalnum(*s) ) { @@ -91,15 +91,13 @@ static void strcpy_trim( char *d, char *s ) static void strcpy_strip_ext( char *d, char *s ) { char *tmp = strrchr(s, '.'); - if( !tmp ) { + if( !tmp ) + { strcpy(d, s); return; } else - { - strncpy(d, s, tmp - s); - d[tmp - s] = 0; - } + strlcpy(d, s, tmp - s + 1 ); while( *d ) { *d = tolower(*d); @@ -131,6 +129,7 @@ typedef struct _subfn { int priority; char *psz_fname; + char *psz_ext; } subfn; static int compare_sub_priority( const void *a, const void *b ) @@ -152,14 +151,38 @@ static int compare_sub_priority( const void *a, const void *b ) #endif } +/* + * Check if a file ends with a subtitle extension + */ +int subtitles_Filter( const char *psz_dir_content ) +{ + const char *tmp = strrchr( psz_dir_content, '.'); + if( tmp == NULL ) + return 0; + else + { + int i; + tmp++; + + for( i = 0; sub_exts[i]; i++ ) + if( strcasecmp( sub_exts[i], tmp ) == 0 ) + return 1; + } + return 0; +} + + /** * Convert a list of paths separated by ',' to a char** */ -static char **paths_to_list( char *psz_dir, char *psz_path ) +static char **paths_to_list( const char *psz_dir, char *psz_path ) { unsigned int i, k, i_nb_subdirs; char **subdirs; /* list of subdirectories to look in */ - + + if( !psz_dir ) return NULL; + if( !psz_path ) return NULL; + i_nb_subdirs = 1; for( k = 0; k < strlen( psz_path ); k++ ) { @@ -168,11 +191,11 @@ static char **paths_to_list( char *psz_dir, char *psz_path ) i_nb_subdirs++; } } - + if( i_nb_subdirs > 0 ) { - char *psz_parser, *psz_temp; - + char *psz_parser = NULL, *psz_temp = NULL; + subdirs = (char**)malloc( sizeof(char*) * ( i_nb_subdirs + 1 ) ); memset( subdirs, 0, sizeof(char*) * ( i_nb_subdirs + 1 ) ); i = 0; @@ -197,11 +220,11 @@ static char **paths_to_list( char *psz_dir, char *psz_path ) + strlen(psz_subdir) + 2 ); if( psz_temp ) { - sprintf( psz_temp, "%s%s%c", - psz_subdir[0] == '.' ? psz_dir : "", + sprintf( psz_temp, "%s%s%c", + psz_subdir[0] == '.' ? psz_dir : "", psz_subdir, - psz_subdir[strlen(psz_subdir) - 1] == - DIRECTORY_SEPARATOR ? '\0' : DIRECTORY_SEPARATOR ); + psz_subdir[strlen(psz_subdir) - 1] == + DIR_SEP_CHAR ? '\0' : DIR_SEP_CHAR ); subdirs[i] = psz_temp; i++; } @@ -216,10 +239,11 @@ static char **paths_to_list( char *psz_dir, char *psz_path ) return subdirs; } + /** * Detect subtitle files. * - * When called this function will split up the psz_fname string into a + * When called this function will split up the psz_name string into a * directory, filename and extension. It then opens the directory * in which the file resides and tries to find possible matches of * subtitles files. @@ -227,180 +251,219 @@ static char **paths_to_list( char *psz_dir, char *psz_path ) * \ingroup Demux * \param p_this the calling \ref input_thread_t * \param psz_path a list of subdirectories (separated by a ',') to look in. - * \param psz_fname the complete filename to base the search on. + * \param psz_name the complete filename to base the search on. * \return a NULL terminated array of filenames with detected possible subtitles. * The array contains max MAX_SUBTITLE_FILES items and you need to free it after use. */ char **subtitles_Detect( input_thread_t *p_this, char *psz_path, - char *psz_fname ) + const char *psz_name ) { - /* variables to be used for derivatives of psz_fname */ - char *f_dir, *f_fname, *f_fname_noext, *f_fname_trim, *tmp; - /* variables to be used for derivatives FILE *f */ - char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult; vlc_value_t fuzzy; - int len, i, j, i_sub_count; - subfn *result; /* unsorted results */ - char **result2; /* sorted results */ + int j, i_result2, i_sub_count = 0, i_fname_len = 0; + char *f_dir = NULL, *f_fname = NULL, *f_fname_noext = NULL, *f_fname_trim = NULL; + char *tmp = NULL; + char **tmp_subdirs, **subdirs; /* list of subdirectories to look in */ - FILE *f; - DIR *d; - struct dirent *de; + subfn *result = NULL; /* unsorted results */ + char **result2; /* sorted results */ + + char *psz_fname_original = strdup( psz_name ); + char *psz_fname = psz_fname_original; + + if( psz_fname == NULL ) return NULL; if( !strncmp( psz_fname, "file://", 7 ) ) { psz_fname += 7; } - i_sub_count = 0; - len = strlen( psz_fname ) > 256 ? strlen( psz_fname ) : 256; - - f_dir = (char*)malloc(len); - f_fname = (char*)malloc(len); - f_fname_noext = (char*)malloc(len); - f_fname_trim = (char*)malloc(len); - - tmp_fname_noext = (char*)malloc(len); - tmp_fname_trim = (char*)malloc(len); - tmp_fname_ext = (char*)malloc(len); - - tmpresult = (char*)malloc(len); - - result = (subfn*)malloc( sizeof(subfn) * MAX_SUBTITLE_FILES ); - memset( result, 0, sizeof(subfn) * MAX_SUBTITLE_FILES ); - /* extract filename & dirname from psz_fname */ - tmp = strrchr( psz_fname, DIRECTORY_SEPARATOR ); + tmp = strrchr( psz_fname, DIR_SEP_CHAR ); if( tmp ) { - int pos; - strncpy( f_fname, tmp + 1, len - 1 ); - f_fname[len - 1] = 0; - pos = tmp - psz_fname + 1; - strncpy( f_dir, psz_fname, __MIN(pos,len-1) ); - f_dir[__MIN(pos,len-1)] = 0; + int dirlen = 0; + + f_fname = malloc( strlen(tmp) ); + if( f_fname ) + strcpy( f_fname, tmp+1 ); // we skip the separator, so it will still fit in the allocated space + dirlen = strlen(psz_fname) - strlen(tmp) + 2; // add the separator + f_dir = malloc( dirlen + 1 ); + if( f_dir != NULL ) + strlcpy( f_dir, psz_fname, dirlen ); } else { - strncpy( f_fname, psz_fname, len - 1 ); - f_fname[len - 1] = 0; - strcpy( f_dir, "" ); + /* Get the current working directory */ + int dirlen; +#ifdef HAVE_UNISTD_H + f_dir = getcwd( NULL, 0 ); +#endif + if( f_dir == NULL ) + { + if( psz_fname_original ) free( psz_fname_original ); + return NULL; + } + dirlen = strlen( f_dir ); + f_dir = (char *)realloc(f_dir, dirlen +2 ); + f_dir[dirlen] = DIR_SEP_CHAR; + f_dir[dirlen+1] = '\0'; + f_fname = strdup( psz_fname ); } + i_fname_len = strlen( f_fname ); + f_fname_noext = malloc(i_fname_len + 1); + f_fname_trim = malloc(i_fname_len + 1 ); + strcpy_strip_ext( f_fname_noext, f_fname ); strcpy_trim( f_fname_trim, f_fname_noext ); + + result = (subfn*)malloc( sizeof(subfn) * MAX_SUBTITLE_FILES ); + if( result ) + memset( result, 0, sizeof(subfn) * MAX_SUBTITLE_FILES ); + var_Get( p_this, "sub-autodetect-fuzzy", &fuzzy ); tmp_subdirs = paths_to_list( f_dir, psz_path ); subdirs = tmp_subdirs; - for( j = -1; j == -1 || ( j >= 0 && subdirs != NULL && *subdirs != NULL ); - j++) + for( j = -1; (j == -1) || ( (j >= 0) && (subdirs != NULL) && + (*subdirs != NULL) ); j++) { - d = opendir( j < 0 ? f_dir : *subdirs ); - if( d ) + const char *psz_dir = j < 0 ? f_dir : *subdirs; + char **ppsz_dir_content; + int i_dir_content; + + if( psz_dir == NULL ) + continue; + + /* parse psz_src dir */ + i_dir_content = utf8_scandir( psz_dir, &ppsz_dir_content, + subtitles_Filter, NULL ); + + if( i_dir_content != -1 ) { - int b_found; - msg_Dbg( p_this, "looking for a subtitle file in %s", - j < 0 ? f_dir : *subdirs ); - while( ( de = readdir( d ) ) ) + int a; + + msg_Dbg( p_this, "looking for a subtitle file in %s", psz_dir ); + for( a = 0; a < i_dir_content; a++ ) { + char *psz_name = ppsz_dir_content[a]; + char tmp_fname_noext[strlen( psz_name ) + 1]; + char tmp_fname_trim[strlen( psz_name ) + 1]; + char tmp_fname_ext[strlen( psz_name ) + 1]; + + int i_prio = 0; + + if( psz_name == NULL ) + continue; + /* retrieve various parts of the filename */ - strcpy_strip_ext( tmp_fname_noext, de->d_name ); - strcpy_get_ext( tmp_fname_ext, de->d_name ); + strcpy_strip_ext( tmp_fname_noext, psz_name ); + strcpy_get_ext( tmp_fname_ext, psz_name ); strcpy_trim( tmp_fname_trim, tmp_fname_noext ); - /* does it end with a subtitle extension? */ - b_found = 0; - for( i = 0; sub_exts[i]; i++ ) + if( !i_prio && !strcmp( tmp_fname_trim, f_fname_trim ) ) { - if( strcmp( sub_exts[i], tmp_fname_ext ) == 0 ) - { - b_found = 1; - msg_Dbg( p_this, "found a possible subtitle: %s", - de->d_name ); - break; - } + /* matches the movie name exactly */ + i_prio = 4; } - - /* we have a (likely) subtitle file */ - if( b_found ) + if( !i_prio && + ( tmp = strstr( tmp_fname_trim, f_fname_trim ) ) ) { - int i_prio = 0; - if( !i_prio && !strcmp( tmp_fname_trim, f_fname_trim ) ) + /* contains the movie name */ + tmp += strlen( f_fname_trim ); + if( whiteonly( tmp ) ) { - /* matches the movie name exactly */ - i_prio = 4; + /* chars in front of the movie name */ + i_prio = 2; } - if( !i_prio && - ( tmp = strstr( tmp_fname_trim, f_fname_trim ) ) ) + else { - /* contains the movie name */ - tmp += strlen( f_fname_trim ); - if( whiteonly( tmp ) ) - { - /* chars in front of the movie name */ - i_prio = 2; - } - else - { - /* chars after (and possibly in front of) - * the movie name */ - i_prio = 3; - } + /* chars after (and possibly in front of) + * the movie name */ + i_prio = 3; } - if( !i_prio ) + } + if( !i_prio ) + { + /* doesn't contain the movie name */ + if( j == 0 ) i_prio = 1; + } + if( i_prio >= fuzzy.i_int ) + { + char psz_path[strlen( psz_dir ) + strlen( psz_name ) + 1]; + struct stat st; + + sprintf( psz_path, "%s%s", psz_dir, psz_name ); + msg_Dbg( p_this, + "autodetected subtitle: %s with priority %d", + psz_path, i_prio ); + + if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) ) { - /* doesn't contain the movie name */ - if( j == 0 ) i_prio = 1; + msg_Dbg( p_this, + "autodetected subtitle: %s with priority %d", + psz_path, i_prio ); + result[i_sub_count].priority = i_prio; + result[i_sub_count].psz_fname = strdup( psz_path ); + result[i_sub_count].psz_ext = strdup(tmp_fname_ext); + i_sub_count++; } - - if( i_prio >= fuzzy.i_int ) + else { - sprintf( tmpresult, "%s%s", j == -1 ? f_dir : *subdirs, - de->d_name ); - msg_Dbg( p_this, "autodetected subtitle: %s with " - "priority %d", de->d_name, i_prio ); - if( ( f = fopen( tmpresult, "rt" ) ) ) - { - fclose( f ); - result[i_sub_count].priority = i_prio; - result[i_sub_count].psz_fname = strdup(tmpresult); - i_sub_count++; - } + msg_Dbg( p_this, "stat failed" ); } } if( i_sub_count >= MAX_SUBTITLE_FILES ) break; } - closedir( d ); + for( a = 0; a < i_dir_content; a++ ) + free( ppsz_dir_content[a] ); + if( ppsz_dir_content ) free( ppsz_dir_content ); } - if( j >= 0 ) free( *subdirs++ ); + if( j >= 0 ) if( *subdirs ) free( *subdirs++ ); } - if( tmp_subdirs ) free( tmp_subdirs ); - - free( f_dir ); - free( f_fname ); - free( f_fname_noext ); - free( f_fname_trim ); - - free( tmp_fname_noext ); - free( tmp_fname_trim ); - free( tmp_fname_ext ); - - free( tmpresult ); + if( tmp_subdirs ) free( tmp_subdirs ); + if( f_fname_trim ) free( f_fname_trim ); + if( f_fname_noext ) free( f_fname_noext ); + if( f_fname ) free( f_fname ); + if( f_dir ) free( f_dir ); qsort( result, i_sub_count, sizeof( subfn ), compare_sub_priority ); result2 = (char**)malloc( sizeof(char*) * ( i_sub_count + 1 ) ); - memset( result2, 0, sizeof(char*) * ( i_sub_count + 1 ) ); + if( result2 ) + memset( result2, 0, sizeof(char*) * ( i_sub_count + 1 ) ); + i_result2 = 0; - for( i = 0; i < i_sub_count; i++ ) + for( j = 0; j < i_sub_count; j++ ) { - result2[i] = result[i].psz_fname; + if( result[j].psz_ext && !strcasecmp( result[j].psz_ext, "sub" ) ) + { + int i; + for( i = 0; i < i_sub_count; i++ ) + { + if( result[i].psz_fname && result[j].psz_fname && + !strncasecmp( result[j].psz_fname, result[i].psz_fname, + sizeof( result[j].psz_fname) - 4 ) && + !strcasecmp( result[i].psz_ext, "idx" ) ) + break; + } + if( i >= i_sub_count ) + { + result2[i_result2] = result[j].psz_fname; + i_result2++; + } + } + else + { + result2[i_result2] = result[j].psz_fname; + i_result2++; + } } - result2[i_sub_count] = NULL; - free( result ); + + if( psz_fname_original ) free( psz_fname_original ); + if( result ) free( result ); return result2; }