Merge pull request #13 from tiagoqpinto/jellyfin

knackebrot · web-flow · commit 309e7c4110ac · 2022-08-22T21:42:48.000+02:00
Add Transcoding option to settings
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs b/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
@@ -23,6 +23,10 @@ public class PluginConfiguration : BasePluginConfiguration
 
         public string RecordingPath { get; set; }
 
+        public bool TranscodedStream { get; set; }
+
+        public string TranscodingPort { get; set; }
+
         public bool EnableDebugLogging { get; set; }
 
 
@@ -44,6 +48,9 @@ public PluginConfiguration()
 
             RecordingPath = "";
 
+            TranscodedStream = false;
+            TranscodingPort = "8002";
+
             EnableDebugLogging = false;
         }
     }
diff --git a/Jellyfin.Plugin.Enigma2/Configuration/configPage.html b/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
@@ -127,6 +127,22 @@ <h1>Enigma2</h1>
                         </div>
                     </div>
 
+                    <div class="checkboxContainer checkboxContainer-withDescription">
+                        <label>
+                            <input is="emby-checkbox" type="checkbox" id="chkTranscodedStream" />
+                            <span>Request Transcoded Stream</span>
+                        </label>
+                        <div class="fieldDescription checkboxFieldDescription">
+                            Request Transcoded Stream (h264, 720p, 1Mpbs and mp4 as default)
+                        </div>
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtTranscodingPort" type="text" label="Enigma2 transcoding port:" />
+                        <div class="fieldDescription">
+                            The Transcoding port of your receiver eg. 8002
+                        </div>
+                    </div>
+
                     <label class="checkboxContainer">
                         <input is="emby-checkbox" type="checkbox" id="chkDebugLogging" />
                         <span>Enable Enigma2 debug logging</span>
@@ -163,6 +179,8 @@ <h1>Enigma2</h1>
                         document.getElementById('chkFetchPiconsFromWebInterface').checked = config.FetchPiconsFromWebInterface || false;
                         document.getElementById('txtPiconsPath').value = config.PiconsPath || "";
                         document.getElementById('txtRecordingPath').value = config.RecordingPath || "";
+                        document.getElementById('chkTranscodedStream').checked = config.TranscodedStream || false;
+                        document.getElementById('txtTranscodingPort').value = config.TranscodingPort || "";
                         document.getElementById('chkDebugLogging').checked = config.EnableDebugLogging || false;
 
                         Dashboard.hideLoadingMsg();
@@ -187,6 +205,8 @@ <h1>Enigma2</h1>
                         config.FetchPiconsFromWebInterface = document.getElementById('chkFetchPiconsFromWebInterface').checked;
                         config.PiconsPath = document.getElementById('txtPiconsPath').value;
                         config.RecordingPath = document.getElementById('txtRecordingPath').value;
+                        config.TranscodedStream = document.getElementById('chkTranscodedStream').checked;
+                        config.TranscodingPort = document.getElementById('txtTranscodingPort').value;
                         config.EnableDebugLogging = document.getElementById('chkDebugLogging').checked;
 
                         ApiClient.updatePluginConfiguration(Enigma2ConfigurationPage.pluginUniqueId, config).then(Dashboard.processPluginConfigurationUpdateResult);
diff --git a/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj b/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <FileVersion>5.0.0.0</FileVersion>
+    <AssemblyVersion>5.0.1.0</AssemblyVersion>
+    <FileVersion>5.0.1.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
diff --git a/Jellyfin.Plugin.Enigma2/LiveTvService.cs b/Jellyfin.Plugin.Enigma2/LiveTvService.cs
@@ -101,6 +101,12 @@ private async Task EnsureConnectionAsync(CancellationToken cancellationToken)
                 throw new InvalidOperationException("Enigma2 Streaming Port must be configured.");
             }
 
+            if (config.TranscodedStream && string.IsNullOrEmpty(config.TranscodingPort))
+            {
+                _logger.LogError("[Enigma2] Transcoding Port must be configured.");
+                throw new InvalidOperationException("Enigma2 Transcoding Port must be configured.");
+            }
+
             if (string.IsNullOrEmpty(config.WebInterfacePort))
             {
                 _logger.LogError("[Enigma2] Web Interface Port must be configured.");
@@ -552,6 +558,7 @@ public async Task<List<ChannelInfo>> GetChannelsForTVBouquetAsync(CancellationTo
         /// <returns>Task{IEnumerable{RecordingInfo}}</returns>
         public async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             return new List<RecordingInfo>();
         }
 
@@ -1127,8 +1134,15 @@ public async Task<MediaSourceInfo> GetChannelStream(string channelOid, string me
                 protocol = "https";
             }
 
-            var baseUrl = protocol + "://" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.StreamingPort;
+            var streamingPort = Plugin.Instance.Configuration.StreamingPort;
+
+            if (Plugin.Instance.Configuration.TranscodedStream)
+            {
+                streamingPort = Plugin.Instance.Configuration.TranscodingPort;
+            }
 
+            var baseUrl = protocol + "://" + Plugin.Instance.Configuration.HostName + ":" + streamingPort;
+            
             //check if we need to zap to channel - single tuner
             if (Plugin.Instance.Configuration.ZapToChannel)
             {
@@ -1137,11 +1151,17 @@ public async Task<MediaSourceInfo> GetChannelStream(string channelOid, string me
 
             if (Plugin.Instance.Configuration.UseLoginForStreams && !string.IsNullOrEmpty(Plugin.Instance.Configuration.WebInterfaceUsername))
             {
-                baseUrl = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.StreamingPort;
+                baseUrl = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + streamingPort;
+            }
+
+            var trancodingUrl = "";
+            if (Plugin.Instance.Configuration.TranscodedStream)
+            {
+                trancodingUrl = "?bitrate=1000000?width=1280?height=720?vcodec=h264?aspectratio=2?interlaced=0.mp4";
             }
 
             _liveStreams++;
-            var streamUrl = string.Format("{0}/{1}", baseUrl, channelOid);
+            var streamUrl = string.Format("{0}/{1}{2}", baseUrl, channelOid, trancodingUrl);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetChannelStream url: {0}", streamUrl));
 
             return new MediaSourceInfo
@@ -1258,6 +1278,7 @@ public async Task<SeriesTimerInfo> GetNewTimerDefaultsAsync(CancellationToken ca
         {
             _logger.LogInformation("[Enigma2] Start GetNewTimerDefaultsAsync");
 
+            await Task.Delay(0); //to avoid await warnings
             var seriesTimerInfo = new SeriesTimerInfo();
 
             return seriesTimerInfo;
@@ -1553,12 +1574,14 @@ public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken
 
         public async Task<MediaSourceInfo> GetRecordingStream(string recordingId, string mediaSourceId, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
 
         public async Task CloseLiveStream(string id, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1589,7 +1612,7 @@ public Task RecordLiveStream(string id, CancellationToken cancellationToken)
         public async Task<IEnumerable<SeriesTimerInfo>> GetSeriesTimersAsync(CancellationToken cancellationToken)
         {
             _logger.LogInformation("[Enigma2] Start GetSeriesTimersAsync");
-
+            await Task.Delay(0); //to avoid await warnings
             var seriesTimerInfo = new List<SeriesTimerInfo>();
             return seriesTimerInfo;
         }
@@ -1603,6 +1626,7 @@ public async Task<IEnumerable<SeriesTimerInfo>> GetSeriesTimersAsync(Cancellatio
         /// <returns></returns>
         public async Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1615,6 +1639,7 @@ public async Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken
         /// <returns></returns>
         public async Task UpdateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1627,6 +1652,7 @@ public async Task UpdateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken
         /// <returns></returns>
         public async Task UpdateTimerAsync(TimerInfo info, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1639,27 +1665,11 @@ public async Task UpdateTimerAsync(TimerInfo info, CancellationToken cancellatio
         /// <returns></returns>
         public async Task CancelSeriesTimerAsync(string timerId, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
 
-        /// <summary>
-        /// Get the DefaultScheduleSettings
-        /// </summary>
-        /// <param name="cancellationToken">The CancellationToken</param>
-        /// <returns></returns>
-        //private async Task<ScheduleSettings> GetDefaultScheduleSettings(CancellationToken cancellationToken)
-        //{
-        //    throw new NotImplementedException();
-        //}
-
-
-        public event EventHandler DataSourceChanged;
-
-
-        public event EventHandler<RecordingStatusChangedEventArgs> RecordingStatusChanged;
-
-
         public Task ResetTuner(string id, CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
diff --git a/build.yaml b/build.yaml
@@ -8,7 +8,7 @@ guid: "193f29f9-ea6c-4595-a6f6-55e79d7c590a"
 # The version of the plugin, starting at 1. Note that the AssemblyVersion
 # and FileVersion flags in the `.csproj` file must have two additional
 # fiels, e.g. 1.0.0 to be built correctly.
-version: "5.0.0.0" # Please increment with each pull request
+version: "5.0.1.0" # Please increment with each pull request
 
 # The supported Jellyfin version, usually the earliest binary-compatible
 # version. Based on the Jellyfin components from NuGet.

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ public class PluginConfiguration : BasePluginConfiguration`
`23`	`23`
`24`	`24`	`public string RecordingPath { get; set; }`
`25`	`25`
	`26`	`+ public bool TranscodedStream { get; set; }`
	`27`	`+`
	`28`	`+ public string TranscodingPort { get; set; }`
	`29`	`+`
`26`	`30`	`public bool EnableDebugLogging { get; set; }`
`27`	`31`
`28`	`32`
`@@ -44,6 +48,9 @@ public PluginConfiguration()`
`44`	`48`
`45`	`49`	`RecordingPath = "";`
`46`	`50`
	`51`	`+ TranscodedStream = false;`
	`52`	`+ TranscodingPort = "8002";`
	`53`	`+`
`47`	`54`	`EnableDebugLogging = false;`
`48`	`55`	`}`
`49`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,12 @@ private async Task EnsureConnectionAsync(CancellationToken cancellationToken)`
`101`	`101`	`throw new InvalidOperationException("Enigma2 Streaming Port must be configured.");`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ if (config.TranscodedStream && string.IsNullOrEmpty(config.TranscodingPort))`
	`105`	`+ {`
	`106`	`+ _logger.LogError("[Enigma2] Transcoding Port must be configured.");`
	`107`	`+ throw new InvalidOperationException("Enigma2 Transcoding Port must be configured.");`
	`108`	`+ }`
	`109`	`+`
`104`	`110`	`if (string.IsNullOrEmpty(config.WebInterfacePort))`
`105`	`111`	`{`
`106`	`112`	`_logger.LogError("[Enigma2] Web Interface Port must be configured.");`
`@@ -552,6 +558,7 @@ public async Task<List<ChannelInfo>> GetChannelsForTVBouquetAsync(CancellationTo`
`552`	`558`	`/// <returns>Task{IEnumerable{RecordingInfo}}</returns>`
`553`	`559`	`public async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(CancellationToken cancellationToken)`
`554`	`560`	`{`
	`561`	`+ await Task.Delay(0); //to avoid await warnings`
`555`	`562`	`return new List<RecordingInfo>();`
`556`	`563`	`}`
`557`	`564`
`@@ -1127,8 +1134,15 @@ public async Task<MediaSourceInfo> GetChannelStream(string channelOid, string me`
`1127`	`1134`	`protocol = "https";`
`1128`	`1135`	`}`
`1129`	`1136`
`1130`		`- var baseUrl = protocol + "://" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.StreamingPort;`
	`1137`	`+ var streamingPort = Plugin.Instance.Configuration.StreamingPort;`
	`1138`	`+`
	`1139`	`+ if (Plugin.Instance.Configuration.TranscodedStream)`
	`1140`	`+ {`
	`1141`	`+ streamingPort = Plugin.Instance.Configuration.TranscodingPort;`
	`1142`	`+ }`
`1131`	`1143`
	`1144`	`+ var baseUrl = protocol + "://" + Plugin.Instance.Configuration.HostName + ":" + streamingPort;`
	`1145`	`+`
`1132`	`1146`	`//check if we need to zap to channel - single tuner`
`1133`	`1147`	`if (Plugin.Instance.Configuration.ZapToChannel)`
`1134`	`1148`	`{`
`@@ -1137,11 +1151,17 @@ public async Task<MediaSourceInfo> GetChannelStream(string channelOid, string me`
`1137`	`1151`
`1138`	`1152`	`if (Plugin.Instance.Configuration.UseLoginForStreams && !string.IsNullOrEmpty(Plugin.Instance.Configuration.WebInterfaceUsername))`
`1139`	`1153`	`{`
`1140`		`- baseUrl = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.StreamingPort;`
	`1154`	`+ baseUrl = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + streamingPort;`
	`1155`	`+ }`
	`1156`	`+`
	`1157`	`+ var trancodingUrl = "";`
	`1158`	`+ if (Plugin.Instance.Configuration.TranscodedStream)`
	`1159`	`+ {`
	`1160`	`+ trancodingUrl = "?bitrate=1000000?width=1280?height=720?vcodec=h264?aspectratio=2?interlaced=0.mp4";`
`1141`	`1161`	`}`
`1142`	`1162`
`1143`	`1163`	`_liveStreams++;`
`1144`		`- var streamUrl = string.Format("{0}/{1}", baseUrl, channelOid);`
	`1164`	`+ var streamUrl = string.Format("{0}/{1}{2}", baseUrl, channelOid, trancodingUrl);`
`1145`	`1165`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetChannelStream url: {0}", streamUrl));`
`1146`	`1166`
`1147`	`1167`	`return new MediaSourceInfo`
`@@ -1258,6 +1278,7 @@ public async Task<SeriesTimerInfo> GetNewTimerDefaultsAsync(CancellationToken ca`
`1258`	`1278`	`{`
`1259`	`1279`	`_logger.LogInformation("[Enigma2] Start GetNewTimerDefaultsAsync");`
`1260`	`1280`
	`1281`	`+ await Task.Delay(0); //to avoid await warnings`
`1261`	`1282`	`var seriesTimerInfo = new SeriesTimerInfo();`
`1262`	`1283`
`1263`	`1284`	`return seriesTimerInfo;`
`@@ -1553,12 +1574,14 @@ public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken`
`1553`	`1574`
`1554`	`1575`	`public async Task<MediaSourceInfo> GetRecordingStream(string recordingId, string mediaSourceId, CancellationToken cancellationToken)`
`1555`	`1576`	`{`
	`1577`	`+ await Task.Delay(0); //to avoid await warnings`
`1556`	`1578`	`throw new NotImplementedException();`
`1557`	`1579`	`}`
`1558`	`1580`
`1559`	`1581`
`1560`	`1582`	`public async Task CloseLiveStream(string id, CancellationToken cancellationToken)`
`1561`	`1583`	`{`
	`1584`	`+ await Task.Delay(0); //to avoid await warnings`
`1562`	`1585`	`throw new NotImplementedException();`
`1563`	`1586`	`}`
`1564`	`1587`
`@@ -1589,7 +1612,7 @@ public Task RecordLiveStream(string id, CancellationToken cancellationToken)`
`1589`	`1612`	`public async Task<IEnumerable<SeriesTimerInfo>> GetSeriesTimersAsync(CancellationToken cancellationToken)`
`1590`	`1613`	`{`
`1591`	`1614`	`_logger.LogInformation("[Enigma2] Start GetSeriesTimersAsync");`
`1592`		`-`
	`1615`	`+ await Task.Delay(0); //to avoid await warnings`
`1593`	`1616`	`var seriesTimerInfo = new List<SeriesTimerInfo>();`
`1594`	`1617`	`return seriesTimerInfo;`
`1595`	`1618`	`}`
`@@ -1603,6 +1626,7 @@ public async Task<IEnumerable<SeriesTimerInfo>> GetSeriesTimersAsync(Cancellatio`
`1603`	`1626`	`/// <returns></returns>`
`1604`	`1627`	`public async Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)`
`1605`	`1628`	`{`
	`1629`	`+ await Task.Delay(0); //to avoid await warnings`
`1606`	`1630`	`throw new NotImplementedException();`
`1607`	`1631`	`}`
`1608`	`1632`
`@@ -1615,6 +1639,7 @@ public async Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken`
`1615`	`1639`	`/// <returns></returns>`
`1616`	`1640`	`public async Task UpdateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)`
`1617`	`1641`	`{`
	`1642`	`+ await Task.Delay(0); //to avoid await warnings`
`1618`	`1643`	`throw new NotImplementedException();`
`1619`	`1644`	`}`
`1620`	`1645`
`@@ -1627,6 +1652,7 @@ public async Task UpdateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken`
`1627`	`1652`	`/// <returns></returns>`
`1628`	`1653`	`public async Task UpdateTimerAsync(TimerInfo info, CancellationToken cancellationToken)`
`1629`	`1654`	`{`
	`1655`	`+ await Task.Delay(0); //to avoid await warnings`
`1630`	`1656`	`throw new NotImplementedException();`
`1631`	`1657`	`}`
`1632`	`1658`
`@@ -1639,27 +1665,11 @@ public async Task UpdateTimerAsync(TimerInfo info, CancellationToken cancellatio`
`1639`	`1665`	`/// <returns></returns>`
`1640`	`1666`	`public async Task CancelSeriesTimerAsync(string timerId, CancellationToken cancellationToken)`
`1641`	`1667`	`{`
	`1668`	`+ await Task.Delay(0); //to avoid await warnings`
`1642`	`1669`	`throw new NotImplementedException();`
`1643`	`1670`	`}`
`1644`	`1671`
`1645`	`1672`
`1646`		`- /// <summary>`
`1647`		`- /// Get the DefaultScheduleSettings`
`1648`		`- /// </summary>`
`1649`		`- /// <param name="cancellationToken">The CancellationToken</param>`
`1650`		`- /// <returns></returns>`
`1651`		`- //private async Task<ScheduleSettings> GetDefaultScheduleSettings(CancellationToken cancellationToken)`
`1652`		`- //{`
`1653`		`- // throw new NotImplementedException();`
`1654`		`- //}`
`1655`		`-`
`1656`		`-`
`1657`		`- public event EventHandler DataSourceChanged;`
`1658`		`-`
`1659`		`-`
`1660`		`- public event EventHandler<RecordingStatusChangedEventArgs> RecordingStatusChanged;`
`1661`		`-`
`1662`		`-`
`1663`	`1673`	`public Task ResetTuner(string id, CancellationToken cancellationToken)`
`1664`	`1674`	`{`
`1665`	`1675`	`throw new NotImplementedException();`