renamr 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5380eceed0762e9b9e9f813a398a9deafec3f55c083455515d99d4c45a7f4d4a
-  data.tar.gz: a39f45d33359d23c100c4d86ecd51e269c3a20dae5468e44930bf4d3fa24119f
+  metadata.gz: bdddf30ae00e41f680036bee50f3e1c34da6ae3b569aeec8c40f136621a1ce88
+  data.tar.gz: 83724725b200aac5218a4ab319c769b6b982b25398ab5820ef4532b2d09b56b4
 SHA512:
-  metadata.gz: 5481a92f73950a0246e23f38d318a670b3a526978e3ac03a16581718e3be807f584d4f25764b2c5fd0ee543e36da850c805efcbc3461da36f25cc89f7d97867d
-  data.tar.gz: ca31141c775ecab17142cddd36d4b5db6d6600aa794c72220a6b9067962451d7fde3d42d71c00a677ec9070e7e4bcf1adc7827585cbe81eef0b0a80ddf990753
+  metadata.gz: e055a5b53a6fe4d9ac68be46cb207f47b6de392a3ef77d59cb95f5e5fca834f8f85d6fb327fae7f962811271c4a5b9ac8c8a1e92212b73e51afc1edffd956235
+  data.tar.gz: f9e7464fdfed6a0a31a15e03b1bddc54e086693806ae629aee80aff9d1d1b83566e0a87fb12beed599c56fc8193aae7f3df95a2ee36ebb7de7c83ed1e58bda17

data/lib/renamr/factory.rb

@@ -8,7 +8,6 @@ require_relative 'auto_localization'
 require_relative 'char'
 require_relative 'date'
 require_relative 'downcase'
-require_relative 'existence'
 require_relative 'manual_localization'
 require_relative 'omit'
 require_relative 'point'
@@ -50,8 +49,7 @@ module Renamr
           ASCIIValidatorAction.new,
           TrimAction.new,
           TruncateAction.new(LIMIT),
-          DateAction.new,
-          ExistenceAction.new(dir, LIMIT) # Should be the last.
+          DateAction.new
         ].compact
       end
     end

data/lib/renamr/renamer.rb

@@ -24,7 +24,7 @@ module Renamr
           next
         end
         begin
-          FileUtils.mv(src, dst) if @cfg.act?
+          File.rename(src, dst) if @cfg.act?
           rep.add(File.basename(src), File.basename(dst))
         rescue StandardError => e
           rep.add(File.basename(src), e)
@@ -35,6 +35,18 @@ module Renamr
       rep.do
     end
 
+    def unique(dat, nme)
+      dst = []
+      dat.each { |_, d| dst << File.basename(d) }
+      return nme unless dst.include?(nme)
+
+      ext = File.extname(nme)
+      0.step do |i| # Infinitive loop with index.
+        n = ext.nil? ? "#{nme}-#{i}" : "#{File.basename(nme, ext)}-#{i}#{ext}"
+        return n unless dst.include?(n)
+      end
+    end
+
     def do_dir(dir) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
       raise "No such directory: #{dir}." unless File.directory?(dir)
 
@@ -42,12 +54,14 @@ module Renamr
       act = @fac.produce(dir)
       # Doesn't include hidden files.
       Dir.entries(dir).reject { |f| f.start_with?('.') }.sort.each do |nme|
-        p nme
         src = File.join(dir, nme)
         do_dir(src) if @cfg.rec? && File.directory?(src)
         act.each { |a| a.set(nme) }
-        act.each { |a| break if (nme = a.do(nme)).nil? }
-        dat << [src, File.join(dir, nme)] unless nme.nil?
+        act.each { |a| break if (nme = a.do(nme)).nil? } # rubocop:disable Style/CombinableLoops
+        next if nme.nil?
+
+        nme = unique(dat, nme)
+        dat << [src, File.join(dir, nme)]
       end
       move(dir, dat) if dat.any?
     end

data/lib/renamr/version.rb

@@ -4,6 +4,6 @@
 # Copyright 2020 by David Rabkin
 
 module Renamr
-  VERSION = '1.0.9'
-  DATE = '2021-03-03'
+  VERSION = '1.0.10'
+  DATE = '2021-04-07'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renamr
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - David Rabkin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: date
@@ -145,7 +145,6 @@ files:
 - lib/renamr/configurator.rb
 - lib/renamr/date.rb
 - lib/renamr/downcase.rb
-- lib/renamr/existence.rb
 - lib/renamr/factory.rb
 - lib/renamr/manual_localization.rb
 - lib/renamr/omit.rb
@@ -164,12 +163,13 @@ files:
 - renamr-1.0.6.gem
 - renamr-1.0.7.gem
 - renamr-1.0.8.gem
+- renamr-1.0.9.gem
 - renamr.gemspec
 homepage: https://github.com/rdavid/renamr
 licenses:
 - 0BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: File and directory names organiser.
 test_files: []

data/lib/renamr/existence.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-# vi:ts=2 sw=2 tw=79 et lbr wrap
-# Copyright 2018 by David Rabkin
-
-require_relative 'action'
-
-module Renamr
-  # Adds number from 0 to 9 in case of file existence.
-  class ExistenceAction < Action
-    ITERATION = 10
-
-    def initialize(dir, lim)
-      raise 'dir cannot be nil.' if dir.nil?
-      raise 'lim cannot be nil.' if lim.nil?
-
-      @dir = dir
-      @lim = lim
-    end
-
-    def do(src) # rubocop:disable MethodLength, CyclomaticComplexity, AbcSize
-      raise 'ExistenceAction needs original file name.' if @src.nil?
-      return src if src == @src
-      return src unless File.exist?(File.join(@dir, src))
-
-      if src.length == @lim
-        ext = File.extname(src)
-        src = src[0..@lim - ext.length - ITERATION.to_s.length + 1]
-        src << ext
-      end
-      nme = File.basename(src, '.*')
-      nme = '' if nme.length == 1
-      ext = File.extname(src)
-      (0..ITERATION).each do |i|
-        n = File.join(@dir, nme + i.to_s + ext)
-        return n unless File.exist?(n)
-      end
-      raise "Unable to compose a new name: #{src}."
-    end
-
-    def set(src)
-      @src = src
-    end
-  end
-end