Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-04 03:27:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5579 from cocool97/master

Browse Source
This commit is contained in:
Bond-009 2021-03-25 01:45:43 +01:00 committed by GitHub
commit 6d0b2ed080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -17,6 +17,7 @@
- [bugfixin](https://github.com/bugfixin) - [bugfixin](https://github.com/bugfixin)
- [chaosinnovator](https://github.com/chaosinnovator) - [chaosinnovator](https://github.com/chaosinnovator)
- [ckcr4lyf](https://github.com/ckcr4lyf) - [ckcr4lyf](https://github.com/ckcr4lyf)
- [cocool97](https://github.com/cocool97)
- [ConfusedPolarBear](https://github.com/ConfusedPolarBear) - [ConfusedPolarBear](https://github.com/ConfusedPolarBear)
- [crankdoofus](https://github.com/crankdoofus) - [crankdoofus](https://github.com/crankdoofus)
- [crobibero](https://github.com/crobibero) - [crobibero](https://github.com/crobibero)

5
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -133,6 +133,11 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
channel.ImageUrl = value; channel.ImageUrl = value;
} }
if (attributes.TryGetValue("group-title", out string groupTitle))
{
channel.ChannelGroup = groupTitle;
}
channel.Name = GetChannelName(extInf, attributes); channel.Name = GetChannelName(extInf, attributes);
channel.Number = GetChannelNumber(extInf, attributes, mediaUrl); channel.Number = GetChannelNumber(extInf, attributes, mediaUrl);

6
MediaBrowser.Controller/LiveTv/ChannelInfo.cs
View File

@ -45,6 +45,12 @@ namespace MediaBrowser.Controller.LiveTv
/// <value>The type of the channel.</value> /// <value>The type of the channel.</value>
public ChannelType ChannelType { get; set; } public ChannelType ChannelType { get; set; }
/// <summary>
/// Gets or sets the group of the channel.
/// </summary>
/// <value>The group of the channel.</value>
public string ChannelGroup { get; set; }
/// <summary> /// <summary>
/// Supply the image path if it can be accessed directly from the file system. /// Supply the image path if it can be accessed directly from the file system.
/// </summary> /// </summary>