nhkore 0.3.3 → 0.3.8

data/lib/nhkore/cli/search_cmd.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of NHKore.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# NHKore is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# NHKore is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with NHKore.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -30,122 +18,122 @@ require 'nhkore/util'
 module NHKore
 module CLI
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.3.0
   ###
   module SearchCmd
-    def build_search_cmd()
+    def build_search_cmd
       app = self
-      
-      @search_cmd = @app_cmd.define_command() do
+
+      @search_cmd = @app_cmd.define_command do
         name    'search'
         usage   'search [OPTIONS] [COMMAND]...'
         aliases :se,:sea
         summary "Search for links to NHK News Web (Easy) (aliases: #{app.color_alias('se sea')})"
-        
-        description <<-EOD
+
+        description <<-DESC
           Search for links (using a Search Engine, etc.) to NHK News Web (Easy) &
           save to folder: #{SearchLinks::DEFAULT_DIR}
-        EOD
-        
-        option :i,:in,<<-EOD,argument: :required,transform: -> (value) do
+        DESC
+
+        option :i,:in,<<-DESC,argument: :required,transform: lambda { |value|
           file to read instead of URL (for offline testing and/or slow internet;
           see '--show-*' options)
-        EOD
+        DESC
           app.check_empty_opt(:in,value)
-        end
-        option :o,:out,<<-EOD,argument: :required,transform: -> (value) do
+        }
+        option :o,:out,<<-DESC,argument: :required,transform: lambda { |value|
           'directory/file' to save links to; if you only specify a directory or a file, it will attach the
           appropriate default directory/file name
           (defaults: #{SearchLinks::DEFAULT_YASASHII_FILE}, #{SearchLinks::DEFAULT_FUTSUU_FILE})
-        EOD
+        DESC
           app.check_empty_opt(:out,value)
-        end
+        }
         option :r,:results,'number of results per page to request from search',argument: :required,
-          default: SearchScraper::DEFAULT_RESULT_COUNT,transform: -> (value) do
-          value = value.to_i()
-          value = 1 if value < 1
-          value
-        end
-        option nil,:'show-count',<<-EOD
+            default: SearchScraper::DEFAULT_RESULT_COUNT,transform: lambda { |value|
+              value = value.to_i
+              value = 1 if value < 1
+              value
+            }
+        option nil,:'show-count',<<-DESC
           show the number of links scraped and exit;
           useful for manually writing/updating scripts (but not for use in a variable);
           implies '--dry-run' option
-        EOD
-        option nil,:'show-urls',<<-EOD
+        DESC
+        option nil,:'show-urls',<<-DESC
           show the URLs -- if any -- used when searching & scraping and exit;
           you can download these for offline testing and/or slow internet
           (see '--in' option)
-        EOD
-        
+        DESC
+
         run do |opts,args,cmd|
-          opts.each() do |key,value|
-            key = key.to_s()
-            
+          opts.each do |key,value|
+            key = key.to_s
+
             if key.include?('show')
-              raise CLIError.new("must specify a sub command for option[#{key}]")
+              raise CLIError,"must specify a sub command for option[#{key}]"
             end
           end
-          
+
           puts cmd.help
         end
       end
-      
-      @search_easy_cmd = @search_cmd.define_command() do
+
+      @search_easy_cmd = @search_cmd.define_command do
         name    'easy'
         usage   'easy [OPTIONS] [COMMAND]...'
         aliases :e,:ez
         summary "Search for NHK News Web Easy (Yasashii) links (aliases: #{app.color_alias('e ez')})"
-        
-        description <<-EOD
+
+        description <<-DESC
           Search for NHK News Web Easy (Yasashii) links &
           save to file: #{SearchLinks::DEFAULT_YASASHII_FILE}
-        EOD
-        
+        DESC
+
         run do |opts,args,cmd|
           app.refresh_cmd(opts,args,cmd)
-          app.run_search_help()
+          app.run_search_help
         end
       end
-      
-      @search_regular_cmd = @search_cmd.define_command() do
+
+      @search_regular_cmd = @search_cmd.define_command do
         name    'regular'
         usage   'regular [OPTIONS] [COMMAND]...'
         aliases :r,:reg
         summary "Search for NHK News Web Regular (Futsuu) links (aliases: #{app.color_alias('r reg')})"
-        
-        description <<-EOD
+
+        description <<-DESC
           Search for NHK News Web Regular (Futsuu) links &
           save to file: #{SearchLinks::DEFAULT_FUTSUU_FILE}
-        EOD
-        
+        DESC
+
         run do |opts,args,cmd|
           app.refresh_cmd(opts,args,cmd)
-          app.run_search_help()
+          app.run_search_help
         end
       end
-      
-      @search_bing_cmd = Cri::Command.define() do
+
+      @search_bing_cmd = Cri::Command.define do
         name    'bing'
         usage   'bing [OPTIONS] [COMMAND]...'
         aliases :b
         summary "Search bing.com for links (aliases: #{app.color_alias('b')})"
-        
-        description <<-EOD
+
+        description <<-DESC
           Search bing.com for links & save to folder: #{SearchLinks::DEFAULT_DIR}
-        EOD
-        
+        DESC
+
         run do |opts,args,cmd|
           app.refresh_cmd(opts,args,cmd)
-          app.run_search_cmd(cmd.supercommand.name.to_sym(),:bing)
+          app.run_search_cmd(cmd.supercommand.name.to_sym,:bing)
         end
       end
-      
+
       # dup()/clone() must be called for `cmd.supercommand` to work appropriately.
-      @search_easy_cmd.add_command @search_bing_cmd.dup()
-      @search_regular_cmd.add_command @search_bing_cmd.dup()
+      @search_easy_cmd.add_command @search_bing_cmd.dup
+      @search_regular_cmd.add_command @search_bing_cmd.dup
     end
-    
+
     def run_search_cmd(nhk_type,search_type)
       case nhk_type
       when :easy
@@ -153,139 +141,141 @@ module CLI
       when :regular
         nhk_type = :futsuu
       end
-      
+
       return if show_search_urls(search_type)
-      
+
       @cmd_opts[:dry_run] = true if @cmd_opts[:show_count]
-      
+
       build_in_file(:in)
-      
+
       case nhk_type
       when :futsuu
-        build_out_file(:out,default_dir: SearchLinks::DEFAULT_DIR,default_filename: SearchLinks::DEFAULT_FUTSUU_FILENAME)
+        build_out_file(:out,default_dir: SearchLinks::DEFAULT_DIR,
+          default_filename: SearchLinks::DEFAULT_FUTSUU_FILENAME)
       when :yasashii
-        build_out_file(:out,default_dir: SearchLinks::DEFAULT_DIR,default_filename: SearchLinks::DEFAULT_YASASHII_FILENAME)
+        build_out_file(:out,default_dir: SearchLinks::DEFAULT_DIR,
+          default_filename: SearchLinks::DEFAULT_YASASHII_FILENAME)
       else
         raise ArgumentError,"invalid nhk_type[#{nhk_type}]"
       end
-      
+
       return unless check_in_file(:in,empty_ok: true)
       return unless check_out_file(:out)
-      
+
       dry_run = @cmd_opts[:dry_run]
       in_file = @cmd_opts[:in]
       out_file = @cmd_opts[:out]
       result_count = @cmd_opts[:results]
-      result_count = SearchScraper::DEFAULT_RESULT_COUNT if result_count.nil?()
+      result_count = SearchScraper::DEFAULT_RESULT_COUNT if result_count.nil?
       show_count = @cmd_opts[:show_count]
-      
+
       start_spin("Scraping #{search_type}") unless show_count
-      
-      is_file = !in_file.nil?()
+
+      is_file = !in_file.nil?
       links = nil
       new_links = [] # For --dry-run
-      next_page = NextPage.new()
+      next_page = NextPage.new
       page_count = 0
       page_num = 1
       url = in_file # nil will use default URL, else a file
-      
+
       # Load previous links for 'scraped?' vars.
       if File.exist?(out_file)
         links = SearchLinks.load_file(out_file)
       else
-        links = SearchLinks.new()
+        links = SearchLinks.new
       end
-      
+
       links_count = links.length
-      
+
       if show_count
         scraped_count = 0
-        
-        links.links.values.each() do |link|
-          scraped_count += 1 if link.scraped?()
+
+        links.links.each_value do |link|
+          scraped_count += 1 if link.scraped?
         end
-        
+
         puts "#{scraped_count} of #{links_count} links scraped."
-        
+
         return
       end
-      
-      range = (0..10000) # Do a range to prevent an infinite loop; ichiman!
-      
+
+      range = (0..10_000) # Do a range to prevent an infinite loop; ichiman!
+
       case search_type
       # Anything that extends SearchScraper.
       when :bing
-        range.each() do
+        range.each do
           scraper = nil
-          
+
           case search_type
           when :bing
             scraper = BingScraper.new(nhk_type,count: result_count,is_file: is_file,url: url,**@scraper_kargs)
           else
             raise NHKore::Error,"internal code broken; add missing search_type[#{search_type}]"
           end
-          
+
           next_page = scraper.scrape(links,next_page)
-          
+
           new_links.concat(links.links.values[links_count..-1])
           links_count = links.length
           page_count = next_page.count if next_page.count > 0
-          
-          update_spin_detail(" (page=#{page_num}, count=#{page_count}, links=#{links.length}, " +
-            "new_links=#{new_links.length})")
-          
-          break if next_page.empty?()
-          
+
+          update_spin_detail(" (page=#{page_num}, count=#{page_count}, links=#{links.length}," \
+            " new_links=#{new_links.length})")
+
+          break if next_page.empty?
+
           page_num += 1
           url = next_page.url
-          
-          sleep_scraper()
+
+          sleep_scraper
         end
       else
         raise ArgumentError,"invalid search_type[#{search_type}]"
       end
-      
-      stop_spin()
+
+      stop_spin
       puts
       puts 'Last URL scraped:'
       puts "> #{url}"
       puts
-      
+
       if dry_run
-        new_links.each() do |link|
+        new_links.each do |link|
           puts link.to_s(mini: true)
         end
       else
         links.save_file(out_file)
-        
+
         puts 'Saved scraped links to file:'
         puts "> #{out_file}"
       end
     end
-    
-    def run_search_help()
+
+    def run_search_help
       if @cmd_opts[:show_count] || @cmd_opts[:show_urls]
-        run_search_cmd(@cmd.name.to_sym(),nil)
+        run_search_cmd(@cmd.name.to_sym,nil)
       else
         puts @cmd.help
       end
     end
-    
+
     def show_search_urls(search_type)
       return false unless @cmd_opts[:show_urls]
-      
+
       count = @cmd_opts[:results]
-      count = SearchScraper::DEFAULT_RESULT_COUNT if count.nil?()
-      
+      count = SearchScraper::DEFAULT_RESULT_COUNT if count.nil?
+
       case search_type
       when :bing
         puts 'Bing:'
         puts "> Easy:    #{BingScraper.build_url(SearchScraper::YASASHII_SITE,count: count)}"
         puts "> Regular: #{BingScraper.build_url(SearchScraper::FUTSUU_SITE,count: count)}"
       else
-        raise CLIError.new('must specify a sub command for option[show-urls]')
+        raise CLIError,'must specify a sub command for option[show-urls]'
       end
-      
+
       return true
     end
   end

data/lib/nhkore/cli/sift_cmd.rb

@@ -1,29 +1,18 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of NHKore.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# NHKore is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# NHKore is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with NHKore.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
 require 'date'
 require 'time'
 
+require 'nhkore/datetime_parser'
 require 'nhkore/news'
 require 'nhkore/sifter'
 require 'nhkore/util'
@@ -32,298 +21,193 @@ require 'nhkore/util'
 module NHKore
 module CLI
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.0
   ###
   module SiftCmd
     DEFAULT_SIFT_EXT = :csv
     DEFAULT_SIFT_FUTSUU_FILE = "#{Sifter::DEFAULT_FUTSUU_FILE}{search.criteria}{file.ext}"
     DEFAULT_SIFT_YASASHII_FILE = "#{Sifter::DEFAULT_YASASHII_FILE}{search.criteria}{file.ext}"
-    SIFT_EXTS = [:csv,:htm,:html,:json,:yaml,:yml]
-    
-    # Order matters.
-    SIFT_DATETIME_FMTS = [
-      '%Y-%m-%d %H:%M',
-      '%Y-%m-%d %H',
-      '%Y-%m-%d',
-      '%m-%d %H:%M',
-      '%Y-%m %H:%M',
-      '%m-%d %H',
-      '%Y-%m %H',
-      '%m-%d',
-      '%Y-%m',
-      '%d %H:%M',
-      '%y %H:%M',
-      '%d %H',
-      '%Y %H',
-      '%H:%M',
-      '%d',
-      '%Y'
-    ]
-    
+    SIFT_EXTS = %i[csv htm html json yaml yml].freeze
+
     attr_accessor :sift_datetime_text
     attr_accessor :sift_search_criteria
-    
-    def build_sift_cmd()
+
+    def build_sift_cmd
       app = self
-      
+
       @sift_datetime_text = nil
       @sift_search_criteria = nil
-      
-      @sift_cmd = @app_cmd.define_command() do
+
+      @sift_cmd = @app_cmd.define_command do
         name    'sift'
         usage   'sift [OPTIONS] [COMMAND]...'
         aliases :s
-        summary "Sift NHK News Web (Easy) articles data for the frequency of words (aliases: #{app.color_alias('s')})"
-        
-        description <<-EOD
+        summary 'Sift NHK News Web (Easy) articles data for the frequency of words' \
+                " (aliases: #{app.color_alias('s')})"
+
+        description(<<-DESC)
           Sift NHK News Web (Easy) articles data for the frequency of words &
           save to folder: #{Sifter::DEFAULT_DIR}
-        EOD
-        
-        option :d,:datetime,<<-EOD,argument: :required,transform: -> (value) do
+        DESC
+
+        option :d,:datetime,<<-DESC,argument: :required,transform: lambda { |value|
           date time to filter on; examples:
           '2020-7-1 13:10...2020-7-31 11:11';
           '2020-12' (2020, December 1st-31st);
           '7-4...7-9' (July 4th-9th of Current Year);
           '7-9' (July 9th of Current Year);
           '9' (9th of Current Year & Month)
-        EOD
+        DESC
           app.sift_datetime_text = value # Save the original value for the file name
-          value = app.parse_sift_datetime(value)
+
+          value = DatetimeParser.parse_range(value)
+
+          app.check_empty_opt(:datetime,value) if value.nil?
+
           value
-        end
-        option :e,:ext,<<-EOD,argument: :required,default: DEFAULT_SIFT_EXT,transform: -> (value) do
+        }
+        option :e,:ext,<<-DESC,argument: :required,default: DEFAULT_SIFT_EXT,transform: lambda { |value|
           type of file (extension) to save; valid options: [#{SIFT_EXTS.join(', ')}];
           not needed if you specify a file extension with the '--out' option: '--out sift.html'
-        EOD
-          value = Util.unspace_web_str(value).downcase().to_sym()
-          
+        DESC
+          value = Util.unspace_web_str(value).downcase.to_sym
+
           raise CLIError,"invalid ext[#{value}] for option[#{ext}]" unless SIFT_EXTS.include?(value)
-          
+
           value
-        end
-        option :i,:in,<<-EOD,argument: :required,transform: -> (value) do
+        }
+        option :i,:in,<<-DESC,argument: :required,transform: lambda { |value|
           file of NHK News Web (Easy) articles data to sift (see '#{App::NAME} news';
           defaults: #{YasashiiNews::DEFAULT_FILE}, #{FutsuuNews::DEFAULT_FILE})
-        EOD
+        DESC
           app.check_empty_opt(:in,value)
-        end
+        }
         flag :D,:'no-defn','do not output the definitions for words (which can be quite long)'
         flag :E,:'no-eng','do not output the English translations for words'
-        option :o,:out,<<-EOD,argument: :required,transform: -> (value) do
+        option :o,:out,<<-DESC,argument: :required,transform: lambda { |value|
           'directory/file' to save sifted data to; if you only specify a directory or a file, it will attach
           the appropriate default directory/file name
           (defaults: #{DEFAULT_SIFT_YASASHII_FILE}, #{DEFAULT_SIFT_FUTSUU_FILE})
-        EOD
+        DESC
           app.check_empty_opt(:out,value)
-        end
-        flag :H,'no-sha256',<<-EOD
+        }
+        flag :H,'no-sha256',<<-DESC
           if you used this option with the 'news' command, then you'll also need this option here
           to not fail on "duplicate" articles; see '#{App::NAME} news'
-        EOD
+        DESC
         option :t,:title,'title to filter on, where search text only needs to be somewhere in the title',
           argument: :required
         option :u,:url,'URL to filter on, where search text only needs to be somewhere in the URL',
           argument: :required
-        
+
         run do |opts,args,cmd|
           puts cmd.help
         end
       end
-      
-      @sift_easy_cmd = @sift_cmd.define_command() do
+
+      @sift_easy_cmd = @sift_cmd.define_command do
         name    'easy'
         usage   'easy [OPTIONS] [COMMAND]...'
         aliases :e,:ez
         summary "Sift NHK News Web Easy (Yasashii) articles data (aliases: #{app.color_alias('e ez')})"
-        
-        description <<-EOD
+
+        description <<-DESC
           Sift NHK News Web Easy (Yasashii) articles data for the frequency of words &
           save to file: #{DEFAULT_SIFT_YASASHII_FILE}
-        EOD
-        
+        DESC
+
         run do |opts,args,cmd|
           app.refresh_cmd(opts,args,cmd)
           app.run_sift_cmd(:yasashii)
         end
       end
-      
-      @sift_regular_cmd = @sift_cmd.define_command() do
+
+      @sift_regular_cmd = @sift_cmd.define_command do
         name    'regular'
         usage   'regular [OPTIONS] [COMMAND]...'
         aliases :r,:reg
         summary "Sift NHK News Web Regular (Futsuu) articles data (aliases: #{app.color_alias('r reg')})"
-        
-        description <<-EOD
+
+        description(<<-DESC)
           Sift NHK News Web Regular (Futsuu) articles data for the frequency of words &
           save to file: #{DEFAULT_SIFT_FUTSUU_FILE}
-        EOD
-        
+        DESC
+
         run do |opts,args,cmd|
           app.refresh_cmd(opts,args,cmd)
           app.run_sift_cmd(:futsuu)
         end
       end
     end
-    
+
     def build_sift_filename(filename)
       @sift_search_criteria = []
-      
-      @sift_search_criteria << Util.strip_web_str(@sift_datetime_text.to_s())
-      @sift_search_criteria << Util.strip_web_str(@cmd_opts[:title].to_s())
-      @sift_search_criteria << Util.strip_web_str(@cmd_opts[:url].to_s())
-      @sift_search_criteria.filter!() {|sc| !sc.empty?()}
-      
-      clean_regex = /[^[[:alnum:]]\-_\.]+/
-      clean_search_criteria = ''.dup()
-      
-      @sift_search_criteria.each() do |sc|
+
+      @sift_search_criteria << Util.strip_web_str(@sift_datetime_text.to_s)
+      @sift_search_criteria << Util.strip_web_str(@cmd_opts[:title].to_s)
+      @sift_search_criteria << Util.strip_web_str(@cmd_opts[:url].to_s)
+      @sift_search_criteria.filter! { |sc| !sc.empty? }
+
+      clean_regex = /[^[[:alnum:]]\-_.]+/
+      clean_search_criteria = ''.dup
+
+      @sift_search_criteria.each do |sc|
         clean_search_criteria << sc.gsub(clean_regex,'')
       end
-      
-      @sift_search_criteria = @sift_search_criteria.empty?() ? nil : @sift_search_criteria.join(', ')
-      
+
+      @sift_search_criteria = @sift_search_criteria.empty? ? nil : @sift_search_criteria.join(', ')
+
       # Limit the file name length.
       #   If length is smaller, [..] still works appropriately.
       clean_search_criteria = clean_search_criteria[0..32]
-      
-      clean_search_criteria.prepend('_') unless clean_search_criteria.empty?()
-      
+
+      clean_search_criteria.prepend('_') unless clean_search_criteria.empty?
+
       file_ext = @cmd_opts[:ext]
-      
-      if file_ext.nil?()
+
+      if file_ext.nil?
         # Try to get from '--out' if it exists.
-        if !@cmd_opts[:out].nil?()
-          file_ext = Util.unspace_web_str(File.extname(@cmd_opts[:out])).downcase()
+        if !@cmd_opts[:out].nil?
+          file_ext = Util.unspace_web_str(File.extname(@cmd_opts[:out])).downcase
           file_ext = file_ext.sub(/\A\./,'') # Remove '.'; can't be nil for to_sym()
-          file_ext = file_ext.to_sym()
-          
+          file_ext = file_ext.to_sym
+
           file_ext = nil unless SIFT_EXTS.include?(file_ext)
         end
-        
-        file_ext = DEFAULT_SIFT_EXT if file_ext.nil?()
+
+        file_ext = DEFAULT_SIFT_EXT if file_ext.nil?
         @cmd_opts[:ext] = file_ext
       end
-      
+
       filename = "#{filename}#{clean_search_criteria}.#{file_ext}"
-      
+
       return filename
     end
-    
-    # TODO: This should probably be moved into its own class, into Util, or into Sifter?
-    def parse_sift_datetime(value)
-      value = Util.reduce_space(value).strip() # Don't use unspace_web_str(), want spaces for formats
-      value = value.split('...',2)
-      
-      check_empty_opt(:datetime,nil) if value.empty?() # For ''
-      
-      # Make a "to" and a "from" date time range.
-      value << value[0].dup() if value.length == 1
-      
-      to_day = nil
-      to_hour = 23
-      to_minute = 59
-      to_month = 12
-      to_year = Util::MAX_SANE_YEAR
-      
-      value.each_with_index() do |v,i|
-        v = check_empty_opt(:datetime,v) # For '...', '12-25...', or '...12-25'
-        
-        has_day = false
-        has_hour = false
-        has_minute = false
-        has_month = false
-        has_year = false
-        
-        SIFT_DATETIME_FMTS.each_with_index() do |fmt,i|
-          begin
-            # If don't do this, "%d" values will be parsed using "%d %H".
-            #   It seems as though strptime() ignores space.
-            raise ArgumentError if !v.include?(' ') && fmt.include?(' ')
-            
-            # If don't do this, "%y" values will be parsed using "%d".
-            raise ArgumentError if fmt == '%d' && v.length > 2
-            
-            v = Time.strptime(v,fmt,&Util.method(:guess_year))
-            
-            has_day = fmt.include?('%d')
-            has_hour = fmt.include?('%H')
-            has_minute = fmt.include?('%M')
-            has_month = fmt.include?('%m')
-            has_year = fmt.include?('%Y')
-            
-            break # No problem; this format worked
-          rescue ArgumentError
-            # Out of formats.
-            raise if i >= (SIFT_DATETIME_FMTS.length - 1)
-          end
-        end
-        
-        # "From" date time.
-        if i == 0
-          # Set these so that "2012-7-4...7-9" will use the appropriate year
-          #   of "2012" for "7-9".
-          to_day = v.day if has_day
-          to_hour = v.hour if has_hour
-          to_minute = v.min if has_minute
-          to_month = v.month if has_month
-          to_year = v.year if has_year
-          
-          v = Time.new(
-            has_year ? v.year : Util::MIN_SANE_YEAR,
-            has_month ? v.month : 1,
-            has_day ? v.day : 1,
-            has_hour ? v.hour : 0,
-            has_minute ? v.min : 0
-          )
-        # "To" date time.
-        else
-          to_hour = v.hour if has_hour
-          to_minute = v.min if has_minute
-          to_month = v.month if has_month
-          to_year = v.year if has_year
-          
-          if has_day
-            to_day = v.day
-          # Nothing passed from the "from" date time?
-          elsif to_day.nil?()
-            # Last day of month.
-            to_day = Date.new(to_year,to_month,-1).day
-          end
-          
-          v = Time.new(to_year,to_month,to_day,to_hour,to_minute)
-        end
-        
-        value[i] = v
-      end
-      
-      return value
-    end
-    
+
     def run_sift_cmd(type)
       news_name = nil
-      
+
       case type
       when :futsuu
         build_in_file(:in,default_dir: News::DEFAULT_DIR,default_filename: FutsuuNews::DEFAULT_FILENAME)
         build_out_file(:out,default_dir: Sifter::DEFAULT_DIR,
           default_filename: build_sift_filename(Sifter::DEFAULT_FUTSUU_FILENAME))
-        
+
         news_name = 'Regular'
       when :yasashii
         build_in_file(:in,default_dir: News::DEFAULT_DIR,default_filename: YasashiiNews::DEFAULT_FILENAME)
         build_out_file(:out,default_dir: Sifter::DEFAULT_DIR,
           default_filename: build_sift_filename(Sifter::DEFAULT_YASASHII_FILENAME))
-        
+
         news_name = 'Easy'
       else
         raise ArgumentError,"invalid type[#{type}]"
       end
-      
+
       return unless check_in_file(:in,empty_ok: false)
       return unless check_out_file(:out)
-      
+
       datetime_filter = @cmd_opts[:datetime]
       dry_run = @cmd_opts[:dry_run]
       file_ext = @cmd_opts[:ext]
@@ -334,55 +218,55 @@ module CLI
       out_file = @cmd_opts[:out]
       title_filter = @cmd_opts[:title]
       url_filter = @cmd_opts[:url]
-      
+
       start_spin("Sifting NHK News Web #{news_name} data")
-      
+
       news = (type == :yasashii) ?
         YasashiiNews.load_file(in_file,overwrite: no_sha256) :
         FutsuuNews.load_file(in_file,overwrite: no_sha256)
-      
+
       sifter = Sifter.new(news)
-      
-      sifter.filter_by_datetime(datetime_filter) unless datetime_filter.nil?()
-      sifter.filter_by_title(title_filter) unless title_filter.nil?()
-      sifter.filter_by_url(url_filter) unless url_filter.nil?()
+
+      sifter.filter_by_datetime(datetime_filter) unless datetime_filter.nil?
+      sifter.filter_by_title(title_filter) unless title_filter.nil?
+      sifter.filter_by_url(url_filter) unless url_filter.nil?
       sifter.ignore(:defn) if no_defn
       sifter.ignore(:eng) if no_eng
-      
-      sifter.caption = "NHK News Web #{news_name}".dup()
-      
-      if !@sift_search_criteria.nil?()
-        if [:htm,:html].any?(file_ext)
-          sifter.caption << " &mdash; #{Util.escape_html(@sift_search_criteria.to_s())}"
+
+      sifter.caption = "NHK News Web #{news_name}".dup
+
+      if !@sift_search_criteria.nil?
+        if %i[htm html].any?(file_ext)
+          sifter.caption << " &mdash; #{Util.escape_html(@sift_search_criteria.to_s)}"
         else
           sifter.caption << " -- #{@sift_search_criteria}"
         end
       end
-      
+
       case file_ext
       when :csv
-        sifter.put_csv!()
+        sifter.put_csv!
       when :htm,:html
-        sifter.put_html!()
+        sifter.put_html!
       when :json
-        sifter.put_json!()
+        sifter.put_json!
       when :yaml,:yml
-        sifter.put_yaml!()
+        sifter.put_yaml!
       else
         raise ArgumentError,"invalid file ext[#{file_ext}]"
       end
-      
-      stop_spin()
+
+      stop_spin
       puts
-      
+
       if dry_run
-        puts sifter.to_s()
+        puts sifter.to_s
       else
         start_spin('Saving sifted data to file')
-        
+
         sifter.save_file(out_file)
-        
-        stop_spin()
+
+        stop_spin
         puts "> #{out_file}"
       end
     end