daengine 0.3.9.4 → 0.3.9.5

data/app/models/digital_asset.rb

@@ -168,7 +168,7 @@ class DigitalAsset::Document
   field :path, type: String
   field :doc_changed_at, type: Time
   field :content_type, type: String
-  field :pages, type: Integer, default: 0
+  field :pages, type: Integer, default: 1
   field :size, type: String
   field :mime_type, type: String
 

data/lib/daengine/teamsite_metadata_parser.rb

@@ -90,14 +90,15 @@ module Daengine::TeamsiteMetadataParser
             DigitalAsset.where(guid: key).try :delete_all
             delete_count += 1
           else
-            asset_docs = trim_package(assets[key]['documents_attributes'], last_read)
             da = DigitalAsset.find_or_initialize_by(guid: key)
+            asset_docs = trim_package(assets[key]['documents_attributes'], last_read, da)
             if (!asset_docs.empty?)
               assets[key]['documents_attributes'] = asset_docs
+              assets[key]['orderable'] = da.orderable unless da.new?
+
               creating = da.new?
               da.documents = []
               begin
-                assets[key].each { |k,v| assets[key][k] = da.orderable if k == 'orderable'}
                 da.update_attributes!(assets[key])
               rescue Exception => e
                 error_files << "#{e} ----  #{da.try(:guid)}, #{da.try(:errors).try(:full_messages)}"
@@ -124,7 +125,7 @@ module Daengine::TeamsiteMetadataParser
     end
   end
 
-  def self.trim_package(asset_docs, last_read = nil)
+  def self.trim_package(asset_docs, last_read = nil, existing_da = nil)
     docs = []
     path = Daengine.config[:digital_assets_file_directory]
     if Dir.exist?(path)  # dont throw away assets if we can't locate the dir
@@ -141,6 +142,9 @@ module Daengine::TeamsiteMetadataParser
                 pages = exifdata.pagecount
                 pages = exifdata.pages if pages.blank?
                 pages = exifdata.slides if pages.blank?
+                if(pages.blank?)
+                  Daengine.log "Unable to get pages metadata for #{file}, exifdata.pagecount = #{exifdata.pagecount}, exifdata.pages = #{exifdata.pages}", "info"
+                end
                 doc['pages'] = pages
                 doc['size'] = exifdata.filesize
                 doc['mime_type'] = exifdata.mimetype
@@ -148,6 +152,16 @@ module Daengine::TeamsiteMetadataParser
               rescue Exception => e
                 Daengine.log "Error reading metadata from #{file} #{e.message}", "error"
               end
+            elsif(existing_da && !existing_da.new?)  # copy over the existing asset metadata
+             existing_doc = existing_da.documents.where(path: doc['path'])[0]
+             if(existing_doc)
+               doc['pages'] = existing_doc.pages
+               doc['size'] = existing_doc.size
+               doc['mime_type'] = existing_doc.mime_type
+             else
+               Daengine.log "Unable to find document with path #{file} on existing asset #{existing_da.guid} title: #{existing_da.title}", "info"
+             end
+             Daengine.log "Saving existing pages #{existing_doc.pages} and size #{existing_doc.size} on #{file}", "info"
             end
           else
             # the file was missing on disk, show a warning!

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.3.9.4"
+  VERSION = "0.3.9.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: daengine
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.9.4
+  version: 0.3.9.5
 platform: ruby
 authors:
 - sbhatia
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000Z
+date: 2012-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails