Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3343] trunk/plugins/WebEPGfr
|
From: <fr...@us...> - 2010-01-10 18:19:28
|
Revision: 3343
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3343&view=rev
Author: framug
Date: 2010-01-10 18:19:20 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
Update for changes made by MP RC1 :
1/ xmltv path from TVE3 is on app data folder, now.
2/ need to read config in gentle before access to TvBusinessLayer for getting xmltv settings.
Modified Paths:
--------------
trunk/plugins/WebEPGfr/WebEPGfr.cs
trunk/plugins/WebEPGfr/WebEPGfr.csproj
trunk/plugins/WebEPGfr/WebEPGfrSetup.cs
trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj
Modified: trunk/plugins/WebEPGfr/WebEPGfr.cs
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr.cs 2010-01-09 12:41:44 UTC (rev 3342)
+++ trunk/plugins/WebEPGfr/WebEPGfr.cs 2010-01-10 18:19:20 UTC (rev 3343)
@@ -32,8 +32,10 @@
using MediaPortal.Configuration; // pour PluginIcons
using MediaPortal.Dialogs; // pour g\xE9rer les dialogues MediaPortal
using System.Threading; // pour les threads
-using TvDatabase; // pour r\xE9cup\xE9rer la liste des chaines d\xE9finies dans MP sans TVServer
-using Gentle.Framework; // pour r\xE9cup\xE9rer la liste des chaines d\xE9finies dans MP avec TVServer
+using TvDatabase; // pour r\xE9cup\xE9rer la liste des chaines d\xE9finies dans MP sans TVServer
+using Gentle.Framework; // pour r\xE9cup\xE9rer la liste des chaines d\xE9finies dans MP avec TVServer
+using System.Collections.Specialized; // pour r\xE9cup\xE9rer les billes du entle config
+using System.Configuration; // pour r\xE9cup\xE9rer les billes du entle config
#endregion
namespace WebEPGfr
@@ -359,9 +361,14 @@
return false;
}
}
+
//V\xE9rifier si on a une bonne config de Serveur Tele
private void Verif_Config_TVServer(out bool TVServer_ok)
{
+ // Besoin de recup\xE9rer les billes du gentle config pour acceder \xE0 la database du serveur tele et recuperer le chemin du fichier xmltv
+ NameValueCollection appSettings = ConfigurationManager.AppSettings;
+ appSettings.Set("GentleConfigFile", Config.GetFile(Config.Dir.Config, "gentle.config"));
+
string TestConfigTVServer = "";
// Le fameux serveur tele
TvBusinessLayer layer = new TvBusinessLayer();
@@ -369,15 +376,18 @@
{
TestConfigTVServer = layer.GetSetting("xmlTv", "").Value;
}
- catch (Exception)
+ catch (Exception ex)
{
MessageBox.Show("Probl\xE8me avec le Serveur T\xE9l\xE9. (configuration non faite ou serveur non actif)");
+ Log.Error("erreur sur layer.GetSetting exception :{0}", ex.ToString());
TVServer_ok = false;
+ return;
}
+
TVServer_ok = true;
}
-// V\xE9rifications a faire avant affichage de l'ecran du plugin
+ // V\xE9rifications a faire avant affichage de l'ecran du plugin
private void Verifier_avant_affichage()
{
// Definir 4 libelles pour la boite de dialogue
Modified: trunk/plugins/WebEPGfr/WebEPGfr.csproj
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr.csproj 2010-01-09 12:41:44 UTC (rev 3342)
+++ trunk/plugins/WebEPGfr/WebEPGfr.csproj 2010-01-10 18:19:20 UTC (rev 3343)
@@ -37,7 +37,7 @@
<ItemGroup>
<Reference Include="Core, Version=1.0.1.9976, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <HintPath>..\..\mediaportal\xbmc\bin\Release\Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Databases, Version=1.0.2.42467, Culture=neutral, processorArchitecture=x86">
@@ -45,18 +45,19 @@
<HintPath>bin\Databases.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="Dialogs, Version=1.0.1.40031, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Dialogs, Version=1.0.4.17718, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\Dialogs.dll</HintPath>
+ <HintPath>..\..\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Gentle.Common, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\Gentle.Common.dll</HintPath>
+ <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\Gentle.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Gentle.Framework, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\Gentle.Framework.dll</HintPath>
+ <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\Gentle.Framework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
@@ -65,6 +66,7 @@
<Private>False</Private>
</Reference>
<Reference Include="System" />
+ <Reference Include="System.configuration" />
<Reference Include="System.Data" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
@@ -72,16 +74,17 @@
<Reference Include="System.Xml" />
<Reference Include="TvBusinessLayer, Version=1.0.1.10483, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\TvBusinessLayer.dll</HintPath>
+ <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\TvBusinessLayer.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="TVDatabase, Version=1.0.1.40079, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="TVDatabase, Version=1.0.4.20297, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>bin\TVDatabase.dll</HintPath>
+ <HintPath>..\..\TvEngine3\TVLibrary\TVDatabase\bin\Release\TVDatabase.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Utils, Version=2.2.7.9975, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <HintPath>..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
Modified: trunk/plugins/WebEPGfr/WebEPGfrSetup.cs
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2010-01-09 12:41:44 UTC (rev 3342)
+++ trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2010-01-10 18:19:20 UTC (rev 3343)
@@ -280,7 +280,9 @@
if (Repertoire_XMLTV_MP.Text == "")
{
// donc, je le force par defaut au repertoire du client ou est installe MediaPortal
- Repertoire_XMLTV_MP.Text = AppDomain.CurrentDomain.BaseDirectory + "xmltv"; ;
+ //Repertoire_XMLTV_MP.Text = AppDomain.CurrentDomain.BaseDirectory + "xmltv"; ;
+ // modif de MP : le r\xE9pertoire XMLTV est maintenant dans le dossier Application Data
+ Repertoire_XMLTV_MP.Text = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + @"\Team MediaPortal\MediaPortal TV Server\xmltv"; ;
}
}
// Le nom du fichier guide est TVguide.xml par d\xE9faut, dans MediaPortal
Modified: trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2010-01-09 12:41:44 UTC (rev 3342)
+++ trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2010-01-10 18:19:20 UTC (rev 3343)
@@ -35,7 +35,7 @@
<ItemGroup>
<Reference Include="Core, Version=1.0.1.9976, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
@@ -43,7 +43,7 @@
<Reference Include="System.Xml" />
<Reference Include="Utils, Version=2.2.7.9975, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
