multistockphoto 0.8.0 → 0.8.1

data/lib/multistockphoto/photo.rb

@@ -5,17 +5,19 @@ include Magick
 
 class Photo
   attr_reader :filename, :rotated_filename
-  attr_accessor :tags
+  attr_accessor :tags, :title, :description
 
   def initialize(filename)
     @filename = filename
     @tags = nil
+    @title = nil
+    @description = nil
   end
   
   # ist Bild im Hochformat 
   # TODO: paßt dieser Test für alle gedrehten Bilder?
   def portrait?
-    if false
+    if false # vorher
       pic = ImageList.new(@filename)
       if pic.orientation == LeftBottomOrientation
         return true
@@ -77,13 +79,15 @@ class Photo
       self.tags = tags
       #print "writing tags to file ... "
       #$stdout.flush
-      write_keywords
+      write_attributes
       #puts "done"
     rescue Errno::ENOENT
       #warn "WARNING: no tags file #{fn}"
     end
   end    
  
+  # setzt Keywords in Photo-Objekt, schreibt aber nicht in Datei.
+  # Aus Performanzgründen (z.B. bei --plist)
   def set_keywords_without_write(from_lang=nil,to_lang=nil)
     ext = File.extname(@filename)
     fn = @filename.sub(ext,".tags")
@@ -94,6 +98,10 @@ class Photo
       }
       #puts "tags file #{fn} found"
       tags = Photo.to_tags(lines)
+#      tags.each_with_index {|tag,i|
+#        p tag
+#        p i
+#      }
       if from_lang and to_lang
         tags = translate_tags(tags,from_lang,to_lang)
       end
@@ -112,40 +120,46 @@ class Photo
   def file_keywords
     photo = MiniExiftool.new @filename
     self.tags = photo.tags
+    self.title = photo.title
     photo.keywords
   end
   
-  # schreibt Keywords in Datei-Header
-  def write_keywords
+  # schreibt Keywords und Titel in Datei-Header
+  def write_attributes
     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
-    #}
     # lieber durch Komma trennen, da sonst das Formular z.B. bei fotolia nicht
     # richtig gefüllt wird
+    # Die jetzige Lösung funktioniert bei: Fotolia, Zoonar (die restliche konnte
+    # ich noch nicht überprüfen, da ich dort noch kein einziges Photo durchbekommen
+    # habe :-(
     photo['keywords'] = tags.join(',')
-    
     #TODO:
-    photo['title'] = 'Testtitel'
-    
+    photo['title'] = self.title
     photo.save
   end
 
+  def width
+    photo = MiniExiftool.new @filename
+    
+    42
+  end
+  
+  def height
+    42
+  end
+  
+  
+  def file_title
+    @title
+  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 << w if w[0,2].downcase != 't:'
     }
     keys
   end
@@ -167,19 +181,36 @@ class Photo
   # 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})"
+      if File.exist?('translation_de_en.dat') # uebersetzungsdatei_existiert
+        # puts "translation file :de :en found"
+        found = false
+        result = nil
+        File.open('translation_de_en.dat') { |file|
+          file.each_line() { |line|  
+            first,second = line.split(':')
+            if first == tag 
+              result = second 
+              found = true
+            end
+          }   
+        }
+        raise "unknown translation for '#{tag}' (#{from_lang} #{to_lang})" if not found
+        return result
+        #      else
+        #        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
       end
     else 
       raise "unknown translation codes: #{from_lang} #{to_lang}"

data/lib/multistockphoto/sender.rb

@@ -12,7 +12,11 @@ class Sender
   # gibt ein Array in Form [:fotolia,:zoonar,:photocase] zurueck
   def active_sites
     if ENV['MSP_CONFIG']
+      if File.exist? ENV['MSP_CONFIG']
       @config = YAML.load_file(ENV['MSP_CONFIG'])
+      else
+        @config = YAML.load_file("config.yaml")
+      end
     else
       @config = YAML.load_file("config.yaml")
     end

data/lib/multistockphoto/site_fotolia.rb

@@ -101,7 +101,7 @@ class Fotolia < GenericSite
       ext = ext[1..-1]
     end
     case ext
-    when 'jpg','jpeg'  #TODO: pruefen     
+    when 'jpg','jpeg','svg'  #TODO: pruefen     
       return true
     else 
       return false
@@ -112,6 +112,27 @@ class Fotolia < GenericSite
     Fotolia.accept?(ext)  
   end
   
+  def photosize_valid?(photo)
+    return true # TODO: provisorisch
+    if File.extname(photo.filename).downcase == '.jpeg' or
+      File.extname(photo.filename).downcase == '.jpg'
+    # JPEG-Datei mit mind. 4 MP (Megapixel).
+      if photo.width*photo.height > 3 * 3_000_000
+        return true
+      else
+        return false
+      end
+    elsif File.extname(photo.filename).downcase == '.svg'
+      # SVG-Datei mit maximal 1 MB (Megabyte).
+      if photo.size <= 1024*1024
+        return true
+      else
+        return false
+      end
+    end
+    
+  end
+  
   private
   
   def site_can_handle_keywords?

data/lib/multistockphoto/site_panthermedia.rb

@@ -0,0 +1,132 @@
+require 'net/ftp'
+
+=begin
+Das hier schreibt Panthermedia:
+Wichtig:
+- Umlaute und Sonderzeichen im Dateinamen vermeiden
+- Bitte nur JPG-Dateien (max. Größe: 12 MB) hochladen
+- Bilder im FTP-Ordner nach spätestens 7 Tagen bearbeiten/entfernen
+- Ihr verfügbarer FTP-Speicher: 150 MB (bitte nicht überschreiten)
+- Bitte keine Verzeichnisse im FTP-Ordner anlegen
+
+TODO: Groesse der Datei testen - ist aber momentan kein kritischer Wert fuer mich
+=end
+class Panthermedia < GenericSite
+  
+  @@errors = 0
+  
+  attr_reader :total_per_day, :user, :password # user/password wird aber eigentlich nicht benoetigt
+  attr_accessor :ftp_user, :ftp_password, :max_errors
+  
+  FTP_HOST = 'panthermedia.net'
+  SITENAME = 'panthermedia'
+  
+  def initialize(name)
+    super
+    @config = load_config
+    begin
+      @user = @config[:panthermedia][:user]
+      @password = @config[:panthermedia][:password]
+      @ftp_user = @config[:panthermedia][:ftp_user]
+      @ftp_password = @config[:panthermedia][:ftp_password]
+      @total_per_day = @config[:panthermedia][: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 ! Panthermedia.can_handle_orientation?
+      photo.drehen
+    end
+    if site_can_handle_keywords?
+      photo.set_keywords
+    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,Net::FTPTempError
+        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
+  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'
+      return true
+    else 
+      return false
+    end
+  end
+  
+  def accept?(ext)
+    Panthermedia.accept?(ext)  
+  end
+  
+  private
+  
+  def site_can_handle_keywords?
+    true
+  end
+  
+end # class

data/lib/multistockphoto/site_photocase.rb

@@ -26,6 +26,7 @@ class Photocase < GenericSite
   end
   
   def transfer(photo,dont_send=false,dont_log=false)
+    $log.debug 'Photocase#transfer BEGIN'
     sav_photo_filename = photo.filename.dup
     # falls nicht in config Datei eingetragen dann nicht senden
     if @user == nil or @password == nil
@@ -38,7 +39,7 @@ class Photocase < GenericSite
     unless File.exist?(photo.filename)
       raise "file #{photo.filename} does not exist"
     end
-    print "#{SITENAME}:#{photo.filename} ... "
+    print "checking #{SITENAME}:#{photo.filename} ... "
     $stdout.flush
     if already_sent_site?(photo,SITENAME)
       puts 'already sent'
@@ -53,58 +54,78 @@ class Photocase < GenericSite
 
     if ! dont_send
       begin
-      agent = WWW::Mechanize.new
-      agent.user_agent_alias = 'Linux Mozilla'
-      page = agent.get 'http://www.photocase.de/en/login.asp'
-      if !page.body.include?('Log in')
-        raise 'not at the login page'
-      end
-      form = page.forms.first #TODO: besser nach Name
-      #    form['loginForm[Username]']  = @config[:zoonar][:user]
-      #    form['loginForm[Password]']  = @config[:zoonar][:password] 
-      form['UserName']  = @config[:photocase][:user]
-      form['UserPassword']  = @config[:photocase][:password] 
-      #UserName
-      #UserPassword
-      page = agent.submit form
-      raise "login error" if ! page.body.include?("Login successful")
-      page = agent.click page.links.text('Upload')
-      raise "no Upload a photo" if ! page.body.include?('Upload a photo')
-      form = page.form('Form')
-      if photo.portrait?
-        form.file_uploads.first.file_name = photo.rotated_filename
-        #        b = File.basename(photo.filename)
-        #        newfilename = photo.filename.sub(b,'')+'rot_'+b
-        #        #      form.file_uploads.first.file_name = 'r' + photo.filename
-        #        form.file_uploads.first.file_name = newfilename
-      else
-        form.file_uploads.first.file_name = photo.filename
-      end
-      #TODO:
-      # 2 Checkboxen
-      #UploadDisclaimerAccepted
-      #HasCopyright
-      form.checkboxes.name('UploadDisclaimerAccepted').check
-      form.checkboxes.name('HasCopyright').check
-      page = agent.submit form
-      if !page.body.include?('Your photo was uploaded successfully.')
-        raise "not successfully uploaded"
-      end
-      if page.body.include?('Your photo was uploaded successfully.')
-        @@errors = 0
-        puts "OK"
-      else
-        #Fehler aufgetreten
-        @@errors += 1
-        if @@errors > 3
-          raise "too many errors"
+        agent = WWW::Mechanize.new
+        agent.user_agent_alias = 'Linux Mozilla'
+        page = agent.get 'http://www.photocase.de/en/login.asp'
+        if !page.body.include?('Log in')
+          raise UploadException, 'not at the login page'
+        end
+        form = page.forms.first #TODO: besser nach Name
+        #    form['loginForm[Username]']  = @config[:zoonar][:user]
+        #    form['loginForm[Password]']  = @config[:zoonar][:password] 
+        form['UserName']  = @config[:photocase][:user]
+        form['UserPassword']  = @config[:photocase][:password] 
+        #UserName
+        #UserPassword
+        page = agent.submit form
+        # raise "login error" if ! page.body.include?("Login successful")
+        # if ! page.body.include?("Login successful")
+        # obiges kommt anscheinend seit 1.8.2008 nicht mehr auf der Seite.
+        # mit folgendem ersetzt
+        if ! page.body.include?('<div id="loggedIn">')
+          $log.debug page.body
+          raise UploadException, "login error" 
+        end
+        # old mechanize version: page = agent.click page.links.text('Upload')
+        page = agent.click page.link_with(:text => 'Upload')
+        if page.body.include?('Upload a photo') or
+            page.body.include?('Foto hochladen')
+          true # alles OK
+        else          
+          raise UploadException, "no 'Upload a photo' on page"
+        end
+        $log.debug 'bin auf der Upload-Seite'
+        form = page.form('Form')
+        if photo.portrait?
+          form.file_uploads.first.file_name = photo.rotated_filename
+          #        b = File.basename(photo.filename)
+          #        newfilename = photo.filename.sub(b,'')+'rot_'+b
+          #        #      form.file_uploads.first.file_name = 'r' + photo.filename
+          #        form.file_uploads.first.file_name = newfilename
+        else
+          form.file_uploads.first.file_name = photo.filename
+        end
+        #TODO:
+        # 2 Checkboxen
+        #UploadDisclaimerAccepted
+        #HasCopyright
+        # old syntax of mechanize gem:       form.checkboxes.name('UploadDisclaimerAccepted').check
+        form.checkbox_with(:name => 'UploadDisclaimerAccepted').check
+        # old syntax of mechanize gem: form.checkboxes.name('HasCopyright').check
+        form.checkbox_with(:name => 'HasCopyright').check
+        page = agent.submit form
+        $log.debug 'nach Uploadformular'
+        $log.debug page.body
+        #        if !page.body.include?('Your photo was uploaded successfully.') and
+        #           !page.body.include?('Dein Foto wurde erfolgreich hochgeladen')
+        #          raise "not successfully uploaded"
+        #        end
+        if page.body.include?('Your photo was uploaded successfully.') or
+            page.body.include?('Dein Foto wurde erfolgreich hochgeladen')
+          @@errors = 0
+          puts "OK"
+        else
+          #Fehler aufgetreten
+          @@errors += 1
+          if @@errors > 3
+            raise "too many errors"
+          end
         end
-      end
       rescue  Net::HTTPInternalServerError, WWW::Mechanize::ResponseCodeError
-#         Net::HTTPInternalServerError (WWW::Mechanize::ResponseCodeError)
-raise UploadException
+        #         Net::HTTPInternalServerError (WWW::Mechanize::ResponseCodeError)
+        raise UploadException
       end # rescue
-      else
+    else
       puts "OK"
     end
     #'Your photo was uploaded successfully.'
@@ -117,6 +138,7 @@ raise UploadException
         f.puts "#{SITENAME}\t#{photo.filename}\t#{Time.now}"
       }
     end
+    $log.debug 'Photocase#transfer END'
     true
   end
   
@@ -129,15 +151,6 @@ raise UploadException
   # wurde dieses Photo schon gesendet?  
   def already_sent?(photo)
     already_sent_site?(photo,SITENAME)
-    #
-    #    unless photo.class == Photo
-    #      raise 'not a Photo object'
-    #    end
-    #    unless File.exist?(photo.filename)
-    #      raise "file #{photo.filename} does not exist"
-    #    end
-    #    g = grep(SENDLIST, /photocase\t#{photo.filename}/)
-    #    return g.size > 0
   end
   
   # can site handle orientation?

data/lib/multistockphoto/site_zoonar.rb

@@ -67,7 +67,8 @@ class Zoonar < GenericSite
 
       page = agent.submit form
       raise "login error" if ! page.body.include?("Hallo, #{@config[:zoonar][:user]}!")
-      page = agent.click page.links.text('Bilder hochladen')
+      # old syntax of mechanize: page = agent.click page.links.text('Bilder hochladen')
+      page = agent.click page.link_with(:text => 'Bilder hochladen')
       raise "nicht auf Upload-Seite" if ! page.body.include?('bertragen Sie Ihre Bilder einzeln mit Hilfe Ihres Internet-Browsers,')
       form = page.form('fUploadResource')
       if photo.portrait?
@@ -89,7 +90,7 @@ class Zoonar < GenericSite
         end
       end
       @@errors = 0
-      "Es ist ein Fehler aufgetreten!
+      fehlermeldung_falls_bild_zu_klein = "Es ist ein Fehler aufgetreten!
 
 Bei der Übertragung des Bildes ist ein Fehler aufgetreten.
 

data/lib/multistockphoto/version.rb

@@ -2,7 +2,7 @@ module Multistockphoto #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/multistockphoto.rb

@@ -17,6 +17,7 @@ require 'multistockphoto/site_zoonar'
 require 'multistockphoto/site_photocase'
 require 'multistockphoto/site_dreamstime'
 require 'multistockphoto/site_bigstockphoto'
+require 'multistockphoto/site_panthermedia'
 
 
 require 'multistockphoto/upload_exception'