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 516 by iritscen, Wed Apr 28 10:40:52 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 708 | 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 816 | Line 812 | vector<string> getInstallString(string C
812		|                                                          Installer to be replaced (when the new Installer                     |
813		|                                                          launches, this function will be called again but will        |
814		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
815	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
816		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
817		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
818		{
#	Line 930 | Line 927 | int GetUpdateStatus(Install_info_cfg *cu
927		}
928		newUpdateLog << "Installer was updated to:\n";
929		newUpdateLog << newUpdateLine.c_str();
930	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
930	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
931		doneReadingFile = true;
932		newUpdateLog.close();
933		newUpdateLog.clear();
#	Line 969 | Line 966 | int GetUpdateStatus(Install_info_cfg *cu
966		return UPDATE_SIMP_AVAIL;
967		}
968		}
969	<	try {
973	<	directory_iterator end;
974	<	if(exists("../updates")){
975	<	for ( directory_iterator install_iter( "../updates" );
976	<	install_iter != end;
977	<	++install_iter )
969	>	try
970		{
971	<
972	<	ModPackage installedPackage, updatePackage;
973	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
974	<	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
971	>	directory_iterator end;
972	>	if (exists("../updates"))
973	>	{
974	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
975		{
976	<	file.close();
977	<	return UPDATE_THIRD_PARTY;
978	<	}
979	<	file.close();
980	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
981	<	return UPDATE_THIRD_PARTY;
976	>	ModPackage installedPackage, updatePackage;
977	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
978	>	{
979	>	fstream file;
980	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
981	>	if (!file.fail())
982	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
983	>	else
984	>	{
985	>	file.close();
986	>	continue;
987	>	}
988	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
989	>	{
990	>	file.close();
991	>	file.clear();
992	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
993	>	if (!file.fail())
994	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
995	>	file.close();
996	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
997	>	{
998	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
999	>	return UPDATE_PKG_AVAIL;
1000	>	}
1001	>	}
1002	>	else
1003	>	{
1004	>	file.close();
1005	>	return UPDATE_PKG_AVAIL;
1006	>	}
1007	>	}
1008		}
1009	–
1009		}
1011	–	}
1012	–
1013	–	}
1010		}
1011		catch (exception & ex) {
1012		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1013		}
1018	–
1014
1015		return UPDATE_NO_UPD_AVAIL;
1016		}
#	Line 1030 | Line 1025 | bool ReadInstallInfoCfg(fstream *fileHan
1025		string strDaodanVersion = "Daodan_Version";
1026		string strOniSplitVersion = "OniSplit_Version";
1027		string strGUIWinVersion = "GUI_Win_Version";
1028	<	string strGUIMacVersion = "GUI_Mac_Version";
1028	>	string strGUIMacVersion = "GUI_Mac_Version";
1029		string strReglobalize = "Reglobalize";
1030		string strDeleteList = "Delete_List";
1031		string strArrow = "->";
#	Line 1242 | Line 1237 | bool ProcessInstallerUpdate(Install_info
1237
1238		string popenCommand = "../updates/" + strEUFN + "/install/";
1239		#ifdef WIN32
1245	–	// TODO: Fill in Windows equivalent of code below :-3
1240		popenCommand = "replace_installer.bat";
1241		#else
1242		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1272 | Line 1266 | bool ProcessInstallerUpdate(Install_info
1266		#endif
1267		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1268		}
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	–
1269
1270		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1271		{
#	Line 1368 | Line 1292 | bool ProcessAEUpdate(Install_info_cfg *c
1292		bool needNewTrashDir = false;
1293		bool readingVerAndDate = false;
1294
1371	–	// TODO: Fill in Windows equivalent of code below
1295		#ifdef WIN32
1296	<	string strTrashDir = "Trash\\";
1296	>	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1297		#else
1298		FILE *fUserName = NULL;
1299		char chrUserName[32];
#	Line 1507 | Line 1430 | bool ProcessAEUpdate(Install_info_cfg *c
1430		}
1431		}
1432
1433	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1433	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1434
1435		// 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...
1436		// ...and folders which do not exist in the current AE will be created there
#	Line 1564 | Line 1487 | bool ProcessAEUpdate(Install_info_cfg *c
1487		CheckForGlobalization(true); // the 'true' value forces re-globalization
1488
1489		globalPackages = getPackages(); // refresh the list in memory
1490	<	// TODO: Refresh the packages list in the window
1491	<
1490	>	wxCommandEvent e;
1491	>	TheWindow->OnRefreshButtonClick( e );
1492		return true;
1493		}
1494
1495	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1496	+	{
1497	+	ptime startTime(second_clock::local_time());
1498	+	#ifdef WIN32
1499	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1500	+	#else
1501	+	FILE *fUserName = NULL;
1502	+	char chrUserName[32];
1503	+	fUserName = popen("whoami", "r");
1504	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1505	+	pclose(fUserName);
1506	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1507	+	int endOfName = strUserName.find("\n", 0);
1508	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1509	+	bool needNewTrashDir = true;
1510	+	tm tmStartTime = to_tm(startTime);
1511	+	#endif
1512	+
1513	+	try
1514	+	{
1515	+	directory_iterator end;
1516	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1517	+	{
1518	+	ModPackage installedPackage, updatePackage;
1519	+	string updtPath = update_iter->path().string();
1520	+	string updtFolder = update_iter->path().filename();
1521	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1522	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1523	+	if (!boost::iequals(updtFolder, "Edition")
1524	+	&& !boost::iequals(updtFolder, "Edition-patch")
1525	+	&& is_directory(update_iter->path())
1526	+	&& exists(updtModInfo))
1527	+	{
1528	+	fstream file;
1529	+	file.open((updtModInfo).c_str());
1530	+	if (!file.fail())
1531	+	updatePackage = fileToModPackage(file, updtFolder);
1532	+	else
1533	+	{
1534	+	file.close();
1535	+	continue;
1536	+	}
1537	+	if (exists(instModInfo))
1538	+	{
1539	+	file.close();
1540	+	file.clear();
1541	+	file.open(instModInfo.c_str());
1542	+	if (!file.fail())
1543	+	{
1544	+	installedPackage = fileToModPackage(file, updtFolder);
1545	+	}
1546	+	file.close();
1547	+	}
1548	+	file.close();
1549	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1550	+	{
1551	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1552	+	{
1553	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1554	+	#ifdef WIN32
1555	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1556	+	#else
1557	+	if (needNewTrashDir)
1558	+	{
1559	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1560	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1561	+	create_directory(strTrashDir);
1562	+	needNewTrashDir = false;
1563	+	}
1564	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1565	+	#endif
1566	+	}
1567	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1568	+	}
1569	+	}
1570	+	}
1571	+	}
1572	+	}
1573	+	catch (exception & ex)
1574	+	{
1575	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1576	+	}
1577	+	wxCommandEvent e;
1578	+	TheWindow->OnRefreshButtonClick( e );
1579	+	}
1580	+
1581		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
1582		|  update's Globalize folder and changes its path, originally relative to the Installer, to be          |
1583		|  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)