no longer use internalized rexml
[booh] / bin / booh-classifier
old mode 100755 (executable)
new mode 100644 (file)
index 75108db..3be4fab
@@ -10,7 +10,7 @@
 # called Boo, so this one will be it "Booh". Or whatever.
 #
 #
-# Copyright (c) 2004-2009 Guillaume Cottenceau <http://zarb.org/~gc/resource/gc_mail.png>
+# Copyright (c) 2004-2013 Guillaume Cottenceau <http://zarb.org/~gc/resource/gc_mail.png>
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license version 2.
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+begin
+    require 'rubygems'
+rescue LoadError
+end
+
 require 'getoptlong'
 require 'tempfile'
 
@@ -29,7 +34,7 @@ require 'gettext'
 include GetText
 bindtextdomain("booh")
 
-require 'booh/rexml/document'
+require 'rexml/document'
 include REXML
 
 require 'booh/booh-lib'
@@ -73,7 +78,7 @@ def handle_options
             when '--version'
                 puts _("Booh version %s
 
-Copyright (c) 2005-2009 Guillaume Cottenceau.
+Copyright (c) 2005-2013 Guillaume Cottenceau.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") % $VERSION
 
@@ -88,6 +93,14 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") %
     end
 end
 
+def total_memory
+    meminfo = IO.readlines('/proc/meminfo').join
+    meminfo =~ /MemTotal:.*?(\d+)/ or return -1
+    memory = $1.to_i
+    meminfo =~ /SwapTotal:.*?(\d+)/ or return -1
+    return memory + $1.to_i
+end
+
 def startup_memfree
     if $startup_memfree.nil?
         meminfo = IO.readlines('/proc/meminfo').join
@@ -107,7 +120,13 @@ def set_cache_memory_use_figure
     else
         $config['cache-memory-use-figure'] = $config['cache-memory-use'].to_i
     end
-    msg 2, _("Cache memory used: %s kB") % $config['cache-memory-use-figure']
+    #- cannot fork if process is > 0.5 total memory
+    if $config['cache-memory-use-figure'] > total_memory * 0.4
+        $config['cache-memory-use-figure'] = total_memory * 0.4
+        msg 2, _("Cache memory used: %s kB (reduced because cannot exceed 50%% of total memory)") % $config['cache-memory-use-figure']
+    else
+        msg 2, _("Cache memory used: %s kB") % $config['cache-memory-use-figure']
+    end
 end
 
 def read_config
@@ -134,8 +153,8 @@ def read_config
             end
         }
     end
-    $config['video-viewer'] ||= '/usr/bin/mplayer %f'
-    $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f"
+    $config['video-viewer'] ||= '/usr/bin/mplayer %f || /usr/bin/vlc %f'
+    $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f || /usr/bin/firefox -remote 'openURL(%f,new-window)' || /usr/bin/firefox %f"
     $config['preload-distance'] ||= '5'
     $config['cache-memory-use'] ||= 'memfree_80%'
     $config['rotate-set-exif'] ||= 'true'
@@ -161,13 +180,7 @@ Problem was: '%s' is not an executable file.
 Hint: don't forget to specify the full path to the executable,
 e.g. '/usr/bin/mplayer' is correct but 'mplayer' only is not.") % viewer_binary), { :pos_centered => true, :not_transient => true })
     end
-    browser_binary = $config['browser'].split.first
-    if browser_binary && ! File.executable?(browser_binary)
-        show_popup($main_window, utf8(_("The configured browser seems to be unavailable.
-You should fix this in Edit/Preferences so that you can open URLs.
-
-Problem was: '%s' is not an executable file.") % browser_binary), { :pos_centered => true, :not_transient => true })
-    end
+    check_browser
 end
 
 def write_config
@@ -191,7 +204,7 @@ def write_config
             end
         end
     }
-    $xmldoc.write(ios, 0)
+    $xmldoc.write(ios)
     ios.close
 end
 
@@ -202,8 +215,8 @@ def save_undo(name, closure, *params)
 end
 
 def get_mem
-    IO.readlines('/proc/self/status').join =~ /VmRSS.*?(\d+)\s*kB/
-    msg 3, "RSS: #{$1}"
+    IO.readlines('/proc/self/status').join =~ /VmSize.*?(\d+)\s*kB/
+    msg 3, "VmSize: #{$1}"
     return $1.to_i
 end
 
@@ -237,19 +250,33 @@ $colors = [ Gdk::Color.new(0, 65535, 0),
             Gdk::Color.new(65535, 0, 65535) ]
 
 class Label
-    attr_accessor :color, :name, :button
+    attr_accessor :color, :name, :button, :counter
     def initialize(name)
         @name = name
     end
 end
 
+class InterruptedLoading < Exception
+    #- not a StandardError, not catched by a simple rescue
+end
+
+def show_pixbufs_present
+    if 3 <= $verbose_level
+        out = 'Full pixbufs ['
+        for entry in $allentries
+            out += entry.pixbuf_full_present? ? 'F' : '.'
+        end
+        msg 3, out + ']'
+    end
+end
+
 class Entry
     @@max_width = nil
     def Entry.thumbnails_height
         return $config['thumbnails-height'].to_i
     end
 
-    attr_accessor :path, :guipath, :type, :angle, :button, :image, :alignment, :removed, :labeled
+    attr_accessor :path, :guipath, :type, :angle, :button, :image, :alignment, :removed, :labeled, :loader
 
     def initialize(path, type, guipath)
         @path = path
@@ -260,12 +287,8 @@ class Entry
         end
     end
 
-    def pixbuf_full
-        if @pixbuf_full.nil?
-            msg 3, ">>> pixbuf_full #{path}"
-            load_into_pixbuf_full
-        end
-        return @pixbuf_full
+    def pixbuf_full_present?
+        return ! @pixbuf_full.nil?
     end
     def free_pixbuf_full
         if @pixbuf_full.nil?
@@ -276,29 +299,30 @@ class Entry
             return true
         end
     end
-    def pixbuf_main(interruptable)
+
+    def pixbuf_main
+        Gtk.main_iteration while Gtk.events_pending?
         width, height = $mainview.window.size 
         width = MainView.get_usable_width(width)
         height = MainView.get_usable_height(height)
         if @pixbuf_main.nil? || width != @width || height != @height
-            msg 3, ">>> pixbuf_main #{path}"
             @width = width
             @height = height
-            load_into_pixbuf_full(interruptable)  #- make sure it is loaded
+            load_into_pixbuf_full  #- make sure it is loaded
             if @pixbuf_full.nil?
                 return
             end
             if @pixbuf_full.width.to_f / @pixbuf_full.height > width.to_f / height
                 resized_height = @pixbuf_full.height * (width.to_f/@pixbuf_full.width)
                 if @pixbuf_full.width > width || @pixbuf_full.height > resized_height
-                    @pixbuf_main = @pixbuf_full.scale(width, resized_height, Gdk::Pixbuf::INTERP_BILINEAR)
+                    @pixbuf_main = @pixbuf_full.scale(width, resized_height, :bilinear)
                 else
                     @pixbuf_main = @pixbuf_full
                 end
             else
                 resized_width = @pixbuf_full.width * (height.to_f/@pixbuf_full.height)
                 if @pixbuf_full.width > resized_width || @pixbuf_full.height > height
-                    @pixbuf_main = @pixbuf_full.scale(resized_width, height, Gdk::Pixbuf::INTERP_BILINEAR)
+                    @pixbuf_main = @pixbuf_full.scale(resized_width, height, :bilinear)
                 else
                     @pixbuf_main = @pixbuf_full
                 end
@@ -306,6 +330,9 @@ class Entry
         end
         return @pixbuf_main
     end
+    def pixbuf_main_present?
+        return ! @pixbuf_main.nil?
+    end
     def free_pixbuf_main
         if @pixbuf_main.nil?
             return false
@@ -315,14 +342,16 @@ class Entry
             return true
         end
     end
+
     def pixbuf_thumbnail
+        Gtk.main_iteration while Gtk.events_pending?
         if @pixbuf_thumbnail.nil?
             if @pixbuf_main
                 msg 3, ">>> pixbuf_thumbnail from main #{path}"
-                @pixbuf_thumbnail = @pixbuf_main.scale(@pixbuf_main.width * (Entry.thumbnails_height.to_f/@pixbuf_main.height), Entry.thumbnails_height, Gdk::Pixbuf::INTERP_BILINEAR)
+                @pixbuf_thumbnail = @pixbuf_main.scale(@pixbuf_main.width * (Entry.thumbnails_height.to_f/@pixbuf_main.height), Entry.thumbnails_height, :bilinear)
             else
                 msg 3, ">>> pixbuf_thumbnail from file #{path}"
-                @pixbuf_thumbnail = load_into_pixbuf_at_size(false) { |w, h|
+                @pixbuf_thumbnail = load_into_pixbuf_at_size { |w, h|
                     if @angle == 0
                         if h > Entry.thumbnails_height
                             [ w * Entry.thumbnails_height.to_f/h, Entry.thumbnails_height ]
@@ -386,16 +415,24 @@ class Entry
         end
     end
 
-    private
-    def cleanup_dir(dir)
-        Dir.entries(dir).each { |file| file != '.' && file != '..' and File.delete(File.join(dir, file)) }
-        Dir.delete(dir)
+    def cancel_loader
+        if ! @loader.nil?
+            #- avoid unneeded memory allocation
+            @loader.signal_handler_disconnect(@area_prepared_cb)
+            begin
+                @loader.close
+            rescue
+                #- ignore loader errors, at that point they are fairly normal, we're canceling a partial load
+            end
+            @loader = nil
+        end
     end
 
-    def load_into_pixbuf_full(interruptable)
+    private
+    def load_into_pixbuf_full
         if @pixbuf_full.nil?
             msg 3, ">>> load_into_pixbuf_full #{path}"
-            @pixbuf_full = load_into_pixbuf_at_size(interruptable) { |w, h|
+            @pixbuf_full = load_into_pixbuf_at_size { |w, h|
                 if @angle == 0
                     if w > @@max_width
                         #- save memory and speedup (+35%) loading 
@@ -411,22 +448,21 @@ class Entry
                     end
                 end
             }
+            show_pixbufs_present
         end
     end
 
-    def load_into_pixbuf_at_size(interruptable, &specify_size)
-        pixbuf = nil
+    def load_into_pixbuf_at_size(&specify_size)
         if @type == 'video'
-            tmp = Tempfile.new("boohclassifiertemp")
-            dest_dir = tmp.path
-            tmp.close!
-            Dir.mkdir(dest_dir)
-            orig_base = File.basename(path)
-            tmpdir = gen_video_thumbnail(path, false, 0)
-            if tmpdir.nil?
-                return
+            if @video_image_path.nil?
+                orig_base = File.basename(path)
+                tmpdir = gen_video_thumbnail(path, false, 0)
+                if tmpdir.nil?
+                    return
+                end
+                @video_image_path = "#{tmpdir}/00000001.jpg"
             end
-            image_path = "#{tmpdir}/00000001.jpg"
+            image_path = @video_image_path
         else
             image_path = @path
         end
@@ -438,45 +474,45 @@ class Entry
             end
         end
         begin
-            #- use a pixbuf loader and trigger Gtk.main_iteration on each chunk if needed, to keep the UI responsive even
+            #- use a pixbuf loader and check Gtk.events_pending? on each chunk, to keep the UI responsive even
             #- if loaded pictures are several MBs large
-            loader = Gdk::PixbufLoader.new
-            loader.signal_connect('size-prepared') { |l, w, h|
-                r = specify_size.call(w, h)
-                #msg 3, "specified sizes: #{r[0]} #{r[1]}"
-                loader.set_size(*specify_size.call(w, h))
-            }
-            id = loader.signal_connect('area-prepared') { pixbuf = loader.pixbuf }
-            if ! loader.load_not_freezing_ui(image_path, interruptable, id)
-                return
+            if @loader.nil?
+                @loader = GdkPixbuf::PixbufLoader.new
+                @loader.signal_connect('size-prepared') { |l, w, h|
+                    @loader.set_size(*specify_size.call(w, h))
+                }
+                @area_prepared_cb = @loader.signal_connect('area-prepared') { @loaded_pixbuf = @loader.pixbuf }
+                @loader_offset = 0
             end
-            loader.close
-            if pixbuf.nil?
+            msg 3, "calling load_not_freezing_ui on #{image_path}, offset #{@loader_offset}"
+            @loader_offset = @loader.load_not_freezing_ui(image_path, @loader_offset)
+            if @loader_offset > 0
+                #- interrupted
+                raise InterruptedLoading
+            end
+            @loader = nil
+            if @loaded_pixbuf.nil?
                 raise "Loaded pixbuf nil - #{path} #{image_path}"
             end
         rescue
             msg 0, "Cannot load #{image_path}: #{$!}"
-            begin
-                loader.close
-            rescue
-            end
             return
         ensure
-            if @type == 'video'
-                File.delete(image_path)
-                Dir.rmdir(tmpdir)
+            if @video_image_path && @loader.nil?
+                File.delete(@video_image_path)
+                Dir.rmdir(File.dirname(@video_image_path))
+                @video_image_path = nil
             end
         end
-        if pixbuf
+        if @loaded_pixbuf
             if @angle != 0
                 msg 3, ">>> load_into_pixbuf_full #{image_path} => rotate #{@angle}"
-                pixbuf = rotate_pixbuf(pixbuf, @angle)
+                @loaded_pixbuf = rotate_pixbuf(@loaded_pixbuf, @angle)
             end
         end
-        if @type == 'video'
-            cleanup_dir(dest_dir)
-        end
-        return pixbuf
+        retval = @loaded_pixbuf
+        @loaded_pixbuf = nil
+        return retval
     end
 
     def to_s
@@ -492,46 +528,53 @@ def gc
     msg 3, "GC in #{Time.now - start} s"
 end
 
-def free_cache(avoid)
+def free_cache_if_needed
     i = $allentries.index($mainview.get_shown_entry)
     return if i.nil?
+    if get_mem > $config['cache-memory-use-figure']
+        msg 3, "too much RSS, triggering GC"
+        gc
+    end
+    if get_mem < $config['cache-memory-use-figure']
+        return
+    end
+    msg 3, "too much RSS, freeing some cache"
     start = Time.now
+    freed = 0
     ($allentries.size - 1).downto($config['preload-distance'].to_i + 1) { |j|
         index = i + j
-        if i + j < $allentries.size && ! avoid.include?(i + j)
+        if i + j < $allentries.size
             $allentries[i + j].free_pixbuf_full
-            $allentries[i + j].free_pixbuf_main
+            if $allentries[i + j].free_pixbuf_main
+                freed += 1
+            end
         end
-        if i - j >= 0 && ! avoid.include?(i - j)
+        if i - j >= 0
             $allentries[i - j].free_pixbuf_full
-            $allentries[i - j].free_pixbuf_main
+            if $allentries[i - j].free_pixbuf_main
+                freed += 1
+            end
+        end
+        if freed >= 10
+            gc
+            if get_mem < $config['cache-memory-use-figure'] * 3 / 4
+                msg 3, "RSS down enough - freeing done in #{Time.now - start} s"
+                show_pixbufs_present
+                return
+            end
+            freed = 0
         end
     }
     msg 3, "freeing done in #{Time.now - start} s"
-    if get_mem > $config['cache-memory-use-figure'] * 3 / 4
-        gc
-        get_mem
-    end
+    show_pixbufs_present
 end
 
 def run_preloader_real
     msg 3, "*** >> main preloading triggered..."
-    if $preloader_running
-        msg 3, "*** >>>>>> already running, return <<<<<<<<"
-        return
-    end
-    $preloader_running = true
     if $mainview.get_shown_entry
-        if get_mem > $config['cache-memory-use-figure']
-            msg 3, "too much RSS, stopping preloading, triggering GC"
-            $preloader_running = false
-            gc
-            get_mem
-            return
-        end
+        free_cache_if_needed
         if $config['preload-distance'].to_i == 0
-            free_cache([])
-            return
+            return true
         end
         index = $allentries.index($mainview.get_shown_entry)
         index_right = index
@@ -550,8 +593,15 @@ def run_preloader_real
                 if index_right == $allentries.size
                     right_done = true
                 else
-                    msg 3, "preloading #{$allentries[index_right].path}"
-                    $allentries[index_right].pixbuf_main(false)
+                    if ! $allentries[index_right].pixbuf_main_present?
+                        msg 3, "preloading #{$allentries[index_right].path}"
+                        begin
+                            $allentries[index_right].pixbuf_main
+                        rescue InterruptedLoading
+                            msg 3, "*** >>>> interrupted, rerun"
+                            return false
+                        end
+                    end
                     loaded << index_right
                     loaded_right += 1
                     if loaded_right == $config['preload-distance'].to_i
@@ -568,8 +618,15 @@ def run_preloader_real
                 if index_left == -1
                     left_done = true
                 else
-                    msg 3, "preloading #{$allentries[index_left].path}"
-                    $allentries[index_left].pixbuf_main(false)
+                    if ! $allentries[index_left].pixbuf_main_present?
+                        msg 3, "preloading #{$allentries[index_left].path}"
+                        begin
+                            $allentries[index_left].pixbuf_main
+                        rescue InterruptedLoading
+                            msg 3, "*** >>>> interrupted, rerun"
+                            return false
+                        end
+                    end
                     loaded << index_left
                     loaded_left += 1
                     if loaded_left == $config['preload-distance'].to_i
@@ -580,22 +637,18 @@ def run_preloader_real
 
             #- in case just loaded another directory
             if $preloader_force_exit
-                $preloader_running = false
                 $preloader_force_exit = false
-                return
+                return true
             end
             #- in case moved fast
             if index != $allentries.index($mainview.get_shown_entry)
                 msg 3, "*** >>>> moved already, rerun"
-                $preloader_running = false
-                run_preloader_real
-                return
+                return false
             end
         end
-        free_cache(loaded)
     end
-    $preloader_running = false
     msg 3, "*** << main preloading finished"
+    return true
 end
 
 def run_preloader
@@ -603,9 +656,21 @@ def run_preloader
         msg 3, "*** preloader not yet allowed"
         return
     end
-    Gtk.timeout_add(10) {
-        run_preloader_real
-        false
+
+    if $preloader_running
+        msg 3, "preloader already running"
+        return
+    end
+    msg 3, "run preloader"
+    $preloader_running = true
+    Gtk.idle_add {
+        msg 3, "begin preloader from timeout "
+        if run_preloader_real
+            $preloader_running = false
+            false
+        else
+            true
+        end
     }
 end
 
@@ -613,6 +678,7 @@ class MainView < Gtk::DrawingArea
 
     @@borders_thickness = 5
     @@borders_length = 25
+    @@redraw_pending = nil
 
     def MainView.borders_thickness
         return @@borders_thickness
@@ -652,8 +718,8 @@ class MainView < Gtk::DrawingArea
             return
         end
         @entry = entry
+        @entry and msg 3, "*** set entry to #{@entry.path}"
         redraw
-        run_preloader
         msg 3, "entry shown in: #{Time.now - t1} s"
     end
 
@@ -674,10 +740,39 @@ class MainView < Gtk::DrawingArea
         end
         if index < $allentries.size && $allentries[index] && $allentries[index].button && $allentries[index].button.visible?
             try_show_entry($allentries[index])
+            return
+        end
+        #- find a fallback before
+        while index < $allentries.size && index > 0 && $allentries[index] && (! $allentries[index].button || ! $allentries[index].button.visible?)
+            index -= 1
+        end
+        if index < $allentries.size && index > 0 && $allentries[index] && $allentries[index].button && $allentries[index].button.visible?
+            try_show_entry($allentries[index])
         end
     end
 
     def redraw
+        if @@redraw_pending
+            msg 3, "redraw already pending"
+            return
+        end
+        msg 3, "redraw"
+        @@redraw_pending = Gtk.idle_add {
+            msg 3, "begin redraw from timeout "
+            begin
+                msg 3, "try redraw from timeout"
+                redraw_real
+                @@redraw_pending = nil
+                run_preloader
+                false
+            rescue InterruptedLoading
+                msg 3, "interrupted, will retry"
+                true
+            end
+        }
+    end
+
+    def redraw_real
         @entry and sb_msg(_("Selected %s") % @entry.get_beautified_name)
         if ! update_shown
             return
@@ -687,14 +782,12 @@ class MainView < Gtk::DrawingArea
         window.clear
         draw
         window.end_paint
-        Gtk.main_iteration while Gtk.events_pending?
     end
 
     def update_shown
         if @entry
-            $interrupt_loading = false
-            pixbuf = @entry.pixbuf_main(true)
-            $interrupt_loading = true
+            msg 3, "################################################ trying to show #{@entry.path}"
+            pixbuf = @entry.pixbuf_main
             if pixbuf
                 @pixbuf = pixbuf
                 width, height = window.size 
@@ -716,11 +809,11 @@ class MainView < Gtk::DrawingArea
             if @entry && @entry.type == 'video'
                 window.draw_borders($videoborder_pixbuf, @xpos - $videoborder_pixbuf.width, @xpos + @pixbuf.width, @ypos, @ypos + @pixbuf.height)
             end
-            if ! @entry.outline_color.nil?
+            if @entry && ! @entry.outline_color.nil?
                 gc = Gdk::GC.new(window)
                 colormap.alloc_color(@entry.outline_color, false, true)
                 gc.set_foreground(@entry.outline_color)
-                if @entry && @entry.type == 'video'
+                if @entry.type == 'video'
                     xleft = @xpos - $videoborder_pixbuf.width
                     xright = @xpos + @pixbuf.width + $videoborder_pixbuf.width
                 else
@@ -790,9 +883,6 @@ def show_popup(parent, msg, *options)
     if options[:selectable]
         lbl.selectable = true
     end
-    if options[:topwidget]
-        dialog.vbox.add(options[0][:topwidget])
-    end
     if options[:scrolled]
         sw = Gtk::ScrolledWindow.new(nil, nil)
         sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
@@ -807,9 +897,21 @@ def show_popup(parent, msg, *options)
         dialog.vbox.add(options[:bottomwidget])
     end
     if options[:okcancel]
-        dialog.add_button(Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL)
+        cancel = dialog.add_button(Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL)
+        dialog.add_button(Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK)
+    elsif options[:yestoall]
+        cancel = dialog.add_button(Gtk::Stock::NO, Gtk::Dialog::RESPONSE_NO)
+        if ! options[:bottomwidget]
+            cancel.grab_focus
+        end
+        dialog.add_button(Gtk::Stock::YES, Gtk::Dialog::RESPONSE_YES)
+        dialog.add_button(utf8(_("Yes to all")), Gtk::Dialog::RESPONSE_ACCEPT)
+    else
+        ok = dialog.add_button(Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK)
+        if ! options[:bottomwidget]
+            ok.grab_focus
+        end
     end
-    dialog.add_button(Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK)
 
     if options[:pos_centered]
         dialog.window_position = Gtk::Window::POS_CENTER
@@ -846,6 +948,8 @@ def show_popup(parent, msg, *options)
             dialog.destroy
             if options[:okcancel]
                 return response == Gtk::Dialog::RESPONSE_OK
+            elsif options[:yestoall]
+                return response == Gtk::Dialog::RESPONSE_YES ? 'yes' : response == Gtk::Dialog::RESPONSE_ACCEPT ? 'yestoall' : 'no'
             end
         }
     else
@@ -865,6 +969,32 @@ def view_entry(entry)
     end
 end
 
+def update_counters
+    value = 0
+    $allentries.each { |entry|
+        if ! entry.removed && entry.labeled.nil?
+            value += 1
+        end
+    }
+    $unlabelled_counter.set_markup('<tt>' + value.to_s + '</tt>')
+    value = 0
+    $allentries.each { |entry|
+        if entry.removed 
+            value += 1
+        end
+    }
+    $toremove_counter.set_markup('<tt>' + value.to_s + '</tt>')
+    $labels.values.each { |label|
+        value = 0
+        $allentries.each { |entry|
+            if entry.labeled == label
+                value += 1
+            end
+        }
+        label.counter.set_markup('<tt>' + value.to_s + '</tt>')
+    }
+end
+
 def thumbnail_keypressed(entry, event)
     if event.state & Gdk::Window::MOD1_MASK != 0
         #- ALT pressed: Alt-Left and Alft-Right rotate
@@ -877,6 +1007,7 @@ def thumbnail_keypressed(entry, event)
             entry.free_pixbuf_full
             entry.free_pixbuf_main
             entry.free_pixbuf_thumbnail
+            show_pixbufs_present
             $mainview.redraw
             entry.image.pixbuf = entry.pixbuf_thumbnail
             if $config['rotate-set-exif'] == 'true' && entry.type == 'image'
@@ -909,6 +1040,7 @@ def thumbnail_keypressed(entry, event)
             entry.labeled = nil
             entry.show_bg
             update_visibility(entry)
+            update_counters
             $mainview.show_next_entry(entry)
 
             save_undo(_("set for removal"),
@@ -917,6 +1049,7 @@ def thumbnail_keypressed(entry, event)
                           entry.labeled = label_before
                           entry.show_bg
                           update_visibility(entry)
+                          update_counters
                           if entry.button.visible?
                               $mainview.try_show_entry(entry)
                           end
@@ -925,6 +1058,7 @@ def thumbnail_keypressed(entry, event)
                               entry.labeled = nil
                               entry.show_bg
                               update_visibility(entry)
+                              update_counters
                               if entry.button.visible?
                                   $mainview.try_show_entry(entry)
                               end
@@ -940,6 +1074,7 @@ def thumbnail_keypressed(entry, event)
             entry.removed = false
             entry.labeled = nil
             entry.show_bg
+            update_counters
             $mainview.show_next_entry(entry)
 
             save_undo(msg,
@@ -947,11 +1082,13 @@ def thumbnail_keypressed(entry, event)
                           entry.removed = removed_before
                           entry.labeled = label_before
                           entry.show_bg
+                          update_counters
                           $mainview.try_show_entry(entry)
                           proc {
                               entry.removed = false
                               entry.labeled = nil
                               entry.show_bg
+                              update_counters
                               $mainview.try_show_entry(entry)
                           }
                       })
@@ -959,6 +1096,28 @@ def thumbnail_keypressed(entry, event)
         elsif event.keyval == Gdk::Keyval::GDK_Return
             view_entry(entry)
 
+        elsif event.keyval == Gdk::Keyval::GDK_Home
+            index = 0
+            while $allentries[index] && $allentries[index].button && !visible($allentries[index])
+                index += 1
+            end
+            if $allentries[index] && $allentries[index].button
+                $allentries[index].button.grab_focus
+            end
+
+        elsif event.keyval == Gdk::Keyval::GDK_End
+            index = $allentries.size - 1
+            while $allentries[index] && ! $allentries[index].button
+                #- not yet loaded
+                index -= 1
+            end
+            while $allentries[index] && $allentries[index].button && !visible($allentries[index])
+                index -= 1
+            end
+            if $allentries[index] && $allentries[index].button
+                $allentries[index].button.grab_focus
+            end
+
         else
             char = [ Gdk::Keyval.to_unicode(event.keyval) ].pack("C*")
             if char =~ /^[a-zA-z0-9]$/
@@ -989,7 +1148,9 @@ def thumbnail_keypressed(entry, event)
                             $labels[char] = label
                             $ordered_labels << label
                             lbl = Gtk::Label.new.set_markup('<b>(' + char + ')</b>' + text[1..-1]).set_justify(Gtk::Justification::CENTER)
-                            $labels_vbox.pack_start(label.button = Gtk::CheckButton.new.add(evt = Gtk::EventBox.new.add(lbl)).show_all)
+                            $labels_vbox.pack_start(Gtk::HBox.new(false, 5).pack_start(label.button = Gtk::CheckButton.new.add(evt = Gtk::EventBox.new.add(lbl))).
+                                                                            pack_start(Gtk::Label.new, true, true).
+                                                                            pack_start(label.counter = Gtk::Label.new.set_markup('<tt>0</tt>'), false, false).show_all)
                             label.button.active = true
                             label.button.signal_connect('toggled') { update_all_visibilities }
                             evt.modify_bg(Gtk::StateType::NORMAL, label.color)
@@ -1004,6 +1165,7 @@ def thumbnail_keypressed(entry, event)
                     entry.labeled = label
                     entry.show_bg
                     update_visibility(entry)
+                    update_counters
                     $mainview.show_next_entry(entry)
 
                     save_undo(_("set label"),
@@ -1012,6 +1174,7 @@ def thumbnail_keypressed(entry, event)
                                   entry.labeled = label_before
                                   entry.show_bg
                                   update_visibility(entry)
+                                  update_counters
                                   if entry.button.visible?
                                       $mainview.try_show_entry(entry)
                                   end
@@ -1020,6 +1183,7 @@ def thumbnail_keypressed(entry, event)
                                       entry.labeled = label
                                       entry.show_bg
                                       update_visibility(entry)
+                                      update_counters
                                       if entry.button.visible?
                                           $mainview.try_show_entry(entry)
                                       end
@@ -1073,13 +1237,13 @@ def show_entry(entry, i, tips)
         entry.button.grab_focus
     end
     update_visibility(entry)
-    Gtk.main_iteration while Gtk.events_pending?
 end
 
 def show_entries(allentries)
+    update_counters
     sb_msg(_("Loading images..."))
     $loading_progressbar.fraction = 0
-    $loading_progressbar.text = utf8(_("Loading... %d%") % 0)
+    $loading_progressbar.text = utf8(_("Loading... %d%%") % 0)
     $loading_progressbar.show
     t1 = Time.now
     total_loaded_files = 0
@@ -1087,13 +1251,17 @@ def show_entries(allentries)
     i = 0
     tips = Gtk::Tooltips.new
     while i < allentries.size
-#        printf "%d %s\n", i, __LINE__
-        entry = allentries[i]
-        if i == 0
-            loaded_pixbuf = entry.pixbuf_main(false)
-        else
-            loaded_pixbuf = entry.pixbuf_thumbnail
+        begin
+            entry = allentries[i]
+            if i == 0
+                loaded_pixbuf = entry.pixbuf_main
+            else
+                loaded_pixbuf = entry.pixbuf_thumbnail
+            end
+        rescue InterruptedLoading
+            redo
         end
+
         if $allentries != allentries
             #- loaded another directory while this one was not yet finished
             msg 3, "allentries differ, stopping this deprecated load"
@@ -1112,8 +1280,11 @@ def show_entries(allentries)
             total_loaded_files += 1
             i += 1
             if i > $config['preload-distance'].to_i && i <= $config['preload-distance'].to_i * 2
-                #- when we're at preload distance, beging preloading to preload distance
-                allentries[i - $config['preload-distance'].to_i].pixbuf_main(false)
+                #- when we're at preload distance, begin preloading to preload distance
+                begin
+                    allentries[i - $config['preload-distance'].to_i].pixbuf_main
+                rescue InterruptedLoading
+                end
             end
             if i == $config['preload-distance'].to_i * 2 + 1
                 #- when we're after double preload distance, activate normal preloading
@@ -1124,14 +1295,17 @@ def show_entries(allentries)
             allentries.delete_at(i)
         end
         $loading_progressbar.fraction = i.to_f / allentries.size
-        $loading_progressbar.text = utf8(_("Loading... %d%") % (100 * $loading_progressbar.fraction))
+        $loading_progressbar.text = utf8(_("Loading... %d%%") % (100 * $loading_progressbar.fraction))
         if $quit
             return
         end
+        if i % 25 == 0
+            gc
+        end
     end
+    $preloader_allowed = true
     if i <= $config['preload-distance'].to_i * 2
         #- not yet preloaded correctly
-        $preloader_allowed = true
         run_preloader
     end
     sb_msg(_("%d images of total %s kB loaded in %3.2f seconds.") % [ total_loaded_files, commify(total_loaded_size / 1024), Time.now - t1 ])
@@ -1151,7 +1325,7 @@ end
 def open_dir(*paths)
     #- remove visual stuff, so that user will see something is happening
     reset_all
-    sb_msg(_("Scanning source directory..."))
+    sb_msg(_("Scanning source directory... %s") % "")
     Gtk.main_iteration while Gtk.events_pending?
 
     for path in paths
@@ -1159,17 +1333,21 @@ def open_dir(*paths)
         $workingdir = path
         entries = []
         if File.directory?(path)
-            examined_dirs = `find '#{path}' -type d -follow`.sort.collect { |v| v.chomp }
+            examined_dirs = `find '#{path}' -type d -follow`.split("\n").sort.collect { |v| v.chomp }
             #- validate first
             examined_dirs.each { |dir|
                 if dir =~ /'/
                     return utf8(_("Source directory or sub-directories can't contain a single-quote character, sorry: %s") % dir)
                 end
-                Dir.entries(dir).each { |file|
-                    if file =~ /'/ && type = entry2type(file) && type == 'video'
-                        return utf8(_("Videos can't contain a single quote character ('), sorry: %s") % "#{dir}/#{file}")
-                    end
-                }
+                begin
+                    Dir.entries(dir).each { |file|
+                        if file =~ /'/ && type = entry2type(file) && type == 'video'
+                            return utf8(_("Videos can't contain a single quote character ('), sorry: %s") % "#{dir}/#{file}")
+                        end
+                    }
+                rescue
+                    puts "Failed to open directory #{dir}: #{$!}"
+                end
             }
             
             #- scan for populate second
@@ -1178,7 +1356,13 @@ def open_dir(*paths)
                     msg 1, _("Ignoring directory %s, begins with a dot (indicating a hidden directory)") % dir
                     next
                 end
-                entries += Dir.entries(dir).collect { |file| File.join(dir, file) }
+                begin
+                    entries += Dir.entries(dir).collect { |file| File.join(dir, file) }
+                rescue
+                    #- already puts'ed 10 lines upper
+                end
+                sb_msg(_("Scanning source directory... %s") % (_("%d entries found") % entries.size))
+                Gtk.main_iteration while Gtk.events_pending?
             }
 
         else
@@ -1191,6 +1375,8 @@ def open_dir(*paths)
                 date_time = Exif.datetimeoriginal(file)
                 if ! date_time.nil?
                     dates[file] = date_time
+                elsif file =~ /(20\d{2}).?(\d{2}).?(\d{2}).(\d{2}).?(\d{2}).?(\d{2})/
+                    dates[file] = "#$1:#$2:#$3 #$4:#$5:#$6"
                 end
             }
             entries = smartsort(entries, dates)
@@ -1224,7 +1410,7 @@ def open_dir_popup
     ok = false
     load = false
     while !ok
-        if fc.run == Gtk::Dialog::RESPONSE_ACCEPT
+        if fc.run == Gtk::Dialog::RESPONSE_ACCEPT && fc.filename
             msg = open_dir(fc.filename)
             if msg
                 show_popup(fc, msg)
@@ -1299,7 +1485,7 @@ def execute
         table.attach(examples, 2, 3, row, row + 1, Gtk::FILL, Gtk::FILL, 5, 5)
 
         if counter == 0
-            return {}
+            next {}
         end
 
         combostore = Gtk::ListStore.new(Gdk::Pixbuf, String)
@@ -1338,7 +1524,7 @@ def execute
                 if lastpath
                     fc.current_folder = lastpath
                 end
-                if fc.run == Gtk::Dialog::RESPONSE_ACCEPT
+                if fc.run == Gtk::Dialog::RESPONSE_ACCEPT && fc.filename
                     pathlabel.text = fc.filename
                     pathlabel.set_alignment(0, 0.5)
                 end
@@ -1416,7 +1602,7 @@ def execute
                         end
                         begin
                             Dir.mkdir(destination)
-                        rescue Errno::EEXIST
+                        rescue
                         end
                         begin
                             st = File.stat(destination)
@@ -1425,7 +1611,7 @@ def execute
                             problem = true
                             break
                         end
-                        if ! st.directory? || ! st.writable?
+                        if ! st.directory? || ! writable(destination)
                             show_popup(dialog, utf8(_("Directory %s, where to move/copy %s, is not valid or not writable.") % [destination, key.name]))
                             problem = true
                             break
@@ -1457,16 +1643,36 @@ def execute
                     begin
                         moved = 0
                         copied = 0
+                        ignored_errors = []
                         stuff.keys.each { |key|
                             if key.is_a?(Label) && stuff[key][:combo] && stuff[key][:combo].active <= 1
                                 destination = stuff[key][:pathlabel].text
                                 label2entries[key].each { |entry|
                                     if stuff[key][:combo].active == 0
-                                        system("cp -dp '#{entry.path}' '#{destination}'") or raise "failed to copy '#{entry.path}'"
-                                        copied += 1
+                                        result = `cp -dp '#{entry.path}' '#{destination}' 2>&1`
                                     elsif stuff[key][:combo].active == 1
-                                        system("mv '#{entry.path}' '#{destination}'") or raise "failed to move '#{entry.path}'"
-                                        moved += 1
+                                        result = `mv '#{entry.path}' '#{destination}' 2>&1`
+                                    end
+                                    if $?.exitstatus > 0
+                                        simplified_error = result.sub(/#{Regexp.quote(destination + '/' + File.basename(entry.path))}/, '').  #'
+                                                                  sub(/#{Regexp.quote(entry.path)}/, '').
+                                                                  sub(/#{Regexp.quote(File.basename(entry.path))}/, '')
+                                        if ! ignored_errors.include?(simplified_error)
+                                            response = show_popup($main_window,
+                                                                  utf8(_("Failure:\n\n%s\nDo you wish to continue?" % result)),
+                                                                  { :yestoall => true })
+                                            if response == 'no'
+                                                raise "failure on '#{entry.path}'"
+                                            elsif response == 'yestoall'
+                                                ignored_errors << simplified_error
+                                            end
+                                        end
+                                    else
+                                        if stuff[key][:combo].active == 0
+                                            copied += 1
+                                        else
+                                            moved += 1
+                                        end
                                     end
                                 }
                             end
@@ -1481,8 +1687,7 @@ def execute
                             }
                         end
                     rescue
-                        msg 1, "woops: #{$!}"
-                        show_popup(dialog, utf8(_("Unexpected error: '%s'.") % $!))
+                        msg 1, "woops: #{$!}\n" + $@.join("\n")
                     end
                     show_popup(dialog, utf8(_("Successfully moved %d files, copied %d file, and removed %d files.") % [ moved, copied, removed ]))
                     dialog.destroy
@@ -1778,11 +1983,15 @@ def reset_labels
     $labels = {}
     $ordered_labels = []
     lbl = Gtk::Label.new.set_markup(utf8(_("<i>unlabelled</i>")))
-    $labels_vbox.pack_start($unlabelled_button = Gtk::CheckButton.new.add(Gtk::EventBox.new.add(lbl)).show_all)
+    $labels_vbox.pack_start(Gtk::HBox.new(false, 5).pack_start($unlabelled_button = Gtk::CheckButton.new.add(Gtk::EventBox.new.add(lbl)), false, false).
+                                                    pack_start(Gtk::Label.new, true, true).  #- I suck
+                                                    pack_start($unlabelled_counter = Gtk::Label.new.set_markup('<tt>0</tt>'), false, false).show_all)
     $unlabelled_button.active = true
     $unlabelled_button.signal_connect('toggled') { update_all_visibilities }
     lbl = Gtk::Label.new.set_markup(utf8(_("<i>to remove</i>")))
-    $labels_vbox.pack_start($toremove_button = Gtk::CheckButton.new.add(evt = Gtk::EventBox.new.add(lbl)).show_all)
+    $labels_vbox.pack_start(Gtk::HBox.new(false, 5).pack_start($toremove_button = Gtk::CheckButton.new.add(evt = Gtk::EventBox.new.add(lbl)), false, false).
+                                                    pack_start(Gtk::Label.new, true, true).
+                                                    pack_start($toremove_counter = Gtk::Label.new.set_markup('<tt>0</tt>'), false, false).show_all)
     $toremove_button.active = true
     $toremove_button.signal_connect('toggled') { update_all_visibilities }
     evt.modify_bg(Gtk::StateType::NORMAL, $color_red)
@@ -1790,7 +1999,14 @@ def reset_labels
     evt.modify_bg(Gtk::StateType::ACTIVE, $color_red.lighter)
 end
 
+def cleanup_loaders
+    $allentries.each { |e| 
+        e.cancel_loader
+    }
+end
+
 def reset_thumbnails
+    cleanup_loaders
     $allentries = []
     if $preloader_running
         $preloader_force_exit = true
@@ -1807,7 +2023,7 @@ end
 
 def create_main_window
 
-    $videoborder_pixbuf = Gdk::Pixbuf.new("#{$FPATH}/images/video_border.png")
+    $videoborder_pixbuf = GdkPixbuf::Pixbuf.new(:file => "#{$FPATH}/images/video_border.png")
     $videoborder_pixmap, = $videoborder_pixbuf.render_pixmap_and_mask(0)
 
     mb = create_menubar
@@ -1817,7 +2033,7 @@ def create_main_window
     mainview_hbox = Gtk::HBox.new
     mainview_hbox.pack_start(Gtk::Alignment.new(0.5, 0, 1, 1).add(left_vbox = Gtk::VBox.new(false, 5)), false, true)
     left_vbox.pack_start(($labels_vbox = Gtk::VBox.new(false, 5)), false, true)
-    left_vbox.pack_end($loading_progressbar = Gtk::ProgressBar.new.set_text(utf8(_("Loading... %d%") % 0)), false, true)
+    left_vbox.pack_end($loading_progressbar = Gtk::ProgressBar.new.set_text(utf8(_("Loading... %d%%") % 0)), false, true)
     mainview_hbox.pack_start($mainview = MainView.new, true, true)
     main_vbox.pack_start(mainview_hbox, true, true)
     $imagesline_sw = Gtk::ScrolledWindow.new(nil, nil)
@@ -1878,4 +2094,6 @@ if ARGV[0]
 end
 Gtk.main
 
+cleanup_loaders
+
 write_config