ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 504 by gumby, Sat Mar 27 03:48:25 2010 UTC vs.
Revision 558 by gumby, Sat May 29 19:21:27 2010 UTC

#	Line 27 | Line 27 | using namespace boost::posix_time;
27		// externs declared in installer.h
28		string strInstallCfg = "../GameDataFolder/Add.cfg";
29		string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/
30	+	extern MainWindow* TheWindow;
31
32		int globalizeData(void)
33		{
#	Line 231 | Line 232 | int globalizeData(void)
232
233
234		if ( strcmp(levels[i].c_str(), "0") ){
235	<	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] + "_Final/AKEV/AKEV*.oni").c_str());
235	>	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] +
236	>	"_Final/AKEV/AKEV*.oni").c_str());
237		remove(  "../GameDataFolder/level" + levels[i] + "_Final/AKEV" );
238		}
239
#	Line 245 | Line 247 | int globalizeData(void)
247		for (int i = 0; i < 15; i++)
248		{
249		logfile << "\tReimporting level" << levels[i] << "_Final.oni\n";
250	<	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
250	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" +
251	>	levels[i] + "_Final.oni");
252		logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
253		+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
254		string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
#	Line 306 | Line 309 | int globalizeData(void)
309		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
310		Tests for presence of prefs with [ -f ] before doing anything so it doesn't create a partial prefs file -- just in case user has never
311		run Oni before :-p */
312	<	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants the folder that *contains* the GDF)
310	<	//bad Iritscen, bad! fixed buffers can cause crashes.
311	<	/*char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
312	<	strcat(prefsCommand, fullAEpath.c_str());
313	<	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
314	<	*/
312	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants folder that *contains* the GDF)
313		string prefsCommand = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '"
314		+ fullAEpath + "'";
315		system(prefsCommand.c_str());
#	Line 349 | Line 347 | vector<ModPackage> getPackages(string pa
347
348		if (!file.fail())
349		{
350	<	package = fileToModPackage(file);
350	>	package = fileToModPackage(file, dir_itr->path().filename());
351		if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
352		{
353		#ifdef WIN32
#	Line 373 | Line 371 | vector<ModPackage> getPackages(string pa
371		return packages;
372		}
373
374	<	ModPackage fileToModPackage(fstream &file)
375	<	{
378	<	/*
379	<	This converts a file to a ModPackage struct.
380	<
381	<	A few notes...
382	<	"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.
383	<	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
384	<	slower than reading a variable.
385	<	*/
374	>	ModPackage fileToModPackage(fstream &file, string modName)
375	>	{
376		ModPackage package;
377		string line;
378	<	static string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
379	<	static string NameOfMod = "NameOfMod";
380	<	static string ARROW = "->";
381	<	static string ModString = "ModString";
382	<	static string Platform = "Platform";
383	<	static string HasOnis = "HasOnis";
384	<	static string HasDeltas = "HasDeltas";
385	<	static string HasBSL = "HasBSL";
386	<	static string HasDats = "HasDats";
387	<	static string IsEngine = "IsEngine";
388	<	static string Readme = "Readme";
389	<	static string GlobalNeeded = "GlobalNeeded";
390	<	static string Category = "Category";
391	<	static string Creator = "Creator";
378	>	const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
379	>	const string NameOfMod = "NameOfMod";
380	>	const string ARROW = "->";
381	>	const string ModString = "ModString";
382	>	const string ModVersion = "ModVersion";
383	>	const string Platform = "Platform";
384	>	const string HasOnis = "HasOnis";
385	>	const string HasDeltas = "HasDeltas";
386	>	const string HasBSL = "HasBSL";
387	>	const string HasDats = "HasDats";
388	>	const string IsEngine = "IsEngine";
389	>	const string Readme = "Readme";
390	>	const string GlobalNeeded = "GlobalNeeded";
391	>	const string Category = "Category";
392	>	const string Creator = "Creator";
393	>	package.modStringName = modName;
394		while (!file.eof())
395		{
396		getline(file,line);
#	Line 425 | Line 417 | ModPackage fileToModPackage(fstream &fil
417		else if (!ModString.compare(*iter))
418		{
419		iter++; iter++;
420	<	package.modStringName = *iter;
420	>	//package.modStringName = *iter;
421		iter++;
422		package.modStringVersion = atof((*iter).c_str());
423		}
424	+	else if (!ModVersion.compare(*iter))
425	+	{
426	+	iter++; iter++;
427	+	package.modStringVersion = atof((*iter).c_str());
428	+	}
429		else if (!Platform.compare(*iter))
430		{
431		iter++; iter++;
#	Line 442 | Line 439 | ModPackage fileToModPackage(fstream &fil
439		else if (!HasBSL.compare(*iter))
440		{
441		iter++; iter++;
442	<	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasBSL = true;
442	>	if (boost::iequals(*iter, "Yes")) package.hasBSL = true;
443		else if (boost::iequals(*iter, "Addon")) package.hasAddon = true;
444		}
445		else if (!HasDeltas.compare(*iter))
#	Line 567 | Line 564 | void recompileAll(vector<string> install
564
565
566		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
567	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
567	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
568	>	dir_itr->path().filename() + " ");
569
570		system(importCommand.c_str());
571		j++;
#	Line 594 | Line 592 | void recompileAll(vector<string> install
592		else if(splitInstances == false){
593		directory_iterator end_iter;
594
595	<	for ( directory_iterator dir_itr( vanilla_dir );
596	<	dir_itr != end_iter;
597	<	++dir_itr )
598	<	{
599	<	if ( is_directory( dir_itr->status() ) )
600	<	{
601	<	numberOfDats++;
595	>
596	>	char levelnums[256] = {0};
597	>
598	>
599	>
600	>	for(int k = 0; k < 256; k++) {
601	>	if( exists( (path)("./VanillaDats/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
602	>	levelnums[k] = 1;
603	>
604		}
605		}
606	<
606	>
607	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
608	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
609	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
610	>	for(int k = 0; k < 256; k++) {
611	>	if( globalPackages[j].hasOnis &&
612	>	exists( (path)("packages/" + globalPackages[j].modStringName + "/oni/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
613	>	levelnums[k] = 1;
614	>
615	>	}
616	>	}
617	>	}
618	>	}
619	>	}
620	>	for (int levelnum = 0; levelnum < 256; levelnum++)
621	>	if (levelnums[levelnum])
622	>	numberOfDats++;
623	>
624		out << numberOfDats;
625		datString = out.str();
626	<
627	<	for ( directory_iterator dir_itr( vanilla_dir );
611	<	dir_itr != end_iter;
612	<	++dir_itr )
613	<	{
626	>
627	>	for(int levelnum = 0; levelnum < 256; levelnum++) {
628		try
629		{
630	<	if ( is_directory( dir_itr->status() ) )
630	>	if ( levelnums[levelnum] )
631		{
632	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
632	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + "level" + lexical_cast<std::string>(levelnum) + "_Final ";
633		for (unsigned int i = 0; i < installedMods.size(); ++i) {
634	<	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
635	<	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
634	>	if (exists((path)("packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_final") ))
635	>	importCommand += " packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_Final";
636		}
637	<	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
637	>	importCommand += " ../GameDataFolder/level" + lexical_cast<std::string>(levelnum) + "_Final.dat >> Install.log";
638
639		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
640	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
640	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
641	>	"level" + lexical_cast<std::string>(levelnum) + "_Final"+ " ");
642		system(importCommand.c_str());
643		j++;
644		}
#	Line 643 | Line 658 | void recompileAll(vector<string> install
658		vector<string> skippedfolders;
659
660		ofstream BSLlog("BSL.log");
661	+	if(exists("../GameDataFolder/BSLBackup/")) {
662	+	remove_all("../GameDataFolder/BSLBackup/");
663	+	}
664	+	else {
665	+	create_directory("../GameDataFolder/BSLBackup/");
666	+	}
667	+	copy("../GameDataFolder/IGMD/", "../GameDataFolder/BSLBackup/");
668		for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
669		dir_itr != end_itr;
670		++dir_itr ) {
#	Line 655 | Line 677 | void recompileAll(vector<string> install
677		for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
678		for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
679		if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
680	<	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
680	>	if(globalPackages[j].hasBSL) break; //skip non-BSL
681		if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
682		copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
683		BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
#	Line 664 | Line 686 | void recompileAll(vector<string> install
686		}
687		}
688
689	+
690	+
691		ModPackage emptyPackage;
692		emptyPackage.modStringName = "VanillaBSL";
693		emptyPackage.hasBSL = 1;
694		copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
695		BSLlog.close();
696	<
696	>
697	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
698	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
699	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
700	>	if(!globalPackages[j].hasAddon) break; //skip non-BSL
701	>	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
702	>	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
703	>	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
704	>	}
705	>	}
706	>	}
707	>	}
708	>
709		logfile << "Writing config file";
710		writeInstalledMods(installedMods);
711		setProgressBar(1000);
#	Line 700 | Line 736 | void recompileAll(vector<string> install
736
737		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
738		{
739	<	ofstream BSLlog("BSL2.log", ios::app );
739	>	ofstream BSLlog("BSL.log", ios::app );
740
741		try {
742		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 710 | Line 746 | void copyBSL(string copypath, vector<str
746		if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
747		BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
748		int skip_folder = 0;
749	<
750	<	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
751	<	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
752	<	if(dir_itr->path().filename() == BSLfolders[k]) {
753	<	skip_folder = 1;
754	<	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
755	<	break;
749	>	if(!pkg.hasAddon) {
750	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
751	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
752	>	if(dir_itr->path().filename() == BSLfolders[k]) {
753	>	skip_folder = 1;
754	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
755	>	break;
756	>	}
757		}
758		}
759		if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
760	<	remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
760	>	if(!pkg.hasAddon) remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
761		Sleep(100);
762		create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
763		BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n";
#	Line 728 | Line 765 | void copyBSL(string copypath, vector<str
765		bsl_itr != end_itr;
766		bsl_itr++ ) {
767		if ( bsl_itr->path().extension() == ".bsl" ) {
768	+	if(exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()))
769	+	remove("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
770		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
771		}
772		}
773	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
774	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
773	>	if( !pkg.hasAddon ) {
774	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
775	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
776	>	}
777		}
778		}
779		}
#	Line 808 | Line 849 | vector<string> getInstallString(string C
849		|                                                          Installer to be replaced (when the new Installer                     |
850		|                                                          launches, this function will be called again but will        |
851		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
852	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
853		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
854		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
855		{
#	Line 837 | Line 879 | int GetUpdateStatus(Install_info_cfg *cu
879		return UPDATE_LOG_READ_ERR;
880		}
881
882	<	// Is there an update folder, and is it a monthly release or a patch?
882	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
883		bool firstParty = 0;
884	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
885	+	if (!exists("../updates"))
886	+	create_directory("../updates");
887		if (exists("../updates/Edition"))
888		{
889		firstParty = 1;
#	Line 922 | Line 967 | int GetUpdateStatus(Install_info_cfg *cu
967		}
968		newUpdateLog << "Installer was updated to:\n";
969		newUpdateLog << newUpdateLine.c_str();
970	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
970	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
971		doneReadingFile = true;
972		newUpdateLog.close();
973		newUpdateLog.clear();
#	Line 941 | Line 986 | int GetUpdateStatus(Install_info_cfg *cu
986		return UPDATE_LOG_READ_ERR;
987		}
988
989	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
989	>	if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed?
990		{
946	–	if (!strEUFN.compare("Edition-patch")) // if update is a patch...
947	–	{
948	–	if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month?
949	–	return UPDATE_MNTH_REQD_ERR;
950	–	}
991		string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
992		string installerVersion = INSTALLER_VERSION;
993		if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
#	Line 960 | Line 1000 | int GetUpdateStatus(Install_info_cfg *cu
1000		else
1001		return UPDATE_SIMP_AVAIL;
1002		}
1003	+	else
1004	+	return UPDATE_MNTH_REQD_ERR;
1005		}
1006	<	try {
965	<	directory_iterator end;
966	<	if(exists("../updates")){
967	<	for ( directory_iterator install_iter( "../updates" );
968	<	install_iter != end;
969	<	++install_iter )
1006	>	try
1007		{
1008	<
1009	<	ModPackage installedPackage, updatePackage;
1010	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
1011	<	fstream file;
975	<	file.open( (install_iter->path().string() + "/Mod_Info.cfg").c_str());
976	<	if (!file.fail())
977	<	{
978	<	ModPackage updatePackage = fileToModPackage(file);
979	<	}
980	<	else
981	<	{
982	<	file.close();
983	<	continue;
984	<	}
985	<	if(!exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"));
986	<	file.close();
987	<	file.open( ("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
988	<	if (!file.fail())
989	<	{
990	<	ModPackage installedPackage = fileToModPackage(file);
991	<	}
992	<	else
1008	>	directory_iterator end;
1009	>	if (exists("../updates"))
1010	>	{
1011	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
1012		{
1013	<	file.close();
1014	<	return UPDATE_THIRD_PARTY;
1015	<	}
1016	<	file.close();
1017	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1018	<	return UPDATE_THIRD_PARTY;
1013	>	ModPackage installedPackage, updatePackage;
1014	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
1015	>	{
1016	>	fstream file;
1017	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1018	>	if (!file.fail())
1019	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
1020	>	else
1021	>	{
1022	>	file.close();
1023	>	continue;
1024	>	}
1025	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
1026	>	{
1027	>	file.close();
1028	>	file.clear();
1029	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1030	>	if (!file.fail())
1031	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1032	>	file.close();
1033	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1034	>	{
1035	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1036	>	return UPDATE_PKG_AVAIL;
1037	>	}
1038	>	}
1039	>	else
1040	>	{
1041	>	file.close();
1042	>	return UPDATE_PKG_AVAIL;
1043	>	}
1044	>	}
1045		}
1001	–
1046		}
1003	–	}
1004	–
1005	–	}
1047		}
1048		catch (exception & ex) {
1049		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1050		}
1010	–
1051
1052		return UPDATE_NO_UPD_AVAIL;
1053		}
#	Line 1022 | Line 1062 | bool ReadInstallInfoCfg(fstream *fileHan
1062		string strDaodanVersion = "Daodan_Version";
1063		string strOniSplitVersion = "OniSplit_Version";
1064		string strGUIWinVersion = "GUI_Win_Version";
1065	<	string strGUIMacVersion = "GUI_Mac_Version";
1065	>	string strGUIMacVersion = "GUI_Mac_Version";
1066		string strReglobalize = "Reglobalize";
1067		string strDeleteList = "Delete_List";
1068		string strArrow = "->";
#	Line 1234 | Line 1274 | bool ProcessInstallerUpdate(Install_info
1274
1275		string popenCommand = "../updates/" + strEUFN + "/install/";
1276		#ifdef WIN32
1237	–	// TODO: Fill in Windows equivalent of code below :-3
1277		popenCommand = "replace_installer.bat";
1278		#else
1279		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1264 | Line 1303 | bool ProcessInstallerUpdate(Install_info
1303		#endif
1304		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1305		}
1267	–	//strPathToEUFNPackages
1268	–
1269	–	void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1270	–	try{
1271	–	directory_iterator end;
1272	–	for ( directory_iterator install_iter( pathToUpdate );
1273	–	install_iter != end;
1274	–	++install_iter )
1275	–	{
1276	–
1277	–	ModPackage installedPackage, updatePackage;
1278	–	string updateStr = install_iter->path().string() + "/Mod_Info.cfg";
1279	–	if ( !boost::iequals(install_iter->path().filename(),"Edition")
1280	–	&& !boost::iequals(install_iter->path().filename(),"Edition-patch")
1281	–	&& is_directory( install_iter->path() )
1282	–	&& exists( install_iter->path().string() + "/Mod_Info.cfg" ) )
1283	–	{
1284	–	bool update = 0;
1285	–	fstream file;
1286	–	file.open( (install_iter->path().string() + "/Mod_Info.cfg").c_str());
1287	–	if (!file.fail())
1288	–	{
1289	–	updatePackage = fileToModPackage(file);
1290	–	}
1291	–	else
1292	–	{
1293	–	file.close();
1294	–	continue;
1295	–	}
1296	–	if(!exists(strPathToPackages + "/" + install_iter->path().filename() + "/Mod_Info.cfg"));
1297	–	file.close();
1298	–	file.clear();
1299	–	file.open((strPathToPackages + "/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1300	–	if (!file.fail())
1301	–	{
1302	–	installedPackage = fileToModPackage(file);
1303	–	file.close();
1304	–	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1305	–	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1306	–	update = 1;
1307	–	}
1308	–	}
1309	–	else
1310	–	{
1311	–	file.close();
1312	–	update = 1;
1313	–	}
1314	–	file.close();
1315	–
1316	–	if(update) {
1317	–	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1318	–
1319	–	}
1320	–	}
1321	–	}
1322	–	}
1323	–	catch (exception & ex) {
1324	–	//      ex.what();
1325	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
1326	–	}
1327	–	}
1328	–
1329	–
1330	–	bool ProcessThirdPartyUpdates() {
1331	–	CrawlPackages( "../updates",  "./packages");
1332	–	return true;
1333	–	//      globalPackages = getPackages();
1334	–	//      refreshMods(globalInstalledMods);
1335	–	}
1336	–
1306
1307		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1308		{
1309	+	try {
1310		fstream file;
1311		string line;
1312		vector<string> tokens, updateStarted;
#	Line 1356 | Line 1326 | bool ProcessAEUpdate(Install_info_cfg *c
1326		string strOniApp = "Oni.exe";
1327		#else
1328		string strOniApp = "Oni.app";
1359	–	#endif
1329		bool needNewTrashDir = false;
1330	+	#endif
1331	+
1332		bool readingVerAndDate = false;
1333
1363	–	// TODO: Fill in Windows equivalent of code below
1334		#ifdef WIN32
1335	<	string strTrashDir = "Trash\\";
1335	>	//remove readonly attrib from files.
1336	>	setStatusArea("Removing readonly attribute...");
1337	>	system("attrib -r ./* /s");
1338	>	system("attrib -r ../Oni.exe /s");
1339	>	system("attrib -r ../binkw32.dll /s");
1340	>
1341		#else
1342		FILE *fUserName = NULL;
1343		char chrUserName[32];
#	Line 1397 | Line 1372 | bool ProcessAEUpdate(Install_info_cfg *c
1372		if (readingVerAndDate && tokens.capacity() >= 3)
1373		tokenize(tokens[2], updateStarted, "-");
1374		}
1375	+	#ifndef WIN32
1376		if (updateStarted.capacity() < 3)
1377		needNewTrashDir = true;
1378		else
#	Line 1406 | Line 1382 | bool ProcessAEUpdate(Install_info_cfg *c
1382		if (!exists(strTrashDir))
1383		needNewTrashDir = true;
1384		}
1385	+	#endif
1386		}
1387		#ifndef WIN32
1388		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1422 | Line 1399 | bool ProcessAEUpdate(Install_info_cfg *c
1399		// Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit
1400		if (exists(strPathToEUFN + strOniApp))
1401		{
1402	<	if (exists(strOniApp))
1403	<	rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1404	<	rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1402	>	if (exists("../" + strOniApp))
1403	>	#ifdef WIN32
1404	>	remove((path)("../" + strOniApp));
1405	>	#else
1406	>	rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp));
1407	>	#endif
1408	>	rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp));
1409		}
1410		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
1411		{
1412		if (exists(strPathToEUFNInstall + strOniSplit))
1413		{
1414		if (exists(strOniSplit))
1415	+	#ifdef WIN32
1416	+	remove((path)strOniSplit);
1417	+	#else
1418		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1419	+	#endif
1420		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1421		}
1422		}
#	Line 1441 | Line 1426 | bool ProcessAEUpdate(Install_info_cfg *c
1426		if (exists(strPathToEUFN + strDaodan))
1427		{
1428		if (exists(("../" + strDaodan)))
1429	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1429	>	remove((path)("../" + strDaodan));
1430		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1431		}
1432		}
#	Line 1450 | Line 1435 | bool ProcessAEUpdate(Install_info_cfg *c
1435		if (exists(strPathToEUFNInstall + strWinGUI))
1436		{
1437		if (exists((path)strWinGUI))
1438	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1438	>	remove((path)strWinGUI);
1439		if (exists(strWinGUILang))
1440	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1440	>	remove((path)strWinGUILang);
1441		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1442		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1443		}
#	Line 1485 | Line 1470 | bool ProcessAEUpdate(Install_info_cfg *c
1470		while (curPos != string::npos && curPos < thePath.size())
1471		{
1472		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1473	+	#ifndef WIN32
1474		if (!exists(strTrashDir + aParentPath))
1475		create_directory(strTrashDir + aParentPath);
1476	+	#endif
1477		lastPos = curPos + 1;
1478		curPos = thePath.find("/", lastPos);
1479		aParentPath = aParentPath + "/";
#	Line 1499 | Line 1486 | bool ProcessAEUpdate(Install_info_cfg *c
1486		}
1487		}
1488
1489	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1489	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1490
1491	<	// Next, we get a list of which files and folders in the update's Globalize folder to move over; all files not starting with '.' will be moved...
1492	<	// ...and folders which do not exist in the current AE will be created there
1493	<	vector<string> foldersToMake, filesToMove;
1494	<	string thePath;
1491	>	// Next, move over files in the update's Globalize folder; subfolders which do not exist in the current AE will be created by Boost's...
1492	>	// ...create_directories() function
1493	>	string strPath;
1494	>	path thePath;
1495		for (recursive_directory_iterator dir_itr(strPathToEUFNPackages + strGlobalize), end_itr; dir_itr != end_itr; ++dir_itr)
1496		{
1497	<	thePath = dir_itr->path().string();
1498	<	MakePathLocalToGlobalize(&thePath);
1497	>	strPath = dir_itr->path().string();
1498	>	MakePathLocalToGlobalize(&strPath);
1499	>	thePath = (path)strPath;
1500		if (is_regular_file(dir_itr->status()))
1501		{
1502	<	if (dir_itr->filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1503	<	filesToMove.push_back(thePath);
1504	<	}
1505	<	else if (is_directory(dir_itr->status()))
1506	<	{
1507	<	if (!exists(strPathToPackages + strGlobalize + thePath))
1508	<	foldersToMake.push_back(thePath);
1502	>	if (thePath.filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1503	>	{
1504	>	if (exists(strPathToPackages + strGlobalize + strPath))
1505	>	{
1506	>	#ifdef WIN32
1507	>	remove((path)(strPathToPackages + strGlobalize + strPath));
1508	>	#else
1509	>	create_directories((path)(strTrashDir + thePath.parent_path().string()));
1510	>	rename((path)(strPathToPackages + strGlobalize + strPath), (path)(strTrashDir + strPath));
1511	>	#endif
1512	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1513	>	}
1514	>	else
1515	>	{
1516	>	int slashLoc = 0;
1517	>	slashLoc = strPath.find("/", 0);
1518	>	if (slashLoc != string::npos) // then path contains slashes, so we need to make sure its parents' paths exist before moving it
1519	>	create_directories((path)(strPathToPackages + strGlobalize + thePath.parent_path().string()));
1520	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1521	>	}
1522	>	}
1523		}
1524		}
1523	–	// Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'...
1524	–	// ...before folder 'parent/child/'"?
1525	–	sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file
1526	–	// First make the folders that don't exist in the current AE, so all the files have a place to go
1527	–	for (vector<string>::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++)
1528	–	{
1529	–	create_directory(strPathToPackages + strGlobalize + *iter);
1530	–	}
1531	–	for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1532	–	{
1533	–	if (exists(strPathToPackages + strGlobalize + *iter))
1534	–	rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1535	–	rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1536	–	}
1525
1526		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1527	+	#ifdef WIN32
1528	+	remove_all((path)strPathToEUFN);
1529	+	#else
1530		create_directory(strTrashDir + "Unneeded update files");
1531		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1532	<
1532	>	#endif
1533		// Write to log that we are finished with update
1534		ptime end_time(second_clock::local_time());
1535		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1556 | Line 1547 | bool ProcessAEUpdate(Install_info_cfg *c
1547		CheckForGlobalization(true); // the 'true' value forces re-globalization
1548
1549		globalPackages = getPackages(); // refresh the list in memory
1550	<	// TODO: Refresh the packages list in the window
1551	<
1550	>	wxCommandEvent e;
1551	>	TheWindow->OnRefreshButtonClick( e );
1552		return true;
1553	+	}
1554	+	catch (exception & ex)
1555	+	{
1556	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1557	+	return false;
1558	+	}
1559	+	}
1560	+
1561	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1562	+	{
1563	+	ptime startTime(second_clock::local_time());
1564	+	#ifdef WIN32
1565	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1566	+	#else
1567	+	FILE *fUserName = NULL;
1568	+	char chrUserName[32];
1569	+	fUserName = popen("whoami", "r");
1570	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1571	+	pclose(fUserName);
1572	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1573	+	int endOfName = strUserName.find("\n", 0);
1574	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1575	+	bool needNewTrashDir = true;
1576	+	tm tmStartTime = to_tm(startTime);
1577	+	#endif
1578	+
1579	+	try
1580	+	{
1581	+	directory_iterator end;
1582	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1583	+	{
1584	+	ModPackage installedPackage, updatePackage;
1585	+	string updtPath = update_iter->path().string();
1586	+	string updtFolder = update_iter->path().filename();
1587	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1588	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1589	+	if (!boost::iequals(updtFolder, "Edition")
1590	+	&& !boost::iequals(updtFolder, "Edition-patch")
1591	+	&& is_directory(update_iter->path())
1592	+	&& exists(updtModInfo))
1593	+	{
1594	+	fstream file;
1595	+	file.open((updtModInfo).c_str());
1596	+	if (!file.fail())
1597	+	updatePackage = fileToModPackage(file, updtFolder);
1598	+	else
1599	+	{
1600	+	file.close();
1601	+	continue;
1602	+	}
1603	+	if (exists(instModInfo))
1604	+	{
1605	+	file.close();
1606	+	file.clear();
1607	+	file.open(instModInfo.c_str());
1608	+	if (!file.fail())
1609	+	{
1610	+	installedPackage = fileToModPackage(file, updtFolder);
1611	+	}
1612	+	file.close();
1613	+	}
1614	+	file.close();
1615	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1616	+	{
1617	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1618	+	{
1619	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1620	+	#ifdef WIN32
1621	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1622	+	#else
1623	+	if (needNewTrashDir)
1624	+	{
1625	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1626	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1627	+	create_directory(strTrashDir);
1628	+	needNewTrashDir = false;
1629	+	}
1630	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1631	+	#endif
1632	+	}
1633	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1634	+	}
1635	+	}
1636	+	}
1637	+	}
1638	+	}
1639	+	catch (exception & ex)
1640	+	{
1641	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1642	+	}
1643	+	wxCommandEvent e;
1644	+	TheWindow->OnRefreshButtonClick( e );
1645		}
1646
1647		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
#	Line 1657 | Line 1740 | void copy( const path & from_ph,
1740
1741		}
1742		else if(from_ph.filename() != ".svn")
1743	<	{
1744	<	path destination;
1745	<	if(!exists(to_ph))
1746	<	{
1747	<	destination=to_ph;
1748	<	}
1749	<	else
1750	<	{
1751	<	destination=to_ph/from_ph.filename();
1752	<	}
1743	>	{
1744	>	path destination;
1745	>	if(!exists(to_ph))
1746	>	{
1747	>	destination=to_ph;
1748	>	}
1749	>	else
1750	>	{
1751	>	destination=to_ph/from_ph.filename();
1752	>	}
1753
1754	<	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1754	>	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1755		{
1756		//the idiot who coded this in the first place (not me)
1757		//forgot to make a new directory. Exception city. x_x
1758	<	create_directory(destination);
1759	<	copy(*i,destination/i->filename());
1758	>	create_directory(destination);
1759	>	copy(*i, destination/i->filename());
1760		}
1761		}
1762		}

Diff Legend

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