Changeset 3267 in orxonox.OLD

Timestamp:

Dec 24, 2004, 3:18:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: changed the FileInfo-struct

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui_update.cc (modified) (2 diffs)
• orxonox_gui_update.h (modified) (1 diff)

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -153 +153 @@
   FileInfo* info = new FileInfo;
 
-  info->fileOnDisk = new char [5];
-  strcpy (info->fileOnDisk, "test");
-  info->fileOnNet = new char [100];
-  strcpy(info->fileOnNet, "http://www.orxonox.ethz.ch/files/02%20orxonox%203.mp3");
+  info->fileName = "03%20orxonox%203'.mp3";
+  info->webRoot  = "http://www.orxonox.ethz.ch/files/";
+  info->localRoot = "./";
   info->Bar = (ProgressBar*)bar;
-  PRINTF(3)("Preparing to download file %s.\n", info->fileOnNet);
+  PRINTF(3)("Preparing to download file %s.\n", info->fileName);
   //  downloadThread (info);
 
   if (downloadThreadID == NULL)
     {
-        if ( (downloadThreadID =g_thread_create(&downloadThread, info, TRUE, NULL)) == 0 )
-          PRINTF(1)("can't create the thread");
+      if ( (downloadThreadID =g_thread_create(&downloadThread, info, TRUE, NULL)) == 0 )
+        PRINTF(1)("can't create the thread");
     }
   else 
@@ -218 +217 @@
   FILE* outfile;
   curl = curl_easy_init();
+  char* fileOnNet = new char [strlen(info->webRoot)+strlen(info->fileName)+1];
+  strcpy (fileOnNet, info->webRoot);
+  strcat (fileOnNet, info->fileName);
+  char* fileOnDisk = new char [strlen(info->localRoot)+strlen(info->fileName)+1];
+  strcpy (fileOnDisk, info->localRoot);
+  strcat (fileOnDisk, info->fileName);
 
   if(curl)
     {
-      outfile = fopen(info->fileOnDisk, "w");
+      outfile = fopen(fileOnDisk, "w");
       
-      curl_easy_setopt(curl, CURLOPT_URL, info->fileOnNet);
+      curl_easy_setopt(curl, CURLOPT_URL, fileOnNet);
       curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlWriteFunc);

orxonox/branches/updater/src/gui/orxonox_gui_update.h

@@ -39 +39 @@
 
 #ifdef HAVE_CURL
+  //! A Struct to hold information about one File to download.
   struct FileInfo
   {
-    char* fileOnNet;
-    char* fileOnDisk;
-    ProgressBar* Bar;
+    char* fileName;       //!< The Name of the file we want to get.
+    char* webRoot;        //!< The Root of the File on The Web
+    char* localRoot;      //!< The Root directory to put the files on the local disk.
+
+    ProgressBar* Bar;     //!< The ProgressBar, that sould be updated.
   };