Skip to content

Commit 78d72fc

Browse files
LukePulverentiLukePulverenti
committed
consolidate chapter objects
1 parent c3d39d5 commit 78d72fc

File tree

99 files changed

+567
-715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+567
-715
lines changed

‎BDInfo/BDInfo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3838
</Reference>
3939
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Configuration" />

‎BDInfo/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
44
</packages>

‎DvdLib/DvdLib.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<Compile Include="Ifo\VideoAttributes.cs" />
5050
<Compile Include="Properties\AssemblyInfo.cs" />
5151
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
5353
</Reference>
5454
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Configuration" />

‎DvdLib/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
44
</packages>

‎Emby.Dlna/Api/DlnaServerService.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -167,42 +167,42 @@ public object Get(GetContentDirectory request)
167167
{
168168
var xml = ContentDirectory.GetServiceXml(Request.Headers.ToDictionary());
169169

170-
return _resultFactory.GetResult(xml, XMLContentType);
170+
return _resultFactory.GetResult(Request, xml, XMLContentType);
171171
}
172172

173173
public object Get(GetMediaReceiverRegistrar request)
174174
{
175175
var xml = MediaReceiverRegistrar.GetServiceXml(Request.Headers.ToDictionary());
176176

177-
return _resultFactory.GetResult(xml, XMLContentType);
177+
return _resultFactory.GetResult(Request, xml, XMLContentType);
178178
}
179179

180180
public object Get(GetConnnectionManager request)
181181
{
182182
var xml = ConnectionManager.GetServiceXml(Request.Headers.ToDictionary());
183183

184-
return _resultFactory.GetResult(xml, XMLContentType);
184+
return _resultFactory.GetResult(Request, xml, XMLContentType);
185185
}
186186

187187
public object Post(ProcessMediaReceiverRegistrarControlRequest request)
188188
{
189189
var response = PostAsync(request.RequestStream, MediaReceiverRegistrar);
190190

191-
return _resultFactory.GetResult(response.Xml, XMLContentType);
191+
return _resultFactory.GetResult(Request, response.Xml, XMLContentType);
192192
}
193193

194194
public object Post(ProcessContentDirectoryControlRequest request)
195195
{
196196
var response = PostAsync(request.RequestStream, ContentDirectory);
197197

198-
return _resultFactory.GetResult(response.Xml, XMLContentType);
198+
return _resultFactory.GetResult(Request, response.Xml, XMLContentType);
199199
}
200200

201201
public object Post(ProcessConnectionManagerControlRequest request)
202202
{
203203
var response = PostAsync(request.RequestStream, ConnectionManager);
204204

205-
return _resultFactory.GetResult(response.Xml, XMLContentType);
205+
return _resultFactory.GetResult(Request, response.Xml, XMLContentType);
206206
}
207207

208208
private ControlResponse PostAsync(Stream requestStream, IUpnpService service)
@@ -314,7 +314,7 @@ private object ProcessEventRequest(IEventManager eventManager)
314314

315315
private object GetSubscriptionResponse(EventSubscriptionResponse response)
316316
{
317-
return _resultFactory.GetResult(response.Content, response.ContentType, response.Headers);
317+
return _resultFactory.GetResult(Request, response.Content, response.ContentType, response.Headers);
318318
}
319319
}
320320
}

‎Emby.Dlna/Didl/DidlBuilder.cs

-13
Original file line numberDiff line numberDiff line change
@@ -951,19 +951,6 @@ private void AddCover(BaseItem item, BaseItem context, StubType? stubType, XmlWr
951951
{
952952
ImageDownloadInfo imageInfo = null;
953953

954-
if (context is UserView)
955-
{
956-
var episode = item as Episode;
957-
if (episode != null)
958-
{
959-
var parent = episode.Series;
960-
if (parent != null)
961-
{
962-
imageInfo = GetImageInfo(parent);
963-
}
964-
}
965-
}
966-
967954
// Finally, just use the image from the item
968955
if (imageInfo == null)
969956
{

‎Emby.Dlna/Emby.Dlna.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
174174
</ItemGroup>
175175
<ItemGroup>
176176
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
177-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
177+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
178178
</Reference>
179179
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
180-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
180+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
181181
</Reference>
182182
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
183-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
183+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
184184
</Reference>
185185
<Reference Include="System" />
186186
<Reference Include="System.Configuration" />

‎Emby.Dlna/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.48-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
55
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<HintPath>..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4242
</Reference>
4343
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core" />

‎Emby.Drawing.ImageMagick/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ImageMagickSharp" version="1.0.0.19" targetFramework="net452" />
4-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
5-
<package id="MediaBrowser.Server.Core" version="3.3.48-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
5+
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.Skia/Emby.Drawing.Skia.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<Compile Include="StripCollageBuilder.cs" />
4444
<Compile Include="UnplayedCountIndicator.cs" />
4545
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
46+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
49+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
5050
</Reference>
5151
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System" />
5555
<Reference Include="System.Configuration" />

‎Emby.Drawing.Skia/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.48-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
55
<package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
66
</packages>

‎Emby.Drawing/Emby.Drawing.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4545
</Reference>
4646
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
47+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4848
</Reference>
4949
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
50+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Configuration" />

‎Emby.Drawing/ImageProcessor.cs

+16-24
Original file line numberDiff line numberDiff line change
@@ -518,19 +518,26 @@ private ImageSize GetImageSize(string path, bool allowSlowMethod)
518518
/// <exception cref="System.ArgumentNullException">item</exception>
519519
public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
520520
{
521-
if (item == null)
521+
var supportedEnhancers = GetSupportedEnhancers(item, image.Type);
522+
523+
return GetImageCacheTag(item, image, supportedEnhancers);
524+
}
525+
526+
public string GetImageCacheTag(BaseItem item, ChapterInfo chapter)
527+
{
528+
try
522529
{
523-
throw new ArgumentNullException("item");
530+
return GetImageCacheTag(item, new ItemImageInfo
531+
{
532+
Path = chapter.ImagePath,
533+
Type = ImageType.Chapter,
534+
DateModified = chapter.ImageDateModified
535+
});
524536
}
525-
526-
if (image == null)
537+
catch
527538
{
528-
throw new ArgumentNullException("image");
539+
return null;
529540
}
530-
531-
var supportedEnhancers = GetSupportedEnhancers(item, image.Type);
532-
533-
return GetImageCacheTag(item, image, supportedEnhancers);
534541
}
535542

536543
/// <summary>
@@ -543,21 +550,6 @@ public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
543550
/// <exception cref="System.ArgumentNullException">item</exception>
544551
public string GetImageCacheTag(BaseItem item, ItemImageInfo image, IImageEnhancer[] imageEnhancers)
545552
{
546-
if (item == null)
547-
{
548-
throw new ArgumentNullException("item");
549-
}
550-
551-
if (imageEnhancers == null)
552-
{
553-
throw new ArgumentNullException("imageEnhancers");
554-
}
555-
556-
if (image == null)
557-
{
558-
throw new ArgumentNullException("image");
559-
}
560-
561553
var originalImagePath = image.Path;
562554
var dateModified = image.DateModified;
563555
var imageType = image.Type;

‎Emby.Drawing/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.48-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
55
</packages>

‎Emby.Photos/Emby.Photos.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
35+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Common.3.3.48-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4242
</Reference>
4343
<Reference Include="TagLib.Portable">
4444
<HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

‎Emby.Photos/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.48-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.48-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
55
</packages>

‎Emby.Server.Implementations/ApplicationHost.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ protected void RegisterResources()
921921
ZipClient = new ZipClient(FileSystemManager);
922922
RegisterSingleInstance(ZipClient);
923923

924-
HttpResultFactory = new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer);
924+
HttpResultFactory = new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer, CreateBrotliCompressor());
925925
RegisterSingleInstance(HttpResultFactory);
926926

927927
RegisterSingleInstance<IServerApplicationHost>(this);
@@ -1091,6 +1091,11 @@ protected void RegisterResources()
10911091
((UserManager)UserManager).Initialize();
10921092
}
10931093

1094+
protected virtual IBrotliCompressor CreateBrotliCompressor()
1095+
{
1096+
return null;
1097+
}
1098+
10941099
private static Func<string, object> GetParseFn(Type propertyType)
10951100
{
10961101
return s => JsvReader.GetParseFn(propertyType)(s);
@@ -1361,6 +1366,8 @@ private void ConfigureNotificationsRepository()
13611366
/// </summary>
13621367
private void SetStaticProperties()
13631368
{
1369+
((SqliteItemRepository)ItemRepository).ImageProcessor = ImageProcessor;
1370+
13641371
// For now there's no real way to inject these properly
13651372
BaseItem.Logger = LogManager.GetLogger("BaseItem");
13661373
BaseItem.ConfigurationManager = ServerConfigurationManager;

‎Emby.Server.Implementations/Channels/ChannelManager.cs

+8-9
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,6 @@ private async Task<Channel> GetChannel(IChannel channelInfo, CancellationToken c
472472

473473
item.OfficialRating = GetOfficialRating(channelInfo.ParentalRating);
474474
item.Overview = channelInfo.Description;
475-
item.HomePageUrl = channelInfo.HomePageUrl;
476475

477476
if (string.IsNullOrWhiteSpace(item.Name))
478477
{
@@ -1023,7 +1022,6 @@ private BaseItem GetChannelItemEntity(ChannelItemInfo info, IChannel channelProv
10231022
item.OfficialRating = info.OfficialRating;
10241023
item.DateCreated = info.DateCreated ?? DateTime.UtcNow;
10251024
item.Tags = info.Tags.ToArray(info.Tags.Count);
1026-
item.HomePageUrl = info.HomePageUrl;
10271025
item.OriginalTitle = info.OriginalTitle;
10281026
}
10291027
else if (info.Type == ChannelItemType.Folder && info.FolderType == ChannelFolderType.Container)
@@ -1066,12 +1064,13 @@ private BaseItem GetChannelItemEntity(ChannelItemInfo info, IChannel channelProv
10661064
forceUpdate = true;
10671065
}
10681066

1069-
if (!string.Equals(item.ExternalEtag ?? string.Empty, info.Etag ?? string.Empty, StringComparison.Ordinal))
1070-
{
1071-
item.ExternalEtag = info.Etag;
1072-
forceUpdate = true;
1073-
_logger.Debug("Forcing update due to ExternalEtag {0}", item.Name);
1074-
}
1067+
// was used for status
1068+
//if (!string.Equals(item.ExternalEtag ?? string.Empty, info.Etag ?? string.Empty, StringComparison.Ordinal))
1069+
//{
1070+
// item.ExternalEtag = info.Etag;
1071+
// forceUpdate = true;
1072+
// _logger.Debug("Forcing update due to ExternalEtag {0}", item.Name);
1073+
//}
10751074

10761075
if (!internalChannelId.Equals(item.ChannelId))
10771076
{
@@ -1087,7 +1086,7 @@ private BaseItem GetChannelItemEntity(ChannelItemInfo info, IChannel channelProv
10871086
}
10881087
item.ParentId = parentFolderId;
10891088

1090-
var hasSeries = item as IHasSeries;
1089+
var hasSeries = item as IHasSeriesName;
10911090
if (hasSeries != null)
10921091
{
10931092
if (!string.Equals(hasSeries.SeriesName, info.SeriesName, StringComparison.OrdinalIgnoreCase))

0 commit comments

Comments
 (0)