piwigo-api 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1f218541e0a4b20b9e6b3656b29d8930864b07131fd0dbd1f9951c96a6fec4a
-  data.tar.gz: b9857102f2e6b5c8ea8fd746f0de90ed4316d76b3b98d3223a09954e10f9d67e
+  metadata.gz: 87356665f4013fd077e465bc8bc455d65521778ecabe929b4d51e77a4f8a48f7
+  data.tar.gz: 2febfdf137f95ccca79bdb23565373220e1f553114376b05333c944f2d8caee1
 SHA512:
-  metadata.gz: 3b1753972858ddcf68ba352b49f42d7a683aee2d08d6cbcf2b4ba6b3ef795d70d4de33c81aca6c098be0b95126bacdd1f7d8519c310c46eba88a082f37d1789e
-  data.tar.gz: 41588632e509053b1188d8797db04dc30cfd1ce04bdbdf1e1dc82f4932c11ad995010e146c38219efdec4847156997e1f0d740396bb70bfaed7f187432bd941f
+  metadata.gz: fc6d52f44e5d80aea19d572c1bf0c20027c830be07aa6d1d91cccb163be5e65f5fa190c4c7ba4aaf05b8042405c57609f3b8dbdd343285416d9e0a08548750c0
+  data.tar.gz: 50b9ffe518dda064dbbad1c56a43cbfc0671bcec6c2eb70c1833bb3d5bf072b22eb750b7e42f7effca9b01dcc346f07fba210d2c045eca498aa371306180912e

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+0.5.4 - 2019-11-26
+- Fix crash in sniff_attributes when the image dosn't contain a valid EXIF data
+- Fix parent albums when syncronizing a folder-tree of albums into Piwigo
+
 0.5.3 - 2019-11-25
 - Fixed to coverage reports
 - Only generate coverage reports during CI build

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piwigo-api (0.5.3)
+    piwigo-api (0.5.4)
       exifr (~> 1.3)
       http (~> 4.2)
       logger (~> 1.4)
@@ -21,7 +21,6 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     exifr (1.3.6)
-    ffi (1.11.3)
     ffi (1.11.3-x64-mingw32)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)

data/examples/Syncronize_Folder.md

@@ -0,0 +1,21 @@
+## Syncronize a Directory with Piwigo
+
+To syncronize a folder-tree of im ages with Piwigo:
+
+```ruby
+require 'piwigo/session'
+require 'piwigo/folder_sync'
+
+folder = ARGV[0]
+puts "Processing #{folder}"
+session = Piwigo::Session.login('10.100.230.78', 'Adrian', 'mypassword', https: false)
+unless session.nil?
+  Piwigo::FolderSync.synchronize(session, folder)
+end
+```
+
+Call the script with the directory to syncronize. Eg:
+
+```ruby
+ruby main.rb //DISKSTATION/photos/
+```

data/examples/Upload_Image.md

@@ -3,6 +3,10 @@
 Upload a single image if it doesn't already exist. Image is not associated with any Albums. The image will named apple-pie-bars
 
 ```ruby
+require 'piwigo/session'
+require 'piwigo/images'
+
+
 session = Piwigo::Session.login('10.100.230.78', 'Adrian', 'mypassword', https: false)
 unless session.nil?
   filename = 'C:\photos\apple-pie-bars-articleLarge.jpg'

data/lib/piwigo/albums.rb

@@ -57,7 +57,11 @@ module Piwigo
       attr_accessor :tn_url
 
       def initialize(hash: nil)
-        hash&.each { |key, value| send("#{key}=", value) }
+        hash&.each do |key, value|
+          # Bug: If the encoding is Windows-1252, then Piwigo will blowup when creating the album
+          value = value.encode('UTF-8', 'Windows-1252') if value.class == String && value.encoding.to_s == 'Windows-1252'
+          send("#{key}=", value)
+        end
       end
 
       def to_s
@@ -140,6 +144,7 @@ module Piwigo
       begin
         http = Net::HTTP.new(session.uri.host, session.uri.port)
         request = Net::HTTP::Post.new(session.uri.request_uri)
+        logger.info "Encoding: #{album.name} - #{album.name.encoding}"
         form = {
           method: 'pwg.categories.add',
           name: album.name
@@ -155,7 +160,7 @@ module Piwigo
         if response.code == '200'
           data = JSON.parse(response.body)
           album.id = data['result']['id']
-          logger.info "Album Add succeeded: #{album.id} created."
+          logger.info "Album Add succeeded: #{album.name}(#{album.id}) created."
           album
         end
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
@@ -181,7 +186,7 @@ module Piwigo
       begin
         http = Net::HTTP.new(session.uri.host, session.uri.port)
         request = Net::HTTP::Post.new(session.uri.request_uri)
-        request.body = "method=pwg.categories.delete&category_id=#{id}"        
+        request.body = "method=pwg.categories.delete&category_id=#{id}"
         request.body.concat "&photo_deletion_mode=#{photo_deletion_mode}" unless photo_deletion_mode.nil?
         request.body.concat "&pwg_token=#{session.pwg_token}"
         request['Cookie'] = [session.id]
@@ -190,7 +195,7 @@ module Piwigo
         response = http.request(request)
         if response.code == '200'
           data = JSON.parse(response.body)
-          logger.info "Album Delete succeeded: #{data}"
+          logger.info "Album Delete succeeded: Album #{id} removed - #{data}"
           true
         else
           p response.code

data/lib/piwigo/folder_sync.rb

@@ -31,13 +31,22 @@ module Piwigo
     #
     # @param [String] directory - directory to  syncronize.
     def synchronize(directory)
-      @logger.info "Processing Directory: #{directory}"
+      if ['originals', '.picasaoriginals'].include? File.basename(directory.downcase)
+        @logger.info "Skipping special directory: #{directory}"
+        return
+      else
+        @logger.info "Processing Directory: #{directory}"
+      end
 
       Dir.entries(directory).reject { |entry| entry =~ /^.{1,2}$/ }.each do |directory_entry|
         item_to_process = File.join directory, directory_entry
 
         if File.directory? item_to_process
-          process_directory item_to_process
+          @parent_album = ensure_album(File.dirname(item_to_process), nil)
+          @current_album = ensure_album(item_to_process, @parent_album)
+
+          # Recursively process all of the entries in this album
+          synchronize item_to_process
         else
           process_file item_to_process
         end
@@ -46,26 +55,28 @@ module Piwigo
 
     private
 
-    def process_directory(directory_entry)
-      @logger.info "Processing #{directory_entry}"
-      @parent_album = @current_album
-      # Look to see if we have previously created an Album in Piwogo with this name
-      @current_album = Piwigo::Albums.lookup(@session, File.basename(directory_entry))
+    def ensure_album(directory_entry, parent_album)
+      album_name = File.basename(directory_entry)
+      @logger.info "Ensuring Album #{album_name} exits"
+      return if ['/', '\\', ''].include? album_name
+
+      # Look to see if we have previously created an Album in Piwigo with this name
+      album = Piwigo::Albums.lookup(@session, album_name)
 
-      if @current_album.nil?
+      if album.nil?
         # Album doesn't exist, create one
-        new_album = { 'name' => File.basename(directory_entry),
-                      'id_uppercat' => @parent_album.nil? ? nil : @parent_album.id }
+        new_album = { 'name' => album_name,
+                      'id_uppercat' => parent_album.nil? ? nil : parent_album.id }
         album = Piwigo::Albums::Album.new(hash: new_album)
-        @current_album = Piwigo::Albums.add @session, album
+        album = Piwigo::Albums.add @session, album
       end
-
-      # Recursively process all of the entries in this album
-      @logger.info "Recursing into #{directory_entry}"
-      synchronize directory_entry
+      album
     end
 
     def process_file(directory_entry)
+      # Only attempt to import images
+      return unless ['.jpg', '.png', '.gif'].include? File.extname(directory_entry).downcase
+
       @logger.info "Processing Image: '#{directory_entry}' in album '#{@current_album}'"
       image = Piwigo::Images.lookup(@session, directory_entry)
       return unless image.nil?

data/lib/piwigo/image_uploader.rb

@@ -144,23 +144,31 @@ module Piwigo
 
       def sniff_attributes(filename, album: nil)
         attributes = {}
-
-        info = EXIFR::JPEG.new(filename)
-        @logger.info "--> GPS: #{info.gps.latitude}, #{info.gps.longitude}"
-        exif = info.exif.first.to_hash if info.exif?
-        if exif.nil?
-          # No EXIF data, use the file ctime as the date_creation
-          fs = File::Stat.new(filename)
-          attributes[:date_creation] = fs.ctime.strftime('%Y-%m-%d')
-        else
-          # We have EXIF data, pull out the date_time_original for the date_creation
-          attributes[:date_creation] = exif[:date_time_original].strftime('%Y-%m-%d')
-          # exif.each do |item|
-          #   @logger.info "--> #{item[0]}: #{item[1]}"
-          # end
+        begin         
+          info = EXIFR::JPEG.new(filename)
+          @logger.info "--> GPS: #{info.gps.latitude}, #{info.gps.longitude}" unless info.gps.nil?
+          exif = info.exif.first.to_hash if info.exif?
+          if exif.nil?
+            # No EXIF data, use the file ctime as the date_creation
+            fs = File::Stat.new(filename)
+            @logger.info "--> File::Stat: #{fs.inspect}"
+            attributes[:date_creation] = fs.ctime.strftime('%Y-%m-%d')
+          elsif exif.key?(:date_time_original)
+            # We have EXIF data, pull out the date_time_original for the date_creation
+            attributes[:date_creation] = exif[:date_time_original].strftime('%Y-%m-%d')
+
+            # if !exif.key? :date_time_original do
+            #   exif.each do |item|
+            #     @logger.info "--> #{item[0]}: #{item[1]}"
+            #   end
+            # end
+          end
+        rescue EXIFR::MalformedJPEG => e
+          @logger.error e.message
         end
 
         attributes[:categories] = album.id unless album.nil?
+        @logger.info attributes
         attributes
       end
     end

data/lib/piwigo/version.rb

@@ -1,3 +1,3 @@
 module Piwigo
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piwigo-api
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Adrian Gilbert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - bin/console
 - bin/setup
 - codecov.yml
+- examples/Syncronize_Folder.md
 - examples/Upload_Image.md
 - lib/piwigo.rb
 - lib/piwigo/albums.rb