Merge pull request #1689 from MediaBrowser/dev

LukePulverenti · LukePulverenti · commit 3a9d74810d8c · 2016-04-27T16:29:52.000-04:00
Dev
diff --git a/MediaBrowser.Model/Sync/SyncJobItem.cs b/MediaBrowser.Model/Sync/SyncJobItem.cs
@@ -102,6 +102,8 @@ public class SyncJobItem
         /// <value>The index of the job item.</value>
         public int JobItemIndex { get; set; }
 
+        public long ItemDateModifiedTicks { get; set; }
+
         public SyncJobItem()
         {
             AdditionalFiles = new List<ItemFileInfo>();
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -149,6 +149,11 @@ public Task UpdateJobStatus(string id)
         {
             var job = _syncRepo.GetJob(id);
 
+            if (job == null)
+            {
+                return Task.FromResult(true);
+            }
+
             var result = _syncManager.GetJobItems(new SyncJobItemQuery
             {
                 JobId = job.Id,
@@ -632,6 +637,7 @@ private async Task Sync(SyncJobItem jobItem, Video item, User user, bool enableC
 
                     }, innerProgress, cancellationToken);
 
+                    jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                     _syncManager.OnConversionComplete(jobItem);
                 }
                 catch (OperationCanceledException)
@@ -668,6 +674,7 @@ private async Task Sync(SyncJobItem jobItem, Video item, User user, bool enableC
                     throw new InvalidOperationException(string.Format("Cannot direct stream {0} protocol", mediaSource.Protocol));
                 }
 
+                jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                 jobItem.MediaSource = mediaSource;
             }
 
@@ -819,6 +826,7 @@ private async Task Sync(SyncJobItem jobItem, Audio item, User user, bool enableC
 
                     }, innerProgress, cancellationToken);
 
+                    jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                     _syncManager.OnConversionComplete(jobItem);
                 }
                 catch (OperationCanceledException)
@@ -855,6 +863,7 @@ private async Task Sync(SyncJobItem jobItem, Audio item, User user, bool enableC
                     throw new InvalidOperationException(string.Format("Cannot direct stream {0} protocol", mediaSource.Protocol));
                 }
 
+                jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                 jobItem.MediaSource = mediaSource;
             }
 
@@ -871,6 +880,7 @@ private async Task Sync(SyncJobItem jobItem, Photo item, CancellationToken cance
 
             jobItem.Progress = 50;
             jobItem.Status = SyncJobItemStatus.ReadyToTransfer;
+            jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
             await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);
         }
 
@@ -880,6 +890,7 @@ private async Task SyncGeneric(SyncJobItem jobItem, BaseItem item, CancellationT
 
             jobItem.Progress = 50;
             jobItem.Status = SyncJobItemStatus.ReadyToTransfer;
+            jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
             await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);
         }
 
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -775,6 +775,13 @@ public async Task<SyncDataResponse> SyncData(SyncDataRequest request)
                             removeFromDevice = true;
                         }
                     }
+                    else if (libraryItem != null && libraryItem.DateModified.Ticks != jobItem.ItemDateModifiedTicks && jobItem.ItemDateModifiedTicks > 0)
+                    {
+                        _logger.Info("Setting status to Queued for {0} because the media has been modified since the original sync.", jobItem.ItemId);
+                        jobItem.Status = SyncJobItemStatus.Queued;
+                        jobItem.Progress = 0;
+                        requiresSaving = true;
+                    }
                 }
                 else
                 {
@@ -881,6 +888,13 @@ private async Task<SyncDataResponse> SyncDataUsingSyncJobItemIds(SyncDataRequest
                             removeFromDevice = true;
                         }
                     }
+                    else if (libraryItem != null && libraryItem.DateModified.Ticks != jobItem.ItemDateModifiedTicks && jobItem.ItemDateModifiedTicks > 0)
+                    {
+                        _logger.Info("Setting status to Queued for {0} because the media has been modified since the original sync.", jobItem.ItemId);
+                        jobItem.Status = SyncJobItemStatus.Queued;
+                        jobItem.Progress = 0;
+                        requiresSaving = true;
+                    }
                 }
                 else
                 {
@@ -1117,7 +1131,7 @@ public QueryResult<SyncedItemProgress> GetSyncedItemProgresses(SyncJobItemQuery
         public SyncJobOptions GetAudioOptions(SyncJobItem jobItem, SyncJob job)
         {
             var options = GetSyncJobOptions(jobItem.TargetId, null, null);
-            
+
             if (job.Bitrate.HasValue)
             {
                 options.DeviceProfile.MaxStaticBitrate = job.Bitrate.Value;
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -50,7 +50,7 @@ public async Task Initialize()
                                 "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, Bitrate INT, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
                                 "create index if not exists idx_SyncJobs on SyncJobs(Id)",
 
-                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT)",
+                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT, ItemDateModifiedTicks BIGINT)",
                                 "create index if not exists idx_SyncJobItems on SyncJobs(Id)",
 
                                 //pragmas
@@ -63,6 +63,7 @@ public async Task Initialize()
 
             _connection.AddColumn(Logger, "SyncJobs", "Profile", "TEXT");
             _connection.AddColumn(Logger, "SyncJobs", "Bitrate", "INT");
+            _connection.AddColumn(Logger, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT");
 
             PrepareStatements();
         }
@@ -127,7 +128,7 @@ private void PrepareStatements()
 
             // _insertJobItemCommand
             _insertJobItemCommand = _connection.CreateCommand();
-            _insertJobItemCommand.CommandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval, @JobItemIndex)";
+            _insertJobItemCommand.CommandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval, @JobItemIndex, @ItemDateModifiedTicks)";
 
             _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@Id");
             _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@ItemId");
@@ -144,10 +145,11 @@ private void PrepareStatements()
             _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@MediaSource");
             _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@IsMarkedForRemoval");
             _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@JobItemIndex");
+            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@ItemDateModifiedTicks");
 
             // _updateJobItemCommand
             _updateJobItemCommand = _connection.CreateCommand();
-            _updateJobItemCommand.CommandText = "update SyncJobItems set ItemId=@ItemId,ItemName=@ItemName,MediaSourceId=@MediaSourceId,JobId=@JobId,TemporaryPath=@TemporaryPath,OutputPath=@OutputPath,Status=@Status,TargetId=@TargetId,DateCreated=@DateCreated,Progress=@Progress,AdditionalFiles=@AdditionalFiles,MediaSource=@MediaSource,IsMarkedForRemoval=@IsMarkedForRemoval,JobItemIndex=@JobItemIndex where Id=@Id";
+            _updateJobItemCommand.CommandText = "update SyncJobItems set ItemId=@ItemId,ItemName=@ItemName,MediaSourceId=@MediaSourceId,JobId=@JobId,TemporaryPath=@TemporaryPath,OutputPath=@OutputPath,Status=@Status,TargetId=@TargetId,DateCreated=@DateCreated,Progress=@Progress,AdditionalFiles=@AdditionalFiles,MediaSource=@MediaSource,IsMarkedForRemoval=@IsMarkedForRemoval,JobItemIndex=@JobItemIndex,ItemDateModifiedTicks=@ItemDateModifiedTicks where Id=@Id";
 
             _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@Id");
             _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@ItemId");
@@ -164,10 +166,11 @@ private void PrepareStatements()
             _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@MediaSource");
             _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@IsMarkedForRemoval");
             _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@JobItemIndex");
+            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@ItemDateModifiedTicks");
         }
 
         private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
-        private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex from SyncJobItems";
+        private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks from SyncJobItems";
 
         public SyncJob GetJob(string id)
         {
@@ -678,6 +681,7 @@ private async Task InsertOrUpdate(SyncJobItem jobItem, IDbCommand cmd)
                 cmd.GetParameter(index++).Value = jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource);
                 cmd.GetParameter(index++).Value = jobItem.IsMarkedForRemoval;
                 cmd.GetParameter(index++).Value = jobItem.JobItemIndex;
+                cmd.GetParameter(index++).Value = jobItem.ItemDateModifiedTicks;
 
                 cmd.Transaction = transaction;
 
@@ -782,6 +786,11 @@ private SyncJobItem GetJobItem(IDataReader reader)
             info.IsMarkedForRemoval = reader.GetBoolean(13);
             info.JobItemIndex = reader.GetInt32(14);
 
+            if (!reader.IsDBNull(15))
+            {
+                info.ItemDateModifiedTicks = reader.GetInt64(15);
+            }
+
             return info;
         }
 
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.2.48",
-  "_release": "1.2.48",
+  "version": "1.2.49",
+  "_release": "1.2.49",
   "_resolution": {
     "type": "version",
-    "tag": "1.2.48",
-    "commit": "342107db8bbaa343a4c61be6fd2591121a83ffff"
+    "tag": "1.2.49",
+    "commit": "dced619538d91455d46dcbaf0bc03178cbf5ebd8"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.0",
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
@@ -327,6 +327,8 @@
     text-decoration: none;
     overflow: hidden;
     align-items: center;
+    /* Needed for Firefox */
+    text-align: left;
 }
 
 .timeslotCellInner {
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icon/.bower.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icon/.bower.json
@@ -32,14 +32,14 @@
     "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/PolymerElements/iron-icon",
+  "homepage": "https://github.com/polymerelements/iron-icon",
   "_release": "1.0.8",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.8",
     "commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
   },
-  "_source": "git://github.com/PolymerElements/iron-icon.git",
+  "_source": "git://github.com/polymerelements/iron-icon.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-icon"
+  "_originalSource": "polymerelements/iron-icon"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/paper-behaviors/.bower.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -45,7 +45,7 @@
     "tag": "v1.0.11",
     "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
   },
-  "_source": "git://github.com/polymerelements/paper-behaviors.git",
+  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-behaviors"
+  "_originalSource": "PolymerElements/paper-behaviors"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/paper-ripple/.bower.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/paper-ripple/.bower.json
@@ -32,14 +32,14 @@
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/paper-ripple",
+  "homepage": "https://github.com/PolymerElements/paper-ripple",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
   },
-  "_source": "git://github.com/polymerelements/paper-ripple.git",
+  "_source": "git://github.com/PolymerElements/paper-ripple.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-ripple"
+  "_originalSource": "PolymerElements/paper-ripple"
 }

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,8 @@ public class SyncJobItem`
`102`	`102`	`/// <value>The index of the job item.</value>`
`103`	`103`	`public int JobItemIndex { get; set; }`
`104`	`104`
	`105`	`+ public long ItemDateModifiedTicks { get; set; }`
	`106`	`+`
`105`	`107`	`public SyncJobItem()`
`106`	`108`	`{`
`107`	`109`	`AdditionalFiles = new List<ItemFileInfo>();`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,11 @@ public Task UpdateJobStatus(string id)`
`149`	`149`	`{`
`150`	`150`	`var job = _syncRepo.GetJob(id);`
`151`	`151`
	`152`	`+ if (job == null)`
	`153`	`+ {`
	`154`	`+ return Task.FromResult(true);`
	`155`	`+ }`
	`156`	`+`
`152`	`157`	`var result = _syncManager.GetJobItems(new SyncJobItemQuery`
`153`	`158`	`{`
`154`	`159`	`JobId = job.Id,`
`@@ -632,6 +637,7 @@ private async Task Sync(SyncJobItem jobItem, Video item, User user, bool enableC`
`632`	`637`
`633`	`638`	`}, innerProgress, cancellationToken);`
`634`	`639`
	`640`	`+ jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;`
`635`	`641`	`_syncManager.OnConversionComplete(jobItem);`
`636`	`642`	`}`
`637`	`643`	`catch (OperationCanceledException)`
`@@ -668,6 +674,7 @@ private async Task Sync(SyncJobItem jobItem, Video item, User user, bool enableC`
`668`	`674`	`throw new InvalidOperationException(string.Format("Cannot direct stream {0} protocol", mediaSource.Protocol));`
`669`	`675`	`}`
`670`	`676`
	`677`	`+ jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;`
`671`	`678`	`jobItem.MediaSource = mediaSource;`
`672`	`679`	`}`
`673`	`680`
`@@ -819,6 +826,7 @@ private async Task Sync(SyncJobItem jobItem, Audio item, User user, bool enableC`
`819`	`826`
`820`	`827`	`}, innerProgress, cancellationToken);`
`821`	`828`
	`829`	`+ jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;`
`822`	`830`	`_syncManager.OnConversionComplete(jobItem);`
`823`	`831`	`}`
`824`	`832`	`catch (OperationCanceledException)`
`@@ -855,6 +863,7 @@ private async Task Sync(SyncJobItem jobItem, Audio item, User user, bool enableC`
`855`	`863`	`throw new InvalidOperationException(string.Format("Cannot direct stream {0} protocol", mediaSource.Protocol));`
`856`	`864`	`}`
`857`	`865`
	`866`	`+ jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;`
`858`	`867`	`jobItem.MediaSource = mediaSource;`
`859`	`868`	`}`
`860`	`869`
`@@ -871,6 +880,7 @@ private async Task Sync(SyncJobItem jobItem, Photo item, CancellationToken cance`
`871`	`880`
`872`	`881`	`jobItem.Progress = 50;`
`873`	`882`	`jobItem.Status = SyncJobItemStatus.ReadyToTransfer;`
	`883`	`+ jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;`
`874`	`884`	`await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);`
`875`	`885`	`}`
`876`	`886`
`@@ -880,6 +890,7 @@ private async Task SyncGeneric(SyncJobItem jobItem, BaseItem item, CancellationT`
`880`	`890`
`881`	`891`	`jobItem.Progress = 50;`
`882`	`892`	`jobItem.Status = SyncJobItemStatus.ReadyToTransfer;`
	`893`	`+ jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;`
`883`	`894`	`await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);`
`884`	`895`	`}`
`885`	`896`
Original file line number	Diff line number	Diff line change
`@@ -775,6 +775,13 @@ public async Task<SyncDataResponse> SyncData(SyncDataRequest request)`
`775`	`775`	`removeFromDevice = true;`
`776`	`776`	`}`
`777`	`777`	`}`
	`778`	`+ else if (libraryItem != null && libraryItem.DateModified.Ticks != jobItem.ItemDateModifiedTicks && jobItem.ItemDateModifiedTicks > 0)`
	`779`	`+ {`
	`780`	`+ _logger.Info("Setting status to Queued for {0} because the media has been modified since the original sync.", jobItem.ItemId);`
	`781`	`+ jobItem.Status = SyncJobItemStatus.Queued;`
	`782`	`+ jobItem.Progress = 0;`
	`783`	`+ requiresSaving = true;`
	`784`	`+ }`
`778`	`785`	`}`
`779`	`786`	`else`
`780`	`787`	`{`
`@@ -881,6 +888,13 @@ private async Task<SyncDataResponse> SyncDataUsingSyncJobItemIds(SyncDataRequest`
`881`	`888`	`removeFromDevice = true;`
`882`	`889`	`}`
`883`	`890`	`}`
	`891`	`+ else if (libraryItem != null && libraryItem.DateModified.Ticks != jobItem.ItemDateModifiedTicks && jobItem.ItemDateModifiedTicks > 0)`
	`892`	`+ {`
	`893`	`+ _logger.Info("Setting status to Queued for {0} because the media has been modified since the original sync.", jobItem.ItemId);`
	`894`	`+ jobItem.Status = SyncJobItemStatus.Queued;`
	`895`	`+ jobItem.Progress = 0;`
	`896`	`+ requiresSaving = true;`
	`897`	`+ }`
`884`	`898`	`}`
`885`	`899`	`else`
`886`	`900`	`{`
`@@ -1117,7 +1131,7 @@ public QueryResult<SyncedItemProgress> GetSyncedItemProgresses(SyncJobItemQuery`
`1117`	`1131`	`public SyncJobOptions GetAudioOptions(SyncJobItem jobItem, SyncJob job)`
`1118`	`1132`	`{`
`1119`	`1133`	`var options = GetSyncJobOptions(jobItem.TargetId, null, null);`
`1120`		`-`
	`1134`	`+`
`1121`	`1135`	`if (job.Bitrate.HasValue)`
`1122`	`1136`	`{`
`1123`	`1137`	`options.DeviceProfile.MaxStaticBitrate = job.Bitrate.Value;`
Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,8 @@`
`327`	`327`	`text-decoration: none;`
`328`	`328`	`overflow: hidden;`
`329`	`329`	`align-items: center;`
	`330`	`+ /* Needed for Firefox */`
	`331`	`+ text-align: left;`
`330`	`332`	`}`
`331`	`333`
`332`	`334`	`.timeslotCellInner {`