Skip to content

Commit 4e4a491

Browse files
committed
fix(rime_api): use user_config_open() to access user.yaml
1 parent 2e5c39c commit 4e4a491

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

src/rime_api.cc

+16-11
Original file line numberDiff line numberDiff line change
@@ -542,24 +542,28 @@ RIME_API Bool RimeSelectSchema(RimeSessionId session_id, const char* schema_id)
542542

543543
// config
544544

545-
RIME_API Bool RimeSchemaOpen(const char *schema_id, RimeConfig* config) {
546-
if (!schema_id || !config) return False;
547-
Config::Component* cc = Config::Require("schema");
545+
static Bool open_config_in_component(const char* config_component,
546+
const char* config_id,
547+
RimeConfig* config) {
548+
if (!config_id || !config) return False;
549+
Config::Component* cc = Config::Require(config_component);
548550
if (!cc) return False;
549-
Config* c = cc->Create(schema_id);
551+
Config* c = cc->Create(config_id);
550552
if (!c) return False;
551553
config->ptr = (void*)c;
552554
return True;
553555
}
554556

557+
RIME_API Bool RimeSchemaOpen(const char *schema_id, RimeConfig* config) {
558+
return open_config_in_component("schema", schema_id, config);
559+
}
560+
555561
RIME_API Bool RimeConfigOpen(const char *config_id, RimeConfig* config) {
556-
if (!config_id || !config) return False;
557-
Config::Component* cc = Config::Require("config");
558-
if (!cc) return False;
559-
Config* c = cc->Create(config_id);
560-
if (!c) return False;
561-
config->ptr = (void*)c;
562-
return True;
562+
return open_config_in_component("config", config_id, config);
563+
}
564+
565+
RIME_API Bool RimeUserConfigOpen(const char* config_id, RimeConfig* config) {
566+
return open_config_in_component("user_config", config_id, config);
563567
}
564568

565569
RIME_API Bool RimeConfigClose(RimeConfig *config) {
@@ -1008,6 +1012,7 @@ RIME_API RimeApi* rime_get_api() {
10081012
s_api.select_schema = &RimeSelectSchema;
10091013
s_api.schema_open = &RimeSchemaOpen;
10101014
s_api.config_open = &RimeConfigOpen;
1015+
s_api.user_config_open = &RimeUserConfigOpen;
10111016
s_api.config_close = &RimeConfigClose;
10121017
s_api.config_get_bool = &RimeConfigGetBool;
10131018
s_api.config_get_int = &RimeConfigGetInt;

src/rime_api.h

+5
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ RIME_API Bool RimeSelectSchema(RimeSessionId session_id, const char* schema_id);
283283
RIME_API Bool RimeSchemaOpen(const char* schema_id, RimeConfig* config);
284284
// <config_id>.yaml
285285
RIME_API Bool RimeConfigOpen(const char* config_id, RimeConfig* config);
286+
// access config files in user data directory, eg. user.yaml and installation.yaml
287+
RIME_API Bool RimeUserConfigOpen(const char* config_id, RimeConfig* config);
286288
RIME_API Bool RimeConfigClose(RimeConfig* config);
287289
RIME_API Bool RimeConfigInit(RimeConfig* config);
288290
RIME_API Bool RimeConfigLoadString(RimeConfig* config, const char* yaml);
@@ -513,6 +515,9 @@ typedef struct rime_api_t {
513515
Bool (*candidate_list_next)(RimeCandidateListIterator* iterator);
514516
void (*candidate_list_end)(RimeCandidateListIterator* iterator);
515517

518+
// access config files in user data directory, eg. user.yaml and installation.yaml
519+
Bool (*user_config_open)(const char *config_id, RimeConfig* config);
520+
516521
} RimeApi;
517522

518523
//! API entry

0 commit comments

Comments
 (0)