ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 504 by gumby, Sat Mar 27 03:48:25 2010 UTC vs.
Revision 542 by iritscen, Mon May 24 02:43:35 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 349 | Line 352 | vector<ModPackage> getPackages(string pa
352
353		if (!file.fail())
354		{
355	<	package = fileToModPackage(file);
355	>	package = fileToModPackage(file, dir_itr->path().filename());
356		if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
357		{
358		#ifdef WIN32
#	Line 373 | Line 376 | vector<ModPackage> getPackages(string pa
376		return packages;
377		}
378
379	<	ModPackage fileToModPackage(fstream &file)
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	<	*/
379	>	ModPackage fileToModPackage(fstream &file, string modName)
380	>	{
381		ModPackage package;
382		string line;
383	<	static string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
384	<	static string NameOfMod = "NameOfMod";
385	<	static string ARROW = "->";
386	<	static string ModString = "ModString";
387	<	static string Platform = "Platform";
388	<	static string HasOnis = "HasOnis";
389	<	static string HasDeltas = "HasDeltas";
390	<	static string HasBSL = "HasBSL";
391	<	static string HasDats = "HasDats";
392	<	static string IsEngine = "IsEngine";
393	<	static string Readme = "Readme";
394	<	static string GlobalNeeded = "GlobalNeeded";
395	<	static string Category = "Category";
396	<	static string Creator = "Creator";
383	>	const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
384	>	const string NameOfMod = "NameOfMod";
385	>	const string ARROW = "->";
386	>	const string ModString = "ModString";
387	>	const string ModVersion = "ModVersion";
388	>	const string Platform = "Platform";
389	>	const string HasOnis = "HasOnis";
390	>	const string HasDeltas = "HasDeltas";
391	>	const string HasBSL = "HasBSL";
392	>	const string HasDats = "HasDats";
393	>	const string IsEngine = "IsEngine";
394	>	const string Readme = "Readme";
395	>	const string GlobalNeeded = "GlobalNeeded";
396	>	const string Category = "Category";
397	>	const string Creator = "Creator";
398	>	package.modStringName = modName;
399		while (!file.eof())
400		{
401		getline(file,line);
#	Line 425 | Line 422 | ModPackage fileToModPackage(fstream &fil
422		else if (!ModString.compare(*iter))
423		{
424		iter++; iter++;
425	<	package.modStringName = *iter;
425	>	//package.modStringName = *iter;
426		iter++;
427		package.modStringVersion = atof((*iter).c_str());
428		}
429	+	else if (!ModString.compare(*iter))
430	+	{
431	+	iter++; iter++;
432	+	package.modStringVersion = atof((*iter).c_str());
433	+	}
434		else if (!Platform.compare(*iter))
435		{
436		iter++; iter++;
#	Line 442 | Line 444 | ModPackage fileToModPackage(fstream &fil
444		else if (!HasBSL.compare(*iter))
445		{
446		iter++; iter++;
447	<	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasBSL = true;
447	>	if (boost::iequals(*iter, "Yes")) package.hasBSL = true;
448		else if (boost::iequals(*iter, "Addon")) package.hasAddon = true;
449		}
450		else if (!HasDeltas.compare(*iter))
#	Line 567 | 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 623 | 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 700 | Line 704 | void recompileAll(vector<string> install
704
705		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
706		{
707	<	ofstream BSLlog("BSL2.log", ios::app );
707	>	ofstream BSLlog("BSL.log", ios::app );
708
709		try {
710		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 731 | Line 735 | void copyBSL(string copypath, vector<str
735		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
736		}
737		}
738	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
739	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
738	>	if( !pkg.hasAddon ) {
739	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
740	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
741	>	}
742		}
743		}
744		}
#	Line 808 | Line 814 | vector<string> getInstallString(string C
814		|                                                          Installer to be replaced (when the new Installer                     |
815		|                                                          launches, this function will be called again but will        |
816		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
817	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
818		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
819		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
820		{
#	Line 837 | Line 844 | int GetUpdateStatus(Install_info_cfg *cu
844		return UPDATE_LOG_READ_ERR;
845		}
846
847	<	// Is there an update folder, and is it a monthly release or a patch?
847	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
848		bool firstParty = 0;
849	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
850	+	if (!exists("../updates"))
851	+	create_directory("../updates");
852		if (exists("../updates/Edition"))
853		{
854		firstParty = 1;
#	Line 922 | Line 932 | int GetUpdateStatus(Install_info_cfg *cu
932		}
933		newUpdateLog << "Installer was updated to:\n";
934		newUpdateLog << newUpdateLine.c_str();
935	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
935	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
936		doneReadingFile = true;
937		newUpdateLog.close();
938		newUpdateLog.clear();
#	Line 961 | Line 971 | int GetUpdateStatus(Install_info_cfg *cu
971		return UPDATE_SIMP_AVAIL;
972		}
973		}
974	<	try {
965	<	directory_iterator end;
966	<	if(exists("../updates")){
967	<	for ( directory_iterator install_iter( "../updates" );
968	<	install_iter != end;
969	<	++install_iter )
974	>	try
975		{
976	<
977	<	ModPackage installedPackage, updatePackage;
978	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
979	<	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
976	>	directory_iterator end;
977	>	if (exists("../updates"))
978	>	{
979	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
980		{
981	<	file.close();
982	<	return UPDATE_THIRD_PARTY;
983	<	}
984	<	file.close();
985	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
986	<	return UPDATE_THIRD_PARTY;
981	>	ModPackage installedPackage, updatePackage;
982	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
983	>	{
984	>	fstream file;
985	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
986	>	if (!file.fail())
987	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
988	>	else
989	>	{
990	>	file.close();
991	>	continue;
992	>	}
993	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
994	>	{
995	>	file.close();
996	>	file.clear();
997	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
998	>	if (!file.fail())
999	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1000	>	file.close();
1001	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1002	>	{
1003	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1004	>	return UPDATE_PKG_AVAIL;
1005	>	}
1006	>	}
1007	>	else
1008	>	{
1009	>	file.close();
1010	>	return UPDATE_PKG_AVAIL;
1011	>	}
1012	>	}
1013		}
1001	–
1002	–	}
1014		}
1004	–
1005	–	}
1015		}
1016		catch (exception & ex) {
1017		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1018		}
1010	–
1019
1020		return UPDATE_NO_UPD_AVAIL;
1021		}
#	Line 1022 | Line 1030 | bool ReadInstallInfoCfg(fstream *fileHan
1030		string strDaodanVersion = "Daodan_Version";
1031		string strOniSplitVersion = "OniSplit_Version";
1032		string strGUIWinVersion = "GUI_Win_Version";
1033	<	string strGUIMacVersion = "GUI_Mac_Version";
1033	>	string strGUIMacVersion = "GUI_Mac_Version";
1034		string strReglobalize = "Reglobalize";
1035		string strDeleteList = "Delete_List";
1036		string strArrow = "->";
#	Line 1234 | Line 1242 | bool ProcessInstallerUpdate(Install_info
1242
1243		string popenCommand = "../updates/" + strEUFN + "/install/";
1244		#ifdef WIN32
1237	–	// TODO: Fill in Windows equivalent of code below :-3
1245		popenCommand = "replace_installer.bat";
1246		#else
1247		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1264 | Line 1271 | bool ProcessInstallerUpdate(Install_info
1271		#endif
1272		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1273		}
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	–
1274
1275		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1276		{
#	Line 1360 | Line 1297 | bool ProcessAEUpdate(Install_info_cfg *c
1297		bool needNewTrashDir = false;
1298		bool readingVerAndDate = false;
1299
1363	–	// TODO: Fill in Windows equivalent of code below
1300		#ifdef WIN32
1301	<	string strTrashDir = "Trash\\";
1301	>	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1302		#else
1303		FILE *fUserName = NULL;
1304		char chrUserName[32];
#	Line 1499 | Line 1435 | bool ProcessAEUpdate(Install_info_cfg *c
1435		}
1436		}
1437
1438	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1438	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1439
1440		// 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...
1441		// ...and folders which do not exist in the current AE will be created there
#	Line 1556 | Line 1492 | bool ProcessAEUpdate(Install_info_cfg *c
1492		CheckForGlobalization(true); // the 'true' value forces re-globalization
1493
1494		globalPackages = getPackages(); // refresh the list in memory
1495	<	// TODO: Refresh the packages list in the window
1496	<
1495	>	wxCommandEvent e;
1496	>	TheWindow->OnRefreshButtonClick( e );
1497		return true;
1498		}
1499
1500	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1501	+	{
1502	+	ptime startTime(second_clock::local_time());
1503	+	#ifdef WIN32
1504	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1505	+	#else
1506	+	FILE *fUserName = NULL;
1507	+	char chrUserName[32];
1508	+	fUserName = popen("whoami", "r");
1509	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1510	+	pclose(fUserName);
1511	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1512	+	int endOfName = strUserName.find("\n", 0);
1513	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1514	+	bool needNewTrashDir = true;
1515	+	tm tmStartTime = to_tm(startTime);
1516	+	#endif
1517	+
1518	+	try
1519	+	{
1520	+	directory_iterator end;
1521	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1522	+	{
1523	+	ModPackage installedPackage, updatePackage;
1524	+	string updtPath = update_iter->path().string();
1525	+	string updtFolder = update_iter->path().filename();
1526	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1527	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1528	+	if (!boost::iequals(updtFolder, "Edition")
1529	+	&& !boost::iequals(updtFolder, "Edition-patch")
1530	+	&& is_directory(update_iter->path())
1531	+	&& exists(updtModInfo))
1532	+	{
1533	+	fstream file;
1534	+	file.open((updtModInfo).c_str());
1535	+	if (!file.fail())
1536	+	updatePackage = fileToModPackage(file, updtFolder);
1537	+	else
1538	+	{
1539	+	file.close();
1540	+	continue;
1541	+	}
1542	+	if (exists(instModInfo))
1543	+	{
1544	+	file.close();
1545	+	file.clear();
1546	+	file.open(instModInfo.c_str());
1547	+	if (!file.fail())
1548	+	{
1549	+	installedPackage = fileToModPackage(file, updtFolder);
1550	+	}
1551	+	file.close();
1552	+	}
1553	+	file.close();
1554	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1555	+	{
1556	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1557	+	{
1558	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1559	+	#ifdef WIN32
1560	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1561	+	#else
1562	+	if (needNewTrashDir)
1563	+	{
1564	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1565	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1566	+	create_directory(strTrashDir);
1567	+	needNewTrashDir = false;
1568	+	}
1569	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1570	+	#endif
1571	+	}
1572	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1573	+	}
1574	+	}
1575	+	}
1576	+	}
1577	+	}
1578	+	catch (exception & ex)
1579	+	{
1580	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1581	+	}
1582	+	wxCommandEvent e;
1583	+	TheWindow->OnRefreshButtonClick( e );
1584	+	}
1585	+
1586		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
1587		|  update's Globalize folder and changes its path, originally relative to the Installer, to be          |
1588		|  relative to the structure of the Globalize folder; this makes it easier to have the Installer        |

Diff Legend

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