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

Merge pull request #2082 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-20 13:16:21 -04:00 committed by GitHub
commit d04f45ec20
3 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,6 +271,7 @@
<Compile Include="Sorting\StartDateComparer.cs" />
<Compile Include="Sync\SyncHelper.cs" />
<Compile Include="Sync\SyncJobOptions.cs" />
<Compile Include="Sync\SyncNotificationEntryPoint.cs" />
<Compile Include="UserViews\CollectionFolderImageProvider.cs" />
<Compile Include="UserViews\DynamicImageProvider.cs" />
<Compile Include="News\NewsEntryPoint.cs" />

48
MediaBrowser.Server.Implementations/Sync/SyncNotificationEntryPoint.cs Normal file
View File

@ -0,0 +1,48 @@
using System.Threading;
using MediaBrowser.Controller.Plugins;
using MediaBrowser.Controller.Session;
using MediaBrowser.Controller.Sync;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Sync;
namespace MediaBrowser.Server.Implementations.Sync
{
public class SyncNotificationEntryPoint : IServerEntryPoint
{
private readonly ISessionManager _sessionManager;
private readonly ISyncManager _syncManager;
public SyncNotificationEntryPoint(ISyncManager syncManager, ISessionManager sessionManager)
{
_syncManager = syncManager;
_sessionManager = sessionManager;
}
public void Run()
{
_syncManager.SyncJobItemUpdated += _syncManager_SyncJobItemUpdated;
}
private async void _syncManager_SyncJobItemUpdated(object sender, GenericEventArgs<SyncJobItem> e)
{
var item = e.Argument;
if (item.Status == SyncJobItemStatus.ReadyToTransfer)
{
try
{
await _sessionManager.SendMessageToUserDeviceSessions(item.TargetId, "SyncJobItemReady", item, CancellationToken.None).ConfigureAwait(false);
}
catch
{
}
}
}
public void Dispose()
{
_syncManager.SyncJobItemUpdated -= _syncManager_SyncJobItemUpdated;
}
}
}

2
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -382,8 +382,6 @@ namespace MediaBrowser.WebDashboard.Api
}
_fileSystem.DeleteDirectory(Path.Combine(bowerPath, "jquery", "src"), true);
//_fileSystem.DeleteDirectory(Path.Combine(bowerPath, "fingerprintjs2", "flash"), true);
//_fileSystem.DeleteDirectory(Path.Combine(bowerPath, "fingerprintjs2", "specs"), true);
DeleteCryptoFiles(Path.Combine(bowerPath, "cryptojslib", "components"));