ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/main_window.cpp

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 436 by iritscen, Fri Jul 17 01:55:31 2009 UTC vs.
Revision 462 by gumby, Sat Oct 10 02:49:27 2009 UTC

#	Line 33 | Line 33 | ITaskbarList3 *pTaskbarList3;
33
34		#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
35		#include "boost/lexical_cast.hpp" //int -> string
36	+	#include "boost/algorithm/string.hpp"
37		#include "installer.h"
38
39		#ifdef WIN32
#	Line 64 | Line 65 | using namespace boost::filesystem;
65		using namespace std;
66
67
68	+	vector<string> globalInstalledMods;
69	+	vector<ModPackage> globalPackages;
70
71
72		#include "boost/date_time/gregorian/gregorian.hpp"
#	Line 74 | Line 77 | string escapePath(string input) {
77
78		string output;
79		string escape_me = "& ;()|<>\"'\\#*?$";
80	<	for(int i = 0; i < input.size(); i++)  {
81	<	for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
80	>	for(unsigned int i = 0; i < input.size(); i++)  {
81	>	for(unsigned int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
82		output += input[i];
83		}
84		return output;
#	Line 331 | Line 334 | int globalizeData(void)
334		create_directory( VanillaSounds.parent_path() );
335		create_directory( VanillaAnimations.remove_filename() );
336
337	<	for(int j = 0; j < GDFPaths.size(); j++) {
337	>	for(unsigned int j = 0; j < GDFPaths.size(); j++) {
338		logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
339		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
340		system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
#	Line 408 | Line 411 | vector<ModPackage> getPackages(void)
411
412		try
413		{
414	<	directory_iterator end_iter;
412	<	for (directory_iterator dir_itr("./packages"); dir_itr != end_iter; ++dir_itr)
414	>	for (directory_iterator dir_itr("./packages"), end_itr; dir_itr != end_itr; ++dir_itr)
415		{
416		file.open((dir_itr->path().string() + "/" + MODINFO_CFG).c_str());
417		//cout << filename << "\n";
#	Line 488 | Line 490 | ModPackage fileToModPackage(fstream &fil
490		}
491		else if (!HasOnis.compare(*iter)) {
492		iter++; iter++;
493	<	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
494	<	else if (!HasBSL.compare(*iter)) { // string comparer...I know my implementation here sucks. I need to change it to check each character one by one. At the moment,
495	<	iter++; iter++;}  // using "YFR" would probably set it off. :<
496	<
497	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasBSL = 1;
493	>	if ( boost::iequals(*iter, "Yes")) package.hasOnis = 1;
494	>	}
495	>	else if (!HasBSL.compare(*iter)) { // string comparer...I know my implementation here sucks. I need to change it to check each character one by one. At the moment,
496	>	iter++; iter++;  // using "YFR" would probably set it off. :<
497	>	if ( boost::iequals(*iter, "Yes")) package.hasBSL = 1;
498	>	else if ( boost::iequals(*iter, "Addon")) package.hasAddon = 1;
499		}
500		else if (!HasDeltas.compare(*iter)) {
501		iter++; iter++;
#	Line 518 | Line 521 | ModPackage fileToModPackage(fstream &fil
521		//cout << " ";
522		package.category += *iter + " ";
523		}
521	–	}
524		}
525	<	else if (!Creator.compare(*iter))  {    //if it contains the name
526	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
527	<	if (ARROW.compare(*iter) && Creator.compare(*iter)) {                   //ignores "->" and "Category"
528	<	//cout << *iter;
529	<	//cout << " ";
530	<	package.creator += *iter + " ";
531	<	}
525	>	}
526	>	else if (!Creator.compare(*iter))  {    //if it contains the name
527	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
528	>	if (ARROW.compare(*iter) && Creator.compare(*iter)) {                   //ignores "->" and "Category"
529	>	//cout << *iter;
530	>	//cout << " ";
531	>	package.creator += *iter + " ";
532		}
533		}
534	<	else if (!Readme.compare(*iter))  {     //if it contains the name
535	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
536	<	if (ARROW.compare(*iter) && Readme.compare(*iter)) {                    //ignores "->" and "Category"
537	<	if(!(*iter).compare("\\n")) package.readme += '\n';
538	<	else package.readme += *iter + " ";
539	<	}
534	>	}
535	>	else if (!Readme.compare(*iter))  {     //if it contains the name
536	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
537	>	if (ARROW.compare(*iter) && Readme.compare(*iter)) {                    //ignores "->" and "Category"
538	>	if(!(*iter).compare("\\n")) package.readme += '\n';
539	>	else package.readme += *iter + " ";
540		}
541		}
542		}
541	–
543		}
544	<	package.doOutput();
545	<	return package;
544	>
545	>	}
546	>	package.doOutput();
547	>	return package;
548		}
549
550		void recompileAll(vector<string> installedMods)
#	Line 611 | Line 614 | void recompileAll(vector<string> install
614		if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
615		{
616		importCommand = strOniSplit + " " + strImportOption + " " + dir_itr->path().parent_path().string() + '/' + dir_itr->path().filename();
617	<	for (int i = 0; i < installedMods.size(); ++i) {
617	>	for (unsigned int i = 0; i < installedMods.size(); ++i) {
618		if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename()  ))
619		importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename();
620
#	Line 684 | Line 687 | void recompileAll(vector<string> install
687		if ( is_directory( dir_itr->status() ) )
688		{
689		importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
690	<	for (int i = 0; i < installedMods.size(); ++i) {
690	>	for (unsigned int i = 0; i < installedMods.size(); ++i) {
691		if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
692		importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
693		}
#	Line 711 | Line 714 | void recompileAll(vector<string> install
714		logfile.close();
715		}}
716		}
717	+
718	+
719	+
720	+
721	+
722	+
723	+
724	+
725	+
726	+
727	+	vector<string> BSLfolders;
728	+	vector<string> skippedfolders;
729	+
730	+
731	+	ofstream BSLlog("BSL.log");
732	+	for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
733	+	dir_itr != end_itr;
734	+	++dir_itr ) {
735	+	if( exists(dir_itr->path().string() + "/ignore.txt") ){
736	+	BSLfolders.push_back(dir_itr->path().filename());
737	+	skippedfolders.push_back(dir_itr->path().filename());
738	+	}
739	+	}
740	+
741	+	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
742	+	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
743	+	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
744	+	/*BSLlog << "Testing " << globalPackages[j].modStringName << "\n"
745	+	<< "HasBSL: " << globalPackages[j].hasBSL << "\n"
746	+	<< "HasAddon: " << globalPackages[j].hasAddon << "\n";*/
747	+	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
748	+	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
749	+	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
750	+	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
751	+	}
752	+
753	+	}
754	+
755	+	}
756	+	}
757	+
758	+	ModPackage emptyPackage;
759	+	emptyPackage.modStringName = "VanillaBSL";
760	+	emptyPackage.hasBSL = 1;
761	+	copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
762	+	BSLlog.close();
763	+
764	+
765		logfile << "Writing config file";
766		writeInstalledMods(installedMods);
767		setProgressBar(1000);
768	<	setStatusArea("Done! You can now play Oni.");
768	>
769	>	string finallyDone = "Done! You can now play Oni.";
770	>
771	>
772	>
773	>	setStatusArea(finallyDone);
774
775		ptime end_time(second_clock::local_time());
776		time_period total_time (start_time, end_time);
#	Line 723 | Line 779 | void recompileAll(vector<string> install
779		ofstream logfile2("Install.log", ios::app | ios::ate);
780		string outstring = (string)"\n\nGlobalization ended " + to_simple_string(end_time) + "\nThe process took ";// + (string)total_time.length();
781
782	<	logfile2 << "\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
782	>	logfile2 << "\nInstallation ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
783
784		//logfile2.write(outstring.c_str(), outstring.length());
785		logfile2.close();
#	Line 732 | Line 788 | void recompileAll(vector<string> install
788
789		Sleep(1000);
790		setProgressBar(0);
791	<
791	>
792	>	}
793	>	catch(exception & ex) {
794	>	remove("Install.log"); //why did we do this? :|
795	>	ofstream logfile("Install.log");
796	>
797	>
798	>	logfile << "Warning, exception " << ex.what() << "!";
799	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
800	>	logfile.close();
801	>	}
802	>	busy = 0;
803		}
737	–	catch(exception & ex) {
738	–	remove("Install.log");
739	–	ofstream logfile("Install.log");
804
805	+	void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg) {
806
807	<	logfile << "Warning, exception " << ex.what() << "!";
808	<	setStatusArea("Warning, exception " + (string)ex.what() + "!");
809	<	logfile.close();
810	<	}
811	<	busy = 0;
807	>	ofstream BSLlog("BSL2.log", ios::app );
808	>
809	>	try {
810	>	for ( directory_iterator dir_itr( copypath ), end_itr;
811	>	dir_itr != end_itr;
812	>	++dir_itr ) {
813	>
814	>	if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
815	>	BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
816	>	int skip_folder = 0;
817	>
818	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
819	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
820	>	if(dir_itr->path().filename() == BSLfolders[k]) {
821	>	skip_folder = 1;
822	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
823	>	break;
824	>	}
825	>	}
826	>	if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
827	>	remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
828	>	Sleep(100);
829	>	create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
830	>	BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n";
831	>	for ( directory_iterator bsl_itr( dir_itr->path() );
832	>	bsl_itr != end_itr;
833	>	bsl_itr++ ) {
834	>	if ( bsl_itr->path().extension() == ".bsl" ) {
835	>	copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
836	>	}
837	>	}
838	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
839	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
840	>	}
841	>	}
842	>	}
843	>	}
844	>	catch ( const std::exception & ex )
845	>	{
846	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
847	>	while(1) Sleep(1000);
848	>	}
849	>	BSLlog.close();
850	>
851		}
852
853
#	Line 828 | Line 932 | void clearOldDats(void) {
932
933		}
934
831	–	vector<string> globalInstalledMods;
832	–	vector<ModPackage> globalPackages;
935		#include "boost/thread.hpp"
936		#include <boost/thread/mutex.hpp>
937
#	Line 1203 | Line 1305 | void MainWindow::CreateControls()
1305
1306		globalPackages = getPackages();
1307		globalInstalledMods = getInstallString();
1308	<	for (int i = 0; i < globalPackages.size(); i++) {
1308	>	for (unsigned int i = 0; i < globalPackages.size(); i++) {
1309		Mods_CheckboxList->Append(globalPackages[i].name.c_str());
1310		if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
1311		}
#	Line 1242 | Line 1344 | void MainWindow::OnSelectAllCheckboxClic
1344		{
1345		switch(SelectAll->Get3StateValue()) {
1346		case wxCHK_UNCHECKED:
1347	<	for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1347	>	for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1348		//SelectAll->Set3StateValue(wxCHK_CHECKED);
1349		break;
1350		case wxCHK_CHECKED:
1351	<	for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, true);
1351	>	for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, true);
1352		//SelectAll->Set3StateValue(wxCHK_UNCHECKED);
1353		break;
1354		case wxCHK_UNDETERMINED:
1355	<	for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1355	>	for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1356		//SelectAll->Set3StateValue(wxCHK_CHECKED);
1357		break;
1358
#	Line 1433 | Line 1535 | void MainWindow::OnInstallButtonClick( w
1535
1536		vector<string> localPackages;
1537		localPackages.push_back("00000Globalize");
1538	<	for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) localPackages.push_back( globalPackages[i].modStringName );
1538	>	for(unsigned int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) localPackages.push_back( globalPackages[i].modStringName );
1539		if ( !localPackages.empty() )   {
1540		sort(localPackages.begin(), localPackages.end());
1541		localPackages[0] = "Globalize";
#	Line 1575 | Line 1677 | void MainWindow::refreshMods (vector<str
1677
1678		Mods_CheckboxList->Clear();
1679		//globalInstalledMods = getPackages();
1680	<	for (int i = 0; i < globalPackages.size(); i++) {
1680	>	for (unsigned int i = 0; i < globalPackages.size(); i++) {
1681		Mods_CheckboxList->Append(globalPackages[i].name.c_str());
1682		if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
1683		//else Mods_CheckboxList->Check(i,0);
#	Line 1638 | Line 1740 | void MainWindow::OnSaveClick( wxCommandE
1740		ofstream file(openFileDialog->GetPath().c_str());
1741
1742		vector<string>list;
1743	<	for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) list.push_back( globalPackages[i].modStringName );
1743	>	for(unsigned int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) list.push_back( globalPackages[i].modStringName );
1744		vector<string>::iterator begin_iter = list.begin();
1745		vector<string>::iterator end_iter = list.end();
1746

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)