Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [795] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <che...@us...> - 2007-08-05 22:22:00
|
Revision: 795
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=795&view=rev
Author: chef_koch
Date: 2007-08-05 15:21:57 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
added many fixes/changes/improvements when using thumbsDirectory, most should be fine now
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -72,21 +72,19 @@
public void Refresh(ApplicationItem curApp)
{
- if (curApp != null)
+ if (curApp == null) return;
+
+ currentApplication = curApp;
+ if (!currentApplication.filesAreLoaded)
{
- currentApplication = curApp;
- if (!currentApplication.filesAreLoaded)
- {
- currentApplication.LoadFiles();
- }
- SyncListView();
+ currentApplication.LoadFiles();
}
+ SyncListView();
}
private void SyncListView()
{
- if (currentApplication == null)
- return;
+ if (currentApplication == null) return;
fileListView.BeginUpdate();
try
@@ -172,8 +170,15 @@
{
this.fileDirTextBox.Text = currentApplication.FileDirectory;
- string imageDirectorys = string.Join(";", currentApplication.imageDirs);
- this.imageDirsTextBox.Text = imageDirectorys;
+ if (ProgramUtils.UseThumbsDir())
+ {
+ ProgramUtils.GetApplicationImageFolder(currentApplication);
+ }
+ else
+ {
+ string imageDirectorys = string.Join(";", currentApplication.imageDirs);
+ this.imageDirsTextBox.Text = imageDirectorys;
+ }
this.fileExtensionsTextBox.Text = currentApplication.ValidExtensions;
// filePathsLabel.Text = currentApplication.CurrentFilePath().Replace("&", "&&");
@@ -181,15 +186,8 @@
public string FileExtensionsText
{
-
- get
- {
- return fileExtensionsTextBox.Text;
- }
- set
- {
- fileExtensionsTextBox.Text = value;
- }
+ get { return fileExtensionsTextBox.Text; }
+ set { fileExtensionsTextBox.Text = value; }
}
public bool EntriesOK()
@@ -349,118 +347,111 @@
return System.IO.Directory.Exists(firstDirectory);
}
}
-
}
//scans all files in the fileviewlist
//and look for matching imagenames in the imagefolders(if any)
private void scanImageDirsButton_Click(object sender, EventArgs e)
{
- if (FirstImageDirectoryValid())
+ if (!FirstImageDirectoryValid())
{
+ MessageBox.Show("Please set the first imagedirectory before rescanning folders for images!", "Missing or Invalid Imagedirectory");
+ return;
+ }
- SetEnabledComponents(false);
- scanImageDirsButton.Enabled = false;
- scanImageDirsButton.Text = "Scanning for images..";
- Application.DoEvents();
- List<string> imageDirsList = new List<string>();
- if (this.OnImageFolderSearch != null)
- {
+ SetEnabledComponents(false);
+ scanImageDirsButton.Enabled = false;
+ scanImageDirsButton.Text = "Scanning for images..";
+ Application.DoEvents();
+ List<string> imageDirsList = new List<string>();
+ if (this.OnImageFolderSearch != null)
+ {
+ OnImageFolderSearch(this, null);
+ }
+ //get all imagedirs
+ /* for (int i = 0; i < currentApplication.imageDirs.Length; i++)
+ {
+ if (!currentApplication.imageDirs[i].ToString().Equals(""))
+ {
+ imageDirsList.Add(currentApplication.imageDirs[i]);
+ }
- OnImageFolderSearch(this, null);
+ }
+ */
- }
+ if (this.imageDirsTextBox.Text != string.Empty)
+ {
+ string[] imageDirs = this.imageDirsTextBox.Text.Split(';');
//get all imagedirs
- /* for (int i = 0; i < currentApplication.imageDirs.Length; i++)
- {
- if (!currentApplication.imageDirs[i].ToString().Equals(""))
- {
- imageDirsList.Add(currentApplication.imageDirs[i]);
- }
-
- }
- */
-
- if (this.imageDirsTextBox.Text != string.Empty)
+ for (int i = 0; i < imageDirs.Length; i++)
{
- string[] imageDirs = this.imageDirsTextBox.Text.Split(';');
- //get all imagedirs
- for (int i = 0; i < imageDirs.Length; i++)
+ if (!imageDirs[i].ToString().Equals(""))
{
- if (!imageDirs[i].ToString().Equals(""))
- {
- imageDirsList.Add(imageDirs[i]);
- }
-
+ imageDirsList.Add(imageDirs[i]);
}
+ }
- try
+ try
+ {
+ //if any imagedirs given
+ if (imageDirsList.Count > 0)
{
- //if any imagedirs given
- if (imageDirsList.Count > 0)
+ //for every dir fiven...
+ foreach (string directory in imageDirsList)
{
- //for every dir fiven...
- foreach (string directory in imageDirsList)
+
+ DirectoryInfo directoryInfo = new DirectoryInfo(directory);
+ //and for each file in dir
+ if (directoryInfo.Exists)
{
+ System.IO.FileInfo[] files = directoryInfo.GetFiles();
- DirectoryInfo directoryInfo = new DirectoryInfo(directory);
- //and for each file in dir
- if (directoryInfo.Exists)
+ for (int z = 0; z < currentApplication.ItemList.Count; z++)
{
- System.IO.FileInfo[] files = directoryInfo.GetFiles();
+ bool imageFound = false;
+ string foundImagePath = string.Empty;
+ FileItem fileItem = (FileItem)currentApplication.ItemList[z];
+ string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileItem.Filename);
- for (int z = 0; z < currentApplication.ItemList.Count; z++)
+ //check all files if same name can be found
+ int i = 0;
+ while ((imageFound == false) && (i < files.Length))
{
- bool imageFound = false;
- string foundImagePath = string.Empty;
- FileItem fileItem = (FileItem)currentApplication.ItemList[z];
- string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileItem.Filename);
-
- //check all files if same name can be found
- int i = 0;
- while ((imageFound == false) && (i < files.Length))
+ if (fileNameWithoutExtension.Equals(Path.GetFileNameWithoutExtension(files[i].ToString())))
{
- if (fileNameWithoutExtension.Equals(Path.GetFileNameWithoutExtension(files[i].ToString())))
- {
- //found
- imageFound = true;
- foundImagePath = Path.Combine(directory, files[i].ToString());
- }
- i++;
+ //found
+ imageFound = true;
+ foundImagePath = Path.Combine(directory, files[i].ToString());
}
+ i++;
+ }
- // if an image with same name as file was found
- if (foundImagePath != string.Empty)
- {
- fileItem.Imagefile = foundImagePath;
- fileItem.Write();
+ // if an image with same name as file was found
+ if (foundImagePath != string.Empty)
+ {
+ fileItem.Imagefile = foundImagePath;
+ fileItem.Write();
- }
}
}
}
}
}
- catch (Exception ee)
- {
-
- MessageBox.Show(ee.ToString());
- SetEnabledComponents(true);
- }
}
-
- scanImageDirsButton.Enabled = true;
- scanImageDirsButton.Text = "(Re)Scan imagefolders";
- Application.DoEvents();
- SetEnabledComponents(true);
- if (this.OnImageFolderSearch != null)
+ catch (Exception ee)
{
- OnImageFolderSearch(this, null);
+ MessageBox.Show(ee.ToString());
+ SetEnabledComponents(true);
}
}
- else
+
+ scanImageDirsButton.Enabled = true;
+ scanImageDirsButton.Text = "(Re)Scan imagefolders";
+ Application.DoEvents();
+ SetEnabledComponents(true);
+ if (this.OnImageFolderSearch != null)
{
- MessageBox.Show("Please set the first imagedirectory before rescanning folders for images!", "Missing or Invalid Imagedirectory");
+ OnImageFolderSearch(this, null);
}
}
@@ -585,35 +576,30 @@
public void FillApplicationItem(ApplicationItem applicationItem)
{
- if (applicationItem != null)
- {
+ if (applicationItem == null) return;
- applicationItem.FileDirectory = fileDirTextBox.Text;
+ if (!ProgramUtils.UseThumbsDir())
+ {
applicationItem.ImageDirectory = imageDirsTextBox.Text;
- applicationItem.ValidExtensions = fileExtensionsTextBox.Text;
+ }
+ applicationItem.FileDirectory = fileDirTextBox.Text;
+ applicationItem.ValidExtensions = fileExtensionsTextBox.Text;
+ if ((currentApplication is ApplicationItemMame) || ((currentApplication is ApplicationItemGameBase)))
+ {
+ applicationItem.ImportValidImagesOnly = this.validImagesCheckBox.Checked;
+ }
+ if ((currentApplication is ApplicationItemMame))
+ {
+ ((ApplicationItemMame)applicationItem).ImportOriginalsOnly = this.importOriginalsCheckBox.Checked;
+ applicationItem.ImportMameMahjong = this.importMahjongCheckBox.Checked;
+ applicationItem.ImportMamePlaychoice10 = this.importPlaychoiceCheckBox.Checked;
+ }
- if ((currentApplication is ApplicationItemMame) || ((currentApplication is ApplicationItemGameBase)))
- {
- applicationItem.ImportValidImagesOnly = this.validImagesCheckBox.Checked;
- }
-
- if ((currentApplication is ApplicationItemMame))
- {
- ((ApplicationItemMame)applicationItem).ImportOriginalsOnly = this.importOriginalsCheckBox.Checked;
- applicationItem.ImportMameMahjong = this.importMahjongCheckBox.Checked;
- applicationItem.ImportMamePlaychoice10 = this.importPlaychoiceCheckBox.Checked;
-
- }
-
- if ((currentApplication is ApplicationItemGameBase))
- {
- applicationItem.Source = this.gamebaseDBTextBox.Text;
- }
-
-
-
+ if ((currentApplication is ApplicationItemGameBase))
+ {
+ applicationItem.Source = this.gamebaseDBTextBox.Text;
}
}
@@ -674,8 +660,14 @@
if (currentApplication != null)
{
+ if (ProgramUtils.UseThumbsDir())
+ imageDirsTextBox.Text = ProgramUtils.GetApplicationImageFolder(currentApplication);
+ else
+ imageDirsTextBox.Text = currentApplication.ImageDirectory;
+ imageDirsTextBox.ReadOnly = ProgramUtils.UseThumbsDir();
+ imageDirButton.Visible = !ProgramUtils.UseThumbsDir();
+
fileDirTextBox.Text = currentApplication.FileDirectory;
- imageDirsTextBox.Text = currentApplication.ImageDirectory;
fileExtensionsTextBox.Text = currentApplication.ValidExtensions;
@@ -694,7 +686,6 @@
this.importOriginalsCheckBox.Checked = ((ApplicationItemMame)currentApplication).ImportOriginalsOnly;
this.importMahjongCheckBox.Checked = currentApplication.ImportMameMahjong;
this.importPlaychoiceCheckBox.Checked = currentApplication.ImportMamePlaychoice10;
-
}
if ((currentApplication is ApplicationItemGameBase))
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -48,26 +48,14 @@
public ApplicationItem CurApp
{
- get
- {
- return m_CurApp;
- }
- set
- {
- m_CurApp = value;
- }
+ get { return m_CurApp; }
+ set { m_CurApp = value; }
}
public FileItem CurFile
{
- get
- {
- return m_CurFile;
- }
- set
- {
- m_CurFile = value;
- }
+ get { return m_CurFile; }
+ set { m_CurFile = value; }
}
public FileDetailsForm()
@@ -83,12 +71,21 @@
gbFileDetails.Text = CurApp.Title + ": " + CurFile.Title;
txtTitle.Text = m_CurFile.Title;
txtFilename.Text = m_CurFile.Filename;
- txtImageFile.Text = m_CurFile.Imagefile;
+
+ if (ProgramUtils.UseThumbsDir())
+ {
+ txtImageFile.Text = ProgramUtils.GetFileImage(CurApp, CurFile);
+ }
+ else
+ {
+ txtImageFile.Text = m_CurFile.Imagefile;
+ }
+
FileItemToGenre();
manufacturerComboBox.SelectedValue = CurFile.ManufacturerId;
//txtManufacturer.Text = m_CurFile.Manufacturer;
- txtYear.Text = m_CurFile.Year.ToString();
+ txtYear.Text = m_CurFile.Year.ToString();
cbRating.SelectedIndex = m_CurFile.Rating;
txtCountry.Text = m_CurFile.Country;
@@ -241,7 +238,8 @@
{
CurFile.Title = txtTitle.Text;
CurFile.Filename = txtFilename.Text;
- CurFile.Imagefile = txtImageFile.Text;
+ if (!ProgramUtils.UseThumbsDir())
+ CurFile.Imagefile = txtImageFile.Text;
// CurFile.MainGenre = genreComboBox.SelectedText;
CurFile.MainGenreId = (int)genreComboBox.SelectedValue;
//CurFile.SubGenre = subGenreComboBox.SelectedText;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -941,7 +941,7 @@
// check whether to use thumbsdir or not
string imgFile = String.Empty;
if (ProgramUtils.UseThumbsDir())
- imgFile = ProgramUtils.GetApplicationImage(applicationItem.Title);
+ imgFile = ProgramUtils.GetApplicationImage(applicationItem);
else
imgFile = applicationItem.Imagefile;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -1043,8 +1043,8 @@
}
else
{
- string candFolder = imageDirs[thumbFolderIndex];
- string candThumb = candFolder + "\\" + fileItem.ExtractImageFileNoPath();
+ string candFolder = imageDirs[thumbFolderIndex];
+ string candThumb = candFolder + "\\" + Path.GetFileName(fileItem.Imagefile);
if ( candThumb.ToLower() != fileItem.Imagefile.ToLower() )
{
foundThumb = ( System.IO.File.Exists( candThumb ) );
@@ -1060,7 +1060,7 @@
public virtual string GetCurThumb(GUIListItem item)
{
- if ( item.MusicTag == null ) return "";
+ if ( item.MusicTag == null ) return "";
if ( item.MusicTag is FileItem )
{
@@ -1073,9 +1073,12 @@
}
else if ( item.MusicTag is ApplicationItem )
{
- ApplicationItem curApp = item.MusicTag as ApplicationItem;
+ ApplicationItem curApp = item.MusicTag as ApplicationItem;
- return curApp.Imagefile;
+ if ( ProgramUtils.UseThumbsDir() )
+ return ProgramUtils.GetApplicationImage( curApp );
+ else
+ return curApp.Imagefile;
}
else return "";
}
@@ -1091,7 +1094,7 @@
else
{
string curFolder = imageDirs[thumbFolderIndex];
- curThumb = curFolder + "\\" + fileItem.ExtractImageFileNoPath();
+ curThumb = curFolder + "\\" + Path.GetFileName(fileItem.Imagefile);
}
if ( thumbIndex > 0 )
@@ -1099,7 +1102,7 @@
// try to find another thumb....
// use the myGames convention:
// every thumb has the postfix "_1", "_2", etc with the same file extension
- string curExtension = fileItem.ExtractImageExtension();
+ string curExtension = Path.GetExtension(fileItem.Imagefile);
if ( curThumb != "" )
{
string cand = curThumb.Replace( curExtension, "_" + thumbIndex.ToString() + curExtension );
@@ -1121,10 +1124,7 @@
public string GetCurThumbFromThumbsDir(FileItem fileItem)
{
- string curThumb = MediaPortal.Util.Utils.GetCoverArtName(
- Config.GetSubFolder( Config.Dir.Thumbs, @"MyProgramsAlt\" + this.Title ),
- Path.GetFileNameWithoutExtension( fileItem.Filename )
- );
+ string curThumb = ProgramUtils.GetFileImage(this, fileItem);
if ( File.Exists( curThumb ) )
if ( thumbIndex > 0 )
@@ -1132,10 +1132,7 @@
// 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 ),
- Path.GetFileNameWithoutExtension( fileItem.Filename ) + "_" + thumbIndex.ToString()
- );
+ string cand = ProgramUtils.GetFileImage(this, fileItem, thumbIndex);
if ( File.Exists( cand ) )
curThumb = cand;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -401,28 +401,33 @@
return nRes;
}
- public string ExtractImageExtension()
- {
- string strRes = "";
- string[] parts = this.Imagefile.Split( '.' );
- if ( parts.Length >= 2 )
- {
- // there was an extension
- strRes = '.' + parts[parts.Length - 1];
- }
- return strRes;
- }
+ //
+ // no need for these methods anymore
+ //
- public string ExtractImageFileNoPath()
- {
- string strRes = "";
- string[] parts = this.Imagefile.Split( '\\' );
- if ( parts.Length >= 1 )
- {
- strRes = parts[parts.Length - 1];
- }
- return strRes;
- }
+ //public string ExtractImageExtension()
+ //{
+ // string strRes = "";
+ // string[] parts = this.Imagefile.Split( '.' );
+ // if ( parts.Length >= 2 )
+ // {
+ // // there was an extension
+ // strRes = '.' + parts[parts.Length - 1];
+ // }
+ // return strRes;
+ //}
+
+ //public string ExtractImageFileNoPath()
+ //{
+ // string strRes = "";
+ // string[] parts = this.Imagefile.Split( '\\' );
+ // if ( parts.Length >= 1 )
+ // {
+ // strRes = parts[parts.Length - 1];
+ // }
+ // return strRes;
+ //}
+
public void SetProperties()
{
/* string strThumb = MediaPortal.Util.Utils.GetLargeCoverArtName(Thumbs.MovieTitle, Title);*/
@@ -752,6 +757,9 @@
public string GetNewValidImageFile(ApplicationItem curApp, string strExtension)
{
+ if (ProgramUtils.UseThumbsDir())
+ return GetNewValidImageFileFromThumbsDir(curApp, strExtension);
+
if ( curApp == null )
return "";
if ( curApp.imageDirs == null )
@@ -831,58 +839,43 @@
iImgIndex++;
if ( iImgIndex == 0 )
{
- strCand = String.Format( "{0}\\{1}{2}", strFolder, strFileName, strExtension );
+ strCand = String.Format( "{0}\\{1}.{2}", strFolder, strFileName, strExtension );
}
else
{
- strCand = String.Format( "{0}\\{1}_{2}{3}", strFolder, strFileName, iImgIndex, strExtension );
+ strCand = String.Format( "{0}\\{1}_{2}.{3}", strFolder, strFileName, iImgIndex, strExtension );
}
bFound = !File.Exists( strCand );
}
return strCand;
}
- public string GetNewValidImageFileFromThumbsDir(ApplicationItem curApp, string strExtension)
- {
- if ( curApp == null ) return "";
- if ( ( this.Imagefile == "" ) && ( this.Filename == "" ) )
- return "";
+ public string GetNewValidImageFileFromThumbsDir(ApplicationItem curApp, string strExtension)
+ {
+ if (curApp == null) return "";
+ if (this.Filename == "") return "";
- string strCand = "";
- int iImgIndex = -1;
- bool bFound = false;
+ 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 );
+ string folder = ProgramUtils.GetApplicationImageFolder(curApp);
+ 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 );
- }
+ while (!bFound)
+ {
+ iImgIndex++;
+ strCand = ProgramUtils.GetFileImage(curApp, this, iImgIndex);
+ strCand = Path.ChangeExtension(strCand, strExtension);
- return strCand;
- }
+ bFound = !File.Exists(strCand);
+ }
+ return strCand;
+ }
+
public void DeleteImages(ApplicationItem curApp)
{
if ( curApp == null )
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -351,10 +351,7 @@
// imageUrl contains a full URL with one picture to download
i++;
- if (ProgramUtils.UseThumbsDir())
- strFile = curFile.GetNewValidImageFileFromThumbsDir(curApp, Path.GetExtension(imageUrl));
- else
- strFile = curFile.GetNewValidImageFile(curApp, Path.GetExtension(imageUrl));
+ strFile = curFile.GetNewValidImageFile(curApp, Path.GetExtension(imageUrl));
MediaPortal.Util.Utils.DownLoadImage(imageUrl, strFile);
if ((File.Exists(strFile)) && (curFile.Imagefile == ""))
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-08-05 17:23:42 UTC (rev 794)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-08-05 22:21:57 UTC (rev 795)
@@ -47,6 +47,8 @@
using MediaPortal.Util;
using GUIPrograms.Database;
+using GUIPrograms.Items;
+
using MediaPortal.Configuration;
namespace GUIPrograms
@@ -423,11 +425,38 @@
return Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt");
}
- public static string GetApplicationImage(string applicationTitle)
+ public static string GetApplicationImage(ApplicationItem appItem)
{
- return MediaPortal.Util.Utils.GetCoverArtName(GetPluginThumbFolder(), applicationTitle);
+ return MediaPortal.Util.Utils.GetCoverArtName(GetPluginThumbFolder(), appItem.Title);
}
+ public static string GetApplicationImageFolder(ApplicationItem appItem)
+ {
+ string folder = String.Format(@"{0}\{1}", GetPluginThumbFolder(), appItem.Title);
+
+ if (!Directory.Exists(folder))
+ Directory.CreateDirectory(folder);
+
+ return folder;
+ }
+
+ public static string GetFileImage(ApplicationItem appItem, FileItem fileItem)
+ {
+ return GetFileImage(appItem, fileItem, 0);
+ }
+
+ public static string GetFileImage(ApplicationItem appItem, FileItem fileItem, int index)
+ {
+ if (index > 0)
+ return MediaPortal.Util.Utils.GetCoverArtName(
+ GetApplicationImageFolder(appItem),
+ Path.GetFileNameWithoutExtension(fileItem.Filename) + "_" + index.ToString());
+ else
+ return MediaPortal.Util.Utils.GetCoverArtName(
+ GetApplicationImageFolder(appItem),
+ Path.GetFileNameWithoutExtension(fileItem.Filename));
+ }
+
#endregion
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
