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 507 by gumby, Sat Apr 24 17:41:46 2010 UTC vs.
Revision 509 by gumby, Sat Apr 24 19:19:14 2010 UTC

#	Line 975 | Line 975 | int GetUpdateStatus(Install_info_cfg *cu
975		ModPackage installedPackage, updatePackage;
976		if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
977		{
978	+	string blah =install_iter->path().string() + "/Mod_Info.cfg";
979	+	string blah2 = "packages/" + install_iter->path().filename() + "/Mod_Info.cfg";
980		fstream file;
981		file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
982		if (!file.fail())
983	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
983	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
984		else
985		{
986		file.close();
987		continue;
988		}
989	<	if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"))
989	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
990		{
991		file.close();
992	<	file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
992	>	file.clear();
993	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
994		if (!file.fail())
995	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
995	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
996		file.close();
997		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
998		{
#	Line 1004 | Line 1007 | int GetUpdateStatus(Install_info_cfg *cu
1007		}
1008		}
1009		}
1007	–	else
1008	–	{
1009	–	file.close();
1010	–	continue;
1011	–	}
1012	–	file.close();
1013	–
1014	–	file.open( ("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1015	–	if (!file.fail())
1016	–	{
1017	–	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
1018	–	}
1019	–	else
1020	–	{
1021	–	file.close();
1022	–	return UPDATE_THIRD_PARTY;
1023	–	}
1024	–	file.close();
1025	–	if(((string)INSTALLER_VERSION).compare(updatePackage.installerVersion) < 1 && updatePackage.modStringVersion > installedPackage.modStringVersion) {
1026	–	return UPDATE_THIRD_PARTY;
1027	–	}
1010		}
1011		}
1012		catch (exception & ex) {
#	Line 1044 | Line 1026 | bool ReadInstallInfoCfg(fstream *fileHan
1026		string strDaodanVersion = "Daodan_Version";
1027		string strOniSplitVersion = "OniSplit_Version";
1028		string strGUIWinVersion = "GUI_Win_Version";
1029	<	string strGUIMacVersion = "GUI_Mac_Version";
1029	>	string strGUIMacVersion = "GUI_Mac_Version";
1030		string strReglobalize = "Reglobalize";
1031		string strDeleteList = "Delete_List";
1032		string strArrow = "->";
#	Line 1286 | Line 1268 | bool ProcessInstallerUpdate(Install_info
1268		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1269		}
1270
1289	–
1290	–	void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1291	–	try{
1292	–	directory_iterator end;
1293	–	for ( directory_iterator update_iter( pathToUpdate );
1294	–	update_iter != end;
1295	–	++update_iter )
1296	–	{
1297	–
1298	–	ModPackage installedPackage, updatePackage;
1299	–	string updateStr = update_iter->path().string() + "/Mod_Info.cfg";
1300	–	if ( !boost::iequals(update_iter->path().filename(),"Edition")
1301	–	&& !boost::iequals(update_iter->path().filename(),"Edition-patch")
1302	–	&& is_directory( update_iter->path() )
1303	–	&& exists( update_iter->path().string() + "/Mod_Info.cfg" ) )
1304	–	{
1305	–	bool update = 0;
1306	–	fstream file;
1307	–	file.open( (update_iter->path().string() + "/Mod_Info.cfg").c_str());
1308	–	if (!file.fail())
1309	–	{
1310	–	updatePackage = fileToModPackage(file, update_iter->path().filename());
1311	–	}
1312	–	else
1313	–	{
1314	–	file.close();
1315	–	continue;
1316	–	}
1317	–	file.close();
1318	–	file.clear();
1319	–	if(exists(strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg"))
1320	–	{
1321	–	file.open((strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg").c_str());
1322	–	if (!file.fail())
1323	–	{
1324	–	installedPackage = fileToModPackage(file, update_iter->path().filename());
1325	–	file.close();
1326	–	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1327	–	update = 1;
1328	–	}
1329	–	}
1330	–	else
1331	–	{
1332	–	file.close();
1333	–	update = 1;
1334	–	}
1335	–	file.close();
1336	–	}
1337	–	else update = 1;
1338	–	if(update) {
1339	–	if(exists((path)(strPathToPackages +  "/" + updatePackage.modStringName)))
1340	–	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1341	–	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1342	–
1343	–	}
1344	–	}
1345	–	}
1346	–	}
1347	–	catch (exception & ex) {
1348	–	//      ex.what();
1349	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
1350	–	}
1351	–	}
1352	–
1353	–
1354	–	bool ProcessThirdPartyUpdates() {
1355	–	CrawlPackages( "../updates",  "./packages");
1356	–	return true;
1357	–	//      globalPackages = getPackages();
1358	–	//      refreshMods(globalInstalledMods);
1359	–	}
1360	–
1361	–
1271		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1272		{
1273		fstream file;
#	Line 1583 | Line 1492 | bool ProcessAEUpdate(Install_info_cfg *c
1492
1493		return true;
1494		}
1495	<
1495	>	extern MainWindow* TheWindow;
1496		void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1497		{
1498		ptime startTime(second_clock::local_time());
#	Line 1634 | Line 1543 | void ProcessPackageUpdates(string pathTo
1543		if (!file.fail())
1544		{
1545		installedPackage = fileToModPackage(file, updtFolder);
1546	<	file.close();
1547	<	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1548	<	{
1549	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1550	<	{
1546	>	}
1547	>	file.close();
1548	>	}
1549	>	file.close();
1550	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1551	>	{
1552	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1553	>	{
1554	>	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1555		#ifdef WIN32
1556	<	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1556	>	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1557		#else
1558	<	if (needNewTrashDir)
1559	<	{
1560	<	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1561	<	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1562	<	create_directory(strTrashDir);
1563	<	needNewTrashDir = false;
1651	<	}
1652	<	rename((path)(strPathToPackages +  "/" + installedPackage.modStringName), (path)(strTrashDir + installedPackage.modStringName));
1653	<	#endif
1654	<	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1558	>	if (needNewTrashDir)
1559	>	{
1560	>	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1561	>	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1562	>	create_directory(strTrashDir);
1563	>	needNewTrashDir = false;
1564		}
1565	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1566	+	#endif
1567		}
1568	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1569		}
1658	–	else
1659	–	file.close();
1570		}
1661	–	file.close();
1662	–	file.clear();
1571		}
1572		}
1573		}
#	Line 1667 | Line 1575 | void ProcessPackageUpdates(string pathTo
1575		{
1576		setStatusArea("Warning, handled exception: " + (string)ex.what());
1577		}
1578	+	wxCommandEvent e;
1579	+	TheWindow->OnRefreshButtonClick( e );
1580		}
1581
1582		/* 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)