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 506 by iritscen, Mon Apr 5 02:11:45 2010 UTC vs.
Revision 510 by gumby, Sat Apr 24 19:19:52 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 1023 | 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 1486 | Line 1489 | bool ProcessAEUpdate(Install_info_cfg *c
1489
1490		globalPackages = getPackages(); // refresh the list in memory
1491		// TODO: Refresh the packages list in the window
1492	<
1492	>	wxCommandEvent e;
1493	>	TheWindow->OnRefreshButtonClick( e );
1494		return true;
1495		}
1496	<
1496	>	extern MainWindow* TheWindow;
1497		void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1498		{
1499		ptime startTime(second_clock::local_time());
#	Line 1540 | Line 1544 | void ProcessPackageUpdates(string pathTo
1544		if (!file.fail())
1545		{
1546		installedPackage = fileToModPackage(file, updtFolder);
1547	<	file.close();
1548	<	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1549	<	{
1550	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1551	<	{
1547	>	}
1548	>	file.close();
1549	>	}
1550	>	file.close();
1551	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1552	>	{
1553	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1554	>	{
1555	>	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1556		#ifdef WIN32
1557	<	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1557	>	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1558		#else
1559	<	if (needNewTrashDir)
1560	<	{
1561	<	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1562	<	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1563	<	create_directory(strTrashDir);
1564	<	needNewTrashDir = false;
1557	<	}
1558	<	rename((path)(strPathToPackages +  "/" + installedPackage.modStringName), (path)(strTrashDir + installedPackage.modStringName));
1559	<	#endif
1560	<	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1559	>	if (needNewTrashDir)
1560	>	{
1561	>	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1562	>	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1563	>	create_directory(strTrashDir);
1564	>	needNewTrashDir = false;
1565		}
1566	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1567	+	#endif
1568		}
1569	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1570		}
1564	–	else
1565	–	file.close();
1571		}
1567	–	file.close();
1568	–	file.clear();
1572		}
1573		}
1574		}
#	Line 1573 | Line 1576 | void ProcessPackageUpdates(string pathTo
1576		{
1577		setStatusArea("Warning, handled exception: " + (string)ex.what());
1578		}
1579	+	wxCommandEvent e;
1580	+	TheWindow->OnRefreshButtonClick( e );
1581		}
1582
1583		/* 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)