[Mp-plugins-svn] SF.net SVN: mp-plugins: [653] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt

[<che...@us...>]

Revision: 653
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=653&view=rev
Author:   chef_koch
Date:     2007-06-28 15:33:41 -0700 (Thu, 28 Jun 2007)

Log Message:
-----------
added a bool variable to Database/DatabaseHandler.cs for checking which ThumbPaths should be used

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs	2007-06-28 22:03:15 UTC (rev 652)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs	2007-06-28 22:33:41 UTC (rev 653)
@@ -674,8 +674,18 @@
       if (guiListItem.MusicTag == null) return;
       FileItem curFileItem = (FileItem)guiListItem.MusicTag;
       if (curFileItem == null) return;
+      
+      string imgFile = String.Empty;
+      
+      if (DatabaseHandler.useMPsThumbDirectory)
+        imgFile = curFileItem.Imagefile;
+      else
+        imgFile = MediaPortal.Util.Utils.GetCoverArtName(
+          Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt\" + this.Title),
+          Path.GetFileNameWithoutExtension(curFileItem.Filename)
+          );
 
-      if (curFileItem.Imagefile != "")
+      if (imgFile != "")
       {
         guiListItem.ThumbnailImage = curFileItem.Imagefile;
         guiListItem.IconImageBig = curFileItem.Imagefile;
@@ -1185,8 +1195,11 @@
       if (item.MusicTag is FileItem)
       {
         FileItem curFile = item.MusicTag as FileItem;
-        return GetCurThumb(curFile);
-        //return GetCurThumbFromThumbsDir(curFile);
+
+        if (DatabaseHandler.useMPsThumbDirectory)
+          return GetCurThumbFromThumbsDir(curFile);
+        else
+          return GetCurThumb(curFile);
       }
       else if (item.MusicTag is ApplicationItem)
       {
@@ -1236,7 +1249,7 @@
     {
       string curThumb = MediaPortal.Util.Utils.GetCoverArtName(
         Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt\" + this.Title),
-        fileItem.Title
+        Path.GetFileNameWithoutExtension(fileItem.Filename)
         );
 
       if (curThumb != "")
@@ -1247,7 +1260,7 @@
           // every thumb has the postfix "_1", "_2", etc with the same file extension
           string cand = MediaPortal.Util.Utils.GetCoverArtName(
             Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt\" + this.Title),
-            fileItem.Title + "_" + thumbIndex.ToString()
+            Path.GetFileNameWithoutExtension(fileItem.Filename) + "_" + thumbIndex.ToString()
             );
 
           if (cand != "")

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs	2007-06-28 22:03:15 UTC (rev 652)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs	2007-06-28 22:33:41 UTC (rev 653)
@@ -50,6 +50,8 @@
     static private ProgramViewHandler viewHandler = null;
     private const string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
 
+    public static bool useMPsThumbDirectory = false;
+
     // singleton. Dont allow any instance of this class
     private DatabaseHandler() { }
 

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs	2007-06-28 22:03:15 UTC (rev 652)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs	2007-06-28 22:33:41 UTC (rev 653)
@@ -31,6 +31,9 @@
 
 using GUIPrograms.ApplicationItems;
 
+// just 4 useMPsThumbsDirectory variable
+using GUIPrograms.Database;
+
 namespace GUIPrograms.FileItems
 {
   /// <summary>
@@ -296,8 +299,10 @@
         // imageUrl contains a full URL with one picture to download
 
         i++;
-        strFile = curFile.GetNewValidImageFile(curApp, Path.GetExtension(imageUrl));
-        //strFile = curFile.GetNewValidImageFileFromThumbsDir(curApp, Path.GetExtension(imageUrl));
+        if (DatabaseHandler.useMPsThumbDirectory)
+          strFile = curFile.GetNewValidImageFileFromThumbsDir(curApp, Path.GetExtension(imageUrl));
+        else
+          strFile = curFile.GetNewValidImageFile(curApp, Path.GetExtension(imageUrl));
         MediaPortal.Util.Utils.DownLoadImage(imageUrl, strFile);
         if ((File.Exists(strFile)) && (curFile.Imagefile == ""))
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.