refactor: begin to try to refactor frontend part

lua/Trans/core/conf.lua

@@ -56,6 +56,7 @@ return {
                 'definition',
             },
             spinner = 'dots', -- see: /lua/Trans/style/spinner
+            fallback_message = '翻译超时或没有找到相关的翻译' -- TODO :support replace with {{special word}}
         },
     },
     style    = {

lua/Trans/core/translate.lua

@@ -65,14 +65,6 @@ local function set_result(data)
 end
 
 
-local function render_window(data)
-    -- TODO :
-    vim.pretty_print(data)
-    print('begin to render window')
-end
-
-
-
 -- HACK : Core process logic
 local function process(opts)
     Trans.translate = coroutine.wrap(process)
@@ -82,8 +74,8 @@ local function process(opts)
 
     -- Find in cache
     if Trans.cache[str] then
-        local data = Trans.cache[opts.str]
+        local data = Trans.cache[str]
-        render_window(data)
+        data.frontend:process(data)
         return
     end
 
@@ -101,7 +93,7 @@ local function process(opts)
     if success == false then return end
 
     Trans.cache[data.str] = data
-    render_window(data)
+    data.frontend:process(data)
 end
 
 return coroutine.wrap(process)

lua/Trans/frontend/float.lua

@@ -1,120 +1,120 @@
-local api = vim.api
+-- local api = vim.api
-local conf = require('Trans').conf
+-- local conf = require('Trans').conf
-local buffer = require('Trans.buffer')()
+-- local buffer = require('Trans.buffer')()
 
-local node = require("Trans.node")
+-- local node = require("Trans.node")
-local t = node.text
+-- local t = node.text
-local it = node.item
+-- local it = node.item
-local f = node.format
+-- local f = node.format
 
 
-local engine_map = {
+-- local engine_map = {
-    baidu   = '百度',
+--     baidu   = '百度',
-    youdao  = '有道',
+--     youdao  = '有道',
-    iciba   = 'iciba',
+--     iciba   = 'iciba',
-    offline = '本地',
+--     offline = '本地',
-}
+-- }
 
-local function set_tag_hl(name, status)
+-- local function set_tag_hl(name, status)
-    -- local hl = conf.float.tag[status]
+-- local hl = conf.float.tag[status]
-    -- m_window:set_hl(name, {
+-- m_window:set_hl(name, {
-    --     fg = '#000000',
+--     fg = '#000000',
-    --     bg = hl,
+--     bg = hl,
-    -- })
+-- })
 
-    -- m_window:set_hl(name .. 'round', {
+-- m_window:set_hl(name .. 'round', {
-    --     fg = hl,
+--     fg = hl,
-    -- })
+-- })
-end
+-- end
 
-local function set_title()
+-- local function set_title()
-    -- local title = m_window:new_content()
+-- local title = m_window:new_content()
-    -- local github = '  https://github.com/JuanZoran/Trans.nvim'
+-- local github = '  https://github.com/JuanZoran/Trans.nvim'
 
-    -- title:addline(
+-- title:addline(
-    --     title:center(it(github, '@text.uri'))
+--     title:center(it(github, '@text.uri'))
-    -- )
+-- )
 
-    -- local f = '%s(%d)'
+-- local f = '%s(%d)'
 
-    -- local tags = {}
+-- local tags = {}
-    -- local load_tag = function(engine, index)
+-- local load_tag = function(engine, index)
-    --     set_tag_hl(engine, 'wait')
+--     set_tag_hl(engine, 'wait')
-    --     local round = engine .. 'round'
+--     local round = engine .. 'round'
-    --     table.insert(tags, t(
+--     table.insert(tags, t(
-    --         it('', round),
+--         it('', round),
-    --         it(f:format(engine_map[engine], index), engine),
+--         it(f:format(engine_map[engine], index), engine),
-    --         it('', round)
+--         it('', round)
-    --     ))
+--     ))
-    -- end
+-- end
-    -- load_tag('offline', 1)
+-- load_tag('offline', 1)
-    -- title:addline(unpack(tags))
+-- title:addline(unpack(tags))
-    -- title:newline('')
+-- title:newline('')
-end
+-- end
 
-local action = {
+-- local action = {
-    quit = function()
+--     quit = function()
-        -- m_window:try_close()
+--         -- m_window:try_close()
-    end,
+--     end,
-}
+-- }
 
-local exist = function(str)
+-- local exist = function(str)
-    return str and str ~= ''
+--     return str and str ~= ''
-end
+-- end
 
-local function process()
+-- local function process()
-    -- TODO :
+-- TODO :
-    -- local icon = conf.icon
+-- local icon = conf.icon
-    -- m_content:addline(m_content:format {
+-- m_content:addline(m_content:format {
-    --     nodes = {
+--     nodes = {
-    --         it(m_result.word, 'TransWord'),
+--         it(m_result.word, 'TransWord'),
-    --         t(
+--         t(
-    --             it('['),
+--             it('['),
-    --             it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'),
+--             it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'),
-    --             it(']')
+--             it(']')
-    --         ),
+--         ),
-    --         it(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'),
+--         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)
+--         it(m_result.oxford == 1 and icon.yes or icon.no)
-    --     },
+--     },
-    --     width = math.floor(m_window.width * 0.5)
+--     width = math.floor(m_window.width * 0.5)
-    -- })
+-- })
-    -- m_content:addline(it('该窗口还属于实验性功能 .... '))
+-- m_content:addline(it('该窗口还属于实验性功能 .... '))
-end
+-- end
 
-return function(word)
+-- return function(word)
-    buffer:init()
+--     buffer:init()
-    -- TODO :online query
+--     -- TODO :online query
-    -- local float = conf.float
+--     -- local float = conf.float
-    vim.notify([[
+--     vim.notify([[
-[注意]: 
+-- [注意]:
-float窗口目前还待开发
+-- float窗口目前还待开发
-如果需要input查询功能, 请将窗口改成hover]])
+-- 如果需要input查询功能, 请将窗口改成hover]])
-    -- local opt = {
+-- local opt = {
-    --     relative  = 'editor',
+--     relative  = 'editor',
-    --     width     = float.width,
+--     width     = float.width,
-    --     height    = float.height,
+--     height    = float.height,
-    --     border    = float.border,
+--     border    = float.border,
-    --     title     = float.title,
+--     title     = float.title,
-    --     animation = float.animation,
+--     animation = float.animation,
-    --     row       = bit.rshift((vim.o.lines - float.height), 1),
+--     row       = bit.rshift((vim.o.lines - float.height), 1),
-    --     col       = bit.rshift((vim.o.columns - float.width), 1),
+--     col       = bit.rshift((vim.o.columns - float.width), 1),
-    --     zindex    = 20,
+--     zindex    = 20,
-    -- }
+-- }
-    -- m_window = require('Trans.window')(true, opt)
+-- m_window = require('Trans.window')(true, opt)
-    -- set_title()
+-- set_title()
-    -- m_content = m_window:new_content()
+-- m_content = m_window:new_content()
-    -- m_result = require('Trans.query.offline')(word)
+-- m_result = require('Trans.query.offline')(word)
-    -- if m_result then
+-- if m_result then
-    --     set_tag_hl('offline', 'success')
+--     set_tag_hl('offline', 'success')
-    --     process()
+--     process()
-    -- else
+-- else
-    --     set_tag_hl('offline', 'fail')
+--     set_tag_hl('offline', 'fail')
-    -- end
+-- end
 
-    -- m_window:open()
+-- m_window:open()
-    -- m_window:bufset('bufhidden', 'wipe')
+-- m_window:bufset('bufhidden', 'wipe')
 
-    -- for act, key in pairs(float.keymap) do
+-- for act, key in pairs(float.keymap) do
-    --     m_window:map(key, action[act])
+--     m_window:map(key, action[act])
-    -- end
+-- end
-end
+-- end

lua/Trans/frontend/hover/execute.lua

@@ -0,0 +1,27 @@
+local strategy = {
+    play = function(self)
+        print('TODO: play')
+    end,
+    pageup = function()
+        print('TODO: pageup')
+    end,
+    pagedown = function()
+        print('TODO: pagedown')
+    end,
+    pin = function()
+        print('TODO: pin')
+    end,
+    close = function()
+        print('TODO: close')
+    end,
+    toggle_entry = function()
+        print('TODO: toggle_entry')
+    end,
+}
+
+
+
+return function(self, action)
+    -- TODO :
+    strategy[action](self)
+end

lua/Trans/frontend/hover/init.lua

@@ -1,29 +1,54 @@
-local M     = {}
-
 local Trans = require('Trans')
+local style = Trans.conf.style
 
-M.__index   = M
+local M = Trans.metatable('frontend.hover')
 
-function M.new(data)
+M.queue = {}
-    return setmetatable({
+
+M.__index = M
+
+
+function M.new()
+    local new_instance = {
         buffer = Trans.wrapper.buffer.new(),
-    }, M)
+    }
+    M.queue[#M.queue + 1] = new_instance
+
+    return setmetatable(new_instance, M)
 end
 
 function M.get_active_instance()
-    -- TODO :
+    M.clear_dead_instance()
+    return M.queue[1]
 end
 
 function M.clear_dead_instance()
-    -- TODO :
+    for i = #M.queue, 1, -1 do
+        if not M.queue[i]:is_available() then
+            table.remove(M.queue, i)
+        end
+    end
+end
+
+function M.new_window()
+
 end
 
 function M:wait(tbl, name, timeout)
-    local error_message = 'Faild'
+    local msg     = self.opts.fallback_message
-    local interval = math.floor(timeout / #error_message)
+    local wid     = msg:width()
-    for i = 1, #error_message do
+    local spinner = Trans.style.spinner[self.opts.spinner]
+    local size    = #spinner
+
+    local function update_text(times)
+        return spinner[times % size + 1] .. ('.'):rep(times)
+    end
+
+
+    local interval = math.floor(timeout / wid)
+    for i = 1, wid do
         if tbl[name] ~= nil then break end
-        print('waitting' .. ('.'):rep(i))
+        print(update_text(i))
         Trans.util.pause(interval)
     end
 
@@ -31,42 +56,17 @@ function M:wait(tbl, name, timeout)
 end
 
 function M:process(data)
+    vim.pretty_print(data.result)
     print('TODO: process data')
 end
 
-
 function M:is_available()
-    return true
+    return self.buffer:is_valid() and self.window:is_valid()
-end
-
-function M:execute(action)
-    -- M.actions = {
-    --     play = function()
-    --         print('TODO: play')
-    --     end,
-    --     pageup = function()
-    --         print('TODO: pageup')
-    --     end,
-    --     pagedown = function()
-    --         print('TODO: pagedown')
-    --     end,
-    --     pin = function()
-    --         print('TODO: pin')
-    --     end,
-    --     close = function()
-    --         print('TODO: close')
-    --     end,
-    --     toggle_entry = function()
-    --         print('TODO: toggle_entry')
-    --     end,
-    -- }
 end
 
 return M
 
--- local hover = conf.hover
 -- local error_msg = conf.icon.notfound .. '    没有找到相关的翻译'
-
 -- local buffer = require('Trans.buffer')()
 
 -- local node = require('Trans.node')

plugin/Trans.lua

@@ -1,5 +1,6 @@
 local api, fn = vim.api, vim.fn
 
+string.width = api.nvim_strwidth
 --- INFO :Define string play method
 if fn.has('linux') == 1 then
     string.play = function(self)