* subtitles.c
*****************************************************************************
* Copyright (C) 2003-2004 VideoLAN
- * $Id: subtitles.c,v 1.8 2004/01/25 17:16:06 zorglub Exp $
+ * $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan.org>
* This is adapted code from the GPL'ed MPlayer (http://mplayerhq.hu)
#include <vlc/vlc.h>
#include <vlc/input.h>
-#include "ninput.h"
-
#ifdef HAVE_DIRENT_H
# include <dirent.h>
#else
return strcoll(((subfn*)a)->psz_fname, ((subfn*)b)->psz_fname);
}
+/**
+ * Convert a list of paths separated by ',' to a char**
+ */
+static char **paths_to_list( char *psz_dir, char *psz_path )
+{
+ unsigned int i, k, i_nb_subdirs;
+ char **subdirs; /* list of subdirectories to look in */
+
+ i_nb_subdirs = 1;
+ for( k = 0; k < strlen( psz_path ); k++ )
+ {
+ if( psz_path[k] == ',' )
+ {
+ i_nb_subdirs++;
+ }
+ }
+
+ if( i_nb_subdirs > 0 )
+ {
+ char *psz_parser, *psz_temp;
+
+ subdirs = (char**)malloc( sizeof(char*) * ( i_nb_subdirs + 1 ) );
+ memset( subdirs, 0, sizeof(char*) * ( i_nb_subdirs + 1 ) );
+ i = 0;
+ psz_parser = psz_path;
+ while( psz_parser && *psz_parser )
+ {
+ char *psz_subdir;
+ psz_subdir = psz_parser;
+ psz_parser = strchr( psz_subdir, ',' );
+ if( psz_parser )
+ {
+ *psz_parser = '\0';
+ psz_parser++;
+ while( *psz_parser == ' ' )
+ {
+ psz_parser++;
+ }
+ }
+ if( strlen( psz_subdir ) > 0 )
+ {
+ psz_temp = (char *)malloc( strlen(psz_dir)
+ + strlen(psz_subdir) + 2 );
+ if( psz_temp )
+ {
+ sprintf( psz_temp, "%s%s%c",
+ psz_subdir[0] == '.' ? psz_dir : "",
+ psz_subdir,
+ psz_subdir[strlen(psz_subdir) - 1] ==
+ DIRECTORY_SEPARATOR ? '\0' : DIRECTORY_SEPARATOR );
+ subdirs[i] = psz_temp;
+ i++;
+ }
+ }
+ }
+ subdirs[i] = NULL;
+ }
+ else
+ {
+ subdirs = NULL;
+ }
+ return subdirs;
+}
+
/**
* Detect subtitle files.
*
*
* \ingroup Demux
* \param p_this the calling \ref input_thread_t
- * \param psz_path a subdirectory to look into. This is not used atm.
+ * \param psz_path a list of subdirectories (separated by a ',') to look in.
* \param psz_fname 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 )
+char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
+ char *psz_fname )
{
/* variables to be used for derivatives of psz_fname */
char *f_dir, *f_fname, *f_fname_noext, *f_fname_trim, *tmp;
int len, i, j, i_sub_count;
subfn *result; /* unsorted results */
char **result2; /* sorted results */
+ char **tmp_subdirs, **subdirs; /* list of subdirectories to look in */
FILE *f;
DIR *d;
struct dirent *de;
i_sub_count = 0;
- len = ( strlen( psz_fname ) > 256 ? strlen( psz_fname ) : 256 ) +
- ( strlen( psz_path ) > 256 ? strlen( psz_path ) : 256 ) + 2;
+ len = strlen( psz_fname ) > 256 ? strlen( psz_fname ) : 256;
f_dir = (char*)malloc(len);
f_fname = (char*)malloc(len);
if( tmp )
{
int pos;
- strcpy( f_fname, tmp + 1 );
- pos = tmp - psz_fname;
- strncpy( f_dir, psz_fname, pos + 1 );
- f_dir[pos + 1] = 0;
+ 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;
}
else
{
- strcpy( f_fname, psz_fname );
+ strncpy( f_fname, psz_fname, len - 1 );
+ f_fname[len - 1] = 0;
strcpy( f_dir, "" );
}
strcpy_trim( f_fname_trim, f_fname_noext );
var_Get( p_this, "sub-autodetect-fuzzy", &fuzzy );
+ tmp_subdirs = paths_to_list( f_dir, psz_path );
+ subdirs = tmp_subdirs;
- for( j = 0; j <= 1; j++)
+ for( j = -1; j == -1 || ( j >= 0 && subdirs != NULL && *subdirs != NULL );
+ j++)
{
- d = opendir( j == 0 ? f_dir : psz_path );
+ d = opendir( j < 0 ? f_dir : *subdirs );
if( d )
{
int b_found;
+ msg_Dbg( p_this, "looking for a subtitle file in %s",
+ j < 0 ? f_dir : *subdirs );
while( ( de = readdir( d ) ) )
{
/* retrieve various parts of the filename */
b_found = 0;
for( i = 0; sub_exts[i]; i++ )
{
- if( strcmp(sub_exts[i], tmp_fname_ext ) == 0 )
+ if( strcmp( sub_exts[i], tmp_fname_ext ) == 0 )
{
b_found = 1;
- msg_Dbg( p_this, "found a possible subtitle: %s", de->d_name );
+ msg_Dbg( p_this, "found a possible subtitle: %s",
+ de->d_name );
break;
}
}
if( b_found )
{
int i_prio = 0;
- if( !i_prio && strcmp( tmp_fname_trim, f_fname_trim ) == 0 )
+ if( !i_prio && !strcmp( tmp_fname_trim, f_fname_trim ) )
{
/* matches the movie name exactly */
i_prio = 4;
}
- if( !i_prio && ( tmp = strstr( tmp_fname_trim, f_fname_trim ) ) )
+ if( !i_prio &&
+ ( tmp = strstr( tmp_fname_trim, f_fname_trim ) ) )
{
/* contains the movie name */
tmp += strlen( f_fname_trim );
if( i_prio >= fuzzy.i_int )
{
- sprintf( tmpresult, "%s%s", j == 0 ? f_dir : psz_path, de->d_name );
- msg_Dbg( p_this, "autodetected subtitle: %s with priority %d", de->d_name, i_prio );
+ 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 );
+ result[i_sub_count].psz_fname = strdup(tmpresult);
i_sub_count++;
}
}
-
}
if( i_sub_count >= MAX_SUBTITLE_FILES ) break;
}
closedir( d );
}
+ if( j >= 0 ) free( *subdirs++ );
}
+ if( tmp_subdirs ) free( tmp_subdirs );
+
free( f_dir );
free( f_fname );
free( f_fname_noext );
free( result );
return result2;
}
-
projects / vlc / blobdiff