imagut 0.0.1 → 0.0.2

data/CHANGES

@@ -1,6 +1,9 @@
-= filerenamer Changelog
+= imagut Changelog
 
-== Master (for 0.0.2)
+== Master (for 0.0.3)
+
+== Version 0.0.2
+* Rename bin/importnef to bin/importphoto, with function to deal with jpg file.
 
 == Version 0.0.1
 * Adjust for filerenamer-0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/importphoto

@@ -0,0 +1,55 @@
+#! /usr/local/bin/ruby
+# last-modified: 2012/08/31 23:56:49.
+
+# Nikon NEF ファイルの撮影日時をファイル名の先頭に付加する。
+
+
+NEF_DIR_PREFIX = "#{ENV["HOME"]}/image/photo/undone"
+
+
+require "pp"
+require "rubygems"
+
+gem "exifr"
+require "exifr"
+
+gem "filerenamer"
+require "filerenamer.rb"
+
+gem "imagut"
+require "imagut/nefparser.rb"
+
+op = FileRenamer::OptionParser.new
+op.parse!(ARGV)
+
+fr = FileRenamer::Commander.new(op.options, ARGV)
+np = NefParser.new
+fr.execute do |filename|
+  #pp filename
+  new_name = ""
+  #pp File.extname(filename)
+  #exit
+
+  if File.extname(filename) =~ /^\.nef$/i
+    begin
+      str = File.open(filename, "r").read(391)
+      date = np.taken_date(str)
+      new_name = (NEF_DIR_PREFIX + date.strftime("/%Y/%m/%d/%H%M%S_") + filename)
+      new_name.sub!(/\.NEF$/, ".nef")
+        #new_name = date.strftime("%Y/%m/%d/") + filename
+        # 秒までだと、連写したときに重複ファイル名になりうる。
+        # 何枚目かだけだと、1日の途中でメモリカードを交換したときに
+        # 重複して順番が滅茶苦茶になる。
+        # このプログラムを使用した後、更に適当にリネームすることを想定。
+    rescue NefParserNotNefError
+      new_name = nil
+    end
+  elsif File.extname(filename) =~ /^\.jpg$/i
+    date = EXIFR::JPEG.new(filename).date_time
+    new_name = (NEF_DIR_PREFIX + date.strftime("/%Y/%m/%d/%H%M%S_") + filename)
+    new_name.sub!(/\.JPG$/, ".jpg")
+  else
+    puts "Unknown format. Next."
+  end
+  new_name
+end

data/imagut.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "imagut"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2012-08-26"
+  s.date = "2012-08-31"
   s.description = "Library to deal image files. This includes file renamer with NIKON NEF file, downloader for images on a web page."
   s.email = "ippei94da@gmail.com"
-  s.executables = ["getimage", "importnef", "resizeimage"]
+  s.executables = ["getimage", "importphoto", "resizeimage"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/getimage",
-    "bin/importnef",
+    "bin/importphoto",
     "bin/resizeimage",
     "imagut.gemspec",
     "lib/imagut.rb",
     "lib/imagut/nefparser.rb",
     "lib/imagut/urllogger.rb",
-    "memo.txt",
     "test/001.nef",
     "test/helper.rb",
     "test/test_nefparser.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagut
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &86885460 !ruby/object:Gem::Requirement
+  requirement: &75166720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *86885460
+  version_requirements: *75166720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &86885130 !ruby/object:Gem::Requirement
+  requirement: &75166280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *86885130
+  version_requirements: *75166280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &86884820 !ruby/object:Gem::Requirement
+  requirement: &75165800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *86884820
+  version_requirements: *75165800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &86884470 !ruby/object:Gem::Requirement
+  requirement: &75197760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86884470
+  version_requirements: *75197760
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &86884180 !ruby/object:Gem::Requirement
+  requirement: &75196830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.4
   type: :development
   prerelease: false
-  version_requirements: *86884180
+  version_requirements: *75196830
 - !ruby/object:Gem::Dependency
   name: filerenamer
-  requirement: &86883830 !ruby/object:Gem::Requirement
+  requirement: &75196140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,13 +76,13 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *86883830
+  version_requirements: *75196140
 description: Library to deal image files. This includes file renamer with NIKON NEF
   file, downloader for images on a web page.
 email: ippei94da@gmail.com
 executables:
 - getimage
-- importnef
+- importphoto
 - resizeimage
 extensions: []
 extra_rdoc_files:
@@ -97,13 +97,12 @@ files:
 - Rakefile
 - VERSION
 - bin/getimage
-- bin/importnef
+- bin/importphoto
 - bin/resizeimage
 - imagut.gemspec
 - lib/imagut.rb
 - lib/imagut/nefparser.rb
 - lib/imagut/urllogger.rb
-- memo.txt
 - test/001.nef
 - test/helper.rb
 - test/test_nefparser.rb
@@ -125,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -720519053
+      hash: -585907423
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/bin/importnef

@@ -1,41 +0,0 @@
-#! /usr/bin/ruby -w
-# last-modified: 2012/08/26 09:51:49.
-
-# Nikon NEF ファイルの撮影日時をファイル名の先頭に付加する。
-
-
-NEF_DIR_PREFIX = "#{ENV["HOME"]}/image/photo/undone"
-
-
-require "pp"
-require "rubygems"
-
-gem "filerenamer"
-require "filerenamer.rb"
-
-gem "imagut"
-require "imagut/nefparser.rb"
-
-op = FileRenamer::OptionParser.new
-op.parse!(ARGV)
-
-fr = FileRenamer::Commander.new(op.options, ARGV)
-np = NefParser.new
-fr.execute do |filename|
-  #pp filename
-  new_name = ""
-  begin
-    str = File.open(filename, "r").read(391)
-    date = np.taken_date(str)
-    new_name = (NEF_DIR_PREFIX + date.strftime("/%Y/%m/%d/%H%M%S_") + filename)
-    new_name.sub!(/\.NEF$/, ".nef")
-      #new_name = date.strftime("%Y/%m/%d/") + filename
-      # 秒までだと、連写したときに重複ファイル名になりうる。
-      # 何枚目かだけだと、1日の途中でメモリカードを交換したときに
-      # 重複して順番が滅茶苦茶になる。
-      # このプログラムを使用した後、更に適当にリネームすることを想定。
-  rescue NefParserNotNefError
-    new_name = nil
-  end
-  new_name
-end

data/memo.txt

@@ -1 +0,0 @@
-0.0.0 release