mirror of https://github.com/jellyfin/jellyfin.git
update plugin installs
This commit is contained in:
parent
81bb469fe1
commit
64a683e84d
|
@ -588,6 +588,27 @@ namespace MediaBrowser.Model.Configuration
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
DisabledMetadataFetchers = new []{ "TheMovieDb" }
|
DisabledMetadataFetchers = new []{ "TheMovieDb" }
|
||||||
|
},
|
||||||
|
|
||||||
|
new MetadataOptions(0, 1280)
|
||||||
|
{
|
||||||
|
ItemType = "Episode",
|
||||||
|
ImageOptions = new []
|
||||||
|
{
|
||||||
|
new ImageOption
|
||||||
|
{
|
||||||
|
Limit = 0,
|
||||||
|
MinWidth = 1280,
|
||||||
|
Type = ImageType.Backdrop
|
||||||
|
},
|
||||||
|
|
||||||
|
new ImageOption
|
||||||
|
{
|
||||||
|
Limit = 1,
|
||||||
|
Type = ImageType.Primary
|
||||||
|
}
|
||||||
|
},
|
||||||
|
DisabledImageFetchers = new []{ "TheMovieDb" }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
UserAgent = UserAgent,
|
UserAgent = UserAgent,
|
||||||
CancellationToken = cancellationToken,
|
CancellationToken = cancellationToken,
|
||||||
// The data can be large so give it some extra time
|
// The data can be large so give it some extra time
|
||||||
TimeoutMs = 120000,
|
TimeoutMs = 60000,
|
||||||
LogErrorResponseBody = true
|
LogErrorResponseBody = true
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1208,6 +1208,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
var guideDays = GetGuideDays(list.Count);
|
var guideDays = GetGuideDays(list.Count);
|
||||||
|
|
||||||
|
_logger.Info("Refreshing guide with {0} days of guide data", guideDays);
|
||||||
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
foreach (var currentChannel in list)
|
foreach (var currentChannel in list)
|
||||||
|
@ -1291,13 +1293,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private const int MaxGuideDays = 14;
|
||||||
private double GetGuideDays(int channelCount)
|
private double GetGuideDays(int channelCount)
|
||||||
{
|
{
|
||||||
var config = GetConfiguration();
|
var config = GetConfiguration();
|
||||||
|
|
||||||
if (config.GuideDays.HasValue)
|
if (config.GuideDays.HasValue)
|
||||||
{
|
{
|
||||||
return config.GuideDays.Value;
|
return Math.Max(1, Math.Min(config.GuideDays.Value, MaxGuideDays));
|
||||||
}
|
}
|
||||||
|
|
||||||
var programsPerDay = channelCount * 48;
|
var programsPerDay = channelCount * 48;
|
||||||
|
@ -1306,7 +1309,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
var days = Math.Round(((double)maxPrograms) / programsPerDay);
|
var days = Math.Round(((double)maxPrograms) / programsPerDay);
|
||||||
|
|
||||||
return Math.Max(3, Math.Min(days, 14));
|
return Math.Max(3, Math.Min(days, MaxGuideDays));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<IEnumerable<Tuple<string, ChannelInfo>>> GetChannels(ILiveTvService service, CancellationToken cancellationToken)
|
private async Task<IEnumerable<Tuple<string, ChannelInfo>>> GetChannels(ILiveTvService service, CancellationToken cancellationToken)
|
||||||
|
|
|
@ -333,9 +333,6 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
|
|
||||||
private string ModifyForCordova(string html)
|
private string ModifyForCordova(string html)
|
||||||
{
|
{
|
||||||
// Strip everything between CORDOVA_EXCLUDE_START and CORDOVA_EXCLUDE_END
|
|
||||||
html = ReplaceBetween(html, "<!--CORDOVA_EXCLUDE_START-->", "<!--CORDOVA_EXCLUDE_END-->", string.Empty);
|
|
||||||
|
|
||||||
// Replace CORDOVA_REPLACE_SUPPORTER_SUBMIT_START
|
// Replace CORDOVA_REPLACE_SUPPORTER_SUBMIT_START
|
||||||
html = ReplaceBetween(html, "<!--CORDOVA_REPLACE_SUPPORTER_SUBMIT_START-->", "<!--CORDOVA_REPLACE_SUPPORTER_SUBMIT_END-->", "<i class=\"fa fa-check\"></i><span>${ButtonPurchase}</span>");
|
html = ReplaceBetween(html, "<!--CORDOVA_REPLACE_SUPPORTER_SUBMIT_START-->", "<!--CORDOVA_REPLACE_SUPPORTER_SUBMIT_END-->", "<i class=\"fa fa-check\"></i><span>${ButtonPurchase}</span>");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue