Changeset 5560

Timestamp:

10/17/07 10:51:04 (2 years ago)

Author:

fabien

Message:

added the ability to sort results in sfFinder (closes #1609 - patch from francois)

Files:

• trunk/lib/util/sfFinder.class.php (modified) (6 diffs)

trunk/lib/util/sfFinder.class.php

@@ -48 +48 @@
-  protected $relative    = false;
-  protected $follow_link = false;
+  protected $sort        = false;
-
-  /**
@@ -247 +248 @@
-
-    return $this->discard($ignores)->prune($ignores);
+  }
+
+  /**
+   * Returns files and directories ordered by name
+   *
+   * @return object current sfFinder object
+   */
+  public function sort_by_name()
+  {
+    $this->sort = 'name';
+
+    return $this;
+  }
+
+  /**
+   * Returns files and directories ordered by type (directories before files), then by name
+   *
+   * @return object current sfFinder object
+   */
+  public function sort_by_type()
+  {
+    $this->sort = 'type';
+
+    return $this;
-  }
-
@@ -352 +377 @@
-    }
-
+    if ($this->sort == 'name')
+    {
+      sort($files);
+    }
+
-    return array_unique($files);
-  }
@@ -368 +398 @@
-
-    $files = array();
-
+
+
-    if (is_dir($dir))
-    {
@@ -383 +414 @@
-
-        if (is_dir($current_entry))
+        {
+          if ($this->sort == 'type')
+          {
+            $temp_folders[$entryname] = $current_entry;
+          }
+          else
+          {
+            if (($this->type == 'directory' || $this->type == 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname))
+            {
+              $files[] = realpath($current_entry);
+            }
+
+            if (!$this->is_pruned($dir, $entryname))
+            {
+              $files = array_merge($files, $this->search_in($current_entry, $depth + 1));
+            }
+          }
+        }
+        else
+        {
+          if (($this->type != 'directory' || $this->type == 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->size_ok($dir, $entryname) && $this->exec_ok($dir, $entryname))
+          {
+            if ($this->sort == 'type')
+            {
+              $temp_files[] = realpath($current_entry);
+            }
+            else
+            {
+              $files[] = realpath($current_entry);
+            }
+          }
+        }
+      }
+
+      if ($this->sort == 'type')
+      {
+        ksort($temp_folders);
+        foreach($temp_folders as $entryname => $current_entry)
-        {
-          if (($this->type == 'directory' || $this->type == 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname))
@@ -394 +463 @@
-          }
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
-      closedir($current_dir);
-    }