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 556 by gumby, Sat May 29 18:41:43 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 374 | Line 372 | vector<ModPackage> getPackages(string pa
372		}
373
374		ModPackage fileToModPackage(fstream &file, string modName)
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	<	*/
386	<
375	>	{
376		ModPackage package;
377		string line;
378		const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
#	Line 575 | 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 602 | 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 );
619	<	dir_itr != end_iter;
620	<	++dir_itr )
621	<	{
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 651 | 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 663 | 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 672 | 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 708 | 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 718 | 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 739 | Line 768 | void copyBSL(string copypath, vector<str
768		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
769		}
770		}
771	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
772	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
771	>	if( !pkg.hasAddon ) {
772	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
773	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
774	>	}
775		}
776		}
777		}
#	Line 816 | Line 847 | vector<string> getInstallString(string C
847		|                                                          Installer to be replaced (when the new Installer                     |
848		|                                                          launches, this function will be called again but will        |
849		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
850	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
851		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
852		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
853		{
#	Line 845 | Line 877 | int GetUpdateStatus(Install_info_cfg *cu
877		return UPDATE_LOG_READ_ERR;
878		}
879
880	<	// Is there an update folder, and is it a monthly release or a patch?
880	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
881		bool firstParty = 0;
882	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
883	+	if (!exists("../updates"))
884	+	create_directory("../updates");
885		if (exists("../updates/Edition"))
886		{
887		firstParty = 1;
#	Line 930 | Line 965 | int GetUpdateStatus(Install_info_cfg *cu
965		}
966		newUpdateLog << "Installer was updated to:\n";
967		newUpdateLog << newUpdateLine.c_str();
968	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
968	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
969		doneReadingFile = true;
970		newUpdateLog.close();
971		newUpdateLog.clear();
#	Line 949 | Line 984 | int GetUpdateStatus(Install_info_cfg *cu
984		return UPDATE_LOG_READ_ERR;
985		}
986
987	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
987	>	if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed?
988		{
954	–	if (!strEUFN.compare("Edition-patch")) // if update is a patch...
955	–	{
956	–	if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month?
957	–	return UPDATE_MNTH_REQD_ERR;
958	–	}
989		string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
990		string installerVersion = INSTALLER_VERSION;
991		if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
#	Line 968 | Line 998 | int GetUpdateStatus(Install_info_cfg *cu
998		else
999		return UPDATE_SIMP_AVAIL;
1000		}
1001	+	else
1002	+	return UPDATE_MNTH_REQD_ERR;
1003		}
1004	<	try {
973	<	directory_iterator end;
974	<	if(exists("../updates")){
975	<	for ( directory_iterator install_iter( "../updates" );
976	<	install_iter != end;
977	<	++install_iter )
1004	>	try
1005		{
1006	<
1007	<	ModPackage installedPackage, updatePackage;
1008	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
1009	<	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
1006	>	directory_iterator end;
1007	>	if (exists("../updates"))
1008	>	{
1009	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
1010		{
1011	<	file.close();
1012	<	return UPDATE_THIRD_PARTY;
1013	<	}
1014	<	file.close();
1015	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1016	<	return UPDATE_THIRD_PARTY;
1011	>	ModPackage installedPackage, updatePackage;
1012	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
1013	>	{
1014	>	fstream file;
1015	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1016	>	if (!file.fail())
1017	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
1018	>	else
1019	>	{
1020	>	file.close();
1021	>	continue;
1022	>	}
1023	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
1024	>	{
1025	>	file.close();
1026	>	file.clear();
1027	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1028	>	if (!file.fail())
1029	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1030	>	file.close();
1031	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1032	>	{
1033	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1034	>	return UPDATE_PKG_AVAIL;
1035	>	}
1036	>	}
1037	>	else
1038	>	{
1039	>	file.close();
1040	>	return UPDATE_PKG_AVAIL;
1041	>	}
1042	>	}
1043		}
1009	–
1044		}
1011	–	}
1012	–
1013	–	}
1045		}
1046		catch (exception & ex) {
1047		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1048		}
1018	–
1049
1050		return UPDATE_NO_UPD_AVAIL;
1051		}
#	Line 1030 | Line 1060 | bool ReadInstallInfoCfg(fstream *fileHan
1060		string strDaodanVersion = "Daodan_Version";
1061		string strOniSplitVersion = "OniSplit_Version";
1062		string strGUIWinVersion = "GUI_Win_Version";
1063	<	string strGUIMacVersion = "GUI_Mac_Version";
1063	>	string strGUIMacVersion = "GUI_Mac_Version";
1064		string strReglobalize = "Reglobalize";
1065		string strDeleteList = "Delete_List";
1066		string strArrow = "->";
#	Line 1242 | Line 1272 | bool ProcessInstallerUpdate(Install_info
1272
1273		string popenCommand = "../updates/" + strEUFN + "/install/";
1274		#ifdef WIN32
1245	–	// TODO: Fill in Windows equivalent of code below :-3
1275		popenCommand = "replace_installer.bat";
1276		#else
1277		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1272 | Line 1301 | bool ProcessInstallerUpdate(Install_info
1301		#endif
1302		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1303		}
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	–
1304
1305		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1306		{
1307	+	try {
1308		fstream file;
1309		string line;
1310		vector<string> tokens, updateStarted;
#	Line 1364 | Line 1324 | bool ProcessAEUpdate(Install_info_cfg *c
1324		string strOniApp = "Oni.exe";
1325		#else
1326		string strOniApp = "Oni.app";
1367	–	#endif
1327		bool needNewTrashDir = false;
1328	+	#endif
1329	+
1330		bool readingVerAndDate = false;
1331
1371	–	// TODO: Fill in Windows equivalent of code below
1332		#ifdef WIN32
1333	<	string strTrashDir = "Trash\\";
1333	>	//remove readonly attrib from files.
1334	>	setStatusArea("Removing readonly attribute...");
1335	>	system("attrib -r ./* /s");
1336	>	system("attrib -r ../Oni.exe /s");
1337	>	system("attrib -r ../binkw32.dll /s");
1338	>
1339		#else
1340		FILE *fUserName = NULL;
1341		char chrUserName[32];
#	Line 1405 | Line 1370 | bool ProcessAEUpdate(Install_info_cfg *c
1370		if (readingVerAndDate && tokens.capacity() >= 3)
1371		tokenize(tokens[2], updateStarted, "-");
1372		}
1373	+	#ifndef WIN32
1374		if (updateStarted.capacity() < 3)
1375		needNewTrashDir = true;
1376		else
#	Line 1414 | Line 1380 | bool ProcessAEUpdate(Install_info_cfg *c
1380		if (!exists(strTrashDir))
1381		needNewTrashDir = true;
1382		}
1383	+	#endif
1384		}
1385		#ifndef WIN32
1386		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1430 | Line 1397 | bool ProcessAEUpdate(Install_info_cfg *c
1397		// Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit
1398		if (exists(strPathToEUFN + strOniApp))
1399		{
1400	<	if (exists(strOniApp))
1401	<	rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1402	<	rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1400	>	if (exists("../" + strOniApp))
1401	>	#ifdef WIN32
1402	>	remove((path)("../" + strOniApp));
1403	>	#else
1404	>	rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp));
1405	>	#endif
1406	>	rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp));
1407		}
1408		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
1409		{
1410		if (exists(strPathToEUFNInstall + strOniSplit))
1411		{
1412		if (exists(strOniSplit))
1413	+	#ifdef WIN32
1414	+	remove((path)strOniSplit);
1415	+	#else
1416		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1417	+	#endif
1418		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1419		}
1420		}
#	Line 1449 | Line 1424 | bool ProcessAEUpdate(Install_info_cfg *c
1424		if (exists(strPathToEUFN + strDaodan))
1425		{
1426		if (exists(("../" + strDaodan)))
1427	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1427	>	remove((path)("../" + strDaodan));
1428		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1429		}
1430		}
#	Line 1458 | Line 1433 | bool ProcessAEUpdate(Install_info_cfg *c
1433		if (exists(strPathToEUFNInstall + strWinGUI))
1434		{
1435		if (exists((path)strWinGUI))
1436	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1436	>	remove((path)strWinGUI);
1437		if (exists(strWinGUILang))
1438	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1438	>	remove((path)strWinGUILang);
1439		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1440		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1441		}
#	Line 1493 | Line 1468 | bool ProcessAEUpdate(Install_info_cfg *c
1468		while (curPos != string::npos && curPos < thePath.size())
1469		{
1470		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1471	+	#ifndef WIN32
1472		if (!exists(strTrashDir + aParentPath))
1473		create_directory(strTrashDir + aParentPath);
1474	+	#endif
1475		lastPos = curPos + 1;
1476		curPos = thePath.find("/", lastPos);
1477		aParentPath = aParentPath + "/";
#	Line 1507 | Line 1484 | bool ProcessAEUpdate(Install_info_cfg *c
1484		}
1485		}
1486
1487	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1487	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1488
1489	<	// 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...
1490	<	// ...and folders which do not exist in the current AE will be created there
1491	<	vector<string> foldersToMake, filesToMove;
1492	<	string thePath;
1489	>	// 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...
1490	>	// ...create_directories() function
1491	>	string strPath;
1492	>	path thePath;
1493		for (recursive_directory_iterator dir_itr(strPathToEUFNPackages + strGlobalize), end_itr; dir_itr != end_itr; ++dir_itr)
1494		{
1495	<	thePath = dir_itr->path().string();
1496	<	MakePathLocalToGlobalize(&thePath);
1495	>	strPath = dir_itr->path().string();
1496	>	MakePathLocalToGlobalize(&strPath);
1497	>	thePath = (path)strPath;
1498		if (is_regular_file(dir_itr->status()))
1499		{
1500	<	if (dir_itr->filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1501	<	filesToMove.push_back(thePath);
1502	<	}
1503	<	else if (is_directory(dir_itr->status()))
1504	<	{
1505	<	if (!exists(strPathToPackages + strGlobalize + thePath))
1506	<	foldersToMake.push_back(thePath);
1500	>	if (thePath.filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1501	>	{
1502	>	if (exists(strPathToPackages + strGlobalize + strPath))
1503	>	{
1504	>	#ifdef WIN32
1505	>	remove((path)(strPathToPackages + strGlobalize + strPath));
1506	>	#else
1507	>	create_directories((path)(strTrashDir + thePath.parent_path().string()));
1508	>	rename((path)(strPathToPackages + strGlobalize + strPath), (path)(strTrashDir + strPath));
1509	>	#endif
1510	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1511	>	}
1512	>	else
1513	>	{
1514	>	int slashLoc = 0;
1515	>	slashLoc = strPath.find("/", 0);
1516	>	if (slashLoc != string::npos) // then path contains slashes, so we need to make sure its parents' paths exist before moving it
1517	>	create_directories((path)(strPathToPackages + strGlobalize + thePath.parent_path().string()));
1518	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1519	>	}
1520	>	}
1521		}
1522		}
1531	–	// Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'...
1532	–	// ...before folder 'parent/child/'"?
1533	–	sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file
1534	–	// First make the folders that don't exist in the current AE, so all the files have a place to go
1535	–	for (vector<string>::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++)
1536	–	{
1537	–	create_directory(strPathToPackages + strGlobalize + *iter);
1538	–	}
1539	–	for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1540	–	{
1541	–	if (exists(strPathToPackages + strGlobalize + *iter))
1542	–	rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1543	–	rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1544	–	}
1523
1524		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1525	+	#ifdef WIN32
1526	+	remove_all((path)strPathToEUFN);
1527	+	#else
1528		create_directory(strTrashDir + "Unneeded update files");
1529		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1530	<
1530	>	#endif
1531		// Write to log that we are finished with update
1532		ptime end_time(second_clock::local_time());
1533		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1564 | Line 1545 | bool ProcessAEUpdate(Install_info_cfg *c
1545		CheckForGlobalization(true); // the 'true' value forces re-globalization
1546
1547		globalPackages = getPackages(); // refresh the list in memory
1548	<	// TODO: Refresh the packages list in the window
1549	<
1548	>	wxCommandEvent e;
1549	>	TheWindow->OnRefreshButtonClick( e );
1550		return true;
1551	+	}
1552	+	catch (exception & ex)
1553	+	{
1554	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1555	+	return false;
1556	+	}
1557	+	}
1558	+
1559	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1560	+	{
1561	+	ptime startTime(second_clock::local_time());
1562	+	#ifdef WIN32
1563	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1564	+	#else
1565	+	FILE *fUserName = NULL;
1566	+	char chrUserName[32];
1567	+	fUserName = popen("whoami", "r");
1568	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1569	+	pclose(fUserName);
1570	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1571	+	int endOfName = strUserName.find("\n", 0);
1572	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1573	+	bool needNewTrashDir = true;
1574	+	tm tmStartTime = to_tm(startTime);
1575	+	#endif
1576	+
1577	+	try
1578	+	{
1579	+	directory_iterator end;
1580	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1581	+	{
1582	+	ModPackage installedPackage, updatePackage;
1583	+	string updtPath = update_iter->path().string();
1584	+	string updtFolder = update_iter->path().filename();
1585	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1586	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1587	+	if (!boost::iequals(updtFolder, "Edition")
1588	+	&& !boost::iequals(updtFolder, "Edition-patch")
1589	+	&& is_directory(update_iter->path())
1590	+	&& exists(updtModInfo))
1591	+	{
1592	+	fstream file;
1593	+	file.open((updtModInfo).c_str());
1594	+	if (!file.fail())
1595	+	updatePackage = fileToModPackage(file, updtFolder);
1596	+	else
1597	+	{
1598	+	file.close();
1599	+	continue;
1600	+	}
1601	+	if (exists(instModInfo))
1602	+	{
1603	+	file.close();
1604	+	file.clear();
1605	+	file.open(instModInfo.c_str());
1606	+	if (!file.fail())
1607	+	{
1608	+	installedPackage = fileToModPackage(file, updtFolder);
1609	+	}
1610	+	file.close();
1611	+	}
1612	+	file.close();
1613	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1614	+	{
1615	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1616	+	{
1617	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1618	+	#ifdef WIN32
1619	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1620	+	#else
1621	+	if (needNewTrashDir)
1622	+	{
1623	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1624	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1625	+	create_directory(strTrashDir);
1626	+	needNewTrashDir = false;
1627	+	}
1628	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1629	+	#endif
1630	+	}
1631	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1632	+	}
1633	+	}
1634	+	}
1635	+	}
1636	+	}
1637	+	catch (exception & ex)
1638	+	{
1639	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1640	+	}
1641	+	wxCommandEvent e;
1642	+	TheWindow->OnRefreshButtonClick( e );
1643		}
1644
1645		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
#	Line 1665 | Line 1738 | void copy( const path & from_ph,
1738
1739		}
1740		else if(from_ph.filename() != ".svn")
1741	<	{
1742	<	path destination;
1743	<	if(!exists(to_ph))
1744	<	{
1745	<	destination=to_ph;
1746	<	}
1747	<	else
1748	<	{
1749	<	destination=to_ph/from_ph.filename();
1750	<	}
1741	>	{
1742	>	path destination;
1743	>	if(!exists(to_ph))
1744	>	{
1745	>	destination=to_ph;
1746	>	}
1747	>	else
1748	>	{
1749	>	destination=to_ph/from_ph.filename();
1750	>	}
1751
1752	<	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1752	>	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1753		{
1754		//the idiot who coded this in the first place (not me)
1755		//forgot to make a new directory. Exception city. x_x
1756	<	create_directory(destination);
1757	<	copy(*i,destination/i->filename());
1756	>	create_directory(destination);
1757	>	copy(*i, destination/i->filename());
1758		}
1759		}
1760		}

Diff Legend

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