caboose-rets 0.1.88 → 0.1.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547de6ab998d847d3e6e5a40d9a23c48600cfcc9fd8755d1575a15004884871b
-  data.tar.gz: 9b137b9450265bedcc150c1114fc89156ffb74c11411f12d5a9aa7df7c6f3862
+  metadata.gz: aa9081255e9cd3873b90d251b27d550e1c383112ad9247bc3fe87ae60d66f4ec
+  data.tar.gz: b7f286eb071acef6e5fe3f07c990990ac6c3588b99d78b8f435c5b67a049dd59
 SHA512:
-  metadata.gz: 700c35ebef6486cf6e71e4cd11b0c2e19e79713ce40a370b4fc9c99c1def9890f8b0bdd9333d8cd4a1089b5bb73622d57701716fa929965ad758cf2f642b1a4d
-  data.tar.gz: d8b0ffa2b21cf31128c8a71bf1fbfc2c547b47140e8cc96f0fcdea55c3c8b7c7a9be20e2d6cbd2cb6080a1d01d68b705d32d18bb95257999810b385013a842bc
+  metadata.gz: 705d2d222fa9fea221a9e836fc0a56b3e4436eba3a8ec62d029df8da93da6dd0378868001ec2709625d7488bdcac51387a6dbba8e5ead9c13e2cce76e1b5a58b
+  data.tar.gz: f6414868489eb6c11e23ae962c558ed7a93ac91473a04d8a9113c58260c27cb5eefc78729cae3de3c62f1e3b8de746145630bbee0278651b7ab54353da754377

data/app/models/caboose_rets/rets_importer.rb

@@ -273,51 +273,88 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 
   def self.download_property_images(p)
     self.log3('Property',p.mls_number,"Downloading images for #{p.mls_number}...")
-  #  begin
-      # Get first image
-      self.client.get_object(:resource => 'Property', :type => 'Photo', :location=> false, :id => "#{p.matrix_unique_id}:0") do |headers, content|
-        m = CabooseRets::Media.where(:media_mui => headers['content-id'], :media_order => 0).first
-        m = CabooseRets::Media.new if m.nil?
-        tmp_path = "#{Rails.root}/tmp/rets_media_#{headers['content-id']}:0.jpeg"
-        File.open(tmp_path, "wb") do |f|
-          f.write(content)
-        end
-        m.media_mui     = headers['content-id']
-        m.media_order   = 0
-        m.media_type    = 'Photo'
-        cm               = Caboose::Media.new
-        cm.image         = File.open(tmp_path)
-        cm.name          = "rets_media_#{headers['content-id']}_0"
-        cm.original_name = "rets_media_#{headers['content-id']}_0.jpeg"
-        cm.processed     = true
-        cm.save
-        m.media_id = cm.id
-        m.save
-        `rm #{tmp_path}`
-        self.log("Image rets_media_#{headers['content-id']}_0 saved")
+ 
+    self.client.get_object(:resource => 'Property', :type => 'Photo', :location=> false, :id => "#{p.matrix_unique_id}:*") do |headers, content|
+      next if headers.blank?
+      ind = headers['orderhint'] ? headers['orderhint'].to_i : 0
+      self.log3('Media',p.mls_number,headers.to_s)
+      self.log3('Media',p.mls_number,"Downloading photo with content-id #{headers['content-id']}, index #{ind}")
+      m = CabooseRets::Media.where(:media_mui => headers['content-id'], :media_order => ind).first
+      m = CabooseRets::Media.new if m.nil?
+      tmp_path = "#{Rails.root}/tmp/rets_media_#{headers['content-id']}_#{ind}.jpeg"
+      File.open(tmp_path, "wb") do |f|
+        f.write(content)
       end
-      # Get rest of images
-      self.client.get_object(:resource => 'Property', :type => 'Photo', :location=> false, :id => "#{p.matrix_unique_id}:*") do |headers, content|
-        m = CabooseRets::Media.where(:media_mui => headers['content-id'], :media_order => headers['orderhint']).first
-        m = CabooseRets::Media.new if m.nil?
-        tmp_path = "#{Rails.root}/tmp/rets_media_#{headers['content-id']}:#{headers['object-id']}.jpeg"
-        File.open(tmp_path, "wb") do |f|
-          f.write(content)
-        end
-        m.media_mui     = headers['content-id']
-        m.media_order   = headers['orderhint']
-        m.media_type    = 'Photo'
-        cm               = Caboose::Media.new
-        cm.image         = File.open(tmp_path)
-        cm.name          = "rets_media_#{headers['content-id']}_#{headers['object-id']}"
-        cm.original_name = "rets_media_#{headers['content-id']}_#{headers['object-id']}.jpeg"
-        cm.processed     = true
-        cm.save
+      m.media_mui     = headers['content-id']
+      m.media_order   = ind
+      m.media_type    = 'Photo'
+      cm               = Caboose::Media.new
+      cm.image         = File.open(tmp_path)
+      cm.name          = "rets_media_#{headers['content-id']}_#{ind}"
+      cm.original_name = "rets_media_#{headers['content-id']}_#{ind}.jpeg"
+      cm.processed     = true
+      cm.save
+      #puts cm
+      if cm
         m.media_id = cm.id
         m.save
+        self.log3("Media",p.mls_number,"Created new RetsMedia object #{m.id}, CabooseMedia object #{cm.id}")
         `rm #{tmp_path}`
-        self.log("Image rets_media_#{headers['content-id']}_#{headers['object-id']} saved")
+        self.log3("Media",p.mls_number,"Image rets_media_#{headers['content-id']}_#{ind} saved")
+      else
+        self.log3("Media",p.mls_number,"CabooseMedia was not created, not saving image")
       end
+    end
+
+
+      # # Get first image
+      # self.client.get_object(:resource => 'Property', :type => 'Photo', :location=> false, :id => "#{p.matrix_unique_id}:0") do |headers, content|
+      #   self.log3('Media',p.mls_number,"Downloading first photo with content-id #{headers['content-id']}, orderhint #{headers['orderhint']}, object-id #{headers['object-id']}")
+      #   m = CabooseRets::Media.where(:media_mui => headers['content-id'], :media_order => 0).first
+      #   m = CabooseRets::Media.new if m.nil?
+      #   tmp_path = "#{Rails.root}/tmp/rets_media_#{headers['content-id']}:0.jpeg"
+      #   File.open(tmp_path, "wb") do |f|
+      #     f.write(content)
+      #   end
+      #   m.media_mui     = headers['content-id']
+      #   m.media_order   = 0
+      #   m.media_type    = 'Photo'
+      #   cm               = Caboose::Media.new
+      #   cm.image         = File.open(tmp_path)
+      #   cm.name          = "rets_media_#{headers['content-id']}_0"
+      #   cm.original_name = "rets_media_#{headers['content-id']}_0.jpeg"
+      #   cm.processed     = true
+      #   cm.save
+      #   m.media_id = cm.id
+      #   m.save
+      #   self.log3("Media",p.mls_number,"Created new RetsMedia object #{m.id}, CabooseMedia object #{cm.id}")
+      #   `rm #{tmp_path}`
+      #   self.log3("Media",p.mls_number,"Image rets_media_#{headers['content-id']}_0 saved")
+      # end
+      # # Get rest of images
+      # self.client.get_object(:resource => 'Property', :type => 'Photo', :location=> false, :id => "#{p.matrix_unique_id}:*") do |headers, content|
+      #   self.log3('Media',p.mls_number,"Downloading subsequent photo with content-id #{headers['content-id']}, orderhint #{headers['orderhint']}, object-id #{headers['object-id']}")
+      #   m = CabooseRets::Media.where(:media_mui => headers['content-id'], :media_order => headers['orderhint']).first
+      #   m = CabooseRets::Media.new if m.nil?
+      #   tmp_path = "#{Rails.root}/tmp/rets_media_#{headers['content-id']}:#{headers['object-id']}.jpeg"
+      #   File.open(tmp_path, "wb") do |f|
+      #     f.write(content)
+      #   end
+      #   m.media_mui     = headers['content-id']
+      #   m.media_order   = headers['orderhint']
+      #   m.media_type    = 'Photo'
+      #   cm               = Caboose::Media.new
+      #   cm.image         = File.open(tmp_path)
+      #   cm.name          = "rets_media_#{headers['content-id']}_#{headers['object-id']}"
+      #   cm.original_name = "rets_media_#{headers['content-id']}_#{headers['object-id']}.jpeg"
+      #   cm.processed     = true
+      #   cm.save
+      #   m.media_id = cm.id
+      #   m.save
+      #   self.log3("Media",p.mls_number,"Created new RetsMedia object #{m.id}, CabooseMedia object #{cm.id}")
+      #   `rm #{tmp_path}`
+      #   self.log3("Media",p.mls_number,"Image rets_media_#{headers['content-id']}_#{headers['object-id']} saved")
+      # end
  #   rescue RETS::APIError => err
  #     self.log "No image for #{p.mls_number}."
  #     self.log err

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.88'
+  VERSION = '0.1.89'
 end

data/lib/tasks/caboose_rets.rake

@@ -169,8 +169,10 @@ namespace :caboose_rets do
   end
   
   desc "Single Import Test"
-  task :import_one => :environment do
-    CabooseRets::RetsImporter.import_properties('131330',true)
+  task :import_one, [:mls_number, :download_photos] => :environment do |t, args|
+    puts "Save images: #{args.download_photos}"
+    save_images = args.download_photos == true || args.download_photos == 'true'
+    CabooseRets::RetsImporter.import_properties(args.mls_number, save_images)
   end
 
   desc "Purge rets data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.88
+  version: 0.1.89
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms