multistockphoto 0.8.1 → 0.9.0

data/History.txt

@@ -1,4 +1,18 @@
+== 0.9.0 2009-07-08
+
+* 4 bugfixes
+  * Laeuft jetzt mit Ruby 1.9
+  * Login-Prozedur bei photocase angepasst
+  * Abhaengigkeit von gem 'mini_exiftool' hat gefehlt
+  * Abhaengigkeit von gem 'exifr' hat gefehlt
+
+== 0.8.2 2008-12-30
+
+* 1 bugfix
+  * Abhaengigkeit von gem 'choice' hat gefehlt
+
 == 0.8.1 2008-12-30
+
 * 1 enhancement
   * doppelte Tags in Datei nicht mehrfach zaehlen
   * photocase: bessere Fehleranalyse, falls Upload-Fehler

data/bin/multistockphoto

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+# encoding: utf-8
 require 'rubygems'
 require 'choice'
 require 'multistockphoto'
@@ -20,7 +20,72 @@ require 'fcntl'
 #STDOUT.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
 
 require 'logger'
-$log = Logger.new('multistockphoto.log', 'daily', 30)
+# $log = Logger.new('multistockphoto.log', 'daily', 30)
+# $log = Logger.new('multistockphoto.log', 5, 1024000)
+# $log = Logger.new('multistockphoto.log', 'daily', 7)
+
+
+class Fixnum
+
+  def to_german_word
+    raise "Sorry, I can only count from 1 to 999999." if self < 1 || self > 999999
+    self.to_german + (self % 100 == 1 ? "s" : "")
+  end
+
+  protected
+
+  def to_german
+    words = {
+      0     => "",
+      1     => "ein",
+      2     => "zwei",
+      3     => "drei",
+      4     => "vier",
+      5     => "fünf",
+      6     => "sechs",
+      7     => "sieben",
+      8     => "acht",
+      9     => "neun",
+      10    => "zehn",
+      11    => "elf",
+      12    => "zwölf",
+      16    => "sechzehn",
+      17    => "siebzehn",
+      20    => "zwanzig",
+      30    => "dreissig",
+      40    => "vierzig",
+      50    => "fünfzig",
+      60    => "sechzig",
+      70    => "siebzig",
+      80    => "achtzig",
+      90    => "neunzig",
+      :join      => "und",
+      :hundred   => "hundert",
+      :thousand  => "tausend",
+    }
+
+    if words[self]
+      words[self]
+    elsif self < 20
+      (self % 10).to_german + words[10]
+    elsif self < 100
+      (self % 10).to_german + words[:join] + ((self / 10) * 10).to_german
+    elsif self < 1000
+      (self / 100).to_german + words[:hundred] + (self % 100).to_german
+    elsif self < 1000000
+      (self / 1000).to_german + words[:thousand] + (self % 1000).to_german
+    end
+  end
+
+end
+
+
+# test
+=begin
+1.upto(999999) do |n|
+  puts "#{n.to_s}: #{n.to_german_word}"
+end
+=end
 
 # alle Sites komplett bearbeitet?
 def all_sites_done(sites,n)
@@ -417,6 +482,11 @@ def send_all
     end
   }
   puts "#{total_transfers} photos sent."
+if total_transfers == 0
+	puts "keine photos gesendet"
+else
+	puts "#{total_transfers.to_german_word} photos gesendet}"
+end
 end
 
 # gibt Orientation aller uebergebenen Bilddateien aus

data/lib/multistockphoto/site_aldi.rb

@@ -0,0 +1,82 @@
+class Aldi < GenericSite
+  
+  def initialize(name)
+    p "creating an ALDI object"
+    super
+    if ENV['MSP_CONFIG']
+      @config = YAML.load_file(ENV['MSP_CONFIG'])
+      p "meine config: #{ENV['MSP_CONFIG']}"
+    else
+      p "standard config"
+      @config = YAML.load_file("config.yaml")
+    end
+    @user = @config[:aldi][:user]
+    @password = @config[:aldi][:password]
+    # kann vom Client ueberschrieben werden
+  end
+
+  def transfer(photo)
+    # 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
+    puts "zoonar:#{photo.filename}"
+    g = `grep "zoonar\t#{photo.filename}" sendeliste.dat`
+    if g.size > 0
+      #puts "INFO: already sent to zoonar"
+      return :duplicate
+    end
+
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = 'Linux Mozilla'
+    page = agent.get 'https://shop.aldi-fotoservice-druck.de/shop/viewLoginForm.do'
+    
+    if page.body.include?('Login/Neuanmeldung')
+      p 'bin auf Login-Seite'
+    end
+    form = page.forms.first #TODO: besser nach Name
+    form.username  = @config[:aldi][:user]
+    form.password  = @config[:aldi][:password] 
+    p form.username
+    p form.password
+    page = agent.submit form
+    if page.body.include?('Ihre Benutzerdaten')
+      p 'bin auf Benutzerdaten-Seite'
+    else
+      html_out(page.body,'out.html')
+    end
+    page = agent.click page.links.text('zum Direkt-Upload')
+#    if page.body.include?('Ihr Warenkorb ist leer.')
+#      p 'bin beim leeren Warenkorb'
+#    end
+# #   page = agent.get('https://shop.aldi-fotoservice-druck.de/shop/viewUploadForm.do')
+#    page = agent.click page.links.text(/viewUploadForm/)
+    if page.body.include?('Bilddateien und Zip-Archive einzeln hochladen')
+      p 'bin auf Upload-Seite'
+    end
+    form = page.forms.first #TODO: besser nach Name
+    pp form
+    #form.file_1 = photo.filename
+    pp form.file_uploads.name('file_1').first
+    form.file_uploads.name('file_1').first.file_name = photo.filename
+    pp form.file_uploads.name('file_1').first
+    #pp form
+    ##TODO: derzeit sind in diesem Formular bis zu 5 Photos gleichzeitig moeglich
+    page = agent.submit form
+    if page.body.include?('Ihr Auftrag')
+      p "bin auf Auftrag-Anzeigeseite"
+      html_out(page.body,'out.html')
+    end
+  end
+  
+  def html_out(body,html_file)
+    File.open(html_file,"w") {|f| f.print body}
+  end
+end

data/lib/multistockphoto/site_fotolia.rb

@@ -50,7 +50,7 @@ class Fotolia < GenericSite
     if site_can_handle_keywords?
       photo.set_keywords
     end
-    if ! dont_send
+    unless dont_send
       begin
         ftp = Net::FTP.new(FTP_HOST)
         ftp.login(@ftp_user,@ftp_password) 
@@ -139,4 +139,4 @@ class Fotolia < GenericSite
     true
   end
   
-end # class
+end # class

data/lib/multistockphoto/site_istockphoto.rb

@@ -0,0 +1,15 @@
+# require 'net/ftp'
+=begin
+Istockphoto stellt dermassen hohe Einstiegshuerden auf:
+1. Bewerbung mit 3 der eigenen besten Photos, bevor man aufgenommen wirde
+2. Kopie Ausweis oder Pass zwingend vorgeschrieben (meinen die, ich würde für
+jemand anderen meine Photos verkaufen? Werde ich nicht im eigenen Interesse
+meine richtigen Daten angeben, damit ich auch Kohle bekomme?)
+
+dass ich erstmal darauf verzichtet habe, Istockphoto hier mit aufzunehmen.
+Aufgeschoben ist aber nicht aufgehoben. Ich werde irgenwann mal darauf zurückkommen.
+
+=end
+class Itockphoto < GenericSite
+  
+end # class

data/lib/multistockphoto/site_photocase.rb

@@ -26,7 +26,6 @@ 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
@@ -55,130 +54,143 @@ 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 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
-      rescue  Net::HTTPInternalServerError, WWW::Mechanize::ResponseCodeError
-        #         Net::HTTPInternalServerError (WWW::Mechanize::ResponseCodeError)
-        raise UploadException
-      end # rescue
-    else
-      puts "OK"
-    end
-    #'Your photo was uploaded successfully.'
-    if sav_photo_filename != photo.filename
-      raise "photo.filenames has been changed!"
-    end
+				agent.user_agent_alias = 'Linux Mozilla'
+				begin
+					page = agent.get 'http://www.photocase.de/en/login.asp'
+				rescue ArgumentError
+					warn "ArgumentError error in mechanize-gem"
+					warn "TODO: mechanize should fix this problem"
+					warn "skipping file"
+					raise UploadException
+				end
+				if !page.body.include?('Log in')
+					raise UploadException, 'not at the login page'
+				end
+			end
+			# form = page.forms.first #TODO: besser nach Name
+			form = page.forms[1] #TODO: es ist jetzt das zweite Formular
+			#    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")) and
+                           (! page.body.include?("Einloggen erfolgreich"))
+                        #2009-07-08 Fehlermeldung kommt jetzt in deutsch
+                          
+			# obiges kommt anscheinend seit 1.8.2008 nicht mehr auf der Seite.
+			# mit folgendem ersetzt
+			# 2009-06-26: scheint doch wieder zu kommen
+			# if ! page.body.include?('<div id="loggedIn">')
+				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
+			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
+			#        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
+#		rescue  Net::HTTPInternalServerError, WWW::Mechanize::ResponseCodeError
+#			#         Net::HTTPInternalServerError (WWW::Mechanize::ResponseCodeError)
+#			raise UploadException
+#		rescue Iconv::IllegalSequence
+#			warn "Iconv::IllegalSequence error in mechanize-gem"
+#			warn "TODO: mechanize should fix this problem"
+#			warn "skipping file"
+#			raise UploadException
+#		end # rescue
+	else
+		puts "OK"
+	end
+	#'Your photo was uploaded successfully.'
+	if sav_photo_filename != photo.filename
+		raise "photo.filenames has been changed!"
+	end
     
-    unless dont_log
-      File.open(SENDLIST,'a') {|f|
-        f.puts "#{SITENAME}\t#{photo.filename}\t#{Time.now}"
-      }
-    end
-    $log.debug 'Photocase#transfer END'
-    true
-  end
+	unless 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
+# 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
+# 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
+# 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' #TODO: pruefen
-      return true
-    else 
-      return false
-    end
-  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' #TODO: pruefen
+		return true
+	else
+		return false
+	end
+end
   
-  def accept?(ext)
-    Photocase.accept?(ext)  
-  end
+def accept?(ext)
+	Photocase.accept?(ext)
+end
   
-  private 
+private 
   
-  def site_can_handle_keywords?
-    true # TODO: ueberpruefen, ob richtig?
-  end
-end
+def site_can_handle_keywords?
+	true # TODO: ueberpruefen, ob richtig?
+end
+end