Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

loading configuration from ticket.schema to support loading from other schema.yaml #886

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
80cd700
Update release-ci.yml
shewer Jan 20, 2023
b779750
Merge branch 'rime:master' into master
shewer Jan 26, 2023
24a35e2
Merge branch 'rime:master' into master
shewer Feb 3, 2023
d6511eb
Merge branch 'rime:master' into master
shewer Feb 20, 2023
9a7414c
Merge branch 'rime:master' into master
shewer Apr 3, 2023
b2377f1
Merge branch 'rime:master' into master
shewer Jun 11, 2023
9029305
Merge branch 'rime:master' into master
shewer Jun 25, 2023
64e626f
Merge branch 'rime:master' into master
shewer Aug 14, 2023
a5638b7
Merge remote-tracking branch 'fork/master'
shewer Aug 24, 2023
297df0d
Merge branch 'rime:master' into master
shewer Sep 6, 2023
2a622d2
Merge branch 'rime:master' into master
shewer Sep 18, 2023
a32d31d
Merge branch 'rime:master' into master
shewer Oct 4, 2023
034c84f
Merge branch 'rime:master' into master
shewer Oct 5, 2023
35da4ba
Merge remote-tracking branch 'fork/master'
shewer Oct 19, 2023
78a29e0
Merge remote-tracking branch 'fork/master'
shewer Oct 24, 2023
3d55f69
Merge remote-tracking branch 'fork/master'
shewer Dec 2, 2023
30e3b82
Merge remote-tracking branch 'fork/master'
shewer Dec 12, 2023
90d9a6a
Merge remote-tracking branch 'fork/master'
shewer Dec 14, 2023
457455d
reset release-ci.yml
shewer Dec 15, 2023
7cdd4c5
merged fork/master
shewer Feb 6, 2024
9ce9011
merged
shewer Feb 6, 2024
5fbc053
merged
shewer Feb 14, 2024
720f3bb
Merge remote-tracking branch 'fork/master'
shewer Feb 27, 2024
fc1a5c1
Merge remote-tracking branch 'fork/master'
shewer Mar 14, 2024
5247d05
Merge remote-tracking branch 'fork/master'
shewer Mar 15, 2024
1715223
Merge remote-tracking branch 'fork/master'
shewer Mar 30, 2024
fd3d867
Merge remote-tracking branch 'fork/master'
shewer Apr 26, 2024
a974a5c
Merge remote-tracking branch 'fork/master'
shewer Apr 27, 2024
2f4c702
Merge remote-tracking branch 'fork/master'
shewer May 17, 2024
6354019
Merge remote-tracking branch 'fork/master'
shewer May 18, 2024
e6b20c9
Merge remote-tracking branch 'fork/master'
shewer May 19, 2024
b41d124
loading configuration from ticket.schema
shewer Jun 4, 2024
1320e82
fixed clang-format
shewer Jun 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/rime/gear/script_translator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ ScriptTranslator::ScriptTranslator(const Ticket& ticket)
: Translator(ticket), Memory(ticket), TranslatorOptions(ticket) {
if (!engine_)
return;
if (Config* config = engine_->schema()->config()) {
if (Config* config = ticket.schema->config()) {
DLOG(INFO) << "loading configuration from schema_id: "
<< ticket.schema->schema_id();
config->GetInt(name_space_ + "/spelling_hints", &spelling_hints_);
config->GetBool(name_space_ + "/always_show_comments",
&always_show_comments_);
Expand Down
4 changes: 3 additions & 1 deletion src/rime/gear/table_translator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ TableTranslator::TableTranslator(const Ticket& ticket)
: Translator(ticket), Memory(ticket), TranslatorOptions(ticket) {
if (!engine_)
return;
if (Config* config = engine_->schema()->config()) {
if (Config* config = ticket.schema->config()) {
DLOG(INFO) << "loading configuration from schema_id: "
<< ticket.schema->schema_id();
config->GetBool(name_space_ + "/enable_charset_filter",
&enable_charset_filter_);
config->GetBool(name_space_ + "/enable_sentence", &enable_sentence_);
Expand Down