cr.rb 4.1.1 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900040b08ba030c166a96a350fe5c0764d3ed527319240cd5c09a83af03a3890
-  data.tar.gz: f0b2f1bc7abaf49c649107ab45a436c9ba7ce63af9665fa23b02064fbbef60ae
+  metadata.gz: 572931031815b1f284c44e722df17147b330a853439f79f0953946bfb42bb69d
+  data.tar.gz: 653b3090e8f85a8b962d3d62d0a3a5e362e65c4abb5db506b7b2d2091ff343ab
 SHA512:
-  metadata.gz: 5f4b18c9828c07b1da421501d6c9bf898c475ae6784d8d7864ded3295df51ea43c1ac0f3e0178a6cede1ea224d62bb5f3f1d634dc13960b512e9f7fd00898aa2
-  data.tar.gz: 5bec78a9df8f94ae2a1f72d27da6ea755cf315258f8247c84029ece1802bfdb47e056bb6b07956ae666dc1506dfeaa5090610c1b68dba9d7af9d149ee771c46d
+  metadata.gz: f105ec4f493687a15e205b8ded554172a47369c5ed61a4dd0139ca335005cb73d56284c8bd881acb6f50b62fe89ae9a996a9dacecfaf0a1d0bffa53d107036bd
+  data.tar.gz: db01b4bdcc86d62017d043db81c561e1f5e14b56931aeaacf820b31c7f9ee8d524912dd0bdb78ef0ea011f4eb8697e8e6cd090a15e8b7888e14798a6ae060128

data/bin/cr

@@ -3,7 +3,7 @@
 # File          : cr.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2021-07-08>
-# Last modified : <2023-02-12>
+# Last modified : <2023-02-13>
 #
 # cr:
 #
@@ -518,7 +518,10 @@ A info looks like this
 
     # Try to match every word in all dicts
     Dir.children(library).each do |dict|
-      sheets = Dir.children(File.join(library, dict)).select do
+
+      path = File.join(library, dict)
+      next if File.file? path
+      sheets = Dir.children(path).select do
         _1.end_with?('.toml')
       end
 

data/lib/cr/version.rb

@@ -11,6 +11,6 @@
 
 module CrypticResolver
 
-  GEM_VERSION = "4.1.1"
+  GEM_VERSION = "4.1.3"
 
 end

data/lib/cr.rb

@@ -153,8 +153,10 @@ class CrypticResolver::Resolver
       abort "cr: Cancel add default dicts"
       end
 
-      puts "cr: Add done" ; word_count
-      puts ; puts "#{$DefaultLibWordCount} words added"
+      puts "cr: Add done" ;
+      @counter.count_def_lib(display: false)
+      puts ; puts "#{@counter.word_count_of_def_lib} words added"
+      @counter.reset!
 
       # Really added
       return true
@@ -184,13 +186,15 @@ class CrypticResolver::Resolver::Counter
     @resolver = resolver
   end
 
-
+  # a.toml
+  # b.toml
+  # ...
   def count_dict_words(library, dict)
     dict_dir = library + "/#{dict}"
     wc = 0
     Dir.children(dict_dir).each do |entry|
-      next if File.file? entry
       next unless entry.end_with?('.toml')
+      next if File.directory? dict_dir + "/#{entry}"
       sheet_content = @resolver.load_sheet(library, dict, entry.delete_suffix('.toml'))
       count = sheet_content.keys.count
 
@@ -202,12 +206,13 @@ class CrypticResolver::Resolver::Counter
 
   # Count default library
   def count_def_lib(display: )
-    default_lib = Dir.children(CrypticResolver::Resolver::DEFAULT_LIB_PATH)
+    path = CrypticResolver::Resolver::DEFAULT_LIB_PATH
+    default_lib = Dir.children path
     unless default_lib.empty?
       puts bold(green("Default library: "))  if display
       default_lib.each do |s|
-        next if File.file? s
-        wc = count_dict_words(CrypticResolver::Resolver::DEFAULT_LIB_PATH,s)
+        next if File.file? path + "/#{s}"
+        wc = count_dict_words(path,s)
         @word_count_of_def_lib += wc
         # With color, ljust not works, so we disable color
         puts("#{wc.to_s.rjust(5)}  #{s}")   if display
@@ -220,12 +225,11 @@ class CrypticResolver::Resolver::Counter
   # Count extra library
   def count_extra_lib(display: )
     if path = @resolver.extra_lib_path
-      extra_lib = Dir.children(path)
+      extra_lib = Dir.children path
       unless extra_lib.empty?
-        wc = 0
-        puts(bold(green("\nExtra library:")))  if display
+        puts bold(green("\nExtra library:"))  if display
         extra_lib.each do |s|
-          next if File.file? s
+          next if File.file? path + "/#{s}"
           wc = count_dict_words(path,s)
           @word_count_of_extra_lib += wc
           puts("#{wc.to_s.rjust(5)}  #{s}")  if display
@@ -249,4 +253,11 @@ class CrypticResolver::Resolver::Counter
     end
   end
 
+
+  def reset!
+    @word_count_of_two_libs = 0
+    @word_count_of_def_lib = 0
+    @word_count_of_extra_lib = 0
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cr.rb
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.3
 platform: ruby
 authors:
 - Aoran Zeng