photo_rename 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3031e21de21dd1b1fa98a72a93c878d03a276618
-  data.tar.gz: aebd139a00bf7f82199d1bd5ea64bea4f6c429fb
+  metadata.gz: 2ec86080ae15389f539c47aafc0f780d795319c7
+  data.tar.gz: 03d2696d36dcb5090c4fea24246d2a1a7d8d5a63
 SHA512:
-  metadata.gz: 7151029179326ef1a2e5c7af235403ea29942fee08a172be07f90041636a2e62521375bd7b15d86e45a6287da3ede278e7d1f78c30938e517713ec6c971cb4ed
-  data.tar.gz: e253aafc4f37365235c3c05749add37dad2a882663bc06710165a18195509a119adbf0c946265e2c3e5d4ac95865fd86591cc556bc3e3ce7a0112edbf7ee9e42
+  metadata.gz: 9e1543cfc677fa16d43663658a5da164e280ab69f29c5e51f5e9c22d93f9111469546df1841d2d660df6efa104560cd10c69e05cc8796a015c14587e78e29cdb
+  data.tar.gz: 3d14851a6b3fa6f2fe52d73dc9d2de3c9e199268edbe2eca1e8daa155c80bb2a7dfd8f55682ab19078773fec012a79c27f06a3a12ca98e72f3d82d37186eed61

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in photo_rename.gemspec
 gemspec
-gem "awesome_print"
+gem 'awesome_print' , '~> 1.2.0'

data/README.org

@@ -1,4 +1,5 @@
 * Photo Renamer
+ 
 ** What the script does
 This script is fairly specific. It renames all JPG files (technically files with a .jpg or .jpeg extenstion) in a given directory to the form IMG_*yyyymmdd*_*hhmmss*.jpg
 
@@ -12,8 +13,26 @@ After some experimenting I found that if I copy photos from my camera's memory c
 *IMPORTANT NOTE*
 Since I am renaming files based on the date created by the device that captured the image, this device's date should be correctly set. (For the next release I want to add more options to manually set the date)
 
+** Install
+The easiest way to install the script is by using rubygems.
+#+begin_src bash
+gem install photo_rename
+#+end_src
+
+[[./screenshots/install.png]]
+
 ** Usage
-   [[./screenshots/2014-07-05-135037_818x747_scrot.png]]
+#+begin_src bash
+photo_rename photo_directory
+#+end_src
+
+[[./screenshots/example.png]]
+** Release notes
+*** 0.0.4
+- Do not rename files that are already in the correct format.
+
+*** 0.0.1 - 0.0.3
+- Sort out teething problems with gem.
 
 ** GNU GPL
 This program is licensed under [(http://www.gnu.org/licenses/gpl-3.0.txt)[GNU GPL]]

data/bin/photo_rename

@@ -5,7 +5,7 @@ require 'photo_rename'
 def main()
     photo_rename = Photo_rename.new()
     ARGV.length == 0 ? print_opts = true : print_opts = false
-    opts = photo_rename.parse_options(print_opts)
+    photo_rename.parse_options(print_opts)
 
     ARGV.each do |arg|
         map = photo_rename.name_map(arg)

data/lib/photo_rename.rb

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'optparse'
-require "rubygems"
+require 'rubygems'
 require 'awesome_print'
 
 class Photo_rename
@@ -30,20 +30,28 @@ class Photo_rename
   end
 
   def name_map(dir_path)
-    name_map = {}
+    no_change_array = []
+    change_map = {}
     Dir.glob("#{dir_path}/*.[jJ][pP][gG]").sort.each do |f|
-      mdate = File.mtime(f)
-      name_map[f] = "#{dir_path}/#{new_name(mdate)}"
+      if /[Ii][Mm][Gg]\_[0-9]{8}\_[0-9]{6}\.[Jj][Pp][Gg]/.match(f) == nil
+        mdate = File.mtime(f)
+        change_map[f] = "#{dir_path}/#{new_name(mdate)}"
+      else
+        no_change_array.push(f)
+      end
     end
-    return name_map
+    return [no_change_array, change_map]
   end
 
   def print_replace_names(dir_path, map)
-    puts "We will be renaming the following image files"
-    ap map
+    puts "These files are in the correct format and will remain unchanged:"
+    ap map[0], :index => false
+    puts ""
+    puts "These files will be renamed as follows:"
+    ap map[1]
     puts "Are you sure you want to continue renaming these files (Y/N)"
     if STDIN.gets.chomp.downcase == "y"
-      map.each() do |key, value|
+      map[1].each() do |key, value|
         File.rename("#{key}", "#{value}")
       end
     end

data/lib/photo_rename/version.rb

@@ -1,3 +1,3 @@
 module PhotoRename
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/photo_rename.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["github@tjaart.co.za"]
   spec.summary     = "Photo renamer"
   spec.description = "Rename JPG images in a directory based on the date in the file's mtime field. By default the target file names are in the same format as those created by Android devices."
-  spec.homepage    ='https://github.com/tjaartvdwalt/photo-renamer'
+  spec.homepage    ='https://github.com/tjaartvdwalt/photo_rename'
   spec.license       = "GNU GPL"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  #spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.3"
   
   spec.add_runtime_dependency "awesome_print" , "~> 1.2"
+  
+  spec.required_ruby_version = '~> 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photo_rename
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tjaart van der Walt
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -57,8 +71,9 @@ files:
 - lib/photo_rename.rb
 - lib/photo_rename/version.rb
 - photo_rename.gemspec
-- screenshots/2014-07-05-135037_818x747_scrot.png
-homepage: https://github.com/tjaartvdwalt/photo-renamer
+- screenshots/example.png
+- screenshots/install.png
+homepage: https://github.com/tjaartvdwalt/photo_rename
 licenses:
 - GNU GPL
 metadata: {}
@@ -68,9 +83,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="