Changeset 425

Timestamp:

02/13/2008 13:17:31 (7 months ago)

Author:

why

Message:

• lib/shoes/shy.rb: working on shy progress meter.
  

Location:

trunk/lib

Files:

• shoes.rb (modified) (4 diffs)
• shoes/shy.rb (modified) (5 diffs)

trunk/lib/shoes.rb

@@ -30 +30 @@
 
 class Shoes
-  VERSION = "0.1"
+  VERSION = "Raisins"
 
   NotFound = proc do
@@ -42 +42 @@
         stack :margin => 10 do
           subtitle "ShyMaker", :margin => 0
-          tagline "for Shoes #{Shoes::VERSION}"
+          inscription "for Shoes #{Shoes::VERSION}"
         end
       end
-      stack do
+      stack :margin_left => 40 do
         @done =
           stack :margin => 20, :hidden => true do
@@ -52 +52 @@
         @make =
           stack :margin => 20, :hidden => true do
-            para "Making the Shy"
+            para "Making the Shy" 
+            @make_text = para "Creating file..."
             @prog = progress
           end
@@ -87 +88 @@
 
                 Thread.start do
-                  Shy.c(shy_save, shy, s)
+                  Shy.c(shy_save, shy, s) do |_name, _perc, _left|
+                    @make_text.replace "Adding #{_name}"
+                  end
                   @make.hide
                   @done.show

trunk/lib/shoes/shy.rb

@@ -5 +5 @@
 require 'zlib'
 require 'shoes/minitar'
+require 'find'
 require 'tmpdir'
 require 'yaml'
@@ -18 +19 @@
   def self.launchable(d)
     Dir["#{d}/**/*.rb"].map do |path|
-      path.gsub(%r!#{Regexp::quote(path)}/!, '')
+      path.gsub(%r!#{Regexp::quote(d)}/!, '')
+    end
+  end
+
+  def self.__hdr__(f)
+    hdr = f.read(10).unpack(LAYOUT)
+    raise IOError, "Invalid header" if hdr[0] != MAGIC and hdr[1] > VERSION
+    YAML.load(f.read(hdr[2]))
+  end
+
+
+  def self.du(root)
+    size = 0
+    Find.find(root) do |path|
+      if FileTest.directory?(path)
+        if File.basename(path)[0] == ?.
+          Find.prune
+        else
+          next
+        end
+      else
+        size += FileTest.size(path)
+      end
+    end
+    size
+  end
+
+  def self.meta(path, d = ".")
+    File.open(path, 'rb') do |f|
+      shy = __hdr__(f)
     end
   end
@@ -24 +54 @@
   def self.x(path, d = ".")
     File.open(path, 'rb') do |f|
-      hdr = f.read(10).unpack(LAYOUT)
-      raise IOError, "Invalid header" if hdr[0] != MAGIC and hdr[1] > VERSION
-      shy = YAML.load(f.read(hdr[2]))
+      shy = __hdr__(f)
       inp = Zlib::GzipReader.new(f)
       Archive::Tar::Minitar.unpack(inp, d)
@@ -33 +61 @@
   end
 
-  def self.c(path, shy, d)
+  def self.c(path, shy, d, &blk)
     path = File.expand_path(path)
     meta = shy.to_yaml
+    total = left = du(d)
     Dir.chdir(d) do
       File.open(path, "wb") do |f|
@@ -42 +71 @@
         out = Zlib::GzipWriter.new(f)
         files = ["."]
-        Archive::Tar::Minitar.pack(files, out)
+
+        tarblk = nil
+        if blk
+          tarblk = proc do |action, name, stats|
+            if action == :file_progress
+              left -= stats[:currinc]
+              blk[name, 100.0 - (left.to_f / total.to_f), left]
+            end
+          end
+        end
+        Archive::Tar::Minitar.pack(files, out, &tarblk)
       end
     end