tvshow_renamer 0.1 → 0.2

data/README.md

@@ -12,6 +12,6 @@ Installation
 Usage
 -----
 
-`tvshow_renamer [options] file ...`
+`tvshow_renamer [options] <tvshow_name> file|directory ...`
 
 You can specify many files to rename.

data/lib/tvshow_renamer/cli.rb

@@ -7,9 +7,9 @@ module TVShowRenamer
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: tvshow_renamer [options] <tvshow_name> file|directory ..."
 
-        opts.on("-v", "--verbose", "Run verbosely") do |v|
-          options[:verbose] = v
-        end
+        # opts.on("-v", "--verbose", "Run verbosely") do |v|
+        #   options[:verbose] = v
+        # end
 
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts

data/lib/tvshow_renamer/renamer.rb

@@ -27,7 +27,7 @@ module TVShowRenamer
     end
 
     def rename_dir(dirname)
-      puts "Processing directory #{dirname}" if @options[:verbose]
+      puts "Renaming files in directory \"#{dirname}\""
       Dir.glob(dirname + '/**').each do |filename|
         rename_file(filename)
       end
@@ -38,17 +38,78 @@ module TVShowRenamer
       extension = File.extname(filename)
 
       if EXTENSIONS.include?(extension.downcase)
-        dirname = File.dirname(filename)
         basename = File.basename(filename)
+        detected_season, detected_episode = get_season_and_episode(basename)
 
-        FileUtils.mv filename, File.join(dirname, new_basename(basename))
+        season = detected_season
+        episode = detected_episode
+
+        rename_ok = false
+        until rename_ok
+          new_basename = format_filename(@tvshow_name, season, episode, extension)
+          print "Rename \"#{basename}\" to \"#{new_basename}\" ? (yneh) "
+          $stdout.flush
+          rename_value = $stdin.gets.chomp.strip
+          case rename_value.downcase
+          when 'y'
+            new_filename = File.join(File.dirname(filename), new_basename)
+            if File.exists?(new_filename)
+              override_ok = false
+              until override_ok
+                print "File \"#{new_basename}\" already exists. Override ? (yn) "
+                $stdout.flush
+                override_value = $stdin.gets.chomp.strip
+                case override_value
+                when 'y'
+                  FileUtils.mv filename, new_filename
+                  override_ok = true
+                  rename_ok = true
+                when 'n'
+                  override_ok = true
+                end
+              end
+            else
+              FileUtils.mv filename, new_filename
+              rename_ok = true
+            end
+          when 'n'
+            rename_ok = true
+          when 'e'
+            season = edit_value "Season", detected_season
+            episode = edit_value "Episode", detected_episode
+          when '?', 'h'
+            puts "y: Yes, n: No, e: Edit"
+          end
+        end
       end
     end
 
-    def new_basename(basename)
+    def get_season_and_episode(basename)
       regex = /(?<season>\d{1,2})(e|x|\.)?(?<episode>\d{2,})/i
       match = regex.match basename
-      "#{@tvshow_name} - %02ix%02i#{File.extname(basename)}" % [match[:season], match[:episode]]
+      [match[:season].to_i, match[:episode].to_i]
+    end
+
+    def format_filename(tvshow_name, season, episode, extension)
+      "#{tvshow_name} - %02ix%02i#{extension}" % [season, episode]
+    end
+
+    def edit_value(prompt, value)
+      ok = false
+      until ok
+        print "#{prompt} (#{value}) : "
+        $stdout.flush
+        str = $stdin.gets.chomp.strip
+        if str.empty?
+          ok = true
+        else
+          if str =~ /0{1,}/ || str.to_i > 0
+            value = str.to_i
+            ok = true
+          end
+        end
+      end
+      value
     end
   end
 end

data/lib/tvshow_renamer/version.rb

@@ -1,3 +1,3 @@
 module TVShowRenamer
-  Version = VERSION = '0.1'
+  Version = VERSION = '0.2'
 end

data/test/test_tvshow_renamer.rb

@@ -8,15 +8,23 @@ class TVShowRenamerTest < Test::Unit::TestCase
     @renamer = TVShowRenamer::Renamer.new(TVSHOW_NAME)
   end
 
-  def test_new_basename
-    tests = {
-      'FamousShow.S05E01.DVDRip.XviD-BLAH.avi' => 'Famous Show - 05x01.avi',
-      'FamousShow.12x03.DVDRip.XviD-BLAH.avi'  => 'Famous Show - 12x03.avi',
-      'FamousShow.0103.720p.mkv'               => 'Famous Show - 01x03.mkv',
-      'FS.503.avi'                             => 'Famous Show - 05x03.avi',
-      'Famous.Show.03.04.avi'                  => 'Famous Show - 03x04.avi'
+  def test_get_season_and_episode
+    {
+      'FamousShow.S05E01.DVDRip.XviD-BLAH.avi' => [5, 1],
+      'FamousShow.12x03.DVDRip.XviD-BLAH.avi'  => [12,3],
+      'FamousShow.0103.720p.mkv'               => [1, 3],
+      'FS.503.avi'                             => [5, 3],
+      'Famous.Show.03.04.avi'                  => [3, 4],
+      'Famous-Show.04x00.srt'                  => [4, 0],
     }.each do |k,v|
-      assert_equal v, @renamer.new_basename(k)
+      assert_equal v, @renamer.get_season_and_episode(k)
     end
   end
+
+  def test_format_filename
+    assert_equal 'Famous Show - 01x02.mkv',
+                 @renamer.format_filename(TVSHOW_NAME, 1, 2, '.mkv')
+    assert_equal 'Famous Show - 01x101.mkv',
+                 @renamer.format_filename(TVSHOW_NAME, 1, 101, '.mkv')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tvshow_renamer
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors: