Changeset 462 for AE/Installer/trunk

Timestamp:

Oct 10, 2009, 4:49:27 AM (15 years ago)

Author:

gumby

Message:

Fixed buggy BSL stuff

Location:

AE/Installer/trunk/source

Files:

• installer.h (modified) (1 diff)
• main_window.cpp (modified) (10 diffs)

AE/Installer/trunk/source/installer.h

@@ -101 +101 @@
 void setProgressBar( int );
 
-void copyBSL( string, vector<string>, ModPackage );
+void copyBSL( string, vector<string>&, ModPackage );
 
 //New copy(path, path) function. Too lazy to implement my own, this is basically how I would have done it though.

AE/Installer/trunk/source/main_window.cpp

@@ -723 +723 @@
 
 
-                ofstream BSLlog("BSL.log");
+                
                 
                 vector<string> BSLfolders;
@@ -729 +729 @@
 
                 
-
+ofstream BSLlog("BSL.log");
                 for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
                         dir_itr != end_itr;
@@ -742 +742 @@
                         for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
                                 if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
-                                        BSLlog << "Testing " << globalPackages[j].modStringName << "\n"
+                                /*BSLlog << "Testing " << globalPackages[j].modStringName << "\n"
                                                 << "HasBSL: " << globalPackages[j].hasBSL << "\n"
-                                                << "HasAddon: " << globalPackages[j].hasAddon << "\n";
+                                                << "HasAddon: " << globalPackages[j].hasAddon << "\n";*/
                                         if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
-                                        if( exists( "packages/" + globalPackages[j].modStringName + "/BSL" ) )
+                                        if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
                                         copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
+                                        BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
+                                        }
+
                                 }
 
@@ -754 +757 @@
 
                 ModPackage emptyPackage;
+                emptyPackage.modStringName = "VanillaBSL";
+                emptyPackage.hasBSL = 1;
                 copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
                 BSLlog.close();
@@ -764 +769 @@
         string finallyDone = "Done! You can now play Oni.";
         
-a
+
         
         setStatusArea(finallyDone);
@@ -798 +803 @@
 }
 
-void copyBSL(string copypath, vector<string> BSLfolders, ModPackage pkg) {
+void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg) {
+
+        ofstream BSLlog("BSL2.log", ios::app );
+        
         try {
                 for ( directory_iterator dir_itr( copypath ), end_itr;
@@ -805 +813 @@
 
                                 if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {  
+                                        BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
                                         int skip_folder = 0;
+
                                         for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders    
+                                                BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
                                                 if(dir_itr->path().filename() == BSLfolders[k]) {
-                                                        skip_folder = 1;                        
+                                                        skip_folder = 1;
+                                                        BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
                                                         break;
                                                 }
@@ -816 +828 @@
                                                 Sleep(100);
                                                 create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
-
+                                                BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n";
                                                 for ( directory_iterator bsl_itr( dir_itr->path() );
                                                         bsl_itr != end_itr;
@@ -824 +836 @@
                                                                 }
                                                 }
-                                                BSLfolders.push_back( dir_itr->path().filename() );
+                                                BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
+                                                BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
                                         }
                                 }
@@ -834 +847 @@
                 while(1) Sleep(1000);
         }
-
-}
-                         
-                         
+        BSLlog.close();
+        
+}
+
+
 void writeInstalledMods(vector<string> installedMods)
 {