Changeset 1022 for trunk/rtorrent/src/utils/directory.cc

Timestamp:

12/23/07 14:12:23 (4 years ago)

Author:

rakshasa

Message:

* Refactoring utils::Directory.

Files:

• trunk/rtorrent/src/utils/directory.cc (modified) (3 diffs)

trunk/rtorrent/src/utils/directory.cc

@@ -47 +47 @@
 namespace utils {
 
+// Keep this?
 bool
 Directory::is_valid() const {
@@ -58 +59 @@
 }
 
+// Update should take various flags and sort functors.
 bool
 Directory::update(bool hideDot) {
@@ -70 +72 @@
   struct dirent* ent;
 
+  // Err... let us use getdirentries here instead.
   while ((ent = readdir(d)) != NULL) {
+    // Don't construct it here, check the const char.
     std::string de(ent->d_name);
 
-    if (!de.empty() && (!hideDot || de[0] != '.'))
-      Base::push_back(ent->d_name);
+    if (!de.empty() && (!hideDot || de[0] != '.')) {
+      iterator itr = base_type::insert(end(), value_type());
+
+      itr->d_fileno = ent->d_fileno;
+      itr->d_reclen = ent->d_reclen;
+      itr->d_type   = ent->d_type;
+      itr->d_name   = de;
+    }
   }
 
   closedir(d);
-  Base::sort(std::less<std::string>());
+  std::sort(begin(), end());
 
   return true;
 }
 
-Directory::Base
+std::vector<std::string>
 Directory::make_list() {
-  Base l;
+  std::vector<std::string> l;
+  l.reserve(size());
 
-  for (Base::iterator itr = begin(); itr != end(); ++itr)
-    l.push_back(m_path + *itr);
+  for (iterator itr = begin(); itr != end(); ++itr)
+    l.push_back(m_path + itr->d_name);
 
   return l;