media_archiver 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62eeb44c05bb40fd6c54cb66d830cd5282228ac8
-  data.tar.gz: 5c3c96acf6341444071a901fd0c576ed28b7e163
+  metadata.gz: 7b989a4e5cda660b386280c064560963b9a42603
+  data.tar.gz: 58e679df4a7651ea2e6d936b2d1f5ddcb6bddc0e
 SHA512:
-  metadata.gz: a921bd3cd1e73e23a32cdc08dd6ce65c19eac0bcbb5aee7c57f961a43d2ab17fb722032b672f6bc6d5a4daa8128763bd30b62eb48a7384474051c3ac46d476b3
-  data.tar.gz: 53665d79d0797b7d68e1b1fd8fc4f1554f8f14da21e34ecb396bcdb228d7d23af1309c2bdd2ea4c62ad522ad3dd6f56b3041fd85112039a4f48f9d5d2462b8b2
+  metadata.gz: 10d96ee3da9d9ab082108584e894db5e3da27a6a5f5892daf80aff85e4525463ed44e46f318746fd4a8e5bc44f4287de808f8f6a9e3be6380b11b80918162c2a
+  data.tar.gz: fc8cb9ca9da4d1c99c7dde978aa7f53ada35ec32a2d88fad9dd681d9a95c65485759a13babe6e49e0b3aa439042710189afa28c31eddf5fe2cfe0ebf8200c1ca

data/lib/media_archiver/cli.rb

@@ -4,10 +4,12 @@ require 'yaml'
 
 module MediaArchiver
   class CLI < Thor
+    DEFAULT_OUTPUT_TEMPLATE = ':DateTimeOriginal/:Make/:Model'
+
     desc 'copy [DIR] [OUTPUT_DIR]', 'Scans a folder and archives media files'
     option :output_dir, aliases: :o
     option :recursive, aliases: :r, type: :boolean, default: true
-    option :output_template, default: ':date_created/:camera_maker/:camera_model'
+    option :output_template
     option :configuration_file, aliases: :c
     def copy(path = Dir.pwd)
       config = configurations(options)
@@ -33,21 +35,25 @@ module MediaArchiver
     private
 
     def configurations(options)
-      options = symbolize_keys!(options)
-      system_configurations.merge(options)
+      conf = system_configurations.merge symbolize_keys!(options)
+
+      # Defaults that we don't want to set via Thor
+      conf[:output_template] = DEFAULT_OUTPUT_TEMPLATE unless conf[:output_template]
+
+      conf
     end
 
     def system_configurations
-      path = [
+      config_file = [
         File.expand_path(Dir.pwd),
         Dir.home
       ].map { |path| File.join(path, '.media_archiver_conf.yml') }
               .keep_if { |f| File.file? f }
               .first
 
-      return {} unless path
+      return {} unless config_file
 
-      load_config_file path
+      load_config_file config_file
     end
 
     def load_config_file(path)
@@ -58,7 +64,10 @@ module MediaArchiver
       output = [output_path]
 
       output += output_template_parts(template).map do |key|
-        file.respond_to?(key) ? file.send(key) : file.exif_tags[key.to_s]
+        value = file.exif_tags[key.to_s.downcase]
+        value = value.to_date.to_s if value.is_a?(Time)
+
+        value
       end
       output << file.file_name
 
@@ -76,7 +85,7 @@ module MediaArchiver
     end
 
     def symbolize_keys!(hash)
-      hash.each_with_object({}) { |(k,v),acc| acc[k.to_sym] = v }
+      hash.each_with_object({}) { |(k, v), acc| acc[k.to_sym] = v }
     end
   end
 end

data/lib/media_archiver/media_file.rb

@@ -1,6 +1,6 @@
 module MediaArchiver
   class MediaFile
-    attr_reader :path, :file_name
+    attr_reader :path, :file_name, :exif_tags
 
     def initialize(file_path)
       @path = file_path
@@ -8,30 +8,16 @@ module MediaArchiver
 
       begin
         @file = MiniExiftool.new(file_path)
-        @info = @file.to_hash
+        @exif_tags = @file.to_hash.each_with_object({}) do |(k, v), acc|
+          acc[k.downcase] = v if k
+        end
       rescue MiniExiftool::Error
         nil
       end
     end
 
     def valid?
-      @file
-    end
-
-    def exif_tags
-      @info
-    end
-
-    def date_created
-      exif_tags['DateTimeOriginal'].to_date.to_s if exif_tags['DateTimeOriginal']
-    end
-
-    def camera_maker
-      exif_tags['Make']
-    end
-
-    def camera_model
-      exif_tags['Model']
+      @file && @exif_tags
     end
   end
 end

data/lib/media_archiver/version.rb

@@ -1,3 +1,3 @@
 module MediaArchiver
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: media_archiver
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Ramalho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler