multistockphoto 0.9.0 → 0.9.2

data/History.txt

@@ -1,108 +1,5 @@
-== 0.9.0 2009-07-08
+rescue von Net::FTPPermError bei fotolia, damit man andere Sites fortsetzen kann
+== 0.9.2 / 2010-06-21
 
-* 4 bugfixes
-  * Laeuft jetzt mit Ruby 1.9
-  * Login-Prozedur bei photocase angepasst
-  * Abhaengigkeit von gem 'mini_exiftool' hat gefehlt
-  * Abhaengigkeit von gem 'exifr' hat gefehlt
-
-== 0.8.2 2008-12-30
-
-* 1 bugfix
-  * Abhaengigkeit von gem 'choice' hat gefehlt
-
-== 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
-  * Option --plist in bin/multistockphoto erstellt
-  * Option --count=N in Verbindung mit --no-tags und --tags_only erstellt
-* 1 minor enhancement
-  * Absicherung/Fehlermeldung wenn Config-Datei nicht richtig gelesen werden kann
-  * Methode self.accept?/accept? je Site Klasse neu, fuer zulaessige File-Typen
-  * 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
-* 3 minor enhancements
-  * --stats listet zusaetzlich Anzahl Photos mit/ohne tags file auf + Anteil
-  * neue Methode Sender#sent_to?(fn,site)
-  * site_* Klassen etwas allgemeiner gehalten, so daß man leichter neue kopieren kann
-
-== 0.6.2 2008-06-14
-* 3 minor enhancements
-  * new method Sitename.can_handle_orientation?
-  * --tags-only Schalter sendet nur Photos mit .tags Datei  
-  * Zoonar: besser abgesichert gegen Site-down
-* 2 bug fix
-  * an Fotolia wurden die nicht gedrehten, anstatt die gedrehten Bilder gesendet
-  * an Zoonar wurden die nicht gedrehten, anstatt die gedrehten Bilder gesendet
-
-== 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
-  * 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
-
-== 0.5.0 2008-05-27
-* 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
-
-== 0.2.0 2008-05-08
-* 1 major enhancement:
-  * new site www.photocase.de
-
-== 0.1.1 2008-05-07
-
-* 1 bug fix:
-  * mehr Plattformunabhaengigkeit (waren noch spezielle Unix Kommandos drin)
-
-== 0.1.0 2008-05-01
-
-* 1 major enhancement:
-  * Initial release
+  * photocase changed layout of the site, login form is now the 3rd form on the page

data/README.txt

@@ -1,6 +1,5 @@
-= multistockphoto
-
-* http://multistockphoto.rubyforge.org
+    by Thomas Preymesser
+    http://thopre.wordpress.com
 
 == DESCRIPTION:
 
@@ -11,12 +10,12 @@ anzubieten.
 == FEATURES/PROBLEMS:
 
 * automatisiertes Hochladen an mehrere Sites
-* automatisches Drehen von Hochformatphotos, falls die Site dies nicht selbstaendig erkennen kann
+* automatisches Drehen von Hochformatphotos, falls die Site dies nicht selbständig erkennen kann
 * automatische Verarbeiten von Keywords 
 
 == SYNOPSIS:
 
-  ausfuehrliche Dokumentation zur Benutzung, siehe http://multistockphoto.rubyforge.org
+    ausfuehrliche Dokumentation zur Benutzung, siehe http://multistockphoto.rubyforge.org GUIDE.txt
 
 == REQUIREMENTS:
 
@@ -30,7 +29,7 @@ anzubieten.
 
 (The MIT License)
 
-Copyright (c) 2008 FIX
+Copyright (c) 2008 FIXME (different license?)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -49,4 +48,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,47 @@
+# Look in the tasks/setup.rb file for the various options that can be
+# configured in this Rakefile. The .rake files in the tasks directory
+# are where the options are used.
+
+begin
+  require 'bones'
+  #Bones.setup
+rescue LoadError
+  begin
+    load 'tasks/setup.rb'
+  rescue LoadError
+    raise RuntimeError, '### please install the "bones" gem ###'
+  end
+end
+
+ensure_in_path 'lib'
+require 'multistockphoto'
+
+task :default => 'spec:run'
+
+Bones {
+  name 'multistockphoto'
+  authors 'Thomas Preymesser'
+  email  'thopre@gmail.com'
+  url 'http://multistockphoto.rubyforge.net/'
+  version Multistockphoto::VERSION
+  dependencies = [
+    #  ['activesupport', '>= 1.3.1']
+    # s.u. ['mechanize', '>= 0.7.5'], # mein aktuelles release
+    ['choice', '>= 0.1.2'], # mein aktuelles release
+    ['grep', '>= 0.0.1'], # mein aktuelles release
+    ['exifr', '>= 0.10.6'], # mein aktuelles release
+    ['rmagick', '>= 0.0.1'],
+    ['mini_exiftool', '>= 1.0.1'],   # mein aktuelles release
+    ['exifr', '>= 0.10.8'],          # mein aktuelles release
+    ['mechanize'],
+    #if RUBY_VERSION >= "1.9.0"
+    #  EXTRA_DEPENDENCIES <<
+    #    ['mechanize', '>= 0.7.5'] # mein aktuelles release
+    #else
+    #  EXTRA_DEPENDENCIES <<
+    #    ['mechanize', '>= 0.9.2'] # in Ruby 1.9* dieses wegen iconv-Problem
+    #end
+  ]
+}
+
+

data/TODO

@@ -0,0 +1,2 @@
+* ab 10.06.2010 kann Zoonar auch FTP-Upload, ggf. umstellen
+

data/bin/multistockphoto

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. lib multistockphoto]))
+
+# Put your code here
 require 'rubygems'
 require 'choice'
 require 'multistockphoto'
@@ -7,7 +12,10 @@ require 'RMagick'
 include Magick
 require 'exifr'
 require 'grep'
+require 'multistockphoto/photo'
+require 'multistockphoto/upload_exception'
 include Grep
+require 'timeout'
 
 SENDELISTE = 'sendeliste.dat'
 ROT_PREFIX = 'rot_'
@@ -99,7 +107,7 @@ def all_sites_done(sites,n)
   result
 end
 
-version = Multistockphoto::VERSION::STRING
+version = Multistockphoto::VERSION #::STRING
 
 Choice.options do
   header 'Options:'
@@ -141,7 +149,7 @@ Choice.options do
       $tags_only = true
     end
   end
-  
+
   option :verbose do
     short '-y'
     long '--verbose'
@@ -241,7 +249,7 @@ Choice.options do
       $silent = true
     end
   end
-  
+
   option :ordered do
     short '-o' #TODO: geht das?
     long '--ordered'
@@ -272,7 +280,7 @@ Choice.options do
       $count_flag = true
     end
   end
-  
+
   option :plist do
     short '-d'
     long '--plist'
@@ -290,7 +298,7 @@ Choice.options do
       $check_translation = true
     end
   end
-  
+
   option :shuffle do
     short '-f'
     long '--shuffle'
@@ -335,8 +343,8 @@ def not_enough_tags?(photo)
   if $tags_only
     if ! tagsfile?(photo.filename)
       return true
-    else 
-      if $count_flag 
+    else
+      if $count_flag
         photo.set_keywords
         if photo.tags.uniq.size < $count
           return true
@@ -364,7 +372,7 @@ def send_all
 
   remaining = Hash.new
   done = Hash.new
-  $active_sites.each {|site| 
+  $active_sites.each {|site|
     done[site] = false
     remaining[site] = 999_999_999
   }
@@ -393,8 +401,8 @@ def send_all
       $active_sites.each {|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 
+        # 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
@@ -404,7 +412,7 @@ def send_all
               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
@@ -415,7 +423,7 @@ def send_all
               end
               #end
               if $send_all or
-                  (total_per_site_flag and 
+                  (total_per_site_flag and
                     total[site_name] < Choice.choices[:total_per_site])
                 if !site.already_sent?(photo)
                   begin
@@ -442,17 +450,17 @@ def send_all
                     sleep 30
                     errors[site_name] += 1
                     if errors[site_name] >= MAX_ERRORS
-                      done[site_name] = true 
+                      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 
+                  rescue UploadException => msg
                     errors[site_name] += 1
                     if errors[site_name] >= MAX_ERRORS
-                      done[site_name] = true 
+                      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!"
+                    puts "Upload error at sending to #{site_name} occurred ('#{msg}'. Check configuration or try again later!"
                   rescue Timeout::Error
                     puts "timeout error"
                     #timeout error
@@ -469,16 +477,16 @@ def send_all
             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" 
+      #threads.each {|thr|
+      #  print "warte auf Thread "+thr.to_s+" "+thr["threadname"]+"\n"
       #  $stdout.flush
       #  thr.join
       #}
-        
+
     end
   }
   puts "#{total_transfers} photos sent."
@@ -575,7 +583,7 @@ def stats
       chosen_date.year,
       chosen_date.month,
       chosen_date.day)+" | "
-    $active_sites.each {|site|    
+    $active_sites.each {|site|
       key = [site.to_s, chosen_date]
       fmt = "%#{site.to_s.length}d | "
       printf(fmt, (count[key] || 0))
@@ -591,7 +599,7 @@ def stats
   }
   count.each_pair {|k,v|
     site = k[0]
-    if $active_sites.include? site.to_sym # sonst kommt es zu Fehlern bei 
+    if $active_sites.include? site.to_sym # sonst kommt es zu Fehlern bei
       # deaktivierten Sites
       totals[site.to_sym] += v
     end
@@ -605,11 +613,11 @@ def stats
   fmt = "%#{"total".length}d"
   printf(fmt, all)
   puts
-  
+
   #Photos mit/ohne tags-file
   count = Hash.new
   count[:tags] = 0
-  count[:notags] = 0  
+  count[:notags] = 0
   Dir.glob(File.join($upload_dir,'*')).each {|filename|
     next if File.basename(filename)[0,4] == ROT_PREFIX
     if filename.upcase =~ PICTURE_FILES
@@ -617,7 +625,7 @@ def stats
         count[:tags] += 1
       else
         count[:notags] += 1
-      end  
+      end
     end
   }
   puts "#{count[:tags]+count[:notags]} files"
@@ -688,10 +696,10 @@ def purge_done
         FileUtils.mkdir $done_dir
       end
       puts "mv #{filename} done/#{File.basename filename}" unless $silent
-      FileUtils.mv(filename, File.join($done_dir,File.basename(filename))) 
+      FileUtils.mv(filename, File.join($done_dir,File.basename(filename)))
       if tagsfile?(filename)
         puts "mv #{tagsfilename(filename)} done/#{File.basename(tagsfilename(filename))}" unless $silent
-        FileUtils.mv(tagsfilename(filename), 
+        FileUtils.mv(tagsfilename(filename),
           File.join($done_dir,File.basename(tagsfilename(filename))))
       end
     end
@@ -711,7 +719,7 @@ def no_tags
     next if File.basename(fn)[0,4] == ROT_PREFIX
     if fn.upcase =~ PICTURE_FILES
       if ! tagsfile?(fn)
-        puts fn 
+        puts fn
       else
         # es gibt eine aber zu wenige keywords
         if $count_flag
@@ -722,7 +730,7 @@ def no_tags
           end
         end
       end
-      
+
     end
   }
 end
@@ -774,7 +782,7 @@ def check_translation
         photo = Photo.new(fn)
         photo.set_keywords_without_write(:de,:en) #TODO: später noch flexibler machen!
       end
-      
+
     end
   }
 end
@@ -819,3 +827,5 @@ end
 if $check_translation
   check_translation
 end
+
+# EOF

data/bin/multistockphoto-gui

@@ -0,0 +1,187 @@
+#!/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
+#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
+# 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
+  Id_random = 2006
+  
+  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_actions.append(Id_random,"Random")
+    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
+    evt_menu Id_random, :on_random
+  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_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`
+    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