mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
commit
3630497237
17 changed files with 178 additions and 41 deletions
|
@ -59,6 +59,12 @@ namespace MediaBrowser.Controller.LiveTv
|
|||
/// <value>The clients.</value>
|
||||
public List<string> Clients { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this instance can reset.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if this instance can reset; otherwise, <c>false</c>.</value>
|
||||
public bool CanReset { get; set; }
|
||||
|
||||
public LiveTvTunerInfo()
|
||||
{
|
||||
Clients = new List<string>();
|
||||
|
|
|
@ -934,8 +934,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
_mediaEncoder._runningProcesses.Remove(this);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
process.Dispose();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
private bool _disposed;
|
||||
private readonly object _syncLock = new object();
|
||||
|
|
|
@ -496,6 +496,26 @@ namespace MediaBrowser.MediaEncoding.Probing
|
|||
}
|
||||
}
|
||||
|
||||
var lyricist = FFProbeHelpers.GetDictionaryValue(tags, "lyricist");
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(lyricist))
|
||||
{
|
||||
foreach (var person in Split(lyricist, false))
|
||||
{
|
||||
audio.People.Add(new BaseItemPerson { Name = person, Type = PersonType.Lyricist });
|
||||
}
|
||||
}
|
||||
// Check for writer some music is tagged that way as alternative to composer/lyricist
|
||||
var writer = FFProbeHelpers.GetDictionaryValue(tags, "writer");
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(writer))
|
||||
{
|
||||
foreach (var person in Split(writer, false))
|
||||
{
|
||||
audio.People.Add(new BaseItemPerson { Name = person, Type = PersonType.Writer });
|
||||
}
|
||||
}
|
||||
|
||||
audio.Album = FFProbeHelpers.GetDictionaryValue(tags, "album");
|
||||
|
||||
var artists = FFProbeHelpers.GetDictionaryValue(tags, "artists");
|
||||
|
|
|
@ -48,11 +48,17 @@ namespace MediaBrowser.Model.Configuration
|
|||
public bool HidePlayedInLatest { get; set; }
|
||||
public bool DisplayChannelsInline { get; set; }
|
||||
|
||||
public bool RememberAudioSelections { get; set; }
|
||||
public bool RememberSubtitleSelections { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
|
||||
/// </summary>
|
||||
public UserConfiguration()
|
||||
{
|
||||
RememberAudioSelections = true;
|
||||
RememberSubtitleSelections = true;
|
||||
|
||||
HidePlayedInLatest = true;
|
||||
PlayDefaultAudioTrack = true;
|
||||
|
||||
|
|
|
@ -34,5 +34,9 @@ namespace MediaBrowser.Model.Entities
|
|||
/// The conductor
|
||||
/// </summary>
|
||||
public const string Conductor = "Conductor";
|
||||
/// <summary>
|
||||
/// The lyricist
|
||||
/// </summary>
|
||||
public const string Lyricist = "Lyricist";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,6 +64,12 @@ namespace MediaBrowser.Model.LiveTv
|
|||
/// <value>The clients.</value>
|
||||
public List<string> Clients { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this instance can reset.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if this instance can reset; otherwise, <c>false</c>.</value>
|
||||
public bool CanReset { get; set; }
|
||||
|
||||
public LiveTvTunerInfoDto()
|
||||
{
|
||||
Clients = new List<string>();
|
||||
|
|
|
@ -502,7 +502,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
|||
}
|
||||
}
|
||||
|
||||
return series ?? new Series();
|
||||
return series;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -276,7 +276,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
|
||||
private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
|
||||
{
|
||||
if (userData.SubtitleStreamIndex.HasValue)
|
||||
if (userData.SubtitleStreamIndex.HasValue && user.Configuration.RememberSubtitleSelections)
|
||||
{
|
||||
var index = userData.SubtitleStreamIndex.Value;
|
||||
// Make sure the saved index is still valid
|
||||
|
@ -307,7 +307,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
|
||||
private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
|
||||
{
|
||||
if (userData.AudioStreamIndex.HasValue)
|
||||
if (userData.AudioStreamIndex.HasValue && user.Configuration.RememberAudioSelections)
|
||||
{
|
||||
var index = userData.AudioStreamIndex.Value;
|
||||
// Make sure the saved index is still valid
|
||||
|
|
|
@ -178,7 +178,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
|||
SourceType = info.SourceType,
|
||||
Status = info.Status,
|
||||
ChannelName = channelName,
|
||||
Url = info.Url
|
||||
Url = info.Url,
|
||||
CanReset = info.CanReset
|
||||
};
|
||||
|
||||
if (!string.IsNullOrEmpty(info.ChannelId))
|
||||
|
|
|
@ -801,11 +801,21 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
|||
{
|
||||
if (!string.IsNullOrWhiteSpace(info.ImagePath))
|
||||
{
|
||||
item.SetImagePath(ImageType.Primary, info.ImagePath);
|
||||
item.SetImage(new ItemImageInfo
|
||||
{
|
||||
Path = info.ImagePath,
|
||||
Type = ImageType.Primary,
|
||||
IsPlaceholder = true
|
||||
}, 0);
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(info.ImageUrl))
|
||||
{
|
||||
item.SetImagePath(ImageType.Primary, info.ImageUrl);
|
||||
item.SetImage(new ItemImageInfo
|
||||
{
|
||||
Path = info.ImageUrl,
|
||||
Type = ImageType.Primary,
|
||||
IsPlaceholder = true
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using CommonIO;
|
||||
|
@ -51,7 +52,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
string channnelName = null;
|
||||
string channelNumber = null;
|
||||
string line;
|
||||
|
||||
string imageUrl = null;
|
||||
while ((line = reader.ReadLine()) != null)
|
||||
{
|
||||
line = line.Trim();
|
||||
|
@ -70,8 +71,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
line = line.Substring(8);
|
||||
_logger.Info("Found m3u channel: {0}", line);
|
||||
var parts = line.Split(new[] { ',' }, 2);
|
||||
channelNumber = parts[0];
|
||||
channnelName = parts[1];
|
||||
channelNumber = parts[0].Trim().Split(' ')[0] ?? "0";
|
||||
channnelName = FindProperty("tvg-name", line, parts[1]);
|
||||
imageUrl = FindProperty("tvg-logo", line, null);
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(channelNumber))
|
||||
{
|
||||
|
@ -80,23 +82,34 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
Name = channnelName,
|
||||
Number = channelNumber,
|
||||
Id = channelIdPrefix + urlHash + line.GetMD5().ToString("N"),
|
||||
Path = line
|
||||
ImageUrl = imageUrl
|
||||
});
|
||||
|
||||
imageUrl = null;
|
||||
channelNumber = null;
|
||||
channnelName = null;
|
||||
}
|
||||
}
|
||||
return channels;
|
||||
}
|
||||
public string FindProperty(string property, string properties, string defaultResult = "")
|
||||
{
|
||||
var reg = new Regex(@"([a-z0-9\-_]+)=\""([^""]+)\""", RegexOptions.IgnoreCase);
|
||||
var matches = reg.Matches(properties);
|
||||
foreach (Match match in matches)
|
||||
{
|
||||
if (match.Groups[1].Value == property)
|
||||
{
|
||||
return match.Groups[2].Value;
|
||||
}
|
||||
}
|
||||
return defaultResult;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public class M3UChannel : ChannelInfo
|
||||
{
|
||||
public string Path { get; set; }
|
||||
|
||||
public M3UChannel()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
@ -195,12 +196,31 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
|
|||
break;
|
||||
}
|
||||
|
||||
case "friendlyName":
|
||||
{
|
||||
info.FriendlyName = reader.ReadElementContentAsString();
|
||||
break;
|
||||
}
|
||||
|
||||
case "satip:X_SATIPCAP":
|
||||
case "X_SATIPCAP":
|
||||
{
|
||||
// <satip:X_SATIPCAP xmlns:satip="urn:ses-com:satip">DVBS2-2</satip:X_SATIPCAP>
|
||||
var value = reader.ReadElementContentAsString();
|
||||
// TODO
|
||||
var value = reader.ReadElementContentAsString() ?? string.Empty;
|
||||
var parts = value.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
if (parts.Length == 2)
|
||||
{
|
||||
int intValue;
|
||||
if (int.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
|
||||
{
|
||||
info.TunersAvailable = intValue;
|
||||
}
|
||||
|
||||
if (int.TryParse(parts[0].Substring(parts[0].Length - 1), NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
|
||||
{
|
||||
info.Tuners = intValue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -226,5 +246,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
|
|||
public int Tuners { get; set; }
|
||||
public int TunersAvailable { get; set; }
|
||||
public string M3UUrl { get; set; }
|
||||
public string FriendlyName { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
@ -140,17 +141,31 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
|
|||
public Task<List<LiveTvTunerInfo>> GetTunerInfos(CancellationToken cancellationToken)
|
||||
{
|
||||
var list = GetTunerHosts()
|
||||
.Select(i => new LiveTvTunerInfo()
|
||||
{
|
||||
Name = Name,
|
||||
SourceType = Type,
|
||||
Status = LiveTvTunerStatus.Available,
|
||||
Id = i.Url.GetMD5().ToString("N"),
|
||||
Url = i.Url
|
||||
})
|
||||
.SelectMany(i => GetTunerInfos(i, cancellationToken))
|
||||
.ToList();
|
||||
|
||||
return Task.FromResult(list);
|
||||
}
|
||||
|
||||
public List<LiveTvTunerInfo> GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
|
||||
{
|
||||
var satInfo = (SatIpTunerHostInfo) info;
|
||||
|
||||
var list = new List<LiveTvTunerInfo>();
|
||||
|
||||
for (var i = 0; i < satInfo.Tuners; i++)
|
||||
{
|
||||
list.Add(new LiveTvTunerInfo
|
||||
{
|
||||
Name = satInfo.FriendlyName ?? Name,
|
||||
SourceType = Type,
|
||||
Status = LiveTvTunerStatus.Available,
|
||||
Id = info.Url.GetMD5().ToString("N") + i.ToString(CultureInfo.InvariantCulture),
|
||||
Url = info.Url
|
||||
});
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1014,7 +1014,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
|
||||
if (!reader.IsDBNull(31))
|
||||
{
|
||||
item.OfficialRating = reader.GetString(31);
|
||||
item.OfficialRatingDescription = reader.GetString(31);
|
||||
}
|
||||
|
||||
if (!reader.IsDBNull(32))
|
||||
|
|
|
@ -680,7 +680,7 @@ namespace MediaBrowser.Server.Implementations.Session
|
|||
|
||||
foreach (var user in users)
|
||||
{
|
||||
await OnPlaybackProgress(user.Id, key, libraryItem, info).ConfigureAwait(false);
|
||||
await OnPlaybackProgress(user, key, libraryItem, info).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -712,9 +712,9 @@ namespace MediaBrowser.Server.Implementations.Session
|
|||
StartIdleCheckTimer();
|
||||
}
|
||||
|
||||
private async Task OnPlaybackProgress(Guid userId, string userDataKey, BaseItem item, PlaybackProgressInfo info)
|
||||
private async Task OnPlaybackProgress(User user, string userDataKey, BaseItem item, PlaybackProgressInfo info)
|
||||
{
|
||||
var data = _userDataRepository.GetUserData(userId, userDataKey);
|
||||
var data = _userDataRepository.GetUserData(user.Id, userDataKey);
|
||||
|
||||
var positionTicks = info.PositionTicks;
|
||||
|
||||
|
@ -722,17 +722,32 @@ namespace MediaBrowser.Server.Implementations.Session
|
|||
{
|
||||
_userDataRepository.UpdatePlayState(item, data, positionTicks.Value);
|
||||
|
||||
UpdatePlaybackSettings(info, data);
|
||||
UpdatePlaybackSettings(user, info, data);
|
||||
|
||||
await _userDataRepository.SaveUserData(userId, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
|
||||
await _userDataRepository.SaveUserData(user.Id, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdatePlaybackSettings(PlaybackProgressInfo info, UserItemData data)
|
||||
private void UpdatePlaybackSettings(User user, PlaybackProgressInfo info, UserItemData data)
|
||||
{
|
||||
if (user.Configuration.RememberAudioSelections)
|
||||
{
|
||||
data.AudioStreamIndex = info.AudioStreamIndex;
|
||||
}
|
||||
else
|
||||
{
|
||||
data.AudioStreamIndex = null;
|
||||
}
|
||||
|
||||
if (user.Configuration.RememberSubtitleSelections)
|
||||
{
|
||||
data.SubtitleStreamIndex = info.SubtitleStreamIndex;
|
||||
}
|
||||
else
|
||||
{
|
||||
data.SubtitleStreamIndex = null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Used to report that playback has ended for an item
|
||||
|
|
|
@ -19,6 +19,7 @@ using MediaBrowser.Model.Sync;
|
|||
using MoreLinq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
|
@ -125,7 +126,23 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
|
||||
private string GetSyncJobItemName(BaseItem item)
|
||||
{
|
||||
return item.Name;
|
||||
var name = item.Name;
|
||||
var episode = item as Episode;
|
||||
|
||||
if (episode != null)
|
||||
{
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
name = "E" + episode.IndexNumber.Value.ToString(CultureInfo.InvariantCulture) + " - " + name;
|
||||
}
|
||||
|
||||
if (episode.ParentIndexNumber.HasValue)
|
||||
{
|
||||
name = "S" + episode.ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture) + ", " + name;
|
||||
}
|
||||
}
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
public Task UpdateJobStatus(string id)
|
||||
|
|
|
@ -281,9 +281,6 @@
|
|||
<Content Include="dashboard-ui\robots.txt">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\scripts\actionsheet.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\scripts\globalize.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
Loading…
Reference in a new issue