multistockphoto 0.7.1 → 0.8.0

data/History.txt

@@ -1,3 +1,14 @@
+== 0.8.0 2008-06-28
+* 1 major enhancement
+  * neue Site Bigstockphoto erstellt
+  * Option --plist in bin/multistockphoto erstellt
+  * Option --count=N in Verbindung mit --no-tags und --tags_only erstellt
+* 1 minor enhancement
+  * Absicherung/Fehlermeldung wenn Config-Datei nicht richtig gelesen werden kann
+  * Methode self.accept?/accept? je Site Klasse neu, fuer zulaessige File-Typen
+  * Optimierungen in bin/multistockphoto
+* 1 bug fix
+  * --stats Fehler bei deaktivierten Sites behoben
 == 0.7.1 2008-06-16
 * 1 bug fix
   * entfernen von ueberfluessiger aldi-site fuehrte anderweitig zu Fehler

data/Manifest.txt

@@ -21,6 +21,7 @@ lib/multistockphoto/site_zoonar.rb
 lib/multistockphoto/mock_zoonar.rb
 lib/multistockphoto/site_photocase.rb
 lib/multistockphoto/site_dreamstime.rb
+lib/multistockphoto/site_bigstockphoto.rb
 lib/multistockphoto/photo.rb
 lib/multistockphoto/upload_exception.rb
 script/console

data/bin/multistockphoto

@@ -6,10 +6,18 @@ require 'multistockphoto'
 require 'RMagick'
 include Magick
 require 'exifr'
+require 'grep'
+include Grep
 
 SENDELISTE = 'sendeliste.dat'
+ROT_PREFIX = 'rot_'
 MAX_ERRORS = 3
-PICTURE_FILES = /.PNG|.JPG|.GIF|.JPEG/
+PICTURE_FILES = /(.PNG|.JPG|.GIF|.JPEG|.EPS|.AI|.PSD|.PDF|.TIF|.TIFF)$/
+
+require 'fcntl'
+
+#STDOUT.sync = true
+#STDOUT.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
 
 # alle Sites komplett bearbeitet?
 def all_sites_done(sites,n)
@@ -170,11 +178,33 @@ Choice.options do
     short '-q'
     long '--no-tags'
     desc 'List photos without tags file' #TODO: eigentlich muss man auch auf vorhandene IPTC in Photo selbst testen
+    #cast Integer
+    #default 0
     action do
       $no_tags = true
     end
   end
 
+  option :count do
+    short '-3'
+    long '--count'
+    desc 'count'
+    cast Integer
+    default 0
+    action do
+      $count_flag = true
+    end
+  end
+  
+  option :plist do
+    short '-2'
+    long '--plist'
+    desc 'Show details sending status for each picture'
+    action do
+      $plist = true
+    end
+  end
+
   option :dont_send do
     long '--dont-send'
     action do
@@ -200,51 +230,49 @@ def formatted_minutes(d)
   mm = (d / 60.0).floor
   d = d-mm*60
   ss = d.round
-  #  return sprintf("%02d:%02d:%02d",hh,mm,ss)
   return sprintf("%d:%02d",mm,ss)
 end
 
+# Hilfsmethode fuer send_all
+# false, falls keine Tags-Datei existiert oder laut Aufrufparameter --count zu wenige
+# Keywords hat.
+def not_enough_tags?(photo)
+  if $tags_only
+    if ! tagsfile?(photo.filename)
+      return true
+    else 
+      if $count_flag 
+        photo.set_keywords
+        if photo.tags.size < $count
+          return true
+        end
+      end
+    end
+  end # tags_only
+  false
+end
+
 # Senden aller noch nicht gesendeten Photos an alle Sites
 # unter Berücksichtigung sonstiger Optionsparameter
 def send_all
+  if $count_flag
+    $count = Choice.choices[:count]
+  end
   total_transfers = 0
   total = {}
   errors = {}
-  #sites = [:fotolia, :zoonar, :photocase]
   $active_sites.each {|site|
     total[site] = 0
     errors[site] = 0
   }
   puts 'sending all unsent photos'
 
-  # rotate photos
-  # - true: we do the rotation
-  # - false: the site does the rotation automatically
-  # change to false if a photo site can automatically rotate photos
-  #  rotate_photos = {
-  #    :fotolia => true,
-  #    :zoonar => true,
-  #    :photocase => true,
-  #  }
-
-#  done = {
-#    :fotolia => false,
-#    :zoonar => false,
-#    :photocase => false,
-#    :dreamstime => false,
-#  }
-#  remaining = {
-#    :fotolia => 999_999_999,
-#    :zoonar => 999_999_999,
-#    :photocase => 999_999_999,
-#    :dreamstime => 999_999_999,
-#  }
   remaining = Hash.new
   done = Hash.new
   $active_sites.each {|site| 
     done[site] = false
     remaining[site] = 999_999_999
-        }
+  }
   $active_sites.each {|site|
     # dynamisches Site.new("site")
     s = eval("#{site.to_s.capitalize}"+".new(#{site.to_s.capitalize})")
@@ -257,25 +285,30 @@ def send_all
     allfiles.sort!
   end
   allfiles.each {|filename|
-    next if File.basename(filename)[0,4] == 'rot_'
+    next if File.basename(filename)[0,4] == ROT_PREFIX
     #puts "rot_ uebersprungen"
     if filename.upcase =~ PICTURE_FILES
       total_per_site_flag = $total_per_site
       photo = Photo.new(filename)
+      next if not_enough_tags? photo
       $active_sites.each {|site_name|
         begin
           Timeout::timeout(10.0*60.0) do
             t1 = Time.now
             site = eval(site_name.to_s.capitalize+".new(#{site_name.to_s.capitalize})")
+            #            if ! site.accept?(File.extname(filename))
+            #              warn "Warning: Site (#{site_name}) does not support this file extension (#{File.extname(filename)}). Skipped"
+            #              next
+            #            end
             # site.rotate_photos = rotate_photos[site_name]
             done[site_name] = true if remaining[site_name] <= 0
             next if done[site_name]
-            if $tags_only and ! tagsfile?(photo.filename)
-#              if $verbose 
-#                puts "#{photo.filename}: no tags file. skipped."
-#              end
-              next 
+            
+            if ! site.accept?(File.extname(filename))
+              warn "Warning: Site (#{site_name}) does not support this file extension (#{File.extname(filename)}). Skipped"
+              next
             end
+            #end
             if $send_all or
                 (total_per_site_flag and 
                   total[site_name] < Choice.choices[:total_per_site])
@@ -288,8 +321,8 @@ def send_all
                     remaining[site_name] -= 1
                     done[site_name] = true if remaining[site_name] <= 0
                     errors[site_name] = 0
+                    t2 = Time.now
                     if $verbose
-                      t2 = Time.now
                       if $dont_send and $dont_log
                         puts "1:23"
                       else
@@ -298,17 +331,13 @@ def send_all
                       p total # Summenzeile ausgeben
                     end
                   end
-                rescue UploadException #Net::FTPTempError #TODO: gefaellt mir noch nicht so ganz
+                rescue UploadException 
                   errors[site_name] += 1
                   if errors[site_name] >= MAX_ERRORS
-                    done[site_name] = true # nichts mehr uploaden
+                    done[site_name] = true 
                     puts "too many errors. giving up."
                   end
-                  #            puts "FTP-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
                   puts "Upload error at sending to #{site_name} occurred. Check configuration or try again later!"
-                  #                rescue SocketError
-                  #                  puts "SocketError: no net? waiting 60 secs"
-                  #                  sleep 60
                 rescue Timeout::Error
                   puts "timeout error"
                   #timeout error
@@ -367,7 +396,7 @@ def not_sent
   }
   puts "not sent photos:"
   Dir.glob(File.join($upload_dir,'*')).each {|filename|
-    next if File.basename(filename)[0,4] == 'rot_'
+    next if File.basename(filename)[0,4] == ROT_PREFIX
     if filename.upcase =~ PICTURE_FILES
       $active_sites.each {|site|
         print filename+"\t"+site.to_s+"\t" if $verbose
@@ -428,7 +457,10 @@ def stats
   }
   count.each_pair {|k,v|
     site = k[0]
-    totals[site.to_sym] += v
+    if $active_sites.include? site.to_sym # sonst kommt es zu Fehlern bei 
+      # deaktivierten Sites
+      totals[site.to_sym] += v
+    end
     all += v
   }
   print "total      | "
@@ -445,7 +477,7 @@ def stats
   count[:tags] = 0
   count[:notags] = 0  
   Dir.glob(File.join($upload_dir,'*')).each {|filename|
-    next if File.basename(filename)[0,4] == 'rot_'
+    next if File.basename(filename)[0,4] == ROT_PREFIX
     if filename.upcase =~ PICTURE_FILES
       if tagsfile?(filename)
         count[:tags] += 1
@@ -467,7 +499,7 @@ def list_done
     $active_sites.each {|site|
       photo_sent[site] = false
     }
-    next if File.basename(filename)[0,4] == 'rot_'
+    next if File.basename(filename)[0,4] == ROT_PREFIX
     if filename.upcase =~ PICTURE_FILES
       $active_sites.each {|site|
         print filename+"\t"+site.to_s+"\t" if $verbose
@@ -506,7 +538,7 @@ def purge_done
     $active_sites.each {|site|
       photo_sent[site] = false
     }
-    next if File.basename(filename)[0,4] == 'rot_'
+    next if File.basename(filename)[0,4] == ROT_PREFIX
     if filename.upcase =~ PICTURE_FILES
       $active_sites.each {|site|
         print filename+"\t"+site.to_s+"\t" if $verbose
@@ -533,20 +565,63 @@ end
 
 # Listet alle Photo-Dateien auf, zu denen es keine .tags-Datei gibt
 def no_tags
-  sender = Sender.new("Thomas")
+  if $count_flag
+    $count = Choice.choices[:count]
+  end
   allfiles = Dir.glob(File.join($upload_dir,'*'))
   if $ordered
     allfiles.sort!
   end
   allfiles.each {|fn|
-    next if File.basename(fn)[0,4] == 'rot_'
+    next if File.basename(fn)[0,4] == ROT_PREFIX
     if fn.upcase =~ PICTURE_FILES
       if ! tagsfile?(fn)
-        #if ! sender.sent_to?(fn,:fotolia) #TODO: provisorisch
-          puts fn 
-        #end
-        
+        puts fn 
+      else
+        # es gibt eine aber zu wenige keywords
+        if $count_flag
+          photo = Photo.new(fn)
+          photo.set_keywords_without_write
+          if photo.tags.size < $count
+            puts fn + " only #{photo.tags.size} keywords"
+          end
+        end
+      end
+      
+    end
+  }
+end
+
+def plist
+  allfiles = Dir.glob(File.join($upload_dir,'*'))
+  if $ordered
+    allfiles.sort!
+  end
+  print '    '+' '*34
+  $active_sites.each {|site|
+    printf("%-10s",site)
+  }
+  puts
+  allfiles.each {|filename|
+    next if File.basename(filename)[0,4] == ROT_PREFIX
+    if filename.upcase =~ PICTURE_FILES
+      photo = Photo.new(filename)
+      photo.set_keywords_without_write
+      printf("%-30s ",filename)
+      if tagsfile?(filename)
+        printf "(t %2d) ", photo.tags.size
+      else
+        print '       '
       end
+      $active_sites.each {|site|
+        g = grep(SENDELISTE, /#{site.to_s}\t#{filename}/)
+        if g.size == 0
+          print ' '*10
+        else
+          print '+'+' '*9
+        end
+      }
+      puts
     end
   }
 end
@@ -584,3 +659,6 @@ if $no_tags
   no_tags
 end
 
+if $plist
+  plist
+end

data/config.yaml

@@ -4,6 +4,7 @@
 - :zoonar
 - :photocase
 - :dreamstime
+- :bigstockphoto
 :zoonar: 
   :user: 'hugo'
   :password: 'lalala'
@@ -24,3 +25,9 @@
   :ftp_user: 'martha12345'
   :ftp_password: 'ftpgeheimmartha'
   :total_per_day: 1
+:bigstockphoto: 
+  :user: 'dennis'
+  :password: 'dennisgeheim'
+  :ftp_user: 'dennis12345'
+  :ftp_password: 'ftpgeheimdennis'
+  :total_per_day: 1

data/lib/multistockphoto/photo.rb

@@ -50,30 +50,56 @@ class Photo
         pic.auto_orient!
         puts "rotating picture, writing to #{tmpname}"
         pic.write(tmpname)
-        
       end
       @rotated_filename = tmpname
     end
   end
 
   # setzt IPTC-Keywords, enthalten in Datei <imagefilename>.tags
-  def set_keywords
+  # wenn from_lang und to_lang uebergeben, dann Uebersetzung der Keywords
+  # z.B. set_keywords(:de,:en)
+  def set_keywords(from_lang=nil,to_lang=nil)
     ext = File.extname(@filename)
+    if ext.upcase != '.JPG' and ext.upcase != '.JPEG'
+      warn "cannot set Exif-Header with non-JPEG file #{@filename}"
+      return
+    end
     fn = @filename.sub(ext,".tags")
     lines=[]
     begin
       File.open(fn) {|f|
         lines = f.read
       }
-      puts "tags file #{fn} found"
       tags = Photo.to_tags(lines)
+      if from_lang and to_lang
+        tags = translate_tags(tags,from_lang,to_lang)
+      end
       self.tags = tags
-      print "writing tags to file ... "
-      $stdout.flush
+      #print "writing tags to file ... "
+      #$stdout.flush
       write_keywords
-      puts "done"
+      #puts "done"
     rescue Errno::ENOENT
-      warn "WARNING: no tags file #{fn}"
+      #warn "WARNING: no tags file #{fn}"
+    end
+  end    
+ 
+  def set_keywords_without_write(from_lang=nil,to_lang=nil)
+    ext = File.extname(@filename)
+    fn = @filename.sub(ext,".tags")
+    lines=[]
+    begin
+      File.open(fn) {|f|
+        lines = f.read
+      }
+      #puts "tags file #{fn} found"
+      tags = Photo.to_tags(lines)
+      if from_lang and to_lang
+        tags = translate_tags(tags,from_lang,to_lang)
+      end
+      self.tags = tags
+    rescue Errno::ENOENT
+      #warn "WARNING: no tags file #{fn}"
     end
   end    
  
@@ -82,15 +108,6 @@ class Photo
     tags
   end
  
-  # erstellt Key-Array aus String (getrennt durch newline,',' oder ' ')
-  def self.to_tags(s)
-    keys = []
-    s.split(/[, |\t\n]+/).each {|w|
-      keys << w
-    }
-    keys
-  end
-  
   # ermittelt Keywords aus Datei
   def file_keywords
     photo = MiniExiftool.new @filename
@@ -101,18 +118,20 @@ class Photo
   # schreibt Keywords in Datei-Header
   def write_keywords
     photo = MiniExiftool.new @filename
-    s = ''
-    tags.each {|tag|
-      if s == ''
-        s = s + tag
-      else
-#        s = s + ' ' + tag
-# lieber durch Komma trennen, da sonst das Formular z.B. bei fotolia nicht
-# richtig gefüllt wird
-        s = s + ',' + tag
-      end
-    }
-    photo['keywords'] = s
+    #s = ''
+    #tags.each {|tag|
+    #if s == ''
+    #s = s + tag
+    #else
+    ##        s = s + ' ' + tag
+    ## lieber durch Komma trennen, da sonst das Formular z.B. bei fotolia nicht
+    ## richtig gefüllt wird
+    #s = s + ',' + tag
+    #end
+    #}
+    # lieber durch Komma trennen, da sonst das Formular z.B. bei fotolia nicht
+    # richtig gefüllt wird
+    photo['keywords'] = tags.join(',')
     
     #TODO:
     photo['title'] = 'Testtitel'
@@ -120,4 +139,51 @@ class Photo
     photo.save
   end
 
+  private
+
+  # erstellt Key-Array aus String (getrennt durch newline,',' oder ' ')
+  def self.to_tags(s)
+    keys = []
+    s.split(/[, |\t\n]+/).each {|w|
+      keys << w
+    }
+    keys
+  end
+  
+  
+  # uebersetzt Tags von 'from_lang' nach 'to_lang'
+  # bisher realisiert: :de -> :en
+  # Achtung: bisher nur experimentell. Nicht verwenden!
+  def translate_tags(tags, from_lang, to_lang)
+    new_tags = []
+    tags.each {|tag|
+      new_tags << translate_tag(tag,from_lang,to_lang)
+    }
+    return new_tags
+  end
+
+  # uebersetzt ein Tag von 'from_lang' nach 'to_lang'
+  # bisher realisiert: :de -> :en
+  # Achtung: bisher nur experimentell. Nicht verwenden!
+  def translate_tag(tag,from_lang,to_lang)
+    if from_lang == :de and to_lang == :en
+      case tag
+      when 'Baum'
+        'tree'
+      when 'Berlin'
+        'Berlin'
+      when 'gwb'
+        'gwb'
+      when 'Blume'
+        'flower'
+      when 'Biene'
+        'bee'
+      else
+        raise "unknown translation for '#{tag}' (#{from_lang} #{to_lang})"
+      end
+    else 
+      raise "unknown translation codes: #{from_lang} #{to_lang}"
+    end
+  end
+ 
 end

data/lib/multistockphoto/sender.rb

@@ -28,7 +28,7 @@ class Sender
   end
   
   # wurde dieses File schon an diese Site gesendet?
-  def sent_to?(p_filename,p_site)
+  def sent_to?(p_filename,p_site) #TODO:
     sendeliste = 'sendeliste.dat' #TODO:
     result = false
     File.open(sendeliste) {|f|

data/lib/multistockphoto/site_bigstockphoto.rb

@@ -0,0 +1,121 @@
+require 'net/ftp'
+
+class Bigstockphoto < GenericSite
+  
+  @@errors = 0
+  
+  attr_reader :total_per_day
+  attr_accessor :ftp_user, :ftp_password, :max_errors
+  
+  FTP_HOST = 'bigstockphoto.com'
+  SITENAME = 'bigstockphoto'
+  
+  def initialize(name)
+    super
+    @config = load_config
+    begin
+      @user = @config[:bigstockphoto][:user]
+      @password = @config[:bigstockphoto][:password]
+      @ftp_user = @config[:bigstockphoto][:ftp_user]
+      @ftp_password = @config[:bigstockphoto][:ftp_password]
+      @total_per_day = @config[:bigstockphoto][:total_per_day]
+    rescue
+      puts 'cannot read configuration entries of '+SITENAME
+    end
+  end
+  
+  def transfer(photo, dont_send=nil, dont_log=nil)
+    # falls nicht in config Datei eingetragen dann nicht senden
+    if @user == nil or @password == nil
+      return
+    end
+    unless photo.class == Photo
+      raise 'not a Photo object'
+    end
+    unless File.exist?(photo.filename)
+      raise "file #{photo.filename} does not exist"
+    end
+    if @ftp_user == nil or @ftp_password == nil
+      raise "ftp_user/ftp_password not set"
+    end
+    print "#{SITENAME}:#{photo.filename} ... "
+    $stdout.flush
+if already_sent_site?(photo,SITENAME)    
+      puts "already sent"
+      return :duplicate
+    end
+    if photo.portrait? and ! Bigstockphoto.can_handle_orientation?
+      photo.drehen
+    end
+    if site_can_handle_keywords?
+      photo.set_keywords(:de,:en) # Keywords uebersetzen
+    end
+    if ! dont_send
+      begin
+        ftp = Net::FTP.new(FTP_HOST)
+        ftp.login(@ftp_user,@ftp_password) 
+        files=ftp.list('*')
+        if photo.portrait?
+          #p photo.rotated_filename
+          res = ftp.putbinaryfile(photo.rotated_filename)
+        else
+          res = ftp.putbinaryfile(photo.filename)
+        end
+        files =ftp.list('*')
+        #p files
+        ftp.close
+      rescue Errno::EPIPE
+        raise UploadException
+      end
+    end
+    @@errors = 0
+    puts 'OK'
+    if ! dont_log
+      File.open(SENDLIST,'a') {|f|
+        f.puts "#{SITENAME}\t#{photo.filename}\t#{Time.now}"
+      }
+    end
+    true
+  end
+  
+  # Anzahl heute schon gesendeter Photos
+  def sent_today
+    site = SITENAME
+    return sent_today_site(site)
+  end
+
+  # wurde dieses Photo schon gesendet?  
+  def already_sent?(photo)
+    already_sent_site?(photo,SITENAME) 
+  end
+
+  # can site handle orientation?
+  def self.can_handle_orientation?
+    false #TODO: pruefen!
+  end
+  
+  # Site akzeptiert diese Extension
+  def self.accept?(ext)
+    ext = ext.downcase
+    if ext[0,1] == '.'
+      ext = ext[1..-1]
+    end
+    case ext
+    when 'jpg','jpeg','eps','ai','psd','png','pdf'
+      return true
+    else 
+      return false
+    end
+  end
+  
+  def accept?(ext)
+    Bigstockphoto.accept?(ext)  
+  end
+  
+  private
+  
+  def site_can_handle_keywords?
+    true #TODO: pruefen!
+  end
+  
+end # class