refactor: add animation utility

lua/Trans/init.lua

@@ -39,7 +39,7 @@ M.conf = {
             'BufLeave',
         },
         auto_play = true,
-        timeout = 3000,
+        timeout = 2000,
         spinner = 'dots', -- 查看所有样式: /lua/Trans/util/spinner
         -- spinner = 'moon'
     },
@@ -145,7 +145,7 @@ M.setup = function(opts)
         end, { desc = '  搜索翻译' })
 
 
-        local hls = require('Trans.theme')[M.conf.theme]
+        local hls = require('Trans.ui.theme')[M.conf.theme]
         for hl, opt in pairs(hls) do
             vim.api.nvim_set_hl(0, hl, opt)
         end

lua/Trans/query/baidu.lua

@@ -28,10 +28,10 @@ end
 --- this is a nice plugin
 ---返回一个channel
 ---@param word string
----@return function
+---@return table
 return function(word)
     local query = get_field(word)
-    local result
+    local result = {}
 
     post(uri, {
         data = query,
@@ -39,26 +39,21 @@ return function(word)
             content_type = "application/x-www-form-urlencoded",
         },
         callback = function(str)
-            if result then
+            local res = vim.json.decode(str)
-                return
+            if res and res.trans_result then
-            elseif str ~= '' then
+                result.value = {
-                local res = vim.fn.json_decode(str)
+                    word = word,
-                if res and res.trans_result then
+                    translation = res.trans_result[1].dst,
-                    result = {
+                }
-                        word = word,
-                        translation = res.trans_result[1].dst,
-                    }
 
-                else
+                if result.callback then
-                    result = false
+                    result.callback(result.value)
                 end
             else
-                result = false
+                result.value = false
             end
         end,
     })
 
-    return function()
+    return result
-        return result
-    end
 end

lua/Trans/util/animation.lua

@@ -0,0 +1,57 @@
+local animation = {
+    display = function(self)
+        local callback = self.callback or function ()
+
+        end
+
+        if self.sync then
+            local times = self.times
+            if times then
+                for i = 1, self.times do
+                    if self.run then
+                        self:frame(i)
+                    end
+                end
+            else
+                while self.run do
+                    self:frame()
+                end
+                callback()
+            end
+
+        else
+            local frame
+            if self.times then
+                local target = self.times
+                local times = 0
+                frame = function()
+                    if self.run and times < target then
+                        times = times + 1
+                        self:frame(times)
+                        vim.defer_fn(frame, self.interval)
+                    else
+                        callback()
+                    end
+                end
+
+            else
+                frame = function()
+                    if self.run then
+                        self:frame()
+                        vim.defer_fn(frame, self.interval)
+                    else
+                        callback()
+                    end
+                end
+            end
+            frame()
+        end
+    end,
+}
+
+animation.__index = animation
+
+return function(opts)
+    opts.run = true
+    return setmetatable(opts, animation)
+end

lua/Trans/util/curl.lua

@@ -10,8 +10,6 @@ local curl = {}
 --     end,
 -- }
 
-
-
 curl.GET = function(uri, opts)
     --- TODO :
 end
@@ -23,6 +21,8 @@ curl.POST = function(uri, opts)
         opts = { opts, 't' }
     }
 
+    local callback = opts.callback
+
     local cmd = { 'curl', '-s', uri }
     local size = 3
 
@@ -45,14 +45,20 @@ curl.POST = function(uri, opts)
         insert('-d', s:format(k, v))
     end
 
-    local option
+
-    if opts.callback then
+    local output = ''
-        option = {
+    local option = {
-            on_stdout = function (_, output)
+        stdin = 'null',
-                opts.callback(table.concat(output))
+        on_stdout = function(_, stdout)
-            end,
+            local str = table.concat(stdout)
-        }
+            if str ~= '' then
-    end
+                output = output .. str
+            end
+        end,
+        on_exit = function()
+            callback(output)
+        end,
+    }
 
     vim.fn.jobstart(table.concat(cmd, ' '), option)
 end

lua/Trans/view/hover.lua

@@ -23,7 +23,6 @@ local exist = function(str)
     return str and str ~= ''
 end
 
-
 local process = {
     title = function()
         local icon = conf.icon
@@ -105,9 +104,11 @@ local process = {
                 t = '不定式标记infm   ',
                 d = '限定词determiner ',
             }
+
+            local f = '%s %s%%'
             for pos in vim.gsplit(m_result.pos, '/', true) do
                 m_content:addline(
-                    it(m_indent .. pos_map[pos:sub(1, 1)] .. pos:sub(3) .. '%', 'TransPos')
+                    it(m_indent .. f:format(pos_map[pos:sub(1, 1)], pos:sub(3)), 'TransPos')
                 )
             end
 
@@ -131,7 +132,6 @@ local process = {
                 ['f'] = '第三人称单数',
             }
             local interval = '    '
-
             for exc in vim.gsplit(m_result.exchange, '/', true) do
                 m_content:addline(
                     it(m_indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3), 'TransExchange')
@@ -195,9 +195,7 @@ action = {
         if pin then
             error('too many window')
         end
-
         pcall(api.nvim_del_autocmd, cmd_id)
-        m_window:set('wrap', false)
 
         m_window:try_close {
             callback = function()
@@ -209,8 +207,8 @@ action = {
                     },
                     opt = {
                         callback = function()
-                            m_window:set('wrap', true)
                             m_window:bufset('bufhidden', 'wipe')
+                            m_window:set('wrap', true)
                         end
                     },
                 }
@@ -239,8 +237,7 @@ action = {
 
     close = function()
         pcall(api.nvim_del_autocmd, cmd_id)
-        m_window:set('wrap', false)
+        m_window:try_close { wipeout = true }
-        m_window:try_close()
         try_del_keymap()
     end,
 
@@ -284,13 +281,15 @@ end
 
 local function online_query(word)
     -- TODO :Progress Bar
-    local wait = {}
+    local lists = {}
     local size = 0
+    local icon = conf.icon
     for k, _ in pairs(conf.engine) do
         size = size + 1
-        wait[size] = require('Trans.query.' .. k)(word)
+        lists[size] = require('Trans.query.' .. k)(word)
     end
-    local error_msg = conf.icon.notfound .. '    没有找到相关的翻译'
+
+    local error_msg = icon.notfound .. '    没有找到相关的翻译'
 
     m_window:set_height(1)
     local width = m_window.width
@@ -301,58 +300,53 @@ local function online_query(word)
         return
     end
 
-    m_window:open()
-    local icon = conf.icon
     local cell = icon.cell
-    local spinner = require('Trans.util.spinner')[conf.hover.spinner]
+    local spinner = require('Trans.ui.spinner')[conf.hover.spinner]
     local range = #spinner
 
     local timeout = conf.hover.timeout
     local interval = math.floor(timeout / (m_window.width - spinner[1]:width()))
     local f = '%s %s'
-    local i = 1
+    require('Trans.util.animation')({
-    local do_progress
+        times = m_window.width,
-    do_progress = function()
+        frame = function(self, times)
-        m_content:wipe()
+            m_content:wipe()
-        for j = 1, size do
+            for i, v in ipairs(lists) do
-            local res = wait[j]()
+                local res = v.value
-            if res then
+                if res then
-                m_result = res
+                    m_result = res
-                m_window:set_width(width)
+                    m_window:set_width(width)
-                handle()
+                    handle()
+                    m_content:attach()
+
+                    m_window.height = m_content:actual_height(true)
+                    m_window:open {
+                        animation = 'fold',
+                    }
+
+                    self.run = false
+                    return
+                elseif res == 'false' then
+                    table.remove(lists, i)
+                    size = size - 1
+                end
+            end
+
+            if size == 0 then
+                m_content:addline(
+                    it(error_msg, 'TransFailed')
+                )
                 m_content:attach()
 
-                m_window.height = m_content:actual_height(true)
+            else
-                m_window:open {
+                m_content:addline(
-                    animation = 'fold',
+                    it(f:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg')
-                }
+                )
-                return
+                m_content:attach()
-
-            elseif res == false then
-                table.remove(wait, j)
-                size = size - 1
             end
-        end
+        end,
-
+        interval = interval,
-        if i == m_window.width or size == 0 then
+    }):display()
-            --- HACK : change framework
-            m_content:addline(
-                it(error_msg, 'TransFailed')
-            )
-
-            m_content:attach()
-
-        else
-            m_content:addline(
-                it(f:format(spinner[i % range + 1], cell:rep(i)), 'MoreMsg')
-            )
-            i = i + 1
-            m_content:attach()
-            vim.defer_fn(do_progress, interval)
-        end
-    end
-
-    do_progress()
 end
 
 return function(word)
@@ -372,22 +366,17 @@ return function(word)
         row       = 1,
     })
 
-
+    m_window:set('wrap', true)
     m_content = m_window:new_content()
 
     m_result = require('Trans.query.offline')(word)
     if m_result then
         handle()
-        m_window:open({
-            callback = function()
-                m_window:set('wrap', true)
-            end,
-        })
-
         local height = m_content:actual_height(true)
         if height < m_window.height then
             m_window:set_height(height)
         end
+        m_window:open()
     else
         online_query(word)
     end
@@ -398,8 +387,7 @@ return function(word)
             hover.auto_close_events, {
             buffer = 0,
             callback = function()
-                m_window:set('wrap', false)
+                m_window:try_close { wipeout = true }
-                m_window:try_close()
                 try_del_keymap()
                 api.nvim_del_autocmd(cmd_id)
             end,

lua/Trans/window.lua

@@ -1,5 +1,6 @@
 local api = vim.api
 local new_content = require('Trans.content')
+local new_animation = require('Trans.util.animation')
 
 function string:width()
     ---@diagnostic disable-next-line: param-type-mismatch
@@ -7,10 +8,11 @@ function string:width()
 end
 
 local busy = false
-local function check_busy()
+local function lock()
     while busy do
         vim.wait(50)
     end
+    busy = true
 end
 
 ---@class window
@@ -74,42 +76,37 @@ local window = {
 
     open = function(self, opts)
         self:draw()
+        local wrap = self:option('wrap')
+        self:set('wrap', false)
         opts            = opts or {}
-        local interval  = self.animation.interval
         local animation = opts.animation or self.animation.open
-        local callback  = opts.callback
+        local callback  = function()
-
+            busy = false
-        if animation then
+            self:set('wrap', wrap)
-            check_busy()
+            if opts.callback then
-
+                opts.callback()
-            local handler
-            local function wrap(name, target)
-                local count = 0
-                local action = 'nvim_win_set_' .. target
-                return function()
-                    if count < self[target] then
-                        busy = true
-                        count = count + 1
-                        api[action](self.winid, count)
-                        vim.defer_fn(handler[name], interval)
-
-                    else
-                        busy = false
-                        if callback then
-                            callback()
-                        end
-                    end
-                end
             end
+        end
 
-            handler = {
+        lock()
-                slid = wrap('slid', 'width'),
+        if animation then
-                fold = wrap('fold', 'height'),
+            local interval = self.animation.interval
-            }
+            local field = ({
+                fold = 'height',
+                slid = 'width',
+            })[animation]
 
-            handler[animation]()
+            local method = 'nvim_win_set_' .. field
+            new_animation({
+                interval = interval,
+                times = self[field],
+                frame = function(_, times)
+                    api[method](self.winid, times)
+                end,
+                callback = callback,
+            }):display()
 
-        elseif callback then
+        else
             callback()
         end
     end,
@@ -117,63 +114,58 @@ local window = {
     ---安全的关闭窗口
     try_close = function(self, opts)
         opts = opts or {}
-        local callback = opts.callback
+        self:set('wrap', false)
+
         if self:is_open() then
-            check_busy()
+            local callback = function()
-            self.config = api.nvim_win_get_config(self.winid)
-            local animation = self.animation
-            if animation.close then
-                local handler
-                local function wrap(name, target)
-                    local count = self[target]
-                    local action = 'nvim_win_set_' .. target
-                    return function()
-                        if count > 1 then
-                            busy = true
-                            count = count - 1
-                            api[action](self.winid, count)
-                            vim.defer_fn(handler[name], animation.interval)
-
-                        else
-                            vim.defer_fn(function()
-                                api.nvim_win_close(self.winid, true)
-                                self.winid = -1
-                                busy = false
-
-                                if type(callback) == 'function' then
-                                    callback()
-                                end
-
-                            end, animation.interval + 2)
-                        end
-                    end
-                end
-
-                handler = {
-                    slid = wrap('slid', 'width'),
-                    fold = wrap('fold', 'height'),
-                }
-
-                handler[animation.close]()
-
-            else
                 api.nvim_win_close(self.winid, true)
                 self.winid = -1
+                busy = false
+                if opts.callback then
+                    opts.callback()
+                end
+                if api.nvim_buf_is_valid(self.bufnr) and opts.wipeout then
+                    api.nvim_buf_delete(self.bufnr, { force = true })
+                    self.bufnr = -1
+                end
+            end
+
+            lock()
+            self.config = api.nvim_win_get_config(self.winid)
+            local animation = self.animation.close
+            if animation then
+                local interval = self.animation.interval
+                local field = ({
+                    fold = 'height',
+                    slid = 'width',
+                })[animation]
+
+                local target = self[field]
+                local method = 'nvim_win_set_' .. field
+                new_animation({
+                    times = target,
+                    frame = function(_, times)
+                        api[method](self.winid, target - times)
+                    end,
+                    callback = callback,
+                    interval = interval,
+                }):display()
+
+            else
+                callback()
             end
         end
     end,
 
     reopen = function(self, opts)
-        local entry    = opts.entry or false
+        assert(self.bufnr ~= -1)
-        local win_opt  = opts.win_opt
+        local entry   = opts.entry or false
-        local opt      = opts.opt
+        local win_opt = opts.win_opt or {}
+        local opt     = opts.opt
 
-        check_busy()
         self.config.win = nil
-        if win_opt then
+        for k, v in pairs(win_opt) do
-            for k, v in pairs(win_opt) do
+            self.config[k] = v
-                self.config[k] = v
-            end
         end
 
         self.winid = api.nvim_open_win(self.bufnr, entry, self.config)