multistockphoto 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.8.1 2008-12-30
+* 1 enhancement
+  * doppelte Tags in Datei nicht mehrfach zaehlen
+  * photocase: bessere Fehleranalyse, falls Upload-Fehler
+* 1 bugfix
+  * Anpassung an neue Syntax beim mechanize gem in site_* Dateien
+
 == 0.8.0 2008-06-28
 * 1 major enhancement
   * neue Site Bigstockphoto erstellt
@@ -9,9 +16,11 @@
   * 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
+
 == 0.7.0 2008-06-16
 * 1 major enhancement
   * neue Site Dreamstime erstellt

data/Manifest.txt

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

data/bin/multistockphoto

@@ -12,13 +12,16 @@ include Grep
 SENDELISTE = 'sendeliste.dat'
 ROT_PREFIX = 'rot_'
 MAX_ERRORS = 3
-PICTURE_FILES = /(.PNG|.JPG|.GIF|.JPEG|.EPS|.AI|.PSD|.PDF|.TIF|.TIFF)$/
+PICTURE_FILES = /(.PNG|.JPG|.JPEG|.GIF|.EPS|.AI|.PSD|.PDF|.TIF|.TIFF)$/
 
 require 'fcntl'
 
 #STDOUT.sync = true
 #STDOUT.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
 
+require 'logger'
+$log = Logger.new('multistockphoto.log', 'daily', 30)
+
 # alle Sites komplett bearbeitet?
 def all_sites_done(sites,n)
   #p sites
@@ -165,6 +168,15 @@ Choice.options do
     end
   end
 
+  option :silent do
+    short '-c'
+    long '--silent'
+    desc 'No output at list-done and purge-done'
+    action do
+      $silent = true
+    end
+  end
+  
   option :ordered do
     short '-o' #TODO: geht das?
     long '--ordered'
@@ -186,9 +198,9 @@ Choice.options do
   end
 
   option :count do
-    short '-3'
+    short '-b'
     long '--count'
-    desc 'count'
+    desc 'Count - only photo with at least N tags'
     cast Integer
     default 0
     action do
@@ -197,14 +209,32 @@ Choice.options do
   end
   
   option :plist do
-    short '-2'
+    short '-d'
     long '--plist'
-    desc 'Show details sending status for each picture'
+    desc 'Show detailed sending state for each picture'
     action do
       $plist = true
     end
   end
 
+  option :check_translation do
+    short '-e'
+    long '--check-translation'
+    desc 'Checks if translation can be done for all tags'
+    action do
+      $check_translation = true
+    end
+  end
+  
+  option :shuffle do
+    short '-f'
+    long '--shuffle'
+    desc 'Shuffle order of files (sending)'
+    action do
+      $shuffle = true
+    end
+  end
+
   option :dont_send do
     long '--dont-send'
     action do
@@ -243,7 +273,7 @@ def not_enough_tags?(photo)
     else 
       if $count_flag 
         photo.set_keywords
-        if photo.tags.size < $count
+        if photo.tags.uniq.size < $count
           return true
         end
       end
@@ -284,6 +314,9 @@ def send_all
   if $ordered
     allfiles.sort!
   end
+  if $shuffle
+    allfiles = allfiles.sort_by { rand }
+  end
   allfiles.each {|filename|
     next if File.basename(filename)[0,4] == ROT_PREFIX
     #puts "rot_ uebersprungen"
@@ -291,69 +324,96 @@ def send_all
       total_per_site_flag = $total_per_site
       photo = Photo.new(filename)
       next if not_enough_tags? photo
+     # threads = []
       $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]
+        # TODO:
+        # Bevor man Threads nutzt, muß man sicherstellen, dass das Rotieren
+        # von Bildern abeschlossen ist, bevor ein anderer Thread auf das 
+        # rotierte Bilde zugreift 
+        #threads << Thread.new(site_name) { |site_name|
+          #print "Thread #{site_name} gestartet\n"
+          #Thread.current["threadname"] = site_name.to_s
+          begin
+            Timeout::timeout(10.0*60.0) do
+              t1 = Time.now
+              site = eval(site_name.to_s.capitalize+".new(#{site_name.to_s.capitalize})")
+              done[site_name] = true if remaining[site_name] <= 0
+              next if done[site_name]
             
-            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])
-              if !site.already_sent?(photo)
-                begin
-                  result = site.transfer(photo,$dont_send,$dont_log)
-                  if result != :duplicate
-                    total_transfers += 1
-                    total[site_name] += 1
-                    remaining[site_name] -= 1
-                    done[site_name] = true if remaining[site_name] <= 0
-                    errors[site_name] = 0
-                    t2 = Time.now
-                    if $verbose
-                      if $dont_send and $dont_log
-                        puts "1:23"
-                      else
-                        puts formatted_minutes(t2-t1)
+              if ! site.accept?(File.extname(filename))
+                warn "Warning: Site (#{site_name}) does not support this file extension (#{File.extname(filename)}). Skipped"
+                next
+              end
+              if ! site.photosize_valid?(photo)
+                warn "Warning: filesize for #{photo.filename} not valid for site #{site_name}"
+                next
+              end
+              #end
+              if $send_all or
+                  (total_per_site_flag and 
+                    total[site_name] < Choice.choices[:total_per_site])
+                if !site.already_sent?(photo)
+                  begin
+                    result = site.transfer(photo,$dont_send,$dont_log)
+                    if result != :duplicate
+                      total_transfers += 1
+                      total[site_name] += 1
+                      remaining[site_name] -= 1
+                      done[site_name] = true if remaining[site_name] <= 0
+                      errors[site_name] = 0
+                      t2 = Time.now
+                      if $verbose
+                        if $dont_send and $dont_log
+                          puts "1:23"
+                        else
+                          puts formatted_minutes(t2-t1)
+                        end
+                        p total # Summenzeile ausgeben
                       end
-                      p total # Summenzeile ausgeben
                     end
-                  end
-                rescue UploadException 
-                  errors[site_name] += 1
-                  if errors[site_name] >= MAX_ERRORS
-                    done[site_name] = true 
-                    puts "too many errors. giving up."
-                  end
-                  puts "Upload error at sending to #{site_name} occurred. Check configuration or try again later!"
-                rescue Timeout::Error
-                  puts "timeout error"
-                  #timeout error
-                  errors[site_name] += 1
-                  if errors[site_name] >= MAX_ERRORS
-                    done[site_name] = true
-                    puts "too many errors. giving up."
+                  # TODO: SocketError nur experimentell
+                  rescue SocketError
+                    print "SocketError - ignore and sleep 30 seconds"
+                    sleep 30
+                    errors[site_name] += 1
+                    if errors[site_name] >= MAX_ERRORS
+                      done[site_name] = true 
+                      puts "too many errors. giving up."
+                    end
+                    puts "Upload error at sending to #{site_name} occurred. Check configuration or try again later!"
+                  rescue UploadException 
+                    errors[site_name] += 1
+                    if errors[site_name] >= MAX_ERRORS
+                      done[site_name] = true 
+                      puts "too many errors. giving up."
+                    end
+                    puts "Upload error at sending to #{site_name} occurred. Check configuration or try again later!"
+                  rescue Timeout::Error
+                    puts "timeout error"
+                    #timeout error
+                    errors[site_name] += 1
+                    if errors[site_name] >= MAX_ERRORS
+                      done[site_name] = true
+                      puts "too many errors. giving up."
+                    end
                   end
                 end
+                break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
+                break if all_sites_done(total,Choice.choices[:total_per_site])
               end
-              break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
-              break if all_sites_done(total,Choice.choices[:total_per_site])
-            end
-          end # Timeout
-        end # timeout
-      }
+            end # Timeout
+          end # timeout
+        #} # Thread
+          
+      } # alle Sites
+      #print "warte auf Beendigung aller Threads ...\n"
+      #
+      #threads.each {|thr| 
+      #  print "warte auf Thread "+thr.to_s+" "+thr["threadname"]+"\n" 
+      #  $stdout.flush
+      #  thr.join
+      #}
+        
     end
   }
   puts "#{total_transfers} photos sent."
@@ -429,7 +489,7 @@ def stats
       end
     }
   }
-  print " "*11+"| "
+  print " "*14+"| "
   $active_sites.each {|site|
     print "#{site.to_s}"
     print " | "
@@ -440,7 +500,11 @@ def stats
   10.times do |i|
     chosen_date = today - i
     total = 0
-    print chosen_date.to_s+" | "
+    #    print chosen_date.to_s+" | "
+    print sprintf("%2s %04d-%02d-%02d",%w{ So Mo Di Mi Do Fr Sa}[chosen_date.wday],
+      chosen_date.year,
+      chosen_date.month,
+      chosen_date.day)+" | "
     $active_sites.each {|site|    
       key = [site.to_s, chosen_date]
       fmt = "%#{site.to_s.length}d | "
@@ -463,7 +527,7 @@ def stats
     end
     all += v
   }
-  print "total      | "
+  print "total         | "
   $active_sites.each {|site|
     fmt = "%#{site.to_s.length}d | "
     printf(fmt, (totals[site] || 0))
@@ -510,7 +574,7 @@ def list_done
       }
     end
     unless photo_sent.has_value?(false)
-      puts "#{filename} sent to all sites"
+      puts "#{filename} sent to all sites"+" "*20 unless $silent
     end
   }
 end
@@ -532,7 +596,7 @@ end
 # dort koennen sie entweder geloescht oder archiviert werden
 # Es schadet aber auch nicht, wenn dieser Schritt nie ausgefuehrt wird.
 def purge_done
-  puts 'purge_done'
+  puts 'purge_done' unless $silent
   Dir.glob(File.join($upload_dir,'*')).each {|filename|
     photo_sent = {}
     $active_sites.each {|site|
@@ -549,15 +613,16 @@ def purge_done
       }
     end
     unless photo_sent.has_value?(false)
-      puts "#{filename} sent to all sites"
+      puts "#{filename} sent to all sites" unless $silent
       if !File.exist? $done_dir
         FileUtils.mkdir $done_dir
       end
-      puts "mv #{filename} done/#{File.basename filename}"
-      FileUtils.mv filename, $done_dir+"/"
+      puts "mv #{filename} done/#{File.basename filename}" unless $silent
+      FileUtils.mv(filename, File.join($done_dir,File.basename(filename))) 
       if tagsfile?(filename)
-        puts "mv #{tagsfilename(filename)} done/#{File.basename(tagsfilename(filename))}"
-        FileUtils.mv(tagsfilename(filename), $done_dir+"/")
+        puts "mv #{tagsfilename(filename)} done/#{File.basename(tagsfilename(filename))}" unless $silent
+        FileUtils.mv(tagsfilename(filename), 
+          File.join($done_dir,File.basename(tagsfilename(filename))))
       end
     end
   }
@@ -582,8 +647,8 @@ def no_tags
         if $count_flag
           photo = Photo.new(fn)
           photo.set_keywords_without_write
-          if photo.tags.size < $count
-            puts fn + " only #{photo.tags.size} keywords"
+          if photo.tags.uniq.size < $count
+            puts fn + " only #{photo.tags.uniq.size} keywords"
           end
         end
       end
@@ -609,7 +674,7 @@ def plist
       photo.set_keywords_without_write
       printf("%-30s ",filename)
       if tagsfile?(filename)
-        printf "(t %2d) ", photo.tags.size
+        printf "(t %2d) ", photo.tags.uniq.size
       else
         print '       '
       end
@@ -626,6 +691,24 @@ def plist
   }
 end
 
+# Testet, ob für jedes Tag in jeder tags-Datei eine Übersetzung existiert.
+def check_translation
+  allfiles = Dir.glob(File.join($upload_dir,'*'))
+  if $ordered
+    allfiles.sort!
+  end
+  allfiles.each {|fn|
+    next if File.basename(fn)[0,4] == ROT_PREFIX
+    if fn.upcase =~ PICTURE_FILES
+      if tagsfile?(fn)
+        photo = Photo.new(fn)
+        photo.set_keywords_without_write(:de,:en) #TODO: später noch flexibler machen!
+      end
+      
+    end
+  }
+end
+
 if $send_all or $total_per_site
   send_all
 end
@@ -662,3 +745,7 @@ end
 if $plist
   plist
 end
+
+if $check_translation
+  check_translation
+end

data/bin/multistockphoto-gui

@@ -5,6 +5,9 @@ begin
   require 'rubygems' 
 rescue LoadError
 end
+#gem 'wxruby', "1.9.7"
+#require 'wx'
+gem 'wxruby', "!=1.9.8"
 require 'wx'
 
 # This sample shows a fairly minimal Wx::App using a Frame, with a
@@ -19,6 +22,7 @@ class MinimalFrame < Wx::Frame
   Id_purge_done = 2003
   Id_no_tags = 2004
   Id_not_sent = 2005
+  Id_random = 2006
   
   def initialize(title)
     # The main application frame has no parent (nil)
@@ -43,6 +47,7 @@ class MinimalFrame < Wx::Frame
     menu_actions.append(Id_send_all,"Send all photos")
     menu_actions.append(Id_list_done,"List all done photos")
     menu_actions.append(Id_purge_done,"Purge all done photos")
+    menu_actions.append(Id_random,"Random")
     menu_bar.append(menu_actions, "Actions")
     
     #multistockphoto - admin
@@ -70,6 +75,7 @@ class MinimalFrame < Wx::Frame
     evt_menu Id_list_done, :on_list_done
     evt_menu Id_no_tags, :on_no_tags
     evt_menu Id_not_sent, :on_not_sent
+    evt_menu Id_random, :on_random
   end
 
   # End the application; it should finish automatically when the last
@@ -96,6 +102,35 @@ class MinimalFrame < Wx::Frame
     self.status_text = "done uploading all photos"
   end
   
+  def on_random
+    puts 'random'
+    self.status_text = "select a random picture"
+all = Dir.glob("upload/*.JPG")
+while true
+  r = all[rand(all.size)]
+  b = File.basename(r,".JPG")
+  p b
+  t = File.join("upload", b)+".tags"
+  p t
+  if b[0...4] == 'rot_'  
+    puts "nur rotierte Datei"
+  elsif File.exist? t
+    puts "tags-File existiert schon"
+  else
+    Thread.start do
+      `eog #{r}`
+    end
+    Thread.start do
+      `gedit #{t}` 
+    end
+    break # wir haben eine gefunden
+  end
+end
+
+#    puts `ruby  random.rb`
+    self.status_text = "done random"
+  end
+  
   def on_list_done
     self.status_text = "list-done"
     result = `multistockphoto --list-done`
@@ -149,4 +184,4 @@ Wx::App.run do
   self.app_name = 'Minimal'
   frame = MinimalFrame.new("multistockphoto")
   frame.show
-end
+end

data/config.yaml

@@ -5,6 +5,7 @@
 - :photocase
 - :dreamstime
 - :bigstockphoto
+- :panthermedia
 :zoonar: 
   :user: 'hugo'
   :password: 'lalala'
@@ -31,3 +32,9 @@
   :ftp_user: 'dennis12345'
   :ftp_password: 'ftpgeheimdennis'
   :total_per_day: 1
+:panthermedia: 
+  :user: 'iris'
+  :password: 'irisgeheim'
+  :ftp_user: 'irisftp'
+  :ftp_password: 'irisftpgeheim'
+  :total_per_day: 1de

data/lib/multistockphoto/generic_site.rb

@@ -8,6 +8,10 @@ class GenericSite
   def initialize(name)
     @name = name
     @max_errors = MAX_ERRORS
+    unless File.exist?(SENDLIST)
+      warn "File #{SENDLIST} does not exist - creating empty file"
+      File.open(SENDLIST,"w"){|file|}
+    end
   end
 
   def photos_fuer_heute_uebrig?
@@ -30,6 +34,11 @@ class GenericSite
     return g.size > 0
   end
   
+  # Groesse der Datei gueltig fuer die Site, auch in Verbindung mit File-Typ
+  def photosize_valid?(photo)
+    true
+  end
+
   protected
   
   def sent_today_site(p_site)
@@ -37,8 +46,11 @@ class GenericSite
     count = {}
     File.open(SENDLIST) {|f|
       f.each_line {|line|
+        #TODO: leere Zeilen ignorieren
         site, photo_file, time = line.chomp.split("\t")
-        date = Date.parse(time)
+         
+          date = Date.parse(time)
+        
         key = [site, date]
         if count[key]==nil 
           count[key] = 1