extern/ctpv
1
0
Fork 0
mirror of https://github.com/NikitaIvanovV/ctpv.git synced 2025-06-20 18:08:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add: multiple types for preview in config

Browse Source
This commit is contained in:
Nikita Ivanov 2022-07-13 23:27:06 +05:00
parent 6d96259e8f
commit 965d42cc3d
No known key found for this signature in database
GPG Key ID: 6E656AC5B97B5133
1 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/config.c
View File

@ -22,6 +22,8 @@
#define DEF_OPTION_INT(name) DEF_OPTION(name, OPTION_INT, i) #define DEF_OPTION_INT(name) DEF_OPTION(name, OPTION_INT, i)
#define DEF_OPTION_STR(name) DEF_OPTION(name, OPTION_STR, s) #define DEF_OPTION_STR(name) DEF_OPTION(name, OPTION_STR, s)
#define TYPE_SET_EMPTY (struct TypeSet){ NULL, NULL, NULL }
struct Option { struct Option {
char *name; char *name;
enum { enum {
@ -35,6 +37,10 @@ struct Option {
} arg_val; } arg_val;
}; };
struct TypeSet {
char *type, *subtype, *ext;
};
enum { enum {
STAT_OK, STAT_OK,
STAT_ERR, STAT_ERR,
@ -60,30 +66,32 @@ static void any_type_null(char **s)
*s = NULL; *s = NULL;
} }
static void add_preview(char *name, char *script, char *type, char *subtype, static void add_preview(char *name, char *script, struct TypeSet *set,
char *ext) unsigned int set_len)
{ {
if (!previews) if (!previews)
return; return;
any_type_null(&type); size_t script_len = strlen(script) + 1;
any_type_null(&subtype);
if (subtype && strcmp(subtype, any_type) == 0) for (unsigned int i = 0; i < set_len; i++) {
subtype = NULL; any_type_null(&set[i].type);
any_type_null(&set[i].subtype);
Preview p = (Preview){ Preview p = (Preview){
.name = name, .name = name,
.script = script, .script = script,
.script_len = strlen(script) + 1, .script_len = script_len,
.type = type, .ext = set[i].ext,
.subtype = subtype, .type = set[i].type,
.ext = ext, .subtype = set[i].subtype,
.attrs = PREV_ATTR_NONE, .attrs = PREV_ATTR_NONE,
.order = 1 /* custom previews are always prioritized */ .order = 1, /* custom previews are always prioritized */
.priority = 0
}; };
vectorPreview_append(previews, p); vectorPreview_append(previews, p);
}
} }
static int add_priority(char *name, int priority) static int add_priority(char *name, int priority)
@ -166,9 +174,9 @@ static int preview_type_mime_part(char **s)
{ {
NOT_ACCEPT(TOK_STAR); NOT_ACCEPT(TOK_STAR);
Token t = token; Token tok = token;
EXPECT(TOK_STR); EXPECT(TOK_STR);
*s = t.val.s; *s = tok.val.s;
return STAT_OK; return STAT_OK;
} }
@ -192,16 +200,18 @@ static inline void reset_lexer_opts(void)
lexer_set_opts(lexer, LEX_OPT_NONE); lexer_set_opts(lexer, LEX_OPT_NONE);
} }
static int preview_type(char **type, char **subtype, char **ext) static int preview_type(struct TypeSet *set)
{ {
int ret; int ret;
*set = TYPE_SET_EMPTY;
num_is_text(); num_is_text();
if ((ret = preview_type_ext(ext)) != STAT_NULL) if ((ret = preview_type_ext(&set->ext)) != STAT_NULL)
goto exit; goto exit;
ret = preview_type_mime(type, subtype); ret = preview_type_mime(&set->type, &set->subtype);
exit: exit:
reset_lexer_opts(); reset_lexer_opts();
@ -256,12 +266,17 @@ static int cmd_preview(void)
Token name = token; Token name = token;
EXPECT(TOK_STR); EXPECT(TOK_STR);
char *type = NULL, *subtype = NULL, *ext = NULL; struct TypeSet types[16];
CHECK_OK(preview_type(&type, &subtype, &ext)); unsigned int types_len = 0;
if (accept(TOK_BLK_OPEN) == STAT_NULL) { while (accept(TOK_BLK_OPEN) == STAT_NULL) {
CHECK_OK(preview_type(&type, &subtype, &ext)); if (types_len >= LEN(types)) {
EXPECT(TOK_BLK_OPEN); PARSEERROR(name, "a preview can only have up through %lu types",
LEN(types));
return STAT_ERR;
}
CHECK_OK(preview_type(types + types_len++));
} }
Token script = token; Token script = token;
@ -269,7 +284,7 @@ static int cmd_preview(void)
EXPECT(TOK_BLK_CLS); EXPECT(TOK_BLK_CLS);
add_preview(name.val.s, script.val.s, type, subtype, ext); add_preview(name.val.s, script.val.s, types, types_len);
return STAT_OK; return STAT_OK;
} }