From 8782354e6d275e2e92fc129d4358864312032e76 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 20 Sep 2015 18:05:06 +0200 Subject: player: rename and move find_subfiles.c This was in sub/, because the code used to be specific to subtitles. It was extended to automatically load external audio files too, and moving the file and renaming it was long overdue. --- TOOLS/old-makefile | 2 +- input/event.c | 2 +- player/external_files.c | 284 ++++++++++++++++++++++++++++++++++++++++++++++++ player/external_files.h | 35 ++++++ player/loadfile.c | 2 +- sub/find_subfiles.c | 284 ------------------------------------------------ sub/find_subfiles.h | 35 ------ wscript_build.py | 2 +- 8 files changed, 323 insertions(+), 323 deletions(-) create mode 100644 player/external_files.c create mode 100644 player/external_files.h delete mode 100644 sub/find_subfiles.c delete mode 100644 sub/find_subfiles.h diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile index 5477811832..107495b49d 100644 --- a/TOOLS/old-makefile +++ b/TOOLS/old-makefile @@ -195,6 +195,7 @@ SOURCES = audio/audio.c \ player/client.c \ player/configfiles.c \ player/command.c \ + player/external_files.c \ player/loadfile.c \ player/main.c \ player/misc.c \ @@ -219,7 +220,6 @@ SOURCES = audio/audio.c \ stream/stream_rar.c \ sub/dec_sub.c \ sub/draw_bmp.c \ - sub/find_subfiles.c \ sub/img_convert.c \ sub/osd.c \ sub/sd_lavc.c \ diff --git a/input/event.c b/input/event.c index d47f17ddaf..2c46978b15 100644 --- a/input/event.c +++ b/input/event.c @@ -18,7 +18,7 @@ #include "event.h" #include "input.h" #include "common/msg.h" -#include "sub/find_subfiles.h" +#include "player/external_files.h" void mp_event_drop_files(struct input_ctx *ictx, int num_files, char **files, enum mp_dnd_action action) diff --git a/player/external_files.c b/player/external_files.c new file mode 100644 index 0000000000..77e12db066 --- /dev/null +++ b/player/external_files.c @@ -0,0 +1,284 @@ +#include +#include +#include +#include +#include + +#include "osdep/io.h" + +#include "common/common.h" +#include "common/global.h" +#include "common/msg.h" +#include "misc/ctype.h" +#include "options/options.h" +#include "options/path.h" +#include "external_files.h" + +static const char *const sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt", + "smi", "rt", "txt", "ssa", "aqt", "jss", + "js", "ass", "mks", "vtt", "sup", NULL}; + +static const char *const audio_exts[] = {"mp3", "aac", "mka", "dts", "flac", + "ogg", "m4a", "ac3", "opus", NULL}; + +static bool test_ext_list(bstr ext, const char *const *list) +{ + for (int n = 0; list[n]; n++) { + if (bstrcasecmp(bstr0(list[n]), ext) == 0) + return true; + } + return false; +} + +static int test_ext(bstr ext) +{ + if (test_ext_list(ext, sub_exts)) + return STREAM_SUB; + if (test_ext_list(ext, audio_exts)) + return STREAM_AUDIO; + return -1; +} + +static struct bstr strip_ext(struct bstr str) +{ + int dotpos = bstrrchr(str, '.'); + if (dotpos < 0) + return str; + return (struct bstr){str.start, dotpos}; +} + +static struct bstr get_ext(struct bstr s) +{ + int dotpos = bstrrchr(s, '.'); + if (dotpos < 0) + return (struct bstr){NULL, 0}; + return bstr_splice(s, dotpos + 1, s.len); +} + +bool mp_might_be_subtitle_file(const char *filename) +{ + return test_ext(get_ext(bstr0(filename))) == STREAM_SUB; +} + +static int compare_sub_filename(const void *a, const void *b) +{ + const struct subfn *s1 = a; + const struct subfn *s2 = b; + return strcoll(s1->fname, s2->fname); +} + +static int compare_sub_priority(const void *a, const void *b) +{ + const struct subfn *s1 = a; + const struct subfn *s2 = b; + if (s1->priority > s2->priority) + return -1; + if (s1->priority < s2->priority) + return 1; + return strcoll(s1->fname, s2->fname); +} + +static struct bstr guess_lang_from_filename(struct bstr name) +{ + if (name.len < 2) + return (struct bstr){NULL, 0}; + + int n = 0; + int i = name.len - 1; + + if (name.start[i] == ')' || name.start[i] == ']') + i--; + while (i >= 0 && mp_isalpha(name.start[i])) { + n++; + if (n > 3) + return (struct bstr){NULL, 0}; + i--; + } + if (n < 2) + return (struct bstr){NULL, 0}; + return (struct bstr){name.start + i + 1, n}; +} + +static void append_dir_subtitles(struct mpv_global *global, + struct subfn **slist, int *nsub, + struct bstr path, const char *fname, + int limit_fuzziness) +{ + void *tmpmem = talloc_new(NULL); + struct MPOpts *opts = global->opts; + struct mp_log *log = mp_log_new(tmpmem, global->log, "find_files"); + + if (mp_is_url(bstr0(fname))) + goto out; + + struct bstr f_fname = bstr0(mp_basename(fname)); + struct bstr f_fname_noext = bstrdup(tmpmem, strip_ext(f_fname)); + bstr_lower(f_fname_noext); + struct bstr f_fname_trim = bstr_strip(f_fname_noext); + + // 0 = nothing + // 1 = any subtitle file + // 2 = any sub file containing movie name + // 3 = sub file containing movie name and the lang extension + char *path0 = bstrdup0(tmpmem, path); + DIR *d = opendir(path0); + if (!d) + goto out; + mp_verbose(log, "Loading external files in %.*s\n", BSTR_P(path)); + struct dirent *de; + while ((de = readdir(d))) { + struct bstr dename = bstr0(de->d_name); + void *tmpmem2 = talloc_new(tmpmem); + + // retrieve various parts of the filename + struct bstr tmp_fname_noext = bstrdup(tmpmem2, strip_ext(dename)); + bstr_lower(tmp_fname_noext); + struct bstr tmp_fname_ext = get_ext(dename); + struct bstr tmp_fname_trim = bstr_strip(tmp_fname_noext); + + // check what it is (most likely) + int type = test_ext(tmp_fname_ext); + char **langs = NULL; + int fuzz = -1; + switch (type) { + case STREAM_SUB: + langs = opts->stream_lang[type]; + fuzz = opts->sub_auto; + break; + case STREAM_AUDIO: + langs = opts->stream_lang[type]; + fuzz = opts->audiofile_auto; + break; + } + + if (fuzz < 0) + goto next_sub; + + // we have a (likely) subtitle file + int prio = 0; + char *found_lang = NULL; + if (langs) { + if (bstr_startswith(tmp_fname_trim, f_fname_trim)) { + struct bstr lang = guess_lang_from_filename(tmp_fname_trim); + if (lang.len) { + for (int n = 0; langs[n]; n++) { + if (bstr_startswith0(lang, langs[n])) { + prio = 4; // matches the movie name + lang extension + found_lang = langs[n]; + break; + } + } + } + } + } + if (!prio && bstrcmp(tmp_fname_trim, f_fname_trim) == 0) + prio = 3; // matches the movie name + if (!prio && bstr_find(tmp_fname_trim, f_fname_trim) >= 0 && fuzz >= 1) + prio = 2; // contains the movie name + if (!prio) { + // doesn't contain the movie name + // don't try in the mplayer subtitle directory + if (!limit_fuzziness && fuzz >= 2) { + prio = 1; + } + } + + mp_dbg(log, "Potential external file: \"%s\" Priority: %d\n", + de->d_name, prio); + + if (prio) { + prio += prio; + char *subpath = mp_path_join_bstr(*slist, path, dename); + if (mp_path_exists(subpath)) { + MP_GROW_ARRAY(*slist, *nsub); + struct subfn *sub = *slist + (*nsub)++; + + // annoying and redundant + if (strncmp(subpath, "./", 2) == 0) + subpath += 2; + + sub->type = type; + sub->priority = prio; + sub->fname = subpath; + sub->lang = found_lang; + } else + talloc_free(subpath); + } + + next_sub: + talloc_free(tmpmem2); + } + closedir(d); + + out: + talloc_free(tmpmem); +} + +static bool case_endswith(const char *s, const char *end) +{ + size_t len = strlen(s); + size_t elen = strlen(end); + return len >= elen && strcasecmp(s + len - elen, end) == 0; +} + +// Drop .sub file if .idx file exists. +// Assumes slist is sorted by compare_sub_filename. +static void filter_subidx(struct subfn **slist, int *nsub) +{ + const char *prev = NULL; + for (int n = 0; n < *nsub; n++) { + const char *fname = (*slist)[n].fname; + if (case_endswith(fname, ".idx")) { + prev = fname; + } else if (case_endswith(fname, ".sub")) { + if (prev && strncmp(prev, fname, strlen(fname) - 4) == 0) + (*slist)[n].priority = -1; + } + } + for (int n = *nsub - 1; n >= 0; n--) { + if ((*slist)[n].priority < 0) + MP_TARRAY_REMOVE_AT(*slist, *nsub, n); + } +} + +// Return a list of subtitles and audio files found, sorted by priority. +// Last element is terminated with a fname==NULL entry. +struct subfn *find_external_files(struct mpv_global *global, const char *fname) +{ + struct MPOpts *opts = global->opts; + struct subfn *slist = talloc_array_ptrtype(NULL, slist, 1); + int n = 0; + + // Load subtitles from current media directory + append_dir_subtitles(global, &slist, &n, mp_dirname(fname), fname, 0); + + if (opts->sub_auto >= 0) { + // Load subtitles in dirs specified by sub-paths option + if (opts->sub_paths) { + for (int i = 0; opts->sub_paths[i]; i++) { + char *path = mp_path_join_bstr(slist, mp_dirname(fname), + bstr0(opts->sub_paths[i])); + append_dir_subtitles(global, &slist, &n, bstr0(path), fname, 0); + } + } + + // Load subtitles in ~/.mpv/sub limiting sub fuzziness + char *mp_subdir = mp_find_config_file(NULL, global, "sub/"); + if (mp_subdir) + append_dir_subtitles(global, &slist, &n, bstr0(mp_subdir), fname, 1); + talloc_free(mp_subdir); + } + + // Sort by name for filter_subidx() + qsort(slist, n, sizeof(*slist), compare_sub_filename); + + filter_subidx(&slist, &n); + + // Sort subs by priority and append them + qsort(slist, n, sizeof(*slist), compare_sub_priority); + + struct subfn z = {0}; + MP_TARRAY_APPEND(NULL, slist, n, z); + + return slist; +} diff --git a/player/external_files.h b/player/external_files.h new file mode 100644 index 0000000000..223bf06e86 --- /dev/null +++ b/player/external_files.h @@ -0,0 +1,35 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with mpv. If not, see . + */ + +#ifndef MPLAYER_FIND_SUBFILES_H +#define MPLAYER_FIND_SUBFILES_H + +#include + +struct subfn { + int type; // STREAM_SUB/STREAM_AUDIO + int priority; + char *fname; + char *lang; +}; + +struct mpv_global; +struct subfn *find_external_files(struct mpv_global *global, const char *fname); + +bool mp_might_be_subtitle_file(const char *filename); + +#endif /* MPLAYER_FINDFILES_H */ diff --git a/player/loadfile.c b/player/loadfile.c index 4e32ccd6b6..2b87dfd927 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -50,7 +50,7 @@ #include "demux/demux.h" #include "stream/stream.h" #include "sub/dec_sub.h" -#include "sub/find_subfiles.h" +#include "external_files.h" #include "video/decode/dec_video.h" #include "video/out/vo.h" diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c deleted file mode 100644 index 8b01a8b0ae..0000000000 --- a/sub/find_subfiles.c +++ /dev/null @@ -1,284 +0,0 @@ -#include -#include -#include -#include -#include - -#include "osdep/io.h" - -#include "common/common.h" -#include "common/global.h" -#include "common/msg.h" -#include "misc/ctype.h" -#include "options/options.h" -#include "options/path.h" -#include "sub/find_subfiles.h" - -static const char *const sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt", - "smi", "rt", "txt", "ssa", "aqt", "jss", - "js", "ass", "mks", "vtt", "sup", NULL}; - -static const char *const audio_exts[] = {"mp3", "aac", "mka", "dts", "flac", - "ogg", "m4a", "ac3", "opus", NULL}; - -static bool test_ext_list(bstr ext, const char *const *list) -{ - for (int n = 0; list[n]; n++) { - if (bstrcasecmp(bstr0(list[n]), ext) == 0) - return true; - } - return false; -} - -static int test_ext(bstr ext) -{ - if (test_ext_list(ext, sub_exts)) - return STREAM_SUB; - if (test_ext_list(ext, audio_exts)) - return STREAM_AUDIO; - return -1; -} - -static struct bstr strip_ext(struct bstr str) -{ - int dotpos = bstrrchr(str, '.'); - if (dotpos < 0) - return str; - return (struct bstr){str.start, dotpos}; -} - -static struct bstr get_ext(struct bstr s) -{ - int dotpos = bstrrchr(s, '.'); - if (dotpos < 0) - return (struct bstr){NULL, 0}; - return bstr_splice(s, dotpos + 1, s.len); -} - -bool mp_might_be_subtitle_file(const char *filename) -{ - return test_ext(get_ext(bstr0(filename))) == STREAM_SUB; -} - -static int compare_sub_filename(const void *a, const void *b) -{ - const struct subfn *s1 = a; - const struct subfn *s2 = b; - return strcoll(s1->fname, s2->fname); -} - -static int compare_sub_priority(const void *a, const void *b) -{ - const struct subfn *s1 = a; - const struct subfn *s2 = b; - if (s1->priority > s2->priority) - return -1; - if (s1->priority < s2->priority) - return 1; - return strcoll(s1->fname, s2->fname); -} - -static struct bstr guess_lang_from_filename(struct bstr name) -{ - if (name.len < 2) - return (struct bstr){NULL, 0}; - - int n = 0; - int i = name.len - 1; - - if (name.start[i] == ')' || name.start[i] == ']') - i--; - while (i >= 0 && mp_isalpha(name.start[i])) { - n++; - if (n > 3) - return (struct bstr){NULL, 0}; - i--; - } - if (n < 2) - return (struct bstr){NULL, 0}; - return (struct bstr){name.start + i + 1, n}; -} - -static void append_dir_subtitles(struct mpv_global *global, - struct subfn **slist, int *nsub, - struct bstr path, const char *fname, - int limit_fuzziness) -{ - void *tmpmem = talloc_new(NULL); - struct MPOpts *opts = global->opts; - struct mp_log *log = mp_log_new(tmpmem, global->log, "find_files"); - - if (mp_is_url(bstr0(fname))) - goto out; - - struct bstr f_fname = bstr0(mp_basename(fname)); - struct bstr f_fname_noext = bstrdup(tmpmem, strip_ext(f_fname)); - bstr_lower(f_fname_noext); - struct bstr f_fname_trim = bstr_strip(f_fname_noext); - - // 0 = nothing - // 1 = any subtitle file - // 2 = any sub file containing movie name - // 3 = sub file containing movie name and the lang extension - char *path0 = bstrdup0(tmpmem, path); - DIR *d = opendir(path0); - if (!d) - goto out; - mp_verbose(log, "Loading external files in %.*s\n", BSTR_P(path)); - struct dirent *de; - while ((de = readdir(d))) { - struct bstr dename = bstr0(de->d_name); - void *tmpmem2 = talloc_new(tmpmem); - - // retrieve various parts of the filename - struct bstr tmp_fname_noext = bstrdup(tmpmem2, strip_ext(dename)); - bstr_lower(tmp_fname_noext); - struct bstr tmp_fname_ext = get_ext(dename); - struct bstr tmp_fname_trim = bstr_strip(tmp_fname_noext); - - // check what it is (most likely) - int type = test_ext(tmp_fname_ext); - char **langs = NULL; - int fuzz = -1; - switch (type) { - case STREAM_SUB: - langs = opts->stream_lang[type]; - fuzz = opts->sub_auto; - break; - case STREAM_AUDIO: - langs = opts->stream_lang[type]; - fuzz = opts->audiofile_auto; - break; - } - - if (fuzz < 0) - goto next_sub; - - // we have a (likely) subtitle file - int prio = 0; - char *found_lang = NULL; - if (langs) { - if (bstr_startswith(tmp_fname_trim, f_fname_trim)) { - struct bstr lang = guess_lang_from_filename(tmp_fname_trim); - if (lang.len) { - for (int n = 0; langs[n]; n++) { - if (bstr_startswith0(lang, langs[n])) { - prio = 4; // matches the movie name + lang extension - found_lang = langs[n]; - break; - } - } - } - } - } - if (!prio && bstrcmp(tmp_fname_trim, f_fname_trim) == 0) - prio = 3; // matches the movie name - if (!prio && bstr_find(tmp_fname_trim, f_fname_trim) >= 0 && fuzz >= 1) - prio = 2; // contains the movie name - if (!prio) { - // doesn't contain the movie name - // don't try in the mplayer subtitle directory - if (!limit_fuzziness && fuzz >= 2) { - prio = 1; - } - } - - mp_dbg(log, "Potential external file: \"%s\" Priority: %d\n", - de->d_name, prio); - - if (prio) { - prio += prio; - char *subpath = mp_path_join_bstr(*slist, path, dename); - if (mp_path_exists(subpath)) { - MP_GROW_ARRAY(*slist, *nsub); - struct subfn *sub = *slist + (*nsub)++; - - // annoying and redundant - if (strncmp(subpath, "./", 2) == 0) - subpath += 2; - - sub->type = type; - sub->priority = prio; - sub->fname = subpath; - sub->lang = found_lang; - } else - talloc_free(subpath); - } - - next_sub: - talloc_free(tmpmem2); - } - closedir(d); - - out: - talloc_free(tmpmem); -} - -static bool case_endswith(const char *s, const char *end) -{ - size_t len = strlen(s); - size_t elen = strlen(end); - return len >= elen && strcasecmp(s + len - elen, end) == 0; -} - -// Drop .sub file if .idx file exists. -// Assumes slist is sorted by compare_sub_filename. -static void filter_subidx(struct subfn **slist, int *nsub) -{ - const char *prev = NULL; - for (int n = 0; n < *nsub; n++) { - const char *fname = (*slist)[n].fname; - if (case_endswith(fname, ".idx")) { - prev = fname; - } else if (case_endswith(fname, ".sub")) { - if (prev && strncmp(prev, fname, strlen(fname) - 4) == 0) - (*slist)[n].priority = -1; - } - } - for (int n = *nsub - 1; n >= 0; n--) { - if ((*slist)[n].priority < 0) - MP_TARRAY_REMOVE_AT(*slist, *nsub, n); - } -} - -// Return a list of subtitles and audio files found, sorted by priority. -// Last element is terminated with a fname==NULL entry. -struct subfn *find_external_files(struct mpv_global *global, const char *fname) -{ - struct MPOpts *opts = global->opts; - struct subfn *slist = talloc_array_ptrtype(NULL, slist, 1); - int n = 0; - - // Load subtitles from current media directory - append_dir_subtitles(global, &slist, &n, mp_dirname(fname), fname, 0); - - if (opts->sub_auto >= 0) { - // Load subtitles in dirs specified by sub-paths option - if (opts->sub_paths) { - for (int i = 0; opts->sub_paths[i]; i++) { - char *path = mp_path_join_bstr(slist, mp_dirname(fname), - bstr0(opts->sub_paths[i])); - append_dir_subtitles(global, &slist, &n, bstr0(path), fname, 0); - } - } - - // Load subtitles in ~/.mpv/sub limiting sub fuzziness - char *mp_subdir = mp_find_config_file(NULL, global, "sub/"); - if (mp_subdir) - append_dir_subtitles(global, &slist, &n, bstr0(mp_subdir), fname, 1); - talloc_free(mp_subdir); - } - - // Sort by name for filter_subidx() - qsort(slist, n, sizeof(*slist), compare_sub_filename); - - filter_subidx(&slist, &n); - - // Sort subs by priority and append them - qsort(slist, n, sizeof(*slist), compare_sub_priority); - - struct subfn z = {0}; - MP_TARRAY_APPEND(NULL, slist, n, z); - - return slist; -} diff --git a/sub/find_subfiles.h b/sub/find_subfiles.h deleted file mode 100644 index 223bf06e86..0000000000 --- a/sub/find_subfiles.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#ifndef MPLAYER_FIND_SUBFILES_H -#define MPLAYER_FIND_SUBFILES_H - -#include - -struct subfn { - int type; // STREAM_SUB/STREAM_AUDIO - int priority; - char *fname; - char *lang; -}; - -struct mpv_global; -struct subfn *find_external_files(struct mpv_global *global, const char *fname); - -bool mp_might_be_subtitle_file(const char *filename); - -#endif /* MPLAYER_FINDFILES_H */ diff --git a/wscript_build.py b/wscript_build.py index ee4321926d..c8788c3a06 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -202,6 +202,7 @@ def build(ctx): ( "player/client.c" ), ( "player/command.c" ), ( "player/configfiles.c" ), + ( "player/external_files.c" ), ( "player/loadfile.c" ), ( "player/main.c" ), ( "player/misc.c" ), @@ -251,7 +252,6 @@ def build(ctx): ( "sub/ass_mp.c", "libass"), ( "sub/dec_sub.c" ), ( "sub/draw_bmp.c" ), - ( "sub/find_subfiles.c" ), ( "sub/img_convert.c" ), ( "sub/osd.c" ), ( "sub/osd_dummy.c", "dummy-osd" ), -- cgit v1.2.3