From a1488b2d9b75691a33e40232c37b4be541749d81 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Thu, 5 Jan 2023 21:15:01 +0800 Subject: [PATCH] refactor: init the repo and decide to add more feature --- lua/.luarc.json | 6 ++++ lua/Trans/component/offline/Definition.lua | 7 ++++ lua/Trans/component/offline/Exchange.lua | 7 ++++ lua/Trans/component/offline/Pos.lua | 7 ++++ lua/Trans/component/offline/Tag.lua | 7 ++++ lua/Trans/component/offline/Title.lua | 7 ++++ lua/Trans/component/offline/Translation.lua | 7 ++++ lua/Trans/conf/base.lua | 2 +- lua/Trans/conf/default.lua | 34 +++++++++++-------- lua/Trans/conf/window.lua | 11 +++++- lua/Trans/core/content.lua | 19 +++++++++++ lua/Trans/{core.lua => core/init.lua} | 25 -------------- lua/Trans/core/query.lua | 37 +++++++++++++++++++++ lua/Trans/database/init.lua | 27 ++++++++++++--- lua/Trans/init.lua | 2 +- lua/Trans/{content.lua => ui/init.lua} | 0 lua/Trans/util/parser.lua | 19 +++++++++++ 17 files changed, 178 insertions(+), 46 deletions(-) create mode 100644 lua/.luarc.json create mode 100644 lua/Trans/component/offline/Definition.lua create mode 100644 lua/Trans/component/offline/Exchange.lua create mode 100644 lua/Trans/component/offline/Pos.lua create mode 100644 lua/Trans/component/offline/Tag.lua create mode 100644 lua/Trans/component/offline/Title.lua create mode 100644 lua/Trans/component/offline/Translation.lua create mode 100644 lua/Trans/core/content.lua rename lua/Trans/{core.lua => core/init.lua} (91%) create mode 100644 lua/Trans/core/query.lua rename lua/Trans/{content.lua => ui/init.lua} (100%) create mode 100644 lua/Trans/util/parser.lua diff --git a/lua/.luarc.json b/lua/.luarc.json new file mode 100644 index 0000000..43e8c9f --- /dev/null +++ b/lua/.luarc.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "Lua.diagnostics.disable": [ + "unused-local" + ] +} \ No newline at end of file diff --git a/lua/Trans/component/offline/Definition.lua b/lua/Trans/component/offline/Definition.lua new file mode 100644 index 0000000..cf04e60 --- /dev/null +++ b/lua/Trans/component/offline/Definition.lua @@ -0,0 +1,7 @@ +local M = {} + +M.to_lines = function (field) + -- TODO +end + +return M diff --git a/lua/Trans/component/offline/Exchange.lua b/lua/Trans/component/offline/Exchange.lua new file mode 100644 index 0000000..cf04e60 --- /dev/null +++ b/lua/Trans/component/offline/Exchange.lua @@ -0,0 +1,7 @@ +local M = {} + +M.to_lines = function (field) + -- TODO +end + +return M diff --git a/lua/Trans/component/offline/Pos.lua b/lua/Trans/component/offline/Pos.lua new file mode 100644 index 0000000..cf04e60 --- /dev/null +++ b/lua/Trans/component/offline/Pos.lua @@ -0,0 +1,7 @@ +local M = {} + +M.to_lines = function (field) + -- TODO +end + +return M diff --git a/lua/Trans/component/offline/Tag.lua b/lua/Trans/component/offline/Tag.lua new file mode 100644 index 0000000..cf04e60 --- /dev/null +++ b/lua/Trans/component/offline/Tag.lua @@ -0,0 +1,7 @@ +local M = {} + +M.to_lines = function (field) + -- TODO +end + +return M diff --git a/lua/Trans/component/offline/Title.lua b/lua/Trans/component/offline/Title.lua new file mode 100644 index 0000000..cf04e60 --- /dev/null +++ b/lua/Trans/component/offline/Title.lua @@ -0,0 +1,7 @@ +local M = {} + +M.to_lines = function (field) + -- TODO +end + +return M diff --git a/lua/Trans/component/offline/Translation.lua b/lua/Trans/component/offline/Translation.lua new file mode 100644 index 0000000..cf04e60 --- /dev/null +++ b/lua/Trans/component/offline/Translation.lua @@ -0,0 +1,7 @@ +local M = {} + +M.to_lines = function (field) + -- TODO +end + +return M diff --git a/lua/Trans/conf/base.lua b/lua/Trans/conf/base.lua index 0a7f899..42c4d8e 100644 --- a/lua/Trans/conf/base.lua +++ b/lua/Trans/conf/base.lua @@ -6,7 +6,7 @@ local buf_opts = { local buf = vim.api.nvim_create_buf(false, true) for k, v in pairs(buf_opts) do - vim.api.nvim_buf_set_options(buf, k, v) + vim.api.nvim_buf_set_option(buf, k, v) end M.buf = buf diff --git a/lua/Trans/conf/default.lua b/lua/Trans/conf/default.lua index 667274f..7212202 100644 --- a/lua/Trans/conf/default.lua +++ b/lua/Trans/conf/default.lua @@ -1,27 +1,21 @@ local M = {} --- INFO :加载的规则 [LuaRule] -M.replace_rules = { - 'order', - 'Trans.+', -} - M.conf = { style = { - window = { + ui = { input = 'float', cursor = 'cursor', select = 'cursor' }, order = { - 'title', - 'tag', - 'pos', - 'exchange', - 'zh', - 'en', + 'Title', + 'Tag', + 'Pos', + 'Exchange', + 'Translation', + 'Definition', }, - conf = { + window = { -- NOTE :可选的风格：['fixed', 'relative', .. TODO] -- width 和 height说明： -- 大于1： @@ -44,6 +38,12 @@ M.conf = { width = 0.8, height = 0.9, }, + -- NOTE :如果你想限制某个组件的行数，可以设置 (名称与order相同) + -- Example: + -- limit = { + -- En = 1, -- 只显示第一行，（一般为最广泛的释义） + -- }, + limit = nil, }, }, ui = { @@ -107,4 +107,10 @@ M.conf = { -- TODO register word } +-- INFO :加载的规则 [LuaRule] +M.replace_rules = { + 'order', + 'Trans.+', +} + return M diff --git a/lua/Trans/conf/window.lua b/lua/Trans/conf/window.lua index 6f49f3f..04c6b49 100644 --- a/lua/Trans/conf/window.lua +++ b/lua/Trans/conf/window.lua @@ -1,7 +1,13 @@ local M = {} -local conf = require("Trans").conf.view +local conf = require("Trans.conf").style.window +local type_check = require("Trans.util.debug").type_check + +-- FIXME local get_float_opts = function(float_conf) + type_check { + float_conf = { float_conf, 'table' }, + } local columns = vim.o.columns local height = vim.o.lines - vim.o.cmdheight - float_conf.top_offset local width = math.floor(columns * float_conf.relative_width) @@ -21,6 +27,9 @@ local get_float_opts = function(float_conf) end local get_cursor_opts = function(cursor_conf) + type_check { + cursor_conf = { cursor_conf, 'table' }, + } local opts = { relative = 'cursor', col = 2, diff --git a/lua/Trans/core/content.lua b/lua/Trans/core/content.lua new file mode 100644 index 0000000..0cc6206 --- /dev/null +++ b/lua/Trans/core/content.lua @@ -0,0 +1,19 @@ +local M = {} +local type_check = require("Trans.util.debug").type_check + +local offline_dir = debug.getinfo(1, "S").source:sub(2):match('.*Trans') .. '/component/offline' + +M.to_content = function(query_res) + type_check { + query_res = { query_res, 'table' } + } + local content = {} + for file in vim.fs.dir(offline_dir) do + local res = require("Trans.component.offline." .. file:gsub('.lua', '')).to_content(query_res) + assert(res) + table.insert(content, res) + end + return content +end + +return M diff --git a/lua/Trans/core.lua b/lua/Trans/core/init.lua similarity index 91% rename from lua/Trans/core.lua rename to lua/Trans/core/init.lua index 08676d6..6e28f2d 100644 --- a/lua/Trans/core.lua +++ b/lua/Trans/core/init.lua @@ -1,4 +1,3 @@ ----@diagnostic disable: unused-local local M = {} local api = vim.api local conf = require("Trans").conf @@ -21,31 +20,7 @@ local highlight = { } -local function get_select() - local s_start = vim.fn.getpos("'<") - local s_end = vim.fn.getpos("'>") - if s_start[2] ~= s_start[2] then - error('TODO: multiline translate') - end - local lin = vim.api.nvim_buf_get_lines(0, s_start[2] - 1, s_end[2], false)[1] - local word = string.sub(lin, s_start[3], s_end[3]) - return word -end -local function get_query_res(method) - -- NOTE : get query word - local word = '' - if method == 'cursor' then - word = vim.fn.expand('') - elseif method == 'select' then - word = get_select():match('%s+') - elseif method == 'input' then - word = vim.fn.input('请输入您要查询的单词:') -- TODO Use Telescope with fuzzy finder - else - error('unknown method') - end - -- FIXME -end M.TransLate = function(opts) local res = get_query_res(opts.method) diff --git a/lua/Trans/core/query.lua b/lua/Trans/core/query.lua new file mode 100644 index 0000000..2f3f43e --- /dev/null +++ b/lua/Trans/core/query.lua @@ -0,0 +1,37 @@ +local M = {} + +local type_check = require("Trans.util.debug").type_check +local query = require("Trans.database").query + +local function get_select() + local s_start = vim.fn.getpos("'<") + local s_end = vim.fn.getpos("'>") + if s_start[2] ~= s_start[2] then + error('TODO: multiline translate') + end + local lin = vim.api.nvim_buf_get_lines(0, s_start[2] - 1, s_end[2], false)[1] + local word = string.sub(lin, s_start[3], s_end[3]) + return word +end + +M.get_query_res = function(method) + type_check { + method = { method, 'string' }, + } + + -- NOTE : get query word + local word = '' + if method == 'cursor' then + word = vim.fn.expand('') + elseif method == 'select' then + word = get_select():match('%s+') + elseif method == 'input' then + word = vim.fn.input('请输入您要查询的单词:') -- TODO Use Telescope with fuzzy finder + else + error('unknown method') + end + -- FIXME + return query(word) +end + +return M diff --git a/lua/Trans/database/init.lua b/lua/Trans/database/init.lua index a20baf6..aeab460 100644 --- a/lua/Trans/database/init.lua +++ b/lua/Trans/database/init.lua @@ -3,25 +3,44 @@ local _, db = pcall(require, 'sqlite.db') if not _ then error('Please check out sqlite.lua') end +local type_check = require("Trans.util.debug").type_check + +local query_field = { + 'word', + 'phonetic', + 'definition', + 'translation', + 'pos', + 'collins', + 'oxford', + 'tag', + 'exchange', +} -- INFO : init database -local path = require("Trans").conf.db_path +local path = require("Trans.conf").base.db_path local dict = db:open(path) -- INFO :Auto Close vim.api.nvim_create_autocmd('VimLeavePre', { group = require("Trans.conf.base").autogroup, - callback = function () + callback = function() if db:isopen() then db:close() end end }) -M.query = function (arg) +M.query = function(arg) -- TODO : more opts + type_check { + arg = { arg, 'string' }, + } local res = dict:select('stardict', { - where = { word = arg }, + where = { + word = arg, + }, + keys = query_field, }) return res[1] end diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index 828a1be..e076815 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -7,7 +7,7 @@ function M.setup(conf) if conf.base and not conf.base.lazy_load then require("Trans.conf.loader").load_conf() end - require("Trans.setup") + -- require("Trans.setup") end return M diff --git a/lua/Trans/content.lua b/lua/Trans/ui/init.lua similarity index 100% rename from lua/Trans/content.lua rename to lua/Trans/ui/init.lua diff --git a/lua/Trans/util/parser.lua b/lua/Trans/util/parser.lua new file mode 100644 index 0000000..4c4adfc --- /dev/null +++ b/lua/Trans/util/parser.lua @@ -0,0 +1,19 @@ +---@diagnostic disable: missing-return, unused-local +local M = {} +local type_check = require("Trans.util.debug").type_check + +---解析宽度 +---@param width integer +---@return integer +M.width = function (width) + -- TODO +end + +---解析宽度 +---@param height integer +---@return integer +M.height = function (height) + -- TODO +end + +return M