Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-05 22:54:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

update polymer

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-14 10:42:40 -04:00
parent da837ffbf0
commit 6ed2a85f45
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/Sync/SyncHelper.cs
View File

@ -10,11 +10,6 @@ namespace MediaBrowser.Api.Sync
{ {
List<SyncJobOption> options = new List<SyncJobOption>(); List<SyncJobOption> options = new List<SyncJobOption>();
if (items.Count > 1)
{
options.Add(SyncJobOption.Name);
}
foreach (BaseItemDto item in items) foreach (BaseItemDto item in items)
{ {
if (item.SupportsSync ?? false) if (item.SupportsSync ?? false)
@ -65,7 +60,6 @@ namespace MediaBrowser.Api.Sync
{ {
List<SyncJobOption> options = new List<SyncJobOption>(); List<SyncJobOption> options = new List<SyncJobOption>();
options.Add(SyncJobOption.Name);
options.Add(SyncJobOption.Quality); options.Add(SyncJobOption.Quality);
options.Add(SyncJobOption.Profile); options.Add(SyncJobOption.Profile);
options.Add(SyncJobOption.UnwatchedOnly); options.Add(SyncJobOption.UnwatchedOnly);

6
MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -337,6 +337,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
(details.showType ?? "No ShowType") == "TV Movie" || (details.showType ?? "No ShowType") == "TV Movie" ||
(details.showType ?? "No ShowType") == "Short Film", (details.showType ?? "No ShowType") == "Short Film",
IsPremiere = false, IsPremiere = false,
ShowId = programInfo.programID
}; };
if (!string.IsNullOrWhiteSpace(details.originalAirDate)) if (!string.IsNullOrWhiteSpace(details.originalAirDate))
@ -448,8 +449,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
_logger.Info("Headend: " + headend.headend); _logger.Info("Headend: " + headend.headend);
foreach (ScheduleDirect.Lineup lineup in headend.lineups) foreach (ScheduleDirect.Lineup lineup in headend.lineups)
{ {
_logger.Info("Headend: " + lineup.uri.Substring(18)); _logger.Info("Headend: " + lineup.uri);
lineups.Add(new NameIdPair()
lineups.Add(new NameIdPair
{ {
Name = string.IsNullOrWhiteSpace(lineup.name) ? lineup.lineup : lineup.name, Name = string.IsNullOrWhiteSpace(lineup.name) ? lineup.lineup : lineup.name,
Id = lineup.uri.Substring(18) Id = lineup.uri.Substring(18)

17
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
View File

@ -52,8 +52,8 @@ namespace MediaBrowser.Server.Implementations.Sync
private readonly IConfigurationManager _config; private readonly IConfigurationManager _config;
private readonly IUserDataManager _userDataManager; private readonly IUserDataManager _userDataManager;
private readonly Func<IMediaSourceManager> _mediaSourceManager; private readonly Func<IMediaSourceManager> _mediaSourceManager;
private readonly IJsonSerializer _json; private readonly IJsonSerializer _json;
private readonly ITaskManager _taskManager; private readonly ITaskManager _taskManager;
private ISyncProvider[] _providers = { }; private ISyncProvider[] _providers = { };
@ -63,7 +63,7 @@ namespace MediaBrowser.Server.Implementations.Sync
public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemUpdated; public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemUpdated;
public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemCreated; public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemCreated;
public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IServerApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config, IUserDataManager userDataManager, Func<IMediaSourceManager> mediaSourceManager, IJsonSerializer json, ITaskManager taskManager) public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IServerApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config, IUserDataManager userDataManager, Func<IMediaSourceManager> mediaSourceManager, IJsonSerializer json, ITaskManager taskManager)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;
_repo = repo; _repo = repo;
@ -80,7 +80,7 @@ namespace MediaBrowser.Server.Implementations.Sync
_userDataManager = userDataManager; _userDataManager = userDataManager;
_mediaSourceManager = mediaSourceManager; _mediaSourceManager = mediaSourceManager;
_json = json; _json = json;
_taskManager = taskManager; _taskManager = taskManager;
} }
public void AddParts(IEnumerable<ISyncProvider> providers) public void AddParts(IEnumerable<ISyncProvider> providers)
@ -126,7 +126,7 @@ namespace MediaBrowser.Server.Implementations.Sync
if (string.IsNullOrWhiteSpace(request.Name)) if (string.IsNullOrWhiteSpace(request.Name))
{ {
throw new ArgumentException("Please supply a name for the sync job."); request.Name = DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString();
} }
var target = GetSyncTargets(request.UserId) var target = GetSyncTargets(request.UserId)
@ -217,9 +217,10 @@ namespace MediaBrowser.Server.Implementations.Sync
}, _logger); }, _logger);
} }
if (returnResult.JobItems.Any (i => i.Status == SyncJobItemStatus.Queued || i.Status == SyncJobItemStatus.Converting)) { if (returnResult.JobItems.Any(i => i.Status == SyncJobItemStatus.Queued || i.Status == SyncJobItemStatus.Converting))
_taskManager.QueueScheduledTask<SyncConvertScheduledTask> (); {
} _taskManager.QueueScheduledTask<SyncConvertScheduledTask>();
}
return returnResult; return returnResult;
} }