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

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

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

Log Message:
-----------
added new methods which uses the thumbs folders, but
  did not Enabled them yet, just to prevent loosing the code ;)
  if we have setting for that we also can decide which should be used

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.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 21:16:18 UTC (rev 651)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs	2007-06-28 22:03:15 UTC (rev 652)
@@ -1180,24 +1180,20 @@
 
     public virtual string GetCurThumb(GUIListItem item)
     {
-      if (item.MusicTag == null)
-      {
-        return "";
-      }
+      if (item.MusicTag == null) return "";
+
       if (item.MusicTag is FileItem)
       {
         FileItem curFile = item.MusicTag as FileItem;
         return GetCurThumb(curFile);
+        //return GetCurThumbFromThumbsDir(curFile);
       }
       else if (item.MusicTag is ApplicationItem)
       {
         ApplicationItem curApp = item.MusicTag as ApplicationItem;
         return curApp.Imagefile;
       }
-      else
-      {
-        return "";
-      }
+      else return "";
     }
 
     public string GetCurThumb(FileItem fileItem)
@@ -1236,6 +1232,36 @@
       return curThumb;
     }
 
+    public string GetCurThumbFromThumbsDir(FileItem fileItem)
+    {
+      string curThumb = MediaPortal.Util.Utils.GetCoverArtName(
+        Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt\" + this.Title),
+        fileItem.Title
+        );
+
+      if (curThumb != "")
+        if (thumbIndex > 0)
+        {
+          // try to find another thumb....
+          // use the myGames convention:
+          // 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()
+            );
+
+          if (cand != "")
+            curThumb = cand;
+          else
+          {
+            thumbIndex = 0; // restart at the first thumb!
+            //GetNextThumbFolderIndex(fileItem);
+          }
+        }
+
+      return curThumb;
+    }
+
     public void ResetThumbs()
     {
       thumbIndex = 0;

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs	2007-06-28 21:16:18 UTC (rev 651)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs	2007-06-28 22:03:15 UTC (rev 652)
@@ -29,6 +29,7 @@
 using System.IO;
 using SQLite.NET;
 
+using MediaPortal.Configuration;
 using MediaPortal.GUI.Library;
 
 using GUIPrograms;
@@ -858,6 +859,48 @@
       }
       return strCand;
     }
+
+    public string GetNewValidImageFileFromThumbsDir(ApplicationItem curApp, string strExtension)
+    {
+      if (curApp == null) return "";
+      if ((this.Imagefile == "") && (this.Filename == ""))
+        return "";
+
+      string strCand = "";
+      int iImgIndex = -1;
+      bool bFound = false;
+
+      string folder = Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt\" + curApp.Title);
+      if (!Directory.Exists(folder))
+        Directory.CreateDirectory(folder);
+
+      while (!bFound)
+      {
+        iImgIndex++;
+        if (iImgIndex == 0)
+        {
+          strCand = String.Format("{0}\\{1}{2}",
+            folder,
+            Path.GetFileNameWithoutExtension(this.Filename),
+            strExtension
+            );
+        }
+        else
+        {
+          strCand = String.Format("{0}\\{1}_{2}{3}",
+            folder,
+            Path.GetFileNameWithoutExtension(this.Filename),
+            iImgIndex,
+            strExtension
+            );
+        }
+        bFound = !File.Exists(strCand);
+      }
+
+      return strCand;
+    }
+
+
     public void DeleteImages(ApplicationItem curApp)
     {
       if (curApp == null)

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs	2007-06-28 21:16:18 UTC (rev 651)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs	2007-06-28 22:03:15 UTC (rev 652)
@@ -281,8 +281,8 @@
 
     public void DownloadImages(ApplicationItem curApp, FileItem curFile)
     {
-      if (curFile == null)
-        return;
+      if (curFile == null) return;
+
       int i = 0;
       string strFile = "";
 
@@ -297,6 +297,7 @@
 
         i++;
         strFile = curFile.GetNewValidImageFile(curApp, Path.GetExtension(imageUrl));
+        //strFile = curFile.GetNewValidImageFileFromThumbsDir(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.