update polymer

3 files changed, 13 insertions, 16 deletions

diff --git a/MediaBrowser.Api/Sync/SyncHelper.cs b/MediaBrowser.Api/Sync/SyncHelper.cs
index 6a5b6a927..0d3e8707d 100644
--- a/MediaBrowser.Api/Sync/SyncHelper.cs
+++ b/MediaBrowser.Api/Sync/SyncHelper.cs
@@ -10,11 +10,6 @@ namespace MediaBrowser.Api.Sync
         {
             List<SyncJobOption> options = new List<SyncJobOption>();
 
-            if (items.Count > 1)
-            {
-                options.Add(SyncJobOption.Name);
-            }
-            
             foreach (BaseItemDto item in items)
             {
                 if (item.SupportsSync ?? false)
@@ -65,7 +60,6 @@ namespace MediaBrowser.Api.Sync
         {
             List<SyncJobOption> options = new List<SyncJobOption>();
 
-            options.Add(SyncJobOption.Name);
             options.Add(SyncJobOption.Quality);
             options.Add(SyncJobOption.Profile);
             options.Add(SyncJobOption.UnwatchedOnly);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 457d1a4f1..b0edfc46b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -337,6 +337,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                     (details.showType ?? "No ShowType") == "TV Movie" ||
                     (details.showType ?? "No ShowType") == "Short Film",
                 IsPremiere = false,
+                ShowId = programInfo.programID
             };
 
             if (!string.IsNullOrWhiteSpace(details.originalAirDate))
@@ -448,8 +449,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                             _logger.Info("Headend: " + headend.headend);
                             foreach (ScheduleDirect.Lineup lineup in headend.lineups)
                             {
-                                _logger.Info("Headend: " + lineup.uri.Substring(18));
-                                lineups.Add(new NameIdPair()
+                                _logger.Info("Headend: " + lineup.uri);
+
+                                lineups.Add(new NameIdPair
                                 {
                                     Name = string.IsNullOrWhiteSpace(lineup.name) ? lineup.lineup : lineup.name,
                                     Id = lineup.uri.Substring(18)
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 6c71a90a0..36f8984dd 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -52,8 +52,8 @@ namespace MediaBrowser.Server.Implementations.Sync
         private readonly IConfigurationManager _config;
         private readonly IUserDataManager _userDataManager;
         private readonly Func<IMediaSourceManager> _mediaSourceManager;
-		private readonly IJsonSerializer _json;
-		private readonly ITaskManager _taskManager;
+        private readonly IJsonSerializer _json;
+        private readonly ITaskManager _taskManager;
 
         private ISyncProvider[] _providers = { };
 
@@ -63,7 +63,7 @@ namespace MediaBrowser.Server.Implementations.Sync
         public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemUpdated;
         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;
             _repo = repo;
@@ -80,7 +80,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             _userDataManager = userDataManager;
             _mediaSourceManager = mediaSourceManager;
             _json = json;
-			_taskManager = taskManager;
+            _taskManager = taskManager;
         }
 
         public void AddParts(IEnumerable<ISyncProvider> providers)
@@ -126,7 +126,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             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)
@@ -217,9 +217,10 @@ namespace MediaBrowser.Server.Implementations.Sync
                 }, _logger);
             }
 
-			if (returnResult.JobItems.Any (i => i.Status == SyncJobItemStatus.Queued || i.Status == SyncJobItemStatus.Converting)) {
-				_taskManager.QueueScheduledTask<SyncConvertScheduledTask> ();
-			}
+            if (returnResult.JobItems.Any(i => i.Status == SyncJobItemStatus.Queued || i.Status == SyncJobItemStatus.Converting))
+            {
+                _taskManager.QueueScheduledTask<SyncConvertScheduledTask>();
+            }
 
             return returnResult;
         }