photo_folder 1.0.8 → 1.0.9

data/lib/models/photo.rb

@@ -17,7 +17,7 @@ class Photo < ActiveRecord::Base
     File.join(PhotoFolder.source_directory_location,path)
   end
   
-  def update_meta
+  def update_info
     set_exif_data
     set_last_modified
     set_guid
@@ -49,6 +49,16 @@ class Photo < ActiveRecord::Base
     self.last_modified = File.mtime(full_path)
   end
   
+  def meta_file_path
+    File.join(full_path.gsub(/\.(jpg|png)$/,'.json'))
+  end
+  
+  def set_meta
+    meta_data = File.exists?(meta_file_path) ? File.read(meta_file_path) : nil
+    update_attribute :meta, meta_data
+    meta_data
+  end
+  
   def set_exif_data
     if full_path.match(/\.(png|jpg)$/)
       if PhotoFolder.mini_exiftool_available?
@@ -74,10 +84,12 @@ class Photo < ActiveRecord::Base
     end
     #date,title,lens and tags are special cases
     if exif[:date].is_a? Time
-      self.date = exif[:date]
+      self.date = exif[:date].to_i
     else
       date_match = (exif[:date] || '').match(/([\d]+):([\d]+):([\d]+) ([\d]+):([\d]+):([\d]+)/)
-      self.date = Time.mktime(date_match[1],date_match[2],date_match[3],date_match[4],date_match[5],date_match[6]) if date_match
+      if date_match
+        self.date = (Time.mktime(date_match[1],date_match[2],date_match[3],date_match[4],date_match[5],date_match[6])).to_i
+      end
     end
     self.name = exif[:title] || full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
     self.lens = exif[:lens] ? exif[:lens] : nil

data/lib/models/photo_collection.rb

@@ -54,6 +54,27 @@ class PhotoCollection < ActiveRecord::Base
     end
   end
   
+  def self.cascade_meta_data
+    PhotoCollection.find(:all).each do |collection|
+      if collection.meta
+        collection.descendants.each do |descendant|
+          if(descendant.meta)
+              collection_meta_as_object = JSON.parse(collection.meta)
+              descendant_meta_as_object = JSON.parse(descendant.meta)
+              merged_meta = collection_meta_as_object.merge(descendant_meta_as_object)
+              descendant.update_attribute :meta, merged_meta.to_json
+          else
+            descendant.update_attribute :meta, collection.meta
+          end
+        end
+      end
+    end
+  end
+  
+  def descendants
+    children.empty? ? [] : children.map(&:descendants).flatten + children
+  end
+  
   def set_children_parent_id
     PhotoFolder::all_paths_in_database.select{|path| self.path.underscore.gsub(/\s/,'_') == path.gsub(/\/[^\/]+$/,'').underscore.gsub(/\s/,'_')}.each do |path|
       Photo.update_all("photo_collection_id = #{self.id}","path = '#{path}'")
@@ -97,8 +118,8 @@ class PhotoCollection < ActiveRecord::Base
   end
   
   def set_meta
-    meta_data = File.exists?(meta_file_path) ? File.read(meta_file_path) : false
-    write_attribute :meta, meta_data
+    meta_data = File.exists?(meta_file_path) ? File.read(meta_file_path) : nil
+    update_attribute :meta, meta_data
     meta_data
   end
   

data/lib/photo_folder.rb

@@ -52,7 +52,7 @@ module PhotoFolder
         t.string   "guid"
         t.string   "path"
         t.string   "name"
-        t.datetime "date"
+        t.integer "date"
         t.string   "location"
         t.string   "f_stop"
         t.string   "shutter_speed"
@@ -61,6 +61,7 @@ module PhotoFolder
         t.string   "camera"
         t.string   "lens"
         t.text     "caption"
+        t.text     "meta"
         t.datetime "last_modified"
         t.integer  "nsfw"
         t.integer  "featured"
@@ -133,11 +134,10 @@ module PhotoFolder
     PhotoFolder::all_paths_in_filesystem.each do |path_in_filesystem|
       if !to_add.include?(path_in_filesystem) && !to_remove.include?(path_in_filesystem)
         entry = Photo.find_by_path(path_in_filesystem)
-        if entry && File.mtime(entry.full_path) > entry.last_modified
+        if entry && File.mtime(entry.full_path) > entry.last_modified || File.exists?(entry.meta_file_path)
           to_update.push(path_in_filesystem)
         end
       elsif to_add.include?(path_in_filesystem)
-        #cleaned = Photo.clean_filename(path_in_filesystem)
         entry = Photo.find_by_path(path_in_filesystem)
         if entry
           to_update.push(path_in_filesystem)
@@ -197,7 +197,7 @@ module PhotoFolder
         inner_result[item.id.to_s] = item.attributes.inject(Hash.new) do |attribute_result,key_and_value|
           key = key_and_value[0]
           value = key_and_value[1]
-          attribute_result[key.to_s] = value.to_s
+          attribute_result[key.to_s] = value.is_a?(Numeric) ? value : value.to_s
           attribute_result
         end
         inner_result
@@ -247,7 +247,10 @@ module PhotoFolder
         if photos_to_add.length > 0
           photos_to_add.each do |path|
             puts "Adding photo: #{path}"
-            Photo.create :path => path
+            photo = Photo.create :path => path
+            if photo.set_meta
+              puts "Setting meta data for #{path} from #{photo.meta_file_path}"
+            end
           end
         else
           puts "No photos to add."
@@ -257,7 +260,12 @@ module PhotoFolder
           photos_to_update.each do |path|
             puts "Updating photo: #{path}"
             photo = Photo.find_by_path(path)
-            photo.update_meta if photo
+            if photo
+              photo.update_info
+              if photo.set_meta
+                puts "Setting meta data for #{path} from #{photo.meta_file_path}"
+              end
+            end
           end
         else
           puts "No photos to update."
@@ -319,7 +327,8 @@ module PhotoFolder
           end
         end
       end
-      
+      PhotoCollection.cascade_meta_data
+      puts "Cascading meta data."
       puts "Writing database to #{json_location}"
       PhotoFolder::write_database_to_file(json_location)
     end

data/photo_folder.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "photo_folder"
-  s.version  = "1.0.8"
-  s.date     = "2010-05-11"
+  s.version  = "1.0.9"
+  s.date     = "2010-05-27"
   s.summary  = "JavaScript gallery"
   s.email    = "ryan@syntacticx.com"
   s.homepage = "http://photofolder.org/"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: photo_folder
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Ryan Johnson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency