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

add js local asset manager

Browse Source
This commit is contained in:
Luke Pulverenti 2015-06-03 01:30:14 -04:00
parent b14ee63635
commit 2771dd6289
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/MediaInfoService.cs
View File

@ -46,7 +46,7 @@ namespace MediaBrowser.Api.Playback
}
[Route("/Playback/BitrateTest", "GET")]
public class GetBitrateTestBytes : IReturn<PlaybackInfoResponse>
public class GetBitrateTestBytes
{
[ApiMember(Name = "Size", Description = "Size", IsRequired = true, DataType = "int", ParameterType = "query", Verb = "GET")]
public long Size { get; set; }

6
MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
View File

@ -81,10 +81,10 @@ namespace MediaBrowser.Server.Implementations.IO
throw new ArgumentNullException("path");
}
// This is an arbitraty amount of time, but delay it because file system writes often trigger events after RemoveTempIgnore has been called.
// This is an arbitraty amount of time, but delay it because file system writes often trigger events long after the file was actually written to.
// Seeing long delays in some situations, especially over the network, sometimes up to 45 seconds
// But if we make this delay too high, we risk missing legitimate changes
await Task.Delay(15000).ConfigureAwait(false);
// But if we make this delay too high, we risk missing legitimate changes, such as user adding a new file, or hand-editing metadata
await Task.Delay(20000).ConfigureAwait(false);
string val;
_tempIgnoredPaths.TryRemove(path, out val);

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -117,6 +117,12 @@
<Content Include="dashboard-ui\css\materialize.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\apiclient\localassetmanager.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\cordova\android\localassetmanager.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voice.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>