Index: AE/Installer/trunk/source/methods.h =================================================================== --- AE/Installer/trunk/source/methods.h (revision 293) +++ AE/Installer/trunk/source/methods.h (revision 294) @@ -8,15 +8,50 @@ bool isInstalled; //replace with function string name; - string modString; + string modStringName; + int modStringVersion; bool hasOnis; bool hasDeltas; bool hasBSL; bool hasDats; - bool category; + string category; string creator; bool isEngine; string readme; bool globalNeeded; + ModPackage(); + void doOutput() { + cout << "Mod: " << name; cout << "\n"; //remove this when done + cout << " String: " << modStringName << " v." << modStringVersion << "\n"; + cout << " Category: " << category << "\n"; + cout << " Creator: " << creator << "\n"; + cout << " HasOnis: " << hasOnis << "\n"; + cout << " HasBSL: " << hasBSL << "\n"; + cout << " HasDeltas: " << hasDeltas << "\n"; + cout << " HasDats: " << hasDats << "\n"; + cout << " IsEngine: " << isEngine << "\n"; + cout << " GlobalNeeded: " << globalNeeded << "\n"; + cout << " Readme: " << readme << "\n"; + cout << "\n"; +} + }; +//Initialization +ModPackage::ModPackage() { + isInstalled = 0; //replace with function + name = ""; + modStringName = ""; + modStringVersion = 0; + hasOnis = 0; + hasDeltas = 0; + hasBSL = 0; + hasDats = 0; + category = ""; + creator = ""; + isEngine = 0; + readme = ""; + globalNeeded = 1; +// void doOutput() const +// { }; +} int mainMenu(); @@ -32,20 +67,20 @@ void Tokenize(const string& str, - vector& tokens, - const string& delimiters = " ") + vector& tokens, + const string& delimiters = " ") { - // Skip delimiters at beginning. - string::size_type lastPos = str.find_first_not_of(delimiters, 0); - // Find first "non-delimiter". - string::size_type pos = str.find_first_of(delimiters, lastPos); + // Skip delimiters at beginning. + string::size_type lastPos = str.find_first_not_of(delimiters, 0); + // Find first "non-delimiter". + string::size_type pos = str.find_first_of(delimiters, lastPos); - while (string::npos != pos || string::npos != lastPos) - { - // Found a token, add it to the vector. - tokens.push_back(str.substr(lastPos, pos - lastPos)); - // Skip delimiters. Note the "not_of" - lastPos = str.find_first_not_of(delimiters, pos); - // Find next "non-delimiter" - pos = str.find_first_of(delimiters, lastPos); - } + while (string::npos != pos || string::npos != lastPos) + { + // Found a token, add it to the vector. + tokens.push_back(str.substr(lastPos, pos - lastPos)); + // Skip delimiters. Note the "not_of" + lastPos = str.find_first_not_of(delimiters, pos); + // Find next "non-delimiter" + pos = str.find_first_of(delimiters, lastPos); + } } Index: AE/Installer/trunk/source/subs.cpp =================================================================== --- AE/Installer/trunk/source/subs.cpp (revision 293) +++ AE/Installer/trunk/source/subs.cpp (revision 294) @@ -6,4 +6,6 @@ #include +//#include +#include #include #include "methods.h" @@ -13,7 +15,7 @@ #include #ifdef WIN32 - #include "Include\dirent.h" +#include "Include\dirent.h" #else - #include //??? is this included for Macs? +#include //??? is this included for Macs? #endif #include @@ -31,28 +33,28 @@ // SetConsoleTitle("AE Installer"); windows junk, convert to SDL // system("color 0A"); - + cout << "\nWelcome to the AE installer!\n"; cout << "\nWhat would you like to do?\n"; - + return mainMenu(); } - + vector getPackages(void) { vector packages; packages.reserve(256); //thats 63 or 64 pointers to packages...i think. :P Reserving this improves performance when we add new pointers - + fstream file; - - #ifdef WIN32 - string path = "K:\\Oni\\edition\\install\\packages"; //only for my build. :P - #else - string path = "K:\\Oni\\edition\\install\\packages"; //change this, 'scen. - #endif + +#ifdef WIN32 + string path = "K:\\Oni\\edition\\install\\packages"; //only for my build. :P +#else + string path = "K:\\Oni\\edition\\install\\packages"; //change this, 'scen. +#endif string filename = "\0"; string MODINFO_CFG = "\\Mod_Info.cfg"; - + DIR *pdir; @@ -67,5 +69,5 @@ while (( pent = readdir(pdir) )){ - + filename = path + '\\' + pent->d_name + MODINFO_CFG; file.open(filename.c_str()); @@ -76,72 +78,134 @@ { //file.open(filename.c_str(), fstream::out); - + //do stuff like adding to vector :P //would prefer to push a pointer to a package, but this will do for now packages.push_back( fileToModPackage(file) ); - + } file.close(); file.clear(); - - } - - + + } + + if (errno){ printf ("readdir() failure; terminating"); - exit(1); + exit(1); } closedir(pdir); - - + + return packages; } ModPackage fileToModPackage(fstream &file) { - ModPackage package = {0, ""}; + /* + This converts a file to a ModPackage struct. + + A few notes... + "iter" is the current word we are on. I should have named it "token" or something, but I don't have multiple iterators, so its ok. + I refer to (*iter) at the beginning of each if statement block. I could probably store it as a variable, but I'm pretty sure that dereferencing a pointer\iterator isn't much slower than reading a variable. + */ + ModPackage package; string line; - static string NameOfMod = "NameOfMod"; //used for comparing to the current token - static string SLASHSLASH = "//"; - static string ARROW = "->"; - while (! file.eof() ) - { - getline (file,line); - vector tokens; - vector::iterator iter; - Tokenize(line, tokens); //string to vector of "words" - if (tokens.capacity() >= 2) { //make sure they are using enough stuff - iter = tokens.begin(); //what word we are on, starts at first word - /* - if (!AEInstallVersion.compare(*iter)) - If mod is too old, skip this mod. - */ - /*else*/if (!NameOfMod.compare(*iter)) { //if it contains the name - for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) { //interates through the words, ends if it reaches the end of the line or a "//" comment - if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) { //ignores "->" and "NameOfMod" - //cout << *iter; - //cout << " "; - package.name += *iter + " "; - } - } - cout << package.name; cout << "\n"; //remove this when done - /* - else if (!ModString.compare(*iter) - else if (!HasOnis.compare(*iter) - else if (!HasDeltas.compare(*iter) - else if (!HasBSL.compare(*iter) - else if (!HasDats.compare(*iter) - else if (!Category.compare(*iter) - else if (!Creator.compare(*iter) - else if (!IsEngine.compare(*iter) - else if (!Readme.compare(*iter) - else if (!GlobalNeeded.compare(*iter) - */ - } - //cout << *iter; - } - - } - + static string NameOfMod = "NameOfMod"; //used for comparing to the current token... + static string SLASHSLASH = "//"; //I could have done it in reverse (*iter).compare("ModString") or + static string ARROW = "->"; //did something like "ModString".compare(*iter), and it would have been + static string ModString = "ModString"; //functionably the same. + static string HasOnis = "HasOnis"; + static string HasDeltas = "HasDeltas"; + static string HasBSL = "HasBSL"; + static string HasDats = "HasDats"; + static string IsEngine = "IsEngine"; + static string Readme = "Readme"; + static string GlobalNeeded = "GlobalNeeded"; + static string Category = "Category"; + static string Creator = "Creator"; + while (! file.eof() ) + { + getline (file,line); + vector tokens; + vector::iterator iter; + Tokenize(line, tokens); //string to vector of "words" + if (tokens.capacity() >= 2) { //make sure they are using enough stuff + iter = tokens.begin(); //what word we are on, starts at first word + /* + if (!AEInstallVersion.compare(*iter)) + If mod is too old, skip this mod. + */ + /*else*/if (!NameOfMod.compare(*iter)) { //if it contains the name + for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) { //interates through the words, ends if it reaches the end of the line or a "//" comment + if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) { //ignores "->" and "NameOfMod" + //cout << *iter; + //cout << " "; + package.name += *iter + " "; + } + } + + } + else if (!ModString.compare(*iter)) { + iter++; iter++; + package.modStringName = *iter; + iter++; + package.modStringVersion = atoi((*iter).c_str()); + } + else if (!HasOnis.compare(*iter)) { + iter++; iter++; + if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasOnis = 1; //Gotta love c++'s lack of a standard case-insensitive string comparer...I know my implementation here sucks. I need to change it to check each character one by one. At the moment, using "YFR" would probably set it off. :< + } + else if (!HasBSL.compare(*iter)) { + iter++; iter++; + if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasBSL = 1; + } + else if (!HasDeltas.compare(*iter)) { + iter++; iter++; + if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDeltas = 1; + } + else if (!HasDats.compare(*iter)) { + iter++; iter++; + if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDats = 1; + } + else if (!IsEngine.compare(*iter)) { + iter++; iter++; + if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.isEngine = 1; + } + else if (!GlobalNeeded.compare(*iter)) { + iter++; iter++; + if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.globalNeeded = 1; + else if (toupper((*iter)[0]) + toupper((*iter)[1]) == 'N' + 'O') package.globalNeeded = 1; //Really the only place where checking for "No" is important atm. + } + else if (!Category.compare(*iter)) { + for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) { //interates through the words, ends if it reaches the end of the line or a "//" comment + if (ARROW.compare(*iter) && Category.compare(*iter)) { //ignores "->" and "Category" + //cout << *iter; + //cout << " "; + package.category += *iter + " "; + } + } + } + else if (!Creator.compare(*iter)) { //if it contains the name + for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) { //interates through the words, ends if it reaches the end of the line or a "//" comment + if (ARROW.compare(*iter) && Creator.compare(*iter)) { //ignores "->" and "Category" + //cout << *iter; + //cout << " "; + package.creator += *iter + " "; + } + } + } + else if (!Readme.compare(*iter)) { //if it contains the name + for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) { //interates through the words, ends if it reaches the end of the line or a "//" comment + if (ARROW.compare(*iter) && Readme.compare(*iter)) { //ignores "->" and "Category" + //cout << *iter; + //cout << " "; + package.readme += *iter + " "; + } + } + } + } + + } + package.doOutput(); return package; } @@ -155,5 +219,5 @@ cout << "4. About AE\n"; cout << "5. Quit\n\n"; - + do { ok = TRUE; @@ -186,5 +250,5 @@ vector::iterator iter; iter = packages.begin(); - + getPackages(); @@ -193,8 +257,8 @@ return; } - + cout << "Detecting installed packages...\n"; - - for(int i = 0; i < packages.size();) { + + for(int i = 0; i < packages.size();) { package = *iter; if(!package.isInstalled){ @@ -205,20 +269,20 @@ iter++; } - - } - + + } + if (packages.empty()) { cout << "Error: You have no installed packages!\n"; return; } - + //listInstalledPackages(packages); - + } void uninstallPackages() { -; + ; } void getInstalledPackages() { -; -} + ; +}