From 6f75ba057b9d86b9edefcaff29d356cefe9b60c3 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Fri, 3 Feb 2023 15:27:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=E4=BA=86=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E7=9A=84=E8=AE=BE=E8=AE=A1,=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将回调的接口换成了run的函数接口, 修复了在线查询, 自动命令, 窗口显示的bug --- install.sh | 2 +- lua/Trans/buffer.lua | 17 ++-- lua/Trans/init.lua | 15 ++- lua/Trans/node.lua | 6 +- lua/Trans/query/youdao.lua | 39 ++++--- lua/Trans/util/display.lua | 77 +++++++------- lua/Trans/view/float.lua | 154 ++++++++++++++-------------- lua/Trans/view/hover.lua | 201 ++++++++++++++++--------------------- lua/Trans/window.lua | 106 ++++++++----------- 9 files changed, 284 insertions(+), 333 deletions(-) diff --git a/install.sh b/install.sh index 57f24e0..09e5d30 100755 --- a/install.sh +++ b/install.sh @@ -12,7 +12,7 @@ wget https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdi unzip /tmp/dict.zip -d "$HOME/.vim/dict" && rm -rf /tmp/dict.zip -uNames=`uname -s` +uNames=$(uname -s) osName=${uNames: 0: 4} if [ "$osName" != "Linux" ];then cd ./tts/ && npm install diff --git a/lua/Trans/buffer.lua b/lua/Trans/buffer.lua index 78ac88e..0a64ebb 100644 --- a/lua/Trans/buffer.lua +++ b/lua/Trans/buffer.lua @@ -42,6 +42,11 @@ local buffer = { end end, + wipe = function(self) + api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {}) + self.size = 0 + end, + del = function(self, _start, _end) if not _start then fn.deletebufline(self.bufnr, '$') @@ -91,14 +96,10 @@ local buffer = { return api.nvim_buf_get_lines(self.bufnr, i, j, false) end, - height = function(self, opts) - local width = opts.width - local wrap = opts.wrap or false - - local lines = self:lines() - local size = #lines - - if wrap then + height = function(self, width) + local size = self.size + if width then + local lines = self:lines() local height = 0 for i = 1, size do height = height + math.max(1, (math.ceil(lines[i]:width() / width))) diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index 2d91f4e..faa1a2f 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -2,12 +2,21 @@ local M = {} local api = vim.api local fn = vim.fn -local title = fn.has('nvim-0.9') == 1 and { +local win_title = fn.has('nvim-0.9') == 1 and { { '', 'TransTitleRound' }, { ' Trans', 'TransTitle' }, { '', 'TransTitleRound' }, } or nil +-- local title = { +-- "████████╗██████╗ █████╗ ███╗ ██╗███████╗", +-- "╚══██╔══╝██╔══██╗██╔══██╗████╗ ██║██╔════╝", +-- " ██║ ██████╔╝███████║██╔██╗ ██║███████╗", +-- " ██║ ██╔══██╗██╔══██║██║╚██╗██║╚════██║", +-- " ██║ ██║ ██║██║ ██║██║ ╚████║███████║", +-- " ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝", +--} + string.width = api.nvim_strwidth string.isEn = function(self) @@ -41,7 +50,7 @@ M.conf = { width = 37, height = 27, border = 'rounded', - title = title, + title = win_title, keymap = { pageup = '[[', pagedown = ']]', @@ -71,7 +80,7 @@ M.conf = { width = 0.8, height = 0.8, border = 'rounded', - title = title, + title = win_title, keymap = { quit = 'q', }, diff --git a/lua/Trans/node.lua b/lua/Trans/node.lua index 0de11b4..1deb1e6 100644 --- a/lua/Trans/node.lua +++ b/lua/Trans/node.lua @@ -59,12 +59,12 @@ return { format = function(opts) local text = opts.text + local size = text.size local width = opts.width local spin = opts.spin or ' ' - local size = text.size - local text_width = text[1]:width() - local space = math.max(math.floor((width - text_width) / (size - 1)), 0) + local wid = text[1]:width() + local space = math.max(math.floor((width - wid) / (size - 1)), 0) if space > 0 then text.step = spin:rep(space) end diff --git a/lua/Trans/query/youdao.lua b/lua/Trans/query/youdao.lua index 43e7dfd..d8616ee 100644 --- a/lua/Trans/query/youdao.lua +++ b/lua/Trans/query/youdao.lua @@ -1,24 +1,20 @@ local youdao = require("Trans").conf.engine.youdao -local appKey = youdao.appKey -local appPasswd = youdao.appPasswd local uri = 'https://openapi.youdao.com/api' -local salt = tostring(math.random(bit.rshift(1, 5))) - - -local ok, curl = pcall(require, 'plenary.curl') -if not ok then - error('plenary not found') -end +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 = appKey .. input .. salt .. curtime .. appPasswd + local hash = appid .. input .. salt .. curtime .. appPasswd local sign = vim.fn.sha256(hash) return { @@ -26,7 +22,7 @@ local function get_field(word) from = 'auto', to = 'zh-CHS', signType = 'v3', - appKey = appKey, + appKey = appid, salt = salt, curtime = curtime, sign = sign, @@ -35,14 +31,15 @@ end return function(word) -- return result - local field = get_field(word) - local output = curl.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 + -- 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/display.lua b/lua/Trans/util/display.lua index 049d16e..b740f73 100644 --- a/lua/Trans/util/display.lua +++ b/lua/Trans/util/display.lua @@ -1,51 +1,48 @@ return function(opts) - local callback = opts.callback or function() - - end - opts.run = true - local target = opts.times - if opts.sync then - if target then - for i = 1, target do - if opts.run then - opts:frame(i) - end - end + opts.run = target ~= 0 - else - while opts.run do - opts:frame() + ---@type function[] + local tasks = {} + local function do_task() + for _, task in ipairs(tasks) do + task() + end + end + + local frame + if target then + local times = 0 + frame = function() + if opts.run and times < target then + times = times + 1 + opts:frame(times) + vim.defer_fn(frame, opts.interval) + + else + do_task() end end - callback() - else - local frame - if target then - local times = 0 - frame = function() - if opts.run and times < target then - times = times + 1 - opts:frame(times) - vim.defer_fn(frame, opts.interval) - else - callback() - end - end - - else - frame = function() - if opts.run then - opts:frame() - vim.defer_fn(frame, opts.interval) - else - callback() - end + frame = function() + if opts.run then + opts:frame() + vim.defer_fn(frame, opts.interval) + else + do_task() end end - frame() end - return opts + frame() + + ---任务句柄, 如果任务结束了则立即执行, 否则立即执行 + ---@param task function + return function(task) + if opts.run then + tasks[#tasks + 1] = task + else + task() + end + end end diff --git a/lua/Trans/view/float.lua b/lua/Trans/view/float.lua index 0123b9c..16fae4a 100644 --- a/lua/Trans/view/float.lua +++ b/lua/Trans/view/float.lua @@ -1,11 +1,11 @@ +local api = vim.api local conf = require('Trans').conf -local m_window -local m_result -local m_content +local buffer = require('Trans.buffer')() local node = require("Trans.node") local t = node.text local it = node.item +local f = node.format local engine_map = { @@ -16,102 +16,104 @@ local engine_map = { } local function set_tag_hl(name, status) - local hl = conf.float.tag[status] - m_window:set_hl(name, { - fg = '#000000', - bg = hl, - }) + -- local hl = conf.float.tag[status] + -- m_window:set_hl(name, { + -- fg = '#000000', + -- bg = hl, + -- }) - m_window:set_hl(name .. 'round', { - fg = hl, - }) + -- m_window:set_hl(name .. 'round', { + -- fg = hl, + -- }) end local function set_title() - local title = m_window:new_content() - local github = ' https://github.com/JuanZoran/Trans.nvim' + -- local title = m_window:new_content() + -- local github = ' https://github.com/JuanZoran/Trans.nvim' - title:addline( - title:center(it(github, '@text.uri')) - ) + -- title:addline( + -- title:center(it(github, '@text.uri')) + -- ) - local f = '%s(%d)' + -- local f = '%s(%d)' - local tags = {} - local load_tag = function(engine, index) - set_tag_hl(engine, 'wait') - local round = engine .. 'round' - table.insert(tags, t( - it('', round), - it(f:format(engine_map[engine], index), engine), - it('', round) - )) - end - load_tag('offline', 1) - title:addline(unpack(tags)) - title:newline('') + -- local tags = {} + -- local load_tag = function(engine, index) + -- set_tag_hl(engine, 'wait') + -- local round = engine .. 'round' + -- table.insert(tags, t( + -- it('', round), + -- it(f:format(engine_map[engine], index), engine), + -- it('', round) + -- )) + -- end + -- load_tag('offline', 1) + -- title:addline(unpack(tags)) + -- title:newline('') end local action = { quit = function() - m_window:try_close() + -- m_window:try_close() end, } -local exist = function (str) +local exist = function(str) return str and str ~= '' end local function process() -- TODO : - local icon = conf.icon - m_content:addline(m_content:format { - nodes = { - it(m_result.word, 'TransWord'), - t( - it('['), - it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'), - it(']') - ), - it(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'), - it(m_result.oxford == 1 and icon.yes or icon.no) - }, - width = math.floor(m_window.width * 0.5) - }) - m_content:addline(it('该窗口还属于实验性功能 .... ')) + -- local icon = conf.icon + -- m_content:addline(m_content:format { + -- nodes = { + -- it(m_result.word, 'TransWord'), + -- t( + -- it('['), + -- it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'), + -- it(']') + -- ), + -- it(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'), + -- it(m_result.oxford == 1 and icon.yes or icon.no) + -- }, + -- width = math.floor(m_window.width * 0.5) + -- }) + -- m_content:addline(it('该窗口还属于实验性功能 .... ')) end return function(word) -- TODO :online query - local float = conf.float - vim.notify('[注意]: float窗口目前还待开发, 如果需要input查询功能, 请将窗口改成hover', - vim.log.WARN) - local opt = { - relative = 'editor', - width = float.width, - height = float.height, - border = float.border, - title = float.title, - animation = float.animation, - row = bit.rshift((vim.o.lines - float.height), 1), - col = bit.rshift((vim.o.columns - float.width), 1), - zindex = 20, - } - m_window = require('Trans.window')(true, opt) - set_title() - m_content = m_window:new_content() - m_result = require('Trans.query.offline')(word) - if m_result then - set_tag_hl('offline', 'success') - process() - else - set_tag_hl('offline', 'fail') - end + -- local float = conf.float + vim.notify([[ +[注意]: +float窗口目前还待开发 +如果需要input查询功能, 请将窗口改成hover]]) + -- local opt = { + -- relative = 'editor', + -- width = float.width, + -- height = float.height, + -- border = float.border, + -- title = float.title, + -- animation = float.animation, + -- row = bit.rshift((vim.o.lines - float.height), 1), + -- col = bit.rshift((vim.o.columns - float.width), 1), + -- zindex = 20, + -- } + -- m_window = require('Trans.window')(true, opt) + -- set_title() + -- m_content = m_window:new_content() + -- m_result = require('Trans.query.offline')(word) + -- if m_result then + -- set_tag_hl('offline', 'success') + -- process() + -- else + -- set_tag_hl('offline', 'fail') + -- end - m_window:open() - m_window:bufset('bufhidden', 'wipe') + -- m_window:open() + -- m_window:bufset('bufhidden', 'wipe') - for act, key in pairs(float.keymap) do - m_window:map(key, action[act]) - end + -- for act, key in pairs(float.keymap) do + -- m_window:map(key, action[act]) + -- end end diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index 8e41ae8..35d37bf 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -14,6 +14,12 @@ local function handle_result(result) local notfound = icon.notfound local indent = ' ' + local word = result.title.word + if hover.auto_play then + string.play(word:isEn() and word or result.definition) + end + + local addtitle = function(title) buffer:addline { it('', 'TransTitleRound'), @@ -24,13 +30,12 @@ local function handle_result(result) local process = { title = function(title) - local word = title.word local oxford = title.oxford local collins = title.collins local phonetic = title.phonetic if not phonetic and not collins and not oxford then - buffer:addline(it(result.word, 'TransWord')) + buffer:addline(it(word, 'TransWord')) else buffer:addline(f { @@ -138,10 +143,6 @@ local function handle_result(result) end, translation = function(translation) - if hover.auto_play then - result.title.word:play() - end - addtitle('中文翻译') for trs in vim.gsplit(translation, '\n', true) do @@ -178,18 +179,17 @@ local function handle_result(result) end local function open_window(opts) - opts = opts or {} + opts = opts or {} + local col = opts.col or 1 local row = opts.row or 1 local width = opts.width or hover.width local height = opts.height or hover.height local relative = opts.relative or 'cursor' - local task = opts.task - local win = require('Trans.window') { + return require('Trans.window') { col = col, row = row, - task = task, buf = buffer, relative = relative, width = width, @@ -197,11 +197,10 @@ local function open_window(opts) title = hover.title, border = hover.border, animation = hover.animation, - zindex = 100, + zindex = 80, enter = false, ns = require('Trans').ns, } - return win end local function handle_keymap(win, word) @@ -210,13 +209,13 @@ local function handle_keymap(win, word) local del = vim.keymap.del local function try_del_keymap() for _, key in pairs(keymap) do - pcall(del, 'n', key, { buffer = cur_buf }) + pcall(del, 'n', key) end end local lock = false local cmd_id - local next = win.id + local next local action = { pageup = function() buffer:normal('gg') @@ -228,7 +227,7 @@ local function handle_keymap(win, word) pin = function() if lock then - error('too many window') + error('请先关闭窗口') else lock = true end @@ -237,19 +236,22 @@ local function handle_keymap(win, word) local height = win.height local col = vim.o.columns - width - 3 local buf = buffer.bufnr - win:try_close() - win.tasks:add(function() - win = open_window { + local run = win:try_close() + run(function() + local w, r = open_window { width = width, height = height, relative = 'editor', col = col, - task = function(self) - self:set('wrap', true) - end, } - del('n', keymap.pin, { buffer = cur_buf }) + next = w.winid + win = w + r(function() + w:set('wrap', true) + end) + + del('n', keymap.pin) api.nvim_create_autocmd('BufWipeOut', { callback = function(opt) if opt.buf == buf or opt.buf == cur_buf then @@ -263,8 +265,8 @@ local function handle_keymap(win, word) close = function() pcall(api.nvim_del_autocmd, cmd_id) - win:try_close() - win.tasts:add(function() + local run = win:try_close() + run(function() buffer:delete() end) try_del_keymap() @@ -276,7 +278,7 @@ local function handle_keymap(win, word) api.nvim_set_current_win(next) next = prev else - del('n', keymap.toggle_entry, { buffer = cur_buf }) + del('n', keymap.toggle_entry) end end, @@ -286,31 +288,21 @@ local function handle_keymap(win, word) end end, } - local set = vim.keymap.set - local opts = { buffer = cur_buf, silent = true } for act, key in pairs(hover.keymap) do - set('n', key, action[act], opts) + set('n', key, action[act]) end if hover.auto_close_events then cmd_id = api.nvim_create_autocmd( hover.auto_close_events, { buffer = 0, - callback = function(opt) - win:try_close() - win.tasks:add(function() - buffer:delete() - try_del_keymap() - end) - api.nvim_del_autocmd(opt.id) - end, + callback = action.close, }) end end local function online_query(win, word) - -- FIXME : local lists = { remove = table.remove } @@ -318,116 +310,93 @@ local function online_query(win, word) local size = #engines local icon = conf.icon local error_line = it(error_msg, 'TransFailed') - if size == 0 then buffer:addline(error_line) - else for i = 1, size do lists[size] = require('Trans.query.' .. engines[i])(word) end + local cell = icon.cell + local timeout = hover.timeout + local spinner = require('Trans.ui.spinner')[hover.spinner] + local range = #spinner + local interval = math.floor(timeout / (win.width - spinner[1]:width())) local win_width = win.width - local cell = icon.cell - local spinner = require('Trans.ui.spinner')[hover.spinner] - local range = #spinner - - local timeout = hover.timeout - local interval = math.floor(timeout / (win.width - spinner[1]:width())) local s = '%s %s' local width = hover.width local height = hover.height - buffer:set('modifiable', true) + local function waitting_result(self, times) + for i = 1, size do + local res = lists[i][1] + if res then + buffer:wipe() + win:set_width(width) + handle_result(res) + local actual_height = buffer:height(width) + height = math.min(height, actual_height) - require('Trans.util.display') { + win:expand { + field = 'height', + target = height, + } + self.run = false + return + elseif res == false then + lists:remove(i) + size = size - 1 + end + end + + if size == 0 or times == win_width then + buffer:addline(error_line, 1) + self.run = false + else + buffer:addline(it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg'), 1) + end + end + + buffer:set('modifiable', true) + local run = require('Trans.util.display') { times = win_width, interval = interval, - frame = function(self, times) - for i, v in ipairs(lists) do - local res = v[1] - if res then - vim.pretty_print(res) - buffer:del(1) - win:set_width(width) - handle_result(res) - local actual_height = buffer:height { - width = width, - wrap = true, - } - height = math.min(height, actual_height) - - win:expand { - field = 'height', - target = height, - } - - win.tasks:add(function(this) - this:set('wrap', true) - handle_keymap(this, word) - end) - - self.run = false - return - - elseif res == false then - lists:remove(i) - size = size - 1 - end - end - - local line - if size == 0 or times == win_width then - line = error_line - self.run = false - win:set('wrap', true) - handle_keymap(win, word) - - else - line = it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg') - end - - buffer:addline(line, 1) - end, - - callback = function() - buffer:set('modifiable', false) - end, + frame = waitting_result, } + + run(function() + buffer:set('modifiable', false) + end) end end +---处理不同hover模式的窗口 +---@param word string 待查询的单词 return function(word) buffer:init() local result = require('Trans.query.offline')(word) - local opts if result then handle_result(result) - local width = hover.width - local height = math.min(buffer:height { + local win, run = open_window { width = width, - wrap = true, - }, hover.height) - - opts = { - width = width, - height = height, - task = function(self) - self:set('wrap', true) - handle_keymap(self, word) - end + height = math.min(buffer:height(width), hover.height) } + run(function() + win:set('wrap', true) + handle_keymap(win, word) + end) else - opts = { + local win, run = open_window { width = error_msg:width(), height = 1, - task = function(win) - online_query(win, word) - end } - end - open_window(opts) + run(function() + win:set('wrap', true) + handle_keymap(win, word) + online_query(win, word) + end) + end end diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua index 55be0fd..e9dea82 100644 --- a/lua/Trans/window.lua +++ b/lua/Trans/window.lua @@ -30,71 +30,52 @@ local window = { expand = function(self, opts) self:lock() + local field = opts.field + local target = opts.target + local cur = self[field] + local times = math.abs(target - cur) + local wrap = self:option('wrap') self:set('wrap', false) - local field = opts.field - local target = opts.target local interval = opts.interval or self.animation.interval - local callback = function() + local method = 'set_' .. field + + local frame = target > cur and function(_, cur_times) + self[method](self, cur + cur_times) + end or function(_, cur_times) + self[method](self, cur - cur_times) + end + + local run = display { + times = times, + frame = frame, + interval = interval, + } + + run(function() self:set('wrap', wrap) - local tasks = self.tasks - for i = 1, #tasks do - tasks[i](self) - tasks[i] = nil - end self:unlock() - end - - local cur = self[field] - local times = math.abs(target - cur) - - if times ~= 0 then - local frame - local method = 'set_' .. field - if target > cur then - frame = function(_, cur_times) - self[method](self, cur + cur_times) - end - - elseif target < cur then - frame = function(_, cur_times) - self[method](self, cur - cur_times) - end - end - - display { - times = times, - frame = frame, - interval = interval, - callback = callback, - } - - else - callback() - end + end) + return run end, try_close = function(self) if self:is_valid() then local winid = self.winid - self.tasks:add(function() - api.nvim_win_close(winid, true) - end) - - local animation = self.animation local field = ({ slid = 'width', fold = 'height', - })[animation.close] + })[self.animation.close] - if field then - --- 播放动画 - self:expand { - field = field, - target = 1, - debug = true, - } - end + --- 播放动画 + local run = self:expand { + field = field, + target = 1, + } + run(function() + api.nvim_win_close(winid, true) + end) + return run end end, @@ -125,6 +106,10 @@ local window = { } window.__index = window +---window的构造函数 +---@param opts table +---@return table +---@return function return function(opts) assert(type(opts) == 'table') local buf = opts.buf @@ -139,7 +124,6 @@ return function(opts) local enter = opts.enter local ns = opts.ns local animation = opts.animation - local task = opts.task local open = animation.open @@ -173,26 +157,18 @@ return function(opts) local win = setmetatable({ buf = buf, ns = ns, - tasks = { - add = table.insert, - }, height = win_opt.height, width = win_opt.width, animation = animation, winid = api.nvim_open_win(buf.bufnr, enter, win_opt), }, window) - if task then - win.tasks:add(task) - end - - win:expand { - field = field, - target = opts[field], - } - api.nvim_win_set_hl_ns(win.winid, win.ns) win:set_hl('Normal', { link = 'TransWin' }) win:set_hl('FloatBorder', { link = 'TransBorder' }) - return win + + return win, win:expand { + field = field, + target = opts[field], + } end From 1205b11d9740e3f571aa7ceb0b8f67cadf9340b2 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Sat, 4 Feb 2023 15:03:02 +0800 Subject: [PATCH 2/5] style: remove nest --- README.md | 164 +++++++++++++++---------- install.sh | 9 +- lua/Trans/buffer.lua | 230 +++++++++++++++++++---------------- lua/Trans/init.lua | 60 ++++----- lua/Trans/node.lua | 2 +- lua/Trans/query/offline.lua | 8 +- lua/Trans/util/curl.lua | 1 - lua/Trans/view/hover.lua | 117 +++++++++--------- lua/Trans/window.lua | 235 +++++++++++++++++++++--------------- 9 files changed, 450 insertions(+), 376 deletions(-) diff --git a/README.md b/README.md index 568ea62..fa5851c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Trans.nvim + - [Trans.nvim](#transnvim) - [特点](#特点) - [屏幕截图](#屏幕截图) @@ -14,15 +15,17 @@ - [感谢](#感谢) - [贡献](#贡献) - [待办 (画大饼)](#待办-画大饼) - - + ## 特点 -- 使用纯lua编写, 速度极快 -> `Lazy.nvim`的记录: `➜  Trans.nvim 0.82ms` + +- 使用纯 lua 编写, 速度极快 + + > `Lazy.nvim`的记录: `➜  Trans.nvim 0.82ms` - **可以定义快捷键读英文单词** -> 见wiki + + > 见 wiki - 大部分功能可以自定义: - 高亮 @@ -34,19 +37,20 @@ - **完全离线** 的单词翻译体验 (可能后面会支持在线翻译) - 支持显示: - 柯林斯星级 - - 牛津3000词汇 + - 牛津 3000 词汇 - 中文翻译 - - 英文翻译 (不是英译中, 而是用英文解释) + - 英文翻译 (不是英译中, 而是用英文解释) - 词根 - etc - 舒服的排版和`动画` - 支持 `normal`和 `visual`模式 - > 不支持 visual-block mode - + > 不支持 visual-block mode - 本地词库单词量: `430w` - + ## 屏幕截图 + ### 演示 + https://user-images.githubusercontent.com/107862700/213752097-2eee026a-ddee-4531-bf80-ba2cbc8b44ef.mp4 > 视频演示的在线查询, 查询速度取决于你的网络状况 @@ -55,22 +59,23 @@ https://user-images.githubusercontent.com/107862700/213752097-2eee026a-ddee-4531 https://user-images.githubusercontent.com/107862700/215941500-3293c571-20a1-44e2-b202-77079f158ce9.mp4 ### 主题 -> 如果你有更美观或者更适合的配色, 欢迎提PR + +> 如果你有更美观或者更适合的配色, 欢迎提 PR > 主题配色在: `lua/Trans/theme.lua`文件中，你只需要添加你主题的表就可以了 - - `default` -![default](./theme/default.png) + ![default](./theme/default.png) - `dracula` -![dracula](./theme/dracula.png) + ![dracula](./theme/dracula.png) - `tokyonight` -![tokyonight](./theme/tokyonight.png) - + ![tokyonight](./theme/tokyonight.png) ## 安装 -*安装之前, 首先需要明确本插件的依赖:* + +_安装之前, 首先需要明确本插件的依赖:_ + - [ECDICT](https://github.com/skywind3000/ECDICT): 插件所用的离线单词数据库 - sqlite.lua: 操作数据库所用的库 - sqlite3: 数据库 @@ -92,13 +97,14 @@ use { } ``` -**如果你想要使用Packer的惰性加载，这里有一个例子** +**如果你想要使用 Packer 的惰性加载，这里有一个例子** + ```lua use { "JuanZoran/Trans.nvim", keys = { { {'n', 'x'}, 'mm' }, -- 换成其他你想用的key即可 - { {'n', 'x'}, 'mk' }, + { {'n', 'x'}, 'mk' }, { 'n', 'mi' }, }, run = 'bash ./install.sh', -- 自动下载使用的本地词库 @@ -111,6 +117,7 @@ use { end } ``` +
@@ -133,38 +140,46 @@ use { } } ``` +
-**注意事项**: +**注意事项**: + - `install.sh` - - 使用了 `wget`下载词库, 安装请确保你的环境变量中存在wget + + - 使用了 `wget`下载词库, 安装请确保你的环境变量中存在 wget - install.sh 下载后会自动将词库解压, 并移动到 `$HOME/.vim/dict`文件夹下 - 目前仅在 `Ubuntu22.04`的环境下测试通过 > 如果上述条件不符合, 请删掉 `run = 'install.sh'`部分, 考虑手动安装词库 - > 如果上述条件满足, 仍出现问题, 欢迎在issue里向我反馈,我会及时尝试解决 + > 如果上述条件满足, 仍出现问题, 欢迎在 issue 里向我反馈,我会及时尝试解决 - 下载词典的过程中, 需要能够 `流畅的访问github下载` - > 词库文件压缩包大小为: **281M** - > 解压缩后的大小大概为: 1.2G + + > 词库文件压缩包大小为: **281M** + > 解压缩后的大小大概为: 1.2G - 安装后如果不能正常运行, 请尝试检查一下问题: + - 本机是否已经安装了 `sqlite3` - > Linux下安装: + > Linux 下安装: > `sudo pacman -S sqlite # Arch` > `sudo apt-get install sqlite3 libsqlite3-dev # Ubuntu` - + > 后续会增加 `healthcheck` 进行检查 - **`auto_play`** 使用步骤: - > linux 只需要安装`festival` - > sudo apt-get install festival festvox-kallpc16k - > ***如果你想要设置音色，发音可以访问:*** [Festival官方](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html) - > 可以选择英音、美音、男声、女声 - > 其他操作系统 - - 需要确保安装了`nodejs` - - 进入插件的`tts`目录运行`npm install` - > 如果`install.sh`运行正常则自动安装，如果安装失败，请尝试手动安装 + > linux 只需要安装`festival` + > sudo apt-get install festival festvox-kallpc16k + > **_如果你想要设置音色，发音可以访问:_** [Festival 官方](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html) + > 可以选择英音、美音、男声、女声 + + > 其他操作系统 + + - 需要确保安装了`nodejs` + - 进入插件的`tts`目录运行`npm install` + > 如果`install.sh`运行正常则自动安装，如果安装失败，请尝试手动安装 + - `title`的配置，只对`neovim 0.9`版本有效
@@ -174,41 +189,49 @@ use { - 用户配置: `~/.festivalrc` - 更改声音 - - 在festival的voices文件内建立自己的文件夹 - > 一般其默认配置目录在`/usr/share/festival/voices` - 示例: - > `sudo mkdir /usr/share/festival/voices/my_voices` + - 在 festival 的 voices 文件内建立自己的文件夹 - - 下载想要的voices文件并解压 - > 可能需要 + > 一般其默认配置目录在`/usr/share/festival/voices` - - 试听[在这里](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html)) - - 下载[在这里](http://festvox.org/packed/festival/2.5/voices/)) - > 假设下载的文件在`Downloads`文件夹, 下载的文件为:`festvox_cmu_us_aew_cg.tar.gz` + 示例: - 示例: - > `cd ~/Downloads && tar -xf festvox_cmu_us_aew_cg.tar.gz` + > `sudo mkdir /usr/share/festival/voices/my_voices` - - 将音频文件拷贝到festival文件夹 - 示例: - > `sudo cp -r festival/lib/voices/us/cmu_us_aew_cg/ /usr/share/festival/voices/my_voices/` + - 下载想要的 voices 文件并解压 - - 在配置文件中设置默认的声音 - 示例: - > 加入`(set! voice_default voice_cmu_indic_hin_ab_cg)`到配置文件 + > 可能需要  - - 安装完成 + - 试听[在这里](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html)) + - 下载[在这里](http://festvox.org/packed/festival/2.5/voices/)) + > 假设下载的文件在`Downloads`文件夹, 下载的文件为:`festvox_cmu_us_aew_cg.tar.gz` + + 示例: + + > `cd ~/Downloads && tar -xf festvox_cmu_us_aew_cg.tar.gz` + + - 将音频文件拷贝到 festival 文件夹 + 示例: + + > `sudo cp -r festival/lib/voices/us/cmu_us_aew_cg/ /usr/share/festival/voices/my_voices/` + + - 在配置文件中设置默认的声音 + 示例: + + > 加入`(set! voice_default voice_cmu_indic_hin_ab_cg)`到配置文件 + + - 安装完成 - 相关说明网站 - > 可能需要 - - [wiki](https://archlinux.org/packages/community/any/festival-us/) 查看更多详细配置 - - [官方网站](http://festvox.org/dbs/index.html) - - [用户手册](http://www.festvox.org/docs/manual-2.4.0/festival_toc.html) + > 可能需要  + - [wiki](https://archlinux.org/packages/community/any/festival-us/) 查看更多详细配置 + - [官方网站](http://festvox.org/dbs/index.html) + - [用户手册](http://www.festvox.org/docs/manual-2.4.0/festival_toc.html)
## 配置 + ```lua require'Trans'.setup { view = { @@ -314,12 +337,15 @@ require'Trans'.setup { -- TODO :add online translate engine } - + ``` ## 快捷键绑定 + **示例:** + > 示例中展示, 将`mm`映射成快捷键 + ```lua vim.keymap.set({'n', 'x'}, 'mm', 'Translate') vim.keymap.set({'n', 'x'}, 'mk', 'TransPlay') -- 自动发音选中或者光标下的单词 @@ -328,7 +354,9 @@ vim.keymap.set('n', 'mi', 'TranslateInput') ``` ## 高亮组 + > 默认定义 + ```lua { TransWord = { @@ -378,23 +406,27 @@ vim.keymap.set('n', 'mi', 'TranslateInput') ``` ## 声明 + - 本插件词典基于[ECDICT](https://github.com/skywind3000/ECDICT) ## 感谢 -- [ECDICT](https://github.com/skywind3000/ECDICT) 本地词典的提供 -- [sqlite.lua](https://github.com/kharji/sqlite.lua) 数据库访问 -- [T.vim](https://github.com/sicong-li/T.vim) 灵感来源 + +- [ECDICT](https://github.com/skywind3000/ECDICT) 本地词典的提供 +- [sqlite.lua](https://github.com/kharji/sqlite.lua) 数据库访问 +- [T.vim](https://github.com/sicong-li/T.vim) 灵感来源 ## 贡献 + > 更新比较频繁, 文档先鸽了 -> 如果你想要参加这个项目, 可以提issue, 我会把文档补齐 +> 如果你想要参加这个项目, 可以提 issue, 我会把文档补齐 ## 待办 (画大饼) + - [x] 多风格样式查询 -- [x] 重新录制屏幕截图示例 -- [x] 快捷键定义 -- [x] 自动读音 +- [x] 重新录制屏幕截图示例 +- [x] 快捷键定义 +- [x] 自动读音 - [ ] 变量命名的支持 - [ ] 历史查询结果保存 -- [ ] 在线多引擎异步查询 -- [ ] `句子翻译` | `中翻英` 的支持 +- [ ] 在线多引擎异步查询 +- [ ] `句子翻译` | `中翻英` 的支持 diff --git a/install.sh b/install.sh index 09e5d30..629d14f 100755 --- a/install.sh +++ b/install.sh @@ -2,10 +2,9 @@ set -e if test -e "$HOME/.vim/dict/ultimate.db"; then - exit + exit fi - mkdir -p "$HOME/.vim/dict" wget https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdict-ultimate-sqlite.zip -O /tmp/dict.zip @@ -13,7 +12,7 @@ wget https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdi unzip /tmp/dict.zip -d "$HOME/.vim/dict" && rm -rf /tmp/dict.zip uNames=$(uname -s) -osName=${uNames: 0: 4} -if [ "$osName" != "Linux" ];then - cd ./tts/ && npm install +osName=${uNames:0:4} +if [ "$osName" != "Linux" ]; then + cd ./tts/ && npm install fi diff --git a/lua/Trans/buffer.lua b/lua/Trans/buffer.lua index 0a64ebb..698f8dc 100644 --- a/lua/Trans/buffer.lua +++ b/lua/Trans/buffer.lua @@ -1,123 +1,143 @@ -local api = vim.api -local fn = vim.fn +local api, fn = vim.api, vim.fn -local buffer = { - addline = function(self, nodes, index) - local size = self.size - if index then - assert(index <= size + 1) - index = index - else - index = size + 1 - end - local append = index == size + 1 - local line = index - 1 - if type(nodes) == 'string' then - self[index] = nodes +---@class buf +---@field bufnr integer buffer handle +---@field size integer buffer line count +local buffer = {} - else - local bufnr = self.bufnr - local col = 0 - if type(nodes[1]) == 'string' then - self[index] = nodes[1] - nodes:load(bufnr, line, col) +---Clear all content in buffer +function buffer:wipe() + api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {}) + self.size = 0 +end - else - local strs = {} - local num = #nodes - for i = 1, num do - strs[i] = nodes[i][1] - end +---delete buffer [_start, _end] line content [one index] +---@param _start integer start line index +---@param _end integer end line index +function buffer:del(_start, _end) + if not _start then + fn.deletebufline(self.bufnr, '$') + else + _end = _end or _start + fn.deletebufline(self.bufnr, _start, _end) + end + self.size = api.nvim_buf_line_count(self.bufnr) +end - self[index] = table.concat(strs) - for i = 1, num do - local node = nodes[i] - node:load(bufnr, line, col) - col = col + #node[1] - end - end - end - if append then - self.size = self.size + 1 - end - end, +---Set buffer option +---@param name string option name +---@param value any option value +function buffer:set(name, value) + api.nvim_buf_set_option(self.bufnr, name, value) +end - wipe = function(self) - api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {}) - self.size = 0 - end, +---get buffer option +---@param name string option name +---@return any +function buffer:option(name) + return api.nvim_buf_get_option(self.bufnr, name) +end - del = function(self, _start, _end) - if not _start then - fn.deletebufline(self.bufnr, '$') - else - _end = _end or _start - fn.deletebufline(self.bufnr, _start, _end) - end - self.size = api.nvim_buf_line_count(self.bufnr) - end, +function buffer:delete() + api.nvim_buf_delete(self.bufnr, { force = true }) +end - set = function(self, name, option) - api.nvim_buf_set_option(self.bufnr, name, option) - end, +---Set buffer load keymap +---@param key string +---@param operation function | string +function buffer:map(key, operation) + vim.keymap.set('n', key, operation, { + buffer = self.bufnr, + silent = true, + }) +end - option = function(self, name) - return api.nvim_buf_get_option(self.bufnr, name) - end, +---Execute normal keycode in this buffer[no recursive] +---@param key string key code +function buffer:normal(key) + api.nvim_buf_call(self.bufnr, function() + vim.cmd([[normal! ]] .. key) + end) +end - is_valid = function(self) - return api.nvim_buf_is_valid(self.bufnr) - end, +---@return boolean +---@nodiscard +function buffer:is_valid() + return api.nvim_buf_is_valid(self.bufnr) +end - delete = function(self) - api.nvim_buf_delete(self.bufnr, { force = true }) - end, +---Get buffer [i, j] line content +---@param i integer? start line index +---@param j integer? end line index +---@return string[] +function buffer:lines(i, j) + i = i and i - 1 or 0 + j = j and j - 1 or -1 + return api.nvim_buf_get_lines(self.bufnr, i, j, false) +end - len = function(self) - return api.nvim_buf_line_count(self.bufnr) - 1 - end, +---Calculate buffer content display height +---@param width integer +---@return integer height +function buffer:height(width) + local size = self.size + local lines = self:lines() + local height = 0 + for i = 1, size do + height = height + math.max(1, (math.ceil(lines[i]:width() / width))) + end + return height +end - map = function(self, key, operation) - vim.keymap.set('n', key, operation, { - buffer = self.bufnr, - silent = true, - }) - end, +---Add|Set line content +---@param nodes string|table|table[] string -> as line content | table -> as a node | table[] -> as node[] +---@param index number? line number should be set[one index] +function buffer:addline(nodes, index) + local newsize = self.size + 1 + assert(index == nil or index <= newsize) + index = index or newsize + if index == newsize then + self.size = newsize + end - normal = function(self, key) - api.nvim_buf_call(self.bufnr, function() - vim.cmd([[normal! ]] .. key) - end) - end, + if type(nodes) == 'string' then + self[index] = nodes + return + end - lines = function(self, i, j) - i = i and i - 1 or 0 - j = j and j - 1 or -1 - return api.nvim_buf_get_lines(self.bufnr, i, j, false) - end, - height = function(self, width) - local size = self.size - if width then - local lines = self:lines() - local height = 0 - for i = 1, size do - height = height + math.max(1, (math.ceil(lines[i]:width() / width))) - end - return height - else - return size - end - end, + local line = index - 1 + local bufnr = self.bufnr + local col = 0 + if type(nodes[1]) == 'string' then + self[index] = nodes[1] + nodes:load(bufnr, line, col) + return + end - init = function(self) - self.bufnr = api.nvim_create_buf(false, false) - self:set('filetype', 'Trans') - self:set('buftype', 'nofile') - self.size = 0 - end, -} + local strs = {} + local num = #nodes + for i = 1, num do + strs[i] = nodes[i][1] + end + + self[index] = table.concat(strs) + for i = 1, num do + local node = nodes[i] + node:load(bufnr, line, col) + col = col + #node[1] + end +end + +function buffer:init() + self.bufnr = api.nvim_create_buf(false, false) + self:set('filetype', 'Trans') + self:set('buftype', 'nofile') + self.size = 0 +end + +---@private buffer.__index = function(self, key) local res = buffer[key] if res then @@ -131,12 +151,14 @@ buffer.__index = function(self, key) end end +---@private buffer.__newindex = function(self, key, text) assert(key <= self.size + 1) fn.setbufline(self.bufnr, key, text) end - +---buffer constructor +---@return buf return function() return setmetatable({ bufnr = -1, diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index faa1a2f..75cd51b 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -1,6 +1,9 @@ -local M = {} -local api = vim.api -local fn = vim.fn +local M = {} +local api, fn = vim.api, vim.fn + +if fn.executable('sqlite3') ~= 1 then + error('Please check out sqlite3') +end local win_title = fn.has('nvim-0.9') == 1 and { { '', 'TransTitleRound' }, @@ -17,7 +20,6 @@ local win_title = fn.has('nvim-0.9') == 1 and { -- " ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝", --} - string.width = api.nvim_strwidth string.isEn = function(self) local char = { self:byte(1, -1) } @@ -29,7 +31,6 @@ string.isEn = function(self) return true end - string.play = fn.has('linux') == 1 and function(self) local cmd = ([[echo "%s" | festival --tts]]):format(self) fn.jobstart(cmd) @@ -39,7 +40,6 @@ end or function(self) fn.jobstart('node ' .. file .. ' ' .. self) end - M.conf = { view = { i = 'float', @@ -121,7 +121,6 @@ M.conf = { -- theme = 'tokyonight', db_path = '$HOME/.vim/dict/ultimate.db', - engine = { -- baidu = { -- appid = '', @@ -132,7 +131,6 @@ M.conf = { -- appPasswd = '', -- }, }, - -- TODO : -- register word -- history = { @@ -158,41 +156,33 @@ M.setup = function(opts) end local engines = {} + local i = 1 for k, _ in pairs(conf.engine) do - table.insert(engines, k) + engines[i] = k + i = i + 1 end - conf.engines = engines + conf.engines = engines times = times + 1 if times == 1 then - - local get_mode = api.nvim_get_mode - local set_hl = api.nvim_set_hl + ---@format disable local new_command = api.nvim_create_user_command - - if fn.executable('sqlite3') ~= 1 then - error('Please check out sqlite3') - end - - new_command('Translate', function() - M.translate() - end, { desc = ' 单词翻译', }) - - new_command('TranslateInput', function() - M.translate('i') - end, { desc = ' 搜索翻译' }) - - new_command('TransPlay', function() - local word = M.get_word(get_mode().mode) + new_command('Translate' , function() M.translate() end, { desc = ' 单词翻译',}) + new_command('TranslateInput' , function() M.translate('i') end, { desc = ' 搜索翻译',}) + new_command('TransPlay' , function() + local word = M.get_word(api.nvim_get_mode().mode) if word ~= '' and word:isEn() then word:play() end end, { desc = ' 自动发音' }) - local hls = require('Trans.ui.theme')[conf.theme] + + local set_hl = api.nvim_set_hl + local hls = require('Trans.ui.theme')[conf.theme] for hl, opt in pairs(hls) do set_hl(0, hl, opt) end + ---@format enable end end @@ -203,10 +193,8 @@ local function get_select() if _start[2] > _end[2] or (_start[3] > _end[3] and _start[2] == _end[2]) then _start, _end = _end, _start end - local s_row = _start[2] - local e_row = _end[2] - local s_col = _start[3] - local e_col = _end[3] + local s_row, s_col = _start[2], _start[3] + local e_row, e_col = _end[2], _end[3] -- print(s_row, e_row, s_col, e_col) ---@type string @@ -217,6 +205,7 @@ local function get_select() if s_row == e_row then return line:sub(s_col, e_col) + else local lines = fn.getline(s_row, e_row) local i = #lines @@ -237,9 +226,8 @@ M.get_word = function(mode) elseif mode == 'i' then -- TODO Use Telescope with fuzzy finder - vim.ui.input({ prompt = '请输入需要查询的单词: ' }, function(input) - word = input - end) + ---@diagnostic disable-next-line: param-type-mismatch + word = fn.input('请输入需要查询的单词:') else error('invalid mode: ' .. mode) end diff --git a/lua/Trans/node.lua b/lua/Trans/node.lua index 1deb1e6..81729df 100644 --- a/lua/Trans/node.lua +++ b/lua/Trans/node.lua @@ -1,6 +1,6 @@ local api = vim.api -local add_hl = api.nvim_buf_add_highlight local ns = require('Trans').ns +local add_hl = api.nvim_buf_add_highlight local item_meta = { load = function(self, bufnr, line, col) diff --git a/lua/Trans/query/offline.lua b/lua/Trans/query/offline.lua index 4cfdbcb..96fdd3b 100644 --- a/lua/Trans/query/offline.lua +++ b/lua/Trans/query/offline.lua @@ -19,9 +19,7 @@ vim.api.nvim_create_autocmd('VimLeavePre', { return function(word) local res = (dict:select('stardict', { - where = { - word = word, - }, + where = { word = word, }, keys = { 'word', 'phonetic', @@ -43,10 +41,6 @@ return function(word) collins = res.collins, phonetic = res.phonetic, } - res.word = nil - res.oxford = nil - res.collins = nil - res.phonetic = nil end return res diff --git a/lua/Trans/util/curl.lua b/lua/Trans/util/curl.lua index 50af442..701e729 100644 --- a/lua/Trans/util/curl.lua +++ b/lua/Trans/util/curl.lua @@ -63,5 +63,4 @@ curl.POST = function(uri, opts) vim.fn.jobstart(table.concat(cmd, ' '), option) end - return curl diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index 35d37bf..5c396cd 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -5,9 +5,7 @@ local buffer = require('Trans.buffer')() local error_msg = conf.icon.notfound .. ' 没有找到相关的翻译' local node = require('Trans.node') -local it = node.item -local t = node.text -local f = node.format +local it, t, f = node.item, node.text, node.format local function handle_result(result) local icon = conf.icon @@ -19,7 +17,6 @@ local function handle_result(result) string.play(word:isEn() and word or result.definition) end - local addtitle = function(title) buffer:addline { it('', 'TransTitleRound'), @@ -197,8 +194,6 @@ local function open_window(opts) title = hover.title, border = hover.border, animation = hover.animation, - zindex = 80, - enter = false, ns = require('Trans').ns, } end @@ -232,8 +227,7 @@ local function handle_keymap(win, word) lock = true end pcall(api.nvim_del_autocmd, cmd_id) - local width = win.width - local height = win.height + local width, height = win.width, win.height local col = vim.o.columns - width - 3 local buf = buffer.bufnr local run = win:try_close() @@ -312,61 +306,60 @@ local function online_query(win, word) local error_line = it(error_msg, 'TransFailed') if size == 0 then buffer:addline(error_line) - else - for i = 1, size do - lists[size] = require('Trans.query.' .. engines[i])(word) - end - local cell = icon.cell - local timeout = hover.timeout - local spinner = require('Trans.ui.spinner')[hover.spinner] - local range = #spinner - local interval = math.floor(timeout / (win.width - spinner[1]:width())) - local win_width = win.width - - local s = '%s %s' - local width = hover.width - local height = hover.height - local function waitting_result(self, times) - for i = 1, size do - local res = lists[i][1] - if res then - buffer:wipe() - win:set_width(width) - handle_result(res) - local actual_height = buffer:height(width) - height = math.min(height, actual_height) - - win:expand { - field = 'height', - target = height, - } - self.run = false - return - elseif res == false then - lists:remove(i) - size = size - 1 - end - end - - if size == 0 or times == win_width then - buffer:addline(error_line, 1) - self.run = false - else - buffer:addline(it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg'), 1) - end - end - - buffer:set('modifiable', true) - local run = require('Trans.util.display') { - times = win_width, - interval = interval, - frame = waitting_result, - } - - run(function() - buffer:set('modifiable', false) - end) + return end + + for i = 1, size do + lists[size] = require('Trans.query.' .. engines[i])(word) + end + local cell = icon.cell + local timeout = hover.timeout + local spinner = require('Trans.ui.spinner')[hover.spinner] + local range = #spinner + local interval = math.floor(timeout / (win.width - spinner[1]:width())) + local win_width = win.width + + local s = '%s %s' + local width, height = hover.width, hover.height + local function waitting_result(this, times) + for i = 1, size do + local res = lists[i][1] + if res then + buffer:wipe() + win:set_width(width) + handle_result(res) + height = math.min(height, buffer:height(width)) + + win:expand { + field = 'height', + target = height, + } + this.run = false + return + elseif res == false then + lists:remove(i) + size = size - 1 + end + end + + if size == 0 or times == win_width then + buffer:addline(error_line, 1) + this.run = false + else + buffer:addline(it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg'), 1) + end + end + + buffer:set('modifiable', true) + local run = require('Trans.util.display') { + times = win_width, + interval = interval, + frame = waitting_result, + } + + run(function() + buffer:set('modifiable', false) + end) end ---处理不同hover模式的窗口 diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua index e9dea82..cd85546 100644 --- a/lua/Trans/window.lua +++ b/lua/Trans/window.lua @@ -1,128 +1,175 @@ local api = vim.api local display = require('Trans.util.display') -local window = { - set_buf = function(self, buf) - api.nvim_win_set_buf(self.winid, buf) - end, +---@class win +---@field winid integer window handle +---@field width integer +---@field height integer +---@field ns integer namespace for highlight +---@field animation table window animation +---@field buf buf buffer for attached +local window = {} - is_valid = function(self) - return api.nvim_win_is_valid(self.winid) - end, +---Change window attached buffer +---@param buf buf +function window:set_buf(buf) + api.nvim_win_set_buf(self.winid, buf.bufnr) + self.buf = buf +end - set = function(self, option, value) - api.nvim_win_set_option(self.winid, option, value) - end, +---Check window valid +---@return boolean +function window:is_valid() + return api.nvim_win_is_valid(self.winid) +end - option = function(self, name) - return api.nvim_win_get_option(self.winid, name) - end, +---Set window option +---@param option string option name +---@param value any +function window:set(option, value) + api.nvim_win_set_option(self.winid, option, value) +end - set_height = function(self, height) - api.nvim_win_set_height(self.winid, height) - self.height = height - end, +---@param name string option name +---@return any +function window:option(name) + return api.nvim_win_get_option(self.winid, name) +end - set_width = function(self, width) - api.nvim_win_set_width(self.winid, width) - self.width = width - end, +---@param height integer +function window:set_height(height) + api.nvim_win_set_height(self.winid, height) + self.height = height +end - expand = function(self, opts) - self:lock() - local field = opts.field - local target = opts.target - local cur = self[field] - local times = math.abs(target - cur) +---@param width integer +function window:set_width(width) + api.nvim_win_set_width(self.winid, width) + self.width = width +end - local wrap = self:option('wrap') - self:set('wrap', false) - local interval = opts.interval or self.animation.interval - local method = 'set_' .. field +---Expand window [width | height] value +---@param opts table 窗口的配置 +---|'field'string [width | height] +---|'target'integer +---@return function +function window:expand(opts) + self:lock() + local field = opts.field + local target = opts.target + local cur = self[field] + local times = math.abs(target - cur) - local frame = target > cur and function(_, cur_times) - self[method](self, cur + cur_times) - end or function(_, cur_times) - self[method](self, cur - cur_times) - end + local wrap = self:option('wrap') + self:set('wrap', false) + local interval = opts.interval or self.animation.interval + local method = api['nvim_win_set_' .. field] - local run = display { - times = times, - frame = frame, - interval = interval, - } + local winid = self.winid + local frame = target > cur and function(_, cur_times) + method(winid, cur + cur_times) + end or function(_, cur_times) + method(winid, cur - cur_times) + end - run(function() - self:set('wrap', wrap) - self:unlock() - end) - return run - end, + local run = display { + times = times, + frame = frame, + interval = interval, + } - try_close = function(self) - if self:is_valid() then - local winid = self.winid - local field = ({ - slid = 'width', - fold = 'height', - })[self.animation.close] + run(function() + self:set('wrap', wrap) + self[field] = target + self:unlock() + end) + return run +end - --- 播放动画 - local run = self:expand { - field = field, - target = 1, - } - run(function() - api.nvim_win_close(winid, true) - end) - return run - end - end, +---Close window +---@return function run run until close done +function window:try_close() + local field = ({ + slid = 'width', + fold = 'height', + })[self.animation.close] - lock = function(self) - while self.busy do - vim.wait(50) - end - self.busy = true + --- 播放动画 + local run = self:expand { + field = field, + target = 1, + } + run(function() + api.nvim_win_close(self.winid, true) + end) + return run +end - end, +---lock window [open | close] operation +function window:lock() + while self.busy do + vim.wait(50) + end + self.busy = true +end - unlock = function(self) - self.busy = false - end, +function window:unlock() + self.busy = false +end - set_hl = function(self, name, opts) - api.nvim_set_hl(self.ns, name, opts) - end, +---设置窗口本地的高亮组 +---@param name string 高亮组的名称 +---@param opts table 高亮选项 +function window:set_hl(name, opts) + api.nvim_set_hl(self.ns, name, opts) +end - center = function(self, node) - local text = node[1] - local width = text:width() - local win_width = self.width - local space = math.max(math.floor((win_width - width) / 2), 0) - node[1] = (' '):rep(space) .. text - return node - end, -} +---buffer:addline() helper function +---@param node table +---@return table node formatted node +function window:center(node) + local text = node[1] + local width = text:width() + local win_width = self.width + local space = math.max(math.floor((win_width - width) / 2), 0) + node[1] = (' '):rep(space) .. text + return node +end + +---@private window.__index = window ----window的构造函数 ----@param opts table +---@class win_opts +---@field buf buf buffer for attached +---@field height integer +---@field width integer +---@field col integer +---@field row integer +---@field border string +---@field title string | nil | table +---@field relative string +---@field ns integer namespace for highlight +---@field zindex? integer +---@field enter? boolean cursor should [enter] window +---@field animation table window animation + +---window constructor +---@param opts win_opts ---@return table ---@return function return function(opts) assert(type(opts) == 'table') + local ns = opts.ns local buf = opts.buf - local height = opts.height - local width = opts.width local col = opts.col local row = opts.row - local border = opts.border local title = opts.title + local width = opts.width + local enter = opts.enter or false + local height = opts.height + local border = opts.border + local zindex = opts.zindex local relative = opts.relative - local zindex = opts.zindex or 100 - local enter = opts.enter - local ns = opts.ns local animation = opts.animation local open = animation.open 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 3/5] 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 From 0dca4c2007235c73cb9b7503efd3a7c0f25dcb39 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Wed, 8 Feb 2023 01:14:25 +0800 Subject: [PATCH 4/5] fix: fix engine lists remove --- lua/Trans/view/hover.lua | 2 +- lua/Trans/window.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index ab19611..37ee5b8 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -322,7 +322,7 @@ local function online_query(win, word) local s = '%s %s' local width, height = hover.width, hover.height local function waitting_result(this, times) - for i = 1, size do + for i = size, 1, -1 do local res = lists[i][1] if res then buffer:wipe() diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua index cd85546..621142e 100644 --- a/lua/Trans/window.lua +++ b/lua/Trans/window.lua @@ -49,7 +49,7 @@ function window:set_width(width) end ---Expand window [width | height] value ----@param opts table 窗口的配置 +---@param opts table ---|'field'string [width | height] ---|'target'integer ---@return function From c6c5bf4f7c1b200cfbf8201e0e0748747f32c7e0 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Sat, 18 Feb 2023 13:13:32 +0800 Subject: [PATCH 5/5] fix: fix window is not valid --- lua/Trans/init.lua | 24 +++++++++++++++++++++++- lua/Trans/view/float.lua | 1 + lua/Trans/view/hover.lua | 4 +++- lua/Trans/window.lua | 4 +++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index 94796a8..035bc13 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -20,11 +20,33 @@ local win_title = fn.has('nvim-0.9') == 1 and { -- " ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝", --} +-- 中文字符匹配函数 +local function is_chinese(str) + local len = #str + local left = 0 + local right = len + local mid = 0 + while left <= right do + mid = math.floor((left + right) / 2) + local cur_byte = string.byte(str, mid) + local cur_char = string.sub(str, mid, mid) + if cur_byte == nil then + break + end + if cur_byte > 128 then + return true + else + left = mid + 1 + end + end + return false +end + string.width = api.nvim_strwidth string.isEn = function(self) local char = { self:byte(1, -1) } for i = 1, #self do - if char[i] > 127 then + if char[i] > 128 then return false end end diff --git a/lua/Trans/view/float.lua b/lua/Trans/view/float.lua index 16fae4a..15c7d49 100644 --- a/lua/Trans/view/float.lua +++ b/lua/Trans/view/float.lua @@ -82,6 +82,7 @@ local function process() end return function(word) + buffer:init() -- TODO :online query -- local float = conf.float vim.notify([[ diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index 37ee5b8..7b09fca 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -1,9 +1,10 @@ local api = vim.api local conf = require('Trans').conf local hover = conf.hover -local buffer = require('Trans.buffer')() local error_msg = conf.icon.notfound .. ' 没有找到相关的翻译' +local buffer = require('Trans.buffer')() + local node = require('Trans.node') local it, t, f = node.item, node.text, node.format @@ -375,6 +376,7 @@ return function(word) width = width, height = math.min(buffer:height(width), hover.height) } + run(function() win:set('wrap', true) handle_keymap(win, word) diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua index 621142e..72dccf0 100644 --- a/lua/Trans/window.lua +++ b/lua/Trans/window.lua @@ -27,7 +27,9 @@ end ---@param option string option name ---@param value any function window:set(option, value) - api.nvim_win_set_option(self.winid, option, value) + if self:is_valid() then + api.nvim_win_set_option(self.winid, option, value) + end end ---@param name string option name