XBMC Provider finished
This commit is contained in:
parent
2af078b23d
commit
0cb20b0092
|
@ -0,0 +1,32 @@
|
||||||
|
Missing after HDD Failure....
|
||||||
|
|
||||||
|
ExternalNotiifcationProvider
|
||||||
|
- NotifyOnGrab, Download, Rename
|
||||||
|
|
||||||
|
XbmcProvider
|
||||||
|
- SendNotification
|
||||||
|
- Update
|
||||||
|
- Clean
|
||||||
|
|
||||||
|
Settings/Notications
|
||||||
|
NoticationSettingsModel
|
||||||
|
XBMC:
|
||||||
|
Enabled
|
||||||
|
Notify On: Grab, Download, Rename
|
||||||
|
Update On: Download, Rename
|
||||||
|
FullUpdate (If Required)
|
||||||
|
Clean On: Download, Rename
|
||||||
|
Show Image?
|
||||||
|
TimeToDisplay?
|
||||||
|
|
||||||
|
|
||||||
|
ServerHelper
|
||||||
|
- Get IP/Hostname
|
||||||
|
|
||||||
|
|
||||||
|
SyncProvider Changes
|
||||||
|
- Add by Root or Single Series
|
||||||
|
|
||||||
|
AddSeries
|
||||||
|
- Simlar to SB
|
||||||
|
- FileBrowserModel - Name, Path
|
|
@ -158,6 +158,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Helpers\EpisodeRenameHelper.cs" />
|
<Compile Include="Helpers\EpisodeRenameHelper.cs" />
|
||||||
<Compile Include="Helpers\EpisodeSortingHelper.cs" />
|
<Compile Include="Helpers\EpisodeSortingHelper.cs" />
|
||||||
|
<Compile Include="Helpers\ServerHelper.cs" />
|
||||||
<Compile Include="Instrumentation\ILogProvider.cs" />
|
<Compile Include="Instrumentation\ILogProvider.cs" />
|
||||||
<Compile Include="Instrumentation\LogLevel.cs" />
|
<Compile Include="Instrumentation\LogLevel.cs" />
|
||||||
<Compile Include="Instrumentation\LogProvider.cs" />
|
<Compile Include="Instrumentation\LogProvider.cs" />
|
||||||
|
@ -173,20 +174,26 @@
|
||||||
<Compile Include="Model\NzbInfoModel.cs" />
|
<Compile Include="Model\NzbInfoModel.cs" />
|
||||||
<Compile Include="Model\NzbSiteModel.cs" />
|
<Compile Include="Model\NzbSiteModel.cs" />
|
||||||
<Compile Include="Model\SabnzbdPriorityType.cs" />
|
<Compile Include="Model\SabnzbdPriorityType.cs" />
|
||||||
|
<Compile Include="Providers\ExternalNotificationProvider.cs" />
|
||||||
<Compile Include="Providers\HistoryProvider.cs" />
|
<Compile Include="Providers\HistoryProvider.cs" />
|
||||||
|
<Compile Include="Providers\IExtenalNotificationProvider.cs" />
|
||||||
<Compile Include="Providers\IHistoryProvider.cs" />
|
<Compile Include="Providers\IHistoryProvider.cs" />
|
||||||
<Compile Include="Providers\IIndexerProvider.cs" />
|
<Compile Include="Providers\IIndexerProvider.cs" />
|
||||||
<Compile Include="Providers\IndexerProvider.cs" />
|
<Compile Include="Providers\IndexerProvider.cs" />
|
||||||
|
<Compile Include="Providers\IPostProcessingProvider.cs" />
|
||||||
<Compile Include="Providers\IQualityProvider.cs" />
|
<Compile Include="Providers\IQualityProvider.cs" />
|
||||||
<Compile Include="Providers\IRenameProvider.cs" />
|
<Compile Include="Providers\IRenameProvider.cs" />
|
||||||
<Compile Include="Providers\IRssSyncProvider.cs" />
|
<Compile Include="Providers\IRssSyncProvider.cs" />
|
||||||
<Compile Include="Providers\IRssProvider.cs" />
|
<Compile Include="Providers\IRssProvider.cs" />
|
||||||
<Compile Include="Providers\ITimerProvider.cs" />
|
<Compile Include="Providers\ITimerProvider.cs" />
|
||||||
|
<Compile Include="Providers\IXbmcProvider.cs" />
|
||||||
|
<Compile Include="Providers\PostProcessingProvider.cs" />
|
||||||
<Compile Include="Providers\QualityProvider.cs" />
|
<Compile Include="Providers\QualityProvider.cs" />
|
||||||
<Compile Include="Providers\RenameProvider.cs" />
|
<Compile Include="Providers\RenameProvider.cs" />
|
||||||
<Compile Include="Providers\RssSyncProvider.cs" />
|
<Compile Include="Providers\RssSyncProvider.cs" />
|
||||||
<Compile Include="Providers\RssProvider.cs" />
|
<Compile Include="Providers\RssProvider.cs" />
|
||||||
<Compile Include="Providers\TimerProvider.cs" />
|
<Compile Include="Providers\TimerProvider.cs" />
|
||||||
|
<Compile Include="Providers\XbmcProvider.cs" />
|
||||||
<Compile Include="Repository\EpisodeFile.cs" />
|
<Compile Include="Repository\EpisodeFile.cs" />
|
||||||
<Compile Include="Model\Notification\BasicNotification.cs" />
|
<Compile Include="Model\Notification\BasicNotification.cs" />
|
||||||
<Compile Include="Model\Notification\ProgressNotificationStatus.cs" />
|
<Compile Include="Model\Notification\ProgressNotificationStatus.cs" />
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Model;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Providers
|
namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
public interface IExtenalNotificationProvider
|
public interface IExtenalNotificationProvider
|
||||||
{
|
{
|
||||||
void OnGrab(string message);
|
void OnGrab(string message);
|
||||||
void OnDownload(EpisodeFile episodeFile);
|
void OnDownload(EpisodeRenameModel erm);
|
||||||
void OnRename(EpisodeFile episodeFile);
|
void OnRename(EpisodeRenameModel erm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -198,10 +198,10 @@ namespace NzbDrone.Core.Providers
|
||||||
_mediaFileProvider.Update(erm.EpisodeFile);
|
_mediaFileProvider.Update(erm.EpisodeFile);
|
||||||
|
|
||||||
if (erm.NewDownload)
|
if (erm.NewDownload)
|
||||||
_externalNotificationProvider.OnDownload();
|
_externalNotificationProvider.OnDownload(erm);
|
||||||
|
|
||||||
else
|
else
|
||||||
_externalNotificationProvider.OnRename();
|
_externalNotificationProvider.OnRename(erm);
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using System.Xml.Linq;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using NzbDrone.Core.Helpers;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Providers
|
namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
|
@ -26,27 +29,54 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
//Get time in seconds and convert to ms
|
//Get time in seconds and convert to ms
|
||||||
var time = Convert.ToInt32(_configProvider.GetValue("XbmcDisplayTime", "3", true)) * 1000;
|
var time = Convert.ToInt32(_configProvider.GetValue("XbmcDisplayTime", "3", true)) * 1000;
|
||||||
|
|
||||||
var command = String.Format("ExecBuiltIn(Notification({0},{1},{2}))", header, message, time);
|
var command = String.Format("ExecBuiltIn(Notification({0},{1},{2}))", header, message, time);
|
||||||
|
|
||||||
|
if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotificationImage", false, true)))
|
||||||
|
{
|
||||||
|
//Todo: Get the actual port that NzbDrone is running on...
|
||||||
|
var serverInfo = String.Format("http://{0}:{1}", ServerHelper.GetServerHostname(), "8989");
|
||||||
|
|
||||||
|
var imageUrl = String.Format("{0}/Content/XbmcNotification.png", serverInfo);
|
||||||
|
command = String.Format("ExecBuiltIn(Notification({0},{1},{2}, {3}))", header, message, time, imageUrl);
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var host in _configProvider.GetValue("XbmcHosts", "localhost:80", true).Split(','))
|
foreach (var host in _configProvider.GetValue("XbmcHosts", "localhost:80", true).Split(','))
|
||||||
{
|
{
|
||||||
Logger.Trace("Sending Notifcation to XBMC Host: {0}", host);
|
Logger.Trace("Sending Notifcation to XBMC Host: {0}", host);
|
||||||
|
SendCommand(host, command);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update(int seriesId)
|
public void Update(int seriesId)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
foreach (var host in _configProvider.GetValue("XbmcHosts", "localhost:80", true).Split(','))
|
||||||
|
{
|
||||||
|
Logger.Trace("Sending Update DB Request to XBMC Host: {0}", host);
|
||||||
|
var xbmcSeriesPath = GetXbmcSeriesPath(host, seriesId);
|
||||||
|
|
||||||
|
//If the path is not found & the user wants to update the entire library, do it now.
|
||||||
|
if (String.IsNullOrEmpty(xbmcSeriesPath) && Convert.ToBoolean(_configProvider.GetValue("XbmcFullUpdate", false, true)))
|
||||||
|
{
|
||||||
|
//Update the entire library
|
||||||
|
Logger.Trace("Series [{0}] doesn't exist on XBMC host: {1}, Updating Entire Library", seriesId, host);
|
||||||
|
SendCommand(host, "ExecBuiltIn(UpdateLibrary(video))");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var command = String.Format("ExecBuiltIn(UpdateLibrary(video,{0}))", xbmcSeriesPath);
|
||||||
|
SendCommand(host, command);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Clean()
|
public void Clean()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
foreach (var host in _configProvider.GetValue("XbmcHosts", "localhost:80", true).Split(','))
|
||||||
|
{
|
||||||
|
Logger.Trace("Sending DB Clean Request to XBMC Host: {0}", host);
|
||||||
|
|
||||||
|
var command = String.Format("ExecBuiltIn(CleanLibrary(database) )");
|
||||||
|
SendCommand(host, command);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -75,5 +105,34 @@ namespace NzbDrone.Core.Providers
|
||||||
|
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string GetXbmcSeriesPath(string host, int seriesId)
|
||||||
|
{
|
||||||
|
var query = String.Format("select path.strPath from path, tvshow, tvshowlinkpath where tvshow.c12 = {0} and tvshowlinkpath.idShow = tvshow.idShow and tvshowlinkpath.idPath = path.idPath", seriesId);
|
||||||
|
var command = String.Format("QueryVideoDatabase({0})", query);
|
||||||
|
|
||||||
|
var setResponseCommand = "SetResponseFormat(webheader;false;webfooter;false;header;<xml>;footer;</xml>;opentag;<tag>;closetag;</tag>;closefinaltag;false)";
|
||||||
|
var resetResponseCommand = "SetResponseFormat()";
|
||||||
|
|
||||||
|
SendCommand(host, setResponseCommand);
|
||||||
|
var response = SendCommand(host, command);
|
||||||
|
SendCommand(host, resetResponseCommand);
|
||||||
|
|
||||||
|
if (String.IsNullOrEmpty(response))
|
||||||
|
return String.Empty;
|
||||||
|
|
||||||
|
var xDoc = XDocument.Load(new StringReader(response));
|
||||||
|
var xml = (from x in xDoc.Descendants("xml") select x).FirstOrDefault();
|
||||||
|
|
||||||
|
if (xml == null)
|
||||||
|
return String.Empty;
|
||||||
|
|
||||||
|
var field = xml.Descendants("field").FirstOrDefault();
|
||||||
|
|
||||||
|
if (field == null)
|
||||||
|
return String.Empty;
|
||||||
|
|
||||||
|
return field.Value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,6 +231,7 @@
|
||||||
<Content Include="Content\Windows7\editor.png" />
|
<Content Include="Content\Windows7\editor.png" />
|
||||||
<Content Include="Content\Windows7\loading.gif" />
|
<Content Include="Content\Windows7\loading.gif" />
|
||||||
<Content Include="Content\Windows7\sprite.png" />
|
<Content Include="Content\Windows7\sprite.png" />
|
||||||
|
<Content Include="Content\XbmcNotification.png" />
|
||||||
<Content Include="Global.asax" />
|
<Content Include="Global.asax" />
|
||||||
<Content Include="Libraries\Telerik.Web.Mvc.dll" />
|
<Content Include="Libraries\Telerik.Web.Mvc.dll" />
|
||||||
<Content Include="Libraries\Telerik.Web.Mvc.xml" />
|
<Content Include="Libraries\Telerik.Web.Mvc.xml" />
|
||||||
|
|
Loading…
Reference in New Issue