Changeset 9869 in orxonox.OLD for trunk/src/lib/util/filesys

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/util/filesys

Files:

• directory.cc (modified) (3 diffs)
• directory.h (modified) (4 diffs)
• file.cc (modified) (1 diff)

trunk/src/lib/util/filesys/directory.cc

@@ -41 +41 @@
 #include <sys/stat.h>
 #include <dirent.h>
+const char Directory::delimiter = '/';
 #else
 #include <windows.h>
 #include <winbase.h>
+const char Direcotry::delimiter = '\\';
 #endif
 
@@ -63 +65 @@
  */
 Directory::Directory(const Directory& directory)
-  : File(directory)
+    : File(directory)
 {
   this->_opened = directory._opened;
@@ -166 +168 @@
 #endif
 }
+
+
+Directory Directory::operator+(const Directory& dir) const
+{
+  return Directory(*this) += dir;
+}
+
+/**
+ * @param dir the Directory to append to this one (say this one is "/var", then dir can be "log")
+ * @returns The Directory appended by dir.
+ *
+ * @note the Directoy will again be closed even if it was opened previously!
+ */
+Directory& Directory::operator+=(const Directory& dir)
+{
+  this->setFileName(this->name() + Directory::delimiter + dir.name());
+  return *this;
+}
+
+/**
+ * @brief Traverses the Directory tree one step up. (Parent Directory)
+ * @returns a Reference to the Directory.
+ */
+Directory& Directory::operator--()
+{
+}
+
+
+/**
+ * @brief Traverses the Directory tree one step up. (Parent Directory)
+ * @param int the PostFix iterator
+ * @returns a Reference to the Directory.
+ */
+Directory& Directory::operator--(int)
+{
+}
+
+/**
+ * @returns The Parent Directory.
+ */
+Directory Directory::parentDir() const
+{
+
+}
+
+File operator+(const Directory& dir, const File& file)
+{
+  return File(dir.name() + Directory::delimiter + file.name());
+}

trunk/src/lib/util/filesys/directory.h

@@ -29 +29 @@
 #include <vector>
 
+//! A Directory is a Special file, that contains multiple Files.
+/**
+ * @example Correct usage
+ * Directory dir("/var/log");
+ * dir.open();
+ * if (dir.fileNameInDir("emerge.log"))
+ *  { // do stuff; }
+ */
 class Directory : public File
 {
@@ -41 +49 @@
   bool create();
 
+  Directory operator+(const Directory& dir) const;
+  Directory& operator+=(const Directory& dir);
+  Directory& operator--();
+  Directory& operator--(int);
+  Directory parentDir() const;
+
+
   /** @returns if the Directory was opened */
   bool isOpen() const { return this->_opened; }
@@ -50 +65 @@
   const std::string& operator[](unsigned int fileNumber) const { return this->_fileNames[fileNumber]; };
   /** @returns a formated string containing the FileName, prepended with the directory-Name */
-  std::string fileNameInDir(unsigned int fileNumber) const { return this->name() + "/" + _fileNames[fileNumber]; };
+  std::string fileNameInDir(unsigned int fileNumber) const { return this->name() + Directory::delimiter + _fileNames[fileNumber]; };
   /** @returns a File pointing to the File @param fileNumber the fileNumber (must not bigger than fileCount()) */
   File getFile(unsigned int fileNumber) const { return File(fileNameInDir(fileNumber)); };
+
+public:
+  static const char           delimiter;        //!< A Delimiter (*nix: '/', windows: '\\')
 
 private:
@@ -58 +76 @@
   std::vector<std::string>    _fileNames;       //!< The List of Files contained in the directory. (will be filled when open was called.)
 };
+
+File operator+(const Directory& dir, const File& file);
 
 #endif /* __DIRECTORY_H_ */

trunk/src/lib/util/filesys/file.cc

@@ -326 +326 @@
 }
 
+/**
+ * @brief converts an Absolute Filename to a Relative one
+ * @param absFileName the FileName to convert. The Relative path will be stored in absFileName.
+ */
 void File::absToRel(std::string& absFileName)
 {