mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 03:52:22 +02:00
cleanup: find_subfiles.c: simplify (mainly using bstr)
This commit is contained in:
Uoti Urpala
parent
52d60a7334
commit
a2d28010cc
15
bstr.c
15
bstr.c
@ -19,6 +19,7 @@
|
||||
#include <string.h>
|
||||
#include <libavutil/avutil.h>
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "talloc.h"
|
||||
|
||||
@ -70,6 +71,14 @@ int bstrrchr(struct bstr str, int c)
|
||||
return -1;
|
||||
}
|
||||
|
||||
int bstr_find(struct bstr haystack, struct bstr needle)
|
||||
{
|
||||
for (int i = 0; i < haystack.len; i++)
|
||||
if (bstr_startswith(bstr_splice(haystack, i, haystack.len), needle))
|
||||
return i;
|
||||
return -1;
|
||||
}
|
||||
|
||||
struct bstr bstr_strip(struct bstr str)
|
||||
{
|
||||
while (str.len && isspace(*str.start)) {
|
||||
@ -148,3 +157,9 @@ struct bstr *bstr_splitlines(void *talloc_ctx, struct bstr str)
|
||||
r[count - 1].len = str.start + str.len - p;
|
||||
return r;
|
||||
}
|
||||
|
||||
void bstr_lower(struct bstr str)
|
||||
{
|
||||
for (int i = 0; i < str.len; i++)
|
||||
str.start[i] = tolower(str.start[i]);
|
||||
}
|
||||
|
||||
12
bstr.h
12
bstr.h
@ -38,11 +38,13 @@ int bstrcmp(struct bstr str1, struct bstr str2);
|
||||
int bstrcasecmp(struct bstr str1, struct bstr str2);
|
||||
int bstrchr(struct bstr str, int c);
|
||||
int bstrrchr(struct bstr str, int c);
|
||||
int bstr_find(struct bstr haystack, struct bstr needle);
|
||||
struct bstr *bstr_splitlines(void *talloc_ctx, struct bstr str);
|
||||
struct bstr bstr_strip(struct bstr str);
|
||||
struct bstr bstr_split(struct bstr str, char *sep, struct bstr *rest);
|
||||
struct bstr bstr_splice(struct bstr str, int start, int end);
|
||||
long long bstrtoll(struct bstr str, struct bstr *rest, int base);
|
||||
void bstr_lower(struct bstr str);
|
||||
|
||||
static inline struct bstr bstr_cut(struct bstr str, int n)
|
||||
{
|
||||
@ -56,12 +58,20 @@ static inline bool bstr_startswith(struct bstr str, struct bstr prefix)
|
||||
return !memcmp(str.start, prefix.start, prefix.len);
|
||||
}
|
||||
|
||||
// demux_rtp.cpp (live555) C++ compilation workaround
|
||||
#ifndef __cplusplus
|
||||
static inline char *bstrdup0(void *talloc_ctx, struct bstr str)
|
||||
{
|
||||
// cast is live555 C++ compilation workaround
|
||||
return talloc_strndup(talloc_ctx, (char *)str.start, str.len);
|
||||
}
|
||||
|
||||
static inline struct bstr bstrdup(void *talloc_ctx, struct bstr str)
|
||||
{
|
||||
struct bstr r = { talloc_strndup(talloc_ctx, str.start, str.len), str.len };
|
||||
return r;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Create bstr compound literal from null-terminated string
|
||||
#define BSTR(s) (struct bstr){(char *)(s), (s) ? strlen(s) : 0}
|
||||
// create a pair (not single value!) for "%.*s" printf syntax
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "mp_msg.h"
|
||||
#include "options.h"
|
||||
@ -10,56 +11,20 @@
|
||||
#include "sub/find_subfiles.h"
|
||||
#include "sub/sub.h"
|
||||
|
||||
static void strcpy_trim(char *d, char *s)
|
||||
static struct bstr strip_ext(struct bstr str)
|
||||
{
|
||||
// skip leading whitespace
|
||||
while (*s && isspace(*s)) {
|
||||
s++;
|
||||
}
|
||||
for (;;) {
|
||||
// copy word
|
||||
while (*s && !isspace(*s)) {
|
||||
*d = tolower(*s);
|
||||
s++; d++;
|
||||
}
|
||||
if (*s == 0)
|
||||
break;
|
||||
// trim excess whitespace
|
||||
while (*s && isspace(*s)) {
|
||||
s++;
|
||||
}
|
||||
if (*s == 0)
|
||||
break;
|
||||
*d++ = ' ';
|
||||
}
|
||||
*d = 0;
|
||||
int dotpos = bstrrchr(str, '.');
|
||||
if (dotpos < 0)
|
||||
return str;
|
||||
return (struct bstr){str.start, dotpos};
|
||||
}
|
||||
|
||||
static void strcpy_strip_ext(char *d, char *s)
|
||||
static struct bstr get_ext(struct bstr s)
|
||||
{
|
||||
char *tmp = strrchr(s, '.');
|
||||
if (!tmp) {
|
||||
strcpy(d, s);
|
||||
return;
|
||||
} else {
|
||||
strncpy(d, s, tmp-s);
|
||||
d[tmp-s] = 0;
|
||||
}
|
||||
while (*d) {
|
||||
*d = tolower(*d);
|
||||
d++;
|
||||
}
|
||||
}
|
||||
|
||||
static void strcpy_get_ext(char *d, char *s)
|
||||
{
|
||||
char *tmp = strrchr(s, '.');
|
||||
if (!tmp) {
|
||||
strcpy(d, "");
|
||||
return;
|
||||
} else {
|
||||
strcpy(d, tmp+1);
|
||||
}
|
||||
int dotpos = bstrrchr(s, '.');
|
||||
if (dotpos < 0)
|
||||
return (struct bstr){NULL, 0};
|
||||
return bstr_splice(s, dotpos + 1, s.len);
|
||||
}
|
||||
|
||||
struct subfn {
|
||||
@ -78,29 +43,25 @@ static int compare_sub_priority(const void *a, const void *b)
|
||||
return strcoll(s1->fname, s2->fname);
|
||||
}
|
||||
|
||||
static void guess_lang_from_filename(char *dstlang, const char *name)
|
||||
static struct bstr guess_lang_from_filename(struct bstr name)
|
||||
{
|
||||
int n = 0, i = strlen(name);
|
||||
if (name.len < 2)
|
||||
return (struct bstr){NULL, 0};
|
||||
|
||||
if (i < 2)
|
||||
goto err;
|
||||
int n = 0;
|
||||
int i = name.len - 1;
|
||||
|
||||
if (name.start[i] == ')' || name.start[i] == ']')
|
||||
i--;
|
||||
if (name[i] == ')' || name[i] == ']')
|
||||
i--;
|
||||
while (i >= 0 && isalpha(name[i])) {
|
||||
while (i >= 0 && isalpha(name.start[i])) {
|
||||
n++;
|
||||
if (n > 3)
|
||||
goto err;
|
||||
return (struct bstr){NULL, 0};
|
||||
i--;
|
||||
}
|
||||
if (n < 2)
|
||||
goto err;
|
||||
memcpy(dstlang, &name[i + 1], n);
|
||||
dstlang[n] = 0;
|
||||
return;
|
||||
|
||||
err:
|
||||
dstlang[0] = 0;
|
||||
return (struct bstr){NULL, 0};
|
||||
return (struct bstr){name.start + i + 1, n};
|
||||
}
|
||||
|
||||
struct sub_list {
|
||||
@ -124,43 +85,43 @@ static void append_dir_subtitles(struct MPOpts *opts,
|
||||
int limit_fuzziness)
|
||||
{
|
||||
char *sub_exts[] = {"utf", "utf8", "utf-8", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", "js", "ass", NULL};
|
||||
void *tmpmem = talloc_new(NULL);
|
||||
FILE *f;
|
||||
char *f_fname = talloc_strdup(NULL, mp_basename(fname));
|
||||
size_t len = strlen(f_fname) + 1;
|
||||
char *f_fname_noext = talloc_size(f_fname, len);
|
||||
char *f_fname_trim = talloc_size(f_fname, len);
|
||||
assert(strlen(fname) < 1e6);
|
||||
|
||||
strcpy_strip_ext(f_fname_noext, f_fname);
|
||||
strcpy_trim(f_fname_trim, f_fname_noext);
|
||||
struct bstr f_fname = BSTR(mp_basename(fname));
|
||||
struct bstr f_fname_noext = 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(f_fname, path);
|
||||
char *path0 = bstrdup0(tmpmem, path);
|
||||
DIR *d = opendir(path0);
|
||||
if (d) {
|
||||
struct dirent *de;
|
||||
if (!d)
|
||||
goto out;
|
||||
mp_msg(MSGT_SUBREADER, MSGL_INFO, "Load subtitles in %.*s\n", BSTR_P(path));
|
||||
struct dirent *de;
|
||||
while ((de = readdir(d))) {
|
||||
len = strlen(de->d_name) + 1;
|
||||
char *tmp_fname_noext = talloc_size(NULL, len);
|
||||
char *tmp_fname_ext = talloc_size(tmp_fname_noext, len);
|
||||
char *tmp_fname_trim = talloc_size(tmp_fname_noext, len);
|
||||
struct bstr dename = BSTR(de->d_name);
|
||||
void *tmpmem2 = talloc_new(tmpmem);
|
||||
|
||||
// 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_trim(tmp_fname_trim, tmp_fname_noext);
|
||||
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);
|
||||
|
||||
// If it's a .sub, check if there is a .idx with the same name. If
|
||||
// there is one, it's certainly a vobsub so we skip it.
|
||||
if (strcasecmp(tmp_fname_ext, "sub") == 0) {
|
||||
struct bstr idxname = BSTR(talloc_strdup(NULL, de->d_name));
|
||||
strcpy(idxname.start + idxname.len - sizeof("idx") + 1, "idx");
|
||||
char *idx = mp_path_join(idxname.start, path, idxname);
|
||||
if (bstrcasecmp(tmp_fname_ext, BSTR("sub")) == 0) {
|
||||
char *idxname = talloc_asprintf(tmpmem2, "%.*s.idx",
|
||||
(int)tmp_fname_noext.len,
|
||||
de->d_name);
|
||||
char *idx = mp_path_join(tmpmem2, path, BSTR(idxname));
|
||||
f = fopen(idx, "rt");
|
||||
talloc_free(idxname.start);
|
||||
if (f) {
|
||||
fclose(f);
|
||||
goto next_sub;
|
||||
@ -168,35 +129,32 @@ static void append_dir_subtitles(struct MPOpts *opts,
|
||||
}
|
||||
|
||||
// does it end with a subtitle extension?
|
||||
int i, found = 0;
|
||||
#ifdef CONFIG_ICONV
|
||||
#ifdef CONFIG_ENCA
|
||||
for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) {
|
||||
int i = (sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0;
|
||||
#else
|
||||
for (i = (sub_cp ? 3 : 0); sub_exts[i]; i++) {
|
||||
int i = sub_cp ? 3 : 0;
|
||||
#endif
|
||||
#else
|
||||
for (i = 0; sub_exts[i]; i++) {
|
||||
int i = 0;
|
||||
#endif
|
||||
if (strcasecmp(sub_exts[i], tmp_fname_ext) == 0) {
|
||||
found = 1;
|
||||
while (1) {
|
||||
if (!sub_exts[i])
|
||||
goto next_sub;
|
||||
if (bstrcasecmp(BSTR(sub_exts[i]), tmp_fname_ext) == 0)
|
||||
break;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
// we have a (likely) subtitle file
|
||||
if (found) {
|
||||
int prio = 0;
|
||||
if (opts->sub_lang) {
|
||||
char lang[4];
|
||||
|
||||
if (!strncmp(tmp_fname_trim, f_fname_trim,
|
||||
strlen(f_fname_trim))) {
|
||||
guess_lang_from_filename(lang, tmp_fname_trim);
|
||||
if (*lang) {
|
||||
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; opts->sub_lang[n]; n++) {
|
||||
if (!strncmp(lang, opts->sub_lang[n],
|
||||
strlen(opts->sub_lang[n]))) {
|
||||
if (bstr_startswith(lang,
|
||||
BSTR(opts->sub_lang[n]))) {
|
||||
prio = 4; // matches the movie name + lang extension
|
||||
break;
|
||||
}
|
||||
@ -204,9 +162,9 @@ static void append_dir_subtitles(struct MPOpts *opts,
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!prio && strcmp(tmp_fname_trim, f_fname_trim) == 0)
|
||||
if (!prio && bstrcmp(tmp_fname_trim, f_fname_trim) == 0)
|
||||
prio = 3; // matches the movie name
|
||||
if (!prio && strstr(tmp_fname_trim, f_fname_trim)
|
||||
if (!prio && bstr_find(tmp_fname_trim, f_fname_trim) >= 0
|
||||
&& sub_match_fuzziness >= 1)
|
||||
prio = 2; // contains the movie name
|
||||
if (!prio) {
|
||||
@ -225,7 +183,7 @@ static void append_dir_subtitles(struct MPOpts *opts,
|
||||
if (i < 3) // prefer UTF-8 coded
|
||||
prio++;
|
||||
#endif
|
||||
char *subpath = mp_path_join(*slist, path, BSTR(de->d_name));
|
||||
char *subpath = mp_path_join(*slist, path, dename);
|
||||
if ((f = fopen(subpath, "rt"))) {
|
||||
MP_GROW_ARRAY(*slist, *nsub);
|
||||
struct subfn *sub = *slist + (*nsub)++;
|
||||
@ -236,15 +194,14 @@ static void append_dir_subtitles(struct MPOpts *opts,
|
||||
} else
|
||||
talloc_free(subpath);
|
||||
}
|
||||
}
|
||||
|
||||
next_sub:
|
||||
talloc_free(tmp_fname_noext);
|
||||
next_sub:
|
||||
talloc_free(tmpmem2);
|
||||
}
|
||||
closedir(d);
|
||||
}
|
||||
|
||||
talloc_free(f_fname);
|
||||
out:
|
||||
talloc_free(tmpmem);
|
||||
}
|
||||
|
||||
char **find_text_subtitles(struct MPOpts *opts, const char *fname)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user