Skip to content

Commit

Permalink
replace RimeApi::get_*_dir with Deployer's getters
Browse files Browse the repository at this point in the history
  • Loading branch information
lotem committed Feb 6, 2024
1 parent f21369c commit df714a5
Showing 1 changed file with 10 additions and 17 deletions.
27 changes: 10 additions & 17 deletions src/types.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <rime_api.h>
#include <rime/candidate.h>
#include <rime/translation.h>
#include <rime/segmentation.h>
Expand All @@ -15,9 +16,9 @@
#include <rime/gear/memory.h>
#include <rime/dict/dictionary.h>
#include <rime/dict/user_dictionary.h>
#include <rime/service.h>
#include <rime/switcher.h>
#include "lua_gears.h"
#include <rime/service.h>
#include <boost/regex.hpp>

#include "lib/lua_export_type.h"
Expand Down Expand Up @@ -1845,43 +1846,35 @@ namespace KeySequenceReg {

namespace RimeApiReg {
string get_rime_version() {
RimeApi* rime = rime_get_api();
return string(rime->get_version());
return string(rime_get_api()->get_version());
}

string get_shared_data_dir() {
RimeApi* rime = rime_get_api();
return string(rime->get_shared_data_dir());
return Service::instance().deployer().shared_data_dir.string();
}

string get_user_data_dir() {
RimeApi* rime = rime_get_api();
return string(rime->get_user_data_dir());
return Service::instance().deployer().user_data_dir.string();
}

string get_sync_dir() {
RimeApi* rime = rime_get_api();
return string(rime->get_sync_dir());
return Service::instance().deployer().sync_dir.string();
}

string get_distribution_name(){
Deployer &deployer(Service::instance().deployer());
return deployer.distribution_name;
return Service::instance().deployer().distribution_name;
}

string get_distribution_code_name(){
Deployer &deployer(Service::instance().deployer());
return deployer.distribution_code_name;
return Service::instance().deployer().distribution_code_name;
}

string get_distribution_version(){
Deployer &deployer(Service::instance().deployer());
return deployer.distribution_version;
return Service::instance().deployer().distribution_version;
}

string get_user_id(){
Deployer &deployer(Service::instance().deployer());
return deployer.user_id;
return Service::instance().deployer().user_id;
}

// boost::regex api
Expand Down

0 comments on commit df714a5

Please sign in to comment.