visioner 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e13126577086c8113fd97ddaa358503ad72a8fae
-  data.tar.gz: 07a31b3248cb29b8e5b67b8ffedf9cde2fd55924
+  metadata.gz: 3ad07e8c2e46392159f5c62a4a956d4e646ab4f3
+  data.tar.gz: fcc1116040567630a84f1c96c4f94d6c899d5bee
 SHA512:
-  metadata.gz: d90f9c44dc00aae708ab3ac64eea5019e906ea2b1aa628301a0446caeb468f40a28ca5e29312401b4978694dacff50cafd495089fd2cf647b62f716d60cce3e5
-  data.tar.gz: 2bca6f64ac31dfc1e0152de4e7f67d6baa5113d7636c05313001b3e110713d5d2868fb02908185c78796443a3925d17aa2e7d7aa6adeeda7fd472f538e4e650b
+  metadata.gz: 91018c0cd1ef95db035ee992d996c75f6a7dcf17df4b51a4127ec90e5d421d5c5f1b7b52a27eca92c625f8a3718c7c5162c3ff2ed4243c48d9eddf8596c711b7
+  data.tar.gz: a5482df04d15ddba0fa81fca3dfec6700377b6b8f0594dd15290a52c25e3681ae46b8b795fe81399de55e19ad8437da2e2f89daf08503eb83c28a11a8f6f67aa

data/README.md

@@ -1,41 +1,43 @@
 # Visioner
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/visioner`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Automatically rename your pictures using Google Vision API and metadata.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'visioner'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install visioner
+    $ bundle install
+    $ rake install
 
 ## Usage
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/visioner.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+    $ export GOOGLE_VISION_API_KEY=...
+    $ bin/visioner [options] image ...
+
+**Options:**
+
+-c, --country                    Adds country to the new filename (ex: south-korea)
+
+-d, --date                       Adds date to the new filename (ex: 29/07/2016)
+
+-h, --help                       Displays help
+
+**Examples:**
+
+    $ export GOOGLE_VISION_API_KEY=BI34SyB5DhqV5ReVnkmIM79812yux9UFazNdynD
+    
+    $ bin/visioner /Desktop/travel-south-korea-2016-2/*.jpg
+      /Desktop/travel-south-korea-2016-2/IMG_213.jpg -> sea.jpg
+      /Desktop/travel-south-korea-2016-2/IMG_214.jpg -> tower.jpg
+      /Desktop/travel-south-korea-2016-2/IMG_215.jpg -> people.jpg
+      /Desktop/travel-south-korea-2016-2/IMG_216.jpg -> sea2.jpg
+      
+    $ bin/visioner --date /Desktop/travel-south-korea-2016-3/*.jpg
+      /Desktop/travel-south-korea-2016-3/IMG_213.jpg -> 02-28-2015_sea.jpg
+      /Desktop/travel-south-korea-2016-3/IMG_214.jpg -> 02-15-2015_tower.jpg
+      /Desktop/travel-south-korea-2016-3/IMG_215.jpg -> 03-28-2015_people.jpg
+      /Desktop/travel-south-korea-2016-3/IMG_216.jpg -> 04-02-2015_sea2.jpg
+      
+    $ bin/visioner --country --date /Desktop/travel-south-korea-2016-4/*.jpg
+      /Desktop/travel-south-korea-2016-4/IMG_213.jpg -> south-korea_02-28-2015_sea.jpg
+      /Desktop/travel-south-korea-2016-4/IMG_214.jpg -> south-korea_03-15-2015_tower.jpg
+      /Desktop/travel-south-korea-2016-4/IMG_215.jpg -> south-korea_03-28-2015_people.jpg
+      /Desktop/travel-south-korea-2016-4/IMG_216.jpg -> south-korea_04-02-2015_sea2.jpg

data/bin/visioner

@@ -1,11 +1,31 @@
 #!/usr/bin/env ruby
 
 require 'visioner'
+require 'optparse'
+
+options = {}
+opts = OptionParser.new
+
+opts.banner = "Visioner automatically renames your pictures using Google API Visioner and metadata.\nMake sure you have set GOOGLE_API_KEY in your env.\n\nUsage: visioner [options] image ..."
+
+opts.on("-c", "--country", "Adds country to the new filename (ex: south-korea)") do |c|
+  options[:country] = c
+end
+
+opts.on("-d", "--date", "Adds date to the new filename (ex: 29/07/2016)") do |d|
+  options[:date] = d
+end
+
+opts.on("-h", "--help", "Displays help") do
+  puts opts
+  exit
+end
+
+opts.parse!
 
 if ARGV.empty?
-  puts "Visioner automatically renames your pictures using Google API Visioner"
-  puts "Usage: visioner image ..."
+  puts opts
   exit 1
 else
-  Visioner.rename_all(ARGV)
+  Visioner.rename_all(ARGV, options)
 end

data/lib/visioner/version.rb

@@ -1,3 +1,3 @@
 module Visioner
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/visioner.rb

@@ -2,21 +2,53 @@ require 'visioner/version'
 require 'base64'
 require 'net/http'
 require 'json'
+require 'exifr'
+require 'optparse'
 
 module Visioner
-  
-  def self.rename_all(images)
+
+  def self.get_country(latitude, longitude)
+    # Prepare request
+    url = "https://maps.googleapis.com/maps/api/geocode/json?latlng=#{latitude},#{longitude}"
+    url = URI(url)
+    req = Net::HTTP::Get.new(url)
+    res = Net::HTTP.new(url.host, url.port)
+    res.use_ssl = true
+
+    # Get country
+    country = 'unknown'
+    res.start do |http|
+      resp = http.request(req)
+      json = JSON.parse(resp.body)
+      if json && json['status'] == 'OK' && json['results'][0]['address_components'] && json['results'][0]['address_components'].select {|address_component| address_component['types'][0] == 'country' }
+        country = json['results'][0]['address_components'].select {|address_component| address_component['types'][0] == 'country' }
+        country = country[0]['long_name']
+        country = country.downcase.tr(" ", "-")
+      end
+    end
+
+    return country
+  end
+
+  def self.rename_all(images, options)
     images.each do |image_name|
 
+      # Check file extension
+      if File.extname(image_name) != '.jpg'
+        puts "Error: can only rename jpg files. Continuing..."
+        next
+      end
+
+
       # Convert image to Base 64
       begin
         b64_data = Base64.encode64(File.open(image_name, "rb").read)
       rescue
-        puts "Error: can't read file"
+        puts "Error: can't read file. Exiting..."
       end
 
       # Prepare request
-      api_key = ENV['GOOGLE_VISION_API_KEY']
+      api_key = ENV['GOOGLE_API_KEY']
       content_type = "Content-Type: application/json"
       url = "https://vision.googleapis.com/v1/images:annotate?key=#{api_key}"
       data = {
@@ -34,8 +66,6 @@ module Visioner
           }
         ]
       }.to_json
-
-      # Make request
       url = URI(url)
       req = Net::HTTP::Post.new(url, initheader = {'Content-Type' =>'application/json'})
       req.body = data
@@ -49,18 +79,34 @@ module Visioner
         json = JSON.parse(resp.body)
         if json && json["responses"] && json["responses"][0]["labelAnnotations"] && json["responses"][0]["labelAnnotations"][0]["description"]
           name = json['responses'][0]['labelAnnotations'][0]['description']
+          name = name.tr(" ", "-")
         end
       end
 
       unless name.empty?
-        counter = ''
+        counter = nil
         while File.exist?(File.dirname(image_name) + "/" + name + counter.to_s + File.extname(image_name)) do
+          counter = 1 if counter == nil
           counter = counter.to_i + 1
         end
 
-        puts "#{image_name} -> #{name + counter.to_s + File.extname(image_name)}"
+        exif = EXIFR::JPEG.new(image_name)
+
+        date = ''
+        if options[:date]
+          date = File.mtime(image_name).strftime('%m-%d-%Y') # Fallback
+          date = exif.date_time_original.strftime('%m-%d-%Y') + '_' if exif.date_time_original
+        end
+
+        country = ''
+        if options[:country]
+          country = 'unknown' # Fallback
+          country = self.get_country(exif.gps.latitude, exif.gps.longitude) + '_' if exif.gps_latitude && exif.gps_longitude
+        end
+
+        puts "#{image_name} -> #{country + date + name + counter.to_s + File.extname(image_name)}"
 
-        File.rename(image_name, File.dirname(image_name) + "/" + name + counter.to_s + File.extname(image_name))
+        File.rename(image_name, File.dirname(image_name) + "/" + country + date + name + counter.to_s + File.extname(image_name))
       end
 
     end

data/visioner.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Pierre-Jean Bergeron"]
   spec.email         = ["pj@bergeron.io"]
 
-  spec.summary       = %q{Automatically rename your pictures using Google Vision API.}
+  spec.summary       = %q{Automatically rename your pictures using Google Vision API and metadata.}
   spec.homepage      = "https://github.com/berpj/visioner"
   spec.license       = "MIT"
 
@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "exifr", "~> 1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visioner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre-Jean Bergeron
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: exifr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: 
 email:
 - pj@bergeron.io
@@ -82,5 +96,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Automatically rename your pictures using Google Vision API.
+summary: Automatically rename your pictures using Google Vision API and metadata.
 test_files: []