Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [266] trunk/plugins/MyFilms
|
From: <ze...@us...> - 2007-03-31 11:14:18
|
Revision: 266
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=266&view=rev
Author: zebons
Date: 2007-03-31 04:14:14 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
add rating for DVDProfiler
Correct some bugs on ESC key press
add a reset of last-position when quit setup (for cleaning when a bug is encountered with that function)
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-31 08:54:56 UTC (rev 265)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-31 11:14:14 UTC (rev 266)
@@ -20,7 +20,7 @@
ProfilerDict.Add("SortTitle", "TranslatedTitle");
ProfilerDict.Add("SortTitle1", "FormattedTitle");
ProfilerDict.Add("CollectionNumber", "Number");
- ProfilerDict.Add("Notes/Rating", "Rating");
+ ProfilerDict.Add("Review/ReviewFilm", "Rating");
ProfilerDict.Add("Notes/File", "URL");
ProfilerDict.Add("Notes/Country", "Country");
ProfilerDict.Add("Year", "Year");
@@ -32,10 +32,16 @@
ProfilerDict.Add("Picture", "Picture");
}
- public string ConvertProfiler(string source)
+ public string ConvertProfiler(string source, string folderimage)
{
//string destFile = Path.GetTempPath()+@"AntTempFile.xml";
- string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
+ //string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
+ string WStrPathImg;
+ if (folderimage.Substring(folderimage.Length - 1) == "\\")
+ WStrPathImg = folderimage.Substring(0, folderimage.LastIndexOf(@"\"));
+ else
+ WStrPathImg = folderimage;
+ string destFile = WStrPathImg + "\\" + source.Substring(source.LastIndexOf(@"\") + 1, source.Length - source.LastIndexOf(@"\") - 5) + "_tmp.xml";
XmlTextWriter destXml = new XmlTextWriter(destFile,Encoding.Default);
destXml.Formatting = Formatting.Indented;
destXml.WriteStartDocument();
@@ -68,16 +74,10 @@
string Country = null;
if (nodeNotes != null && nodeNotes.InnerText != null)
{
- MessageBox.Show(nodeNotes.InnerText + ", " + nodeNotes.InnerText.IndexOf("<File>").ToString() + ", " + nodeNotes.InnerText.IndexOf("</File>").ToString());
if (nodeNotes.InnerText.IndexOf("<File>") != -1)
File = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<File>") + 6, nodeNotes.InnerText.IndexOf("</File>") - nodeNotes.InnerText.IndexOf("<File>") - 6);
if (nodeNotes.InnerText.IndexOf("<Country>") != -1)
Country = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Country>") + 9, nodeNotes.InnerText.IndexOf("</Country>") - nodeNotes.InnerText.IndexOf("<Country>") - 9);
- //if (nodeNotes.InnerText.IndexOf("<Rating>") != -1)
- // Rating = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Rating>") + 8, nodeNotes.InnerText.IndexOf("</Rating>") - nodeNotes.InnerText.IndexOf("<Rating>") - 8);
- MessageBox.Show(File);
- MessageBox.Show(Country);
- MessageBox.Show(Rating);
}
string genre = String.Empty;
@@ -125,7 +125,7 @@
credits += String.Format("{0} {1}", firstname, lastname);
}
}
- //rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg";
+ string Image = folderimage + @"\" + nodeID.InnerText.Trim() + "f.jpg";
XmlNode nodeRating = nodeDVD.SelectSingleNode("Review/ReviewFilm");
if (nodeRating != null && nodeRating.InnerText != null)
Rating = nodeRating.InnerText + ".0";
@@ -141,13 +141,14 @@
WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
WriteAntAtribute(destXml, "Notes/File", File);
WriteAntAtribute(destXml, "Notes/Country", Country);
- WriteAntAtribute(destXml, "Notes/Rating", Rating);
+ WriteAntAtribute(destXml, "Review/ReviewFilm", Rating);
WriteAntAtribute(destXml, "Year", nodeYear.InnerText);
WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText);
WriteAntAtribute(destXml, "Genres", genre);
WriteAntAtribute(destXml, "Credits", credits);
WriteAntAtribute(destXml, "Actors", cast);
- WriteAntAtribute(destXml, "Picture", nodeID.InnerText.Trim() + "f.jpg");
+// WriteAntAtribute(destXml, "Picture", nodeID.InnerText.Trim() + "f.jpg");
+ WriteAntAtribute(destXml, "Picture", Image);
if (nodeOverview != null && nodeOverview.InnerText != null)
WriteAntAtribute(destXml, "Overview", nodeOverview.InnerText);
else
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 08:54:56 UTC (rev 265)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 11:14:14 UTC (rev 266)
@@ -912,18 +912,12 @@
//-----------------------------------------------------------------------------------------
private bool ControlFichierDonn\xE9es()
{
+ if (StrFileXml == "")
+ return false;
if (File.Exists(StrFileXml))
- {
- choice_menu = false;
return true;
- }
else
{
- if (choice_menu)
- {
- choice_menu = false;
- return false;
- }
GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlgOk.SetHeading(3);//my videos
dlgOk.SetLine(1, "The ANT '.xml' file is missing");
@@ -1139,6 +1133,7 @@
StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
+ StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
switch (StrFileType)
{
case "0":
@@ -1146,21 +1141,25 @@
case "1":
if (create_temp)
{
- string destFile = StrFileXml.Substring(0, StrFileXml.Length - 4) + "_tmp.xml";
+ string WStrPathImg;
+ if (StrPathImg.Substring(StrPathImg.Length - 1) == "\\")
+ WStrPathImg = StrPathImg.Substring(0, StrPathImg.LastIndexOf(@"\"));
+ else
+ WStrPathImg = StrPathImg;
+ string destFile = WStrPathImg + "\\" + StrFileXml.Substring(StrFileXml.LastIndexOf(@"\") + 1, StrFileXml.Length - StrFileXml.LastIndexOf(@"\") - 5) + "_tmp.xml";
if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(StrFileXml))))
{
StrFileXml = destFile;
break;
}
CatalogConverter cv = new CatalogConverter();
- StrFileXml = cv.ConvertProfiler(StrFileXml);
+ StrFileXml = cv.ConvertProfiler(StrFileXml,StrPathImg);
}
else
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
break;
}
- StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", "");
StrDfltSelect = xmlreader.GetValueAsString(CurrentConfig, "StrDfltSelect", "");
@@ -1189,7 +1188,7 @@
if (dlg == null)
{
StrFileXml = "";
- return "";
+ return CurrentConfig;
}
dlg.Reset();
dlg.SetHeading(924); // menu
@@ -1205,7 +1204,7 @@
if (dlg.SelectedLabel == -1)
{
StrFileXml = "";
- return "";
+ return CurrentConfig;
}
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
@@ -1300,7 +1299,6 @@
GetFilmList(l_index);
}
-
}
}
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-31 08:54:56 UTC (rev 265)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-31 11:14:14 UTC (rev 266)
@@ -31,7 +31,7 @@
private void MesFilmsSetup_Load(object sender, EventArgs e)
{
-// Refresh_Items();
+ Refresh_Items(false);
textBox1.Text = MyFilms_xmlreader.GetValueAsString("MyFilms", "PluginName", "Films");
MesFilms_nb_config = MyFilms_xmlreader.GetValueAsInt("MyFilms", "NbConfig", -1);
for (int i = 0; i < (int)MesFilms_nb_config; i++)
@@ -323,7 +323,7 @@
Config_Name.Items.Add(w_Config_Name);
Config_Name.Text = w_Config_Name;
// Config_Name.ResetText();
-// Refresh_Items();
+ Refresh_Items(false);
}
private void butPath_Click(object sender, EventArgs e)
@@ -354,7 +354,7 @@
private void Config_Name_SelectedIndexChanged(object sender, EventArgs e)
{
-// Refresh_Items();
+ Refresh_Items(false);
CatalogType.SelectedIndex = Convert.ToInt16(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "CatalogType", "0"));
MesFilmsCat.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntCatalog", "");
MesFilmsImg.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntPicture", "");
@@ -403,9 +403,14 @@
View_Dflt_Item.Items.Add(AntViewItem2.Text);
View_Dflt_Item.Items.Remove("");
}
- private void Refresh_Items()
+ private void Refresh_Items(bool all)
{
CatalogType.SelectedIndex = 0;
+ StrDfltSelect = "";
+ mydivx.Clear();
+ Config_Dflt.Checked = false;
+ if (!all)
+ return;
MesFilmsCat.ResetText();
MesFilmsImg.ResetText();
AntStorage.ResetText();
@@ -441,7 +446,6 @@
TitleDelim.ResetText();
View_Dflt_Item.ResetText();
View_Dflt_Text.ResetText();
- Config_Dflt.Checked = false;
View_Dflt_Item.Items.Clear();
View_Dflt_Item.Items.Add("(none)");
View_Dflt_Item.Items.Add("Year");
@@ -517,13 +521,14 @@
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
Config_Name.Items.Remove(Config_Name.Text);
- Refresh_Items();
+ Refresh_Items(true);
Config_Name.ResetText();
}
}
private void MesFilmsSetup_Quit(object sender, FormClosedEventArgs e)
{
+ MyFilms_xmlwriter.SetValue("MyFilms", "Current_Config", "");
if (Config_Name.Items.Count == 0)
{
DialogResult dialogResult = MessageBox.Show("No Configuration defined; the plugin'll not work !", "Information", MessageBoxButtons.OKCancel,
@@ -541,6 +546,8 @@
for (int i = 0; i < (int)Config_Name.Items.Count; i++)
{
MyFilms_xmlwriter.SetValue("MyFilms", "ConfigName" + i, Config_Name.Items[i]);
+ MyFilms_xmlwriter.SetValue("ConfigName" + i, "IndexItem", -1);
+ MyFilms_xmlwriter.SetValue("ConfigName" + i, "LastID", "");
if (Config_Name.Items.Count == 1)
MyFilms_xmlwriter.SetValue("MyFilms", "Default_Config", Config_Name.Items[i]);
}
@@ -591,7 +598,7 @@
break;
}
CatalogConverter cc = new CatalogConverter();
- mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text));
+ mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text,MesFilmsImg.Text));
break;
}
DataRow[] movies = mydivx.Movie.Select(StrDfltSelect + AntTitle1.Text + " not like ''");
@@ -637,7 +644,8 @@
private void button1_Click(object sender, EventArgs e)
{
CatalogConverter cc = new CatalogConverter();
- cc.ConvertProfiler(MesFilmsCat.Text);
+ cc.ConvertProfiler(MesFilmsCat.Text, MesFilmsImg.Text);
}
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
