Merge branch 'master' of ssh://git.zarb.org/srv/git/booh

diff --git a/bin/booh b/bin/booh
index 7b66e2eaacd1290043afeab7192541c17546865a..a5db62400be49c1328256853e4959c054fa6ded1 100644 (file)
--- a/bin/booh
+++ b/bin/booh
@@ -2181,11 +2181,9 @@ end
 
 def call_backend(cmd, waitmsg, mode, params)
     pipe = Tempfile.new("boohpipe")
-    Thread.critical = true
     path = pipe.path
     pipe.close!
     system("mkfifo #{path}")
-    Thread.critical = false
     cmd += " --info-pipe #{path}"
     button, w8 = backend_wait_message($main_window, waitmsg, path, mode)
     pid = nil
@@ -3039,12 +3037,10 @@ def open_file_user(filename)
         $orig_filename = $filename
         $main_window.title = 'booh - ' + File.basename($orig_filename)
         tmp = Tempfile.new("boohtemp")
-        Thread.critical = true
         $filename = tmp.path
         tmp.close!
         #- for security
         ios = File.open($filename, File::RDWR|File::CREAT|File::EXCL)
-        Thread.critical = false
         ios.close
         $tempfiles << $filename << "#{$filename}.backup"
     else

diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb
index d44e8650d5044160762146cac42a7ad8d245a92d..0f034cdc6dffc486d5c6620d341da2cc90c715e7 100644 (file)
--- a/lib/booh/booh-lib.rb
+++ b/lib/booh/booh-lib.rb
@@ -341,6 +341,8 @@ module Booh
         gen_thumbnails(orig, allow_background, dests, xmldirorelem, type + '-')
     end
 
+    $video_thumbnail_directory_lock = Monitor.new
+
     def gen_video_thumbnail(orig, colorswap, seektime)
         if colorswap
             #- ignored for the moment. is mplayer subject to blue faces problem?
@@ -348,16 +350,15 @@ module Booh
         #- it's not possible to specify a basename for the output jpeg file with mplayer (file will be named 00000001.jpg); as this can
         #- be called from multiple threads, we must come up with a unique directory where to put the file
         tmpfile = Tempfile.new("boohvideotmp")
-        Thread.critical = true
-        tmpdirname = tmpfile.path
-        tmpfile.close!
-        begin
-            Dir.mkdir(tmpdirname)
-        rescue Errno::EEXIST
-            raise "Tmp directory #{tmpdirname} already exists"
-        ensure
-            Thread.critical = false
-        end
+        $video_thumbnail_directory_lock.synchronize {
+            tmpdirname = tmpfile.path
+            tmpfile.close!
+            begin
+                Dir.mkdir(tmpdirname)
+            rescue Errno::EEXIST
+                raise "Tmp directory #{tmpdirname} already exists"
+            end
+        }
         cmd = "mplayer '#{orig}' -nosound -vo jpeg:outdir='#{tmpdirname}' -frames 1 -ss #{seektime} -slave >/dev/null 2>/dev/null"
         sys(cmd)
         if ! File.exists?("#{tmpdirname}/00000001.jpg")

diff --git a/lib/booh/rexml/element.rb b/lib/booh/rexml/element.rb
index 2676fcff4efac990b426b84bd7a99fdf09da5c3b..fbc5d0c40ac997933ff775b2b202b655872a96a8 100644 (file)
--- a/lib/booh/rexml/element.rb
+++ b/lib/booh/rexml/element.rb
@@ -551,9 +551,13 @@ module REXML
                #################################################
 
                def attribute( name, namespace=nil )
-                       prefix = nil
-      prefix = namespaces.index(namespace) if namespace
-                       attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
+                    prefix = nil
+                    if namespaces.respond_to? :key
+                        prefix = namespaces.key(namespace) if namespace
+                    else
+                        prefix = namespaces.index(namespace) if namespace
+                    end
+                    attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
                end
 
                # Evaluates to +true+ if this element has any attributes set, false