ecdict 1.2.alpha4 → 1.2.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8bbfbe1dbd141fc1eecda848fa890fd0e4d85001a6d8e090ca735203786b7dd
-  data.tar.gz: c499d33a61ff61d7000538043fcf6691dd34310ccf5076e45c0e4054367708c3
+  metadata.gz: 5d3b7af98d6ca07e5b9228c8ed515af5250f194b74ff1b5b8a15cc4a53418d48
+  data.tar.gz: 0ac17588afaa66aaddc89b65a870ccebf7d8318dfdc8526f1d2ba804d4624897
 SHA512:
-  metadata.gz: c8e94e4a5dd550cf36dc3e7820b7920c8b45a743a493ff10e1a68e7940d7a536a53078416efe9a984c7aaadb20e1ffc98414c9474d88bf584ccd48bb4e30167c
-  data.tar.gz: cf720681affcbf4a6233bcb04f5bfd8d036a91133b06d73b0f4c4f4a79f96b350f8fc76189dce4cbecf042595d6f89130cd7a97bc43ed94f4ad0e295d7ac4034
+  metadata.gz: f8e715abe0412e94f79739a43cbabd063211d50977c4d7d8dbb49851cdedfd51f9ab4847b91d046a817c64c240baff591a37fd00d7ea45ee13c119c9afce61c8
+  data.tar.gz: ab5ec984d53c633ce72f5a557e5f7f7aab91f395cf24d8706562bbeef5a4efd9d3c653879a28170a0b6ea1dc1b05c819022656e29b97c8977e734a5508940d0e

data/bin/ecdict

@@ -21,16 +21,19 @@
 # EXit -3: 从CSV生成数据库失败
 # Exit  1: 无词典
 # Exit  2: 缺少参数
+#
+# 未搜索到结果并不认为是错误
 # ------------------------------------------------------
 
 require 'sqlite3'
 
-ECDICT_STORAGE = File.expand_path("~/.local/share/ecdict")
-ECDictRAWDATA  = File.join(ECDICT_STORAGE, 'ecdict-csv.7z')
+ECDICT_STORAGE   = File.expand_path("~/.local/share/ecdict")
+ECDICT_RAW_DATA  = File.join(ECDICT_STORAGE, 'ecdict-csv.7z')
+
 ECDictDB  = File.join(ECDICT_STORAGE, 'ecdict.db')
 ECDictCSV = File.join(ECDICT_STORAGE, 'ecdict.csv')
 
-ECDICT_GEM_VERSION  = "1.2.alpha4"
+ECDICT_GEM_VERSION  = "1.2.alpha5"
 
 # 这个版本是我从上游下载的CSV后自己压缩的
 # 这个文件的实际创建日期(上游作者创建)是2017/06/04
@@ -44,12 +47,12 @@ require 'fileutils'
 FileUtils.mkdir_p(ECDICT_STORAGE)
 $DB = SQLite3::Database.new ECDictDB
 
-def db_close
+def close_db
   $DB.close if $DB
 end
 
-def db_close_and_exit(num = 0)
-  db_close
+def close_db_and_exit(num = 0)
+  close_db
   exit num
 end
 
@@ -81,7 +84,8 @@ def cyan(str)       "\e[36m#{str}\e[0m" end
 
 def check_download_integrity
   require 'digest'
-  sha256 = Digest::SHA256.file(ECDictRAWDATA).hexdigest
+  return false if !File.exists?(ECDICT_RAW_DATA)
+  sha256 = Digest::SHA256.file(ECDICT_RAW_DATA).hexdigest
   if ECDICT_DICT_SHA256 == sha256
     true
   else
@@ -90,31 +94,47 @@ def check_download_integrity
 end
 
 
-def download_ecdict_data
+def download_ecdict_raw_data
 
-  if File.exists?(ECDictRAWDATA) && check_download_integrity
-    puts "=> 已存在原始数据文件#{ECDictRAWDATA}, 无需再次下载"
+  if File.exists?(ECDICT_RAW_DATA) && check_download_integrity
+    puts "=> 已存在原始数据文件#{ECDICT_RAW_DATA}, 无需再次下载"
   else
 
-    if File.exists?(ECDictRAWDATA)
-      puts "=> 删除已存在但不完整的数据"
-      FileUtils.rm ECDictRAWDATA
+    if File.exists?(ECDICT_RAW_DATA)
+      puts "=> 删除已存在但不完整的原始数据文件"
+      FileUtils.rm ECDICT_RAW_DATA
+    end
+
+    # 若已经有拉取的仓库，先检查里面的数据是否可用
+    raw_data_git_dir = File.join(ECDICT_STORAGE, 'ecdict-data')
+    raw_data_git_dir_data = File.join(raw_data_git_dir, 'ecdict-csv.7z')
+
+    if Dir.exists?(raw_data_git_dir)
+      if File.exists?(raw_data_git_dir_data)
+        FileUtils.cp(raw_data_git_dir_data, ECDICT_STORAGE)
+        if check_download_integrity
+          puts "=> 从已经Git pull到的仓库中获取原始数据文件"
+          return true
+        else
+          FileUtils.rm ECDICT_RAW_DATA
+        end
+      end
+      FileUtils.rm_rf(raw_data_git_dir)
     end
 
     begin
       puts "=> 使用Git从#{ECDICT_DICT_DOWNLOAD_LINK}获取原始数据库文件"
-      system("git -C #{ECDICT_STORAGE} clone #{ECDICT_DICT_DOWNLOAD_LINK} ")
-      FileUtils.cp(File.join(ECDICT_STORAGE, 'ecdict-data', 'ecdict-csv.7z'), ECDICT_STORAGE)
-      raise "Git拉取仓库数据不完整!" if !check_download_integrity
+      ret = system("git -C #{ECDICT_STORAGE} clone #{ECDICT_DICT_DOWNLOAD_LINK} ")
+      FileUtils.cp(File.join(ECDICT_STORAGE, 'ecdict-data', 'ecdict-csv.7z'), ECDICT_STORAGE) rescue nil
+      raise "Git拉取仓库过程失败，原始数据文件不完整!" if (ret != true  || !check_download_integrity)
     rescue StandardError => e
       puts "=> #{e.message}"
-      puts "=> Git获取原始数据库文件失败"
-      FileUtils.rm(ECDictRAWDATA)
+      FileUtils.rm(ECDICT_RAW_DATA) rescue nil
+      return false
     else
       puts "=> 下载完成!"
     end
   end
-
   true
 end
 
@@ -134,12 +154,12 @@ def decompress_7z_to_csv()
   end
 
 
-  File.open(ECDictRAWDATA, "rb") do |file|
-    puts "=> 正在解压ecdict-csv.7z(#{file.size/1024/1024}MB)"
+  File.open(ECDICT_RAW_DATA, "rb") do |file|
+    puts "=> 正在解压ecdict-csv.7z(#{ '%.2f' % (file.size/1024.0/1024) }MB)"
     SevenZipRuby::Reader.extract_all(file, ECDICT_STORAGE)
   end
 
-  puts "=> 已成功解压出ecdict.csv(#{File.size(ECDictCSV)/1024/1024}MB)"
+  puts "=> 已成功解压出ecdict.csv(#{ '%.2f' % (File.size(ECDictCSV)/1024.0/1024) }MB)"
   true
 end
 
@@ -233,7 +253,7 @@ EOF
   rescue Exception => e
     puts "=> #{e.message}"
     puts "=> 创建数据库文件#{ECDictDB}失败，或表`ecdict`生成失败"
-    db_close
+    close_db
     File.delete(ECDictDB)
     return false
   end
@@ -298,19 +318,19 @@ EOF
   rescue Exception => e
     puts "=> #{e.message}"
     puts "=> 数据库插入信息失败"
-    db_close
+    close_db
     File.delete(ECDictDB)
     return false
   end
   puts
   puts "=> 数据库#{ECDictDB}已完整生成"
-  db_close
+  close_db
   return true
 end
 
 
 def download_and_install_ecdict_data
-  download_ecdict_data || ( puts("\e[31m=> 下载失败，安装取消！\e[0m") || exit(-1) )
+  download_ecdict_raw_data || ( puts("\e[31m=> 下载失败，安装取消！\e[0m") || exit(-1) )
   decompress_7z_to_csv || ( puts("\e[31m=> 解压失败，安装取消！\e[0m") || exit(-2) )
   generate_sqlite_db   || ( puts("\e[31m=> 生成数据库失败，安装取消!\e[0m") || exit(-3) )
   puts
@@ -340,7 +360,7 @@ def reply_once(query)
 
   if !check_db_integrity
     puts "ecdict: 数据库不存在或数据库不完整，请使用`ecdict -i`来下载安装词典数据"
-    db_close_and_exit(1)
+    close_db_and_exit(1)
   end
 
   tables = []
@@ -360,7 +380,7 @@ def reply_once(query)
 
   if rows.empty?
     puts "ecdict: 未找到结果,请检查单词拼写是否正确"
-    db_close
+    close_db
     return
   else
     line = rows[0]
@@ -407,11 +427,11 @@ def chinese_search(cn_word, support_phrase: false)
 
   if cn_word.empty?
     puts "ecdict: 请输入要查询的中文，或使用`ecdict -h`查看帮助"
-    db_close_and_exit(2)
+    close_db_and_exit(2)
   end
   if !check_db_integrity
     puts "=> 数据库不存在或数据库不完整，请使用`ecdict -i`来下载安装词典数据"
-    db_close_and_exit(1)
+    close_db_and_exit(1)
   end
 
   if support_phrase
@@ -432,7 +452,7 @@ def chinese_search(cn_word, support_phrase: false)
   end
   if rows.empty?
     puts "ecdict: 未找到相关英文,请不要输入中文短语或短句，仅支持词的搜索"
-    db_close
+    close_db
     return
   else
     # 有的时候并不是没有结果，而是被我们过滤掉了，对此确认一下
@@ -486,7 +506,8 @@ def chinese_search(cn_word, support_phrase: false)
     if found_a_word
       puts
     else
-      puts "ecdict: 抱歉，为了防止显示内容过多，已将可能的答案过滤了",""
+      puts "ecdict: 抱歉，为了防止显示内容过多，已将可能的答案过滤了"
+      puts "ecdict: 您可尝试使用`ecdict -cp`来搜索短语，扩大搜索范围"
     end
   # end of else
   end
@@ -556,7 +577,7 @@ def start_ecrepl
 
   if !check_db_integrity
     puts "ecdict: 数据库不存在或数据库不完整，请使用`ecdict -i`来下载安装词典数据"
-    db_close_and_exit(1)
+    close_db_and_exit(1)
   end
 
   begin
@@ -571,7 +592,7 @@ def start_ecrepl
   require 'reline'
   Reline.completion_proc = lambda do |word|
     if word.strip.empty?
-      return %w{1.输入单词查询 2.输入exit或按Ctrl-C退出}
+      return %w{1.输入单词并回车查询含义 2.输入单词时按一次tab键反馈搜索建议 3.输入exit或按Ctrl-C或Ctrl-D退出}
     end
 
     max_len = word.length + 4
@@ -614,7 +635,7 @@ def start_ecrepl
     while line = Reline.readline("\e[32mecdict> \e[0m", true)
       case word = line.chomp
       when 'exit'
-        db_close
+        close_db
         return
       when ''
         # NOOP
@@ -623,9 +644,9 @@ def start_ecrepl
       end
     end
   rescue Interrupt
-    puts '^C'
+    # puts '^C'
     `stty #{stty_save}` if stty_save
-    db_close
+    close_db
     return
   end
 
@@ -636,7 +657,7 @@ end
 # remove everything in #{ECDICT_STORAGE}
 #
 def delete_cache
-
+  close_db
   begin
     FileUtils.rm_rf(ECDICT_STORAGE)
   rescue => e
@@ -667,12 +688,12 @@ ecdict (v#{ECDICT_GEM_VERSION}): A courteous cli translator.
 
 usage:
 
-  ecdict word      => 查询单词 word
-  ecdict -r        => 启动ecdict repl交互式查询，输入exit或Ctrl-C退出
-  ecdict -c  中文  => 搜索中文对应的英文单词
-  ecdict -cp 中文  => 搜索中文对应的英文单词以及短语(结果可能很多)
+  ecdict word      => 查询单词word
+  ecdict -r        => 启动ecdict repl交互式查询，输入exit或Ctrl-C/D退出
+  ecdict -c  中文  => 搜索中文单词对应的英文单词
+  ecdict -cp 中文  => 搜索中文短语对应的英文短语
   ecdict -i        => 下载ecdict词典数据并安装
-  ecdict -v        => 打印此Gem与词典版本号
+  ecdict -v        => 打印此Gem版本号
   ecdict -h        => 打印此帮助
   ecdict -d        => 清空词典数据
 
@@ -688,10 +709,10 @@ end
 if ARGV.empty?
   if !check_db_integrity
     puts "ecdict: 数据库不存在或数据库不完整，请使用`ecdict -i`来下载安装词典数据"
-    db_close_and_exit(1)
+    close_db_and_exit(1)
   end
   puts "ecdict: 请输入要查询的词/词组 或使用`ecdict -h`查看帮助"
-  db_close_and_exit
+  close_db_and_exit(2)
 end
 
 query = ARGV.shift
@@ -706,3 +727,6 @@ when "-cp" then chinese_search(ARGV.join, support_phrase: true)
 else
   reply_once(query)
 end
+
+# ensure close db
+close_db

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecdict
 version: !ruby/object:Gem::Version
-  version: 1.2.alpha4
+  version: 1.2.alpha5
 platform: ruby
 authors:
 - ccmywish