multistockphoto 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,6 @@
+== 0.6.1 2008-06-13
+* 1 bug fix
+  * hm, das Schreiben von Keywords scheint nicht aktiviert gewesen zu sein...
 == 0.6.0 2008-06-10
 * 4 enhancements
   * Sendedauer fuer jedes Photo beim Senden auflisten

data/lib/multistockphoto/photo.rb

@@ -65,7 +65,7 @@ class Photo
       puts "tags file #{fn} found"
       tags = Photo.to_tags(lines)
       self.tags = tags
-      #puts "writing tags to file"
+      puts "writing tags to file"
       write_keywords
     rescue Errno::ENOENT
       warn "WARNING: no tags file #{fn}"

data/lib/multistockphoto/site_fotolia.rb

@@ -7,6 +7,7 @@ class Fotolia < GenericSite
   
   @@errors = 0
   
+  attr_reader :total_per_day
   attr_accessor :ftp_user, :ftp_password, :max_errors
   
   FTP_HOST = 'submit.fotolia.com'
@@ -53,6 +54,9 @@ class Fotolia < GenericSite
         photo.drehen
       end
     end
+    if site_can_handle_keywords?
+      photo.set_keywords
+    end
     if ! dont_send
       begin
         ftp = Net::FTP.new(FTP_HOST)
@@ -77,24 +81,23 @@ class Fotolia < GenericSite
     true
   end
   
-  def total_per_day
-    @total_per_day
-  end
-  
+#  def total_per_day
+#    @total_per_day
+#  end
+#  
   def sent_today
     site = 'fotolia'
     return sent_today_site(site)
   end
 
   def already_sent?(photo)
-    already_sent_site?(photo,'fotolia')
-#    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, /fotolia\t#{photo.filename}/)
-#    return g.size > 0
+    already_sent_site?(photo,'fotolia') 
+  end
+  
+  private
+  
+  def site_can_handle_keywords?
+    true
   end
-end
+  
+end # class

data/lib/multistockphoto/site_photocase.rb

@@ -5,6 +5,8 @@ include Grep
 
 class Photocase < GenericSite
   @@errors = 0
+  
+  attr_reader :total_per_day
   attr_accessor :user, :password,  :max_errors
   
   def initialize(name)
@@ -44,6 +46,10 @@ class Photocase < GenericSite
         photo.drehen
       end
     end
+        if site_can_handle_keywords?
+      photo.set_keywords
+    end
+
     if ! dont_send
       agent = WWW::Mechanize.new
       agent.user_agent_alias = 'Linux Mozilla'
@@ -108,9 +114,9 @@ class Photocase < GenericSite
     true
   end
   
-  def total_per_day
-    @total_per_day
-  end
+#  def total_per_day
+#    @total_per_day
+#  end
 
   def sent_today
     site = 'photocase'
@@ -129,4 +135,10 @@ class Photocase < GenericSite
 #    g = grep(SENDLIST, /photocase\t#{photo.filename}/)
 #    return g.size > 0
   end
+  
+  private 
+  
+  def site_can_handle_keywords?
+  true # TODO: ueberpruefen, ob richtig?
+end
 end

data/lib/multistockphoto/site_zoonar.rb

@@ -7,6 +7,7 @@ class Zoonar < GenericSite
   
   @@errors = 0
   
+  attr_reader :total_per_day
   attr_accessor :user, :password, :max_errors
   
   def initialize(name)
@@ -47,6 +48,10 @@ class Zoonar < GenericSite
         photo.drehen
       end
     end
+    if site_can_handle_keywords?
+      photo.set_keywords
+    end
+
     unless dont_send
       agent = WWW::Mechanize.new
       agent.user_agent_alias = 'Linux Mozilla'
@@ -110,9 +115,9 @@ Falls wir das Bild ablehnen sollten, werden Sie eine Benachrichtigung per E-Mail
     true
   end
   
-  def total_per_day
-    @total_per_day
-  end
+  #  def total_per_day
+  #    @total_per_day
+  #  end
   
   def sent_today
     site = 'zoonar'
@@ -120,15 +125,12 @@ Falls wir das Bild ablehnen sollten, werden Sie eine Benachrichtigung per E-Mail
   end
   
   def already_sent?(photo)
-        already_sent_site?(photo,'zoonar')
-#
-#    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, /zoonar\t#{photo.filename}/)
-#    return g.size > 0
+    already_sent_site?(photo,'zoonar')
+  end
+  
+  private
+  
+  def site_can_handle_keywords?
+    true
   end
 end

data/lib/multistockphoto/version.rb

@@ -2,7 +2,7 @@ module Multistockphoto #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   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.0</a>
+      <a href="http://rubyforge.org/projects/multistockphoto" class="numbers">0.6.1</a>
     </div>
     <h1>&#x2192; &#8216;multistockphoto&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multistockphoto
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-11 00:00:00 +02:00
+date: 2008-06-13 00:00:00 +02:00
 default_executable: 
 dependencies: []