From aff76870787df2bfe969a64c928cc62f46d45acd Mon Sep 17 00:00:00 2001
From: Tiago Pinto <tiagoqpinto@gmail.com>
Date: Tue, 19 Jul 2022 15:12:45 +0100
Subject: [PATCH 1/2] Add Transcoding option to settings

---
 .vscode/tasks.json                            | 41 +++++++++++++++++++
 .../Configuration/PluginConfiguration.cs      |  4 ++
 .../Configuration/configPage.html             | 12 ++++++
 .../Jellyfin.Plugin.Enigma2.csproj            |  4 +-
 Jellyfin.Plugin.Enigma2/LiveTvService.cs      | 35 ++++++++--------
 build.yaml                                    |  2 +-
 6 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..2dba439
--- /dev/null
+++ 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"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs b/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
index 57972b4..64cab1b 100644
--- a/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
+++ b/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
@@ -23,6 +23,8 @@ namespace Jellyfin.Plugin.Enigma2.Configuration
 
         public string RecordingPath { get; set; }
 
+        public bool TranscodedStream { get; set; }
+
         public bool EnableDebugLogging { get; set; }
 
 
@@ -44,6 +46,8 @@ namespace Jellyfin.Plugin.Enigma2.Configuration
 
             RecordingPath = "";
 
+            TranscodedStream = false;
+
             EnableDebugLogging = false;
         }
     }
diff --git a/Jellyfin.Plugin.Enigma2/Configuration/configPage.html b/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
index 810208b..85eb199 100644
--- a/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
+++ b/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
@@ -127,6 +127,16 @@
                         </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>
+
                     <label class="checkboxContainer">
                         <input is="emby-checkbox" type="checkbox" id="chkDebugLogging" />
                         <span>Enable Enigma2 debug logging</span>
@@ -163,6 +173,7 @@
                         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('chkDebugLogging').checked = config.EnableDebugLogging || false;
 
                         Dashboard.hideLoadingMsg();
@@ -187,6 +198,7 @@
                         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.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
index 9a1fab1..6ab3b71 100644
--- 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
index 9db0d34..af47804 100644
--- a/Jellyfin.Plugin.Enigma2/LiveTvService.cs
+++ b/Jellyfin.Plugin.Enigma2/LiveTvService.cs
@@ -552,6 +552,7 @@ namespace Jellyfin.Plugin.Enigma2
         /// <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>();
         }
 
@@ -1140,8 +1141,14 @@ namespace Jellyfin.Plugin.Enigma2
                 baseUrl = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.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 +1265,7 @@ namespace Jellyfin.Plugin.Enigma2
         {
             _logger.LogInformation("[Enigma2] Start GetNewTimerDefaultsAsync");
 
+            await Task.Delay(0); //to avoid await warnings
             var seriesTimerInfo = new SeriesTimerInfo();
 
             return seriesTimerInfo;
@@ -1553,12 +1561,14 @@ namespace Jellyfin.Plugin.Enigma2
 
         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 +1599,7 @@ namespace Jellyfin.Plugin.Enigma2
         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 +1613,7 @@ namespace Jellyfin.Plugin.Enigma2
         /// <returns></returns>
         public async Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1615,6 +1626,7 @@ namespace Jellyfin.Plugin.Enigma2
         /// <returns></returns>
         public async Task UpdateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1627,6 +1639,7 @@ namespace Jellyfin.Plugin.Enigma2
         /// <returns></returns>
         public async Task UpdateTimerAsync(TimerInfo info, CancellationToken cancellationToken)
         {
+            await Task.Delay(0); //to avoid await warnings
             throw new NotImplementedException();
         }
 
@@ -1639,27 +1652,11 @@ namespace Jellyfin.Plugin.Enigma2
         /// <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
index 54e7dd4..a86a473 100644
--- 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.

From 09336872edbe1cf9e20488e1de184b5ceb23225a Mon Sep 17 00:00:00 2001
From: Tiago Pinto <tiagoqpinto@gmail.com>
Date: Wed, 17 Aug 2022 10:59:48 +0100
Subject: [PATCH 2/2] Add transcoding port setting

---
 .../Configuration/PluginConfiguration.cs        |  3 +++
 .../Configuration/configPage.html               |  8 ++++++++
 Jellyfin.Plugin.Enigma2/LiveTvService.cs        | 17 +++++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs b/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
index 64cab1b..ecf9f50 100644
--- a/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
+++ b/Jellyfin.Plugin.Enigma2/Configuration/PluginConfiguration.cs
@@ -25,6 +25,8 @@ namespace Jellyfin.Plugin.Enigma2.Configuration
 
         public bool TranscodedStream { get; set; }
 
+        public string TranscodingPort { get; set; }
+
         public bool EnableDebugLogging { get; set; }
 
 
@@ -47,6 +49,7 @@ namespace Jellyfin.Plugin.Enigma2.Configuration
             RecordingPath = "";
 
             TranscodedStream = false;
+            TranscodingPort = "8002";
 
             EnableDebugLogging = false;
         }
diff --git a/Jellyfin.Plugin.Enigma2/Configuration/configPage.html b/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
index 85eb199..342d2d3 100644
--- a/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
+++ b/Jellyfin.Plugin.Enigma2/Configuration/configPage.html
@@ -136,6 +136,12 @@
                             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" />
@@ -174,6 +180,7 @@
                         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();
@@ -199,6 +206,7 @@
                         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/LiveTvService.cs b/Jellyfin.Plugin.Enigma2/LiveTvService.cs
index af47804..654af5a 100644
--- a/Jellyfin.Plugin.Enigma2/LiveTvService.cs
+++ b/Jellyfin.Plugin.Enigma2/LiveTvService.cs
@@ -101,6 +101,12 @@ namespace Jellyfin.Plugin.Enigma2
                 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.");
@@ -1128,8 +1134,15 @@ namespace Jellyfin.Plugin.Enigma2
                 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)
             {
@@ -1138,7 +1151,7 @@ namespace Jellyfin.Plugin.Enigma2
 
             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 = "";