diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-22 16:48:18 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-22 16:48:18 -0400 |
| commit | b15c064bba38dbafa2d785d096ec2bf2c39964e9 (patch) | |
| tree | 180629b614aba27b678da8680fd34ae4a165b4b9 /MediaBrowser.Controller/Providers | |
| parent | a3f08b02cada12be9188a21b61c7bac8ef6c62f0 (diff) | |
Switched FFProbe caching to use service stack's jsv serializer
Diffstat (limited to 'MediaBrowser.Controller/Providers')
| -rw-r--r-- | MediaBrowser.Controller/Providers/AudioInfoProvider.cs | 16 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/VideoInfoProvider.cs | 33 |
2 files changed, 20 insertions, 29 deletions
diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs index 72e9d1e4cd..6c0eb93a6d 100644 --- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs @@ -23,18 +23,14 @@ namespace MediaBrowser.Controller.Providers get { return MetadataProviderPriority.First; }
}
- public async override Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)
+ public override async Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)
{
- Audio audio = item as Audio;
-
- Fetch(audio, await FFProbe.Run(audio, GetFFProbeOutputPath(item)).ConfigureAwait(false));
- }
-
- private string GetFFProbeOutputPath(BaseEntity item)
- {
- string outputDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.FFProbeAudioCacheDirectory, item.Id.ToString().Substring(0, 1));
+ await Task.Run(() =>
+ {
+ Audio audio = item as Audio;
- return Path.Combine(outputDirectory, item.Id + "-" + item.DateModified.Ticks + ".js");
+ Fetch(audio, FFProbe.Run(audio));
+ });
}
private void Fetch(Audio audio, FFProbeResult data)
diff --git a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs index f7a6c3b048..8145654331 100644 --- a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs @@ -1,12 +1,11 @@ using System;
+using System.Collections.Generic;
using System.ComponentModel.Composition;
-using System.IO;
using System.Linq;
using System.Threading.Tasks;
using MediaBrowser.Controller.Events;
using MediaBrowser.Controller.FFMpeg;
using MediaBrowser.Model.Entities;
-using System.Collections.Generic;
namespace MediaBrowser.Controller.Providers
{
@@ -27,27 +26,23 @@ namespace MediaBrowser.Controller.Providers public override async Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)
{
- Video video = item as Video;
-
- if (video.VideoType != VideoType.VideoFile)
+ await Task.Run(() =>
{
- // Not supported yet
- return;
- }
-
- if (CanSkip(video))
- {
- return;
- }
+ Video video = item as Video;
- Fetch(video, await FFProbe.Run(video, GetFFProbeOutputPath(video)).ConfigureAwait(false));
- }
+ if (video.VideoType != VideoType.VideoFile)
+ {
+ // Not supported yet
+ return;
+ }
- private string GetFFProbeOutputPath(Video item)
- {
- string outputDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.FFProbeVideoCacheDirectory, item.Id.ToString().Substring(0, 1));
+ if (CanSkip(video))
+ {
+ return;
+ }
- return Path.Combine(outputDirectory, item.Id + "-" + item.DateModified.Ticks + ".js");
+ Fetch(video, FFProbe.Run(video));
+ });
}
private void Fetch(Video video, FFProbeResult data)
|