lionfish/IPTVplayer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter empty url in m3u

Browse Source
This commit is contained in:
Vladimir
2025-12-13 10:52:02 +02:00
parent d1df90e258
commit 59d0ed1ab5
7 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TV Player WPF/PlaylistWorker/M3UParser.cs
+3 -1
View File
@@ -48,7 +48,8 @@ namespace TV_Player
{ {
return; return;
} }
}; }
;
var channelsContent = string.Empty; var channelsContent = string.Empty;
if (url.Contains(".gz")) if (url.Contains(".gz"))
@@ -227,6 +228,7 @@ namespace TV_Player
{ {
if (TryParseM3ULine(line, out var m3uInfo)) if (TryParseM3ULine(line, out var m3uInfo))
{ {
if (!string.IsNullOrEmpty(m3uInfo?.Url))
playlistItems.Add(m3uInfo); playlistItems.Add(m3uInfo);
} }
} }
TV Player WPF/ProgramsList.xaml
+1 -1
View File
@@ -12,7 +12,7 @@
SnapsToDevicePixels="True" SnapsToDevicePixels="True"
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.VirtualizationMode="Recycling" VirtualizingStackPanel.VirtualizationMode="Recycling"
VirtualizingStackPanel.CacheLength="5" VirtualizingStackPanel.CacheLength="20"
PreviewMouseDown="ListView_PreviewMouseDown" PreviewMouseDown="ListView_PreviewMouseDown"
PreviewMouseUp="ListView_PreviewMouseUp" PreviewMouseUp="ListView_PreviewMouseUp"
PreviewMouseMove="ListView_MouseMove" PreviewMouseMove="ListView_MouseMove"
TV Player WPF/TV Player WPF.csproj
+5 -5
View File
@@ -20,13 +20,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="LibVLCSharp" Version="3.9.1"> <PackageReference Include="LibVLCSharp" Version="3.9.4">
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
<PackageReference Include="LibVLCSharp.WPF" Version="3.9.1" /> <PackageReference Include="LibVLCSharp.WPF" Version="3.9.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.Reactive" Version="6.0.1" /> <PackageReference Include="System.Reactive" Version="6.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
TV Player WPF/ViewModels/PlayerViewModel.cs
+1
View File
@@ -162,6 +162,7 @@ namespace TV_Player
{ {
try try
{ {
if (_currentProgram == null) return;
_currentProgramInfo = _currentGuide.Programs.FirstOrDefault(d => d.StartTime <= DateTime.Now && d.EndTime >= DateTime.Now); _currentProgramInfo = _currentGuide.Programs.FirstOrDefault(d => d.StartTime <= DateTime.Now && d.EndTime >= DateTime.Now);
Programs = _currentGuide.Programs.Skip(_currentGuide.Programs.FindIndex(x=>x.Title==_currentProgramInfo.Title)).Take(7).ToList(); Programs = _currentGuide.Programs.Skip(_currentGuide.Programs.FindIndex(x=>x.Title==_currentProgramInfo.Title)).Take(7).ToList();
TV Player WPF/ViewModels/PlaylistsGroupViewModel.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace TV_Player
ItemSelectedCommand = new RelayCommand(OnItemSelected); ItemSelectedCommand = new RelayCommand(OnItemSelected);
Programs = TVPlayerViewModel.Instance.PlayListsData.Select(x=>new GroupInfo() { Name =x.Key,Count=0}).ToList(); Programs = TVPlayerViewModel.Instance.PlayListsData.Select(x=>new GroupInfo() { Name =x.Key,Count=0}).ToList();
TVPlayerViewModel.Instance.TopPanelVisible(true, "Группы"); TVPlayerViewModel.Instance.TopPanelVisible(true, "Groups");
} }
private void OnItemSelected() private void OnItemSelected()
TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace TV_Player
ItemSelectedCommand = new RelayCommand(OnItemSelected); ItemSelectedCommand = new RelayCommand(OnItemSelected);
_groupInformationSubscriber = TVPlayerViewModel.Instance.CurrentProgrmsData.GroupsInformation.Subscribe(x => Programs = SettingsModel.HiddenGroups == null ? x : x.Where(g => !SettingsModel.HiddenGroups.Contains(g.Name.ToLower())).ToList()); _groupInformationSubscriber = TVPlayerViewModel.Instance.CurrentProgrmsData.GroupsInformation.Subscribe(x => Programs = SettingsModel.HiddenGroups == null ? x : x.Where(g => !SettingsModel.HiddenGroups.Contains(g.Name.ToLower())).ToList());
TVPlayerViewModel.Instance.TopPanelVisible(true, "Группы"); TVPlayerViewModel.Instance.TopPanelVisible(true, "Groups");
TVPlayerViewModel.Instance.SetBackButtonAction(new Action(() => TVPlayerViewModel.Instance.SetBackButtonAction(new Action(() =>
{ {
TV Player WPF/ViewModels/ProgramsListViewModel.cs
+1 -2
View File
@@ -1,7 +1,6 @@
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Reactive;
using System.Windows.Input; using System.Windows.Input;
using TV_Player.ViewModels; using TV_Player.ViewModels;
using System.Windows; using System.Windows;
@@ -43,7 +42,7 @@ namespace TV_Player
TVPlayerViewModel.Instance.CurrentProgrmsData.AllPrograms.ObserveOn(Scheduler.Default) TVPlayerViewModel.Instance.CurrentProgrmsData.AllPrograms.ObserveOn(Scheduler.Default)
.Subscribe(newPrograms => .Subscribe(newPrograms =>
{ {
var filteredPrograms = newPrograms.Where(p => p.GroupTitle == groupInfo.Name).ToList(); var filteredPrograms = newPrograms.Where(p => p.GroupTitle == groupInfo.Name && !string.IsNullOrEmpty(p.Url)).ToList();
Programs.Clear(); Programs.Clear();
const int batchSize = 100; // Define the batch size const int batchSize = 100; // Define the batch size