aperture 0.3.2 → 0.3.3

data/CHANGELOG

@@ -0,0 +1,12 @@
+== 0.3.3 / 2009-12-20
+  * Added verbose output on Library#parse, optional dependency on ruby-progressbar
+
+== 0.3.2 / 2009-12-16
+  * Added plist dependency to gemspec
+  * Added find_by_keyword to PhotoSet
+
+== 0.3.1 / 2009-12-16
+  * Updated rdocs
+
+== 0.3.0 / 2008-12-16
+  * First public release

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/aperture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aperture}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Burckhard"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2009-12-20}
   s.description = %q{Parses out the files from a Aperture Photo Library to give useful figures and check consistancy of the Library itself.}
   s.email = %q{kyle.burckhard@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/lib/aperture/library.rb

@@ -1,4 +1,8 @@
 require 'find'
+begin
+  require 'progressbar'
+rescue LoadError
+end
 
 module Aperture
   
@@ -7,7 +11,9 @@ module Aperture
   # photo library. From the object you can access information about the Versions, Photos, 
   # Albums and Projects contained in the Library.
   #
-  # *Note* Depending on the size of the Aperture photo library parsing it into ruby objects 
+  # There is an optional second argument for parse the enable more verbose output.
+  #
+  # *Note:* Depending on the size of the Aperture photo library parsing it into ruby objects 
   # may take serveral minutes.
   class Library
     attr_reader :root, :photos, :albums, :projects, :versions
@@ -23,36 +29,67 @@ module Aperture
     
     # This the key method for parsing the library, it requires the path of where the library
     # exists on disk. It returns a fully parsed Library object. 
-    def self.parse(root_path)
+    # The second arugment makes the method give more verbose output while it is processing. 
+    # Using the ProgressBar gem, to install use: <tt>[sudo] gem install ruby-progressbar</tt>
+    #
+    # http://github.com/nex3/ruby-progressbar
+    def self.parse(root_path, verbose=false)
       library = new(root_path)
+      pb = nil 
       files = []  
+      
+      if verbose
+        print "Finding metadata files in library: "
+        st = Time.now
+      end
+      
       Find.find(library.root) do |path|
         files << path
       end
       
+      puts "#{(Time.now - st)} seconds"
+      
       # Projects
-      files.select {|p| p =~ /\.approject$/ }.each do |path|
+      files_projects = files.select {|p| p =~ /\.approject$/ }
+      # puts files_projects.size
+      pb = ProgressBar.new("projects", files_projects.size) if defined?(ProgressBar) && verbose
+      files_projects.each do |path|
         project = Project.new
         project.attributes = Plist::parse_xml(File.join(path, 'Info.apfolder'))
         library.projects[project.attributes['uuid']] = project
+        pb.inc if pb
       end
+      pb.finish if pb
       
       # Photo Masters
-      files.select {|p| p =~ /Info\.apmaster$/}.each do |path|
+      files_masters = files.select {|p| p =~ /Info\.apmaster$/}
+      # puts files_masters.size
+      pb = ProgressBar.new("photo masters", files_masters.size) if defined?(ProgressBar) && verbose      
+      files_masters.each do |path|
         photo = Photo.new(File.dirname(path))
         photo.master_attributes = Plist::parse_xml(path)
         photo.master_attributes['path']
         library.photos << photo
+        pb.inc if pb
       end
+      pb.finish if pb
       
       # Photo Files
-      files.select {|p| p =~ /\.apfile$/}.each do |path|
+      files_files = files.select {|p| p =~ /\.apfile$/}
+      # puts files_files.size
+      pb = ProgressBar.new("photo files", files_files.size) if defined?(ProgressBar) && verbose      
+      files_files.each do |path|
         file_attributes = Plist::parse_xml(path)
         library.photos[file_attributes['masterUuid']].file_attributes = file_attributes
+        pb.inc if pb
       end
+      pb.finish if pb
             
       # Versions
-      files.select {|p| p =~ /Version-.+\.apversion$/}.each do |path|
+      files_versions = files.select {|p| p =~ /Version-.+\.apversion$/}
+      # puts files_versions.size
+      pb = ProgressBar.new("versions", files_projects.size) if defined?(ProgressBar) && verbose      
+      files_versions.each do |path|
         directory, filename = File.dirname(path), File.basename(path)
         attributes = Plist::parse_xml(path)
 
@@ -70,10 +107,15 @@ module Aperture
         
         # add version's photo to project
         library.projects[version.attributes['projectUuid']].photos << version.photo
+        pb.inc if pb
       end
+      pb.finish if pb
       
       # Albums
-      files.select {|p| p =~ /\.apalbum/ }.each do |path|
+      files_albums = files.select {|p| p =~ /\.apalbum/ }
+      # puts files_albums.size
+      pb = ProgressBar.new("albums", files_albums.size) if defined?(ProgressBar) && verbose
+      files_albums.each do |path|
         attributes = Plist::parse_xml(path)
         attributes['directory'] = File.dirname(path)
         attributes['filename'] = File.basename(path)
@@ -87,7 +129,9 @@ module Aperture
             library.versions[id].photo.albums << album unless library.versions[id].photo.albums.include?(album)
           end 
         end
+        pb.inc if pb
       end
+      pb.finish if pb
       
       return library
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aperture
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Kyle Burckhard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -08:00
+date: 2009-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile