Fix path_to_id issue where last shorty was stripped

cbeer · Jun 9, 2011 · 0ab346d · 0ab346d
1 parent b449346
commit 0ab346d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/lib/pairtree/path.rb b/lib/pairtree/path.rb
@@ -29,7 +29,7 @@ def self.id_to_path id
 
     def self.path_to_id ppath
       parts = ppath.split(File::SEPARATOR)
-      parts.pop if @@leaf_proc
+      parts.pop if @@leaf_proc and parts.last.length > Root::SHORTY_LENGTH
       Pairtree::Identifier.decode(parts.join)
     end
 

diff --git a/lib/pairtree/root.rb b/lib/pairtree/root.rb
@@ -1,4 +1,3 @@
-require 'find'
 require 'fileutils'
 module Pairtree
   class Root
@@ -19,15 +18,12 @@ def list
       return [] unless pairtree_root? @root
 
       Dir.chdir(@root) do
-        Find.find(*Dir.entries('.').reject { |x| x =~ /^\./ }) do |path|
-          if File.directory? path
-            Find.prune if File.basename(path).length > @shorty_length
-  	        objects << path if Dir.entries(path).any? { |f| f.length > @shorty_length or File.file? File.join(path, f) }
-  	        next
-          end
-  	    end
+        possibles = Dir['**/?'] + Dir['**/??']
+        possibles.each { |path|
+          contents = Dir.entries(path).reject { |x| x =~ /^\./ }
+          objects << path unless contents.all? { |f| f.length <= @shorty_length and File.directory?(File.join(path, f)) }
+        }
       end
-
       objects.map { |x| @prefix + Pairtree::Path.path_to_id(x) }
     end