lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update nlog

Browse Source
This commit is contained in:
Luke Pulverenti 2015-01-12 00:07:19 -05:00
parent 231e89e4b9
commit f45e166604
11 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
View File

@ -48,9 +48,9 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=3.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<Reference Include="NLog, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.10.2.0, Culture=neutral, PublicKeyToken=beaf6f427e128133, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
MediaBrowser.Common.Implementations/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
<package id="SimpleInjector" version="2.6.1" targetFramework="net45" />
</packages>

2
MediaBrowser.LocalMetadata/BaseXmlProvider.cs
View File

@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace MediaBrowser.LocalMetadata
{
public abstract class BaseXmlProvider<T> : ILocalMetadataProvider<T>, IHasChangeMonitor
public abstract class BaseXmlProvider<T> : ILocalMetadataProvider<T>, IHasChangeMonitor, IHasOrder
where T : IHasMetadata, new()
{
protected IFileSystem FileSystem;

19
MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
View File

@ -1,16 +1,16 @@
using System.Collections.Generic;
using System.IO;
using System.Threading;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.LocalMetadata.Parsers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using System.Collections.Generic;
using System.IO;
using System.Threading;
namespace MediaBrowser.LocalMetadata.Providers
{
public class EpisodeXmlProvider : BaseXmlProvider<Episode>, IHasOrder
public class EpisodeXmlProvider : BaseXmlProvider<Episode>
{
private readonly ILogger _logger;
@ -40,14 +40,5 @@ namespace MediaBrowser.LocalMetadata.Providers
return directoryService.GetFile(metadataFile);
}
public int Order
{
get
{
// After Xbmc
return 1;
}
}
}
}

6
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -223,12 +223,6 @@ namespace MediaBrowser.Model.Dto
/// <value>The run time ticks.</value>
public long? RunTimeTicks { get; set; }
/// <summary>
/// Gets or sets the recursive unplayed item count.
/// </summary>
/// <value>The recursive unplayed item count.</value>
public int? RecursiveUnplayedItemCount { get; set; }
/// <summary>
/// Gets or sets the play access.
/// </summary>

42
MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
View File

@ -7,6 +7,7 @@ using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Channels;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Dto;
@ -208,16 +209,6 @@ namespace MediaBrowser.Server.Implementations.Channels
CancellationToken cancellationToken,
string path)
{
var limit = GetDownloadLimit(channelOptions);
if (limit.HasValue)
{
if (IsSizeLimitReached(path, limit.Value))
{
return;
}
}
var itemId = item.Id.ToString("N");
var sources = await _manager.GetChannelItemMediaSources(itemId, false, cancellationToken)
.ConfigureAwait(false);
@ -230,6 +221,16 @@ namespace MediaBrowser.Server.Implementations.Channels
return;
}
var limit = GetDownloadLimit(channelOptions);
if (limit.HasValue)
{
if (IsSizeLimitReached(path, limit.Value))
{
return;
}
}
var channelItem = (IChannelMediaItem)item;
var destination = Path.Combine(path, channelItem.ChannelId, itemId);
@ -254,10 +255,25 @@ namespace MediaBrowser.Server.Implementations.Channels
if (item != null)
{
// Get the version from the database
item = _libraryManager.GetItemById(item.Id) ?? item;
var forceSave = false;
await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
// Get the version from the database
var dbItem = _libraryManager.GetItemById(item.Id);
if (dbItem == null)
{
forceSave = true;
}
else
{
item = dbItem;
}
await item.RefreshMetadata(new MetadataRefreshOptions
{
ForceSave = forceSave
}, cancellationToken).ConfigureAwait(false);
}
}

3
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -1140,7 +1140,7 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.AbsoluteEpisodeNumber = episode.AbsoluteEpisodeNumber;
}
//if (fields.Contains(ItemFields.SpecialEpisodeNumbers))
if (fields.Contains(ItemFields.SpecialEpisodeNumbers))
{
dto.AirsAfterSeasonNumber = episode.AirsAfterSeasonNumber;
dto.AirsBeforeEpisodeNumber = episode.AirsBeforeEpisodeNumber;
@ -1449,7 +1449,6 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.RecursiveItemCount = recursiveItemCount;
dto.UserData.UnplayedItemCount = unplayed;
dto.RecursiveUnplayedItemCount = unplayed;
if (recursiveItemCount > 0)
{

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -577,7 +577,7 @@ namespace MediaBrowser.Server.Implementations.Library
var fullPath = fileInfo.FullName;
if (string.IsNullOrWhiteSpace(collectionType))
if (string.IsNullOrWhiteSpace(collectionType) && parent != null)
{
collectionType = GetContentTypeOverride(fullPath, true);
}

9
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -750,16 +750,11 @@ namespace MediaBrowser.Server.Startup.Common
/// </summary>
protected override void FindParts()
{
// TODO: Remove after next release
if (!IsFirstRun && !ServerConfigurationManager.Configuration.IsPortAuthorized)
{
ServerConfigurationManager.Configuration.IsPortAuthorized = true;
ConfigurationManager.SaveConfiguration();
}
if (!ServerConfigurationManager.Configuration.IsPortAuthorized)
{
RegisterServerWithAdministratorAccess();
ServerConfigurationManager.Configuration.IsPortAuthorized = true;
ConfigurationManager.SaveConfiguration();
}
base.FindParts();

4
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -63,10 +63,6 @@
<Reference Include="MediaBrowser.IsoMounter">
<HintPath>..\packages\MediaBrowser.IsoMounting.3.0.69\lib\net45\MediaBrowser.IsoMounter.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=3.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="pfmclrapi">
<HintPath>..\packages\MediaBrowser.IsoMounting.3.0.69\lib\net45\pfmclrapi.dll</HintPath>
</Reference>

1
MediaBrowser.ServerApplication/packages.config
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.IsoMounting" version="3.0.69" targetFramework="net45" />
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
<package id="System.Data.SQLite.Core" version="1.0.94.0" targetFramework="net45" />
</packages>