multistockphoto 0.3.0 → 0.5.0

data/History.txt

@@ -1,10 +1,21 @@
-== 0.3.0 2008-05-10
-* 5 major enhancements:
+== 0.5.0 2008-05-19???
+* 2 major enhancements:
+  * Schalter in Konfigurationsdatei :total_per_day (pro Site)
+
+== 0.4.0 2008-05-19
+* 2 major enhancements:
+  * Schalter --stats fuer Sendestatistik
+  * Bilder automatisch drehen, wenn in Hochformat aufgenommmen
+  * Schalter --verbose fuer geschwaetzigen Output
+
+== 0.3.0 2008-05-19
+* 6 major enhancements:
   * Site in Lauf deaktivieren, wenn zu viele Fehler
   * Schalter '--total-per-site=N'
   * Schalter '--total-transfers=N' - Nur N Uploads insgsamte pro Session
   * Schalter '--check-orientation'
   * Schalter '--rotate'
+  * Schalter '--not-sent' Listet auf wieviele Photos je Site noch nicht gesendet wurden
 * 1 bug fix
   * kurze Optionsschalter nur noch 1 Zeichen lang und anders benannt
 

data/bin/multistockphoto

@@ -7,6 +7,8 @@ require 'RMagick'
 include Magick
 require 'exifr'
 
+SENDELISTE = 'sendeliste.dat'
+
 def all_sites_done(sites,n)
   p sites
   result = true
@@ -19,6 +21,11 @@ def all_sites_done(sites,n)
 end
 
 version = Multistockphoto::VERSION::STRING
+SITES = ['fotolia',
+  'zoonar',
+  'photocase',
+]
+
 Choice.options do
   header ''
   header 'Specific options:'
@@ -41,7 +48,7 @@ Choice.options do
       exit
     end
   end
-  
+
   option :send_all do
     short '-a'
     long '--send-all'
@@ -50,11 +57,29 @@ Choice.options do
       $send_all=true
     end
   end
-  
+
+  option :verbose do
+    short '-y'
+    long '--verbose'
+    desc 'Verbose output'
+    action do
+      $verbose = true
+    end
+  end
+
+  option :not_sent do
+    short '-n'
+    long '--not-sent'
+    desc 'Count not sent files per site'
+    action do
+      $not_sent = true
+    end
+  end
+
   option :total_transfers do
     short '-t'
     long '--total-transfers'
-    desc 'dont\'t send more than N photos in total'
+    desc 'Dont\'t send more than N photos in total'
     cast Integer
     default 999
     action do
@@ -68,7 +93,7 @@ Choice.options do
   option :total_per_site do
     short '-s'
     long '--total-per-site'
-    desc 'send no more than N photos per site'
+    desc 'Send no more than N photos per site'
     cast Integer
     default 999
     action do
@@ -78,11 +103,11 @@ Choice.options do
       p $total_per_site
     end
   end
-  
+
   option :check_orientation do
     short '-o'
     long '--check-orientation'
-    desc 'displays the orientiation of photo files'
+    desc 'Displays the orientiation of photo files'
     action do
       $check_orientation_loop = true
     end
@@ -91,11 +116,39 @@ Choice.options do
   option :rotate do
     short '-r'
     long '--rotate'
-    desc 'rotate a photo file 90 degrees to the left'
+    desc 'Rotate a photo file 90 degrees to the left'
     action do
       $rotate_photos = true
     end
   end
+
+  option :stats do
+    short '-x'
+    long '--stats'
+    desc 'Displays statistics'
+    action do
+      $stats = true
+    end
+  end
+
+  option :list_done do
+    short '-d'
+    long '--list-done'
+    desc 'List photos sent to all sites'
+    action do
+      $list_done = true
+    end
+  end
+
+  option :purge_done do
+    short '-p'
+    long '--purge-done'
+    desc 'Purge photos sent to all sites'
+    action do
+      $purge_done = true
+    end
+  end
+
 end
 
 def send_all
@@ -104,97 +157,67 @@ def send_all
   errors = {}
   sites = [:fotolia, :zoonar, :photocase]
   sites.each {|site|
-    total[site] = 0  
-    errors[site] = 0 
+    total[site] = 0
+    errors[site] = 0
   }
   p total
   puts 'sending all unsent photos'
-  Dir.glob('upload/*').each {|filename| 
+
+  done = {:fotolia => false,
+    :zoonar => false,
+    :photocase => false,
+  }
+  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})"
+    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|
     next if File.basename(filename)[0,4] == 'rot_'
     #puts "rot_ uebersprungen"
     if filename.upcase =~ /.PNG|.JPG|.GIF|.JPEG/
-      #puts filename
       total_per_site_flag = $total_per_site
-      #p total_per_site_flag
-      # Fotolia
-      if errors[:fotolia] < 3
-        if $send_all or (total_per_site_flag and total[:fotolia] < Choice.choices[:total_per_site])
-          site = Fotolia.new("Fotolia")
-          photo = Photo.new(filename)
+      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
-            result = site.transfer(photo)
-            if result != :duplicate
-              total_transfers += 1
-              total[:fotolia] += 1
-            end
-            if result != :duplicate
-              errors[:fotolia] = 0
+            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
+              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 Net::FTPTempError
-            errors[:fotolia] += 1
-            if errors[:fotolia] >= 3
-              puts "too many errors. giving up."
-            end
-            puts "FTP-Fehler beim Senden an Fotolia aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
-          end
-        end
-      end
-
-      # Zoonar
-      if errors[:zoonar] < 3
-        if $send_all or (total_per_site_flag and total[:zoonar] < Choice.choices[:total_per_site])
-          site = Zoonar.new("Zoonar")
-          photo = Photo.new(filename)
-          begin
-            result = site.transfer(photo)
-            if result != :duplicate
-              total_transfers += 1
-              total[:zoonar] += 1
-            end
-            if result != :duplicate
-              errors[:zoonar] = 0
-            end
-            break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
-            break if all_sites_done(total,Choice.choices[:total_per_site])
-          rescue
-            errors[:zoonar] += 1
-            if errors[:zoonar] >= 3
-              puts "too many errors. giving up."
-            end
-            puts "Fehler beim Senden an Zoonar aufgetreten"
-          end
-        end
-      end
-
-      # Photocase
-      if errors[:photocase] < 3
-        if $send_all or (total_per_site_flag and total[:photocase] < Choice.choices[:total_per_site])
-          site = Photocase.new("Photocase")
-          photo = Photo.new(filename)
-          begin
-            result = site.transfer(photo)
-        
-            if result != :duplicate
-              total_transfers += 1
-              total[:photocase] += 1
-            end
-            if result != :duplicate
-              errors[:photocase] = 0
-            end
-
-            break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
-            break if all_sites_done(total, Choice.choices[:total_per_site])
-          rescue
-            errors[:photocase] += 1
-            if errors[:photocase] >= 3
+            errors[site_name] += 1
+            if errors[site_name] >= 3
+              done[site_name] = true # nichts mehr uploaden
               puts "too many errors. giving up."
             end
-            puts "Fehler beim Senden an Photocase aufgetreten"
+            puts "FTP-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
           end
         end
-      end
+      }
     end
   }
   puts "#{total_transfers} photos sent."
@@ -206,7 +229,7 @@ def  check_orientation_loop
       pic = ImageList.new(fn)
       puts "#{fn}:\t#{pic.orientation}"
     end
-  }  
+  }
 end
 
 def rotate_photos
@@ -218,7 +241,88 @@ def rotate_photos
       puts "writing to #{fn}"
       pic.write(fn)
     end
-  }  
+  }
+end
+
+def not_sent
+  not_sent = {}
+  SITES.each {|site|
+    not_sent[site] = 0
+  }
+  puts "not sent photos:"
+  Dir.glob('upload/*').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 g.size == 0
+          puts "not sent" if $verbose
+          not_sent[site] += 1
+        else
+          puts 'already sent' if $verbose
+        end
+      }
+    end
+  }
+  p not_sent
+end
+
+def stats
+  count = {}
+  File.open("sendeliste.dat") {|f|
+    f.each_line {|line|
+      site,photo_file,time = line.chomp.split("\t")
+      date = Date.parse(time)
+      key = [site, date]
+      if count[key]==nil
+        count[key] = 1
+      else
+        count[key] = count[key] + 1
+      end
+    }
+  }
+  print " "*11+"| "
+  SITES.each {|site|
+    print "#{site}"
+    print " | "
+  }
+  puts "total"
+  d = DateTime.now
+  today = Date.new(d.year, d.month, d.day)
+  10.times do |i|
+    chosen_date = today - i
+    total = 0
+    print chosen_date.to_s+" | "
+    SITES.each {|site|
+      key = [site, chosen_date]
+      fmt = "%#{site.length}d | "
+      printf(fmt, (count[key] || 0))
+      total += (count[key] || 0)
+    }
+    printf("%5d\n", total)
+  end
+  puts
+  totals = {}
+  all = 0
+  SITES.each {|site|
+    totals[site] = 0
+  }
+  count.each_pair {|k,v|
+    site = k[0]
+    #date = k[1]
+    totals[site] += v
+    all += v
+  }
+  print "total      | "
+  SITES.each {|site|
+    fmt = "%#{site.length}d | "
+    printf(fmt, (totals[site] || 0))
+  }
+  fmt = "%#{"total".length}d"
+  printf(fmt, all)
+  puts
 end
 
 if $send_all or $total_per_site
@@ -232,3 +336,79 @@ 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|
+    photo_sent = {}
+    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
+          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"
+    end
+  }
+  # p not_sent
+end
+
+if $purge_done
+  puts 'purge_done'
+  Dir.glob('upload/*').each {|filename|
+    photo_sent = {}
+    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 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'
+      end
+      puts "mv #{filename} done/#{File.basename filename}"
+      FileUtils.mv filename, "done/"
+    end
+  }
+end

data/config.yaml

@@ -2,11 +2,15 @@
 :zoonar: 
   :user: 'hugo'
   :password: 'lalala'
+  :total_per_day: 10
+
 :fotolia: 
   :user: 'hugo'
   :password: 'lalala'
   :ftp_user: '200507099'
   :ftp_password: 'hugolalala'
+  :total_per_day: 11
 :photocase: 
   :user: 'hugo'
   :password: 'lalala'
+  :total_per_day: 12

data/lib/multistockphoto/generic_site.rb

@@ -1,9 +1,45 @@
 class GenericSite
-  
   attr_reader :name
-  attr_accessor :user, :password
+  attr_accessor :user, :password, :max_errors
+
+  MAX_ERRORS = 3
+  SENDELISTE = 'sendeliste.dat'
   
   def initialize(name)
     @name = name
+    @max_errors = MAX_ERRORS
+  end
+
+  def photos_fuer_heute_uebrig?
+    puts "noch #{total_per_day - sent_today} zu senden"
+    return total_per_day - sent_today > 0
   end
+
+  def heute_schon_gesendet(site)
+    sent_today_site(site)
+  end
+  
+  protected
+  
+  def sent_today_site(site)
+    count = {}
+    File.open("sendeliste.dat") {|f|
+      f.each_line {|line|
+        site, photo_file, time = line.chomp.split("\t")
+        date = Date.parse(time)
+        key = [site, date]
+        if count[key]==nil 
+          count[key] = 1
+        else
+          count[key] = count[key] + 1
+        end
+      }
+    }
+    d = DateTime.now
+    today = Date.new(d.year, d.month, d.day)
+    chosen_date = today 
+    key = [site, chosen_date]
+    return (count[key] || 0)
+  end
+  
 end

data/lib/multistockphoto/photo.rb

@@ -1,47 +1,27 @@
-require 'RMagick'
-include Magick
-require 'exifr'
+require 'rubygems'
+require 'mini_exiftool'
+#require 'RMagick'
+#include Magick
+#require 'exifr'
 
 class Photo
   attr_reader :filename
+  attr_accessor :tags
 
   def initialize(filename)
     @filename = filename
+    @tags = nil
   end
   
   # ist Bild im Hochformat 
-  # TODO: ziemlich dummer Test, verbessern!
-  def hochformat
+  # TODO: paßt dieser Test für alle gedrehten Bilder?
+  def portrait
     pic = ImageList.new(@filename)
     if pic.orientation == LeftBottomOrientation
       return true
     else
       return false
     end
-  
-    if false
-      require 'rubygems'
-    
-      require 'RMagick'
-      include Magick
-
-      pic = ImageList.new("/home/tp/multistockphoto/upload/IMG_3453.JPG")
-      pic2 = ImageList.new("/home/tp/multistockphoto/upload/IMG_3464.JPG")
-      puts pic.orientation
-      puts pic2.orientation
-      #pic2 = pic.auto_orient
-      #pic.display
-      #pic2.display
-      if pic.orientation == LeftBottomOrientation
-        pic.auto_orient!
-        pic.write("/tmp/rLALA1234.JPG")
-      end
-
-    end
-    #    width = EXIFR::JPEG.new(@filename).width
-    #    height = EXIFR::JPEG.new(@filename).height
-    #    #return (width < height)
-    #    false
   end
 
   def drehen
@@ -55,6 +35,61 @@ class Photo
         pic.write(tmpname)
       end
     end
+  end
+
+  # setzt IPTC-Keywords, enthalten in Datei <imagefilename>.tags
+  def set_keywords
+    ext = File.extname(@filename)
+    fn = @filename.sub(ext,".tags")
+    lines=[]
+    begin
+      File.open(fn) {|f|
+        lines = f.read
+      }
+      puts "tags file #{fn} found"
+      tags = Photo.to_tags(lines)
+      self.tags = tags
+      puts "writing tags to file"
+      write_keywords
+    rescue Errno::ENOENT
+      warn "WARNING: no tags file #{fn}"
+    end
+  end    
+ 
+  # Keywords aus Object-Attributen
+  def keywords
+    tags
+  end
+ 
+  # erstellt Key-Array aus String (getrennt durch newline,',' oder ' ')
+  def self.to_tags(s)
+    keys = []
+    s.split(/[, |\t\n]+/).each {|w|
+      keys << w
+    }
+    keys
+  end
+  
+  # ermittelt Keywords aus Datei
+  def file_keywords
+    photo = MiniExiftool.new @filename
+    self.tags = photo.tags
+    photo.keywords
+  end
+  
+  # schreibt Keywords in Datei-Header
+  def write_keywords
+    photo = MiniExiftool.new @filename
+    s = ''
+    tags.each {|tag|
+      if s == ''
+        s = s + tag
+      else
+        s = s + ' ' + tag
+      end
+    }
+    photo['keywords'] = s
+    photo.save
+  end
 
-  end  
 end