mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
commit
50b033f3aa
8 changed files with 90 additions and 48 deletions
|
@ -285,7 +285,7 @@ namespace Emby.Dlna.Main
|
|||
{
|
||||
"urn:schemas-upnp-org:service:ContentDirectory:1",
|
||||
"urn:schemas-upnp-org:service:ConnectionManager:1",
|
||||
"urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1"
|
||||
//"urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1"
|
||||
};
|
||||
|
||||
foreach (var subDevice in embeddedDevices)
|
||||
|
|
|
@ -80,7 +80,7 @@ namespace Emby.Server.Implementations.TV
|
|||
var group = new SeriesGroup();
|
||||
FindAllLinked(series, visited, links, group);
|
||||
|
||||
group.Key = group.Select(s => s.GetProviderId(MetadataProviders.Tvdb)).FirstOrDefault(id => !string.IsNullOrEmpty(id));
|
||||
group.Key = group.Select(s => s.PresentationUniqueKey).FirstOrDefault(id => !string.IsNullOrEmpty(id));
|
||||
|
||||
yield return group;
|
||||
}
|
||||
|
@ -105,11 +105,7 @@ namespace Emby.Server.Implementations.TV
|
|||
|
||||
private static bool ShareProviderId(Series a, Series b)
|
||||
{
|
||||
return a.ProviderIds.Any(id =>
|
||||
{
|
||||
string value;
|
||||
return b.ProviderIds.TryGetValue(id.Key, out value) && id.Value == value;
|
||||
});
|
||||
return string.Equals(a.PresentationUniqueKey, b.PresentationUniqueKey, StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
public int Order
|
||||
|
|
|
@ -2134,7 +2134,7 @@ namespace MediaBrowser.Controller.Entities
|
|||
{
|
||||
MetadataCountryCode = GetPreferredMetadataCountryCode(),
|
||||
MetadataLanguage = GetPreferredMetadataLanguage(),
|
||||
Name = Name,
|
||||
Name = GetNameForMetadataLookup(),
|
||||
ProviderIds = ProviderIds,
|
||||
IndexNumber = IndexNumber,
|
||||
ParentIndexNumber = ParentIndexNumber,
|
||||
|
@ -2143,6 +2143,11 @@ namespace MediaBrowser.Controller.Entities
|
|||
};
|
||||
}
|
||||
|
||||
protected virtual string GetNameForMetadataLookup()
|
||||
{
|
||||
return Name;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This is called before any metadata refresh and returns true or false indicating if changes were made
|
||||
/// </summary>
|
||||
|
|
|
@ -4,9 +4,12 @@ using MediaBrowser.Model.Configuration;
|
|||
using MediaBrowser.Model.LiveTv;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using MediaBrowser.Common.Configuration;
|
||||
using MediaBrowser.Model.Entities;
|
||||
using MediaBrowser.Model.Providers;
|
||||
using MediaBrowser.Model.Serialization;
|
||||
using MediaBrowser.Model.Extensions;
|
||||
|
||||
namespace MediaBrowser.Controller.LiveTv
|
||||
{
|
||||
|
@ -236,6 +239,40 @@ namespace MediaBrowser.Controller.LiveTv
|
|||
}
|
||||
}
|
||||
|
||||
private LiveTvOptions GetConfiguration()
|
||||
{
|
||||
return ConfigurationManager.GetConfiguration<LiveTvOptions>("livetv");
|
||||
}
|
||||
|
||||
private ListingsProviderInfo GetListingsProviderInfo()
|
||||
{
|
||||
if (string.Equals(ServiceName, "Emby", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var config = GetConfiguration();
|
||||
|
||||
return config.ListingProviders.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i.MoviePrefix));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
protected override string GetNameForMetadataLookup()
|
||||
{
|
||||
var name = base.GetNameForMetadataLookup();
|
||||
|
||||
var listings = GetListingsProviderInfo();
|
||||
|
||||
if (listings != null)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(listings.MoviePrefix))
|
||||
{
|
||||
name = name.Replace(listings.MoviePrefix, string.Empty, StringComparison.OrdinalIgnoreCase).Trim();
|
||||
}
|
||||
}
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
public override List<ExternalUrl> GetRelatedUrls()
|
||||
{
|
||||
var list = base.GetRelatedUrls();
|
||||
|
|
|
@ -83,6 +83,7 @@ namespace MediaBrowser.Model.LiveTv
|
|||
public string[] KidsCategories { get; set; }
|
||||
public string[] MovieCategories { get; set; }
|
||||
public NameValuePair[] ChannelMappings { get; set; }
|
||||
public string MoviePrefix { get; set; }
|
||||
|
||||
public ListingsProviderInfo()
|
||||
{
|
||||
|
|
|
@ -135,7 +135,7 @@ namespace MediaBrowser.Providers.Omdb
|
|||
|
||||
RootObject result = null;
|
||||
|
||||
foreach (var episode in seasonResult.Episodes)
|
||||
foreach (var episode in (seasonResult.Episodes ?? new RootObject[] { }))
|
||||
{
|
||||
if (episode.Episode == episodeNumber)
|
||||
{
|
||||
|
|
|
@ -368,7 +368,7 @@ namespace MediaBrowser.Providers.TV
|
|||
var seasonNumber = i.Season.IndexNumber.Value + i.SeasonOffset;
|
||||
|
||||
// If there's a physical season with the same number, delete it
|
||||
if (physicalSeasons.Any(p => p.Season.IndexNumber.HasValue && (p.Season.IndexNumber.Value + p.SeasonOffset) == seasonNumber))
|
||||
if (physicalSeasons.Any(p => p.Season.IndexNumber.HasValue && (p.Season.IndexNumber.Value + p.SeasonOffset) == seasonNumber && string.Equals(p.Season.Series.PresentationUniqueKey, i.Season.Series.PresentationUniqueKey, StringComparison.Ordinal)))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -26,6 +26,9 @@ netsh advfirewall firewall delete rule name="Emby Server"
|
|||
netsh advfirewall firewall add rule name="Emby Server" dir=in action=allow protocol=TCP program=%4 enable=yes
|
||||
netsh advfirewall firewall add rule name="Emby Server" dir=in action=allow protocol=UDP program=%4 enable=yes
|
||||
|
||||
netsh advfirewall firewall add rule name="mediabrowser.serverapplication.exe" dir=in action=allow protocol=TCP program=%4 enable=yes
|
||||
netsh advfirewall firewall add rule name="mediabrowser.serverapplication.exe" dir=in action=allow protocol=UDP program=%4 enable=yes
|
||||
|
||||
|
||||
:DONE
|
||||
Exit
|
Loading…
Reference in a new issue