archiver 1.0.1 → 1.1.0

data/archiver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "archiver"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Boerger"]
-  s.date = "2012-11-02"
+  s.date = "2012-12-09"
   s.description = "Archiver is a simple gem to rename photos and videos depending on creation date and exif informations to archive directories in subfolders by year. It sorts out duplicate files to"
   s.email = "tboerger@tbpro.de"
   s.executables = ["archiver"]

data/lib/archiver/record.rb

@@ -15,17 +15,24 @@ module Archiver
     end
 
     def filename(counter = 0)
-      append = if counter > 0
-        sprintf('-%03d', counter)
+      if created
+        append = if counter > 0
+          sprintf('-%03d', counter)
+        else
+          nil
+        end
+        
+        [
+          created.strftime('%Y%m%d-%H%M%S'),
+          append,
+          extension
+        ].compact.join
       else
-        nil
+        [
+          sprintf('%05d', counter),
+          extension
+        ].compact.join
       end
-
-      [
-        created.strftime('%Y%m%d-%H%M%S'),
-        append,
-        extension
-      ].compact.join
     end
 
     def extension
@@ -56,7 +63,11 @@ module Archiver
       if exif_data and exif_data.date_time_original
         exif_data.date_time_original
       else
-        File.mtime(path)
+        if image?
+          
+        else
+          File.mtime(path)
+        end
       end
     end
 
@@ -123,7 +134,7 @@ module Archiver
     end
 
     def segment
-      created.strftime('%Y')
+      created ? created.strftime('%Y') : '0000'
     end
 
     protected

data/lib/archiver/version.rb

@@ -6,8 +6,8 @@
 module Archiver
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archiver
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4308012420230902379
+      hash: -3660788461220623772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: