From 85fdf7f58dca255c91691e92a27567076e0d7e7f Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Tue, 7 Feb 2023 16:44:22 +0800 Subject: [PATCH] feat: add simple youdao api --- lua/Trans/init.lua | 1 + lua/Trans/query/baidu.lua | 6 ++ lua/Trans/query/youdao.lua | 111 +++++++++++++++++++++++-------------- lua/Trans/util/curl.lua | 25 ++++++++- lua/Trans/view/hover.lua | 2 +- 5 files changed, 102 insertions(+), 43 deletions(-) diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index 75cd51b..94796a8 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -122,6 +122,7 @@ M.conf = { db_path = '$HOME/.vim/dict/ultimate.db', engine = { + youdao = {}, -- baidu = { -- appid = '', -- appPasswd = '', diff --git a/lua/Trans/query/baidu.lua b/lua/Trans/query/baidu.lua index cd23dd6..bf0e8ff 100644 --- a/lua/Trans/query/baidu.lua +++ b/lua/Trans/query/baidu.lua @@ -57,3 +57,9 @@ return function(word) return result end + + + +-- NOTE :free tts: +-- https://zj.v.api.aa1.cn/api/baidu-01/?msg=我爱你&choose=0&su=100&yd=5 +-- 选择转音频的人物，女生1 输入0 ｜ 女生2输入：5｜男生1 输入：1｜男生2 输入：2｜男生3 输入：3 diff --git a/lua/Trans/query/youdao.lua b/lua/Trans/query/youdao.lua index d8616ee..ac9fe66 100644 --- a/lua/Trans/query/youdao.lua +++ b/lua/Trans/query/youdao.lua @@ -1,45 +1,74 @@ -local youdao = require("Trans").conf.engine.youdao -local uri = 'https://openapi.youdao.com/api' -local salt = tostring(math.random(bit.lshift(1, 15))) -local appid = youdao.appid -local appPasswd = youdao.appPasswd - -local post = require('Trans.util.curl').POST - -local function get_field(word) - -- local to = isEn and 'zh-' - local len = #word - local curtime = tostring(os.time()) - local input = len > 20 and - word:sub(1, 10) .. len .. word:sub(-10) or word - - -- sign=sha256(应用ID+input+salt+curtime+应用密钥)； - local hash = appid .. input .. salt .. curtime .. appPasswd - local sign = vim.fn.sha256(hash) - - return { - q = word, - from = 'auto', - to = 'zh-CHS', - signType = 'v3', - appKey = appid, - salt = salt, - curtime = curtime, - sign = sign, - } -end +local GET = require("Trans.util.curl").GET return function(word) - -- return result - -- local field = get_field(word) - -- local output = post(uri, { - -- body = field, - -- }) + local isEn = word:isEn() + local result = {} - -- if output.exit == 0 and output.status == 200 then - -- local result = vim.fn.json_decode(output.body) - -- if result and result.errorCode == 0 then - -- --- TODO : - -- end - -- end + local uri = ('https://v.api.aa1.cn/api/api-fanyi-yd/index.php?msg=%s&type=%d'):format(word, isEn and 2 or 1) + GET(uri, { + callback = function(str) + local ok, res = pcall(vim.json.decode, str) + if not ok or not res or not res.text or isEn and res.text:isEn() then + result[1] = false + return + end + + result[1] = { + title = { word = word }, + [isEn and 'translation' or 'definition'] = res.text, + } + + if result.callback then + result.callback(result[1]) + end + end + }) + + return result end + +-- local youdao = require("Trans").conf.engine.youdao +-- local uri = 'https://openapi.youdao.com/api' +-- local salt = tostring(math.random(bit.lshift(1, 15))) +-- local appid = youdao.appid +-- local appPasswd = youdao.appPasswd + +-- local post = require('Trans.util.curl').POST + +-- local function get_field(word) +-- -- local to = isEn and 'zh-' +-- local len = #word +-- local curtime = tostring(os.time()) +-- local input = len > 20 and +-- word:sub(1, 10) .. len .. word:sub(-10) or word + +-- -- sign=sha256(应用ID+input+salt+curtime+应用密钥)； +-- local hash = appid .. input .. salt .. curtime .. appPasswd +-- local sign = vim.fn.sha256(hash) + +-- return { +-- q = word, +-- from = 'auto', +-- to = 'zh-CHS', +-- signType = 'v3', +-- appKey = appid, +-- salt = salt, +-- curtime = curtime, +-- sign = sign, +-- } +-- end + +-- return function(word) +-- -- return result +-- -- local field = get_field(word) +-- -- local output = post(uri, { +-- -- body = field, +-- -- }) + +-- -- if output.exit == 0 and output.status == 200 then +-- -- local result = vim.fn.json_decode(output.body) +-- -- if result and result.errorCode == 0 then +-- -- --- TODO : +-- -- end +-- -- end +-- end diff --git a/lua/Trans/util/curl.lua b/lua/Trans/util/curl.lua index 701e729..0b54edf 100644 --- a/lua/Trans/util/curl.lua +++ b/lua/Trans/util/curl.lua @@ -12,9 +12,32 @@ local curl = {} curl.GET = function(uri, opts) --- TODO : + vim.validate { + uri = { uri, 's' }, + opts = { opts, 't' } + } + local cmd = {'curl', '-s', ('"%s"'):format(uri)} + local callback = opts.callback + + local output = '' + local option = { + stdin = 'null', + on_stdout = function(_, stdout) + local str = table.concat(stdout) + if str ~= '' then + output = output .. str + end + end, + on_exit = function() + callback(output) + end, + } + + vim.fn.jobstart(table.concat(cmd, ' '), option) end + curl.POST = function(uri, opts) vim.validate { uri = { uri, 's' }, @@ -23,7 +46,7 @@ curl.POST = function(uri, opts) local callback = opts.callback - local cmd = { 'curl', '-s', uri } + local cmd = { 'curl', '-s', ('"%s"'):format(uri) } local size = 3 local function insert(...) diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index 5c396cd..ab19611 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -310,7 +310,7 @@ local function online_query(win, word) end for i = 1, size do - lists[size] = require('Trans.query.' .. engines[i])(word) + lists[i] = require('Trans.query.' .. engines[i])(word) end local cell = icon.cell local timeout = hover.timeout