mirror of https://github.com/jellyfin/jellyfin.git
update recording file name
This commit is contained in:
parent
f0864b1dae
commit
06ebf9d3c2
|
@ -423,10 +423,6 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
|
||||||
CurrentProgress = null;
|
CurrentProgress = null;
|
||||||
|
|
||||||
OnTaskCompleted(startTime, endTime, status, failureException);
|
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>
|
/// <summary>
|
||||||
|
|
|
@ -176,7 +176,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
public string UICulture { get; set; }
|
public string UICulture { get; set; }
|
||||||
|
|
||||||
public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
|
public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
|
||||||
public bool FindInternetTrailers { get; set; }
|
|
||||||
|
|
||||||
public bool SaveMetadataHidden { get; set; }
|
public bool SaveMetadataHidden { get; set; }
|
||||||
|
|
||||||
|
@ -243,7 +242,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
LibraryMonitorDelay = 60;
|
LibraryMonitorDelay = 60;
|
||||||
|
|
||||||
EnableInternetProviders = true;
|
EnableInternetProviders = true;
|
||||||
FindInternetTrailers = true;
|
|
||||||
|
|
||||||
PathSubstitutions = new PathSubstitution[] { };
|
PathSubstitutions = new PathSubstitution[] { };
|
||||||
ContentTypes = new NameValuePair[] { };
|
ContentTypes = new NameValuePair[] { };
|
||||||
|
|
|
@ -647,8 +647,6 @@ namespace MediaBrowser.Providers.Manager
|
||||||
|
|
||||||
if (result.HasMetadata)
|
if (result.HasMetadata)
|
||||||
{
|
{
|
||||||
NormalizeRemoteResult(result.Item);
|
|
||||||
|
|
||||||
MergeData(result, temp, new List<MetadataFields>(), false, false);
|
MergeData(result, temp, new List<MetadataFields>(), false, false);
|
||||||
|
|
||||||
refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataDownload;
|
refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataDownload;
|
||||||
|
@ -673,19 +671,6 @@ namespace MediaBrowser.Providers.Manager
|
||||||
return refreshResult;
|
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)
|
private void MergeNewData(TItemType source, TIdType lookupInfo)
|
||||||
{
|
{
|
||||||
// Copy new provider id's that may have been obtained
|
// Copy new provider id's that may have been obtained
|
||||||
|
|
|
@ -1088,10 +1088,6 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
await RunPostScanTasks(innerProgress, cancellationToken).ConfigureAwait(false);
|
await RunPostScanTasks(innerProgress, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
progress.Report(100);
|
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>
|
/// <summary>
|
||||||
|
|
|
@ -165,10 +165,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
|
||||||
progress.Report(100);
|
progress.Report(100);
|
||||||
|
|
||||||
_logger.Info("People validation complete");
|
_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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
||||||
{
|
{
|
||||||
name += " " + info.OriginalAirDate.Value.ToString("yyyy-MM-dd");
|
name += " " + info.OriginalAirDate.Value.ToString("yyyy-MM-dd");
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
name += " " + DateTime.Now.ToString("yyyy-MM-dd");
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(info.EpisodeTitle))
|
if (!string.IsNullOrWhiteSpace(info.EpisodeTitle))
|
||||||
{
|
{
|
||||||
|
|
|
@ -385,8 +385,7 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
new OmdbEpisodeProviderMigration(ServerConfigurationManager),
|
new OmdbEpisodeProviderMigration(ServerConfigurationManager),
|
||||||
new MovieDbEpisodeProviderMigration(ServerConfigurationManager),
|
new MovieDbEpisodeProviderMigration(ServerConfigurationManager),
|
||||||
new DbMigration(ServerConfigurationManager, TaskManager),
|
new DbMigration(ServerConfigurationManager, TaskManager),
|
||||||
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename),
|
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename)
|
||||||
new CollectionsViewMigration(ServerConfigurationManager, UserManager)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach (var task in migrations)
|
foreach (var task in migrations)
|
||||||
|
|
|
@ -70,7 +70,6 @@
|
||||||
<Compile Include="FFMpeg\FFMpegInfo.cs" />
|
<Compile Include="FFMpeg\FFMpegInfo.cs" />
|
||||||
<Compile Include="INativeApp.cs" />
|
<Compile Include="INativeApp.cs" />
|
||||||
<Compile Include="MbLinkShortcutHandler.cs" />
|
<Compile Include="MbLinkShortcutHandler.cs" />
|
||||||
<Compile Include="Migrations\CollectionsViewMigration.cs" />
|
|
||||||
<Compile Include="Migrations\IVersionMigration.cs" />
|
<Compile Include="Migrations\IVersionMigration.cs" />
|
||||||
<Compile Include="Migrations\DbMigration.cs" />
|
<Compile Include="Migrations\DbMigration.cs" />
|
||||||
<Compile Include="Migrations\MovieDbEpisodeProviderMigration.cs" />
|
<Compile Include="Migrations\MovieDbEpisodeProviderMigration.cs" />
|
||||||
|
|
|
@ -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();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue