Add support for bzip2 compressed trace files.

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index eccd3af1f9f8164a40ecd9507086d0b63dcbe143..f2dcf9ad9391902c10d81219094abb2c33b2f6c5 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -12,7 +12,9 @@ class Trace < ActiveRecord::Base
 
   def destroy
     super
 
   def destroy
     super

-    FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
+    FileUtils.rm_f(trace_name)
+    FileUtils.rm_f(icon_picture_name)
+    FileUtils.rm_f(large_picture_name)

   end
 
   def tagstring
   end
 
   def tagstring


@@ -90,11 +92,15 @@ class Trace < ActiveRecord::Base
       # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
       filetype = `file -b #{trace_name}`.chomp
       gzipped = filetype =~ /^gzip/
       # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
       filetype = `file -b #{trace_name}`.chomp
       gzipped = filetype =~ /^gzip/

+      bzipped = filetype =~ /^bzip2/

       zipped = filetype =~ /^Zip/
 
       if gzipped
         filename = tempfile = "/tmp/#{rand}"
         system("gunzip -c #{trace_name} > #{filename}")
       zipped = filetype =~ /^Zip/
 
       if gzipped
         filename = tempfile = "/tmp/#{rand}"
         system("gunzip -c #{trace_name} > #{filename}")

+      elsif bzipped
+        filename = tempfile = "/tmp/#{rand}"
+        system("bunzip2 -c #{trace_name} > #{filename}")

       elsif zipped
         filename = tempfile = "/tmp/#{rand}"
         system("unzip -p #{trace_name} > #{filename}")
       elsif zipped
         filename = tempfile = "/tmp/#{rand}"
         system("unzip -p #{trace_name} > #{filename}")