mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 07:10:34 +02:00
add path help messages
This commit is contained in:
parent
d440e89c50
commit
7f9a2f1af6
|
@ -19,11 +19,6 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <value>The type.</value>
|
/// <value>The type.</value>
|
||||||
string Type { get; }
|
string Type { get; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the tuner hosts.
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>List<TunerHostInfo>.</returns>
|
|
||||||
List<TunerHostInfo> GetTunerHosts();
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the channels.
|
/// Gets the channels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="info">The information.</param>
|
/// <param name="info">The information.</param>
|
||||||
|
|
|
@ -25,6 +25,12 @@ namespace MediaBrowser.Model.LiveTv
|
||||||
public string Url { get; set; }
|
public string Url { get; set; }
|
||||||
public string Type { get; set; }
|
public string Type { get; set; }
|
||||||
public bool ImportFavoritesOnly { get; set; }
|
public bool ImportFavoritesOnly { get; set; }
|
||||||
|
public bool IsEnabled { get; set; }
|
||||||
|
|
||||||
|
public TunerHostInfo()
|
||||||
|
{
|
||||||
|
IsEnabled = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ListingsProviderInfo
|
public class ListingsProviderInfo
|
||||||
|
|
|
@ -13,6 +13,11 @@ namespace MediaBrowser.Model.System
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The operating sytem.</value>
|
/// <value>The operating sytem.</value>
|
||||||
public string OperatingSystem { get; set; }
|
public string OperatingSystem { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the display name of the operating system.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The display name of the operating system.</value>
|
||||||
|
public string OperatingSystemDisplayName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether this instance is running as service.
|
/// Gets or sets a value indicating whether this instance is running as service.
|
||||||
|
|
|
@ -134,6 +134,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
||||||
private List<Tuple<ITunerHost, TunerHostInfo>> GetTunerHosts()
|
private List<Tuple<ITunerHost, TunerHostInfo>> GetTunerHosts()
|
||||||
{
|
{
|
||||||
return GetConfiguration().TunerHosts
|
return GetConfiguration().TunerHosts
|
||||||
|
.Where(i => i.IsEnabled)
|
||||||
.Select(i =>
|
.Select(i =>
|
||||||
{
|
{
|
||||||
var provider = _liveTvManager.TunerHosts.FirstOrDefault(l => string.Equals(l.Type, i.Type, StringComparison.OrdinalIgnoreCase));
|
var provider = _liveTvManager.TunerHosts.FirstOrDefault(l => string.Equals(l.Type, i.Type, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
|
@ -2127,7 +2127,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
private bool IsLiveTvEnabled(User user)
|
private bool IsLiveTvEnabled(User user)
|
||||||
{
|
{
|
||||||
return user.Policy.EnableLiveTvAccess && Services.Count > 0;
|
return user.Policy.EnableLiveTvAccess && (Services.Count > 1 || GetConfiguration().TunerHosts.Count(i => i.IsEnabled) > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<User> GetEnabledUsers()
|
public IEnumerable<User> GetEnabledUsers()
|
||||||
|
@ -2175,7 +2175,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
public async Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info)
|
public async Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info)
|
||||||
{
|
{
|
||||||
info = (TunerHostInfo)_jsonSerializer.DeserializeFromString(_jsonSerializer.SerializeToString(info), typeof(TunerHostInfo));
|
info = (TunerHostInfo)_jsonSerializer.DeserializeFromString(_jsonSerializer.SerializeToString(info), typeof(TunerHostInfo));
|
||||||
|
|
||||||
var provider = _tunerHosts.FirstOrDefault(i => string.Equals(info.Type, i.Type, StringComparison.OrdinalIgnoreCase));
|
var provider = _tunerHosts.FirstOrDefault(i => string.Equals(info.Type, i.Type, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
if (provider == null)
|
if (provider == null)
|
||||||
|
@ -2236,7 +2236,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
_config.SaveConfiguration("livetv", config);
|
_config.SaveConfiguration("livetv", config);
|
||||||
|
|
||||||
_taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
|
_taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ using MediaBrowser.Model.LiveTv;
|
||||||
using MediaBrowser.Model.Tasks;
|
using MediaBrowser.Model.Tasks;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Implementations.LiveTv
|
namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
@ -61,7 +62,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
public bool IsHidden
|
public bool IsHidden
|
||||||
{
|
{
|
||||||
get { return _liveTvManager.Services.Count == 1 && GetConfiguration().TunerHosts.Count == 0; }
|
get { return _liveTvManager.Services.Count == 1 && GetConfiguration().TunerHosts.Count(i => i.IsEnabled) == 0; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsEnabled
|
public bool IsEnabled
|
||||||
|
|
|
@ -207,11 +207,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
return _config.GetConfiguration<LiveTvOptions>("livetv");
|
return _config.GetConfiguration<LiveTvOptions>("livetv");
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<TunerHostInfo> GetTunerHosts()
|
|
||||||
{
|
|
||||||
return GetConfiguration().TunerHosts.Where(i => string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase)).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
private MediaSourceInfo GetMediaSource(TunerHostInfo info, string channelId, string profile)
|
private MediaSourceInfo GetMediaSource(TunerHostInfo info, string channelId, string profile)
|
||||||
{
|
{
|
||||||
int? width = null;
|
int? width = null;
|
||||||
|
|
|
@ -124,11 +124,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
||||||
return _config.GetConfiguration<LiveTvOptions>("livetv");
|
return _config.GetConfiguration<LiveTvOptions>("livetv");
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<TunerHostInfo> GetTunerHosts()
|
|
||||||
{
|
|
||||||
return GetConfiguration().TunerHosts.Where(i => string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase)).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
|
public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var channels = await GetChannels(info, cancellationToken).ConfigureAwait(false);
|
var channels = await GetChannels(info, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
|
@ -288,6 +288,7 @@
|
||||||
"HeaderSelectPath": "Select Path",
|
"HeaderSelectPath": "Select Path",
|
||||||
"ButtonNetwork": "Network",
|
"ButtonNetwork": "Network",
|
||||||
"MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}.",
|
"MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}.",
|
||||||
|
"MessageDirectoryPickerBSDInstruction": "For BSD, you may need to configure storage within your FreeNAS Jail in order to allow Emby to access it.",
|
||||||
"HeaderMenu": "Menu",
|
"HeaderMenu": "Menu",
|
||||||
"ButtonOpen": "Open",
|
"ButtonOpen": "Open",
|
||||||
"ButtonOpenInNewTab": "Open in new tab",
|
"ButtonOpenInNewTab": "Open in new tab",
|
||||||
|
@ -828,7 +829,7 @@
|
||||||
"ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.",
|
"ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.",
|
||||||
"HeaderTryCinemaMode": "Try Cinema Mode",
|
"HeaderTryCinemaMode": "Try Cinema Mode",
|
||||||
"ButtonBecomeSupporter": "Become an Emby Supporter",
|
"ButtonBecomeSupporter": "Become an Emby Supporter",
|
||||||
"ButtonClosePlayVideo": "Close and play my video",
|
"ButtonClosePlayVideo": "Close and play my media",
|
||||||
"MessageDidYouKnowCinemaMode": "Did you know that by becoming an Emby Supporter, you can enhance your experience with features like Cinema Mode?",
|
"MessageDidYouKnowCinemaMode": "Did you know that by becoming an Emby Supporter, you can enhance your experience with features like Cinema Mode?",
|
||||||
"MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature."
|
"MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature."
|
||||||
}
|
}
|
||||||
|
|
|
@ -1055,7 +1055,8 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
HttpServerPortNumber = HttpPort,
|
HttpServerPortNumber = HttpPort,
|
||||||
SupportsHttps = SupportsHttps,
|
SupportsHttps = SupportsHttps,
|
||||||
HttpsPortNumber = HttpsPort,
|
HttpsPortNumber = HttpsPort,
|
||||||
OperatingSystem = OperatingSystemDisplayName,
|
OperatingSystem = NativeApp.Environment.OperatingSystem.ToString(),
|
||||||
|
OperatingSystemDisplayName = OperatingSystemDisplayName,
|
||||||
CanSelfRestart = CanSelfRestart,
|
CanSelfRestart = CanSelfRestart,
|
||||||
CanSelfUpdate = CanSelfUpdate,
|
CanSelfUpdate = CanSelfUpdate,
|
||||||
WanAddress = ConnectManager.WanApiAddress,
|
WanAddress = ConnectManager.WanApiAddress,
|
||||||
|
|
Loading…
Reference in a new issue