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 489 by gumby, Sun Jan 24 23:58:16 2010 UTC vs.
Revision 504 by gumby, Sat Mar 27 03:48:25 2010 UTC

#	Line 17 | Line 17
17		#include "boost/date_time/gregorian/gregorian.hpp"
18		#include "boost/date_time/date_parsing.hpp"
19		#include "boost/date_time/posix_time/posix_time.hpp"
20	+	#include <boost/algorithm/string.hpp>
21		#include "installer.h"
22		#include "aeinstallerapp.h"
23
#	Line 269 | Line 270 | int globalizeData(void)
270		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": moving level0_Characters" );
271		copy((path)"../GameDataFolder/level0_Characters", (path)("VanillaDats/level0_Final"));
272		GDFPaths.push_back( Characters );
273	+	//concactates level0....
274		for(int i = 0; i < GDFPaths.size(); i++)
275		{
276		directory_iterator end_iter;
#	Line 283 | Line 285 | int globalizeData(void)
285		}
286		}
287		}
288	+	//?: syntax is fun.
289	+	//condition ? value_if_true : value_if_false
290	+	(is_empty(Characters)   ? remove( Characters )  : 1);
291	+	(is_empty(Particles)    ? remove( Particles )   : 1);
292	+	(is_empty(Textures)             ? remove( Textures )    : 1);
293	+	(is_empty(Sounds)               ? remove( Sounds )              : 1);
294	+	(is_empty(TRAC)                 ? remove( TRAC )                : 1);
295	+	(is_empty(TRAM)                 ? remove( TRAM )                : 1);
296	+	(is_empty(Animations)   ? remove( Animations )  : 1);
297
298		create_directory((path)"../GameDataFolder/IGMD");
299		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
300		setProgressBar( 1000 );
301	<
302	<	if(exists("../../persist.dat"))
303	<	if(!exists("../persist.dat"))
304	<
294	<	//TODO: Concatenate level0 Dirs.
295	<
296	<	copy("../../persist.dat","..");
297	<	if(exists("../../key_config.txt"))
298	<	if(!exists("../key_config.txt"))
299	<	copy("../../key_config.txt","..");
300	<
301	>
302	>	if(exists("../../persist.dat") && !exists("../persist.dat")) copy("../../persist.dat","..");
303	>	if(exists("../../key_config.txt")&& !exists("../key_config.txt")) copy("../../key_config.txt","..");
304	>
305		#ifndef WIN32
306		/* 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).
307		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
308		run Oni before :-p */
309	<	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for edition/
310	<	char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
311	<	strcat(prefsCommand, fullAEpath.c_str()); // get path of Edition/ folder (Oni wants the folder that *contains* the GDF)
309	>	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	<	system(prefsCommand);
314	>	*/
315	>	string prefsCommand = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '"
316	>	+ fullAEpath + "'";
317	>	system(prefsCommand.c_str());
318	>
319		#endif
320
321		setStatusArea((string)"Done! Now select your mod packages and click install.");
#	Line 326 | Line 335 | int globalizeData(void)
335		vector<ModPackage> getPackages(string packageDir)
336		{
337		vector<ModPackage> packages;
338	+	ModPackage package;
339		packages.reserve(256);
340		fstream file;
341		string filename = "\0";
#	Line 337 | Line 347 | vector<ModPackage> getPackages(string pa
347		{
348		file.open((dir_itr->path().string() + "/" + MODINFO_CFG).c_str());
349
350	<	if(!file.fail())
350	>	if (!file.fail())
351		{
352	<	//would prefer to push a pointer to a package, but this will do for now
353	<	packages.push_back(fileToModPackage(file));
352	>	package = fileToModPackage(file);
353	>	if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
354	>	{
355	>	#ifdef WIN32
356	>	if (!package.platform.compare("Windows") || !package.platform.compare("Both")) // don't show package if it's not for the right OS
357	>	#else
358	>	if (!package.platform.compare("Macintosh") || !package.platform.compare("Both"))
359	>	#endif
360	>	packages.push_back(package);
361	>	}
362		}
363		file.close();
364		file.clear();
#	Line 367 | Line 385 | ModPackage fileToModPackage(fstream &fil
385		*/
386		ModPackage package;
387		string line;
388	<	static string NameOfMod = "NameOfMod";  //used for comparing to the current token...
389	<	//I could have done it in reverse (*iter).compare("ModString") or
390	<	static string ARROW = "->";                             //did something like "ModString".compare(*iter), and it would have been
391	<	static string ModString = "ModString";  //functionably the same.
388	>	static string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
389	>	static string NameOfMod = "NameOfMod";
390	>	static string ARROW = "->";
391	>	static string ModString = "ModString";
392	>	static string Platform = "Platform";
393		static string HasOnis = "HasOnis";
394		static string HasDeltas = "HasDeltas";
395		static string HasBSL = "HasBSL";
#	Line 380 | Line 399 | ModPackage fileToModPackage(fstream &fil
399		static string GlobalNeeded = "GlobalNeeded";
400		static string Category = "Category";
401		static string Creator = "Creator";
402	<	while (! file.eof() )
402	>	while (!file.eof())
403		{
404	<	getline (file,line);
404	>	getline(file,line);
405		vector<string> tokens;
406		vector<string>::iterator iter;
407	<	tokenize(line, tokens);                                 //string to vector of "words"
408	<	if (tokens.capacity() >= 3) {                   //make sure they are using enough stuff
409	<	iter = tokens.begin();                          //what word we are on, starts at first word
410	<	/* TODO: Get this "required Installer version" code working
411	<	if (!AEInstallVersion.compare(*iter))
412	<	If mod is too old, skip this mod.
413	<	*/
414	<	/*else*/if (!NameOfMod.compare(*iter))  {       //if it contains the name
415	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches the end of the line or a "//" comment
416	<	if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) {                 // ignores "->" and "NameOfMod"
407	>	tokenize(line, tokens);
408	>	if (tokens.capacity() >= 3)
409	>	{
410	>	iter = tokens.begin();
411	>
412	>	if (!AEInstallVersion.compare(*iter))
413	>	{
414	>	iter++; iter++;
415	>	package.installerVersion = *iter;
416	>	}
417	>	else if (!NameOfMod.compare(*iter))
418	>	{
419	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) // iterates through the words, ends if it reaches the end of the line or a "//" comment
420	>	{
421	>	if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) // ignores "->" and "NameOfMod"
422		package.name += *iter + " ";
399	–	}
423		}
401	–
424		}
425	<	else if (!ModString.compare(*iter)) {
425	>	else if (!ModString.compare(*iter))
426	>	{
427		iter++; iter++;
428		package.modStringName = *iter;
429		iter++;
430	<	package.modStringVersion = atoi((*iter).c_str());
430	>	package.modStringVersion = atof((*iter).c_str());
431		}
432	<	else if (!HasOnis.compare(*iter)) {
432	>	else if (!Platform.compare(*iter))
433	>	{
434	>	iter++; iter++;
435	>	package.platform = *iter;
436	>	}
437	>	else if (!HasOnis.compare(*iter))
438	>	{
439		iter++; iter++;
440	<	if ( boost::iequals(*iter, "Yes")) package.hasOnis = 1;
440	>	if (boost::iequals(*iter, "Yes")) package.hasOnis = 1;
441		}
442	<	else if (!HasBSL.compare(*iter)) {
443	<	if(toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasBSL = true;
444	<	else if ( boost::iequals(*iter, "Addon")) package.hasAddon = true;
442	>	else if (!HasBSL.compare(*iter))
443	>	{
444	>	iter++; iter++;
445	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasBSL = true;
446	>	else if (boost::iequals(*iter, "Addon")) package.hasAddon = true;
447		}
448	<	else if (!HasDeltas.compare(*iter)) {
448	>	else if (!HasDeltas.compare(*iter))
449	>	{
450		iter++; iter++;
451	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDeltas = 1;
451	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasDeltas = 1;
452		}
453	<	else if (!HasDats.compare(*iter)) {
453	>	else if (!HasDats.compare(*iter))
454	>	{
455		iter++; iter++;
456	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDats = 1;
456	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasDats = 1;
457		}
458	<	else if (!IsEngine.compare(*iter)) {
458	>	else if (!IsEngine.compare(*iter))
459	>	{
460		iter++; iter++;
461	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.isEngine = 1;
461	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.isEngine = 1;
462		}
463	<	else if (!GlobalNeeded.compare(*iter)) {
463	>	else if (!GlobalNeeded.compare(*iter))
464	>	{
465		iter++; iter++;
466	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.globalNeeded = 1;
467	<	else if (toupper((*iter)[0]) + toupper((*iter)[1]) == 'N' + 'O') package.globalNeeded = 1; // only place where checking for "No" is important atm.
466	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.globalNeeded = 1;
467	>	else if (toupper((*iter)[0]) == 'N' && toupper((*iter)[1]) == 'O') package.globalNeeded = 1; // only place where checking for "No" is important atm
468		}
469	<	else if (!Category.compare(*iter))  {
470	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches end of line or a "//" comment
471	<	if (ARROW.compare(*iter) && Category.compare(*iter)) {                  // ignores "->" and "Category"
469	>	else if (!Category.compare(*iter))
470	>	{
471	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++)
472	>	{
473	>	if (ARROW.compare(*iter) && Category.compare(*iter)) // ignores "->" and "Category"
474		package.category += *iter + " ";
438	–	}
475		}
476		}
477	<	else if (!Creator.compare(*iter))  {    //if it contains the name
478	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches end of line or a "//" comment
479	<	if (ARROW.compare(*iter) && Creator.compare(*iter)) {                   // ignores "->" and "Creator"
477	>	else if (!Creator.compare(*iter))
478	>	{
479	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++)
480	>	{
481	>	if (ARROW.compare(*iter) && Creator.compare(*iter)) // ignores "->" and "Creator"
482		package.creator += *iter + " ";
445	–	}
483		}
484		}
485	<	else if (!Readme.compare(*iter))  {     //if it contains the name
486	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches end of line or a "//" comment
487	<	if (ARROW.compare(*iter) && Readme.compare(*iter)) {                    // ignores "->" and "Readme"
488	<	if(!(*iter).compare("\\n")) package.readme += '\n';
485	>	else if (!Readme.compare(*iter))
486	>	{
487	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++)
488	>	{
489	>	if (ARROW.compare(*iter) && Readme.compare(*iter)) // ignores "->" and "Readme"
490	>	{
491	>	if (!(*iter).compare("\\n")) package.readme += '\n';
492		else package.readme += *iter + " ";
493		}
494		}
495		}
496		}
457	–
497		}
498
499		return package;
#	Line 797 | Line 836 | int GetUpdateStatus(Install_info_cfg *cu
836		else
837		return UPDATE_LOG_READ_ERR;
838		}
839	<
839	>
840		// Is there an update folder, and is it a monthly release or a patch?
841	<	if (!exists("../updates/Edition"))
841	>	bool firstParty = 0;
842	>	if (exists("../updates/Edition"))
843		{
844	+	firstParty = 1;
845	+	}
846	+	else {
847		strEUFN = "Edition-patch";
848	<	if (!exists("../updates/Edition-patch"))
849	<	return UPDATE_NO_UPD_AVAIL;
848	>	if (exists("../updates/Edition-patch")) {
849	>	firstParty = 1;
850	>	}
851	>
852		}
853	<
854	<	// Unlike the current AE's version info, we *need* to find the update's version info or we won't continue
855	<	string updateCfgPath = ("../updates/" + strEUFN + "/install/packages/Globalize/Install_Info.cfg");
856	<	updateAECfg.open(updateCfgPath.c_str());
857	<	if (!updateAECfg.fail())
858	<	{
859	<	if (!ReadInstallInfoCfg(&updateAECfg, updateAE))
853	>
854	>	if(firstParty) {
855	>	// Unlike the current AE's version info, we *need* to find the update's version info or we won't continue
856	>	string updateCfgPath = ("../updates/" + strEUFN + "/install/packages/Globalize/Install_Info.cfg");
857	>	updateAECfg.open(updateCfgPath.c_str());
858	>	if (!updateAECfg.fail())
859	>	{
860	>	if (!ReadInstallInfoCfg(&updateAECfg, updateAE))
861	>	return UPDATE_LOG_READ_ERR;
862	>
863	>	updateAECfg.close();
864	>	updateAECfg.clear();
865	>	}
866	>	else
867		return UPDATE_LOG_READ_ERR;
816	–
817	–	updateAECfg.close();
818	–	updateAECfg.clear();
819	–	}
820	–	else
821	–	return UPDATE_LOG_READ_ERR;
868
869	<	// Now we check for an Installer update in progress
870	<	if (exists("Update.log"))
871	<	{
872	<	updateLog.open("Update.log");
873	<	if (!updateLog.fail())
828	<	{
829	<	vector<string> lines;
830	<	string line;
831	<	int num_lines = 0;
832	<	bool readingInstallerVersion = false, doneReadingFile = false;
833	<
834	<	while (!updateLog.eof() && !doneReadingFile)
869	>	// Now we check for an Installer update in progress
870	>	if (exists("Update.log"))
871	>	{
872	>	updateLog.open("Update.log");
873	>	if (!updateLog.fail())
874		{
875	<	getline(updateLog, line);
876	<	lines.push_back(line);
877	<	num_lines++;
878	<	vector<string> tokens;
879	<	vector<string>::iterator iter;
880	<	tokenize(line, tokens);
842	<	iter = tokens.begin();
843	<	if (!readingInstallerVersion && tokens.capacity() >= 4)
875	>	vector<string> lines;
876	>	string line;
877	>	int num_lines = 0;
878	>	bool readingInstallerVersion = false, doneReadingFile = false;
879	>
880	>	while (!updateLog.eof() && !doneReadingFile)
881		{
882	<	if (!strInstaller.compare(*iter))
882	>	getline(updateLog, line);
883	>	lines.push_back(line);
884	>	num_lines++;
885	>	vector<string> tokens;
886	>	vector<string>::iterator iter;
887	>	tokenize(line, tokens);
888	>	iter = tokens.begin();
889	>	if (!readingInstallerVersion && tokens.capacity() >= 4)
890		{
891	<	if (!strBeing.compare(*++iter))
892	<	readingInstallerVersion = true;
893	<	else if (!strWas.compare(*iter))
894	<	*installerJustUpdated = true; // our third indirect return value after currentAE and updateAE
891	>	if (!strInstaller.compare(*iter))
892	>	{
893	>	if (!strBeing.compare(*++iter))
894	>	readingInstallerVersion = true;
895	>	else if (!strWas.compare(*iter))
896	>	*installerJustUpdated = true; // our third indirect return value after currentAE and updateAE
897	>	}
898		}
899	<	}
853	<	else if (readingInstallerVersion && tokens.capacity() >= 3)
854	<	{
855	<	readingInstallerVersion = false;
856	<	string installerVersion = INSTALLER_VERSION;
857	<	if (installerVersion.compare(*iter)) // then the shell script-powered replacement failed
858	<	return UPDATE_INST_REPL_ERR;
859	<	else
899	>	else if (readingInstallerVersion && tokens.capacity() >= 3)
900		{
901	<	updateLog.close();
902	<	updateLog.clear();
903	<	Sleep(1000);
904	<	remove("Update.log");
905	<	ofstream newUpdateLog("Update.log");
866	<	if (!newUpdateLog.fail())
901	>	readingInstallerVersion = false;
902	>	string installerVersion = INSTALLER_VERSION;
903	>	if (installerVersion.compare(*iter)) // then the shell script-powered replacement failed
904	>	return UPDATE_INST_REPL_ERR;
905	>	else
906		{
907	<	// Write over old log with updated information
908	<	ptime startTime(second_clock::local_time());
909	<	string strStartTime = to_simple_string(startTime);
910	<	string newUpdateLine = installerVersion + " on " + strStartTime;
911	<	for (int a = 0; a < lines.capacity() - 2; a++) // if there were even lines in the log before this at all
907	>	updateLog.close();
908	>	updateLog.clear();
909	>	Sleep(1000);
910	>	remove("Update.log");
911	>	ofstream newUpdateLog("Update.log");
912	>	if (!newUpdateLog.fail())
913		{
914	<	newUpdateLog << lines[a].c_str();
915	<	newUpdateLog << "\n";
914	>	// Write over old log with updated information
915	>	ptime startTime(second_clock::local_time());
916	>	string strStartTime = to_simple_string(startTime);
917	>	string newUpdateLine = installerVersion + " on " + strStartTime;
918	>	for (int a = 0; a < lines.capacity() - 2; a++) // if there were even lines in the log before this at all
919	>	{
920	>	newUpdateLog << lines[a].c_str();
921	>	newUpdateLog << "\n";
922	>	}
923	>	newUpdateLog << "Installer was updated to:\n";
924	>	newUpdateLog << newUpdateLine.c_str();
925	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
926	>	doneReadingFile = true;
927	>	newUpdateLog.close();
928	>	newUpdateLog.clear();
929	>	//return UPDATE_CONT_UPD; // as noted above, we are not using this return value; in fact, we want...
930	>	//                                                       ...the code to continue running down through the Edition version check
931		}
932	<	newUpdateLog << "Installer was updated to:\n";
933	<	newUpdateLog << newUpdateLine.c_str();
879	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
880	<	doneReadingFile = true;
881	<	newUpdateLog.close();
882	<	newUpdateLog.clear();
883	<	//return UPDATE_CONT_UPD; // as noted above, we are not using this return value; in fact, we want...
884	<	//                                                       ...the code to continue running down through the Edition version check
932	>	else
933	>	return UPDATE_LOG_READ_ERR;
934		}
886	–	else
887	–	return UPDATE_LOG_READ_ERR;
935		}
936		}
937	+	updateLog.close();
938	+	updateLog.clear();
939		}
940	<	updateLog.close();
941	<	updateLog.clear();
940	>	else
941	>	return UPDATE_LOG_READ_ERR;
942	>	}
943	>
944	>	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
945	>	{
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	>	}
951	>	string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
952	>	string installerVersion = INSTALLER_VERSION;
953	>	if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
954	>	{
955	>	if (exists(strNewInstallerPath))
956	>	return UPDATE_INST_AVAIL;
957	>	}
958	>	else if (updateAE->globalizationRequired)
959	>	return UPDATE_GLOB_AVAIL;
960	>	else
961	>	return UPDATE_SIMP_AVAIL;
962		}
894	–	else
895	–	return UPDATE_LOG_READ_ERR;
963		}
964	<
965	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
964	>	try {
965	>	directory_iterator end;
966	>	if(exists("../updates")){
967	>	for ( directory_iterator install_iter( "../updates" );
968	>	install_iter != end;
969	>	++install_iter )
970		{
971	<	if (!strEUFN.compare("Edition-patch")) // if update is a patch...
972	<	{
973	<	if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month?
974	<	return UPDATE_MNTH_REQD_ERR;
971	>
972	>	ModPackage installedPackage, updatePackage;
973	>	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
974	>	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
993	>	{
994	>	file.close();
995	>	return UPDATE_THIRD_PARTY;
996	>	}
997	>	file.close();
998	>	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
999	>	return UPDATE_THIRD_PARTY;
1000	>	}
1001	>
1002		}
905	–	string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
906	–	string installerVersion = INSTALLER_VERSION;
907	–	if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
908	–	{
909	–	if (exists(strNewInstallerPath))
910	–	return UPDATE_INST_AVAIL;
1003		}
1004	<	else if (updateAE->globalizationRequired)
1005	<	return UPDATE_GLOB_AVAIL;
1006	<	else
1007	<	return UPDATE_SIMP_AVAIL;
1004	>
1005	>	}
1006	>	}
1007	>	catch (exception & ex) {
1008	>	//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1009		}
917	–	else
918	–	return UPDATE_NO_UPD_AVAIL;
1010
1011	+
1012		return UPDATE_NO_UPD_AVAIL;
1013		}
1014
#	Line 939 | Line 1031 | bool ReadInstallInfoCfg(fstream *fileHan
1031
1032		while (getline(*fileHandler, line))
1033		{
1034	+	StripNewlines(&line);
1035		tokenize(line, tokens);
1036		iter = tokens.begin();
1037
#	Line 1142 | Line 1235 | bool ProcessInstallerUpdate(Install_info
1235		string popenCommand = "../updates/" + strEUFN + "/install/";
1236		#ifdef WIN32
1237		// TODO: Fill in Windows equivalent of code below :-3
1238	+	popenCommand = "replace_installer.bat";
1239		#else
1240		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
1241		// ...so we actually get the current user's shortname and manually construct the path to home
#	Line 1163 | Line 1257 | bool ProcessInstallerUpdate(Install_info
1257		#endif
1258		file.close();
1259		file.clear();
1260	+	#ifdef WIN32
1261	+	system(popenCommand.c_str());
1262	+	#else
1263		popen(popenCommand.c_str(), "r");
1264	<
1264	>	#endif
1265		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1266		}
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	+
1337
1338		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1339		{
#	Line 1195 | Line 1362 | bool ProcessAEUpdate(Install_info_cfg *c
1362
1363		// TODO: Fill in Windows equivalent of code below
1364		#ifdef WIN32
1365	<	string strTrashDir = "%RECYCLE%";
1365	>	string strTrashDir = "Trash\\";
1366		#else
1367		FILE *fUserName = NULL;
1368		char chrUserName[32];
#	Line 1240 | Line 1407 | bool ProcessAEUpdate(Install_info_cfg *c
1407		needNewTrashDir = true;
1408		}
1409		}
1410	<
1410	>	#ifndef WIN32
1411		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
1412		{
1413		tm tmStartTime = to_tm(startTime);
#	Line 1248 | Line 1415 | bool ProcessAEUpdate(Install_info_cfg *c
1415		boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1416		create_directory(strTrashDir);
1417		}
1418	+	#endif
1419		file.close();
1420		file.clear();
1421
#	Line 1323 | Line 1491 | bool ProcessAEUpdate(Install_info_cfg *c
1491		curPos = thePath.find("/", lastPos);
1492		aParentPath = aParentPath + "/";
1493		}
1494	+	#ifndef WIN32
1495		rename((path)("../" + thePath), (path)(strTrashDir + thePath));
1496	+	#else
1497	+	remove((path)("../" + thePath));
1498	+	#endif
1499		}
1500		}
1501
1502	<	// Now we crawl the update's package folders for newer versions and move them over, trashing ones that are already present
1331	<	vector<ModPackage> updatePackages, currentPackages;
1332	<	bool matchFound;
1333	<	updatePackages.reserve(256);
1334	<	currentPackages.reserve(256);
1335	<
1336	<	currentPackages = getPackages();
1337	<	updatePackages = getPackages(strPathToEUFNPackages);
1338	<
1339	<	for (vector<ModPackage>::iterator iter1 = updatePackages.begin(); iter1 != updatePackages.end(); iter1++)
1340	<	{
1341	<	matchFound = false;
1342	<	for (vector<ModPackage>::iterator iter2 = currentPackages.begin(); iter2 != currentPackages.end(); iter2++)
1343	<	{
1344	<	if (!iter1->modStringName.compare(iter2->modStringName))
1345	<	{
1346	<	matchFound = true;
1347	<	if (iter1->modStringVersion > iter2->modStringVersion)
1348	<	{
1349	<	rename((path)(strPathToPackages + iter2->modStringName), (path)(strTrashDir + iter2->modStringName));
1350	<	rename((path)(strPathToEUFNPackages + iter1->modStringName), (path)(strPathToPackages + iter1->modStringName));
1351	<	}
1352	<	}
1353	<	}
1354	<	if (!matchFound) // then there's no old package in the way, so just move in the one from the update
1355	<	rename((path)(strPathToEUFNPackages + iter1->modStringName), (path)(strPathToPackages + iter1->modStringName));
1356	<	}
1502	>	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1503
1504		// 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...
1505		// ...and folders which do not exist in the current AE will be created there
#	Line 1410 | Line 1556 | bool ProcessAEUpdate(Install_info_cfg *c
1556		CheckForGlobalization(true); // the 'true' value forces re-globalization
1557
1558		globalPackages = getPackages(); // refresh the list in memory
1413	–
1559		// TODO: Refresh the packages list in the window
1560
1561		return true;
#	Line 1457 | Line 1602 | void tokenize(const string& str, vector<
1602		}
1603		}
1604
1605	+	/* StripNewlines() gets rids of any linebreaks that come from text returned by getline(); \
1606	+	|  getline() should be stripping those out, but Windows CR/LF files seem to be sneaking   |
1607	+	\  some extra return characters into strings in the ReadInstallInfoCfg() function.               */
1608	+	void StripNewlines(string *theLine)
1609	+	{
1610	+	int deleteFromHere = 0;
1611	+	deleteFromHere = theLine->find("\r");
1612	+	if (deleteFromHere > 0)
1613	+	theLine->erase(deleteFromHere, theLine->size());
1614	+	}
1615	+
1616		void clearOldDats(void) {
1617		directory_iterator end_iter_gdf;
1618		for ( directory_iterator dir_itr_gdf( "../GameDataFolder" );
#	Line 1571 | Line 1727 | ModPackage::ModPackage()
1727		name = "";
1728		modStringName = "";
1729		modStringVersion = 0;
1730	+	platform = "Both";
1731		hasOnis = false;
1732		hasDeltas = false;
1733		hasBSL = false;

Diff Legend

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