fertling about.

[feisty_meow.git] / nucleus / library / filesystem / directory_tree.cpp

diff --git a/nucleus/library/filesystem/directory_tree.cpp b/nucleus/library/filesystem/directory_tree.cpp
index dc78832fb64d13d977724ede7afabed1543c53ac..621b73cd271369f9f3790c5d044ce8eb7049f1d6 100644 (file)
--- a/nucleus/library/filesystem/directory_tree.cpp
+++ b/nucleus/library/filesystem/directory_tree.cpp
@@ -39,7 +39,6 @@ using namespace textual;
 
 #undef LOG
 #define LOG(to_print) CLASS_EMERGENCY_LOG(program_wide_logger::get(), to_print)
-//printf("%s::%s: %s\n", static_class_name(), func, astring(to_print).s())
 
 //////////////
 
@@ -224,12 +223,20 @@ void directory_tree::traverse(const astring &path, const char *pattern,
 
 bool directory_tree::reset(const astring &path, const char *pattern)
 {
+  FUNCDEF("reset");
   _scanned_okay = false;
   WHACK(_real_tree);
+//  filename temp_path(path);
+//  temp_path.canonicalize();
   *_path = path;
+//temp_path.raw();
   *_pattern = pattern;
   _real_tree = new filename_tree;
 
+#ifdef DEBUG_DIRECTORY_TREE
+  LOG(astring("dirtree::reset to path: ") + path);
+#endif
+
   // check that the top-level is healthy.
   directory curr(path, "*");
   if (!curr.good()) return false;
@@ -268,7 +275,8 @@ bool directory_tree::jump_to(dir_tree_iterator &scanning,
 {
   FUNCDEF("jump_to");
   string_array pieces;
-  filename(sub_path).separate(pieces);
+  bool rooted;
+  filename(sub_path).separate(rooted, pieces);
   for (int i = 0; i < pieces.length(); i++) {
     filename_tree *curr = dynamic_cast<filename_tree *>(scanning.current());
 #ifdef DEBUG_DIRECTORY_TREE
@@ -276,7 +284,7 @@ bool directory_tree::jump_to(dir_tree_iterator &scanning,
 #endif
     string_array sub_pieces = pieces.subarray(i, i);
     filename curr_path;
-    curr_path.join(sub_pieces);
+    curr_path.join(rooted, sub_pieces);
     curr_path = filename(curr->_dirname.raw() + filename::default_separator()
         + curr_path.raw());
 #ifdef DEBUG_DIRECTORY_TREE
@@ -438,7 +446,7 @@ filename_tree *directory_tree::seek(const astring &dir_name_in,
       filename current(check->_dirname);
       if (!current.is_normal()) {
 //#ifdef DEBUG_DIRECTORY_TREE
-        LOG(astring("skipping abnormal dir:  ") + current);
+        LOG(astring("seek: skipping abnormal dir: \"") + current + "\"");
 //#endif
         continue;
       }
@@ -488,6 +496,9 @@ bool directory_tree::calculate(bool just_size)
 bool directory_tree::calculate(filename_tree *start, bool just_size)
 {
   FUNCDEF("calculate");
+//#ifdef DEBUG_DIRECTORY_TREE
+  LOG(astring("calculate: got tree to start with at ") + start->_dirname.raw());
+//#endif
   dir_tree_iterator *ted = start_at(start, directory_tree::postfix);
     // create our iterator to do a postfix traversal.  why postfix?  well,
     // prefix has been used elsewhere and since it doesn't really matter what
@@ -500,7 +511,7 @@ bool directory_tree::calculate(filename_tree *start, bool just_size)
   while (directory_tree::current_dir(*ted, curr)) {
     if (!curr.is_normal()) {
 //#ifdef DEBUG_DIRECTORY_TREE
-      LOG(astring("skipping abnormal dir:  ") + curr);
+      LOG(astring("calculate: skipping abnormal dir: \"") + curr + "\"");
 //#endif
       directory_tree::next(*ted);
       continue;  // scary non-simple file type.
@@ -518,7 +529,7 @@ bool directory_tree::calculate(filename_tree *start, bool just_size)
 #endif
       if (!curr_file.is_normal()) {
 //#ifdef DEBUG_DIRECTORY_TREE
-        LOG(astring("skipping abnormal file:  ") + curr);
+        LOG(astring("skipping abnormal file: \"") + curr + "\"");
 //#endif
         continue;
       }
@@ -577,7 +588,8 @@ bool directory_tree::compare_trees(const directory_tree &source,
   int source_pieces = 0;
   {
     string_array temp;
-    filename(real_source_start).separate(temp);
+    bool rooted_source;
+    filename(real_source_start).separate(rooted_source, temp);
     source_pieces = temp.length();
   }
 
@@ -591,7 +603,8 @@ bool directory_tree::compare_trees(const directory_tree &source,
 #endif
 
     string_array pieces;
-    curr.separate(pieces);  // get the components of the current location.
+    bool curr_rooted;
+    curr.separate(curr_rooted, pieces);  // get the components of the current location.
 #ifdef DEBUG_DIRECTORY_TREE
     LOG(astring("name in pieces:") + pieces.text_form());
 #endif
@@ -599,7 +612,8 @@ bool directory_tree::compare_trees(const directory_tree &source,
       // snap the root components out of there.
 
     filename corresponding_name;
-    corresponding_name.join(pieces);
+//hmmm: is that right decision?
+    corresponding_name.join(false, pieces);
 #ifdef DEBUG_DIRECTORY_TREE
     LOG(astring("computed target name as: ") + corresponding_name);
 #endif
@@ -617,6 +631,11 @@ bool directory_tree::compare_trees(const directory_tree &source,
     if (target_start.raw().t()) {
       corresponding_name = filename(target_start.raw()
           + filename::default_separator() + corresponding_name.raw());
+/*doesn't help, not right yet.    } else {
+      // if they didn't give us a place to start, we start at the top.
+      corresponding_name = filename(target.path()
+          + filename::default_separator() + corresponding_name.raw());
+*/
     }
 #ifdef DEBUG_DIRECTORY_TREE
     LOG(astring("target with start is: ") + corresponding_name);
@@ -626,10 +645,10 @@ bool directory_tree::compare_trees(const directory_tree &source,
     if (!target_now) {
       // that entire sub-tree is missing.  add all of the files here into
       // the list.
-#ifdef DEBUG_DIRECTORY_TREE
+//#ifdef DEBUG_DIRECTORY_TREE
       LOG(astring("could not find dir in target for ") + curr.raw()
           + " which we computed corresp as " + corresponding_name.raw());
-#endif
+//#endif
     }
 
     // now scan across all the files that are in our source list.
@@ -704,13 +723,15 @@ outcome directory_tree::find_common_root(const astring &finding, bool exists,
 
   // break up the path into pieces.
   pieces.reset();
-  adding.separate(pieces);
+  bool rooted;
+  adding.separate(rooted, pieces);
 
   // break up our root into pieces; we must take off components that are
   // already in the root.
   string_array root_pieces;
+  bool root_rooted;
   filename temp_file(path());
-  temp_file.separate(root_pieces);
+  temp_file.separate(root_rooted, root_pieces);
 
   // locate the last place where the path we were given touches our tree.
   // it could be totally new, partially new, or already contained.
@@ -855,7 +876,8 @@ outcome directory_tree::add_path(const astring &new_item, bool just_size)
 #endif
       // handle the case for files now that we have our proper node.
       string_array partial_pieces;
-      filename(reassembled).separate(partial_pieces);
+      bool partial_rooted;
+      filename(reassembled).separate(partial_rooted, partial_pieces);
       int levels_missing = pieces.length() - partial_pieces.length();
 
       // we loop over all the pieces that were missing in between the last