ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing AE/Installer/trunk/source/subs.cpp (file contents):
Revision 294 by gumby, Mon Apr 6 03:13:01 2009 UTC vs.
Revision 298 by gumby, Tue Apr 28 14:45:43 2009 UTC

#	Line 1 | Line 1
1	+	#define DEBUG
2		/*
3		AE\Mod Installer.
4
5		Needs getPackages() now!
6		*/
7	<
7	>	//#include <dir.h>
8		#include <string>
9	<	//#include <string.h>
9	>
10	>	#include <direct.h>
11	>
12	>	#include "boost/filesystem/operations.hpp"
13	>	#include "boost/filesystem/path.hpp"
14	>	#include "boost/filesystem.hpp"   // includes all needed Boost.Filesystem declarations
15	>	#include <iostream>               // for std::cout
16	>	// for ease of tutorial presentation;
17	>	//  a namespace alias is preferred practice in real code
18	>
19		#include <cctype>
20		#include <iostream>
21		#include "methods.h"
22		#include <vector>
23		#include <fstream>
24
25	+
26	+
27		#include <errno.h>
28		#ifdef WIN32
29	<	#include "Include\dirent.h"
29	>	#include "Include\dirent.h"
30	>	#include <windows.h>
31	>	static const string Onisplit = "Onisplit.exe";
32	>	string import = "-import:nosep";
33		#else
34	+	#include <stdlib.h>
35		#include <dirent.h> //??? is this included for Macs?
36	+	string import = "-import:sep";
37	+	static const string Onisplit = "./mono Onisplit.exe";
38		#endif
21	–	#include <stdio.h>
22	–	#include <stdlib.h>
39
40
41	+
42	+	using namespace boost::filesystem;
43		using namespace std;
44	<	bool FALSE = 0;
45	<	bool TRUE = 0;
44	>	//bool FALSE = 0;
45	>	//bool TRUE = 0;
46	>
47	>	const bool SPLIT = 1;
48	>	const bool NOT_SPLIT = 0;
49
50	+	bool splitInstances = SPLIT;
51
52		int main(void)
53		{
54	<
54	>
55		//      SetConsoleTitle("AE Installer"); windows junk, convert to SDL
56		//      system("color 0A");
57
#	Line 42 | Line 64 | int main(void)
64
65		vector<ModPackage> getPackages(void) {
66		vector<ModPackage> packages;
67	<	packages.reserve(256); //thats 63 or 64 pointers to packages...i think. :P Reserving this improves performance when we add new pointers
46	<
67	>	packages.reserve(65536); //comeon, we shouldn't need this much space...right?!
68		fstream file;
69	<
69	>	#ifdef DEBUG
70		#ifdef WIN32
71	<	string path = "K:\\Oni\\edition\\install\\packages"; //only for my build. :P
71	>	string path = ".\\packages"; //only for my build. :P
72	>	_chdir(path.c_str());
73	>
74	>	_chdir("..");
75	>	cout << path;
76		#else
77		string path = "K:\\Oni\\edition\\install\\packages"; //change this, 'scen.
78		#endif
79	+	#else
80	+	string path = ".";
81	+	#endif
82
83		string filename = "\0";
84		string MODINFO_CFG = "\\Mod_Info.cfg";
#	Line 62 | Line 90 | vector<ModPackage> getPackages(void) {
90
91		pdir = opendir( path.c_str() ); //"." refers to the current dir
92		if (!pdir){
93	<	printf ("opendir() failure; terminating");
93	>	printf ("\nopendir() failure; terminating");
94		exit(1);
95		}
96		errno=0;
#	Line 102 | Line 130 | vector<ModPackage> getPackages(void) {
130
131		ModPackage fileToModPackage(fstream &file) {
132		/*
133	<	This converts a file to a ModPackage struct.
133	>	This converts a file to a ModPackage struct.
134
135	<	A few notes...
136	<	"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.
137	<	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 slower than reading a variable.
135	>	A few notes...
136	>	"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.
137	>	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 slower than reading a variable.
138		*/
139		ModPackage package;
140		string line;
141		static string NameOfMod = "NameOfMod";  //used for comparing to the current token...
142	<	static string SLASHSLASH = "//";                //I could have done it in reverse (*iter).compare("ModString") or
142	>	//I could have done it in reverse (*iter).compare("ModString") or
143		static string ARROW = "->";                             //did something like "ModString".compare(*iter), and it would have been
144		static string ModString = "ModString";  //functionably the same.
145		static string HasOnis = "HasOnis";
#	Line 143 | Line 171 | ModPackage fileToModPackage(fstream &fil
171		package.name += *iter + " ";
172		}
173		}
174	<
174	>
175		}
176		else if (!ModString.compare(*iter)) {
177		iter++; iter++;
#	Line 222 | Line 250 | int mainMenu(void) {
250		do {
251		ok = TRUE;
252		choice = cin.get();
253	<	cin.ignore(1);
253	>	cin.ignore(128, '\n');
254		switch(choice) {
255		case '1':
256		installPackages();
#	Line 246 | Line 274 | int mainMenu(void) {
274		void installPackages() {
275		ModPackage package;
276		vector<string> installed_packages;
277	<	vector<ModPackage> packages; // = getPackages()
277	>	vector<ModPackage> packages;
278		vector<ModPackage>::iterator iter;
279		iter = packages.begin();
280	<
281	<	getPackages();
280	>	vector<string> installString;
281	>	packages = getPackages();
282	>	vector<string> installedMods = getInstallString();
283
284		if (packages.empty()) {
285		cout << "Error: You have no packages!\n";
286		return;
287		}
259	–
288		cout << "Detecting installed packages...\n";
289	+
290	+	int index = 1;
291	+	char  choice = '0';
292	+	for (vector<ModPackage>::iterator package_iter = packages.begin(); package_iter != packages.end(); ++package_iter) {
293	+	if (!binary_search(installedMods.begin(), installedMods.end(), package_iter->modStringName)) { //package_iter->isInstalled :< I forgot about this...
294	+	//cout << index << " ";
295	+	system("cls");
296	+	cout << (*package_iter).name <<"\n";
297	+	for( int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << char(196); //does extended ASCII work in UNIX?
298	+	cout << "\n"
299	+	<< (*package_iter).readme << "\n"
300	+	<< "\n"
301	+	<< "Please enter a number choice\n"
302	+	<< " 1. Install\n"
303	+	<< " 2. Don't Install\n"
304	+	<< "";
305	+	index++;
306	+	choice = 0;
307	+
308	+	do {
309	+	choice = cin.get();
310	+	cin.ignore(1280, '\n');
311	+	} while(choice == 0);
312	+	if (choice == '1') {
313	+	cout << "\nInstalling...\n\n";
314	+	if ( package_iter->hasOnis || ( package_iter->hasDeltas /*(*package_iter).isUnpacked */ )) {
315	+	installedMods.push_back(package_iter->modStringName);
316	+
317	+	system("PAUSE");
318	+
319
320	<	for(int i = 0; i < packages.size();) {
321	<	package = *iter;
264	<	if(!package.isInstalled){
265	<	packages.erase(iter);
266	<	}
267	<	else {
268	<	i++;
269	<	iter++;
270	<	}
320	>	}
321	>	}
322
323	+	}
324		}
325	<
326	<	if (packages.empty()) {
275	<	cout << "Error: You have no installed packages!\n";
325	>	if (index == 1) {
326	>	cout << "Error: All packages are already installed\n";
327		return;
328		}
329	<
330	<	//listInstalledPackages(packages);
331	<
329	>	sort(installedMods.begin(), installedMods.end());
330	>
331	>	//system(Onisplit.c_str());
332	>	RecompileAll(installedMods);
333	>	system("PAUSE");
334		}
335		void uninstallPackages() {
336		;
#	Line 286 | Line 339 | void uninstallPackages() {
339		void getInstalledPackages() {
340		;
341		}
342	+
343	+	void RecompileAll(vector<string> installedMods) {
344	+	cout << "Recompiling Data...\n";
345	+	path vanilla_dir = "./packages/VanillaDats/";
346	+	string importCommand = "";
347	+	if(splitInstances == SPLIT){
348	+	recursive_directory_iterator end_iter;
349	+	try {
350	+	for ( recursive_directory_iterator dir_itr( vanilla_dir );
351	+	dir_itr != end_iter;
352	+	++dir_itr )
353	+	{
354	+	try
355	+	{
356	+	if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
357	+	{
358	+	importCommand =  Onisplit + " " + import + " " + dir_itr->path().parent_path().string() + '/' + dir_itr->path().filename();
359	+	for (int i = 0; i < installedMods.size(); ++i) {
360	+	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename()  ))
361	+	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename();
362	+
363	+	//else cout << " packages/VanillaDats/" + installedMods[i] + "/oni/";
364	+	}
365	+	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat";
366	+	system(importCommand.c_str());
367	+	//cout << importCommand << "\n";
368	+	}
369	+	}
370	+	catch ( const std::exception & ex )
371	+	{
372	+	cout << "Warning, exception " << ex.what() << "!";
373	+	}
374	+	}
375	+	}
376	+	catch( const std::exception & ex ) {
377	+	cout << "Warning, exception " << ex.what() << "!\n"
378	+	<< "You probably need to reGlobalize.;
379	+	create_directory( "./packages/VanillaDats" );
380	+	}
381	+
382	+	}
383	+	else if(splitInstances == NOT_SPLIT){
384	+	directory_iterator end_iter;
385	+	for ( directory_iterator dir_itr( vanilla_dir );
386	+	dir_itr != end_iter;
387	+	++dir_itr )
388	+	{
389	+	try
390	+	{
391	+	if ( is_directory( dir_itr->status() ) )
392	+	{
393	+	system((Onisplit + " " + import + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename() + ".dat").c_str());
394	+	}
395	+	}
396	+	catch ( const std::exception & ex )
397	+	{
398	+	cout << "Warning, something odd happened!\n";
399	+	}
400	+	}
401	+
402	+
403	+
404	+	}
405	+	}
406	+
407	+	vector<string> getInstallString() {
408	+	system("PAUSE");
409	+	vector<string> returnval;
410	+	string file_name = "../GameDataFolder/ImportList.cfg";
411	+	string line;
412	+	fstream file;
413	+	if( exists(file_name) ) {
414	+	file.open(file_name.c_str());
415	+	getline (file,line);
416	+	Tokenize(line, returnval);
417	+	file.close();
418	+	file.clear();
419	+	sort(returnval.begin(), returnval.end());
420	+
421	+	}
422	+	else cout << "fail";
423	+
424	+	return returnval;
425	+	}

Diff Legend

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