multistockphoto 0.5.1 → 0.6.0

data/bin/multistockphoto-gui

@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+begin
+  require 'rubygems' 
+rescue LoadError
+end
+require 'wx'
+
+# This sample shows a fairly minimal Wx::App using a Frame, with a
+# MenuBar and StatusBar but no controls. For the absolute minimum app,
+# see nothing.rb
+
+# A Wx::Frame is a self-contained, top-level Window that can contain
+# controls, menubars, and statusbars
+class MinimalFrame < Wx::Frame
+  Id_send_all = 2001
+  Id_list_done = 2002
+  Id_purge_done = 2003
+  Id_no_tags = 2004
+  Id_not_sent = 2005
+  
+  def initialize(title)
+    # The main application frame has no parent (nil)
+    super(nil, :title => title, :size => [ 400, 300 ])
+
+    # PNG can be used on all platforms, but icon type must be specified
+    # to work on Windows. Note that OS X doesn't have "Frame" icons. 
+    icon_file = File.join( File.dirname(__FILE__), "mondrian.png")
+    self.icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_PNG)
+
+    menu_bar = Wx::MenuBar.new
+    # The "file" menu
+    menu_file = Wx::Menu.new
+    # Using Wx::ID_EXIT standard id means the menu item will be given
+    # the right label for the platform and language, and placed in the
+    # correct platform-specific menu - eg on OS X, in the Application's menu
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+    menu_bar.append(menu_file, "&File")
+
+    #multistockphoto - actions
+    menu_actions = Wx::Menu.new
+    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_bar.append(menu_actions, "Actions")
+    
+    #multistockphoto - admin
+    menu_admin = Wx::Menu.new
+    menu_admin.append(Id_no_tags,"Photos without tags")
+    menu_admin.append(Id_not_sent,"Photos not sent")
+    menu_bar.append(menu_admin, "Administration")
+    
+    # The "help" menu
+    menu_help = Wx::Menu.new
+    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    menu_bar.append(menu_help, "&Help")
+
+    # Assign the menubar to this frame
+    self.menu_bar = menu_bar
+
+    # Create a status bar at the bottom of the frame
+    create_status_bar(2)
+    self.status_text = "Welcome to multistockphoto!"
+
+    # Set it up to handle menu events using the relevant methods. 
+    evt_menu Wx::ID_EXIT, :on_quit
+    evt_menu Wx::ID_ABOUT, :on_about
+    evt_menu Id_send_all, :on_send_all
+    evt_menu Id_list_done, :on_list_done
+    evt_menu Id_no_tags, :on_no_tags
+    evt_menu Id_not_sent, :on_not_sent
+  end
+
+  # End the application; it should finish automatically when the last
+  # window is closed.
+  def on_quit
+    close()
+  end
+
+  # show an 'About' dialog - WxRuby's about_box function will show a
+  # platform-native 'About' dialog, but you could also use an ordinary
+  # Wx::MessageDialog here.
+  def on_about
+    Wx::about_box(:name => self.title,
+      :version     => `multistockphoto --version`, #        Wx::WXRUBY_VERSION,
+      :description => "multistockphoto-gui application",
+      :developers  => ['Thomas Preymesser (thopre@gmail.com)'] )
+  end
+  
+  def on_send_all
+    puts 'send-all'
+    self.status_text = "uploading all photos"
+
+    #   puts `multistockphoto --send-all --verbose`
+    self.status_text = "done uploading all photos"
+  end
+  
+  def on_list_done
+    self.status_text = "list-done"
+    result = `multistockphoto --list-done`
+    puts result
+    self.status_text = "done list-done"
+  end
+  
+  def on_no_tags
+    self.status_text = "no-tags"
+    result = `multistockphoto --no-tags`
+    puts result
+    self.status_text = "done no-tags"
+  end
+
+  
+  def on_not_sent
+    
+self.status_text = "not-sent"
+    #--
+    not_sent = {}
+    SITES.each {|site|
+      not_sent[site] = 0
+    }
+    Dir.glob(UPLOAD_DIR+'/*').each {|filename|
+      next if File.basename(filename)[0,4] == 'rot_'
+      #puts "rot_ uebersprungen"
+      if filename.upcase =~ PICTURE_FILES
+        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
+          end
+        }
+      end
+    }
+    p not_sent
+    #--
+    self.status_text = "done not-sent"
+  end
+end
+
+# Wx::App is the container class for any wxruby app. To start an
+# application, either define a subclass of Wx::App, create an instance,
+# and call its main_loop method, OR, simply call the Wx::App.run class
+# method, as shown here.
+Wx::App.run do 
+  self.app_name = 'Minimal'
+  frame = MinimalFrame.new("multistockphoto")
+  frame.show
+end

data/config.yaml

@@ -1,9 +1,12 @@
 --- 
+:active_sites:
+- :fotolia
+- :zoonar
+- :photocase
 :zoonar: 
   :user: 'hugo'
   :password: 'lalala'
   :total_per_day: 10
-
 :fotolia: 
   :user: 'hugo'
   :password: 'lalala'

data/lib/multistockphoto/generic_site.rb

@@ -1,17 +1,18 @@
 class GenericSite
   attr_reader :name
-  attr_accessor :user, :password, :max_errors
+  attr_accessor :user, :password, :max_errors, :rotate_photos
 
   MAX_ERRORS = 3
-  SENDELISTE = 'sendeliste.dat'
+  SENDLIST = 'sendeliste.dat'
   
   def initialize(name)
     @name = name
     @max_errors = MAX_ERRORS
+    @rotate_photos = true
   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
 
@@ -19,11 +20,23 @@ class GenericSite
     sent_today_site(site)
   end
   
+  def already_sent_site?(photo,site)
+    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, /#{site}\t#{photo.filename}/)
+    return g.size > 0
+  end
+  
   protected
   
-  def sent_today_site(site)
+  def sent_today_site(p_site)
+    p_site = p_site.to_s
     count = {}
-    File.open("sendeliste.dat") {|f|
+    File.open(SENDLIST) {|f|
       f.each_line {|line|
         site, photo_file, time = line.chomp.split("\t")
         date = Date.parse(time)
@@ -38,7 +51,8 @@ class GenericSite
     d = DateTime.now
     today = Date.new(d.year, d.month, d.day)
     chosen_date = today 
-    key = [site, chosen_date]
+    key = [p_site, chosen_date]
+    #puts "#{count[key] || 0} photo sent to #{p_site} today"
     return (count[key] || 0)
   end
   

data/lib/multistockphoto/photo.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'mini_exiftool'
-#require 'RMagick'
-#include Magick
-#require 'exifr'
+require 'RMagick'
+include Magick
 
 class Photo
   attr_reader :filename
@@ -15,12 +14,29 @@ class Photo
   
   # ist Bild im 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
+  def portrait?
+    if false
+      pic = ImageList.new(@filename)
+      if pic.orientation == LeftBottomOrientation
+        return true
+      else
+        return false
+      end
+    end
+    if true
+      img = Magick::Image::read(@filename).first
+      #   p img
+      begin
+        if img.orientation == LeftBottomOrientation
+          return true
+        else
+          return false
+        end
+      rescue
+        puts "error in picture #{@filename}"
+        return false # TODO: etwas gefaehrlich, bei nicht richtiger JPG-Datei
+        # wuerde das auch zuenden
+      end
     end
   end
 
@@ -49,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/sender.rb

@@ -0,0 +1,30 @@
+=begin
+Die Klasse Sender dient als Ausgangspunkt fuer die Applikation. Hier sind
+zentrale Festlegungen gespeichert bzw. werden Methoden zur Verfuegung gestellt,
+die nicht einzelne Sites sondern das Senden als ganzes betreffen.
+=end
+
+class Sender
+  def initialize(name)
+    @name = name
+  end  
+  
+  # gibt ein Array in Form [:fotolia,:zoonar,:photocase] zurueck
+  def active_sites
+    if ENV['MSP_CONFIG']
+      @config = YAML.load_file(ENV['MSP_CONFIG'])
+    else
+      @config = YAML.load_file("config.yaml")
+    end
+    @config[:active_sites]
+  end
+  
+  def upload_dir
+    'upload'
+  end
+  
+  def done_dir
+    'done'
+  end
+  
+end # Sender

data/lib/multistockphoto/site_fotolia.rb

@@ -1,5 +1,6 @@
 require 'net/ftp'
 require 'grep'
+#require 'upload_exception'
 include Grep
 
 class Fotolia < GenericSite
@@ -24,8 +25,8 @@ class Fotolia < GenericSite
     @ftp_password = @config[:fotolia][:ftp_password]
     @total_per_day = @config[:fotolia][:total_per_day]
   end
-  # TODO: Bild gedreht senden, falls Hochformat
-  def transfer(photo)
+  
+  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
@@ -42,34 +43,37 @@ class Fotolia < GenericSite
     print "fotolia:#{photo.filename} ... "
     $stdout.flush
     #g = `grep "fotolia\t#{photo.filename}" sendeliste.dat` #TODO: will not work for windows
-    g = grep(SENDELISTE, /fotolia\t#{photo.filename}/)
+    g = grep(SENDLIST, /fotolia\t#{photo.filename}/)
     if g.size > 0
       puts "already sent"
       return :duplicate
     end
-    if photo.portrait
-      photo.drehen
+    if rotate_photos
+      if photo.portrait?
+        photo.drehen
+      end
+    end
+    if ! dont_send
+      begin
+        ftp = Net::FTP.new(FTP_HOST)
+        ftp.login(@ftp_user,@ftp_password) 
+        files=ftp.list('*')
+        res = ftp.putbinaryfile(photo.filename)
+        files =ftp.list('*')
+        #p files
+        ftp.close
+      rescue Errno::EPIPE
+        raise UploadException
+      end
     end
-    ftp = Net::FTP.new(FTP_HOST)
-    ftp.login(@ftp_user,@ftp_password) 
-    files=ftp.list('*')
-    res = ftp.putbinaryfile(photo.filename)
-    files=ftp.list('*')
-    #p files
-    ftp.close
-    #Test auf Fehler?
-    #    if rand(100) == 42
-    #      @@errors += 1
-    #      if @@errors > max_errors
-    #        raise "too many errors"
-    #      end
-    #    end
     @@errors = 0
     puts 'OK'
     #    `echo "fotolia\t#{photo.filename}\t#{Time.now}" >>sendeliste.dat` #TODO:
-    File.open(SENDELISTE,'a') {|f|
-      f.puts "fotolia\t#{photo.filename}\t#{Time.now}"
-    }
+    if ! dont_log
+      File.open(SENDLIST,'a') {|f|
+        f.puts "fotolia\t#{photo.filename}\t#{Time.now}"
+      }
+    end
     true
   end
   
@@ -83,17 +87,14 @@ class Fotolia < GenericSite
   end
 
   def already_sent?(photo)
-    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(SENDELISTE, /fotolia\t#{photo.filename}/)
-    if g.size > 0
-      return true
-    else
-    return false
-    end
+    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
   end
 end

data/lib/multistockphoto/site_photocase.rb

@@ -19,7 +19,7 @@ class Photocase < GenericSite
     @total_per_day = @config[:photocase][:total_per_day]
   end
   
-  def transfer(photo)
+  def transfer(photo,dont_send=false,dont_log=false)
     sav_photo_filename = photo.filename.dup
     # falls nicht in config Datei eingetragen dann nicht senden
     if @user == nil or @password == nil
@@ -34,69 +34,77 @@ class Photocase < GenericSite
     end
     print "photocase:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDELISTE, /photocase\t#{photo.filename}/)
+    g = grep(SENDLIST, /photocase\t#{photo.filename}/)
     if g.size > 0
       puts 'already sent'
       return :duplicate
     end
-    if photo.portrait
-      photo.drehen
-    end
-    agent = WWW::Mechanize.new
-    agent.user_agent_alias = 'Linux Mozilla'
-    page = agent.get 'http://www.photocase.de/en/login.asp'
-    if !page.body.include?('Log in')
-      raise 'not at the login page'
+    if rotate_photos
+      if photo.portrait?
+        photo.drehen
+      end
     end
-    form = page.forms.first #TODO: besser nach Name
-    #    form['loginForm[Username]']  = @config[:zoonar][:user]
-    #    form['loginForm[Password]']  = @config[:zoonar][:password] 
-    form['UserName']  = @config[:photocase][:user]
-    form['UserPassword']  = @config[:photocase][:password] 
-    #UserName
-    #UserPassword
-    page = agent.submit form
-    raise "login error" if ! page.body.include?("Login successful")
-    page = agent.click page.links.text('Upload')
-    raise "no Upload a photo" if ! page.body.include?('Upload a photo')
-    form = page.form('Form')
-    if photo.portrait
+    if ! dont_send
+      agent = WWW::Mechanize.new
+      agent.user_agent_alias = 'Linux Mozilla'
+      page = agent.get 'http://www.photocase.de/en/login.asp'
+      if !page.body.include?('Log in')
+        raise 'not at the login page'
+      end
+      form = page.forms.first #TODO: besser nach Name
+      #    form['loginForm[Username]']  = @config[:zoonar][:user]
+      #    form['loginForm[Password]']  = @config[:zoonar][:password] 
+      form['UserName']  = @config[:photocase][:user]
+      form['UserPassword']  = @config[:photocase][:password] 
+      #UserName
+      #UserPassword
+      page = agent.submit form
+      raise "login error" if ! page.body.include?("Login successful")
+      page = agent.click page.links.text('Upload')
+      raise "no Upload a photo" if ! page.body.include?('Upload a photo')
+      form = page.form('Form')
+      if photo.portrait?
       
-      b = File.basename(photo.filename)
-      newfilename = photo.filename.sub(b,'')+'rot_'+b
-      #      form.file_uploads.first.file_name = 'r' + photo.filename
-      form.file_uploads.first.file_name = newfilename
+        b = File.basename(photo.filename)
+        newfilename = photo.filename.sub(b,'')+'rot_'+b
+        #      form.file_uploads.first.file_name = 'r' + photo.filename
+        form.file_uploads.first.file_name = newfilename
+      else
+        form.file_uploads.first.file_name = photo.filename
+      end
+      #TODO:
+      # 2 Checkboxen
+      #UploadDisclaimerAccepted
+      #HasCopyright
+      form.checkboxes.name('UploadDisclaimerAccepted').check
+      form.checkboxes.name('HasCopyright').check
+      page = agent.submit form
+      if !page.body.include?('Your photo was uploaded successfully.')
+        raise "not successfully uploaded"
+      end
+      if page.body.include?('Your photo was uploaded successfully.')
+        @@errors = 0
+        puts "OK"
+      else
+        #Fehler aufgetreten
+        @@errors += 1
+        if @@errors > 3
+          raise "too many errors"
+        end
+      end
     else
-      form.file_uploads.first.file_name = photo.filename
-    end
-    #TODO:
-    # 2 Checkboxen
-    #UploadDisclaimerAccepted
-    #HasCopyright
-    form.checkboxes.name('UploadDisclaimerAccepted').check
-    form.checkboxes.name('HasCopyright').check
-    page = agent.submit form
-    if !page.body.include?('Your photo was uploaded successfully.')
-      raise "not successfully uploaded"
-    end
-    if page.body.include?('Your photo was uploaded successfully.')
-      @@errors = 0
       puts "OK"
-    else
-      #Fehler aufgetreten
-      @@errors += 1
-      if @@errors > 3
-        raise "too many errors"
-      end
     end
     #'Your photo was uploaded successfully.'
     if sav_photo_filename != photo.filename
       raise "photo.filenames has been changed!"
     end
     
-    File.open(SENDELISTE,'a') {|f|
-      f.puts "photocase\t#{photo.filename}\t#{Time.now}"
-    }
+    unless dont_log
+      File.open(SENDLIST,'a') {|f|
+        f.puts "photocase\t#{photo.filename}\t#{Time.now}"
+      }
+    end
     true
   end
   
@@ -110,17 +118,15 @@ class Photocase < GenericSite
   end
   
   def already_sent?(photo)
-    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(SENDELISTE, /photocase\t#{photo.filename}/)
-    if g.size > 0
-      return true
-    else
-    return false
-    end
+        already_sent_site?(photo,'photocase')
+#
+#    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, /photocase\t#{photo.filename}/)
+#    return g.size > 0
   end
 end