Changeset 306

Timestamp:

May 2, 2009, 6:34:23 PM (16 years ago)

Author:

gumby

Message:

 

Location:

AE/Installer/trunk/source

Files:

• include (added)
• include/dirent.h (added)
• lib (added)
• lib/dirent.lib (added)
• subs.cpp (modified) (4 diffs)

AE/Installer/trunk/source/subs.cpp

@@ -82 +82 @@
 
         string filename = "\0";
-        string MODINFO_CFG = "\\Mod_Info.cfg";
-
-
-
-        DIR *pdir;
-        struct dirent *pent;
-
-        pdir = opendir( path.c_str() ); //"." refers to the current dir
-        if (!pdir){
-                printf ("\nopendir() failure; terminating");
-                exit(1);
-        }
-        errno=0; 
-
-        while (( pent = readdir(pdir) )){
-
-                filename = path + '\\' + pent->d_name + MODINFO_CFG;
-                file.open(filename.c_str());
+        string MODINFO_CFG = "Mod_Info.cfg";
+
+        try
+        {
+
+
+        directory_iterator end_iter;
+        for ( directory_iterator dir_itr( "./packages" );
+                dir_itr != end_iter;
+                ++dir_itr )
+        {
+
+                
+                file.open( (dir_itr->path().string() + "/" + MODINFO_CFG ).c_str());
 
                 //cout << filename << "\n";
@@ -105 +101 @@
                 if(!file.fail() )
                 {
-                        //file.open(filename.c_str(), fstream::out);
-
-                        //do stuff like adding to vector :P
-
+                        cout << dir_itr->path().string() + MODINFO_CFG ;
                         //would prefer to push a pointer to a package, but this will do for now
                         packages.push_back( fileToModPackage(file) );
@@ -116 +109 @@
                 file.clear();
 
-        }
-
-
-        if (errno){
-                printf ("readdir() failure; terminating");
-                exit(1);
-        }
-        closedir(pdir);
-
+
+
+        }
+
+
+        }
+        catch ( const std::exception & ex )
+        {
+                cout << "Warning, something odd happened!\n";
+        }
 
         return packages;
@@ -376 +370 @@
                                 catch( const std::exception & ex ) {
                                         cout << "Warning, exception " << ex.what() << "!\n"
-                                                << "You probably need to reGlobalize.;
+                                                << "You probably need to reGlobalize.";
                                         create_directory( "./packages/VanillaDats" );
                                 }