FCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp

equal deleted inserted replaced

-:2edacbf5d3f9
+:7197e789b953
 iActivityManager = CTMActivityManager::NewL( this, KBackgroundGenerationIdle);
 UpdatePSValues(ETrue);
 if(iForegroundGenerationObserver)
 {
 delete iForegroundGenerationObserver;
 iForegroundGenerationObserver = NULL;
 }
 RProperty::Define(KTAGDPSNotification, KMPXHarvesting, RProperty::EInt);
 	//start foreground generation observer
 iForegroundGenerationObserver = CTMRPropertyObserver::NewL( *this, KTAGDPSNotification, KForceBackgroundGeneration, ETrue );
 delete iPeriodicTimer;
 }
 if (!iInit)
 {
-/*
+#ifdef MDS_MODIFY_OBSERVER
 iHarvesterClient.RemoveHarvesterEventObserver(*this);
-iHarvesterClient.Close();*/
+iHarvesterClient.Close();
+#endif
 }
 if ( iCollectionUtility )
 {
 iCollectionUtility->Close();
 //}
 }
 }
 delete iQueryPlaceholders;
 iQueryPlaceholders = NULL;
+if(iDoQueryAllItems)
+{
+iDoQueryAllItems = EFalse;
+TRAP_IGNORE(QueryAllItemsL());
+}
 }
 else if(&aQuery == iQueryAllItems)
 {
 TN_DEBUG1( "CThumbAGProcessor::HandleQueryCompleted - QueryAllItems completed");
 // if no errors in query
 // if no errors in query
 if (aError == KErrNone && iQuery)
 {
 iProcessingCount = iQuery->Count();
+if(iProcessingCount != iQueryQueue.Count())
+{
+TN_DEBUG1( "CThumbAGProcessor::HandleQueryCompleted() some result items missing");
+RArray<TItemId> iQueryQueueDelta;
+TInt itemIndex(KErrNotFound);
+//search delta items
+for(TInt queryItem =0; queryItem < iQueryQueue.Count();queryItem++)
+{
+TBool found(EFalse);
+for(TInt queryResult = 0; queryResult < iQuery->Count(); queryResult++)
+{
+const CMdEObject* object = &iQuery->Result(queryResult);
+if( iQueryQueue[queryItem] == object->Id())
+{
+found = ETrue;
+break;
+}
+}
+if(!found)
+{
+TN_DEBUG2( "CThumbAGProcessor::HandleQueryCompleted() missing from results item %d", iQueryQueue[queryItem] );
+iQueryQueueDelta.Append( iQueryQueue[queryItem] );
+}
+}
+TN_DEBUG2( "CThumbAGProcessor::HandleQueryCompleted() missing items total count %d", iQueryQueueDelta.Count());
+//cleanup from previous queue it item is not found from MDS
+while(iQueryQueueDelta.Count())
+{
+itemIndex = iLastQueue->Find(iQueryQueueDelta[0]);
+if(itemIndex >= 0)
+{
+TN_DEBUG2( "CThumbAGProcessor::HandleQueryCompleted() remove items %d", iQueryQueue[0]);
+iLastQueue->Remove( itemIndex );
+}
+iQueryQueueDelta.Remove(0);
+}
+iQueryQueueDelta.Close();
+}
+// no results, reset query
 if( !iProcessingCount)
 {
 delete iQuery;
 iQuery = NULL;
 iProcessingCount = 0;
 iRemoveQueue.ResetAndDestroy();
 iQueryQueue.Reset();
 iPlaceholderQueue.Reset();
 TRAP_IGNORE(QueryPlaceholdersL());
+		//query all items after PH query
+iDoQueryAllItems = ETrue;
 TN_DEBUG1( "CThumbAGProcessor::RunL() - Initialisation 1 done" );
 ActivateAO();
 return;
 }
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() - Do Initialisation 2" );
 iInit2 = EFalse;
 TInt err(KErrNone);
-/*
+#ifdef  MDS_MODIFY_OBSERVER
 TN_DEBUG1( "CThumbAGProcessor::RunL() do iHarvesterClient connect");
-TInt err = iHarvesterClient.Connect();
+err = iHarvesterClient.Connect();
 TN_DEBUG2( "CThumbAGProcessor::RunL() iHarvesterClient connect err = %d", err);
 __ASSERT_DEBUG((err==KErrNone), User::Panic(_L("CThumbAGProcessor::RunL(), !iHarvesterClient "), err));
 if(  err == KErrNone )
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() add iHarvesterClient observer");
 err = iHarvesterClient.AddHarvesterEventObserver( *this, EHEObserverTypeOverall | EHEObserverTypePlaceholder, KMaxTInt );
 TN_DEBUG2( "CThumbAGProcessor::RunL() iHarvesterClient observer err = %d", err);
 __ASSERT_DEBUG((err==KErrNone), User::Panic(_L("CThumbAGProcessor::RunL(), !iHarvesterClient "), err));
-}*/
+}
+#endif
 TN_DEBUG1( "CThumbAGProcessor::RunL() MMPXCollectionUtility");
 TRAP( err, iCollectionUtility = MMPXCollectionUtility::NewL( this, KMcModeIsolated ));
 TN_DEBUG2( "CThumbAGProcessor::RunL() create MMPXCollectionUtility err = %d", err);
 __ASSERT_DEBUG((iCollectionUtility), User::Panic(_L("CThumbAGProcessor::RunL(), !iCollectionUtility "), err));
 if(iActivityManager)
 {
 iActivityManager->Start();
 }
-TRAP_IGNORE(QueryAllItemsL());
 TN_DEBUG1( "CThumbAGProcessor::RunL() - Initialisation 2 done" );
 return;
 }
 // restart session if died
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() - *** FORCED RUN ***");
 }
 #endif
-	if( /*iForceRun || */iForegroundRun )
+	if( iForceRun || iForegroundRun )
 	{
 TN_DEBUG1( "void CThumbAGProcessor::RunL() skip idle detection!");
 	CancelTimeout();
 	 }
 	else
 {
 //check is server idle
 TInt serveIdle(KErrNotFound);
 TInt ret = RProperty::Get(KServerIdle, KIdle, serveIdle);
-if(ret == KErrNone )
+if(ret != KErrNone || !serveIdle )
 {
-if(!serveIdle)
+	//start inactivity timer and retry on after callback
-{
+	TN_DEBUG1( "void CThumbAGProcessor::RunL() server not idle");
-//start inactivity timer and retry on after callback
+StartTimeout();
-TN_DEBUG1( "void CThumbAGProcessor::RunL() server not idle");
+return;
-StartTimeout();
-return;
-}
 }
 TN_DEBUG1( "void CThumbAGProcessor::RunL() device and server idle, process");
 }
 	    }
 if( iProcessingCount <= 0 )
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() - iQueryReady FINISH" );
 iQueryReady = EFalse;
 iQueryActive = EFalse;
-iModify = EFalse;
+}
-//check if forced run needs to continue
+ActivateAO();
-if (iModifyQueue.Count())
-{
-SetForceRun( ETrue );
-}
-else
-{
-SetForceRun( EFalse );
-}
-}
-//keep going if processing Remove items or if Add item fails
-else if( iModify || err )
-{
-ActivateAO();
-}
 }
 //waiting for MDS query to complete
 else if( iQueryActive )
 {
 if(iForceRun && !iModify)
 if( !IsActive() )
 {
 SetActive();
 TRequestStatus* statusPtr = &iStatus;
 User::RequestComplete( statusPtr, KErrNone );
+}
+//check if forced run needs to continue
+if (iModifyQueue.Count())
+{
+SetForceRun( ETrue );
+}
+else
+{
+iModify = EFalse;
+SetForceRun( EFalse );
 }
 UpdatePSValues();
 }
 if( iModifyQueue.Count() == 0)
 			    {
 			    SetForceRun( EFalse );
 		        }
+}
-continue;
-}
+itemIndex = iQueryQueue.Find( aIDArray[i] );
-/*if( aRemoveFromDelete )
+if(itemIndex >= 0)
+{
+iQueryQueue.Remove(itemIndex);
+TN_DEBUG1( "CThumbAGProcessor::RemoveFromQueues() - iQueryQueue" );
+}
+itemIndex = iPlaceholderQueue.Find( aIDArray[i] );
+if(itemIndex >= 0)
+	{
+iPlaceholderQueue.Remove(itemIndex);
+TN_DEBUG1( "CThumbAGProcessor::RemoveFromQueues() - iPlaceholderQueue" );
+}
+/*
+if( aRemoveFromDelete )
 {
 itemIndex = iRemoveQueue.Find( aIDArray[i] );
 if(itemIndex >= 0)
 {
 void CThumbAGProcessor::SetForceRun( const TBool aForceRun)
 {
 TN_DEBUG2( "CThumbAGProcessor::SetForceRun(%d) - end", aForceRun );
 // enable forced run
-if (aForceRun)
+iForceRun = aForceRun;
-{
-iForceRun = aForceRun;
-}
 }
 // ---------------------------------------------------------------------------
 // CThumbAGProcessor::QueryForPlaceholders()
 // ---------------------------------------------------------------------------
 if ( aError != KErrNone || !aMessage )
 {
 return;
 }
-TN_DEBUG1( "CThumbAGProcessor::HandleCollectionMessage" );
 TMPXMessageId generalId( *aMessage->Value<TMPXMessageId>( KMPXMessageGeneralId ) );
+TN_DEBUG2( "CThumbAGProcessor::HandleCollectionMessage KMPXMessageGeneralId=%d", generalId);
 	//we are interestead of only general system events
 if ( generalId == KMPXMessageGeneral )
 {
 TInt event( *aMessage->Value<TInt>( KMPXMessageGeneralEvent ) );
+TInt op( *aMessage->Value<TInt>( KMPXMessageGeneralType ) );
+TN_DEBUG3( "CThumbAGProcessor::HandleCollectionMessage KMPXMessageGeneralEvent=%d", event, op);
 if ( event == TMPXCollectionMessage::EBroadcastEvent )
 {
-TInt op( *aMessage->Value<TInt>( KMPXMessageGeneralType ) );
 switch( op )
 {
 			    //when MTP sync or music collection is started then pause processing
 case EMcMsgRefreshStart:
 case EMcMsgUSBMTPStart:
 if(itemsLeft + i2ndRoundGenerateQueue.Count() + iRemoveQueue.Count() > 0 )
 {
 daemonProcessing = ETrue;
 }
+//disable 2nd round generarion when there is items in 1st round queues
+//or 2nd queue is empty
+if( !i2ndRoundGenerateQueue.Count() || itemsLeft )
+{
+i2ndRound = EFalse;
+}
 if(aDefine)
 {
 TN_DEBUG1( "CThumbAGProcessor::UpdatePSValues() define");
 RProperty::Define(KTAGDPSNotification, KDaemonProcessing, RProperty::EInt);
 RProperty::Set(KTAGDPSNotification, KDaemonProcessing, 0);

changeset 15	7197e789b953
parent 14	2edacbf5d3f9
child 17	ffa62e555b02