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

support more than one playlist

Browse Source
This commit is contained in:
Vladimir
2024-10-22 18:19:33 +03:00
parent 0bff41af12
commit 0abc6971ba
15 changed files with 187 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TV Player WPF/ViewModels/MainViewModel.cs
+14 -1
View File
@@ -36,6 +36,7 @@ namespace TV_Player
get => _currentWindowState;
set => SetProperty(ref _currentWindowState, value);
}
public ICommand OnKeyDownCommand { get; }
public ICommand FullscreenCommand { get; }
public ICommand CloseAppCommand { get; }
@@ -47,7 +48,7 @@ namespace TV_Player
public MainViewModel()
{
OnKeyDownCommand = new RelayCommand<KeyEventArgs>(OnKeyDown);
BackCommand = new RelayCommand(OnButtonBackClick);
FullscreenCommand = new RelayCommand(OnFullSctreenButtonClick);
SettingsCommand = new RelayCommand(OnSettingsButtonClick);
@@ -81,5 +82,17 @@ namespace TV_Player
{
TVPlayerViewModel.Instance.ShowSettingsScreen();
}
private void OnKeyDown(KeyEventArgs e)
{
if (e.Key == Key.Escape)
{
Environment.Exit(0);
}
if (e.Key == Key.Back)
{
ButtonBackAction?.Invoke();
}
}
}
}
TV Player WPF/ViewModels/PlayerViewModel.cs
+3 -3
View File
@@ -98,7 +98,7 @@ namespace TV_Player
ShowProgramListCommand = new RelayCommand(ShowProgramList);
ProgramGuideVisible = false;
_programSubscriber = TVPlayerViewModel.Instance.PlaylistData.AllPrograms.Subscribe(x =>
_programSubscriber = TVPlayerViewModel.Instance.CurrentProgrmsData.AllPrograms.Subscribe(x =>
{
_programs = x.Where(p => p.GroupTitle == _currentProgram.GroupTitle).ToList();
_currentProgramIndex = _programs.Select((program, index) => new { program, index })
@@ -116,11 +116,11 @@ namespace TV_Player
TopPanelTitle = _currentProgram.Name;
SourceUrlChangedEvent?.Invoke(_currentProgram.Url);
_programGuideDisposable = TVPlayerViewModel.Instance.PlaylistData.ProgramGuideInfo.Subscribe(async x =>
_programGuideDisposable = TVPlayerViewModel.Instance.CurrentProgrmsData.ProgramGuideInfo.Subscribe(async x =>
{
try
{
_currentGuide = await TVPlayerViewModel.Instance.PlaylistData.GetGuideByProgram(_currentProgram.TvgID);
_currentGuide = await TVPlayerViewModel.Instance.CurrentProgrmsData.GetGuideByProgram(_currentProgram.TvgID);
UpdateScreenInfo();
TV Player WPF/ViewModels/PlaylistsGroupViewModel.cs
+39
View File
@@ -0,0 +1,39 @@
using CommunityToolkit.Mvvm.Input;
using System.Windows.Input;
using TV_Player.ViewModels;
namespace TV_Player
{
public class PlaylistsGroupViewModel : ObservableViewModelBase, IDisposable
{
private List<GroupInfo> _programs;
public List<GroupInfo> Programs
{
get => _programs;
set => SetProperty(ref _programs, value);
}
public GroupInfo SelectedItem { get; set; }
public ICommand ItemSelectedCommand { get; }
public IDisposable _groupInformationSubscriber;
public PlaylistsGroupViewModel()
{
ItemSelectedCommand = new RelayCommand(OnItemSelected);
Programs = TVPlayerViewModel.Instance.PlayListsData.Select(x=>new GroupInfo() { Name =x.Key,Count=0}).ToList();
TVPlayerViewModel.Instance.TopPanelVisible(true, "Группы");
}
private void OnItemSelected()
{
TVPlayerViewModel.Instance.ShowProgramsGroupScreen(SelectedItem.Name);
}
public void Dispose()
{
_groupInformationSubscriber.Dispose();
}
}
}
TV Player WPF/ViewModels/ProgramsData.cs
+8 -11
View File
@@ -12,11 +12,12 @@ namespace TV_Player
public IObservable<List<GroupInfo>> GroupsInformation => groupsSubject;
public IObservable<Unit> ProgramGuideInfo => programGuideSubject;
public ProgramsData()
{
public ProgramsData(string name,string playlistURL)
{
Task.Run(() => GetPrograms(name,playlistURL));
}
private async Task GetPrograms(string m3uLink)
private async Task GetPrograms(string name,string m3uLink)
{
//string m3uLink = "http://pl.da-tv.vip/a71e77fa/835b3216/tv.m3u";
var result = await M3UParser.DownloadM3UFromWebAsync(m3uLink);
@@ -28,7 +29,7 @@ namespace TV_Player
.ToList();
groupsSubject.OnNext(groupping);
await Task.Run(() => GetProgramGuide(result.programGuide));
await Task.Run(() => GetProgramGuide(name,result.programGuide));
}
public Task<ProgramGuide> GetGuideByProgram(string channelID)
@@ -36,16 +37,12 @@ namespace TV_Player
return M3UParser.ParseEpg(channelID);
}
private async Task GetProgramGuide(string guideLink)
private async Task GetProgramGuide(string name, string guideLink)
{
//guideLink = "http://epg.da-tv.vip/107-light.xml";
await M3UParser.DownloadGuideFromWebAsync(guideLink);
await M3UParser.DownloadGuideFromWebAsync(name,guideLink);
programGuideSubject.OnNext(Unit.Default);
}
internal void GetData(string playlistURL)
{
Task.Run(() => GetPrograms(playlistURL));
}
}
}
TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
+6 -1
View File
@@ -21,9 +21,14 @@ namespace TV_Player
public ProgramsGroupViewModel()
{
ItemSelectedCommand = new RelayCommand(OnItemSelected);
_groupInformationSubscriber = TVPlayerViewModel.Instance.PlaylistData.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.SetBackButtonAction(new Action(() =>
{
TVPlayerViewModel.Instance.ShowPlaylistsGroupScreen();
}));
}
private void OnItemSelected()
TV Player WPF/ViewModels/ProgramsListViewModel.cs
+3 -3
View File
@@ -17,15 +17,15 @@ namespace TV_Player
public ICommand ItemSelectedCommand { get; }
private IDisposable _programSubscriber;
public ProgramsListViewModel(GroupInfo groupInfo)
public ProgramsListViewModel(string playlistName,GroupInfo groupInfo)
{
TVPlayerViewModel.Instance.TopPanelVisible(true, groupInfo.Name);
ItemSelectedCommand = new RelayCommand(OnItemSelected);
_programSubscriber = TVPlayerViewModel.Instance.PlaylistData.AllPrograms.Subscribe(x => Programs = x.Where(p => p.GroupTitle == groupInfo.Name).ToList());
_programSubscriber = TVPlayerViewModel.Instance.CurrentProgrmsData.AllPrograms.Subscribe(x => Programs = x.Where(p => p.GroupTitle == groupInfo.Name).ToList());
TVPlayerViewModel.Instance.SetBackButtonAction(new Action(() =>
{
TVPlayerViewModel.Instance.ShowProgramsGroupScreen();
TVPlayerViewModel.Instance.ShowProgramsGroupScreen(playlistName);
}));
}
TV Player WPF/ViewModels/SettingsModel.cs
+5 -5
View File
@@ -5,10 +5,10 @@ namespace TV_Player.ViewModels
{
public static class SettingsModel
{
private static readonly string AppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "TVPlayer");
private static readonly string AppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "TVPlayer");
private static readonly string SettingsFilePath = Path.Combine(AppDataFolder, "settings.json");
public static string PlaylistURL { get; set; }
public static Dictionary<string,string> Playlists { get; set; }
public static bool StartFullScreen { get; set; }
public static bool StartFromLastScreen { get; set; }
public static string LastScreen { get; set; }
@@ -21,7 +21,7 @@ namespace TV_Player.ViewModels
// Create an anonymous object to hold the properties
var dataToSerialize = new
{
PlaylistURL,
Playlists,
StartFromLastScreen,
StartFullScreen,
LastScreen,
@@ -43,7 +43,7 @@ namespace TV_Player.ViewModels
{
var loadedData = new
{
PlaylistURL = default(string),
Playlists = default(Dictionary<string,string>),
LastScreen = default(string),
Group = default(GroupInfo),
Program = default(M3UInfo),
@@ -58,7 +58,7 @@ namespace TV_Player.ViewModels
loadedData = JsonConvert.DeserializeAnonymousType(json, loadedData);
}
// Assign the values to the properties
PlaylistURL = loadedData.PlaylistURL;
Playlists = loadedData.Playlists;
LastScreen = loadedData.LastScreen;
Group = loadedData.Group;
Program = loadedData.Program;
TV Player WPF/ViewModels/SettingsViewModel.cs
+2 -2
View File
@@ -38,7 +38,7 @@ namespace TV_Player.ViewModels
StartFullScreen = SettingsModel.StartFullScreen;
StartLastScreen = SettingsModel.StartFromLastScreen;
PlaylistURL = SettingsModel.PlaylistURL;
// PlaylistURL = SettingsModel.PlaylistURL;
}
private void OnBackCommand()
@@ -50,7 +50,7 @@ namespace TV_Player.ViewModels
{
SettingsModel.StartFullScreen = StartFullScreen;
SettingsModel.StartFromLastScreen = StartLastScreen;
SettingsModel.PlaylistURL = PlaylistURL;
//SettingsModel.PlaylistURL = PlaylistURL;
SettingsModel.SaveSetttings();
TVPlayerViewModel.Instance.InitializeTVWithData();
TV Player WPF/ViewModels/TVPlayerViewModel.cs
+33 -8
View File
@@ -5,10 +5,15 @@ namespace TV_Player.ViewModels
public class TVPlayerViewModel : IDisposable
{
private readonly MainViewModel _mainViewModel;
public ProgramsData PlaylistData { get; private set; }
public ProgramsData CurrentProgrmsData { get; private set; }
public Dictionary<string,ProgramsData> PlayListsData { get; private set; }
public Action ButtonBackAction { get; set; }
private string _currentPlaylistName;
private static TVPlayerViewModel? _instance;
public static TVPlayerViewModel Instance
{
@@ -22,7 +27,7 @@ namespace TV_Player.ViewModels
public TVPlayerViewModel()
{
PlaylistData = new ProgramsData();
PlayListsData=new Dictionary<string,ProgramsData>();
_mainViewModel = new MainViewModel();
var mainWindow = new MainWindow();
@@ -37,15 +42,20 @@ namespace TV_Player.ViewModels
public void InitializeTVWithData()
{
if (!string.IsNullOrEmpty(SettingsModel.PlaylistURL))
if (SettingsModel.Playlists!=null && SettingsModel.Playlists.Any())
{
foreach(var playlist in SettingsModel.Playlists)
{
PlayListsData.Add(playlist.Key, new ProgramsData(playlist.Key,playlist.Value));
}
if (SettingsModel.StartFullScreen)
FullScreenToggle();
PlaylistData.GetData(SettingsModel.PlaylistURL);
if (SettingsModel.StartFromLastScreen)
SelectScreen();
else
ShowProgramsGroupScreen();
ShowPlaylistsGroupScreen();
}
else
{
@@ -64,13 +74,28 @@ namespace TV_Player.ViewModels
ShowPlayerScreen(SettingsModel.Program);
break;
default:
ShowProgramsGroupScreen();
ShowPlaylistsGroupScreen();
break;
}
}
public void ShowProgramsGroupScreen()
public void ShowPlaylistsGroupScreen()
{
var vm = new PlaylistsGroupViewModel();
var control = new PlaylistsGroup();
control.DataContext = vm;
SettingsModel.LastScreen = nameof(ProgramsGroupViewModel);
SetPageContext(control, vm);
}
public void ShowProgramsGroupScreen(string groupName)
{
var selectedData = PlayListsData.First(x => x.Key == groupName);
_currentPlaylistName = selectedData.Key;
CurrentProgrmsData = selectedData.Value;
var vm = new ProgramsGroupViewModel();
var control = new ProgramsGroupGrid();
@@ -83,7 +108,7 @@ namespace TV_Player.ViewModels
public void ShowProgramsListScreen(GroupInfo group)
{
SettingsModel.Group = group;
var programListViewModel = new ProgramsListViewModel(group);
var programListViewModel = new ProgramsListViewModel(_currentPlaylistName,group);
var conrtrol = new ProgramsList();
SettingsModel.LastScreen = nameof(ProgramsListViewModel);
SetPageContext(conrtrol, programListViewModel);