photostat 0.0.1 → 0.0.3

data/lib/photostat.rb

@@ -13,7 +13,7 @@ require "photostat/db/base"
 require "photostat/plugins/00_base"
 
 module Photostat
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 
   def self.root
     Pathname.new File.join(File.dirname(__FILE__), 'photostat')

data/lib/photostat/plugins/02_flickr.rb

@@ -1,11 +1,13 @@
 module Photostat
   class Flickr < Plugins::Base
     include OSUtils
+    include FileUtils
 
     help_text "Manages your Flickr account"
 
     exposes :config, "Configures Flickr login"
     exposes :sync, "Uploads local photos to Flickr, downloads Flickr tags / visibility info"
+    exposes :export, "Exports web page with thumbnails/links of your public Flickr photos"
 
     def activate!
       return if @activated
@@ -100,13 +102,17 @@ module Photostat
             end
           end
 
-          visibility = 'private'
-          visibility = 'protected' if fphoto.isfamily
-          visibility = 'public' if fphoto.ispublic
+          if fphoto.ispublic == 1
+            visibility = 'public'
+          elsif fphoto.isfamily == 1
+            visibility = 'protected'
+          else
+            visibility = 'private'
+          end
 
           db[:photos].where(:md5 => md5).update(:has_flickr_upload => true, :visibility => visibility)
           
-          STDOUT.write("\r - processed #{count} of #{total}, with #{not_tagged} not tagged on flickr, #{not_local} not local")
+          STDOUT.write("\r - reading flickr meta: #{count} of #{total}, with #{not_tagged} not tagged on flickr, #{not_local} not local")
           STDOUT.flush
         end  
         
@@ -115,7 +121,44 @@ module Photostat
         rs = flickr.photos.search(:user_id => "me", :extras => 'machine_tags', :per_page => 500, :page => page_idx)
       end      
 
-      puts("\r - processed #{count} of #{total}, with #{not_tagged} not tagged and #{not_local} not local")
+      puts("\r - reading flickr meta: #{count} of #{total}, with #{not_tagged} not tagged on flickr, #{not_local} not local")
+    end
+
+    def export
+      opts = Trollop::options do
+        opt :path, "Local path to export web page to", :required => true, :type => :string, :short => "-p"
+      end
+
+      Trollop::die :path, "must have valid base directory" unless File.directory? File.dirname(opts[:path])
+      Trollop::die :path, "directory already exists" if File.directory? opts[:path]
+
+      activate!
+      update_md5_info_on_files!      
+
+      cfg = Photostat.config
+      db = Photostat::DB.instance
+      Dir.mkdir opts[:path]
+
+      fh = File.open(File.join(opts[:path], 'index.html'), 'w')
+                 
+      rs = flickr.photos.search(:user_id => "me", :extras => 'machine_tags, tags, date_taken, date_upload', :per_page => 500, :privacy_filter => 1)
+      rs.each do |fphoto|
+        next unless fphoto.machine_tags =~ /checksum:md5=(\w+)/
+
+        md5 = $1
+        obj = db[:photos].where(:md5 => md5).first
+
+        fname = File.basename obj[:local_path]
+        src_path = File.join(cfg[:repository_path], obj[:local_path])
+        dst_path = File.join(opts[:path], fname)
+
+        cp src_path, dst_path
+        fh.write "<a href='http://www.flickr.com/photos/alex_ndc/#{fphoto.id}/in/photostream' target='_blank'>\n"
+        fh.write "    <img src='#{fname}' />\n"
+        fh.write "</a>\n"
+      end      
+
+      fh.close
     end
 
     def sync

data/lib/photostat/plugins/03_query.rb

@@ -0,0 +1,32 @@
+module Photostat
+  class Query < Plugins::Base
+    include OSUtils
+
+    help_text "For querying the local repo database"
+
+    exposes :list, "Lists photos corresponding to the filtering criteria"
+
+    def list
+      opts = Trollop::options do
+        opt :visibility, "Specifies visibility of photos, choices are private, protected and public", :type => :string
+        opt :sort, "Specify sort field, one example being 'created_at'", :type => :string
+        opt :reverse, "Reverses output list", :type => :boolean
+        opt :absolute, "Output absolute path", :type => :boolean
+      end
+
+      config = Photostat.config
+      db = Photostat::DB.instance
+
+      rs = db[:photos]
+      rs = rs.where(:visibility => opts[:visibility]) if opts[:visibility]
+      rs = rs.order(opts[:sort].to_sym) if opts[:sort]
+      rs = rs.reverse if opts[:reverse]      
+
+      rs.each do |obj|
+        path = obj[:local_path]
+        path = File.expand_path(File.join(config[:repository_path], path)) if opts[:absolute]
+        puts path
+      end
+    end
+  end
+end

data/photostat.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "photostat/version"
+require "photostat"
 
 Gem::Specification.new do |s|
   s.name        = "photostat"
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "flickraw"
   s.add_runtime_dependency "exifr"
   s.add_runtime_dependency "json"
+  s.add_runtime_dependency "sequel"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photostat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74575380 !ruby/object:Gem::Requirement
+  requirement: &79120930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74575380
+  version_requirements: *79120930
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &74575170 !ruby/object:Gem::Requirement
+  requirement: &79120610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74575170
+  version_requirements: *79120610
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &74574890 !ruby/object:Gem::Requirement
+  requirement: &79120350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74574890
+  version_requirements: *79120350
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &74574610 !ruby/object:Gem::Requirement
+  requirement: &79119920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74574610
+  version_requirements: *79119920
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &74574400 !ruby/object:Gem::Requirement
+  requirement: &79118850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74574400
+  version_requirements: *79118850
 - !ruby/object:Gem::Dependency
   name: flickraw
-  requirement: &74574180 !ruby/object:Gem::Requirement
+  requirement: &79118400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74574180
+  version_requirements: *79118400
 - !ruby/object:Gem::Dependency
   name: exifr
-  requirement: &74573940 !ruby/object:Gem::Requirement
+  requirement: &79117740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74573940
+  version_requirements: *79117740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &74573730 !ruby/object:Gem::Requirement
+  requirement: &79117130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74573730
+  version_requirements: *79117130
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &79116740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *79116740
 description: Photostat is a collection of command-line utilities for managing photos
   / syncronizing with Flickr - first version doesnt do much, it just helps me organize
   my files and upload them to Flickr
@@ -126,6 +137,7 @@ files:
 - lib/photostat/plugins/00_base.rb
 - lib/photostat/plugins/01_local.rb
 - lib/photostat/plugins/02_flickr.rb
+- lib/photostat/plugins/03_query.rb
 - lib/photostat/utils/os.rb
 - photostat.gemspec
 homepage: http://github.com/alexandru/photostat