Fix implementation of scripts in renaming/adding Emoji

tindy2013 · Jul 11, 2020 · 447f680 · 447f680
1 parent 081b5ad
commit 447f680
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/src/script.cpp b/src/script.cpp
@@ -193,13 +193,6 @@ int duktape_call_function(duk_context *ctx, const std::string &name, size_t narg
     return duk_pcall(ctx, nargs);
 }
 
-int duktape_get_res_int(duk_context *ctx)
-{
-    int retval = duk_to_int(ctx, -1);
-    duk_pop(ctx);
-    return retval;
-}
-
 int duktape_push_nodeinfo(duk_context *ctx, const nodeInfo &node)
 {
     duk_push_object(ctx);
@@ -237,8 +230,17 @@ int duktape_push_nodeinfo_arr(duk_context *ctx, const nodeInfo &node, duk_idx_t
     return 0;
 }
 
+int duktape_get_res_int(duk_context *ctx)
+{
+    int retval = duk_to_int(ctx, -1);
+    duk_pop(ctx);
+    return retval;
+}
+
 std::string duktape_get_res_str(duk_context *ctx)
 {
+    if(duk_is_null_or_undefined(ctx, -1))
+        return std::string();
     std::string retstr = duk_safe_to_string(ctx, -1);
     duk_pop(ctx);
     return retstr;

diff --git a/src/subexport.cpp b/src/subexport.cpp
@@ -508,11 +508,11 @@ bool applyMatcher(const std::string &rule, std::string &real_rule, const nodeInf
     return true;
 }
 
-std::string nodeRename(const nodeInfo &node, const string_array &rename_array)
+void nodeRename(nodeInfo &node, const string_array &rename_array)
 {
     string_size pos;
     std::string match, rep;
-    std::string remark = node.remarks, real_rule;
+    std::string &remark = node.remarks, original_remark = node.remarks, returned_remark, real_rule;
     duk_context *ctx = NULL;
     defer(duk_destroy_heap(ctx);)
 
@@ -531,8 +531,8 @@ std::string nodeRename(const nodeInfo &node, const string_array &rename_array)
                 {
                     duk_get_global_string(ctx, "rename");
                     duktape_push_nodeinfo(ctx, node);
-                    if(duk_pcall(ctx, 1) == 0)
-                        remark = duktape_get_res_str(ctx);
+                    if(duk_pcall(ctx, 1) == 0 && !(returned_remark = duktape_get_res_str(ctx)).empty())
+                        remark = returned_remark;
                 }
                 else
                 {
@@ -552,8 +552,8 @@ std::string nodeRename(const nodeInfo &node, const string_array &rename_array)
             remark = regReplace(remark, real_rule, rep);
     }
     if(remark.empty())
-        return node.remarks;
-    return remark;
+        remark = original_remark;
+    return;
 }
 
 std::string removeEmoji(const std::string &orig_remark)
@@ -574,7 +574,7 @@ std::string removeEmoji(const std::string &orig_remark)
 
 std::string addEmoji(const nodeInfo &node, const string_array &emoji_array)
 {
-    std::string real_rule;
+    std::string real_rule, ret;
     string_size pos;
     duk_context *ctx = NULL;
     defer(duk_destroy_heap(ctx);)
@@ -594,12 +594,8 @@ std::string addEmoji(const nodeInfo &node, const string_array &emoji_array)
                 {
                     duk_get_global_string(ctx, "getEmoji");
                     duktape_push_nodeinfo(ctx, node);
-                    if(duk_pcall(ctx, 1) == 0)
-                    {
-                         std::string ret = duktape_get_res_str(ctx);
-                         if(ret.size())
-                            return ret + " " + node.remarks;
-                    }
+                    if(duk_pcall(ctx, 1) == 0 && !(ret = duktape_get_res_str(ctx)).empty())
+                        return ret + " " + node.remarks;
                 }
                 else
                 {
@@ -1080,7 +1076,7 @@ void preprocessNodes(std::vector<nodeInfo> &nodes, const extra_settings &ext)
         if(ext.remove_emoji)
             x.remarks = trim(removeEmoji(x.remarks));
 
-        x.remarks = nodeRename(x, ext.rename_array);
+        nodeRename(x, ext.rename_array);
 
         if(ext.add_emoji)
             x.remarks = addEmoji(x, ext.emoji_array);