diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config new file mode 100644 index 0000000..67f8ea0 --- /dev/null +++ b/src/.nuget/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe new file mode 100644 index 0000000..9f8781d Binary files /dev/null and b/src/.nuget/NuGet.exe differ diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets new file mode 100644 index 0000000..3f8c37b --- /dev/null +++ b/src/.nuget/NuGet.targets @@ -0,0 +1,144 @@ + + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + + + + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + + + + + $(SolutionDir).nuget + + + + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config + + + + $(MSBuildProjectDirectory)\packages.config + $(PackagesProjectConfig) + + + + + $(NuGetToolsPath)\NuGet.exe + @(PackageSource) + + "$(NuGetExePath)" + mono --runtime=v4.0.30319 "$(NuGetExePath)" + + $(TargetDir.Trim('\\')) + + -RequireConsent + -NonInteractive + + "$(SolutionDir) " + "$(SolutionDir)" + + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) + $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols + + + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Configuration/configPage.html b/src/Configuration/configPage.html index 9ed4517..41e1a3a 100644 --- a/src/Configuration/configPage.html +++ b/src/Configuration/configPage.html @@ -4,122 +4,117 @@ Vu+ -
+
+ +

VuPlus

+
-
    -
  • - - -
    - The host name (address) or ip address of your receiver -
    -
  • -
  • - - -
    - The Streaming port of your receiver eg. 8001 -
    -
  • -
  • - - -
    - The web Interface port of your receiver eg. 8000 -
    -
  • -
  • - - -
    - The web Interface username of your receiver (optional) -
    -
  • -
  • - - -
    - The web Interface password of your receiver (optional) -
    -
  • +
    + +
    + The host name (address) or ip address of your receiver +
    +
    +
    + +
    + The Streaming port of your receiver eg. 8001 +
    +
    +
    + +
    + The web Interface port of your receiver eg. 8000 +
    +
    +
    + +
    + The web Interface username of your receiver (optional) +
    +
    +
    + +
    + The web Interface password of your receiver (optional) +
    +
    -
  • - - -
    - Use HTTPS to connect to your receiver -
    -
  • +
    + +
    + Use HTTPS to connect to your receiver +
    +
    + +
    + +
    + Limit channels to only those contained within the specified TV Bouquet below (optional) +
    +
    -
  • - - -
    - Limit channels to only those contained within the specified TV Bouquet below (optional) -
    -
  • +
    + +
    + The TV Bouquet to load channels for (optional) +
    +
    + +
    + +
    + Set if only one tuner within receiver +
    +
    + +
    + +
    + Set if you want to retrieve Picons from the web interface of the receiver +
    +
    -
  • - - -
    - The TV Bouquet to load channels for (optional) -
    +
    + +
    + The local location of your Picons eg. C:\Picons\ (optional) +
    +
    -
  • - -
  • - - -
    - Set if only one tuner within receiver -
    -
  • +
    + +
    + The location to store your recordings on your receiver eg. /hdd/movie/ (optional) +
    +
    + - -
  • - - -
    - Set if you want to retrieve Picons from the web interface of the receiver -
    -
  • - - -
  • - - -
    - The local location of your Picons eg. C:\Picons\ (optional) -
    -
  • - -
  • - - -
    - The location to store your recordings on your receiver eg. /hdd/movie/ (optional) -
    -
  • - -
  • - - -
  • - - -
  • - - -
  • -
+
+ +
@@ -130,7 +125,7 @@ var VuPlusConfigurationPage = { pluginUniqueId: "9564ac10-af23-39bc-449f-624f23cfa48f" - }; + }; $('.VuPlusConfigurationPage').on('pageshow', function (event) { @@ -138,7 +133,7 @@ var page = this; - ApiClient.getPluginConfiguration(VuPlusConfigurationPage.pluginUniqueId).done(function (config) { + ApiClient.getPluginConfiguration(VuPlusConfigurationPage.pluginUniqueId).then(function (config) { $('#txtHostName', page).val(config.HostName || ""); $('#txtStreamingPort', page).val(config.StreamingPort || ""); @@ -152,7 +147,7 @@ $('#chkFetchPiconsFromWebInterface', page).checked(config.FetchPiconsFromWebInterface || false).checkboxradio("refresh"); $('#txtPiconsPath', page).val(config.PiconsPath || ""); - $('#txtRecordingPath', page).val(config.RecordingPath || ""); + $('#txtRecordingPath', page).val(config.RecordingPath || ""); $('#chkDebugLogging', page).checked(config.EnableDebugLogging || false).checkboxradio("refresh"); @@ -166,7 +161,7 @@ var form = this; - ApiClient.getPluginConfiguration(VuPlusConfigurationPage.pluginUniqueId).done(function (config) { + ApiClient.getPluginConfiguration(VuPlusConfigurationPage.pluginUniqueId).then(function (config) { //reset TV bouquet reference if TV Bouquet changed //if (config.TVBouquet != $('#txtTVBouquet', form).val()) { @@ -175,8 +170,8 @@ //reset TV bouquet reference if Only 1 Bouquet not set //if ($('#chkOnlyOneBouquet', form).checked()) { - //} - //else + //} + //else //{ // config.tvBouquetSRef = ''; //} @@ -197,7 +192,7 @@ config.EnableDebugLogging = $('#chkDebugLogging', form).checked(); - ApiClient.updatePluginConfiguration(VuPlusConfigurationPage.pluginUniqueId, config).done(Dashboard.processPluginConfigurationUpdateResult); + ApiClient.updatePluginConfiguration(VuPlusConfigurationPage.pluginUniqueId, config).then(Dashboard.processPluginConfigurationUpdateResult); }); // Disable default form submission diff --git a/src/MediaBrowser.Plugins.VuPlus.csproj b/src/MediaBrowser.Plugins.VuPlus.csproj index e394e04..596d6a3 100644 --- a/src/MediaBrowser.Plugins.VuPlus.csproj +++ b/src/MediaBrowser.Plugins.VuPlus.csproj @@ -32,17 +32,20 @@ 4 - - False - ..\packages\MediaBrowser.Common.3.0.566\lib\net45\MediaBrowser.Common.dll + + packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll - - False - ..\packages\MediaBrowser.Server.Core.3.0.566\lib\net45\MediaBrowser.Controller.dll + + packages\MediaBrowser.Common.3.0.658\lib\net45\MediaBrowser.Common.dll + True - - False - ..\packages\MediaBrowser.Common.3.0.566\lib\net45\MediaBrowser.Model.dll + + packages\MediaBrowser.Server.Core.3.0.658\lib\net45\MediaBrowser.Controller.dll + True + + + packages\MediaBrowser.Common.3.0.658\lib\net45\MediaBrowser.Model.dll + True @@ -53,7 +56,7 @@ - + Properties\SharedVersion.cs @@ -76,7 +79,7 @@ - xcopy "$(TargetPath)" "$(SolutionDir)\..\MediaBrowser\ProgramData-Server\Plugins\" /y + xcopy "$(TargetPath)" "$(SolutionDir)\..\..\Emby.dev\ProgramData-Server\Plugins\" /y