rename2mac 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8599bcf752af590a428546ecc70ce7578a44f792
-  data.tar.gz: e8e7406f2c38815dab761cdf302c1ac9180b8fec
+  metadata.gz: b38ef30c1d7c15e3ba46586d9e447351956d4f8a
+  data.tar.gz: fd5d7c3c8b53f7c4e67561b6de5f4aa545ab58d4
 SHA512:
-  metadata.gz: b2a184cf5133bfebd4a1071d6099b3db32ee2407bc9d91404eec6d6f6733b805dc4121da5691287341e4ca35b0bd4eeef768e740787f6d974ca8dc626d5ef6b7
-  data.tar.gz: 1f6440252cca2772a31b4557bcbfd27b07dfcfe487204ff1a77a4b74d96ec5fb20ce3285929c90069b6590869d7607a00d16735ae8d0096bb36f0b76c62b3245
+  metadata.gz: f8556b354e5595741d2cbc2ea29d4f7f210b7693ca1e718e8cbda4fb7b64cd6c79921e8cfe14c7db25509be5dd385057b491e8324b9c68a1aed67d99142e36a4
+  data.tar.gz: a8f94c4d709718224068ead0dc367d36825444bd1ecc54de80ba7309242b5151adf3ed88dbe3b8547bc85fcecf279d6aa2c32a9cb5d8c8be584733b238cc1780

data/README.md

@@ -4,7 +4,11 @@ Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac OS X
 
 Background:
 --------------------------
-The Mac OS X system handles filenames in modified Unicode format called UTF8-Mac. If a filename contain none UTF8-Mac character, the Finder may exihibit behavour such as disappearing file, constant refresh, unable to open file, etc. To fix this problem, the file has to be renamed using UTF8-Mac format. This program will recursively rename all the filenames that needs to be renamed to UTF8-Mac format.
+When I use Mac OS X Finder, I have a lot of issue when dealing with Asian filenames, such as Japanese/Korean/Chinese characters. Previous attempt using convmv and iconv tools failed to fix the problem led me created this tool. I am sure this can fix other international characters too.
+
+The Mac OS X system handles filenames in modified Unicode format called UTF8-Mac. If a filename contain none UTF8-Mac character, the Finder may exihibit behavour such as disappearing file, constant refresh, unable to open file, etc. To fix this problem, the file has to be renamed using UTF8-Mac format.
+
+For more information read https://www.j3e.de/linux/convmv/man/#hfs__on_os_x___darwin
 
 Installation:
 --------------------------
@@ -14,13 +18,17 @@ Installation:
 
 Usage:
 --------------------------
-rename2mac \[-n\] \<directory\>
+rename2mac \[arguments\] \<directory\>
 
-Infomation:
+Arguments:
 --------------------------
-If -n argument is applied, it will only show what will be renamed without making any changes.
+--noop       -n  Make no changes
+--recursive  -r  Recursively rename
+--force      -f  Force overwrite existing file if it exists
+--quiet      -q  Do not output individual results to screen
+--help       -h  Display current help message
 
 License:
 --------------------------
 MIT
-Mac Ma comomac(at)runbox(dot)com (C) 2013 Copyright
+Mac Ma  comomac (at) runbox (dot) com  (C) 2013 Copyright

data/bin/rename2mac

@@ -3,7 +3,7 @@
 
 #
 # Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac OS X use only.
-# Mac Ma comomac (at) runbox (dot) com   (c) Copyright 2013
+# Mac Ma  comomac (at) runbox (dot) com   (c) Copyright 2013
 # License MIT
 #
 
@@ -17,13 +17,18 @@ unless RbConfig::CONFIG['host_os'] =~ /darwin/
 	exit
 end
 
-require 'find'
+require 'getoptlong'
 require 'fileutils'
 require 'term/ansicolor'
 
 include Term::ANSIColor
 
 class String
+	# escape [] and {} character for Dir.glob to use
+	def glob_escape
+		self.gsub(/([\[\]\{\}\*\?\\])/, '\\\\\1')
+	end
+
 	def to_m
 		# convert string to UTF8-MAC format
 		self.encode('UTF8-MAC', 'UTF-8')
@@ -85,28 +90,67 @@ def Dir.restricted?( dir, excludes=[] )
     return false
 end
 
+def show_help
+	puts \
+%Q{Usage:
+rename2mac [arguments] <dir>
+
+Arguments:
+--noop       -n  Make no changes
+--recursive  -r  Recursively rename
+--force      -f  Force overwrite existing file if it exists
+--quiet      -q  Do not output individual results to screen
+--help       -h  Display current help message}
+end
+
+
+
+opts = GetoptLong.new(
+	[ '--noop',      '-n', GetoptLong::NO_ARGUMENT ],
+	[ '--recursive', '-r', GetoptLong::NO_ARGUMENT ],
+	[ '--force',     '-f', GetoptLong::NO_ARGUMENT ],
+	[ '--quiet',     '-q', GetoptLong::NO_ARGUMENT ],
+	[ '--help',      '-h', GetoptLong::NO_ARGUMENT ]
+)
+
+noop = recursive = force = quiet = false
+
+opts.each do |opt, arg|
+	noop = true		 if opt == '--noop'
+	recursive = true if opt == '--recursive'
+	force = true 	 if opt == '--force'
+	quiet = true	 if opt == '--quiet'
+
+	if opt == '--help'
+		show_help
+		exit
+	end
+end
+
+
 if ARGV.length == 0
-	puts "no dir specified.."
+	show_help
 	exit
 else
-	if ARGV[0] == '-n'
-		# -n argument will show what files/folders will be changed, without making changes
-		noop = true
-		src_dir = File.expand_path(ARGV[1])
-	else
-		noop = false
-		src_dir = File.expand_path(ARGV[0])
-	end
+	src_dir = File.expand_path(ARGV[0])
 
 	unless FileTest.directory?( src_dir )
-		puts "dir don't exists. #{src_dir}"
+		puts "Dir don't exists. #{src_dir}"
 		exit
 	end
 end
 
+
 total_success = 0 # success rename counter
 total_fail = 0 # fail rename counter
 
+# set wildcard if recursive or not
+if recursive
+	wildcard = '/**/*'
+else
+	wildcard = '/*'
+end
+
 # repeat if discover some success, because new files might be discovered
 total_files = 0
 flag = true
@@ -114,9 +158,9 @@ while flag
 	total_files = 0
 	flag = false
 
-	Find.find( src_dir ) {|fullpath|
-		# skip files and folders that shouldn't be touched
-		Find.prune if Dir.restricted?( fullpath )
+	Dir.glob(File.expand_path(src_dir).glob_escape + wildcard).delete_if { |fullpath|
+		Dir.restricted?( fullpath )
+	}.each { |fullpath|
 		next if fullpath.bn[0..0] == '.'
 
 		total_files += 1
@@ -136,10 +180,10 @@ while flag
 				# rename directory or file
 				begin
 					# tell program to restart the rename from beginning after finish, because some files maybe revealed after rename
-					FileUtils.mv(fullpath, fullpath.dn.to_m + '/' + fullpath.bn.to_m, :noop => noop)
-					fullpath.print_diff
+					FileUtils.mv(fullpath, fullpath.dn.to_m + '/' + fullpath.bn.to_m, :noop => noop, :force => force)
+					fullpath.print_diff unless quiet
 					total_success += 1
-					flag = true
+					flag = true unless noop
 				rescue => e
 					print 'failed:  '
 					fullpath.print_diff

data/rename2mac.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rename2mac'
-  s.version     = '0.9.4'
+  s.version     = '0.9.5'
   s.date        = '2013-11-15'
   s.summary     = "rename2mac"
   s.description = "Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac OS X use only."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rename2mac
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Mac Ma
@@ -34,6 +34,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- rename2mac-0.9.4.gem
 - rename2mac.gemspec
 - bin/rename2mac
 homepage: http://rubygems.org/gems/rename2mac