visioner 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad07e8c2e46392159f5c62a4a956d4e646ab4f3
-  data.tar.gz: fcc1116040567630a84f1c96c4f94d6c899d5bee
+  metadata.gz: dfb460875ffcf77f13a494ce40b05e1dc089fc9c
+  data.tar.gz: ba23dfdae48c61b58fc88e8bda5c3d0e15c9de1c
 SHA512:
-  metadata.gz: 91018c0cd1ef95db035ee992d996c75f6a7dcf17df4b51a4127ec90e5d421d5c5f1b7b52a27eca92c625f8a3718c7c5162c3ff2ed4243c48d9eddf8596c711b7
-  data.tar.gz: a5482df04d15ddba0fa81fca3dfec6700377b6b8f0594dd15290a52c25e3681ae46b8b795fe81399de55e19ad8437da2e2f89daf08503eb83c28a11a8f6f67aa
+  metadata.gz: 72d6f000b32cbbb60675d483b452d35cec3b176cfbcab02eee5b99d94c1c3b331f5a9da8100491813410f53786f9a1517d0b084e5ffc13bbb1b94fce887ef072
+  data.tar.gz: 050e98a0ef8f60b2d4dd8512fd6388b4db22d5c5c08f3505a996687be1adef043cb0d51f26bec33c0fb86d76384885c5cdfdaaccb8c2876b275dd63ca8b0101e

data/README.md

@@ -16,6 +16,8 @@ Automatically rename your pictures using Google Vision API and metadata.
 
 -c, --country                    Adds country to the new filename (ex: south-korea)
 
+-i, --city                    Adds city to the new filename (ex: seoul)
+
 -d, --date                       Adds date to the new filename (ex: 29/07/2016)
 
 -h, --help                       Displays help
@@ -23,19 +25,19 @@ Automatically rename your pictures using Google Vision API and metadata.
 **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

data/bin/visioner

@@ -12,6 +12,10 @@ opts.on("-c", "--country", "Adds country to the new filename (ex: south-korea)")
   options[:country] = c
 end
 
+opts.on("-l", "--locality", "Adds locality / city to the new filename (ex: seoul)") do |l|
+  options[:locality] = l
+end
+
 opts.on("-d", "--date", "Adds date to the new filename (ex: 29/07/2016)") do |d|
   options[:date] = d
 end

data/lib/visioner/version.rb

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

data/lib/visioner.rb

@@ -7,7 +7,7 @@ require 'optparse'
 
 module Visioner
 
-  def self.get_country(latitude, longitude)
+  def self.get_place(latitude, longitude, type)
     # Prepare request
     url = "https://maps.googleapis.com/maps/api/geocode/json?latlng=#{latitude},#{longitude}"
     url = URI(url)
@@ -15,19 +15,21 @@ module Visioner
     res = Net::HTTP.new(url.host, url.port)
     res.use_ssl = true
 
-    # Get country
-    country = 'unknown'
+    # Get place
+    place = '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(" ", "-")
+      if json && json['status'] == 'OK' && json['results'][0]['address_components'] && json['results'][0]['address_components'].select {|address_component| address_component['types'][0] == type }
+        place = json['results'][0]['address_components'].select {|address_component| address_component['types'][0] == type }
+        if place[0]
+          place = place[0]['long_name']
+          place = place.downcase.tr(" ", "-")
+        end
       end
     end
 
-    return country
+    return place
   end
 
   def self.rename_all(images, options)
@@ -101,12 +103,18 @@ module Visioner
         country = ''
         if options[:country]
           country = 'unknown' # Fallback
-          country = self.get_country(exif.gps.latitude, exif.gps.longitude) + '_' if exif.gps_latitude && exif.gps_longitude
+          country = self.get_place(exif.gps.latitude, exif.gps.longitude, 'country') + '_' if exif.gps_latitude && exif.gps_longitude
+        end
+
+        locality = ''
+        if options[:locality]
+          locality = 'unknown' # Fallback
+          locality = self.get_place(exif.gps.latitude, exif.gps.longitude, 'locality') + '_' if exif.gps_latitude && exif.gps_longitude
         end
 
-        puts "#{image_name} -> #{country + date + name + counter.to_s + File.extname(image_name)}"
+        puts "#{image_name} -> #{country + locality + date + 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))
+        File.rename(image_name, File.dirname(image_name) + "/" + country + locality + date + name + counter.to_s + File.extname(image_name))
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visioner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pierre-Jean Bergeron