fix fetch word

fix(font): replace removed characters with valids

LICENCE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Zoran
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -93,7 +93,7 @@ _安装之前, 首先需要明确本插件的依赖:_
 
 ```lua
 use {
-    'JuanZoran/Trans.nvim'
+    'JuanZoran/Trans.nvim',
     run = function() require('Trans').install() end, -- 自动下载使用的本地词库
     requires =  'kkharji/sqlite.lua', ,
     -- 如果你不需要任何配置的话, 可以直接按照下面的方式启动
@@ -139,10 +139,10 @@ use {
         build = function () require'Trans'.install() end,
         keys = {
         -- 可以换成其他你想映射的键
-            { 'mm', mode = { 'n', 'x' }, '<Cmd>Translate<CR>', desc = ' Translate' },
+            { 'mm', mode = { 'n', 'x' }, '<Cmd>Translate<CR>', desc = '󰊿 Translate' },
             { 'mk', mode = { 'n', 'x' }, '<Cmd>TransPlay<CR>', desc = ' Auto Play' },
             -- 目前这个功能的视窗还没有做好，可以在配置里将view.i改成hover
-            { 'mi', '<Cmd>TranslateInput<CR>', desc = ' Translate From Input' },
+            { 'mi', '<Cmd>TranslateInput<CR>', desc = '󰊿 Translate From Input' },
         },
         dependencies = { 'kkharji/sqlite.lua', },
         opts = {
@@ -177,10 +177,7 @@ use {
 
     -   `Mac` 使用系统的`say`命令
 
-    -   `Windows` 使用 `nodejs`的 say 模块, 如果你有更好的方案欢迎提供 PR
+    -   `Windows` 使用原生的 Powershell 命令, 感谢[PR](https://github.com/JuanZoran/Trans.nvim/pull/34)
-        -   需要确保安装了`nodejs`
-        -   进入插件的`tts`目录运行`npm install`
-            > 如果`install`运行正常则自动安装，如果安装失败，请尝试手动安装
 
 -   `title`的配置，只对`neovim 0.9+`版本有效
 
@@ -262,7 +259,7 @@ default_conf = {
             border    = 'rounded',
             title     = vim.fn.has 'nvim-0.9' == 1 and {
                     { '',       'TransTitleRound' },
-                    { ' Trans', 'TransTitle' },
+                    { '󰊿 Trans', 'TransTitle' },
                     { '',       'TransTitleRound' },
                 } or nil, -- need nvim-0.9+
             auto_play = true,
@@ -329,7 +326,7 @@ default_conf = {
                 -- or use emoji
                 list        = '●', -- ● | ○ | ◉ | ◯ | ◇ | ◆ | ▪ | ▫ | ⬤ | 🟢 | 🟡 | 🟣 | 🟤 | 🟠| 🟦 | 🟨 | 🟧 | 🟥 | 🟪 | 🟫 | 🟩 | 🟦
                 star        = '', -- ⭐ | ✴ | ✳ | ✲ | ✱ | ✰ | ★ | ☆ | 🌟 | 🌠 | 🌙 | 🌛 | 🌜 | 🌟 | 🌠 | 🌌 | 🌙 |
-                notfound    = ' ', --❔ | ❓ | ❗ | ❕|
+                notfound    = '󰆆 ', --❔ | ❓ | ❗ | ❕|
                 yes         = '✔', -- ✅ | ✔️ | ☑
                 no          = '', -- ❌ | ❎ | ✖ | ✘ | ✗ |
                 cell        = '■', -- ■  | □ | ▇ | ▏ ▎ ▍ ▌ ▋ ▊ ▉
@@ -455,12 +452,12 @@ TransWeb = {
 
 ## 贡献
 
-> 更新比较频繁, 文档先鸽了  
+> 更新比较频繁, 文档先鸽了 (wiki 写了一小部分  
 > 如果你想要参加这个项目, 可以提 issue, 我会把文档补齐
 
 ## 从 v1 (main)分支迁移
 
-    见[wiki](https://github.com/JuanZoran/Trans.nvim/wiki/%E4%BB%8E(v1)main%E5%88%86%E6%94%AF%E8%BF%81%E7%A7%BB)
+见[wiki](<https://github.com/JuanZoran/Trans.nvim/wiki/%E4%BB%8E(v1)main%E5%88%86%E6%94%AF%E8%BF%81%E7%A7%BB>)
 
 ## 待办 (画大饼)
 
@@ -468,11 +465,11 @@ TransWeb = {
 -   [x] 自动读音
 -   [x] 在线多引擎异步查询
 -   [x] `句子翻译` | `中翻英` 的支持
--   [ ] 迁移文档
+-   [x] 迁移文档
 -   [ ] 多风格样式查询
--   [ ] 重新录制屏幕截图示例
 -   [ ] 变量命名的支持
 -   [ ] 历史查询结果保存
+-   [ ] 翻译结果替换
 
 ## 项目情况
 

doc/Trans.txt

@@ -129,7 +129,7 @@ Packer.nvim ~
         requires = { 'kkharji/sqlite.lua',  },
         config = function()
             require("Trans").setup {} -- 启动Trans
-            vim.keymap.set({"n", 'x'}, "mm", '<Cmd>Translate<CR>', { desc = ' Translate' }) -- 自动判断virtual 还是 normal 模式
+            vim.keymap.set({"n", 'x'}, "mm", '<Cmd>Translate<CR>', { desc = '󰊿 Translate' }) -- 自动判断virtual 还是 normal 模式
             vim.keymap.set({'n', 'x'}, 'mk', '<Cmd>TransPlay<CR>', {desc = ' 自动发音'}) -- 自动发音选中或者光标下的单词
         end
     }
@@ -142,11 +142,11 @@ Lazy.nvim ~
             "JuanZoran/Trans.nvim",
             keys = {
             -- 可以换成其他你想映射的键
-                { 'mm', mode = { 'n', 'x' }, '<Cmd>Translate<CR>', desc = ' Translate' },
+                { 'mm', mode = { 'n', 'x' }, '<Cmd>Translate<CR>', desc = '󰊿 Translate' },
                 { 'mk', mode = { 'n', 'x' }, '<Cmd>TransPlay<CR>', desc = ' 自动发音' },
     
                 -- 目前这个功能的视窗还没有做好，可以在配置里将view.i改成hover
-                { 'mi', '<Cmd>TranslateInput<CR>', desc = ' Translate From Input' },
+                { 'mi', '<Cmd>TranslateInput<CR>', desc = '󰊿 Translate From Input' },
             },
             dependencies = { 'kkharji/sqlite.lua', },
             opts = {
@@ -301,7 +301,7 @@ Festival配置(仅针对linux用户) ~
                     -- or use emoji
                     list        = '●', -- ● | ○ | ◉ | ◯ | ◇ | ◆ | ▪ | ▫ | ⬤ | 🟢 | 🟡 | 🟣 | 🟤 | 🟦 | 🟨 | 🟧 | 🟥 | 🟪 | 🟫 | 🟩 | 🟠 | 🟦 | 🟨 | 🟧 | 🟥 | 🟪 | 🟫 | 🟩 | 🟠
                     star        = '', -- ⭐ | ✴ | ✳ | ✲ | ✱ | ✰ | ★ | ☆ | 🌟 | 🌠 | 🌙 | 🌛 | 🌜 | 🌟 | 🌠 | 🌌 | 🌙 |
-                    notfound    = ' ', --❔ | ❓ | ❗ | ❕|
+                    notfound    = '󰆆 ', --❔ | ❓ | ❗ | ❕|
                     yes         = '✔', -- ✅ | ✔️ | ☑
                     no          = '', -- ❌ | ❎ | ✖ | ✘ | ✗ |
                     cell        = '■', -- ■  | □ | ▇ | ▏ ▎ ▍ ▌ ▋ ▊ ▉ █

lua/Trans/backend/offline.lua

@@ -1,7 +1,7 @@
 local Trans   = require 'Trans'
 
 local db      = require 'sqlite.db'
-local path    = Trans.conf.dir .. Trans.separator .. 'ultimate.db'
+local path    = Trans.conf.dir .. '/ultimate.db'
 local dict    = db:open(path)
 local db_name = 'stardict'
 vim.api.nvim_create_autocmd('VimLeavePre', {

lua/Trans/core/conf.lua

@@ -6,6 +6,7 @@
 return {
     ---@type string the directory for database file and password file
     dir      = require 'Trans'.plugin_dir,
+    db_url   = 'https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdict-ultimate-sqlite.zip',
     debug    = true,
     ---@type 'default' | 'dracula' | 'tokyonight' global Trans theme [see lua/Trans/style/theme.lua]
     theme    = 'default', -- default | tokyonight | dracula
@@ -24,10 +25,10 @@ return {
             query     = 'fallback',
             border    = 'rounded',
             title     = vim.fn.has 'nvim-0.9' == 1 and {
-                    { '',       'TransTitleRound' },
+                { '', 'TransTitleRound' },
-                    { ' Trans', 'TransTitle' },
+                { '󰊿 Trans', 'TransTitle' },
-                    { '',       'TransTitleRound' },
+                { '', 'TransTitleRound' },
-                } or nil, -- need nvim-0.9+
+            } or nil, -- need nvim-0.9+
             auto_play = true,
             ---@type {open: string | boolean, close: string | boolean, interval: integer} Hover Window Animation
             animation = {
@@ -91,7 +92,7 @@ return {
                 -- or use emoji
                 list        = '●', -- ● | ○ | ◉ | ◯ | ◇ | ◆ | ▪ | ▫ | ⬤ | 🟢 | 🟡 | 🟣 | 🟤 | 🟠| 🟦 | 🟨 | 🟧 | 🟥 | 🟪 | 🟫 | 🟩 | 🟦
                 star        = '', -- ⭐ | ✴ | ✳ | ✲ | ✱ | ✰ | ★ | ☆ | 🌟 | 🌠 | 🌙 | 🌛 | 🌜 | 🌟 | 🌠 | 🌌 | 🌙 |
-                notfound    = ' ', --❔ | ❓ | ❗ | ❕|
+                notfound    = '󰆆 ', --❔ | ❓ | ❗ | ❕|
                 yes         = '✔', -- ✅ | ✔️ | ☑
                 no          = '', -- ❌ | ❎ | ✖ | ✘ | ✗ |
                 cell        = '■', -- ■  | □ | ▇ | ▏ ▎ ▍ ▌ ▋ ▊ ▉

lua/Trans/core/install.lua

@@ -5,7 +5,7 @@ return function()
     local fn = vim.fn
     -- INFO :Check ultimate.db exists
     local dir = Trans.conf.dir
-    local path = dir .. 'ultimate.db'
+    local path = dir .. '/ultimate.db'
 
     if fn.isdirectory(dir) == 0 then
         fn.mkdir(dir, 'p')
@@ -17,17 +17,16 @@ return function()
     end
 
     -- INFO :Download ultimate.db
-    local uri = 'https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdict-ultimate-sqlite.zip'
+    local uri = Trans.conf.db_url
-    local zip = dir .. 'ultimate.zip'
+    local zip = dir .. '/ultimate.zip'
     local continue = fn.filereadable(zip) == 1
     local handle = function(output)
         if output.exit == 0 and fn.filereadable(zip) then
-            if fn.executable 'unzip' == 0 then
+            local cmd =
-                vim.notify('unzip not found, Please unzip ' .. zip .. 'manually', vim.log.ERROR)
+                Trans.system == 'win' and
-                return
+                string.format('powershell.exe -Command "Expand-Archive -Force %s %s"', zip, dir) or
-            end
+                fn.executable('unzip') == 1 and string.format('unzip %s -d %s', zip, dir) or
-
+                error('unzip not found, Please unzip ' .. zip .. ' manually')
-            local cmd = string.format('unzip %s -d %s', zip, dir)
             local status = os.execute(cmd)
             os.remove(zip)
             if status == 0 then
@@ -41,16 +40,11 @@ return function()
     end
 
     Trans.curl.get(uri, {
-        output    = zip,
+        output   = zip,
-        callback  = handle,
+        callback = handle,
-        extra     = continue and { '-C', '-' } or nil,
+        extra    = continue and { '-C', '-' } or nil,
     })
 
     local message = continue and 'Continue download database' or 'Begin to download database'
     vim.notify(message, vim.log.levels.INFO)
-
-    -- INFO : Install tts dependencies
-    if Trans.system == 'win' then
-        os.execute 'cd ./tts && npm install'
-    end
 end

lua/Trans/core/translate.lua

@@ -74,8 +74,10 @@ local strategy = {
 -- HACK : Core process logic
 local function process(opts)
     opts = init_opts(opts)
-    local str = opts.str
+
-    if not str or str == '' then return end
+
+    if not opts.str or opts.str == '' then return end
+    local str = opts.str:match("(%w+)")
 
 
     -- Find in cache

lua/Trans/core/util.lua

@@ -3,20 +3,23 @@ local fn, api = vim.fn, vim.api
 ---@class TransUtil
 local M = require 'Trans'.metatable 'util'
 
+---Get the range of visual modes
+---@return table
+function M.get_range()
+    local _start = fn.getpos 'v'
+    local _end = fn.getpos '.'
+
+    local s_row, e_row = math.min(_start[2], _end[2]), math.max(_start[2], _end[2])
+    local s_col, e_col = math.min(_start[3], _end[3]), math.max(_start[3], _end[3])
+
+    return { s_row, e_row, s_col, e_col }
+end
 
 ---Get selected text
 ---@return string
 function M.get_select()
-    local _start = fn.getpos 'v'
+    local s_row, e_row, s_col, e_col = unpack(M.get_range())
-    local _end = fn.getpos '.'
 
-    if _start[2] > _end[2] or (_start[3] > _end[3] and _start[2] == _end[2]) then
-        _start, _end = _end, _start
-    end
-    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
     ---@diagnostic disable-next-line: assign-type-mismatch
     local line = fn.getline(e_row)
@@ -24,7 +27,6 @@ function M.get_select()
     ---@diagnostic disable-next-line: param-type-mismatch
     e_col = vim.str_byteindex(line, uidx)
 
-
     if s_row == e_row then
         return line:sub(s_col, e_col)
     else
@@ -39,23 +41,39 @@ end
 ---Get selected text
 ---@return string
 function M.get_lines()
-  local _start = vim.fn.getpos 'v'
+  local s_row, e_row = unpack(M.get_range())
-  local _end = vim.fn.getpos '.'
-
-  if _start[2] > _end[2] then
-    _start, _end = _end, _start
-  end
-
-  local s_row, e_row = _start[2], _end[2]
 
   if s_row == e_row then
-    return vim.fn.getline(s_row)
+    return fn.getline(s_row)
   else
-    local lines = vim.fn.getline(s_row, e_row)
+    local lines = fn.getline(s_row, e_row)
     return table.concat(lines, " ")
   end
 end
 
+---Get selected text
+---@return string
+function M.get_block()
+    local s_row, e_row, s_col, e_col = unpack(M.get_range())
+
+    ---@type string
+    ---@diagnostic disable-next-line: assign-type-mismatch
+    local line = fn.getline(e_row)
+    local uidx = vim.str_utfindex(line, math.min(#line, e_col))
+    ---@diagnostic disable-next-line: param-type-mismatch
+    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)
+        for col, l in pairs(lines) do
+          lines[col] = l:sub(s_col,e_col)
+        end
+        return table.concat(lines, " ")
+    end
+end
+
 ---Get Text which need to be translated
 ---@param mode string
 ---@return string
@@ -75,6 +93,10 @@ function M.get_str(mode)
             api.nvim_input '<Esc>'
             return M.get_lines()
         end,
+        [''] = function()
+            api.nvim_input '<Esc>'
+            return M.get_block()
+        end,
     })[mode]():match '^%s*(.-)%s*$'
 end
 

lua/Trans/health.lua

@@ -36,13 +36,14 @@ local function check_binary_dependencies()
     local binary_dependencies = {
         'curl',
         'sqlite3',
+        'unzip',
     }
 
     binary_dependencies[3] = ({
-        win    = 'node',
+        win    = nil,
         mac    = 'say',
         linux  = 'festival',
-        termux = 'termux-api-speak',
+        termux = 'termux-tts-speak',
     })[Trans.system]
 
 
@@ -56,7 +57,7 @@ local function check_binary_dependencies()
 end
 
 local function check_database()
-    local db_path = Trans.conf.dir .. Trans.separator .. 'ultimate.db'
+    local db_path = Trans.conf.dir .. '/ultimate.db'
     if fn.filereadable(db_path) == 1 then
         ok [[ultimate database found ]]
     else
@@ -68,7 +69,7 @@ local function check_database()
 end
 
 local function check_configure_file()
-    local path = fn.expand(Trans.conf.dir .. Trans.separator .. 'Trans.json')
+    local path = fn.expand(Trans.conf.dir .. '/Trans.json')
     if not fn.filereadable(path) then
         warn 'Backend configuration file[%s] not found'
     end

lua/Trans/init.lua

@@ -25,29 +25,18 @@ local system =
     uname == 'Linux' and (vim.fn.executable 'termux-api-start' == 1 and 'termux' or 'linux') or
     error 'Unknown System, Please Report Issue'
 
-local sep = system == 'win' and '\\\\' or '/'
 ---@class Trans
 ---@field style table @Style module
 ---@field cache table<string, TransData> @Cache for translated data object
 ---@field plugin_dir string @Plugin directory
----@field separator string @Path separator
+---@field system 'mac'|'win'|'termux'|'linux' @Operating system
----@field system 'mac'|'win'|'termux'|'linux' @Path separator
 local M = metatable('core', {
     cache      = {},
     style      = metatable 'style',
-    separator  = sep,
     system     = system,
-    plugin_dir = debug.getinfo(1, 'S').source:sub(2):match('(.-)lua' .. sep .. 'Trans'),
+    plugin_dir = vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'),
 })
 
 M.metatable = metatable
 
----Get abs_path of file
----@param path string[]
----@param is_dir boolean?
----@return string
-function M.relative_path(path, is_dir)
-    return M.plugin_dir .. table.concat(path, sep) .. (is_dir and sep or '')
-end
-
 return M

plugin/Trans.lua

@@ -5,11 +5,11 @@ local Trans = require 'Trans'
 local command = api.nvim_create_user_command
 
 command('Translate', function() Trans.translate() end,
-    { desc = '  Translate cursor word' })
+    { desc = '󰊿  Translate cursor word' })
 
 
 command('TranslateInput', function() Trans.translate { mode = 'i' } end,
-    { desc = '  Translate input word' })
+    { desc = '󰊿  Translate input word' })
 
 command('TransPlay', function()
     local util = Trans.util