follow up librime, avoid path-string conversion

Avoid using `RimeGet*Dir()` from `rime_api`. They return native path on
Windows and coding conversion is incurred.

When passing path from lua to librime class, use either rime::path
object or UTF-8 encoded string.

Author: lotem

src/modules.cc

@@ -1,7 +1,7 @@
 #include <cstdio>
 #include <rime/common.h>
 #include <rime/registry.h>
-#include <rime_api.h>
+#include <rime/service.h>
 #include "lib/lua_templates.h"
 #include "lua_gears.h"
 
@@ -17,8 +17,11 @@ static bool file_exists(const char *fname) noexcept {
 }
 
 static void lua_init(lua_State *L) {
-  const auto user_dir = std::string(RimeGetUserDataDir());
-  const auto shared_dir = std::string(RimeGetSharedDataDir());
+  // path::string() returns native encoding on Windows
+  const auto user_dir =
+      rime::Service::instance().deployer().user_data_dir.string();
+  const auto shared_dir =
+      rime::Service::instance().deployer().shared_data_dir.string();
 
   types_init(L);
   lua_getglobal(L, "package");

src/opencc.cc

@@ -13,8 +13,8 @@
 #include <opencc/Dict.hpp>
 #include <opencc/DictEntry.hpp>
 #include <opencc/Common.hpp>
-#include <rime_api.h>
 #include <rime/common.h>
+#include <rime/service.h>
 
 #include "lib/lua_export_type.h"
 #include "optional.h"
@@ -28,8 +28,8 @@ namespace {
 
 class Opencc {
 public:
-  //static shared_ptr<Opencc> create(const string &config_path);
-  Opencc(const string& config_path);
+  //static shared_ptr<Opencc> create(const path &config_path);
+  Opencc(const path& config_path);
   bool ConvertWord(const string& text, vector<string>* forms);
   bool RandomConvertText(const string& text, string* simplified);
   bool ConvertText(const string& text, string* simplified);
@@ -43,9 +43,10 @@ class Opencc {
   opencc::DictPtr dict_;
 };
 
-Opencc::Opencc(const string& config_path) {
+Opencc::Opencc(const path& config_path) {
   opencc::Config config;
-  converter_ = config.NewFromFile(config_path);
+  // OpenCC accepts UTF-8 encoded path.
+  converter_ = config.NewFromFile(config_path.u8string());
   const list<opencc::ConversionPtr> conversions =
     converter_->GetConversionChain()->GetConversions();
   dict_ = conversions.front()->GetDict();
@@ -116,14 +117,14 @@ namespace OpenccReg {
   using T = Opencc;
 
   optional<T> make(const string &filename) {
-    string user_path( RimeGetUserDataDir());
-    string shared_path(RimeGetSharedDataDir());
+    path user_path = Service::instance().deployer().user_data_dir;
+    path shared_path = Service::instance().deployer().shared_data_dir;
     try{
-      return T(user_path + "/opencc/" + filename);
+      return T(user_path / "opencc" / filename);
     }
     catch(...) {
       try{
-        return T(shared_path + "/opencc/" + filename);
+        return T(shared_path / "opencc" / filename);
       }
       catch(...) {
         LOG(ERROR) << " [" << user_path << "|" << shared_path << "]/opencc/"

src/types.cc

@@ -308,7 +308,8 @@ namespace ReverseDbReg {
   using T = ReverseDb;
 
   an<T> make(const string &file) {
-    an<T> db = New<ReverseDb>(string(RimeGetUserDataDir()) +  "/" + file);
+    an<T> db = New<ReverseDb>(
+        Service::instance().deployer().user_data_dir / file);
     db->Load();
     return db;
   }

src/types_ext.cc

@@ -263,6 +263,10 @@ namespace UserDbReg{
     return {};
   }
 
+  string file_name(const T& t) {
+    return t.file_path().u8string();
+  }
+
   bool Open(T &t) { return t.Open(); }
   bool Close(T &t) { return t.Close(); }
   bool OpenReadOnly(T &t) { return t.OpenReadOnly(); }
@@ -300,7 +304,7 @@ namespace UserDbReg{
     {"read_only",WRAPMEM(T, readonly)},
     {"disabled",WRAPMEM(T, disabled)},
     {"name", WRAPMEM(T, name)},
-    {"file_name", WRAPMEM(T, file_name)},
+    {"file_name", WRAP(file_name)},
     { NULL, NULL },
   };