multistockphoto 0.5.1 → 0.6.0

data/History.txt

@@ -1,3 +1,13 @@
+== 0.6.0 2008-06-10
+* 4 enhancements
+  * Sendedauer fuer jedes Photo beim Senden auflisten
+  * Option --ordered fuer alphabetisches Senden der Files
+  * Option --no-tags erstellt (auch in Verbindung mit --ordered)
+  * neues Sender-Objekt fuer zentrale Upload-Funktionen
+== 0.5.2 2008-05-30
+* 1 bug fix
+  * Ja ja, Thomas. Erst eine dicke Lippe riskieren, von wegen "fehlerfrei" und dann noch nichtmal die Sprachelemente von Ruby beherrschen... skip -> next
+  * Keine weiteren Sendeversuche, wenn fuer eine Site bereits die maximale Upload-Anzahl / Tag erreicht ist und dieser Schalter in Konfigurationsdatei gesetzt
 == 0.5.1 2008-05-29
 * 1 bug fix
   * Fehlerbehandlung wenn Site keine Photos mehr annimmt

data/Manifest.txt

@@ -6,11 +6,15 @@ README.txt
 Rakefile
 config.yaml
 bin/multistockphoto
+bin/multistockphoto-gui
+bin/mondrian.png
+bin/mondrian.ico
 config/hoe.rb
 config/requirements.rb
 lib/multistockphoto.rb
 lib/multistockphoto/multistockphoto.rb
 lib/multistockphoto/version.rb
+lib/multistockphoto/sender.rb
 lib/multistockphoto/generic_site.rb
 lib/multistockphoto/site_fotolia.rb
 lib/multistockphoto/site_zoonar.rb
@@ -31,6 +35,7 @@ test/test_helper.rb
 test/test_multistockphoto.rb
 website/index.html
 website/index.txt
+website/face_boy.gif
 website/javascripts/rounded_corners_lite.inc.js
 website/stylesheets/screen.css
 website/template.html.erb

data/bin/multistockphoto

@@ -8,9 +8,12 @@ include Magick
 require 'exifr'
 
 SENDELISTE = 'sendeliste.dat'
+MAX_ERRORS = 3
+PICTURE_FILES = /.PNG|.JPG|.GIF|.JPEG/
 
+# alle Sites komplett bearbeitet?
 def all_sites_done(sites,n)
-  p sites
+  #p sites
   result = true
   sites.each {|entry|
     if entry[1] < n
@@ -21,17 +24,13 @@ def all_sites_done(sites,n)
 end
 
 version = Multistockphoto::VERSION::STRING
-SITES = ['fotolia',
-  'zoonar',
-  'photocase',
-]
 
 Choice.options do
-  header ''
-  header 'Specific options:'
+  header 'Options:'
+  #header 'Specific options:'
   #...
-  separator ''
-  separator 'Common options: '
+  #separator ''
+  #separator 'Common options: '
 
   option :help do
     #short '-h'
@@ -105,7 +104,7 @@ Choice.options do
   end
 
   option :check_orientation do
-    short '-o'
+    short '-c'
     long '--check-orientation'
     desc 'Displays the orientiation of photo files'
     action do
@@ -115,7 +114,7 @@ Choice.options do
 
   option :rotate do
     short '-r'
-    long '--rotate'
+    long '--rotate file [file2 ...]'
     desc 'Rotate a photo file 90 degrees to the left'
     action do
       $rotate_photos = true
@@ -132,7 +131,7 @@ Choice.options do
   end
 
   option :list_done do
-    short '-d'
+    short '-l'
     long '--list-done'
     desc 'List photos sent to all sites'
     action do
@@ -149,8 +148,55 @@ Choice.options do
     end
   end
 
+  option :ordered do
+    short '-o' #TODO: geht das?
+    long '--ordered'
+    desc 'Send/List files in alphabetical order'
+    action do
+      $ordered = true
+    end
+  end
+
+  option :no_tags do
+    short '-q'
+    long '--no-tags'
+    desc 'List photos without tags file' #TODO: eigentlich muss man auch auf vorhandene IPTC in Photo selbst testen
+    action do
+      $no_tags = true
+    end
+  end
+
+  option :dont_send do
+    long '--dont-send'
+    action do
+      $dont_send = true
+    end
+  end
+
+  option :dont_log do
+    long '--dont-log'
+    action do
+      $dont_log = true
+    end
+  end
 end
 
+sender = Sender.new("egal")
+$active_sites = sender.active_sites # [:fotolia,:zoonar,:photocase,...]
+$upload_dir = sender.upload_dir
+$done_dir = sender.done_dir
+
+# konvertiert Sekundenanzahl in Format "MM:SS"
+def formatted_minutes(d)
+  mm = (d / 60.0).floor
+  d = d-mm*60
+  ss = d.round
+  #  return sprintf("%02d:%02d:%02d",hh,mm,ss)
+  return sprintf("%d:%02d",mm,ss)
+end
+
+# Senden aller noch nicht gesendeten Photos an alle Sites
+# unter Berücksichtigung sonstiger Optionsparameter
 def send_all
   total_transfers = 0
   total = {}
@@ -160,79 +206,125 @@ def send_all
     total[site] = 0
     errors[site] = 0
   }
-  p total
   puts 'sending all unsent photos'
 
-  done = {:fotolia => false,
+  # rotate photos
+  # - true: we do the rotation
+  # - false: the site does the rotation automatically
+  # change to false if a photo site can automatically rotate photos
+  rotate_photos = {
+    :fotolia => true,
+    :zoonar => true,
+    :photocase => true,
+  }
+
+  done = {
+    :fotolia => false,
     :zoonar => false,
     :photocase => false,
   }
-  remaining = {:fotolia => 999_999_999,
+  remaining = {
+    :fotolia => 999_999_999,
     :zoonar => 999_999_999,
     :photocase => 999_999_999,
   }
   sites.each {|site|
-    # p   "#{site.to_s.capitalize}"+".new(#{site.to_s.capitalize})"
+    # dynamisches Site.new("site")
     s = eval("#{site.to_s.capitalize}"+".new(#{site.to_s.capitalize})")
     if s.total_per_day
       remaining[site] = s.total_per_day - s.heute_schon_gesendet(site)
     end
   }
-
-  Dir.glob('upload/*').each {|filename|
+  allfiles = Dir.glob($upload_dir+'/*')
+  if $ordered
+    allfiles.sort!
+  end
+  allfiles.each {|filename|
     next if File.basename(filename)[0,4] == 'rot_'
     #puts "rot_ uebersprungen"
-    if filename.upcase =~ /.PNG|.JPG|.GIF|.JPEG/
+    if filename.upcase =~ PICTURE_FILES
       total_per_site_flag = $total_per_site
       photo = Photo.new(filename)
-      [:fotolia, :zoonar, :photocase].each {|site_name|
-        site = eval(site_name.to_s.capitalize+".new(#{site_name.to_s.capitalize})")
-        skip if done[:sitename]
-        #       skip if !site.photos_fuer_heute_uebrig?
-        if $send_all or
-            #          ($send_all and site.total_per_day and site.photos_fuer_heute_uebrig?) or
-          (total_per_site_flag and total[site_name] < Choice.choices[:total_per_site])
-          #photo = Photo.new(filename)
-          begin
-            if !site.already_sent?(photo)
-              result = site.transfer(photo)
-              if result != :duplicate
-                total_transfers += 1
-                total[site_name] += 1
-                remaining[site_name] -= 1
-                done[site_name] = true if remaining[site_name] <= 0
+#      [:fotolia, :zoonar, :photocase].each {|site_name|
+      $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})")
+            site.rotate_photos = rotate_photos[site_name]
+            done[site_name] = true if remaining[site_name] <= 0
+            next if done[site_name]
+            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
+                    if $verbose
+                      t2 = Time.now
+                      if $dont_send and $dont_log
+                        puts "1:23"
+                      else
+                        puts formatted_minutes(t2-t1)
+                      end
+                      p total # Summenzeile ausgeben
+                    end
+                  end
+                rescue UploadException #Net::FTPTempError #TODO: gefaellt mir noch nicht so ganz
+                  errors[site_name] += 1
+                  if errors[site_name] >= MAX_ERRORS
+                    done[site_name] = true # nichts mehr uploaden
+                    puts "too many errors. giving up."
+                  end
+                  #            puts "FTP-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
+                  puts "Upload error at sending to #{site_name} occurred. Check configuration or try again later!"
+                  #                rescue SocketError
+                  #                  puts "SocketError: no net? waiting 60 secs"
+                  #                  sleep 60
+                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
-              if result != :duplicate
-                errors[site_name] = 0
-              end
-            end
-            break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
-            break if all_sites_done(total,Choice.choices[:total_per_site])
-          rescue #UploadException #Net::FTPTempError #TODO: gefaellt mir noch nicht so ganz
-            errors[site_name] += 1
-            if errors[site_name] >= 3
-              done[site_name] = true # nichts mehr uploaden
-              puts "too many errors. giving up."
+              break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
+              break if all_sites_done(total,Choice.choices[:total_per_site])
             end
-#            puts "FTP-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
-            puts "Upload-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
-          end
-        end
+          end # Timeout
+        end # timeout
       }
     end
   }
   puts "#{total_transfers} photos sent."
 end
 
-def  check_orientation_loop
+# gibt Orientation aller uebergebenen Bilddateien aus
+def check_orientation_loop
   ARGV.each {|fn|
     if fn[0,1] != '-'
-      pic = ImageList.new(fn)
-      puts "#{fn}:\t#{pic.orientation}"
+      #pic = ImageList.new(fn)
+      #puts "#{fn}:\t#{pic.orientation}"
+      pic = Photo.new(fn)
+      if pic.portrait?
+        puts "#{fn}:\tportrait"
+      else
+        puts "#{fn}:\tlandscape"
+      end
     end
   }
 end
 
+# rotiert alle uebergebenenen Bilddateien
 def rotate_photos
   ARGV.each {|fn|
     if fn[0,1] != '-'
@@ -245,19 +337,19 @@ def rotate_photos
   }
 end
 
+# summiert noch nicht gesendete Bilder und listet pro Site auf
 def not_sent
   not_sent = {}
-  SITES.each {|site|
+  $active_sites.each {|site|
     not_sent[site] = 0
   }
   puts "not sent photos:"
-  Dir.glob('upload/*').each {|filename|
+  Dir.glob($upload_dir+'/*').each {|filename|
     next if File.basename(filename)[0,4] == 'rot_'
-    #puts "rot_ uebersprungen"
-    if filename.upcase =~ /.PNG|.JPG|.GIF|.JPEG/
-      SITES.each {|site|
-        print filename+"\t"+site+"\t" if $verbose
-        g = grep("sendeliste.dat", /#{site}\t#{filename}/)
+    if filename.upcase =~ PICTURE_FILES
+      $active_sites.each {|site|
+        print filename+"\t"+site.to_s+"\t" if $verbose
+        g = grep(SENDELISTE, /#{site.to_s}\t#{filename}/)
         if g.size == 0
           puts "not sent" if $verbose
           not_sent[site] += 1
@@ -270,9 +362,11 @@ def not_sent
   p not_sent
 end
 
+# listet Statistik ueber gesendete Bilder der letzten 10 Tage pro Site auf,
+# sowie Summenzeile ueber alle gesendeten Bilder
 def stats
   count = {}
-  File.open("sendeliste.dat") {|f|
+  File.open(SENDELISTE) {|f|
     f.each_line {|line|
       site,photo_file,time = line.chomp.split("\t")
       date = Date.parse(time)
@@ -285,8 +379,8 @@ def stats
     }
   }
   print " "*11+"| "
-  SITES.each {|site|
-    print "#{site}"
+  $active_sites.each {|site|
+    print "#{site.to_s}"
     print " | "
   }
   puts "total"
@@ -296,9 +390,9 @@ def stats
     chosen_date = today - i
     total = 0
     print chosen_date.to_s+" | "
-    SITES.each {|site|
-      key = [site, chosen_date]
-      fmt = "%#{site.length}d | "
+    $active_sites.each {|site|    
+      key = [site.to_s, chosen_date]
+      fmt = "%#{site.to_s.length}d | "
       printf(fmt, (count[key] || 0))
       total += (count[key] || 0)
     }
@@ -307,18 +401,17 @@ def stats
   puts
   totals = {}
   all = 0
-  SITES.each {|site|
+  $active_sites.each {|site|
     totals[site] = 0
   }
   count.each_pair {|k,v|
     site = k[0]
-    #date = k[1]
-    totals[site] += v
+    totals[site.to_sym] += v
     all += v
   }
   print "total      | "
-  SITES.each {|site|
-    fmt = "%#{site.length}d | "
+  $active_sites.each {|site|
+    fmt = "%#{site.to_s.length}d | "
     printf(fmt, (totals[site] || 0))
   }
   fmt = "%#{"total".length}d"
@@ -326,90 +419,121 @@ def stats
   puts
 end
 
-if $send_all or $total_per_site
-  send_all
-end
-
-if $check_orientation_loop
-  check_orientation_loop
-end
-
-if $rotate_photos
-  rotate_photos
-end
-
-if $not_sent
-  not_sent
-end
-
-if $stats
-  puts "Statistics"
-  stats
-end
-
-if $list_done
-  #puts 'list_done'
-  #not_sent = {}
-  #SITES.each {|site|
-  # not_sent[site] = 0
-  #}
-
-  Dir.glob('upload/*').each {|filename|
+# listet Bilddateien auf, die an alle Sites gesendet wurden
+def list_done
+  Dir.glob($upload_dir+'/*').each {|filename|
     photo_sent = {}
-    SITES.each {|site|
+    $active_sites.each {|site|
       photo_sent[site] = false
     }
     next if File.basename(filename)[0,4] == 'rot_'
-    #puts "rot_ uebersprungen"
-    if filename.upcase =~ /.PNG|.JPG|.GIF|.JPEG/
-      SITES.each {|site|
-        print filename+"\t"+site+"\t" if $verbose
-        g = grep(SENDELISTE, /#{site}\t#{filename}/)
-        if g.size == 0
-          #puts "not sent" if $verbose
-          #not_sent[site] += 1
-        else
-          #puts 'already sent' if $verbose
+    if filename.upcase =~ PICTURE_FILES
+      $active_sites.each {|site|
+        print filename+"\t"+site.to_s+"\t" if $verbose
+        g = grep(SENDELISTE, /#{site.to_s}\t#{filename}/)
+        unless g.size == 0
           photo_sent[site] = true
         end
       }
     end
-    #    p photo_sent
-    if photo_sent.has_value?(false)
-      #puts "#{filename} nicht an alle gesendet"
-    else
-      puts "#{filename} an alle Sites gesendet"
+    unless photo_sent.has_value?(false)
+      puts "#{filename} sent to all sites"
     end
   }
-  # p not_sent
 end
 
-if $purge_done
+# erzeugt Dateiname einer tags Datei zu einer uebergebenen Photodatei,
+# egal, ob tags-Datei wirlich existiert oder nicht
+def tagsfilename(picturefilename)
+  ext = File.extname(picturefilename)
+  tagsfile = picturefilename.sub(ext,".tags")
+  return tagsfile
+end
+
+# Test, ob zu einer Photodatei eine tags-Datei existiert
+def tagsfile?(picturefilename)
+  return File.exist?(tagsfilename(picturefilename))
+end
+
+# verschiebt Bilddateien, die an alle Sites gesendet wurden ins Directory 'done'
+# 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'
-  Dir.glob('upload/*').each {|filename|
+  Dir.glob($upload_dir+'/*').each {|filename|
     photo_sent = {}
-    SITES.each {|site|
+    $active_sites.each {|site|
       photo_sent[site] = false
     }
     next if File.basename(filename)[0,4] == 'rot_'
-    if filename.upcase =~ /.PNG|.JPG|.GIF|.JPEG/
-      SITES.each {|site|
-        print filename+"\t"+site+"\t" if $verbose
-        g = grep(SENDELISTE, /#{site}\t#{filename}/)
+    if filename.upcase =~ PICTURE_FILES
+      $active_sites.each {|site|
+        print filename+"\t"+site.to_s+"\t" if $verbose
+        g = grep(SENDELISTE, /#{site.to_s}\t#{filename}/)
         if g.size > 0
           photo_sent[site] = true
         end
       }
     end
-    if photo_sent.has_value?(false)
-      #puts "#{filename} nicht an alle gesendet"
-    else
-      puts "#{filename} an alle Sites gesendet"
-      if !File.exist? 'done'
-        FileUtils.mkdir 'done'
+    unless photo_sent.has_value?(false)
+      puts "#{filename} sent to all sites"
+      if !File.exist? $done_dir
+        FileUtils.mkdir $done_dir
       end
       puts "mv #{filename} done/#{File.basename filename}"
-      FileUtils.mv filename, "done/"
+      FileUtils.mv filename, $done_dir+"/"
+      if tagsfile?(filename)
+        puts "mv #{tagsfilename(filename)} done/#{File.basename(tagsfilename(filename))}"
+        FileUtils.mv(tagsfilename(filename), $done_dir+"/")
+      end
     end
   }
 end
+
+# Listet alle Photo-Dateien auf, zu denen es keine .tags-Datei gibt
+def no_tags
+  allfiles = Dir.glob($upload_dir+'/*')
+  if $ordered
+    allfiles.sort!
+  end
+  allfiles.each {|fn|
+    next if File.basename(fn)[0,4] == 'rot_'
+    if fn.upcase =~ PICTURE_FILES
+      puts fn unless tagsfile?(fn)
+    end
+  }
+end
+
+if $send_all or $total_per_site
+  send_all
+end
+
+if $check_orientation_loop
+  check_orientation_loop
+end
+
+if $rotate_photos
+  rotate_photos
+end
+
+if $not_sent
+  not_sent
+end
+
+if $stats
+  puts "Statistics"
+  stats
+end
+
+if $list_done
+  list_done
+end
+
+if $purge_done
+  purge_done
+end
+
+if $no_tags
+  no_tags
+end
+