diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-15 09:20:29 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-15 09:20:29 -0400 |
| commit | 3f1af19ce7702a3310842f812563e580b2ca4408 (patch) | |
| tree | 8890b7f227ac45d260cee48ebc32619d472fea5e /MediaBrowser.Api/ApiService.cs | |
| parent | d5cf6d59a30cc989d7e33c6eb6ac378e6339b2f3 (diff) | |
Re-worked provider id's, api client, moved people to the api item wrapper and added server error handling
Diffstat (limited to 'MediaBrowser.Api/ApiService.cs')
| -rw-r--r-- | MediaBrowser.Api/ApiService.cs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs index c14705be6..7c52e0e5c 100644 --- a/MediaBrowser.Api/ApiService.cs +++ b/MediaBrowser.Api/ApiService.cs @@ -58,6 +58,8 @@ namespace MediaBrowser.Api {
wrapper.Children = Kernel.Instance.GetParentalAllowedChildren(folder, userId).Select(c => GetSerializationObject(c, false, userId));
}
+
+ wrapper.People = item.People;
}
return wrapper;
@@ -136,15 +138,18 @@ namespace MediaBrowser.Api _FFMpegPath = Path.Combine(FFMpegDirectory, filename);
- if (!File.Exists(_FFMpegPath))
+ // Always re-extract the first time to handle new versions
+ if (File.Exists(_FFMpegPath))
+ {
+ File.Delete(_FFMpegPath);
+ }
+
+ // Extract ffprobe
+ using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("MediaBrowser.Api.FFMpeg." + filename))
{
- // Extract ffprobe
- using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("MediaBrowser.Api.FFMpeg." + filename))
+ using (FileStream fileStream = new FileStream(_FFMpegPath, FileMode.Create))
{
- using (FileStream fileStream = new FileStream(_FFMpegPath, FileMode.Create))
- {
- stream.CopyTo(fileStream);
- }
+ stream.CopyTo(fileStream);
}
}
}
|