3.0.5588.1
This commit is contained in:
parent
4a6bd9eb75
commit
b82081e4b2
|
@ -1040,7 +1040,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
|||
innerProgress.RegisterAction(p => progress.Report(90 + (p * .1)));
|
||||
await CleanDatabaseInternal(progress, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
RefreshIfNeeded(GetPrograms().Where(i => (i.StartDate - DateTime.UtcNow).TotalDays <= 1).ToList());
|
||||
RefreshIfNeeded(GetPrograms().ToList());
|
||||
}
|
||||
|
||||
private async Task RefreshChannelsInternal(IProgress<double> progress, CancellationToken cancellationToken)
|
||||
|
|
|
@ -440,6 +440,7 @@
|
|||
"HeaderVideo": "Video",
|
||||
"HeaderRuntime": "Runtime",
|
||||
"HeaderCommunityRating": "Community rating",
|
||||
"HeaderPasswordReset": "Password Reset",
|
||||
"HeaderParentalRating": "Parental rating",
|
||||
"HeaderReleaseDate": "Release date",
|
||||
"HeaderDateAdded": "Date added",
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -401,7 +401,6 @@
|
|||
<EmbeddedResource Include="Localization\JavaScript\kk.json" />
|
||||
<EmbeddedResource Include="Localization\Server\kk.json" />
|
||||
<EmbeddedResource Include="Localization\countries.json" />
|
||||
<EmbeddedResource Include="Localization\cultures.json" />
|
||||
<EmbeddedResource Include="Localization\JavaScript\da.json" />
|
||||
<EmbeddedResource Include="Localization\JavaScript\vi.json" />
|
||||
<EmbeddedResource Include="Localization\Server\da.json" />
|
||||
|
|
|
@ -234,7 +234,7 @@ namespace MediaBrowser.Server.Implementations.Photos
|
|||
protected virtual List<BaseItem> GetFinalItems(List<BaseItem> items, int limit)
|
||||
{
|
||||
// Rotate the images once every x days
|
||||
var random = DateTime.Now.DayOfYear % 4;
|
||||
var random = DateTime.Now.DayOfYear % 5;
|
||||
|
||||
return items
|
||||
.OrderBy(i => (random + "" + items.IndexOf(i)).GetMD5())
|
||||
|
|
|
@ -512,7 +512,7 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
var video = item as Video;
|
||||
if (video != null)
|
||||
{
|
||||
if (video.VideoType == VideoType.Iso || video.VideoType == VideoType.BluRay || video.VideoType == VideoType.Dvd || video.VideoType == VideoType.HdDvd)
|
||||
if (video.VideoType == VideoType.Iso || video.VideoType == VideoType.HdDvd)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -758,6 +758,8 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
var requiresSaving = false;
|
||||
var removeFromDevice = false;
|
||||
|
||||
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
|
||||
|
||||
if (request.LocalItemIds.Contains(jobItem.ItemId, StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
var job = _repo.GetJob(jobItem.JobId);
|
||||
|
@ -775,11 +777,13 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
_logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.ItemId);
|
||||
removeFromDevice = true;
|
||||
}
|
||||
else if (job.UnwatchedOnly)
|
||||
else if (!IsLibraryItemAvailable(libraryItem))
|
||||
{
|
||||
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
|
||||
|
||||
if (IsLibraryItemAvailable(libraryItem))
|
||||
// Tell the device to remove it since it's no longer available
|
||||
_logger.Debug("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.ItemId);
|
||||
removeFromDevice = true;
|
||||
}
|
||||
else if (job.UnwatchedOnly)
|
||||
{
|
||||
if (libraryItem.IsPlayed(user) && libraryItem is Video)
|
||||
{
|
||||
|
@ -788,13 +792,6 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
removeFromDevice = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Tell the device to remove it since it's no longer available
|
||||
_logger.Debug("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.ItemId);
|
||||
removeFromDevice = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -866,6 +863,8 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
var requiresSaving = false;
|
||||
var removeFromDevice = false;
|
||||
|
||||
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
|
||||
|
||||
if (request.SyncJobItemIds.Contains(jobItem.Id, StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
var job = _repo.GetJob(jobItem.JobId);
|
||||
|
@ -883,11 +882,13 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
_logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.Id);
|
||||
removeFromDevice = true;
|
||||
}
|
||||
else if (job.UnwatchedOnly)
|
||||
else if (!IsLibraryItemAvailable(libraryItem))
|
||||
{
|
||||
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
|
||||
|
||||
if (IsLibraryItemAvailable(libraryItem))
|
||||
// Tell the device to remove it since it's no longer available
|
||||
_logger.Debug("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.Id);
|
||||
removeFromDevice = true;
|
||||
}
|
||||
else if (job.UnwatchedOnly)
|
||||
{
|
||||
if (libraryItem.IsPlayed(user) && libraryItem is Video)
|
||||
{
|
||||
|
@ -896,13 +897,6 @@ namespace MediaBrowser.Server.Implementations.Sync
|
|||
removeFromDevice = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Tell the device to remove it since it's no longer available
|
||||
_logger.Debug("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.Id);
|
||||
removeFromDevice = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.0.*")]
|
||||
//[assembly: AssemblyVersion("3.0.5588.0")]
|
||||
//[assembly: AssemblyVersion("3.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.5588.1")]
|
||||
|
|
Loading…
Reference in New Issue
Block a user