fileorganizer 0.0.2 → 0.0.3

data/README.md

@@ -1,30 +1,18 @@
 fileorganizer
 =============
 
-Renames files using the creation date and groups them into folders by date
+Renames files using the file modified date/time (File.mtime()) and groups them into folders by date
 
 WHAT IT DOES:
 
-All files, including subfolders, are searched and organized into folders with naming convention of "YYYY-MM-DD". All files are renamed with the convention of "YYYY-MM-DD hour/minute/second -0800_1#####" where the last five digits increment if a duplicate filename. Any files that already have a name starting with the "YYYY-MM-DD" format will NOT be renamed, but will still be moved/organized into their corresponding folder.
+All files, including subfolders, are searched and organized into a single directory of folders with naming the convention of "YYYY-MM-DD". All files are renamed with the convention of "YYYY-MM-DD hour/minute/second -0800_1#####" where the last five digits increment if a duplicate filename. Any files that already have a name starting with the "YYYY-MM-DD" format will NOT be renamed, but will still be moved/organized into their corresponding folder. The previous folders that do not meet the "YYYY-MM-DD" naming convention will then be removed.
 
 HOW IT WORKS:
 
 Install gem
 
-CLI asks if you'd like to run the script starting from it's installed directory. If "n" (no) is selected then it will ask in which directory (full path) you'd like to search and organize files. It will then display all current files in this directory for review.
+CLI "fileorganizer"
 
-CLI then asks if you want to proceed with renaming the listed files and organizing them into folders. If "y" (yes) then the program will proceed. Once completed it will list out all the new files that have been renamed and the new folders that they have been moved into.
+CLI then asks if you'd like to run the script starting from it's installed directory. If "n" (no) is selected then it will ask in which directory (full path) you'd like to search and organize files. It will then display all current files in this directory for review.
 
-ISSUES:
-
-When this gem is run against any file it will rename the file using the date value from the "File.ctime" method. Unfortunately after changing the filename of a file the "ctime" will then be updated to the time the filename was changed. 
-
-I have (so far) not been able to find a solution to this issue (at least for OSX) that keeps the "File.ctime" value in place even after renaming - including setting the "preserve" attribute when using the "File.rename" method (which simply blew up the rename method on OSX "Moutain Lion"). This unfortunately means that this code can not effectively be run against a file without the date associated with the file being changed. 
-
-A check has therefore been put in place so that the file will not be renamed if it's filename begins with the "YYYY-MM-DD" naming convention. Without this check a previously renamed file would simply get renamed again to the date that the previous rename took place.
-
-Any ideas/solutions to the "File.ctime" issue when using the "File.rename" method would be much appreciated. Thx -B
-
-RPSEC ISSUE:
-
-Due to the same "copying files resets the File.ctime value" issue stated above, the Rspec "after" hook doesn't work properly as it copies the "testfiles_copy" image directory for use by the rpsec test. In doing so the File.ctime values of the "pre-organized" files are incorrect and will not match the values stated in the test. Therefore, after running each rspec test the "testfiles_copy" directory will need to be manually copied as "testfiles" in order to preserve the original File.ctime values. This is a pain in the butt (I know) but a necessecity until I find a solution to this issue. Sorry...
+CLI then asks if you want to proceed with renaming the listed files and organizing them into folders. If "y" (yes) then the program will proceed. Once completed it will list out all the new files that have been renamed and the new folders that they have been moved into.

data/lib/fileorganizer.rb

@@ -12,10 +12,13 @@ puts newTask.directory_files
 newTask.directory_files.each do |filename|
 	puts filename
 end
+puts "Proposed file names:"
+newTask.show_new_names
 puts "Rename & move files? (y/n)"
 if gets.strip == 'y'
 	newTask.rename_files
 	newTask.move_files
+	newTask.delete_non_date_folders
 	newTask.directory_files.each do |filename|
 		puts filename
 	end

data/lib/organize.rb

@@ -8,11 +8,17 @@ class Organize
 		# create tests
 		# what does "full documentation" mean?
 		# integrate with Travic CI 
-		@directory_path = '/Users/brianward/Sites/filetest/'
+		@directory_path = '/Users/brianward/Sites/fileorganizer/lib/testfiles/'
 	end
 
 	def directory_files
-		files_sorted_by_time = Dir["#{directory_path}**/*.*"].sort_by{ |f| File.ctime(f) }
+		files_sorted_by_time = Dir["#{directory_path}**/*.*"].sort_by{ |f| File.mtime(f) }
+	end
+
+	def show_new_names
+		directory_files.each do |filename|
+			puts directory_path + File.mtime(filename).to_s + filename[-4,4]
+		end
 	end
 
 	def rename_files
@@ -35,8 +41,16 @@ class Organize
 		directory_files.each do |filename|
 			folder_name = filename.split('/').last[0,10]
 			Dir.mkdir(directory_path + folder_name) unless Dir.exists?(directory_path + folder_name)
-			puts directory_path + folder_name
-			FileUtils.mv(filename, directory_path + folder_name)
+			FileUtils.copy_file(filename, directory_path + folder_name + "/" + filename.split('/').last, preserve = true)
+			FileUtils.remove_file(filename, force = true)
+		end
+	end
+
+	def delete_non_date_folders
+		Dir["#{directory_path}**/**"].each do |folder_name|
+			if !/\d{4}\-\d{2}\-\d{2}/.match(folder_name)
+				FileUtils.remove_dir(folder_name, force = false)
+			end
 		end
 	end
 	

data/lib/organize_spec.rb

@@ -8,9 +8,9 @@ describe Organize do
 	end
 
 	after(:all) do
-	    # FileUtils.rm_rf(@newTask.directory_path)
-	    # current_directory = Dir.pwd
-	    # FileUtils.cp_r(current_directory + '/testfiles_copy', current_directory + '/testfiles/')
+	    FileUtils.rm_rf(@newTask.directory_path)
+	    current_directory = Dir.pwd
+	    FileUtils.cp_r current_directory + '/testfiles_copy', current_directory + '/testfiles/', :preserve => true
 	 end
 
 	it "should have a directory path" do
@@ -19,19 +19,25 @@ describe Organize do
 
 	it "should return a list of existing files in directory" do
 		existing_files = Dir[@newTask.directory_path + '**/*.*'].map { |a| File.basename(a) }
-		existing_files.should eq ["ben easy street.jpg", "mirror.jpg", "P1080679.jpg", "P1080689.jpg", "P1080693.jpg"]
+		existing_files.should eq ["4471473910_14e267969c.jpg", "4474268581_2b1ebba1c1.jpg", "4477744959_27ba8a402b_z.jpg", "5241024543_4d024eaa09_b.jpg", "5241024587_9ce803aafe_b.jpg", "5241619844_a02287bb21_b.jpg", "5241620170_91d55ef233_o.jpg", "5384868249_80bcb10aa2_b.jpg", "photo (1).JPG", "photo (2).JPG", "photo.JPG", "0f8109ddc4c5d699bbf4d9fbef2bcfcb.jpg", "3e54bfc519c423f3aa3b67d46d2684f4.jpg"]
 	end
 
 	it "should rename the existing files in directory" do
 		@newTask.rename_files
 		new_files = Dir[@newTask.directory_path + '**/*.*'].map { |a| File.basename(a) }
-		new_files.should eq ["2011-01-04 20:30:05 -0800.jpg", "2011-06-02 07:25:05 -0700.jpg", "2012-11-19 17:21:59 -0800.jpg", "2012-11-19 17:22:31 -0800.jpg", "2012-11-19 17:23:47 -0800.jpg"]
+		new_files.should eq ["2011-02-04 14:31:58 -0800.jpg", "2011-02-04 14:34:42 -0800.jpg", "2011-02-04 14:35:32 -0800.jpg", "2011-02-04 14:35:48 -0800.jpg", "2011-02-04 14:35:56 -0800.jpg", "2011-02-04 14:37:02 -0800.jpg", "2011-02-04 14:37:26 -0800.jpg", "2011-02-04 14:37:58 -0800.jpg", "2011-02-21 10:55:15 -0800.jpg", "2011-02-21 10:56:09 -0800.jpg", "2011-03-19 22:24:33 -0700.JPG", "2011-03-19 22:24:45 -0700.JPG", "2011-03-19 22:24:56 -0700.JPG"]
 	end
 
 	it "should create new folders from dates" do
 		@newTask.move_files
 		new_folders = Dir[@newTask.directory_path + '*/'].map { |a| File.basename(a) }
-		new_folders.should eq ["2011-01-04", "2011-06-02", "2012-11-19", "test"]
+		new_folders.should eq ["2011-02-04", "2011-02-21", "2011-03-19", "testfolder"]
+	end
+
+	it "should delete old folders that are now dates" do
+		@newTask.delete_non_date_folders
+		new_folders = Dir[@newTask.directory_path + '*/'].map { |a| File.basename(a) }
+		new_folders.should eq ["2011-02-04", "2011-02-21", "2011-03-19"]
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fileorganizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: This is a gem that renames files based on their creation date and organizes
+description: This is a gem that renames files based on their 'modified date' and organizes
   them into folders for each date
 email: brianmatthewward@gmail.com
 executables:
@@ -55,16 +55,34 @@ files:
 - lib/fileorganizer.rb
 - lib/organize.rb
 - lib/organize_spec.rb
+- lib/testfiles/4471473910_14e267969c.jpg
+- lib/testfiles/4474268581_2b1ebba1c1.jpg
+- lib/testfiles/4477744959_27ba8a402b_z.jpg
+- lib/testfiles/5241024543_4d024eaa09_b.jpg
+- lib/testfiles/5241024587_9ce803aafe_b.jpg
+- lib/testfiles/5241619844_a02287bb21_b.jpg
+- lib/testfiles/5241620170_91d55ef233_o.jpg
+- lib/testfiles/5384868249_80bcb10aa2_b.jpg
+- lib/testfiles/photo (1).JPG
+- lib/testfiles/photo (2).JPG
+- lib/testfiles/photo.JPG
+- lib/testfiles/testfolder/0f8109ddc4c5d699bbf4d9fbef2bcfcb.jpg
+- lib/testfiles/testfolder/3e54bfc519c423f3aa3b67d46d2684f4.jpg
+- lib/testfiles_copy/4471473910_14e267969c.jpg
+- lib/testfiles_copy/4474268581_2b1ebba1c1.jpg
 - lib/testfiles_copy/4477744959_27ba8a402b_z.jpg
 - lib/testfiles_copy/5241024543_4d024eaa09_b.jpg
 - lib/testfiles_copy/5241024587_9ce803aafe_b.jpg
+- lib/testfiles_copy/5241619844_a02287bb21_b.jpg
+- lib/testfiles_copy/5241620170_91d55ef233_o.jpg
+- lib/testfiles_copy/5384868249_80bcb10aa2_b.jpg
 - lib/testfiles_copy/photo (1).JPG
 - lib/testfiles_copy/photo (2).JPG
 - lib/testfiles_copy/photo.JPG
-- lib/testfiles_copy/test/0f8109ddc4c5d699bbf4d9fbef2bcfcb.jpg
-- lib/testfiles_copy/test/3e54bfc519c423f3aa3b67d46d2684f4.jpg
+- lib/testfiles_copy/testfolder/0f8109ddc4c5d699bbf4d9fbef2bcfcb.jpg
+- lib/testfiles_copy/testfolder/3e54bfc519c423f3aa3b67d46d2684f4.jpg
 - README.md
-homepage: http://rubygems.org/gems/fileorganizer
+homepage: https://github.com/brianward/fileorganizer
 licenses: []
 post_install_message: 
 rdoc_options: []