Browse Source

simplify

pull/2828/head
Jason Dove 5 months ago
parent
commit
610ade5eb1
No known key found for this signature in database
  1. 7
      ErsatzTV.Core/Iptv/ChannelIdentifier.cs
  2. 4
      ErsatzTV.Core/SystemEnvironment.cs
  3. 3
      ErsatzTV/Properties/launchSettings.json

7
ErsatzTV.Core/Iptv/ChannelIdentifier.cs

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
using System.Globalization;
using System.Runtime.InteropServices;
namespace ErsatzTV.Core.Iptv;
@ -9,7 +8,6 @@ public static class ChannelIdentifier @@ -9,7 +8,6 @@ public static class ChannelIdentifier
public static string FromNumber(string channelNumber)
{
string instanceID = SystemEnvironment.InstanceID;
// get rid of any decimal (only two are allowed)
var number = (int)(decimal.Parse(channelNumber, CultureInfo.InvariantCulture) * 100);
var id = 0;
@ -19,6 +17,9 @@ public static class ChannelIdentifier @@ -19,6 +17,9 @@ public static class ChannelIdentifier
number /= 10;
}
return $"C{channelNumber}.{id}.{instanceID}";
string instanceId = SystemEnvironment.InstanceId;
return !string.IsNullOrWhiteSpace(instanceId)
? $"C{channelNumber}.{id}.{instanceId}.ersatztv.org"
: $"C{channelNumber}.{id}.ersatztv.org";
}
}

4
ErsatzTV.Core/SystemEnvironment.cs

@ -10,7 +10,7 @@ public class SystemEnvironment @@ -10,7 +10,7 @@ public class SystemEnvironment
TranscodeFolder = Environment.GetEnvironmentVariable("ETV_TRANSCODE_FOLDER");
InstanceID = Environment.GetEnvironmentVariable("ETV_INSTANCE_ID") ?? "ersatztv.org";
InstanceId = Environment.GetEnvironmentVariable("ETV_INSTANCE_ID");
string uiPortVariable = Environment.GetEnvironmentVariable("ETV_UI_PORT");
if (!int.TryParse(uiPortVariable, out int uiPort))
@ -73,5 +73,5 @@ public class SystemEnvironment @@ -73,5 +73,5 @@ public class SystemEnvironment
public static int? SlowApiMs { get; }
public static int JellyfinPageSize { get; }
public static bool JellyfinEnableStats { get; }
public static string InstanceID { get; }
public static string InstanceId { get; }
}

3
ErsatzTV/Properties/launchSettings.json

@ -7,8 +7,7 @@ @@ -7,8 +7,7 @@
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ENVIRONMENT": "Development",
"ETV_STREAMING_PORT": "8409",
"ETV_UI_PORT": "8410",
"ETV_INSTANCE_ID": "ersatztv.org"
"ETV_UI_PORT": "8410"
}
}
}

Loading…
Cancel
Save