refactor: remove useless code

lua/Trans/backend/baidu.lua

@@ -4,11 +4,9 @@ local appPasswd = baidu.appPasswd
 local salt      = tostring(math.random(bit.lshift(1, 15)))
 local uri       = 'https://fanyi-api.baidu.com/api/trans/vip/translate'
 
-if appid == '' or appPasswd == '' then
+-- error('请查看README, 实现在线翻译或者设置将在线翻译设置为false')
-    error('请查看README, 实现在线翻译或者设置将在线翻译设置为false')
-end
 
-local post = require('Trans.util.curl').POST
+local post      = require('Trans.util.curl').POST
 
 local function get_field(word, isEn)
     local to   = isEn and 'zh' or 'en'
@@ -43,7 +41,7 @@ return function(word)
             if ok and res and res.trans_result then
                 result[1] = {
                     title = { word = word },
-                    [isEn and 'translation' or 'definition'] = res.trans_result[1].dst,
+                        [isEn and 'translation' or 'definition'] = res.trans_result[1].dst,
                 }
 
                 if result.callback then

lua/Trans/backend/init.lua

@@ -1,13 +1,10 @@
 local M = {}
 
-
+M.__index = function(t, k)
-M.__index = function(tbl, k)
+    local res, engine = pcall(require, [[Trans.backend.]] .. k)
-    local res, engine = pcall(require, 'Trans.backend.' .. k)
+    assert(res, [[No such Backend: ]] .. k)
-    assert(res, [[Can't Found Engine:]] .. k)
+    t[k] = engine
-
-    tbl[k] = engine
     return engine
 end
 
-
 return setmetatable(M, M)

lua/Trans/backend/offline.lua

@@ -1,12 +1,6 @@
-local _, db = pcall(require, 'sqlite.db')
+local M = {}
-if not _ then
-    error('Please check out sqlite.lua')
-end
-
--- INFO : init database
-local path = require('Trans').conf.db_path
-local dict = db:open(path)
 
+local db = require 'sqlite.db'
 vim.api.nvim_create_autocmd('VimLeavePre', {
     once = true,
     callback = function()
@@ -16,32 +10,52 @@ vim.api.nvim_create_autocmd('VimLeavePre', {
     end
 })
 
+M.query = function(opts)
+    opts = type(opts) == 'string' and { str = opts } or opts
+    if opts.is_word == false then return end
 
-return function(word)
-    local res = (dict:select('stardict', {
-        where = { word = word, },
-        keys = {
-            'word',
-            'phonetic',
-            'definition',
-            'translation',
-            'pos',
-            'collins',
-            'oxford',
-            'tag',
-            'exchange',
-        },
-        limit = 1,
-    }))[1]
 
-    if res then
+    local str       = opts.str
-        res.title = {
+    local path      = opts.path or require('Trans').conf.db_path
-            word = res.word,
+    local formatter = opts.formatter or M.formatter
-            oxford = res.oxford,
+    local field     = M.field or M.field
-            collins = res.collins,
+
-            phonetic = res.phonetic,
+
-        }
+    local dict    = db:open(path)
-    end
+    local db_name = opts.db_name or 'stardict'
+    local res     = dict:select(db_name, {
+            where = { word = str, },
+            keys = field,
+            limit = 1,
+        })[1]
+
+    return res and formatter(res) or nil
+end
+
+M.nowait = true
+
+M.field = {
+    'word',
+    'phonetic',
+    'definition',
+    'translation',
+    'pos',
+    'collins',
+    'oxford',
+    'tag',
+    'exchange',
+}
+
+
+M.formatter = function(res)
+    res.title = {
+        word = res.word,
+        oxford = res.oxford,
+        collins = res.collins,
+        phonetic = res.phonetic,
+    }
 
     return res
 end
+
+return M

lua/Trans/backend/util.lua

@@ -0,0 +1,16 @@
+local M = {}
+
+M.is_English = function(str)
+    local char = { str:byte(1, -1) }
+    for i = 1, #str do
+        if char[i] > 128 then
+            return false
+        end
+    end
+    return true
+end
+
+
+
+return M
+

lua/Trans/frontend/hover.lua

@@ -315,7 +315,7 @@ local function online_query(win, word)
     end
     local cell      = icon.cell
     local timeout   = hover.timeout
-    local spinner   = require('Trans.ui.spinner')[hover.spinner]
+    local spinner   = require('Trans.style.spinner')[hover.spinner]
     local range     = #spinner
     local interval  = math.floor(timeout / (win.width - spinner[1]:width()))
     local win_width = win.width

lua/Trans/init.lua

@@ -1,46 +1,12 @@
 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' },
         { ' Trans', 'TransTitle' },
         { '',       'TransTitleRound' },
     } or nil
 
--- local title = {
---     "████████╗██████╗  █████╗ ███╗   ██╗███████╗",
---     "╚══██╔══╝██╔══██╗██╔══██╗████╗  ██║██╔════╝",
---     "   ██║   ██████╔╝███████║██╔██╗ ██║███████╗",
---     "   ██║   ██╔══██╗██╔══██║██║╚██╗██║╚════██║",
---     "   ██║   ██║  ██║██║  ██║██║ ╚████║███████║",
---     "   ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═══╝╚══════╝",
---}
-
-
-string.width = api.nvim_strwidth
-string.isEn = function(self)
-    local char = { self:byte(1, -1) }
-    for i = 1, #self do
-        if char[i] > 128 then
-            return false
-        end
-    end
-    return true
-end
-
-string.play = fn.has('linux') == 1 and function(self)
-        local cmd = ([[echo "%s" | festival --tts]]):format(self)
-        fn.jobstart(cmd)
-    end or function(self)
-        local seperator = fn.has('unix') and '/' or '\\'
-        local file = debug.getinfo(1, "S").source:sub(2):match('(.*)lua') .. seperator .. 'tts' .. seperator .. 'say.js'
-        fn.jobstart('node ' .. file .. ' ' .. self)
-    end
-
 M.conf = {
     view = {
         i = 'float',
@@ -125,27 +91,10 @@ M.setup = function(opts)
     if opts then
         M.conf = vim.tbl_deep_extend('force', M.conf, opts)
     end
-    local conf = M.conf
+    local conf   = M.conf
-
-    local float = conf.float
-    if 0 < float.height and float.height <= 1 then
-        float.height = math.floor((vim.o.lines - vim.o.cmdheight - 1) * float.height)
-    end
-    if 0 < float.width and float.width <= 1 then
-        float.width = math.floor(vim.o.columns * float.width)
-    end
-
-    local engines = {}
-    local i = 1
-    for k, _ in pairs(conf.engine) do
-        engines[i] = k
-        i = i + 1
-    end
-
-    conf.engines = engines
 
     local set_hl = api.nvim_set_hl
-    local hls    = require('Trans.ui.theme')[conf.theme]
+    local hls    = require('Trans.style.theme')[conf.theme]
     for hl, opt in pairs(hls) do
         set_hl(0, hl, opt)
     end
@@ -168,18 +117,19 @@ local function get_select()
     local uidx = vim.str_utfindex(line, math.min(#line, e_col))
     e_col = vim.str_byteindex(line, uidx)
 
+
     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
+        local e = #lines
         lines[1] = lines[1]:sub(s_col)
-        lines[i] = line:sub(1, e_col)
+        lines[e] = line:sub(1, e_col)
         return table.concat(lines)
     end
 end
 
-M.get_word = function(mode)
+M.get_str = function(mode)
     local word
     if mode == 'n' then
         word = fn.expand('<cword>')
@@ -197,18 +147,47 @@ M.get_word = function(mode)
 end
 
 
-M.translate = function(mode, view)
+M.translate = function(opts)
-    local function demo()
+    opts = opts or {}
-        local frame = 1000
+    local mode = opts.mode or vim.api.nvim_get_mode().mode
-        for i = 1, 10 do
+    local str = M.get_str(mode)
-            print('now is ' .. i)
+    local view = opts.view or M.conf.view[mode]
-            vim.wait(frame)
-        end
-    end
 
-    vim.defer_fn(demo, 10)
+    if str == '' then return end
+
+    local res = require('Trans.backend').offline.query(str)
+    vim.pretty_print(res)
 end
 
+
+-- local title = {
+--     "████████╗██████╗  █████╗ ███╗   ██╗███████╗",
+--     "╚══██╔══╝██╔══██╗██╔══██╗████╗  ██║██╔════╝",
+--     "   ██║   ██████╔╝███████║██╔██╗ ██║███████╗",
+--     "   ██║   ██╔══██╗██╔══██║██║╚██╗██║╚════██║",
+--     "   ██║   ██║  ██║██║  ██║██║ ╚████║███████║",
+--     "   ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═══╝╚══════╝",
+--}
+
+-- string.width = api.nvim_strwidth
+-- string.isEn = function(self)
+--     local char = { self:byte(1, -1) }
+--     for i = 1, #self do
+--         if char[i] > 128 then
+--             return false
+--         end
+--     end
+--     return true
+-- end
+
+-- string.play = fn.has('linux') == 1 and function(self)
+--         local cmd = ([[echo "%s" | festival --tts]]):format(self)
+--         fn.jobstart(cmd)
+--     end or function(self)
+--         local seperator = fn.has('unix') and '/' or '\\'
+--         local file = debug.getinfo(1, "S").source:sub(2):match('(.*)lua') .. seperator .. 'tts' .. seperator .. 'say.js'
+--         fn.jobstart('node ' .. file .. ' ' .. self)
+--     end
 M.ns = api.nvim_create_namespace('Trans')
 
 return M

plugin/Trans.lua

@@ -4,10 +4,11 @@ local api = vim.api
 local M = require('Trans')
 local new_command = api.nvim_create_user_command
 new_command('Translate', function() M.translate() end, { desc = '  单词翻译', })
-new_command('TranslateInput', function() M.translate('i') end, { desc = '  搜索翻译', })
+
-new_command('TransPlay', function()
+-- new_command('TranslateInput', function() M.translate { mode = 'i' } end, { desc = '  搜索翻译', })
-    local word = M.get_word(api.nvim_get_mode().mode)
+-- new_command('TransPlay', function()
-    if word ~= '' and word:isEn() then
+--     local word = M.get_word(api.nvim_get_mode().mode)
-        word:play()
+--     if word ~= '' and word:isEn() then
-    end
+--         word:play()
-end, { desc = ' 自动发音' })
+--     end
+-- end, { desc = ' 自动发音' })