fix: Dummies

SenexCrenshaw · Feb 2, 2024 · 08a0d97 · 08a0d97
1 parent 6b2568f
commit 08a0d97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/StreamMaster.Application/StreamGroups/Queries/GetStreamGroupEPG.cs b/StreamMaster.Application/StreamGroups/Queries/GetStreamGroupEPG.cs
@@ -78,34 +78,10 @@ public async Task<string> Handle(GetStreamGroupEPG request, CancellationToken ca
             videoStreamConfig.IsDummy = epgHelper.IsDummy(videoStreamConfig.User_Tvg_ID);
 
             if (videoStreamConfig.IsDummy)
-            {
-                // Initialize a variable to hold the service
-                MxfService? service = null;
-
-                // Check if User_Tvg_ID is not empty and assign the corresponding service
-                if (!string.IsNullOrEmpty(videoStreamConfig.User_Tvg_ID))
-                {
-                    service = allservices.Find(a => a.StationId.Equals(videoStreamConfig.User_Tvg_ID, StringComparison.CurrentCultureIgnoreCase));
-                }
-                // If service is still null and Tvg_ID is not empty, assign the corresponding service
-                else if (!string.IsNullOrEmpty(videoStreamConfig.Tvg_ID))
-                {
-                    service = allservices.Find(a => a.StationId.Equals(videoStreamConfig.Tvg_ID, StringComparison.CurrentCultureIgnoreCase));
-                }
-
-                // If a service is found, update User_Tvg_ID accordingly
-                if (service != null)
-                {
-                    videoStreamConfig.User_Tvg_ID = $"{service.EPGNumber}-{service.StationId}";
-                    videoStreamConfig.IsDummy = false;
-                }
-                else
-                {
-
-                    videoStreamConfig.User_Tvg_ID = EPGHelper.DummyId + "-" + videoStreamConfig.Id;
-
-                    dummyData.FindOrCreateDummyService(videoStreamConfig.Id, videoStreamConfig);
-                }
+            {              
+                videoStreamConfig.User_Tvg_ID = $"{EPGHelper.DummyId}-{videoStreamConfig.Id}";
+
+                dummyData.FindOrCreateDummyService(videoStreamConfig.User_Tvg_ID, videoStreamConfig);                
             }
 
             if (epgids.Contains(videoStreamConfig.User_Tvg_ID))

diff --git a/StreamMaster.SchedulesDirect/XMLTVBuilder.cs b/StreamMaster.SchedulesDirect/XMLTVBuilder.cs
@@ -99,8 +99,8 @@ public class XMLTVBuilder(IMemoryCache memoryCache, IEPGHelper ePGHelper, IIconS
 
                 if (origService.EPGNumber == EPGHelper.DummyId && !string.IsNullOrEmpty(videoStreamConfig.Tvg_ID))
                 {
-
-                    callSign = videoStreamConfig.Tvg_ID;
+                    (epgNumber, stationId) = ePGHelper.ExtractEPGNumberAndStationId(videoStreamConfig.Tvg_ID);
+                    callSign = stationId;
                 }
 
                 int chNo = videoStreamConfig.User_Tvg_chno;