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 505 by gumby, Sat Mar 27 14:17:32 2010 UTC vs.
Revision 549 by gumby, Wed May 26 23:04:56 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)
312	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants folder that *contains* the GDF)
313		//bad Iritscen, bad! fixed buffers can cause crashes.
314		/*char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
315		strcat(prefsCommand, fullAEpath.c_str());
#	Line 374 | Line 377 | vector<ModPackage> getPackages(string pa
377		}
378
379		ModPackage fileToModPackage(fstream &file, string modName)
380	<	{
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	<	*/
386	<
380	>	{
381		ModPackage package;
382		string line;
383		const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
#	Line 575 | Line 569 | void recompileAll(vector<string> install
569
570
571		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
572	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
572	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
573	>	dir_itr->path().filename() + " ");
574
575		system(importCommand.c_str());
576		j++;
#	Line 631 | Line 626 | void recompileAll(vector<string> install
626		importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
627
628		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
629	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
629	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
630	>	dir_itr->path().filename() + " ");
631		system(importCommand.c_str());
632		j++;
633		}
#	Line 651 | Line 647 | void recompileAll(vector<string> install
647		vector<string> skippedfolders;
648
649		ofstream BSLlog("BSL.log");
650	+	if(exists("../GameDataFolder/BSLBackup/")) {
651	+	remove_all("../GameDataFolder/BSLBackup/");
652	+	}
653	+	else {
654	+	create_directory("../GameDataFolder/BSLBackup/");
655	+	}
656	+	copy("../GameDataFolder/IGMD/", "../GameDataFolder/BSLBackup/");
657		for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
658		dir_itr != end_itr;
659		++dir_itr ) {
#	Line 663 | Line 666 | void recompileAll(vector<string> install
666		for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
667		for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
668		if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
669	<	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
669	>	if(globalPackages[j].hasBSL) break; //skip non-BSL
670		if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
671		copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
672		BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
#	Line 672 | Line 675 | void recompileAll(vector<string> install
675		}
676		}
677
678	+
679	+
680		ModPackage emptyPackage;
681		emptyPackage.modStringName = "VanillaBSL";
682		emptyPackage.hasBSL = 1;
683		copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
684		BSLlog.close();
685	<
685	>
686	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
687	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
688	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
689	>	if(!globalPackages[j].hasAddon) break; //skip non-BSL
690	>	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
691	>	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
692	>	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
693	>	}
694	>	}
695	>	}
696	>	}
697	>
698		logfile << "Writing config file";
699		writeInstalledMods(installedMods);
700		setProgressBar(1000);
#	Line 708 | Line 725 | void recompileAll(vector<string> install
725
726		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
727		{
728	<	ofstream BSLlog("BSL2.log", ios::app );
728	>	ofstream BSLlog("BSL.log", ios::app );
729
730		try {
731		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 718 | Line 735 | void copyBSL(string copypath, vector<str
735		if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
736		BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
737		int skip_folder = 0;
738	<
739	<	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
740	<	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
741	<	if(dir_itr->path().filename() == BSLfolders[k]) {
742	<	skip_folder = 1;
743	<	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
744	<	break;
738	>	if(!pkg.hasAddon) {
739	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
740	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
741	>	if(dir_itr->path().filename() == BSLfolders[k]) {
742	>	skip_folder = 1;
743	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
744	>	break;
745	>	}
746		}
747		}
748		if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
#	Line 739 | Line 757 | void copyBSL(string copypath, vector<str
757		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
758		}
759		}
760	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
761	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
760	>	if( !pkg.hasAddon ) {
761	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
762	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
763	>	}
764		}
765		}
766		}
#	Line 816 | Line 836 | vector<string> getInstallString(string C
836		|                                                          Installer to be replaced (when the new Installer                     |
837		|                                                          launches, this function will be called again but will        |
838		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
839	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
840		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
841		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
842		{
#	Line 845 | Line 866 | int GetUpdateStatus(Install_info_cfg *cu
866		return UPDATE_LOG_READ_ERR;
867		}
868
869	<	// Is there an update folder, and is it a monthly release or a patch?
869	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
870		bool firstParty = 0;
871	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
872	+	if (!exists("../updates"))
873	+	create_directory("../updates");
874		if (exists("../updates/Edition"))
875		{
876		firstParty = 1;
#	Line 930 | Line 954 | int GetUpdateStatus(Install_info_cfg *cu
954		}
955		newUpdateLog << "Installer was updated to:\n";
956		newUpdateLog << newUpdateLine.c_str();
957	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
957	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
958		doneReadingFile = true;
959		newUpdateLog.close();
960		newUpdateLog.clear();
#	Line 969 | Line 993 | int GetUpdateStatus(Install_info_cfg *cu
993		return UPDATE_SIMP_AVAIL;
994		}
995		}
996	<	try {
973	<	directory_iterator end;
974	<	if(exists("../updates")){
975	<	for ( directory_iterator install_iter( "../updates" );
976	<	install_iter != end;
977	<	++install_iter )
996	>	try
997		{
998	<
999	<	ModPackage installedPackage, updatePackage;
1000	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
1001	<	fstream file;
983	<	file.open( (install_iter->path().string() + "/Mod_Info.cfg").c_str());
984	<	if (!file.fail())
985	<	{
986	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
987	<	}
988	<	else
989	<	{
990	<	file.close();
991	<	continue;
992	<	}
993	<	if(!exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"));
994	<	file.close();
995	<	file.open( ("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
996	<	if (!file.fail())
997	<	{
998	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
999	<	}
1000	<	else
998	>	directory_iterator end;
999	>	if (exists("../updates"))
1000	>	{
1001	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
1002		{
1003	<	file.close();
1004	<	return UPDATE_THIRD_PARTY;
1005	<	}
1006	<	file.close();
1007	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1008	<	return UPDATE_THIRD_PARTY;
1003	>	ModPackage installedPackage, updatePackage;
1004	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
1005	>	{
1006	>	fstream file;
1007	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1008	>	if (!file.fail())
1009	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
1010	>	else
1011	>	{
1012	>	file.close();
1013	>	continue;
1014	>	}
1015	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
1016	>	{
1017	>	file.close();
1018	>	file.clear();
1019	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1020	>	if (!file.fail())
1021	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1022	>	file.close();
1023	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1024	>	{
1025	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1026	>	return UPDATE_PKG_AVAIL;
1027	>	}
1028	>	}
1029	>	else
1030	>	{
1031	>	file.close();
1032	>	return UPDATE_PKG_AVAIL;
1033	>	}
1034	>	}
1035		}
1009	–
1036		}
1011	–	}
1012	–
1013	–	}
1037		}
1038		catch (exception & ex) {
1039		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1040		}
1018	–
1041
1042		return UPDATE_NO_UPD_AVAIL;
1043		}
#	Line 1030 | Line 1052 | bool ReadInstallInfoCfg(fstream *fileHan
1052		string strDaodanVersion = "Daodan_Version";
1053		string strOniSplitVersion = "OniSplit_Version";
1054		string strGUIWinVersion = "GUI_Win_Version";
1055	<	string strGUIMacVersion = "GUI_Mac_Version";
1055	>	string strGUIMacVersion = "GUI_Mac_Version";
1056		string strReglobalize = "Reglobalize";
1057		string strDeleteList = "Delete_List";
1058		string strArrow = "->";
#	Line 1242 | Line 1264 | bool ProcessInstallerUpdate(Install_info
1264
1265		string popenCommand = "../updates/" + strEUFN + "/install/";
1266		#ifdef WIN32
1245	–	// TODO: Fill in Windows equivalent of code below :-3
1267		popenCommand = "replace_installer.bat";
1268		#else
1269		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1272 | Line 1293 | bool ProcessInstallerUpdate(Install_info
1293		#endif
1294		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1295		}
1275	–	//strPathToEUFNPackages
1276	–
1277	–	void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1278	–	try{
1279	–	directory_iterator end;
1280	–	for ( directory_iterator update_iter( pathToUpdate );
1281	–	update_iter != end;
1282	–	++update_iter )
1283	–	{
1284	–
1285	–	ModPackage installedPackage, updatePackage;
1286	–	string updateStr = update_iter->path().string() + "/Mod_Info.cfg";
1287	–	if ( !boost::iequals(update_iter->path().filename(),"Edition")
1288	–	&& !boost::iequals(update_iter->path().filename(),"Edition-patch")
1289	–	&& is_directory( update_iter->path() )
1290	–	&& exists( update_iter->path().string() + "/Mod_Info.cfg" ) )
1291	–	{
1292	–	bool update = 0;
1293	–	fstream file;
1294	–	file.open( (update_iter->path().string() + "/Mod_Info.cfg").c_str());
1295	–	if (!file.fail())
1296	–	{
1297	–	updatePackage = fileToModPackage(file, update_iter->path().filename());
1298	–	}
1299	–	else
1300	–	{
1301	–	file.close();
1302	–	continue;
1303	–	}
1304	–	if(!exists(strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg"));
1305	–	file.close();
1306	–	file.clear();
1307	–	file.open((strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg").c_str());
1308	–	if (!file.fail())
1309	–	{
1310	–	installedPackage = fileToModPackage(file, update_iter->path().filename());
1311	–	file.close();
1312	–	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1313	–	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1314	–	update = 1;
1315	–	}
1316	–	}
1317	–	else
1318	–	{
1319	–	file.close();
1320	–	update = 1;
1321	–	}
1322	–	file.close();
1323	–
1324	–	if(update) {
1325	–	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1326	–
1327	–	}
1328	–	}
1329	–	}
1330	–	}
1331	–	catch (exception & ex) {
1332	–	//      ex.what();
1333	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
1334	–	}
1335	–	}
1336	–
1337	–
1338	–	bool ProcessThirdPartyUpdates() {
1339	–	CrawlPackages( "../updates",  "./packages");
1340	–	return true;
1341	–	//      globalPackages = getPackages();
1342	–	//      refreshMods(globalInstalledMods);
1343	–	}
1344	–
1296
1297		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1298		{
1299	+	try {
1300		fstream file;
1301		string line;
1302		vector<string> tokens, updateStarted;
#	Line 1364 | Line 1316 | bool ProcessAEUpdate(Install_info_cfg *c
1316		string strOniApp = "Oni.exe";
1317		#else
1318		string strOniApp = "Oni.app";
1367	–	#endif
1319		bool needNewTrashDir = false;
1320	+	#endif
1321	+
1322		bool readingVerAndDate = false;
1323
1371	–	// TODO: Fill in Windows equivalent of code below
1324		#ifdef WIN32
1325	<	string strTrashDir = "Trash\\";
1325	>	//string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1326		#else
1327		FILE *fUserName = NULL;
1328		char chrUserName[32];
#	Line 1405 | Line 1357 | bool ProcessAEUpdate(Install_info_cfg *c
1357		if (readingVerAndDate && tokens.capacity() >= 3)
1358		tokenize(tokens[2], updateStarted, "-");
1359		}
1360	+	#ifndef WIN32
1361		if (updateStarted.capacity() < 3)
1362		needNewTrashDir = true;
1363		else
#	Line 1414 | Line 1367 | bool ProcessAEUpdate(Install_info_cfg *c
1367		if (!exists(strTrashDir))
1368		needNewTrashDir = true;
1369		}
1370	+	#endif
1371		}
1372		#ifndef WIN32
1373		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1431 | Line 1385 | bool ProcessAEUpdate(Install_info_cfg *c
1385		if (exists(strPathToEUFN + strOniApp))
1386		{
1387		if (exists(strOniApp))
1388	+	#ifdef WIN32
1389	+	remove((path)strOniApp);
1390	+	#else
1391		rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1392	+	#endif
1393		rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1394		}
1395		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
#	Line 1439 | Line 1397 | bool ProcessAEUpdate(Install_info_cfg *c
1397		if (exists(strPathToEUFNInstall + strOniSplit))
1398		{
1399		if (exists(strOniSplit))
1400	+	#ifdef WIN32
1401	+	remove((path)strOniSplit);
1402	+	#else
1403		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1404	+	#endif
1405		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1406		}
1407		}
#	Line 1449 | Line 1411 | bool ProcessAEUpdate(Install_info_cfg *c
1411		if (exists(strPathToEUFN + strDaodan))
1412		{
1413		if (exists(("../" + strDaodan)))
1414	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1414	>	remove((path)("../" + strDaodan));
1415		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1416		}
1417		}
#	Line 1458 | Line 1420 | bool ProcessAEUpdate(Install_info_cfg *c
1420		if (exists(strPathToEUFNInstall + strWinGUI))
1421		{
1422		if (exists((path)strWinGUI))
1423	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1423	>	remove((path)strWinGUI);
1424		if (exists(strWinGUILang))
1425	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1425	>	remove((path)strWinGUILang);
1426		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1427		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1428		}
#	Line 1493 | Line 1455 | bool ProcessAEUpdate(Install_info_cfg *c
1455		while (curPos != string::npos && curPos < thePath.size())
1456		{
1457		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1458	+	#ifndef WIN32
1459		if (!exists(strTrashDir + aParentPath))
1460		create_directory(strTrashDir + aParentPath);
1461	+	#endif
1462		lastPos = curPos + 1;
1463		curPos = thePath.find("/", lastPos);
1464		aParentPath = aParentPath + "/";
#	Line 1507 | Line 1471 | bool ProcessAEUpdate(Install_info_cfg *c
1471		}
1472		}
1473
1474	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1474	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1475
1476		// 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...
1477		// ...and folders which do not exist in the current AE will be created there
#	Line 1539 | Line 1503 | bool ProcessAEUpdate(Install_info_cfg *c
1503		for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1504		{
1505		if (exists(strPathToPackages + strGlobalize + *iter))
1506	+	#ifdef WIN32
1507	+	remove((path)(strPathToPackages + strGlobalize + *iter));
1508	+	#else
1509		rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1510	+	#endif
1511		rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1512		}
1513
1514		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1515	+	#ifdef WIN32
1516	+	remove((path)strPathToEUFN);
1517	+	#else
1518		create_directory(strTrashDir + "Unneeded update files");
1519		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1520	<
1520	>	#endif
1521		// Write to log that we are finished with update
1522		ptime end_time(second_clock::local_time());
1523		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1564 | Line 1535 | bool ProcessAEUpdate(Install_info_cfg *c
1535		CheckForGlobalization(true); // the 'true' value forces re-globalization
1536
1537		globalPackages = getPackages(); // refresh the list in memory
1538	<	// TODO: Refresh the packages list in the window
1539	<
1538	>	wxCommandEvent e;
1539	>	TheWindow->OnRefreshButtonClick( e );
1540		return true;
1541	+	}
1542	+	catch (exception & ex)
1543	+	{
1544	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1545	+	return false;
1546	+	}
1547	+
1548	+	}
1549	+
1550	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1551	+	{
1552	+	ptime startTime(second_clock::local_time());
1553	+	#ifdef WIN32
1554	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1555	+	#else
1556	+	FILE *fUserName = NULL;
1557	+	char chrUserName[32];
1558	+	fUserName = popen("whoami", "r");
1559	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1560	+	pclose(fUserName);
1561	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1562	+	int endOfName = strUserName.find("\n", 0);
1563	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1564	+	bool needNewTrashDir = true;
1565	+	tm tmStartTime = to_tm(startTime);
1566	+	#endif
1567	+
1568	+	try
1569	+	{
1570	+	directory_iterator end;
1571	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1572	+	{
1573	+	ModPackage installedPackage, updatePackage;
1574	+	string updtPath = update_iter->path().string();
1575	+	string updtFolder = update_iter->path().filename();
1576	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1577	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1578	+	if (!boost::iequals(updtFolder, "Edition")
1579	+	&& !boost::iequals(updtFolder, "Edition-patch")
1580	+	&& is_directory(update_iter->path())
1581	+	&& exists(updtModInfo))
1582	+	{
1583	+	fstream file;
1584	+	file.open((updtModInfo).c_str());
1585	+	if (!file.fail())
1586	+	updatePackage = fileToModPackage(file, updtFolder);
1587	+	else
1588	+	{
1589	+	file.close();
1590	+	continue;
1591	+	}
1592	+	if (exists(instModInfo))
1593	+	{
1594	+	file.close();
1595	+	file.clear();
1596	+	file.open(instModInfo.c_str());
1597	+	if (!file.fail())
1598	+	{
1599	+	installedPackage = fileToModPackage(file, updtFolder);
1600	+	}
1601	+	file.close();
1602	+	}
1603	+	file.close();
1604	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1605	+	{
1606	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1607	+	{
1608	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1609	+	#ifdef WIN32
1610	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1611	+	#else
1612	+	if (needNewTrashDir)
1613	+	{
1614	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1615	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1616	+	create_directory(strTrashDir);
1617	+	needNewTrashDir = false;
1618	+	}
1619	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1620	+	#endif
1621	+	}
1622	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1623	+	}
1624	+	}
1625	+	}
1626	+	}
1627	+	}
1628	+	catch (exception & ex)
1629	+	{
1630	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1631	+	}
1632	+	wxCommandEvent e;
1633	+	TheWindow->OnRefreshButtonClick( e );
1634		}
1635
1636		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \

Diff Legend

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