Subversion Repositories spk

Rev

Rev 160 | Rev 171 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 160 Rev 170
Line 132... Line 132...
132
	g_indent = indent;
132
	g_indent = indent;
133
 
133
 
134
	if ( !p->IsEnabled() )
134
	if ( !p->IsEnabled() )
135
		printf("[D] ");
135
		printf("[D] ");
136
 
136
 
137
	printf ( "%s %s by %s\n", p->GetLanguageName(language).c_str(), version.c_str(), p->author().c_str() );
137
	printf ( "%s %s by %s\n", p->getLanguageName(language).c_str(), version.c_str(), p->author().c_str() );
138
}
138
}
139
 
139
 
140
void DoAllChildren(CPackages *packages, CBaseFile *p, CLinkList<CBaseFile> *doneList, int indent)
140
void DoAllChildren(CPackages *packages, CBaseFile *p, CLinkList<CBaseFile> *doneList, int indent)
141
{
141
{
142
	CLinkList<CBaseFile> children;
142
	CLinkList<CBaseFile> children;
Line 268... Line 268...
268
		for ( CListNode<CBaseFile> *pNode = lPackageList.Front(); pNode; pNode = pNode->next() )
268
		for ( CListNode<CBaseFile> *pNode = lPackageList.Front(); pNode; pNode = pNode->next() )
269
		{
269
		{
270
			CBaseFile *package = pNode->Data();
270
			CBaseFile *package = pNode->Data();
271
 
271
 
272
			// compare versions
272
			// compare versions
273
			CyString packageName = package->GetFullPackageName(packages->GetLanguage());
273
			Utils::String packageName = package->getFullPackageName(packages->GetLanguage());
274
 
274
 
275
			int checkFlags = IC_ALL;
275
			int checkFlags = IC_ALL;
276
			int check = packages->PrepareInstallPackage(package, (disabled) ? true : !package->IsEnabled(), false, checkFlags);
276
			int check = packages->PrepareInstallPackage(package, (disabled) ? true : !package->IsEnabled(), false, checkFlags);
277
 
277
 
278
			switch (check)
278
			switch (check)
Line 359... Line 359...
359
	{
359
	{
360
		printf ( "\nError! Some packages are missing dependacies:\n" );
360
		printf ( "\nError! Some packages are missing dependacies:\n" );
361
		for ( CListNode<CBaseFile> *pNode = lCheckPackages.Front(); pNode; pNode = pNode->next() )
361
		for ( CListNode<CBaseFile> *pNode = lCheckPackages.Front(); pNode; pNode = pNode->next() )
362
		{
362
		{
363
			CSpkFile *spk = (CSpkFile *)pNode->Data();
363
			CSpkFile *spk = (CSpkFile *)pNode->Data();
364
			printf ( "\t%s V%s by %s (Requires: %s by %s)\n", spk->GetLanguageName(packages->GetLanguage()).c_str(), spk->version().c_str(), spk->author().c_str(), spk->GetOtherName().c_str(), spk->GetOtherAuthor().c_str());
364
			printf ( "\t%s V%s by %s (Requires: %s by %s)\n", spk->getLanguageName(packages->GetLanguage()).c_str(), spk->version().c_str(), spk->author().c_str(), spk->GetOtherName().c_str(), spk->GetOtherAuthor().c_str());
365
		}
365
		}
366
	}
366
	}
367
 
367
 
368
	// no packages will be installed
368
	// no packages will be installed
369
	if ( packages->GetNumPackagesInQueue() < 1 )
369
	if ( packages->GetNumPackagesInQueue() < 1 )
Line 392... Line 392...
392
	for ( CListNode<CBaseFile> *pNode = lPackages.Front(); pNode; pNode = pNode->next() )
392
	for ( CListNode<CBaseFile> *pNode = lPackages.Front(); pNode; pNode = pNode->next() )
393
	{
393
	{
394
		CBaseFile *package = pNode->Data();
394
		CBaseFile *package = pNode->Data();
395
 
395
 
396
		retStr += "  <> ";
396
		retStr += "  <> ";
397
		retStr += package->GetFullPackageName(packages->GetLanguage());
397
		retStr += package->getFullPackageName(packages->GetLanguage());
398
		retStr += "\n";
398
		retStr += "\n";
399
 
399
 
400
		if ( !packages->GetInstallAfterText(package).Empty() )
400
		if ( !packages->GetInstallAfterText(package).Empty() )
401
		{
401
		{
402
			CyString afterText = packages->GetInstallAfterText(package).StripHTML();
402
			CyString afterText = packages->GetInstallAfterText(package).StripHTML();
Line 446... Line 446...
446
		}
446
		}
447
	}
447
	}
448
 
448
 
449
	CProgressConsole progress;
449
	CProgressConsole progress;
450
 
450
 
451
	(*endMessage) = CyString("Uninstalled: ") + p->GetFullPackageName(packages->GetLanguage());
451
	(*endMessage) = CyString("Uninstalled: ") + p->getFullPackageName(packages->GetLanguage());
452
	// add the uninstall after text
452
	// add the uninstall after text
453
	uText = packages->GetUninstallAfterText(p).StripHTML();
453
	uText = packages->GetUninstallAfterText(p).StripHTML();
454
	if ( !uText.Empty() )
454
	if ( !uText.Empty() )
455
	{
455
	{
456
		(*endMessage) += "\n\n";
456
		(*endMessage) += "\n\n";
Line 481... Line 481...
481
	if ( !p )
481
	if ( !p )
482
		return false;
482
		return false;
483
 
483
 
484
	CProgressConsole progress;
484
	CProgressConsole progress;
485
 
485
 
486
	(*endMessage) = CyString("Enabled: ") + p->GetFullPackageName(packages->GetLanguage());
486
	(*endMessage) = CyString("Enabled: ") + p->getFullPackageName(packages->GetLanguage());
487
 
487
 
488
	printf ( "  - Enabling                       " );
488
	printf ( "  - Enabling                       " );
489
	if ( packages->EnablePackage(p, errors, &progress) )
489
	if ( packages->EnablePackage(p, errors, &progress) )
490
	{
490
	{
491
		progress.Finish();
491
		progress.Finish();
Line 509... Line 509...
509
	if ( !p )
509
	if ( !p )
510
		return false;
510
		return false;
511
 
511
 
512
	CProgressConsole progress;
512
	CProgressConsole progress;
513
 
513
 
514
	(*endMessage) = CyString("Disabled: ") + p->GetFullPackageName(packages->GetLanguage());
514
	(*endMessage) = CyString("Disabled: ") + p->getFullPackageName(packages->GetLanguage());
515
 
515
 
516
	printf ( "  - Disabling                      " );
516
	printf ( "  - Disabling                      " );
517
	if ( packages->DisablePackage(p, errors, &progress) )
517
	if ( packages->DisablePackage(p, errors, &progress) )
518
	{
518
	{
519
		progress.Finish();
519
		progress.Finish();