Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/util

Timestamp:

May 18, 2005, 11:27:40 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

Location:

orxonox/branches/movie_player/src/util

Files:

• resource_manager.cc (modified) (6 diffs)
• resource_manager.h (modified) (4 diffs)

orxonox/branches/movie_player/src/util/resource_manager.cc

@@ -99 +99 @@
       return false;
     }
+}
+
+/**
+   \brief checks for the DataDirectory, by looking if 
+   \param fileInside is inisde??
+*/
+bool ResourceManager::checkDataDir(const char* fileInside)
+{
+  bool retVal;
+  if (!isDir(this->dataDir))
+    {
+      PRINTF(1)("%s is not a directory\n", this->dataDir);
+      return false;
+    }
+  
+  char* testFile = new char[strlen(this->dataDir)+strlen(fileInside)+1];
+  sprintf(testFile, "%s%s", this->dataDir, fileInside);
+  retVal = isFile(testFile);
+  delete testFile;
+  return retVal;
 }
 
@@ -182 +202 @@
   // searching if the resource was loaded before.
   Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2,param3);
-  if (tmpResource) // if the resource was not loaded before.
+  if (tmpResource) // if the resource was loaded before.
     {
       PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
@@ -201 +221 @@
 
       // creating the full name. (directoryName + FileName)
-      char* fullName = new char[strlen(dataDir)+strlen(fileName)+1];
-      sprintf(fullName, "%s%s", this->dataDir, fileName);
-      
+      char* fullName = new char[strlen(this->getDataDir())+strlen(fileName)+1];
+      sprintf(fullName, "%s%s", this->getDataDir(), fileName);
       // Checking for the type of resource \see ResourceType
       switch(type)
@@ -213 +232 @@
             tmpResource->modelSize = 1.0;
 
-          if(isFile(fullName))
+          if(ResourceManager::isFile(fullName))
             tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
           else
@@ -510 +529 @@
     }
 
-  stat(tmpDirName, &status);
-  if (status.st_mode & (S_IFDIR
+  if(!stat(tmpDirName, &status))
+    {
+      if (status.st_mode & (S_IFDIR
 #ifndef __WIN32__
-                        | S_IFLNK
+                            | S_IFLNK
 #endif
-                        ))
-    {
-      delete tmpDirName;
-      return true;
-    }
-  else
-    {
-      delete tmpDirName;
-      return false;
-    }
+                            ))
+        {
+          delete tmpDirName;
+          return true;
+        }
+      else
+        {
+          delete tmpDirName;
+          return false;
+        }
+    }
+  else
+    return false;
 }
 
@@ -534 +557 @@
 bool ResourceManager::isFile(const char* fileName)
 {
+  char* tmpFileName = ResourceManager::homeDirCheck(fileName);
+  // actually checks the File
   struct stat status;
-  stat(fileName, &status);
-  if (status.st_mode & (S_IFREG 
+  if (!stat(tmpFileName, &status))
+    {
+      if (status.st_mode & (S_IFREG 
 #ifndef __WIN32__
-                        | S_IFLNK
+                            | S_IFLNK
 #endif
-                        ))
-    return true;
-  else
-    return false;
-}
+                            ))
+        {
+          delete tmpFileName;
+          return true;
+        }
+      else
+        {
+          delete tmpFileName;
+          return false;
+        }
+    }
+  else 
+    {
+      delete tmpFileName;
+      return false;
+    }
+}
+
+/**
+   \brief touches a File on the disk (thereby creating it)
+   \param fileName The file to touch
+*/
+bool ResourceManager::touchFile(const char* fileName)
+{
+  char* tmpName = ResourceManager::homeDirCheck(fileName);
+
+  FILE* stream;
+  if( (stream = fopen (tmpName, "w")) == NULL)
+    {
+      PRINTF(1)("could not open %s fro writing\n", fileName);
+      return false;
+    }
+  fclose(stream);
+    
+  delete tmpName; 
+}
+
+/**
+   \brief deletes a File from disk
+   \param fileName the File to delete
+*/
+bool ResourceManager::deleteFile(const char* fileName)
+{
+  char* tmpName = ResourceManager::homeDirCheck(fileName);
+  unlink(tmpName);
+  delete tmpName;
+}
+
+/** 
+    \param fileName the Name of the file to check
+    \returns The name of the file, including the HomeDir
+    IMPORTANT: this has to be deleted from the outside
+*/
+char* ResourceManager::homeDirCheck(const char* name)
+{
+  char* retName;
+  if (!strncmp(name, "~/", 2))
+    {
+      char tmpFileName[500];
+#ifdef __WIN32__
+      strcpy(tmpFileName, getenv("USERPROFILE"));
+#else
+      strcpy(tmpFileName, getenv("HOME"));
+#endif
+      retName = new char[strlen(tmpFileName)+strlen(name)];
+      sprintf(retName, "%s%s", tmpFileName, name+1);
+    }
+  else
+    {
+      retName = new char[strlen(name)+1];
+      strcpy(retName, name);
+    }
+  return retName;
+}
+
+/** 
+    \param fileName the Name of the File to check
+    \returns The full name of the file, including the DataDir, and NULL if the file does not exist
+    IMPORTANT: this has to be deleted from the outside
+*/
+char* ResourceManager::getFullName(const char* fileName)
+{
+  char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir())
+                           + strlen(fileName) + 1];
+  sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
+  if (ResourceManager::isFile(retName))
+    return retName;
+  else
+    {
+      delete retName;
+      return NULL;
+    }
+}
+
 
 /**

orxonox/branches/movie_player/src/util/resource_manager.h

@@ -18 +18 @@
 
 //! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
-enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, TTF, IMAGE};
+enum ResourceType {OBJ,
+                   PRIM,
+                   WAV,
+                   MP3,
+                   OGG,
+                   TTF,
+                   IMAGE};
 //! An enumerator for different UNLOAD-types. 
 /**
@@ -26 +32 @@
    RP_GAME: will be unloaded at the end of the whole Game (when closing orxonox)
 */
-enum ResourcePriority {RP_NO = 0, RP_LEVEL = 1, RP_CAMPAIGN = 2, RP_GAME = 3};
+enum ResourcePriority {RP_NO = 0,
+                       RP_LEVEL = 1,
+                       RP_CAMPAIGN = 2,
+                       RP_GAME = 3};
 
 //! A Struct that keeps track about A resource its name its Type, and so on
@@ -65 +74 @@
 
   bool setDataDir(const char* dataDir);
+  /** \returns the Name of the data directory */
+  inline const char* getDataDir(void) const {return this->dataDir;}
+
+  bool checkDataDir(const char* fileInside);
   bool addImageDir(char* imageDir);
   void* load(const char* fileName, ResourcePriority prio = RP_NO,
@@ -78 +91 @@
   // utility functions of this class
   static bool isDir(const char* directory);
-  static bool isFile(const char* directory);
+  static bool isFile(const char* fileName);
+  static bool touchFile(const char* fileName);
+  static bool deleteFile(const char* fileName);
+  static char* homeDirCheck(const char* fileName);
+  static char* getFullName(const char* fileName);
 
  private: