photo_folder 1.0.6 → 1.0.7

data/lib/models/photo.rb

@@ -50,27 +50,52 @@ class Photo < ActiveRecord::Base
   end
   
   def set_exif_data
-    begin
-      exif = EXIFData.new(MiniExiftool.new(full_path),logger)
-      
-      [:focal_length,:iso,:shutter_speed,:f_stop,:camera,:caption,:location,:height,:width].each do |key|
-        self.send(key.to_s + '=',exif[key] || nil)
-      end
-      
-      #date,title,lens and tags are special cases
-      if exif[:date].is_a? Time
-        self.date = exif[:date]
+    if full_path.match(/\.(png|jpg)$/)
+      if PhotoFolder.mini_exiftool_available?
+        set_exif_data_with_mini_exiftool
       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
+        set_exif_data_without_mini_exiftool
       end
-      self.name = exif[:title] || full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
-      self.lens = exif[:lens] ? exif[:lens] : nil
-      @tags = exif[:tags] || []
-    rescue
-      self.name = full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
-      @tags = []
+    else
+      set_default_exif_data
+    end
+  end
+  
+  def set_default_exif_data
+    self.height = 0
+    self.width = 0
+    @tags = []
+  end
+  
+  def set_exif_data_with_mini_exiftool
+    exif = EXIFData.new(MiniExiftool.new(full_path),logger)
+    [:focal_length,:iso,:shutter_speed,:f_stop,:camera,:caption,:location,:height,:width].each do |key|
+      self.send(key.to_s + '=',exif[key] || nil)
+    end
+    #date,title,lens and tags are special cases
+    if exif[:date].is_a? Time
+      self.date = exif[:date]
+    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
+    end
+    self.name = exif[:title] || full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
+    self.lens = exif[:lens] ? exif[:lens] : nil
+    @tags = exif[:tags] || []
+  end
+  
+  def set_exif_data_without_mini_exiftool
+    self.name = full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
+    if(full_path.match(/\.png$/))
+      width, height = File.read(full_path)[0x10..0x18].unpack('NN')
+    else
+      jpeg_meta_info = JPEGMetaInfo.new(full_path)
+      width = jpeg_meta_info.width
+      height = jpeg_meta_info.height
     end
+    self.width = width
+    self.height = height
+    @tags = []
   end
   
   class EXIFData

data/lib/models/photo_collection.rb

@@ -37,6 +37,23 @@ class PhotoCollection < ActiveRecord::Base
     end
   end
   
+  def self.title_card_path
+    File.join(PhotoFolder.source_directory_location,'index.markdown')
+  end
+  
+  def self.add_title_card
+    if File.exists?(PhotoCollection.title_card_path)
+      truncated_title_card_path = title_card_path[PhotoFolder.source_directory_location.length + 1,title_card_path.length]
+      title_card = Photo.find_by_photo_collection_id_and_path(0,truncated_title_card_path) || Photo.create(
+        :photo_collection_id => 0,
+        :path => truncated_title_card_path
+      )
+      title_card.update_attribute :caption, Maruku.new(File.read(title_card_path)).to_html
+    else
+      false
+    end
+  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}'")
@@ -82,6 +99,21 @@ class PhotoCollection < ActiveRecord::Base
     meta_data
   end
   
+  def title_card_path
+    File.join(full_path,'index.markdown')
+  end
+  
+  def add_title_card
+    if File.exists?(title_card_path)
+      truncated_title_card_path = title_card_path[PhotoFolder.source_directory_location.length + 1,title_card_path.length]
+      title_card = photos.find_by_path(truncated_title_card_path) || photos.create(:path => truncated_title_card_path)
+      title_card.update_attribute :caption, Maruku.new(File.read(title_card_path)).to_html
+      title_card.move_to_top
+    else
+      false
+    end
+  end
+  
   def set_correct_positions
     positions.each_with_index do |file_name,i|
       photo = photos.find_by_path("#{path}/#{file_name}")
@@ -93,4 +125,4 @@ class PhotoCollection < ActiveRecord::Base
       end
     end
   end
-end
+end

data/lib/photo_folder.rb

@@ -2,6 +2,7 @@
 require 'rubygems'
 gem 'sqlite3-ruby'
 gem 'activerecord'
+gem 'maruku'
 require 'active_record'
 require 'fileutils'
 require 'tempfile'
@@ -10,12 +11,14 @@ require 'set'
 require 'ftools'
 require 'digest/md5'
 require 'yaml'
+require 'maruku'
 
 #internal libraries
 current_dir = File.expand_path(File.dirname(__FILE__))
 require File.join(current_dir,'..','vendor','acts_as_tree.rb')
 require File.join(current_dir,'..','vendor','acts_as_list.rb')
 require File.join(current_dir,'..','vendor','mini_exiftool.rb')
+require File.join(current_dir,'..','vendor','jpeg_meta_info.rb')
 require File.join(current_dir,'models','photo.rb')
 require File.join(current_dir,'models','photo_tag.rb')
 require File.join(current_dir,'models','photo_tagging.rb')
@@ -30,16 +33,16 @@ unless Numeric.instance_methods.include? 'to_a'
 end
 
 module PhotoFolder
-  def self.setup_database(database_location)
+  def self.establish_database_connection(database_location)
     ActiveRecord::Base.establish_connection(
       :adapter  => "sqlite3",
       :database => database_location,
       :timeout => 5000
     )
-    PhotoFolder::create_schema
   end
   
   def self.create_schema
+    schema_created = false
     if !Photo.table_exists?
       ActiveRecord::Base.connection.create_table("photos") do |t|
         t.integer  "photo_collection_id"
@@ -62,6 +65,7 @@ module PhotoFolder
         t.integer  "nsfw"
         t.integer  "featured"
       end
+      schema_created = true
     end
     
     if !PhotoCollection.table_exists?
@@ -72,12 +76,14 @@ module PhotoFolder
         t.integer "position"
         t.text "meta"
       end
+      schema_created = true
     end
     
     if !PhotoTag.table_exists?
       ActiveRecord::Base.connection.create_table("photo_tags") do |t|
         t.string "tag"
       end
+      schema_created = true
     end
     
     if !PhotoTagging.table_exists?
@@ -85,12 +91,15 @@ module PhotoFolder
         t.integer "photo_tag_id"
         t.integer "photo_id"
       end
+      schema_created = true
     end
+    
+    schema_created
   end
   
   def self.photos_list
     return @photos_list if !@photos_list.nil?
-    @photos_list = Dir[PhotoFolder.source_directory_location + '/**/*.{png,jpg}']
+    @photos_list = Dir[PhotoFolder.source_directory_location + '/**/*.{png,jpg,markdown}']
   end
   
   def self.all_paths_in_database
@@ -138,6 +147,9 @@ module PhotoFolder
     
     to_add.reject!{|item| to_update.include?(item)}
     
+    to_add.reject!{|item| item.match(/index\.markdown$/)}
+    to_update.reject!{|item| item.match(/index\.markdown$/)}
+    
     [to_add,to_update,to_remove]
   end
   
@@ -199,21 +211,30 @@ module PhotoFolder
     @source_directory_location
   end
   
+  def self.mini_exiftool_available?
+    @mini_exiftool_available
+  end
+  
   def self.generate(source_directory_location,database_location,json_location,include_nsfw = false,exif_tool_location = 'exiftool')
     Photo.send(:with_scope, :find => {:conditions => include_nsfw ? "nsfw = 1 OR nsfw = 0" : "nsfw = 0"}) do
+      puts "PhotoFolder Database Generator"
+      puts "=============================="
       
       @source_directory_location = source_directory_location
       
       begin
         MiniExiftool.configure(exif_tool_location)
+        @mini_exiftool_available = true
       rescue
+        @mini_exiftool_available = false
         puts "WARNING: Could not configure MiniExifTool, EXIF data will not be parsed."
       end
       
-      puts "PhotoFolder Database Generator"
-      puts "=============================="
+      PhotoFolder::establish_database_connection(database_location)
+      if PhotoFolder::create_schema
+        puts "Generated schema in #{database_location}"
+      end
       
-      PhotoFolder::setup_database(database_location)
       photos_list = PhotoFolder::photos_list
       puts "Scanning #{photos_list.length} photos in #{source_directory_location}"
       
@@ -278,6 +299,9 @@ module PhotoFolder
         if PhotoCollection.positions
           puts "Setting positions for root collections from #{PhotoCollection.positions_file_path}"
         end
+        if PhotoCollection.add_title_card
+          puts "Adding title card to root from #{PhotoCollection.title_card_path}"
+        end
         PhotoCollection.set_correct_positions(PhotoCollection.find_all_by_parent_id(0))
         PhotoCollection.find(:all).each do |photo_collection|
           if photo_collection.positions
@@ -287,6 +311,9 @@ module PhotoFolder
           if photo_collection.set_meta
             puts "Setting meta data for #{photo_collection.name} from #{photo_collection.meta_file_path}"
           end
+          if photo_collection.add_title_card
+            puts "Adding title card to #{photo_collection.name} from #{photo_collection.title_card_path}"
+          end
         end
       end
       

data/photo_folder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "photo_folder"
-  s.version  = "1.0.6"
+  s.version  = "1.0.7"
   s.date     = "2010-05-11"
   s.summary  = "JavaScript gallery"
   s.email    = "ryan@syntacticx.com"
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
     Dir['vendor/**/*']
   s.add_dependency("sqlite3-ruby", ["> 0.0.0"])
   s.add_dependency("activerecord", ["> 0.0.0"])
+  s.add_dependency("maruku", ["> 0.0.0"])
 end

data/vendor/jpeg_meta_info.rb

@@ -0,0 +1,39 @@
+class JPEGMetaInfo
+  attr_reader :width, :height, :bits
+
+  def initialize(file)
+    if file.kind_of? IO
+      examine(file)
+    else
+      File.open(file, 'rb') { |io| examine(io) }
+    end
+  end
+
+private
+  def examine(io)
+    raise 'malformed JPEG' unless io.getc == 0xFF && io.getc == 0xD8 # SOI
+
+    class << io
+      def readint; (readchar << 8) + readchar; end
+      def readframe; read(readint - 2); end
+      def readsof; [readint, readchar, readint, readint, readchar]; end
+      def next
+        c = readchar while c != 0xFF
+        c = readchar while c == 0xFF
+        c
+      end
+    end
+
+    while marker = io.next
+      case marker
+        when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF # SOF markers
+          length, @bits, @height, @width, components = io.readsof
+          raise 'malformed JPEG' unless length == 8 + components * 3
+        when 0xD9, 0xDA:  break # EOI, SOS
+        when 0xFE:        @comment = io.readframe # COM
+        when 0xE1:        io.readframe # APP1, contains EXIF tag
+        else              io.readframe # ignore frame
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: photo_folder
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Ryan Johnson
@@ -50,6 +50,22 @@ dependencies:
         version: 0.0.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 0
+        - 0
+        version: 0.0.0
+  type: :runtime
+  version_requirements: *id003
 description: JavaScript gallery
 email: ryan@syntacticx.com
 executables: []
@@ -68,6 +84,7 @@ files:
 - lib/photo_folder.rb
 - vendor/acts_as_list.rb
 - vendor/acts_as_tree.rb
+- vendor/jpeg_meta_info.rb
 - vendor/mini_exiftool.rb
 has_rdoc: true
 homepage: http://photofolder.org/