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

Merge pull request #2122 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-29 14:43:52 -04:00 committed by GitHub
commit 814860074e
10 changed files with 11 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
View File

@ -423,10 +423,6 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
CurrentProgress = null;
OnTaskCompleted(startTime, endTime, status, failureException);
// Bad practice, i know. But we keep a lot in memory, unfortunately.
GC.Collect(2, GCCollectionMode.Forced, true);
GC.Collect(2, GCCollectionMode.Forced, true);
}
/// <summary>

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -176,7 +176,6 @@ namespace MediaBrowser.Model.Configuration
public string UICulture { get; set; }
public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
public bool FindInternetTrailers { get; set; }
public bool SaveMetadataHidden { get; set; }
@ -243,7 +242,6 @@ namespace MediaBrowser.Model.Configuration
LibraryMonitorDelay = 60;
EnableInternetProviders = true;
FindInternetTrailers = true;
PathSubstitutions = new PathSubstitution[] { };
ContentTypes = new NameValuePair[] { };

15
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@ -647,8 +647,6 @@ namespace MediaBrowser.Providers.Manager
if (result.HasMetadata)
{
NormalizeRemoteResult(result.Item);
MergeData(result, temp, new List<MetadataFields>(), false, false);
refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataDownload;
@ -673,19 +671,6 @@ namespace MediaBrowser.Providers.Manager
return refreshResult;
}
private void NormalizeRemoteResult(TItemType item)
{
if (!ServerConfigurationManager.Configuration.FindInternetTrailers)
{
var hasTrailers = item as IHasTrailers;
if (hasTrailers != null)
{
hasTrailers.RemoteTrailers.Clear();
}
}
}
private void MergeNewData(TItemType source, TIdType lookupInfo)
{
// Copy new provider id's that may have been obtained

9
MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
View File

@ -216,7 +216,8 @@ namespace MediaBrowser.Server.Implementations.Intros
}
return allIntros
.Where(i => IsMatch(i.Path, codec));
.Where(i => IsMatch(i.Path, codec))
.OrderBy(i => Guid.NewGuid());
}
private IEnumerable<IntroInfo> GetMediaInfoIntrosByAudioStream(List<IntroInfo> allIntros, MediaStream stream)
@ -229,13 +230,15 @@ namespace MediaBrowser.Server.Implementations.Intros
}
return allIntros
.Where(i => IsAudioMatch(i.Path, stream));
.Where(i => IsAudioMatch(i.Path, stream))
.OrderBy(i => Guid.NewGuid());
}
private IEnumerable<IntroInfo> GetMediaInfoIntrosByTags(List<IntroInfo> allIntros, List<string> tags)
{
return allIntros
.Where(i => tags.Any(t => IsMatch(i.Path, t)));
.Where(i => tags.Any(t => IsMatch(i.Path, t)))
.OrderBy(i => Guid.NewGuid());
}
private bool IsMatch(string file, string attribute)

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

@ -1088,10 +1088,6 @@ namespace MediaBrowser.Server.Implementations.Library
await RunPostScanTasks(innerProgress, cancellationToken).ConfigureAwait(false);
progress.Report(100);
// Bad practice, i know. But we keep a lot in memory, unfortunately.
GC.Collect(2, GCCollectionMode.Forced, true);
GC.Collect(2, GCCollectionMode.Forced, true);
}
/// <summary>

4
MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
View File

@ -165,10 +165,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
progress.Report(100);
_logger.Info("People validation complete");
// Bad practice, i know. But we keep a lot in memory, unfortunately.
GC.Collect(2, GCCollectionMode.Forced, true);
GC.Collect(2, GCCollectionMode.Forced, true);
}
}
}

4
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
View File

@ -55,6 +55,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{
name += " " + info.OriginalAirDate.Value.ToString("yyyy-MM-dd");
}
else
{
name += " " + DateTime.Now.ToString("yyyy-MM-dd");
}
if (!string.IsNullOrWhiteSpace(info.EpisodeTitle))
{

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

@ -385,8 +385,7 @@ namespace MediaBrowser.Server.Startup.Common
new OmdbEpisodeProviderMigration(ServerConfigurationManager),
new MovieDbEpisodeProviderMigration(ServerConfigurationManager),
new DbMigration(ServerConfigurationManager, TaskManager),
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename),
new CollectionsViewMigration(ServerConfigurationManager, UserManager)
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename)
};
foreach (var task in migrations)

1
MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
View File

@ -70,7 +70,6 @@
<Compile Include="FFMpeg\FFMpegInfo.cs" />
<Compile Include="INativeApp.cs" />
<Compile Include="MbLinkShortcutHandler.cs" />
<Compile Include="Migrations\CollectionsViewMigration.cs" />
<Compile Include="Migrations\IVersionMigration.cs" />
<Compile Include="Migrations\DbMigration.cs" />
<Compile Include="Migrations\MovieDbEpisodeProviderMigration.cs" />

40
MediaBrowser.Server.Startup.Common/Migrations/CollectionsViewMigration.cs
View File

@ -1,40 +0,0 @@
using System.Linq;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library;
namespace MediaBrowser.Server.Startup.Common.Migrations
{
public class CollectionsViewMigration : IVersionMigration
{
private readonly IServerConfigurationManager _config;
private readonly IUserManager _userManager;
public CollectionsViewMigration(IServerConfigurationManager config, IUserManager userManager)
{
_config = config;
_userManager = userManager;
}
public void Run()
{
var migrationKey = this.GetType().Name;
var migrationKeyList = _config.Configuration.Migrations.ToList();
if (!migrationKeyList.Contains(migrationKey))
{
if (_config.Configuration.IsStartupWizardCompleted)
{
if (_userManager.Users.Any(i => i.Configuration.DisplayCollectionsView))
{
_config.Configuration.DisplayCollectionsView = true;
}
}
migrationKeyList.Add(migrationKey);
_config.Configuration.Migrations = migrationKeyList.ToArray();
_config.SaveConfiguration();
}
}
}
}