lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.0.5588.1

Browse Source
This commit is contained in:
Luke Pulverenti 2015-04-22 09:28:45 -04:00
parent 4a6bd9eb75
commit b82081e4b2
7 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1040,7 +1040,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
innerProgress.RegisterAction(p => progress.Report(90 + (p * .1))); innerProgress.RegisterAction(p => progress.Report(90 + (p * .1)));
await CleanDatabaseInternal(progress, cancellationToken).ConfigureAwait(false); 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) private async Task RefreshChannelsInternal(IProgress<double> progress, CancellationToken cancellationToken)

1
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -440,6 +440,7 @@
"HeaderVideo": "Video", "HeaderVideo": "Video",
"HeaderRuntime": "Runtime", "HeaderRuntime": "Runtime",
"HeaderCommunityRating": "Community rating", "HeaderCommunityRating": "Community rating",
"HeaderPasswordReset": "Password Reset",
"HeaderParentalRating": "Parental rating", "HeaderParentalRating": "Parental rating",
"HeaderReleaseDate": "Release date", "HeaderReleaseDate": "Release date",
"HeaderDateAdded": "Date added", "HeaderDateAdded": "Date added",

1
MediaBrowser.Server.Implementations/Localization/cultures.json
View File

File diff suppressed because one or more lines are too long

1
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -401,7 +401,6 @@
<EmbeddedResource Include="Localization\JavaScript\kk.json" /> <EmbeddedResource Include="Localization\JavaScript\kk.json" />
<EmbeddedResource Include="Localization\Server\kk.json" /> <EmbeddedResource Include="Localization\Server\kk.json" />
<EmbeddedResource Include="Localization\countries.json" /> <EmbeddedResource Include="Localization\countries.json" />
<EmbeddedResource Include="Localization\cultures.json" />
<EmbeddedResource Include="Localization\JavaScript\da.json" /> <EmbeddedResource Include="Localization\JavaScript\da.json" />
<EmbeddedResource Include="Localization\JavaScript\vi.json" /> <EmbeddedResource Include="Localization\JavaScript\vi.json" />
<EmbeddedResource Include="Localization\Server\da.json" /> <EmbeddedResource Include="Localization\Server\da.json" />

2
MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
View File

@ -234,7 +234,7 @@ namespace MediaBrowser.Server.Implementations.Photos
protected virtual List<BaseItem> GetFinalItems(List<BaseItem> items, int limit) protected virtual List<BaseItem> GetFinalItems(List<BaseItem> items, int limit)
{ {
// Rotate the images once every x days // Rotate the images once every x days
var random = DateTime.Now.DayOfYear % 4; var random = DateTime.Now.DayOfYear % 5;
return items return items
.OrderBy(i => (random + "" + items.IndexOf(i)).GetMD5()) .OrderBy(i => (random + "" + items.IndexOf(i)).GetMD5())

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

@ -512,7 +512,7 @@ namespace MediaBrowser.Server.Implementations.Sync
var video = item as Video; var video = item as Video;
if (video != null) 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; return false;
} }
@ -758,6 +758,8 @@ namespace MediaBrowser.Server.Implementations.Sync
var requiresSaving = false; var requiresSaving = false;
var removeFromDevice = false; var removeFromDevice = false;
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
if (request.LocalItemIds.Contains(jobItem.ItemId, StringComparer.OrdinalIgnoreCase)) if (request.LocalItemIds.Contains(jobItem.ItemId, StringComparer.OrdinalIgnoreCase))
{ {
var job = _repo.GetJob(jobItem.JobId); var job = _repo.GetJob(jobItem.JobId);
@ -775,23 +777,18 @@ namespace MediaBrowser.Server.Implementations.Sync
_logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.ItemId); _logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.ItemId);
removeFromDevice = true; removeFromDevice = true;
} }
else 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) else if (job.UnwatchedOnly)
{ {
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId); if (libraryItem.IsPlayed(user) && libraryItem is Video)
if (IsLibraryItemAvailable(libraryItem))
{ {
if (libraryItem.IsPlayed(user) && libraryItem is Video) // Tell the device to remove it since it has been played
{ _logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.ItemId);
// Tell the device to remove it since it has been played
_logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.ItemId);
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; removeFromDevice = true;
} }
} }
@ -866,6 +863,8 @@ namespace MediaBrowser.Server.Implementations.Sync
var requiresSaving = false; var requiresSaving = false;
var removeFromDevice = false; var removeFromDevice = false;
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
if (request.SyncJobItemIds.Contains(jobItem.Id, StringComparer.OrdinalIgnoreCase)) if (request.SyncJobItemIds.Contains(jobItem.Id, StringComparer.OrdinalIgnoreCase))
{ {
var job = _repo.GetJob(jobItem.JobId); var job = _repo.GetJob(jobItem.JobId);
@ -883,23 +882,18 @@ namespace MediaBrowser.Server.Implementations.Sync
_logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.Id); _logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.Id);
removeFromDevice = true; removeFromDevice = true;
} }
else 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) else if (job.UnwatchedOnly)
{ {
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId); if (libraryItem.IsPlayed(user) && libraryItem is Video)
if (IsLibraryItemAvailable(libraryItem))
{ {
if (libraryItem.IsPlayed(user) && libraryItem is Video) // Tell the device to remove it since it has been played
{ _logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.Id);
// Tell the device to remove it since it has been played
_logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.Id);
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; removeFromDevice = true;
} }
} }

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5588.0")] [assembly: AssemblyVersion("3.0.5588.1")]