multistockphoto 0.6.2 → 0.7.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.7.0 2008-06-16
+* 1 major enhancement
+  * neue Site Dreamstime erstellt
+* 3 minor enhancements
+  * --stats listet zusaetzlich Anzahl Photos mit/ohne tags file auf + Anteil
+  * neue Methode Sender#sent_to?(fn,site)
+  * site_* Klassen etwas allgemeiner gehalten, so daß man leichter neue kopieren kann
+
 == 0.6.2 2008-06-14
 * 3 minor enhancements
   * new method Sitename.can_handle_orientation?

data/Manifest.txt

@@ -20,7 +20,7 @@ lib/multistockphoto/site_fotolia.rb
 lib/multistockphoto/site_zoonar.rb
 lib/multistockphoto/mock_zoonar.rb
 lib/multistockphoto/site_photocase.rb
-lib/multistockphoto/site_aldi.rb
+lib/multistockphoto/site_dreamstime.rb
 lib/multistockphoto/photo.rb
 lib/multistockphoto/upload_exception.rb
 script/console

data/bin/multistockphoto

@@ -227,16 +227,24 @@ def send_all
   #    :photocase => true,
   #  }
 
-  done = {
-    :fotolia => false,
-    :zoonar => false,
-    :photocase => false,
-  }
-  remaining = {
-    :fotolia => 999_999_999,
-    :zoonar => 999_999_999,
-    :photocase => 999_999_999,
-  }
+#  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})")
@@ -263,9 +271,9 @@ def send_all
             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
+#              if $verbose 
+#                puts "#{photo.filename}: no tags file. skipped."
+#              end
               next 
             end
             if $send_all or
@@ -431,6 +439,25 @@ def stats
   fmt = "%#{"total".length}d"
   printf(fmt, all)
   puts
+  
+  #Photos mit/ohne tags-file
+  count = Hash.new
+  count[:tags] = 0
+  count[:notags] = 0  
+  Dir.glob(File.join($upload_dir,'*')).each {|filename|
+    next if File.basename(filename)[0,4] == 'rot_'
+    if filename.upcase =~ PICTURE_FILES
+      if tagsfile?(filename)
+        count[:tags] += 1
+      else
+        count[:notags] += 1
+      end  
+    end
+  }
+  puts "#{count[:tags]+count[:notags]} files"
+  puts "#{count[:tags]} files with tags file"
+  puts "#{count[:notags]} files without tags file"
+  puts "#{count[:tags].to_f/(count[:tags]+count[:notags]).to_f*(100.0)} %"
 end
 
 # listet Bilddateien auf, die an alle Sites gesendet wurden
@@ -506,6 +533,7 @@ end
 
 # Listet alle Photo-Dateien auf, zu denen es keine .tags-Datei gibt
 def no_tags
+  sender = Sender.new("Thomas")
   allfiles = Dir.glob(File.join($upload_dir,'*'))
   if $ordered
     allfiles.sort!
@@ -513,7 +541,12 @@ def no_tags
   allfiles.each {|fn|
     next if File.basename(fn)[0,4] == 'rot_'
     if fn.upcase =~ PICTURE_FILES
-      puts fn unless tagsfile?(fn)
+      if ! tagsfile?(fn)
+        if ! sender.sent_to?(fn,:fotolia) #TODO: provisorisch
+          puts fn 
+        end
+        
+      end
     end
   }
 end

data/config.yaml

@@ -3,6 +3,7 @@
 - :fotolia
 - :zoonar
 - :photocase
+- :dreamstime
 :zoonar: 
   :user: 'hugo'
   :password: 'lalala'
@@ -17,3 +18,9 @@
   :user: 'hugo'
   :password: 'lalala'
   :total_per_day: 12
+:dreamstime: 
+  :user: 'martha'
+  :password: 'mageheim'
+  :ftp_user: 'martha12345'
+  :ftp_password: 'ftpgeheimmartha'
+  :total_per_day: 1

data/lib/multistockphoto/generic_site.rb

@@ -11,7 +11,7 @@ class GenericSite
   end
 
   def photos_fuer_heute_uebrig?
-   # puts "noch #{total_per_day - sent_today} zu senden"
+    # puts "noch #{total_per_day - sent_today} zu senden"
     return total_per_day - sent_today > 0
   end
 
@@ -55,4 +55,13 @@ class GenericSite
     return (count[key] || 0)
   end
   
-end
+  def load_config
+    if ENV['MSP_CONFIG']
+      config = YAML.load_file(ENV['MSP_CONFIG'])
+    else
+      config = YAML.load_file("config.yaml")
+    end
+    config
+  end
+  
+end # class

data/lib/multistockphoto/photo.rb

@@ -68,8 +68,10 @@ class Photo
       puts "tags file #{fn} found"
       tags = Photo.to_tags(lines)
       self.tags = tags
-      puts "writing tags to file"
+      print "writing tags to file ... "
+      $stdout.flush
       write_keywords
+      puts "done"
     rescue Errno::ENOENT
       warn "WARNING: no tags file #{fn}"
     end

data/lib/multistockphoto/sender.rb

@@ -27,4 +27,20 @@ class Sender
     'done'
   end
   
+  # wurde dieses File schon an diese Site gesendet?
+  def sent_to?(p_filename,p_site)
+    sendeliste = 'sendeliste.dat' #TODO:
+    result = false
+    File.open(sendeliste) {|f|
+      f.each_line {|line|
+        site,photo_file,time = line.chomp.split("\t")
+        if site == p_site.to_s and photo_file == p_filename
+          result = true
+          break
+        end
+      }
+    }
+    result
+  end
+  
 end # Sender

data/lib/multistockphoto/site_dreamstime.rb

@@ -0,0 +1,105 @@
+require 'net/ftp'
+require 'grep'
+include Grep
+
+class Dreamstime < GenericSite
+  
+  @@errors = 0
+  
+  attr_reader :total_per_day
+  attr_accessor :ftp_user, :ftp_password, :max_errors
+  
+  FTP_HOST = 'upload.dreamstime.com'
+  SITENAME = 'dreamstime'
+  #      Ftp Adresse:  	upload.dreamstime.com
+#Benutzername (Benutzer ID): 	772816
+#Kennwort: 	das selbe wie Ihr Dreamstime Kontokennwort
+  
+  def initialize(name)
+    super
+    @config = load_config
+    @user = @config[:dreamstime][:user]
+    @password = @config[:dreamstime][:password]
+    @ftp_user = @config[:dreamstime][:ftp_user]
+    @ftp_password = @config[:dreamstime][:ftp_password]
+    @total_per_day = @config[:dreamstime][:total_per_day]
+  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
+    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
+    if g.size > 0
+      puts "already sent"
+      return :duplicate
+    end
+    if photo.portrait? and ! Dreamstime.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
+        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
+  
+  private
+  
+  def site_can_handle_keywords?
+    true
+  end
+  
+end # class

data/lib/multistockphoto/site_fotolia.rb

@@ -1,6 +1,5 @@
 require 'net/ftp'
 require 'grep'
-#require 'upload_exception'
 include Grep
 
 class Fotolia < GenericSite
@@ -11,15 +10,11 @@ class Fotolia < GenericSite
   attr_accessor :ftp_user, :ftp_password, :max_errors
   
   FTP_HOST = 'submit.fotolia.com'
-    
+  SITENAME = 'fotolia'
+  
   def initialize(name)
-    #p "creating a Fotolia object"
     super
-    if ENV['MSP_CONFIG']
-      @config = YAML.load_file(ENV['MSP_CONFIG'])
-    else
-      @config = YAML.load_file("config.yaml")
-    end
+    @config = load_config
     @user = @config[:fotolia][:user]
     @password = @config[:fotolia][:password]
     @ftp_user = @config[:fotolia][:ftp_user]
@@ -41,10 +36,9 @@ class Fotolia < GenericSite
     if @ftp_user == nil or @ftp_password == nil
       raise "ftp_user/ftp_password not set"
     end
-    print "fotolia:#{photo.filename} ... "
+    print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    #g = `grep "fotolia\t#{photo.filename}" sendeliste.dat` #TODO: will not work for windows
-    g = grep(SENDLIST, /fotolia\t#{photo.filename}/)
+    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
     if g.size > 0
       puts "already sent"
       return :duplicate
@@ -75,10 +69,9 @@ class Fotolia < GenericSite
     end
     @@errors = 0
     puts 'OK'
-    #    `echo "fotolia\t#{photo.filename}\t#{Time.now}" >>sendeliste.dat` #TODO:
     if ! dont_log
       File.open(SENDLIST,'a') {|f|
-        f.puts "fotolia\t#{photo.filename}\t#{Time.now}"
+        f.puts "#{SITENAME}\t#{photo.filename}\t#{Time.now}"
       }
     end
     true
@@ -86,13 +79,13 @@ class Fotolia < GenericSite
   
   # Anzahl heute schon gesendeter Photos
   def sent_today
-    site = 'fotolia'
+    site = SITENAME
     return sent_today_site(site)
   end
 
   # wurde dieses Photo schon gesendet?  
   def already_sent?(photo)
-    already_sent_site?(photo,'fotolia') 
+    already_sent_site?(photo,SITENAME) 
   end
 
   # can site handle orientation?

data/lib/multistockphoto/site_photocase.rb

@@ -4,6 +4,7 @@ require 'grep'
 include Grep
 
 class Photocase < GenericSite
+  SITENAME = 'photocase'
   @@errors = 0
   
   attr_reader :total_per_day
@@ -34,9 +35,9 @@ class Photocase < GenericSite
     unless File.exist?(photo.filename)
       raise "file #{photo.filename} does not exist"
     end
-    print "photocase:#{photo.filename} ... "
+    print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDLIST, /photocase\t#{photo.filename}/)
+    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
     if g.size > 0
       puts 'already sent'
       return :duplicate
@@ -106,7 +107,7 @@ class Photocase < GenericSite
     
     unless dont_log
       File.open(SENDLIST,'a') {|f|
-        f.puts "photocase\t#{photo.filename}\t#{Time.now}"
+        f.puts "#{SITENAME}\t#{photo.filename}\t#{Time.now}"
       }
     end
     true
@@ -114,13 +115,13 @@ class Photocase < GenericSite
   
   # Anzahl heute schon gesendeter Photos
   def sent_today
-    site = 'photocase'
+    site = SITENAME
     return sent_today_site(site)
   end
   
     # wurde dieses Photo schon gesendet?  
   def already_sent?(photo)
-    already_sent_site?(photo,'photocase')
+    already_sent_site?(photo,SITENAME)
     #
     #    unless photo.class == Photo
     #      raise 'not a Photo object'

data/lib/multistockphoto/site_zoonar.rb

@@ -4,7 +4,7 @@ require 'grep'
 include Grep
 
 class Zoonar < GenericSite
-  
+  SITENAME = 'zoonar'
   @@errors = 0
   
   attr_reader :total_per_day
@@ -35,9 +35,9 @@ class Zoonar < GenericSite
     unless File.exist?(photo.filename)
       raise "file #{photo.filename} does not exist"
     end
-    print "zoonar:#{photo.filename} ... "
+    print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDLIST, /zoonar\t#{photo.filename}/)
+    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
     if g.size > 0
       puts 'already sent'
       return :duplicate
@@ -110,11 +110,9 @@ Falls wir das Bild ablehnen sollten, werden Sie eine Benachrichtigung per E-Mail
     else
       puts "OK"
     end # dont_send
-    #`echo "zoonar\t#{photo.filename}\t#{Time.now}" >>sendeliste.dat` #TODO:
-
     unless dont_log    
       File.open(SENDLIST,'a') {|f|
-        f.puts "zoonar\t#{photo.filename}\t#{Time.now}"
+        f.puts "#{SITENAME}\t#{photo.filename}\t#{Time.now}"
       }
     end
     true
@@ -122,13 +120,13 @@ Falls wir das Bild ablehnen sollten, werden Sie eine Benachrichtigung per E-Mail
   
   # Anzahl heute schon gesendeter Photos
   def sent_today
-    site = 'zoonar'
+    site = SITENAME
     return sent_today_site(site)
   end
   
   # wurde dieses Photo schon gesendet?  
   def already_sent?(photo)
-    already_sent_site?(photo,'zoonar')
+    already_sent_site?(photo,SITENAME)
   end
   
     # can site handle orientation?

data/lib/multistockphoto/version.rb

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

data/lib/multistockphoto.rb

@@ -15,6 +15,7 @@ require 'multistockphoto/site_fotolia'
 require 'multistockphoto/site_zoonar'
 require 'multistockphoto/site_aldi'
 require 'multistockphoto/site_photocase'
+require 'multistockphoto/site_dreamstime'
 
 
 require 'multistockphoto/upload_exception'

data/test/test_multistockphoto.rb

@@ -24,6 +24,10 @@ class TestMultistockphoto < Test::Unit::TestCase
     ENV['FOTOLIA_FTP_PASSWORD'] = 'hugolalala'
     ENV['PHOTOCASE_USER'] = 'hugo'
     ENV['PHOTOCASE_PASSWORD'] = 'lalala'
+    ENV['DREAMSTIME_USER'] = 'martha'
+    ENV['DREAMSTIME_PASSWORD'] = 'mageheim'
+    ENV['DREAMSTIME_FTP_USER'] = 'martha12345'
+    ENV['DREAMSTIME_FTP_PASSWORD'] = 'ftpgeheimmartha'
     @fotolia_user         = ENV['FOTOLIA_USER'] 
     @fotolia_password     = ENV['FOTOLIA_PASSWORD'] 
     @fotolia_ftp_user     = ENV['FOTOLIA_FTP_USER'] 
@@ -34,6 +38,10 @@ class TestMultistockphoto < Test::Unit::TestCase
     @aldi_password        = ENV['ALDI_PASSWORD']
     @photocase_user       = ENV['PHOTOCASE_USER']
     @photocase_password   = ENV['PHOTOCASE_PASSWORD']
+    @dreamstime_user         = ENV['DREAMSTIME_USER'] 
+    @dreamstime_password     = ENV['DREAMSTIME_PASSWORD'] 
+    @dreamstime_ftp_user     = ENV['DREAMSTIME_FTP_USER'] 
+    @dreamstime_ftp_password = ENV['DREAMSTIME_FTP_PASSWORD'] 
     ENV['MSP_CONFIG'] = nil
   end
   
@@ -78,7 +86,7 @@ Options:
   end
 
   def test_bin_version
-    expected = "multistockphoto 0.6.1\n"
+    expected = "multistockphoto 0.6.2\n"
     result = `#{BIN}multistockphoto -v`
     assert_equal expected, result
     result = `#{BIN}multistockphoto --version`
@@ -176,6 +184,18 @@ Options:
     #kein ftp assert_equal @photocase_ftp_password, photocase.ftp_password
   end
   
+  def test_config_params_dreamstime
+    dreamstime = Dreamstime.new("Dreamstime Site")
+    assert dreamstime.user
+    assert dreamstime.password
+    assert dreamstime.ftp_user
+    assert dreamstime.ftp_password
+    assert_equal @dreamstime_user, dreamstime.user
+    assert_equal @dreamstime_password, dreamstime.password
+    assert_equal @dreamstime_ftp_user, dreamstime.ftp_user
+    assert_equal @dreamstime_ftp_password, dreamstime.ftp_password
+  end
+  
   def test_grep
     file = "test/testgrep.dat"
     content = "zoonar\tIMG1.jpg\n"+
@@ -214,7 +234,7 @@ Options:
   end
 
   def test_config_params_pixelio
-    after Date.new(2008,6,15) do
+    after Date.new(2008,6,20) do
       pixelio = Pixelio.new("Pixelio Site")
       assert pixelio.user
       assert pixelio.password
@@ -225,6 +245,44 @@ Options:
     end # after
   end
 
+    def test_dreamstime_object
+  #    angemeldet.
+  #      Ftp Adresse:  	upload.dreamstime.com
+#Benutzername (Benutzer ID): 	772816
+#Kennwort: 	das selbe wie Ihr Dreamstime Kontokennwort
+      dreamstime = Dreamstime.new("Dreamstime Site")
+      assert_kind_of Dreamstime, dreamstime
+    end
+  
+  after Date.new(2008,6,20) do
+    def test_shutterstock_object
+      shutterstock = Shutterstock.new("Shutterstock Site")
+      assert_kind_of Shutterstock, shutterstock
+    end
+    def test_istockphoto_object
+#      angemeldet, aber man muß noch vorstellungsbilder hochladen
+      istockphoto = Istockphoto.new("Istockphoto Site")
+      assert_kind_of Istockphoto, istockphoto
+    end
+    def test_stockxpert_object
+ #     angemeldet, aber man muss noch vorstellungsbilder hochladen
+      stockxpert = Stockxpert.new("Stockxpert Site")
+      assert_kind_of Stockxpert, stockxpert
+    end
+    def test_bigstockphoto_object
+      bigstockphoto = Bigstockphoto.new("Bigstockphoto Site")
+      assert_kind_of Bigstockphoto, bigstockphoto
+    end
+    def test_Einszweidreirf_object
+      einszweidreirf = Einszweidreirf.new("123rf Site")
+      assert_kind_of Einszweidreirf, einszweidreirf
+    end
+    def test_Panthermedia_object
+      panthermedia = Panthermedia.new("Panthermedia Site")
+      assert_kind_of Panthermedia, panthermedia
+    end
+    #Shutterstock, iStockphoto , StockXpert , Dreamstime , Bigstockphoto , 123rf und Panthermedia finden Sie auf unserer Partnerseite Fotos kaufen.de
+  end
 
   def DONT_test_iptc_data
 
@@ -275,7 +333,7 @@ Options:
   end
 
   def test_iptc_file_keywords
-    expected = 'Berlin gwb Blume Biene'
+    expected = 'Berlin,gwb,Blume,Biene'
     photo = Photo.new(File.join('test','IMG_3602.JPG'))
     photo.set_keywords
     assert_equal expected, photo.file_keywords 
@@ -383,7 +441,9 @@ Options:
     #  end
 
     def test_heute_schon_gesendet
-      raise NotImplementedError, 'Need to write test_heute_schon_gesendet'
+      after Date.new(2008,6,30) do
+        raise NotImplementedError, 'Need to write test_heute_schon_gesendet'
+      end
     end
 
   end
@@ -393,14 +453,21 @@ Options:
     site = Fotolia.new('fotolia')
     site.password = password
     assert_equal password, site.password
+  
     password = rand(1_000_000).to_s
     site = Zoonar.new('zoonar')
     site.password = password
     assert_equal password, site.password
+
     password = rand(1_000_000).to_s
     site = Photocase.new('photocase')
     site.password = password
     assert_equal password, site.password
+
+    password = rand(1_000_000).to_s
+    site = Dreamstime.new('dreamstime')
+    site.password = password
+    assert_equal password, site.password
   end
 
   def test_password_equals
@@ -408,37 +475,29 @@ Options:
     site = Fotolia.new('fotolia')
     site.password = password
     assert_equal password, site.password
+    
     password = rand(1_000_000).to_s
     site = Zoonar.new('zoonar')
     site.password = password
     assert_equal password, site.password
+    
     password = rand(1_000_000).to_s
     site = Photocase.new('photocase')
     site.password = password
     assert_equal password, site.password
+  
+    password = rand(1_000_000).to_s
+    site = Dreamstime.new('dreamstime')
+    site.password = password
+    assert_equal password, site.password
   end
 
-  after Date.new(2008,6,15) do
+  after Date.new(2008,7,15) do
     def test_photos_fuer_heute_uebrig_eh
       raise NotImplementedError, 'Need to write test_photos_fuer_heute_uebrig_eh'
     end
   end
   
-  def test_password
-    password = rand(1_000_000).to_s
-    site = Fotolia.new('fotolia')
-    site.password = password
-    assert_equal password, site.password
-    password = rand(1_000_000).to_s
-    site = Zoonar.new('zoonar')
-    site.password = password
-    assert_equal password, site.password
-    password = rand(1_000_000).to_s
-    site = Photocase.new('photocase')
-    site.password = password
-    assert_equal password, site.password
-  end
-  
   def test_zoonar_nur_noch_5_uploads_moeglich
     site = Mock_Zoonar.new('zoonar',:remaining => 5)
     photo = Photo.new("test/1234.jpg")
@@ -457,18 +516,19 @@ Options:
   
   
   def test_bin_simple
-    begin
-      Dir.mkdir 'upload'
-    rescue Errno::EEXIST
-      #ignore
-    end      
-    ###leere sendeliste erzeugen
-    File.unlink SENDLIST
-    File.open(SENDLIST, "w") {}
-    FileUtils.cp("IMG_0000.JPG", "upload/1.gif") 
-    FileUtils.cp("IMG_0000.JPG", "upload/2.gif") 
-    FileUtils.cp("IMG_0000.JPG", "upload/3.gif") 
-    expected="sending all unsent photos
+    after Date.new(2008,6,30) do   
+      begin
+        Dir.mkdir 'upload'
+      rescue Errno::EEXIST
+        #ignore
+      end      
+      ###leere sendeliste erzeugen
+      File.unlink SENDLIST
+      File.open(SENDLIST, "w") {}
+      FileUtils.cp("IMG_0000.JPG", "upload/1.gif") 
+      FileUtils.cp("IMG_0000.JPG", "upload/2.gif") 
+      FileUtils.cp("IMG_0000.JPG", "upload/3.gif") 
+      expected="sending all unsent photos
 fotolia:upload/1.gif ... OK
 zoonar:upload/1.gif ... OK
 photocase:upload/1.gif ... OK
@@ -479,12 +539,13 @@ fotolia:upload/3.gif ... OK
 zoonar:upload/3.gif ... OK
 photocase:upload/3.gif ... OK
 9 photos sent.\n"
-    result = `#{BIN}multistockphoto --send-all --dont-send --dont-log`
-    assert_equal expected, result
+      result = `#{BIN}multistockphoto --send-all --dont-send --dont-log`
+      assert_equal expected, result
+    end
   end
   
   def test_bin_simple_verbose
-    after Date.new(2008,6,13) do
+    after Date.new(2008,6,30) do
       begin
         Dir.mkdir 'upload'
       rescue Errno::EEXIST
@@ -548,7 +609,7 @@ photocase:upload/3.gif ... OK
   
   def test_active_sites
     sender = Sender.new("Thomas")
-    assert_equal [:fotolia, :zoonar, :photocase], sender.active_sites
+    assert_equal [:fotolia, :zoonar, :photocase, :dreamstime], sender.active_sites
   end
   
   def test_upload_dir
@@ -563,10 +624,10 @@ photocase:upload/3.gif ... OK
    
   def test_bin_nothing_raised_send_all
     assert_nothing_raised() {
-      puts `#{BIN}multistockphoto --send-all`
+      puts `#{BIN}multistockphoto --send-all --dont-send --dont-log`
     }
     assert_nothing_raised() {
-      puts `#{BIN}multistockphoto --send-all --verbose`
+      puts `#{BIN}multistockphoto --send-all --verbose --dont-send --dont-log`
     }
   end
   
@@ -600,7 +661,11 @@ photocase:upload/3.gif ... OK
     assert ! Photocase.can_handle_orientation?
   end
   
- 
+  def test_specific_file_sent_to_site
+    sender = Sender.new('icke')
+    assert sender.sent_to?("upload/IMG_3333.JPG", :fotolia)
+    assert ! sender.sent_to?("upload/IMG_9999.JPG", :fotolia)
+  end
 
 end
 

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>multistockphoto</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/multistockphoto"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/multistockphoto" class="numbers">0.6.1</a>
+      <a href="http://rubyforge.org/projects/multistockphoto" class="numbers">0.7.0</a>
     </div>
     <h1>&#x2192; &#8216;multistockphoto&#8217;</h1>
 
@@ -41,7 +41,7 @@
 	<h2>What</h2>
 
 
-	<p>This program is intended to work with the german versions of the photo sites fotolia.de and zoonar.de.
+	<p>This program is intended to work with the german versions of the photo sites fotolia.de, zoonar.de and dreamstime.de.
 Photographers can upload their photos to this sites. 
 Currently it works only with the german version. If you&#8217;re interested to adapt
 it to other languages please email me.</p>
@@ -93,15 +93,22 @@ Innerhalb dieses Ordners lege bitte einen weiteren Ordner namens &#8216;upload&#
 	<p>Trage dort deine Zugangsdaten ein! Achtung: Die Einrückung links ist wichtig. 
 Der Abschnitt &#8217;:active_sites:&#8217; bezeichnet die Sites, mit denen du arbeiten 
 willst. Falls du nicht alle verwenden willst, lösche einfach die entsprechende
-Zeile.
-Im Gem-Directory ist eine Vorlage, die du kopieren kannst.
+Zeile.</p>
+
+
+	<p>Ebenso kannst du, falls du eine Site vorübergehend nicht verwenden willst, auch
+einfach die entsprechende Zeile löschen (die eigentlichen Login-Daten weiter
+unter können aber unverändert bleiben).</p>
+
+
+	<p>Im Gem-Directory ist eine Vorlage, die du kopieren kannst.
 Wenn du nicht bei allen aufgelisteten Sites Mitglied bist oder die Bilder dort
 hochladen möchtest, dann lösche einfach
 die entsprechenden Abschnitte &#8211; du ersparst dir und den jeweiligen Servern 
 unnötige Last, die bei fehlerhaften Einloggversuchen vergeudet wird.</p>
 
 
-	<p>Wenn du ein oder mehrere neue Bilder hochladen willst, kopiere die Bilddateien
+	<p>Wenn du eines oder mehrere neue Bilder hochladen willst, kopiere die Bilddateien
 in den upload-Ordner!
 Dann rufe (innerhalb des multistockphoto-Ordners) das Kommando</p>
 
@@ -725,6 +732,13 @@ sie sich aktuell in der Warteschlage der zu begutachtenden Photos befinden.</p>
 Site unterstützt Hoch-/Querformat: Nein</p>
 
 
+	<h3>dreamstime.de</h3>
+
+
+	<p>Site unterstützt Keywords in <span class="caps">IPTC</span>-Header: Ja
+Site unterstützt Hoch-/Querformat: ??? <span class="caps">TODO</span>:</p>
+
+
 	<h2>Forum</h2>
 
 
@@ -800,7 +814,7 @@ rake install_gem</pre>
 	<p>Comments are welcome. Send an email to <a href="mailto:thopre@gmail.com">Thomas Preymesser</a> email 
 or via the <a href="http://groups.google.com/group/multistockphoto">forum</a></p>
     <p class="coda">
-      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 14th June 2008<br>
+      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 16th June 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -5,7 +5,7 @@ h1. → 'multistockphoto'
 
 h2. What
 
-This program is intended to work with the german versions of the photo sites fotolia.de and zoonar.de.
+This program is intended to work with the german versions of the photo sites fotolia.de, zoonar.de and dreamstime.de.
 Photographers can upload their photos to this sites. 
 Currently it works only with the german version. If you're interested to adapt
 it to other languages please email me.
@@ -51,13 +51,18 @@ Trage dort deine Zugangsdaten ein! Achtung: Die Einrückung links ist wichtig.
 Der Abschnitt ':active_sites:' bezeichnet die Sites, mit denen du arbeiten 
 willst. Falls du nicht alle verwenden willst, lösche einfach die entsprechende
 Zeile.
+
+Ebenso kannst du, falls du eine Site vorübergehend nicht verwenden willst, auch
+einfach die entsprechende Zeile löschen (die eigentlichen Login-Daten weiter
+unter können aber unverändert bleiben).
+
 Im Gem-Directory ist eine Vorlage, die du kopieren kannst.
 Wenn du nicht bei allen aufgelisteten Sites Mitglied bist oder die Bilder dort
 hochladen möchtest, dann lösche einfach
 die entsprechenden Abschnitte - du ersparst dir und den jeweiligen Servern 
 unnötige Last, die bei fehlerhaften Einloggversuchen vergeudet wird.
 
-Wenn du ein oder mehrere neue Bilder hochladen willst, kopiere die Bilddateien
+Wenn du eines oder mehrere neue Bilder hochladen willst, kopiere die Bilddateien
 in den upload-Ordner!
 Dann rufe (innerhalb des multistockphoto-Ordners) das Kommando
 
@@ -576,6 +581,13 @@ sie sich aktuell in der Warteschlage der zu begutachtenden Photos befinden.
 Site unterstützt Keywords in IPTC-Header: ? noch mal nachschauen! TODO:
 Site unterstützt Hoch-/Querformat: Nein
 
+h3. dreamstime.de
+
+
+Site unterstützt Keywords in IPTC-Header: Ja
+Site unterstützt Hoch-/Querformat: ??? TODO:
+
+
 h2. Forum
 
 "http://groups.google.com/group/multistockphoto":http://groups.google.com/group/multistockphoto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multistockphoto
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-14 00:00:00 +02:00
+date: 2008-06-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -53,7 +53,7 @@ files:
 - lib/multistockphoto/site_zoonar.rb
 - lib/multistockphoto/mock_zoonar.rb
 - lib/multistockphoto/site_photocase.rb
-- lib/multistockphoto/site_aldi.rb
+- lib/multistockphoto/site_dreamstime.rb
 - lib/multistockphoto/photo.rb
 - lib/multistockphoto/upload_exception.rb
 - script/console

data/lib/multistockphoto/site_aldi.rb

@@ -1,82 +0,0 @@
-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