Fix for bug 3626 - show filenames are now generated from UIDs 3rded
authorSebastian Brannstrom <sebastianb@symbian.org>
Sat, 16 Oct 2010 20:10:01 +0100
branch3rded
changeset 279 5a44ec2f6f4d
parent 278 e6aa20533d01
child 280 001f04bc4964
Fix for bug 3626 - show filenames are now generated from UIDs
engine/inc/PodcastUtils.h
engine/src/PodcastUtils.cpp
engine/src/ShowEngine.cpp
--- a/engine/inc/PodcastUtils.h	Sat Oct 23 17:11:38 2010 +0100
+++ b/engine/inc/PodcastUtils.h	Sat Oct 16 20:10:01 2010 +0100
@@ -37,6 +37,7 @@
 _LIT(KVideoFormat1, ".wmv");
 _LIT(KVideoFormat2, ".avi");
 _LIT(KVideoFormat3, ".mp4");
+_LIT(KVideoFormat4, ".mov");
 
 
 
--- a/engine/src/PodcastUtils.cpp	Sat Oct 23 17:11:38 2010 +0100
+++ b/engine/src/PodcastUtils.cpp	Sat Oct 16 20:10:01 2010 +0100
@@ -322,7 +322,8 @@
 	{
 	if (aUrl.Find(KVideoFormat1) != KErrNotFound ||
 			aUrl.Find(KVideoFormat2) != KErrNotFound ||
-			aUrl.Find(KVideoFormat3) != KErrNotFound)
+			aUrl.Find(KVideoFormat3) != KErrNotFound ||
+			aUrl.Find(KVideoFormat4) != KErrNotFound)
 		{
 		return ETrue;
 		}
--- a/engine/src/ShowEngine.cpp	Sat Oct 23 17:11:38 2010 +0100
+++ b/engine/src/ShowEngine.cpp	Sat Oct 16 20:10:01 2010 +0100
@@ -189,7 +189,16 @@
 
 	TFileName fileName;
 	PodcastUtils::FileNameFromUrl(info->Url(), fileName);
-	relPath.Append(fileName);
+	
+	TFileName extension;
+	extension.Copy(fileName.Mid(fileName.LocateReverse('.')));
+	DP1("extension=%S", &extension);
+		
+	TFileName newFilename;
+	newFilename.Format(_L("%u%S"), info->Uid(), &extension);
+	DP1("newFilename=%S", &newFilename);
+			
+	relPath.Append(newFilename);
 	PodcastUtils::EnsureProperPathName(relPath);
 
 	// complete file path is base dir + rel path