FCL/sf/app/podcatcher: comparison engine/src/FeedEngine.cpp

equal deleted inserted replaced

-:9569ea080d5a
+:4d230e702aa3
 #include "ShowEngine.h"
 #include <e32hashtab.h>
 #include "OpmlParser.h"
 #include "PodcastUtils.h"
 #include <utf.h>
+#include "Podcatcher.pan"
-// Cleanup stack macro for SQLite3
-// TODO Move this to some common place.
+_LIT(KFeedParseStorePath, "feeds\\");
-static void Cleanup_sqlite3_finalize_wrapper(TAny* handle)
-	{
-	sqlite3_finalize(static_cast<sqlite3_stmt*>(handle));
-	}
-#define Cleanup_sqlite3_finalize_PushL(__handle) CleanupStack::PushL(TCleanupItem(&Cleanup_sqlite3_finalize_wrapper, __handle))
 CFeedEngine* CFeedEngine::NewL(CPodcastModel& aPodcastModel)
 	{
 	CFeedEngine* self = new (ELeave) CFeedEngine(aPodcastModel);
 	CleanupStack::PushL(self);
 	iParser = new (ELeave) CFeedParser(*this, iPodcastModel.FsSession());
 	iFeedClient = CHttpClient::NewL(iPodcastModel, *this);
 	iFeedTimer.ConstructL();
-	RunFeedTimer();
+	TInt err = KErrNone;
+	TInt feedCount = 0;
-if (DBGetFeedCount() > 0)
+	TRAP(err, feedCount = DBGetFeedCountL());
+if (err == KErrNone && feedCount > 0)
 	{
 		DP("Loading feeds from DB");
-		DBLoadFeedsL();
+		TRAP(err, DBLoadFeedsL());
-		}
+	}
-	if (iPodcastModel.IsFirstStartup()) {
+	if (err != KErrNone || iPodcastModel.IsFirstStartup()) {
 		TFileName defaultFile = iPodcastModel.SettingsEngine().DefaultFeedsFileName();
 		DP1("Loading default feeds from %S", &defaultFile);
 		if (BaflUtils::FileExists(iPodcastModel.FsSession(), defaultFile)) {
 			ImportFeedsL(defaultFile);
 		}
 	}
+	// clean out feeds temp directory
+	TFileName feedTempPath;
+	feedTempPath.Copy (iPodcastModel.SettingsEngine().PrivatePath ());
+	feedTempPath.Append(KFeedParseStorePath);
+	feedTempPath.Append(_L("*"));
+	BaflUtils::EnsurePathExistsL(iPodcastModel.FsSession(), feedTempPath);
+	BaflUtils::DeleteFile(iPodcastModel.FsSession(),feedTempPath);
 TFileName importFile = iPodcastModel.SettingsEngine().ImportFeedsFileName();
 if (BaflUtils::FileExists(iPodcastModel.FsSession(), importFile)) {
 	DP("Importing feeds");
-	ImportFeedsL(importFile);
+	TRAP_IGNORE(ImportFeedsL(importFile));
 		}
+	RunFeedTimer();
 	}
 CFeedEngine::CFeedEngine(CPodcastModel& aPodcastModel)
 		: iClientState(EIdle),
 		  iFeedTimer(this),
 		}
 	TInt cnt = iSortedFeeds.Count();
 	for (int i=0;i<cnt;i++)
 		{
-		iFeedsUpdating.Append(iSortedFeeds[i]);
+		iFeedsUpdating.Append(iSortedFeeds[i]->Uid());
 		}
 	UpdateNextFeedL();
 	}
 void CFeedEngine::UpdateNextFeedL()
 	{
 	DP1("UpdateNextFeed. %d feeds left to update", iFeedsUpdating.Count());
+	// reset active feed, will be set again in UpdateFeedL if needed
+	iActiveFeed = NULL;
 	if (iFeedsUpdating.Count() > 0)
 		{
-		CFeedInfo *info = iFeedsUpdating[0];
+		CFeedInfo *info = GetFeedInfoByUid(iFeedsUpdating[0]);
 		iFeedsUpdating.Remove(0);
-		TBool result = EFalse;
-		//DP2("** UpdateNextFeed: %S, ID: %u", &(info->Url()), info->Uid());
+		if (info == NULL)
-		TRAPD(error, result = UpdateFeedL(info->Uid()));
+			{
+			UpdateNextFeedL();
-		if (error != KErrNone || !result)
+			}
-			{
+		else
-			DP("Error while updating all feeds");
+			{
-			for (TInt i=0;i<iObservers.Count();i++)
+			TBool result = EFalse;
+			//DP2("** UpdateNextFeed: %S, ID: %u", &(info->Url()), info->Uid());
+			TRAPD(error, result = UpdateFeedL(info->Uid()));
+			if (error != KErrNone || !result)
 				{
-				TRAP_IGNORE(iObservers[i]->FeedUpdateAllCompleteL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate));
+				DP("Error while updating all feeds");
+				for (TInt i=0;i<iObservers.Count();i++)
+					{
+					TRAP_IGNORE(iObservers[i]->FeedUpdateAllCompleteL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate));
+					}
 				}
 			}
 		}
 	else
 		{
 	}
 EXPORT_C TBool CFeedEngine::UpdateFeedL(TUint aFeedUid)
 	{
 	DP("FeedEngine::UpdateFeedL BEGIN");
+	if (iActiveFeed)
+		{
+		User::Leave(KErrInUse);
+		}
 	iActiveFeed = GetFeedInfoByUid(aFeedUid);
-	iCatchupCounter = 0;
 	iCancelRequested = EFalse;
 	if (iActiveFeed->LastUpdated() == 0)
 		{
 		iCatchupMode = ETrue;
+		iCatchupCounter = 0;
 		}
 	iActiveFeed->SetLastError(KErrNone);
-	DBUpdateFeed(*iActiveFeed);
+	DBUpdateFeedL(*iActiveFeed);
 	iUpdatingFeedFileName.Copy (iPodcastModel.SettingsEngine().PrivatePath ());
+	iUpdatingFeedFileName.Append(KFeedParseStorePath);
+	BaflUtils::EnsurePathExistsL(iPodcastModel.FsSession(), iUpdatingFeedFileName);
 	_LIT(KFileNameFormat, "%lu.xml");
 	iUpdatingFeedFileName.AppendFormat(KFileNameFormat, aFeedUid);
+	iClientState = EUpdatingFeed;
+	for (TInt i=0;i<iObservers.Count();i++)
+		{
+		TRAP_IGNORE(iObservers[i]->FeedDownloadStartedL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate, iActiveFeed->Uid()));
+		}
 	if(iFeedClient->GetL(iActiveFeed->Url(), iUpdatingFeedFileName, iPodcastModel.SettingsEngine().SpecificIAP()))
 		{
-		iClientState = EUpdatingFeed;
-		for (TInt i=0;i<iObservers.Count();i++)
-			{
-			TRAP_IGNORE(iObservers[i]->FeedDownloadStartedL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate, iActiveFeed->Uid()));
-			}
 		DP("FeedEngine::UpdateFeedL END, return ETrue");
 		return ETrue;
 		}
 	else
 		{
 		if (++iCatchupCounter > 1) {
 			aItem.SetPlayState(EPlayed);
 		}
 	}
-	TBool isShowAdded = iPodcastModel.ShowEngine().AddShowL(aItem);
+	TRAPD(err, iPodcastModel.ShowEngine().AddShowL(aItem));
-	if (aItem.PlayState() == ENeverPlayed && isShowAdded && iPodcastModel.SettingsEngine().DownloadAutomatically())
+	if (err == KErrNone && aItem.PlayState() == ENeverPlayed &&
+			iPodcastModel.SettingsEngine().DownloadAutomatically())
 		{
 		iPodcastModel.ShowEngine().AddDownloadL(aItem);
 		}
 	}
 	relPath.Append(fileName);
 	PodcastUtils::EnsureProperPathName(relPath);
 	// complete file path is base dir + rel path
 	filePath.Append(relPath);
-	aFeedInfo->SetImageFileNameL(filePath);
+	aFeedInfo->SetImageFileNameL(filePath, NULL);
 	if(iFeedClient->GetL(aFeedInfo->ImageUrl(), filePath, ETrue))
 		{
 			iClientState = EUpdatingImage;
 		}
 	// Save the feeds into DB
 	DBAddFeedL(aItem);
 	return ETrue;
 	}
-TBool CFeedEngine::DBAddFeedL(const CFeedInfo& aItem)
+void CFeedEngine::DBAddFeedL(const CFeedInfo& aItem)
 	{
 	DP2("CFeedEngine::DBAddFeed, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
-	CFeedInfo *info = DBGetFeedInfoByUidL(aItem.Uid());
+	CFeedInfo *info;
-	if (info) {
-		DP("Feed already exists!");
+	TRAPD(err, info = DBGetFeedInfoByUidL(aItem.Uid()));
+	if (err == KErrNone && info) {
 		delete info;
-		return EFalse;
+		User::Leave(KErrAlreadyExists);
 	}
 	HBufC* titleBuf = HBufC::NewLC(KMaxLineLength);
 	TPtr titlePtr(titleBuf->Des());
 	titlePtr.Copy(aItem.Title());
 	CleanupStack::PopAndDestroy(descBuf);
 	CleanupStack::PopAndDestroy(titleBuf);
 	sqlite3_stmt *st;
-	//DP1("SQL statement length=%d", iSqlBuffer.Length());
 	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st, (const void**) NULL);
 	if (rc==SQLITE_OK)
 		{
+		Cleanup_sqlite3_finalize_PushL(st);
 		rc = sqlite3_step(st);
-		if (rc == SQLITE_DONE)
+		if (rc != SQLITE_DONE)
 			{
-			sqlite3_finalize(st);
+			User::Leave(KErrCorrupt);
-			return ETrue;
+			}
-			}
+		CleanupStack::PopAndDestroy(); // st
-		else {
+		}
-			sqlite3_finalize(st);
+	else
-		}
+		{
-	}
+		User::Leave(KErrCorrupt);
+		}
-	return EFalse;
 	}
 EXPORT_C void CFeedEngine::RemoveFeedL(TUint aUid)
 	{
+	if (iActiveFeed && iActiveFeed->Uid() == aUid)
+		{
+		User::Leave(KErrInUse);
+		}
 	for (int i=0;i<iSortedFeeds.Count();i++)
 		{
 		if (iSortedFeeds[i]->Uid() == aUid)
 			{
 			iPodcastModel.ShowEngine().DeleteAllShowsByFeedL(aUid);
 			CFeedInfo* feedToRemove = iSortedFeeds[i];
 			//delete the image file if it exists
 			if ((feedToRemove->ImageFileName().Length() >0)
 					&& BaflUtils::FileExists(iPodcastModel.FsSession(), feedToRemove->ImageFileName()))
 			delete feedToRemove;
 			DP("Removed feed from array");
 			// now remove it from DB
-			DBRemoveFeed(aUid);
+			DBRemoveFeedL(aUid);
-			return;
 		}
 	}
 }
-TBool CFeedEngine::DBRemoveFeed(TUint aUid)
+void CFeedEngine::DBRemoveFeedL(TUint aUid)
 	{
 	DP("CFeedEngine::DBRemoveFeed");
 	_LIT(KSqlStatement, "delete from feeds where uid=%u");
 	iSqlBuffer.Format(KSqlStatement, aUid);
 	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
 	if (rc==SQLITE_OK)
 		{
+		Cleanup_sqlite3_finalize_PushL(st);
 		rc = sqlite3_step(st);
-		sqlite3_finalize(st);
+		if (rc != SQLITE_DONE)
-		if (rc == SQLITE_DONE)
+			{
-			{
+			User::Leave(KErrNotFound);
-			DP("Feed removed from DB");
+			}
-			return ETrue;
-			}
+		CleanupStack::PopAndDestroy(); //st
-		else
+		}
-			{
+	else
-			DP("Error when removing feed from DB");
+		{
-			}
+		User::Leave(KErrCorrupt);
 		}
-	return EFalse;
+	}
-	}
+void CFeedEngine::DBUpdateFeedL(const CFeedInfo &aItem)
-TBool CFeedEngine::DBUpdateFeed(const CFeedInfo &aItem)
 	{
 	DP2("CFeedEngine::DBUpdateFeed, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
 	HBufC* titleBuf = HBufC::NewLC(KMaxLineLength);
 	TPtr titlePtr(titleBuf->Des());
 	CleanupStack::PopAndDestroy(descBuf);
 	CleanupStack::PopAndDestroy(titleBuf);
 	sqlite3_stmt *st;
-	//DP1("SQL statement length=%d", iSqlBuffer.Length());
 	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st, (const void**) NULL);
 	if (rc==SQLITE_OK)
 		{
+		Cleanup_sqlite3_finalize_PushL(st);
 		rc = sqlite3_step(st);
-		sqlite3_finalize(st);
+		if (rc != SQLITE_DONE)
-		if (rc == SQLITE_DONE)
+			{
-			{
+			User::Leave(KErrNotFound);
-			return ETrue;
+			}
-			}
+		CleanupStack::PopAndDestroy(); //st
 		}
 	else
 		{
-		DP1("SQLite rc=%d", rc);
+		User::Leave(KErrCorrupt);
 		}
-	return EFalse;
 	}
 void CFeedEngine::ParsingCompleteL(CFeedInfo *item)
 	{
 	TBuf<KMaxLineLength> title;
 	{
 	DP2("CFeedEngine::CompleteL BEGIN, iClientState=%d, aSuccessful=%d", iClientState, aError);
 	switch(iClientState)
 		{
-		default:
-			if(iActiveFeed != NULL)
-				{
-				TTime time;
-				time.HomeTime();
-				iActiveFeed->SetLastUpdated(time);
-				iActiveFeed->SetLastError(aError);
-				NotifyFeedUpdateComplete(aError);
-				}
-			break;
 		case EUpdatingFeed:
 		{
-		// Parse the feed. We need to trap this call since it could leave and then
-		// the whole update chain will be broken
-		// change client state
 		iClientState = EIdle;
 		switch (aError)
 			{
 			case KErrCancel:
 				{
 					TTime time;
 					time.HomeTime();
 					iActiveFeed->SetLastUpdated(time);
 					if( aError == KErrNone)
 						{
+						// Parse the feed. We need to trap this call since it could leave and then
+						// the whole update chain will be broken
+						// change client state
 						TRAPD(parserErr, iParser->ParseFeedL(iUpdatingFeedFileName, iActiveFeed, iPodcastModel.SettingsEngine().MaxListItems()));
 						if(parserErr)
 							{
 							// we do not need to any special action on this error.
 							iActiveFeed->SetLastError(parserErr);
 							DP1("CFeedEngine::Complete()\t Failed to parse feed. Leave with error code=%d", parserErr);
 							}
 						else
 							{
-							iPodcastModel.ShowEngine().DeleteOldShowsByFeed(iActiveFeed->Uid());
+							iPodcastModel.ShowEngine().DeleteOldShowsByFeedL(iActiveFeed->Uid());
 							}
 						// delete the downloaded XML file as it is no longer needed
 						BaflUtils::DeleteFile(iPodcastModel.FsSession(),iUpdatingFeedFileName);
 									iClientState = EIdle;
 									}
 								}
 							}
 						}
+					else
+						{
+						// even if it fails, this will allow us to move on
+						iClientState = EIdle;
+						}
 					}
 				iCancelRequested = EFalse;
 				}break;
 			}
+			DBUpdateFeedL(*iActiveFeed);
-			NotifyFeedUpdateComplete(aError);
+			NotifyFeedUpdateComplete(iActiveFeed->Uid(), aError);
 			// we will wait until the image has been downloaded to start the next feed update.
 			if (iClientState == EIdle)
 				{
 				UpdateNextFeedL();
 				}
 			}break;
 		case EUpdatingImage:
 			{
 			// change client state to not updating
 			iClientState = EIdle;
+			if(aError == KErrNone)
-			NotifyFeedUpdateComplete(aError);
+				{
+				// now the image has been downloaded, so we set it again in the FeedInfo to start
+				// converting it
+				HBufC *fileNameCopy = iActiveFeed->ImageFileName().AllocLC();
+				TRAP_IGNORE(iActiveFeed->SetImageFileNameL(*fileNameCopy, &iPodcastModel));
+				CleanupStack::PopAndDestroy(fileNameCopy);
+				}
+			DBUpdateFeedL(*iActiveFeed);
+			NotifyFeedUpdateComplete(iActiveFeed->Uid(), aError);
 			UpdateNextFeedL();
 			}break;
 		case ESearching:
 			{
 			iClientState = EIdle;
 				DP("Parsing OPML");
 				iOpmlParser->ParseOpmlL(iSearchResultsFileName, ETrue);
 				}
 			else
 				{
-				NotifyOpmlParsingComplete(aError, 0);
+				NotifyOpmlParsingCompleteL(aError, 0);
 				}
 			BaflUtils::DeleteFile(iPodcastModel.FsSession(), iSearchResultsFileName);
 			}break;
+		case EIdle:
+			UpdateNextFeedL();
+			break;
+		default:
+			Panic(EPodcatcherPanicFeedEngineState);
+			break;
 		}
 	DP("CFeedEngine::CompleteL END");
 	}
-void CFeedEngine::NotifyFeedUpdateComplete(TInt aError)
+void CFeedEngine::NotifyFeedUpdateComplete(TInt aFeedUid, TInt aError)
 	{
 	DP("CFeedEngine::NotifyFeedUpdateComplete");
-	DBUpdateFeed(*iActiveFeed);
 	for (TInt i=0;i<iObservers.Count();i++)
 		{
-		TRAP_IGNORE(iObservers[i]->FeedDownloadFinishedL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate, iActiveFeed->Uid(), aError));
+		TRAP_IGNORE(iObservers[i]->FeedDownloadFinishedL(MFeedEngineObserver::EFeedAutoUpdate, aFeedUid, aError));
 		}
 	}
 void CFeedEngine::Disconnected(CHttpClient* /*aClient*/)
 	{
 	{
 		//DP2("Comparing %S to %S", &a.Title(), &b.Title());
 		return a.Title().CompareF(b.Title());
 	}
-EXPORT_C void CFeedEngine::GetDownloadedStats(TUint &aNumShows, TUint &aNumUnplayed)
+EXPORT_C void CFeedEngine::GetStatsByFeedL(TUint aFeedUid, TUint &aNumShows, TUint &aNumUnplayed)
 	{
-	DP("CFeedEngine::GetDownloadedStats");
+	//DP1("CFeedEngine::GetStatsByFeed, aFeedUid=%u", aFeedUid);
-	_LIT(KSqlStatement, "select count(*) from shows where downloadstate=%u");
+	DBGetStatsByFeedL(aFeedUid, aNumShows, aNumUnplayed);
-	iSqlBuffer.Format(KSqlStatement, EDownloaded);
+	}
+void CFeedEngine::DBGetStatsByFeedL(TUint aFeedUid, TUint &aNumShows, TUint &aNumUnplayed)
+	{
+	//DP1("CFeedEngine::DBGetStatsByFeed, feedUid=%u", aFeedUid);
+	_LIT(KSqlStatement, "select count(*) from shows where feeduid=%u");
+	iSqlBuffer.Format(KSqlStatement, aFeedUid);
 	sqlite3_stmt *st;
 	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
-	if( rc==SQLITE_OK ){
+	if( rc==SQLITE_OK)
+		{
+		Cleanup_sqlite3_finalize_PushL(st);
 	  	rc = sqlite3_step(st);
-	  	if (rc == SQLITE_ROW) {
+	  	if (rc == SQLITE_ROW)
+	  		{
 	  		aNumShows = sqlite3_column_int(st, 0);
-	  	}
+	  		}
-	}
+	  	else
+	  		{
+			User::Leave(KErrNotFound);
+	  		}
+	  	CleanupStack::PopAndDestroy(); // st
+		}
+	else
+		{
+		User::Leave(KErrCorrupt);
+		}
-	sqlite3_finalize(st);
+	_LIT(KSqlStatement2, "select count(*) from shows where feeduid=%u and playstate=0");
+	iSqlBuffer.Format(KSqlStatement2, aFeedUid);
-	_LIT(KSqlStatement2, "select count(*) from shows where downloadstate=%u and playstate=%u");
-	iSqlBuffer.Format(KSqlStatement2, EDownloaded, ENeverPlayed);
 	rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
-	if( rc==SQLITE_OK ){
+	if(rc==SQLITE_OK)
+		{
+		Cleanup_sqlite3_finalize_PushL(st);
 	  	rc = sqlite3_step(st);
-	  	if (rc == SQLITE_ROW) {
+	  	if (rc == SQLITE_ROW)
+	  		{
 	  		aNumUnplayed = sqlite3_column_int(st, 0);
-	  	}
+	  		}
-	}
+	  	else
+	  		{
-	sqlite3_finalize(st);
+			User::Leave(KErrNotFound);
-	}
+	  		}
+	  	CleanupStack::PopAndDestroy(); // st
-EXPORT_C void CFeedEngine::GetStatsByFeed(TUint aFeedUid, TUint &aNumShows, TUint &aNumUnplayed)
+	}
-	{
+}
-	//DP1("CFeedEngine::GetStatsByFeed, aFeedUid=%u", aFeedUid);
-	DBGetStatsByFeed(aFeedUid, aNumShows, aNumUnplayed);
+TUint CFeedEngine::DBGetFeedCountL()
-	}
+	{
+	DP("DBGetFeedCount BEGIN");
-void CFeedEngine::DBGetStatsByFeed(TUint aFeedUid, TUint &aNumShows, TUint &aNumUnplayed)
-	{
-	//DP1("CFeedEngine::DBGetStatsByFeed, feedUid=%u", aFeedUid);
-	_LIT(KSqlStatement, "select count(*) from shows where feeduid=%u");
-	iSqlBuffer.Format(KSqlStatement, aFeedUid);
 	sqlite3_stmt *st;
+	int rc = sqlite3_prepare_v2(&iDB,"select count(*) from feeds" , -1, &st, (const char**) NULL);
+	TUint size = 0;
-	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
+	if( rc==SQLITE_OK )
+		{
-	if( rc==SQLITE_OK ){
+		Cleanup_sqlite3_finalize_PushL(st);
-	  	rc = sqlite3_step(st);
+		rc = sqlite3_step(st);
-	  	if (rc == SQLITE_ROW) {
+		if (rc == SQLITE_ROW)
-	  		aNumShows = sqlite3_column_int(st, 0);
+			{
-	  	}
-	}
-	sqlite3_finalize(st);
-	_LIT(KSqlStatement2, "select count(*) from shows where feeduid=%u and playstate=0");
-	iSqlBuffer.Format(KSqlStatement2, aFeedUid);
-	rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
-	if( rc==SQLITE_OK ){
-	  	rc = sqlite3_step(st);
-	  	if (rc == SQLITE_ROW) {
-	  		aNumUnplayed = sqlite3_column_int(st, 0);
-	  	}
-	}
-	sqlite3_finalize(st);
-}
-TUint CFeedEngine::DBGetFeedCount()
-	{
-	 DP("DBGetFeedCount BEGIN");
-	 sqlite3_stmt *st;
-	 int rc = sqlite3_prepare_v2(&iDB,"select count(*) from feeds" , -1, &st, (const char**) NULL);
-	 TUint size = 0;
-	 if( rc==SQLITE_OK ){
-	  	rc = sqlite3_step(st);
-	  	if (rc == SQLITE_ROW) {
 	  		size = sqlite3_column_int(st, 0);
-	  	}
+	  		}
-	  }
+		else
+			{
-	  sqlite3_finalize(st);
+	  		User::Leave(KErrCorrupt);
-	  DP1("DBGetFeedCount END=%d", size);
+	  		}
-	  return size;
+		CleanupStack::PopAndDestroy(); // st
+		}
+	else
+		{
+		User::Leave(KErrCorrupt);
+		}
+	DP1("DBGetFeedCount END=%d", size);
+	return size;
 }
 void CFeedEngine::DBLoadFeedsL()
 	{
 	DP("DBLoadFeeds BEGIN");
 	iSortedFeeds.Reset();
 	CFeedInfo *feedInfo = NULL;
-	_LIT(KSqlStatement, "select url, title, description, imageurl, imagefile, link, built, lastupdated, uid, feedtype, customtitle from feeds");
+	_LIT(KSqlStatement, "select url, title, description, imageurl, imagefile, link, built, lastupdated, uid, feedtype, customtitle, lasterror from feeds");
 	iSqlBuffer.Format(KSqlStatement);
 	sqlite3_stmt *st;
 	TLinearOrder<CFeedInfo> sortOrder( CFeedEngine::CompareFeedsByTitle);
 	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
-	Cleanup_sqlite3_finalize_PushL(st);
+	if (rc==SQLITE_OK)
-	if (rc==SQLITE_OK) {
+		{
+		Cleanup_sqlite3_finalize_PushL(st);
 		rc = sqlite3_step(st);
-		while(rc == SQLITE_ROW) {
+		while(rc == SQLITE_ROW)
+			{
 			feedInfo = CFeedInfo::NewLC();
 			const void *urlz = sqlite3_column_text16(st, 0);
 			TPtrC16 url((const TUint16*)urlz);
 			feedInfo->SetUrlL(url);
 			TPtrC16 image((const TUint16*)imagez);
 			feedInfo->SetImageUrlL(image);
 			const void *imagefilez = sqlite3_column_text16(st, 4);
 			TPtrC16 imagefile((const TUint16*)imagefilez);
-			feedInfo->SetImageFileNameL(imagefile);
+			if (imagefile.Length() > 0)
+				{
+				feedInfo->SetImageFileNameL(imagefile, &iPodcastModel);
+				}
 			const void *linkz = sqlite3_column_text16(st, 5);
 			TPtrC16 link((const TUint16*)linkz);
 			feedInfo->SetDescriptionL(link);
 			sqlite3_int64 built = sqlite3_column_int64(st, 6);
 			sqlite3_int64 lastupdated = sqlite3_column_int64(st, 7);
 			TTime lastupdatedtime(lastupdated);
 			feedInfo->SetLastUpdated(lastupdatedtime);
 			sqlite3_int64 customtitle = sqlite3_column_int64(st, 10);
-			if (customtitle) {
+			if (customtitle)
+				{
 				feedInfo->SetCustomTitle();
-			}
+				}
-			TInt lasterror = sqlite3_column_int(st, 11);
+			sqlite3_int64 lasterror = sqlite3_column_int(st, 11);
 			feedInfo->SetLastError(lasterror);
 			TLinearOrder<CFeedInfo> sortOrder( CFeedEngine::CompareFeedsByTitle);
 			iSortedFeeds.InsertInOrder(feedInfo, sortOrder);
 			CleanupStack::Pop(feedInfo);
 			rc = sqlite3_step(st);
-		}
+			}
-	}
+		CleanupStack::PopAndDestroy();//st
+		}
-	CleanupStack::PopAndDestroy();//st
+	else
+		{
+		User::Leave(KErrCorrupt);
+		}
 	DP("DBLoadFeeds END");
 	}
 CFeedInfo* CFeedEngine::DBGetFeedInfoByUidL(TUint aFeedUid)
 	CFeedInfo *feedInfo = NULL;
 	_LIT(KSqlStatement, "select url, title, description, imageurl, imagefile, link, built, lastupdated, uid, feedtype, customtitle, lasterror from feeds where uid=%u");
 	iSqlBuffer.Format(KSqlStatement, aFeedUid);
 	sqlite3_stmt *st;
-	//DP1("SQL statement length=%d", iSqlBuffer.Length());
 	int rc = sqlite3_prepare16_v2(&iDB, (const void*)iSqlBuffer.PtrZ() , -1, &st,	(const void**) NULL);
-	if (rc==SQLITE_OK) {
+	if (rc==SQLITE_OK)
+		{
 		Cleanup_sqlite3_finalize_PushL(st);
 		rc = sqlite3_step(st);
-		if (rc == SQLITE_ROW) {
+		if (rc == SQLITE_ROW)
+			{
 			feedInfo = CFeedInfo::NewLC();
 			const void *urlz = sqlite3_column_text16(st, 0);
 			TPtrC16 url((const TUint16*)urlz);
 			feedInfo->SetUrlL(url);
 			TInt lasterror = sqlite3_column_int(st, 11);
 			feedInfo->SetLastError(lasterror);
 			CleanupStack::Pop(feedInfo);
-		}
+			}
+		else
+			{
+			User::Leave(KErrNotFound);
+			}
 		CleanupStack::PopAndDestroy();//st
-	}
+		}
+	else
+		{
+		User::Leave(KErrNotFound);
+		}
 	return feedInfo;
 }
-EXPORT_C void CFeedEngine::UpdateFeed(CFeedInfo *aItem)
+EXPORT_C void CFeedEngine::UpdateFeedInfoL(CFeedInfo *aItem)
 	{
-	DBUpdateFeed(*aItem);
+	if (iActiveFeed && iActiveFeed->Uid() == aItem->Uid())
+		{
+		User::Leave(KErrInUse);
+		}
+	DBUpdateFeedL(*aItem);
 	}
 EXPORT_C void CFeedEngine::SearchForFeedL(TDesC& aSearchString)
 	{
 	DP1("FeedEngine::SearchForFeedL BEGIN, aSearchString=%S", &aSearchString);
 	{
 	return iSearchResults;
 	}
-EXPORT_C void CFeedEngine::OpmlParsingComplete(TInt aError, TUint aNumFeedsAdded)
+EXPORT_C void CFeedEngine::OpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded)
 	{
-	NotifyOpmlParsingComplete(aError, aNumFeedsAdded);
+	NotifyOpmlParsingCompleteL(aError, aNumFeedsAdded);
 	}
-void CFeedEngine::NotifyOpmlParsingComplete(TInt aError, TUint aNumFeedsAdded)
+void CFeedEngine::NotifyOpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded)
 	{
 	for (TInt i=0;i<iObservers.Count();i++)
 		{
 		iObservers[i]->OpmlParsingComplete(aError, aNumFeedsAdded);
 		}

changeset 60	4d230e702aa3
parent 32	26a3f2dfba08
child 65	bcd88ba95046