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

sync updates

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-08 00:37:48 -05:00
parent d9518be3ed
commit 4389f47fb6
6 changed files with 69 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
View File

@ -118,9 +118,23 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
index++; index++;
} }
DeleteEmptyFolders(directory);
progress.Report(100); progress.Report(100);
} }
private static void DeleteEmptyFolders(string parent)
{
foreach (var directory in Directory.GetDirectories(parent))
{
DeleteEmptyFolders(directory);
if (!Directory.EnumerateFileSystemEntries(directory).Any())
{
Directory.Delete(directory, false);
}
}
}
private void DeleteFile(string path) private void DeleteFile(string path)
{ {
try try

8
MediaBrowser.Controller/Sync/ISyncDataProvider.cs
View File

@ -37,5 +37,13 @@ namespace MediaBrowser.Controller.Sync
/// <param name="id">The identifier.</param> /// <param name="id">The identifier.</param>
/// <returns>Task&lt;LocalItem&gt;.</returns> /// <returns>Task&lt;LocalItem&gt;.</returns>
Task<LocalItem> Get(SyncTarget target, string id); Task<LocalItem> Get(SyncTarget target, string id);
/// <summary>
/// Gets the cached item.
/// </summary>
/// <param name="target">The target.</param>
/// <param name="id">The identifier.</param>
/// <returns>Task&lt;LocalItem&gt;.</returns>
Task<LocalItem> GetCachedItem(SyncTarget target, string id);
} }
} }

5
MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs
View File

@ -40,6 +40,11 @@ namespace MediaBrowser.Server.Implementations.Sync
VideoCodec = "h264,mpeg4", VideoCodec = "h264,mpeg4",
AudioCodec = mp4Audio, AudioCodec = mp4Audio,
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
},
new DirectPlayProfile
{
Container = "mp3",
Type = DlnaProfileType.Audio
} }
}; };

18
MediaBrowser.Server.Implementations/Sync/MediaSync.cs
View File

@ -214,14 +214,14 @@ namespace MediaBrowser.Server.Implementations.Sync
} }
} }
private string GetLocalId(string serverId, string itemId) internal static string GetLocalId(string serverId, string itemId)
{ {
var bytes = Encoding.UTF8.GetBytes(serverId + itemId); var bytes = Encoding.UTF8.GetBytes(serverId + itemId);
bytes = CreateMD5(bytes); bytes = CreateMd5(bytes);
return BitConverter.ToString(bytes, 0, bytes.Length).Replace("-", string.Empty); return BitConverter.ToString(bytes, 0, bytes.Length).Replace("-", string.Empty);
} }
private byte[] CreateMD5(byte[] value) private static byte[] CreateMd5(byte[] value)
{ {
using (var provider = MD5.Create()) using (var provider = MD5.Create())
{ {
@ -341,10 +341,6 @@ namespace MediaBrowser.Server.Implementations.Sync
{ {
itemFile.Type = ItemFileType.Subtitles; itemFile.Type = ItemFileType.Subtitles;
} }
else if (!IsImageFile(file.Name))
{
itemFile.Type = ItemFileType.Media;
}
itemFiles.Add(itemFile); itemFiles.Add(itemFile);
} }
@ -352,14 +348,6 @@ namespace MediaBrowser.Server.Implementations.Sync
return itemFiles; return itemFiles;
} }
private static readonly string[] SupportedImageExtensions = { ".png", ".jpg", ".jpeg", ".webp" };
private bool IsImageFile(string path)
{
var ext = Path.GetExtension(path) ?? string.Empty;
return SupportedImageExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
}
private static readonly string[] SupportedSubtitleExtensions = { ".srt", ".vtt" }; private static readonly string[] SupportedSubtitleExtensions = { ".srt", ".vtt" };
private bool IsSubtitleFile(string path) private bool IsSubtitleFile(string path)
{ {

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

@ -691,9 +691,8 @@ namespace MediaBrowser.Server.Implementations.Sync
dtoOptions.Fields.Remove(ItemFields.SyncInfo); dtoOptions.Fields.Remove(ItemFields.SyncInfo);
syncedItem.Item = _dtoService().GetBaseItemDto(libraryItem, dtoOptions); syncedItem.Item = _dtoService().GetBaseItemDto(libraryItem, dtoOptions);
var mediaSource = syncedItem.Item.MediaSources var mediaSource = jobItem.MediaSource;
.FirstOrDefault(i => string.Equals(i.Id, jobItem.MediaSourceId));
syncedItem.Item.MediaSources = new List<MediaSourceInfo>(); syncedItem.Item.MediaSources = new List<MediaSourceInfo>();

45
MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs
View File

@ -1,8 +1,10 @@
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sync; using MediaBrowser.Controller.Sync;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Sync; using MediaBrowser.Model.Sync;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@ -12,11 +14,13 @@ namespace MediaBrowser.Server.Implementations.Sync
{ {
public class SyncedMediaSourceProvider : IMediaSourceProvider public class SyncedMediaSourceProvider : IMediaSourceProvider
{ {
private readonly ISyncManager _syncManager; private readonly SyncManager _syncManager;
private readonly IServerApplicationHost _appHost;
public SyncedMediaSourceProvider(ISyncManager syncManager) public SyncedMediaSourceProvider(ISyncManager syncManager, IServerApplicationHost appHost)
{ {
_syncManager = syncManager; _appHost = appHost;
_syncManager = (SyncManager)syncManager;
} }
public async Task<IEnumerable<MediaSourceInfo>> GetMediaSources(IHasMediaSources item, CancellationToken cancellationToken) public async Task<IEnumerable<MediaSourceInfo>> GetMediaSources(IHasMediaSources item, CancellationToken cancellationToken)
@ -28,11 +32,36 @@ namespace MediaBrowser.Server.Implementations.Sync
ItemId = item.Id.ToString("N") ItemId = item.Id.ToString("N")
}); });
var jobItems = jobItemResult var list = new List<MediaSourceInfo>();
.Items
.Where(i => true);
return new List<MediaSourceInfo>(); if (jobItemResult.Items.Length > 0)
{
var targets = _syncManager.ServerSyncProviders
.SelectMany(i => i.GetAllSyncTargets().Select(t => new Tuple<IServerSyncProvider, SyncTarget>(i, t)))
.ToList();
foreach (var jobItem in jobItemResult.Items)
{
var targetTuple = targets.FirstOrDefault(i => string.Equals(i.Item2.Id, jobItem.TargetId, StringComparison.OrdinalIgnoreCase));
if (targetTuple != null)
{
var syncTarget = targetTuple.Item2;
var dataProvider = _syncManager.GetDataProvider(targetTuple.Item1, syncTarget);
var localItemId = MediaSync.GetLocalId(_appHost.SystemId, item.Id.ToString("N"));
var localItem = await dataProvider.GetCachedItem(syncTarget, localItemId).ConfigureAwait(false);
if (localItem != null)
{
list.AddRange(localItem.Item.MediaSources);
}
}
}
}
return list;
} }
} }
} }