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 548 by gumby, Wed May 26 22:55:00 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 663 | Line 659 | void recompileAll(vector<string> install
659		for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
660		for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
661		if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
662	<	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
662	>	if(globalPackages[j].hasBSL)) break; //skip non-BSL
663		if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
664		copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
665		BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
#	Line 672 | Line 668 | void recompileAll(vector<string> install
668		}
669		}
670
671	+
672	+
673		ModPackage emptyPackage;
674		emptyPackage.modStringName = "VanillaBSL";
675		emptyPackage.hasBSL = 1;
676		copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
677		BSLlog.close();
678	<
678	>
679	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
680	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
681	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
682	>	if(!globalPackages[j].hasAddon) break; //skip non-BSL
683	>	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
684	>	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
685	>	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
686	>	}
687	>	}
688	>	}
689	>	}
690	>
691		logfile << "Writing config file";
692		writeInstalledMods(installedMods);
693		setProgressBar(1000);
#	Line 708 | Line 718 | void recompileAll(vector<string> install
718
719		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
720		{
721	<	ofstream BSLlog("BSL2.log", ios::app );
721	>	ofstream BSLlog("BSL.log", ios::app );
722
723		try {
724		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 718 | Line 728 | void copyBSL(string copypath, vector<str
728		if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
729		BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
730		int skip_folder = 0;
731	<
732	<	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
733	<	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
734	<	if(dir_itr->path().filename() == BSLfolders[k]) {
735	<	skip_folder = 1;
736	<	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
737	<	break;
731	>	if(!pkg.HasAddon) {
732	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
733	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
734	>	if(dir_itr->path().filename() == BSLfolders[k]) {
735	>	skip_folder = 1;
736	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
737	>	break;
738	>	}
739		}
740		}
741		if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
#	Line 739 | Line 750 | void copyBSL(string copypath, vector<str
750		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
751		}
752		}
753	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
754	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
753	>	if( !pkg.hasAddon ) {
754	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
755	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
756	>	}
757		}
758		}
759		}
#	Line 816 | Line 829 | vector<string> getInstallString(string C
829		|                                                          Installer to be replaced (when the new Installer                     |
830		|                                                          launches, this function will be called again but will        |
831		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
832	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
833		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
834		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
835		{
#	Line 845 | Line 859 | int GetUpdateStatus(Install_info_cfg *cu
859		return UPDATE_LOG_READ_ERR;
860		}
861
862	<	// Is there an update folder, and is it a monthly release or a patch?
862	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
863		bool firstParty = 0;
864	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
865	+	if (!exists("../updates"))
866	+	create_directory("../updates");
867		if (exists("../updates/Edition"))
868		{
869		firstParty = 1;
#	Line 930 | Line 947 | int GetUpdateStatus(Install_info_cfg *cu
947		}
948		newUpdateLog << "Installer was updated to:\n";
949		newUpdateLog << newUpdateLine.c_str();
950	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
950	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
951		doneReadingFile = true;
952		newUpdateLog.close();
953		newUpdateLog.clear();
#	Line 969 | Line 986 | int GetUpdateStatus(Install_info_cfg *cu
986		return UPDATE_SIMP_AVAIL;
987		}
988		}
989	<	try {
973	<	directory_iterator end;
974	<	if(exists("../updates")){
975	<	for ( directory_iterator install_iter( "../updates" );
976	<	install_iter != end;
977	<	++install_iter )
989	>	try
990		{
991	<
992	<	ModPackage installedPackage, updatePackage;
993	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
994	<	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
991	>	directory_iterator end;
992	>	if (exists("../updates"))
993	>	{
994	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
995		{
996	<	file.close();
997	<	return UPDATE_THIRD_PARTY;
998	<	}
999	<	file.close();
1000	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1001	<	return UPDATE_THIRD_PARTY;
996	>	ModPackage installedPackage, updatePackage;
997	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
998	>	{
999	>	fstream file;
1000	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1001	>	if (!file.fail())
1002	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
1003	>	else
1004	>	{
1005	>	file.close();
1006	>	continue;
1007	>	}
1008	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
1009	>	{
1010	>	file.close();
1011	>	file.clear();
1012	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1013	>	if (!file.fail())
1014	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1015	>	file.close();
1016	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1017	>	{
1018	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1019	>	return UPDATE_PKG_AVAIL;
1020	>	}
1021	>	}
1022	>	else
1023	>	{
1024	>	file.close();
1025	>	return UPDATE_PKG_AVAIL;
1026	>	}
1027	>	}
1028		}
1009	–
1010	–	}
1029		}
1012	–
1013	–	}
1030		}
1031		catch (exception & ex) {
1032		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1033		}
1018	–
1034
1035		return UPDATE_NO_UPD_AVAIL;
1036		}
#	Line 1030 | Line 1045 | bool ReadInstallInfoCfg(fstream *fileHan
1045		string strDaodanVersion = "Daodan_Version";
1046		string strOniSplitVersion = "OniSplit_Version";
1047		string strGUIWinVersion = "GUI_Win_Version";
1048	<	string strGUIMacVersion = "GUI_Mac_Version";
1048	>	string strGUIMacVersion = "GUI_Mac_Version";
1049		string strReglobalize = "Reglobalize";
1050		string strDeleteList = "Delete_List";
1051		string strArrow = "->";
#	Line 1242 | Line 1257 | bool ProcessInstallerUpdate(Install_info
1257
1258		string popenCommand = "../updates/" + strEUFN + "/install/";
1259		#ifdef WIN32
1245	–	// TODO: Fill in Windows equivalent of code below :-3
1260		popenCommand = "replace_installer.bat";
1261		#else
1262		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1272 | Line 1286 | bool ProcessInstallerUpdate(Install_info
1286		#endif
1287		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1288		}
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	–
1289
1290		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1291		{
1292	+	try {
1293		fstream file;
1294		string line;
1295		vector<string> tokens, updateStarted;
#	Line 1364 | Line 1309 | bool ProcessAEUpdate(Install_info_cfg *c
1309		string strOniApp = "Oni.exe";
1310		#else
1311		string strOniApp = "Oni.app";
1367	–	#endif
1312		bool needNewTrashDir = false;
1313	+	#endif
1314	+
1315		bool readingVerAndDate = false;
1316
1371	–	// TODO: Fill in Windows equivalent of code below
1317		#ifdef WIN32
1318	<	string strTrashDir = "Trash\\";
1318	>	//string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1319		#else
1320		FILE *fUserName = NULL;
1321		char chrUserName[32];
#	Line 1405 | Line 1350 | bool ProcessAEUpdate(Install_info_cfg *c
1350		if (readingVerAndDate && tokens.capacity() >= 3)
1351		tokenize(tokens[2], updateStarted, "-");
1352		}
1353	+	#ifndef WIN32
1354		if (updateStarted.capacity() < 3)
1355		needNewTrashDir = true;
1356		else
#	Line 1414 | Line 1360 | bool ProcessAEUpdate(Install_info_cfg *c
1360		if (!exists(strTrashDir))
1361		needNewTrashDir = true;
1362		}
1363	+	#endif
1364		}
1365		#ifndef WIN32
1366		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1431 | Line 1378 | bool ProcessAEUpdate(Install_info_cfg *c
1378		if (exists(strPathToEUFN + strOniApp))
1379		{
1380		if (exists(strOniApp))
1381	+	#ifdef WIN32
1382	+	remove((path)strOniApp);
1383	+	#else
1384		rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1385	+	#endif
1386		rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1387		}
1388		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
#	Line 1439 | Line 1390 | bool ProcessAEUpdate(Install_info_cfg *c
1390		if (exists(strPathToEUFNInstall + strOniSplit))
1391		{
1392		if (exists(strOniSplit))
1393	+	#ifdef WIN32
1394	+	remove((path)strOniSplit);
1395	+	#else
1396		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1397	+	#endif
1398		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1399		}
1400		}
#	Line 1449 | Line 1404 | bool ProcessAEUpdate(Install_info_cfg *c
1404		if (exists(strPathToEUFN + strDaodan))
1405		{
1406		if (exists(("../" + strDaodan)))
1407	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1407	>	remove((path)("../" + strDaodan));
1408		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1409		}
1410		}
#	Line 1458 | Line 1413 | bool ProcessAEUpdate(Install_info_cfg *c
1413		if (exists(strPathToEUFNInstall + strWinGUI))
1414		{
1415		if (exists((path)strWinGUI))
1416	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1416	>	remove((path)strWinGUI);
1417		if (exists(strWinGUILang))
1418	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1418	>	remove((path)strWinGUILang);
1419		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1420		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1421		}
#	Line 1493 | Line 1448 | bool ProcessAEUpdate(Install_info_cfg *c
1448		while (curPos != string::npos && curPos < thePath.size())
1449		{
1450		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1451	+	#ifndef WIN32
1452		if (!exists(strTrashDir + aParentPath))
1453		create_directory(strTrashDir + aParentPath);
1454	+	#endif
1455		lastPos = curPos + 1;
1456		curPos = thePath.find("/", lastPos);
1457		aParentPath = aParentPath + "/";
#	Line 1507 | Line 1464 | bool ProcessAEUpdate(Install_info_cfg *c
1464		}
1465		}
1466
1467	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1467	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1468
1469		// 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...
1470		// ...and folders which do not exist in the current AE will be created there
#	Line 1539 | Line 1496 | bool ProcessAEUpdate(Install_info_cfg *c
1496		for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1497		{
1498		if (exists(strPathToPackages + strGlobalize + *iter))
1499	+	#ifdef WIN32
1500	+	remove((path)(strPathToPackages + strGlobalize + *iter));
1501	+	#else
1502		rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1503	+	#endif
1504		rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1505		}
1506
1507		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1508	+	#ifdef WIN32
1509	+	remove((path)strPathToEUFN);
1510	+	#else
1511		create_directory(strTrashDir + "Unneeded update files");
1512		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1513	<
1513	>	#endif
1514		// Write to log that we are finished with update
1515		ptime end_time(second_clock::local_time());
1516		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1564 | Line 1528 | bool ProcessAEUpdate(Install_info_cfg *c
1528		CheckForGlobalization(true); // the 'true' value forces re-globalization
1529
1530		globalPackages = getPackages(); // refresh the list in memory
1531	<	// TODO: Refresh the packages list in the window
1532	<
1531	>	wxCommandEvent e;
1532	>	TheWindow->OnRefreshButtonClick( e );
1533		return true;
1534	+	}
1535	+	catch (exception & ex)
1536	+	{
1537	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1538	+	return false;
1539	+	}
1540	+
1541	+	}
1542	+
1543	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1544	+	{
1545	+	ptime startTime(second_clock::local_time());
1546	+	#ifdef WIN32
1547	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1548	+	#else
1549	+	FILE *fUserName = NULL;
1550	+	char chrUserName[32];
1551	+	fUserName = popen("whoami", "r");
1552	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1553	+	pclose(fUserName);
1554	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1555	+	int endOfName = strUserName.find("\n", 0);
1556	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1557	+	bool needNewTrashDir = true;
1558	+	tm tmStartTime = to_tm(startTime);
1559	+	#endif
1560	+
1561	+	try
1562	+	{
1563	+	directory_iterator end;
1564	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1565	+	{
1566	+	ModPackage installedPackage, updatePackage;
1567	+	string updtPath = update_iter->path().string();
1568	+	string updtFolder = update_iter->path().filename();
1569	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1570	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1571	+	if (!boost::iequals(updtFolder, "Edition")
1572	+	&& !boost::iequals(updtFolder, "Edition-patch")
1573	+	&& is_directory(update_iter->path())
1574	+	&& exists(updtModInfo))
1575	+	{
1576	+	fstream file;
1577	+	file.open((updtModInfo).c_str());
1578	+	if (!file.fail())
1579	+	updatePackage = fileToModPackage(file, updtFolder);
1580	+	else
1581	+	{
1582	+	file.close();
1583	+	continue;
1584	+	}
1585	+	if (exists(instModInfo))
1586	+	{
1587	+	file.close();
1588	+	file.clear();
1589	+	file.open(instModInfo.c_str());
1590	+	if (!file.fail())
1591	+	{
1592	+	installedPackage = fileToModPackage(file, updtFolder);
1593	+	}
1594	+	file.close();
1595	+	}
1596	+	file.close();
1597	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1598	+	{
1599	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1600	+	{
1601	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1602	+	#ifdef WIN32
1603	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1604	+	#else
1605	+	if (needNewTrashDir)
1606	+	{
1607	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1608	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1609	+	create_directory(strTrashDir);
1610	+	needNewTrashDir = false;
1611	+	}
1612	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1613	+	#endif
1614	+	}
1615	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1616	+	}
1617	+	}
1618	+	}
1619	+	}
1620	+	}
1621	+	catch (exception & ex)
1622	+	{
1623	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1624	+	}
1625	+	wxCommandEvent e;
1626	+	TheWindow->OnRefreshButtonClick( e );
1627		}
1628
1629		/* 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)