diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-28 12:59:40 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-28 12:59:40 -0500 |
| commit | 726cf9697aba40f26223789138fe0858ebb374bc (patch) | |
| tree | f6186ca203d9aa2abd783b2339a76133b6153ecc /MediaBrowser.Model | |
| parent | 5278959edef763bdf0b4d72ace75efd151ab5024 (diff) | |
sync updates
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Net/MimeTypes.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/ItemFIleInfo.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/LocalItem.cs | 33 |
4 files changed, 46 insertions, 7 deletions
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index cf6aaa529..8ec271626 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -370,6 +370,7 @@ <Compile Include="Sync\DeviceFileInfo.cs" /> <Compile Include="Sync\ItemFIleInfo.cs" /> <Compile Include="Sync\ItemFileType.cs" /> + <Compile Include="Sync\LocalItem.cs" /> <Compile Include="Sync\SyncCategory.cs" /> <Compile Include="Sync\SyncDialogOptions.cs" /> <Compile Include="Sync\SyncedItem.cs" /> diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs index 6eaac8f03..19dda0603 100644 --- a/MediaBrowser.Model/Net/MimeTypes.cs +++ b/MediaBrowser.Model/Net/MimeTypes.cs @@ -72,7 +72,7 @@ namespace MediaBrowser.Model.Net {".asf", "video/x-ms-asf"}, {".m4v", "video/x-m4v"} }; - + private static readonly Dictionary<string, string> ExtensionLookup = MimeTypeLookup .GroupBy(i => i.Value) @@ -267,7 +267,17 @@ namespace MediaBrowser.Model.Net public static string ToExtension(string mimeType) { - return ExtensionLookup[mimeType]; + if (string.IsNullOrEmpty(mimeType)) + { + throw new ArgumentNullException("mimeType"); + } + + string result; + if (ExtensionLookup.TryGetValue(mimeType, out result)) + { + return result; + } + throw new ArgumentNullException("Unable to determine extension for mimeType: " + mimeType); } } } diff --git a/MediaBrowser.Model/Sync/ItemFIleInfo.cs b/MediaBrowser.Model/Sync/ItemFIleInfo.cs index ef19973a2..f0829bc2b 100644 --- a/MediaBrowser.Model/Sync/ItemFIleInfo.cs +++ b/MediaBrowser.Model/Sync/ItemFIleInfo.cs @@ -24,10 +24,5 @@ namespace MediaBrowser.Model.Sync /// </summary> /// <value>The type of the image.</value> public ImageType ImageType { get; set; } - /// <summary> - /// Gets or sets the item identifier. - /// </summary> - /// <value>The item identifier.</value> - public string ItemId { get; set; } } } diff --git a/MediaBrowser.Model/Sync/LocalItem.cs b/MediaBrowser.Model/Sync/LocalItem.cs new file mode 100644 index 000000000..9e660c590 --- /dev/null +++ b/MediaBrowser.Model/Sync/LocalItem.cs @@ -0,0 +1,33 @@ +using MediaBrowser.Model.Dto; + +namespace MediaBrowser.Model.Sync +{ + public class LocalItem + { + /// <summary> + /// Gets or sets the item. + /// </summary> + /// <value>The item.</value> + public BaseItemDto Item { get; set; } + /// <summary> + /// Gets or sets the local path. + /// </summary> + /// <value>The local path.</value> + public string[] LocalPath { get; set; } + /// <summary> + /// Gets or sets the server identifier. + /// </summary> + /// <value>The server identifier.</value> + public string ServerId { get; set; } + /// <summary> + /// Gets or sets the unique identifier. + /// </summary> + /// <value>The unique identifier.</value> + public string UniqueId { get; set; } + /// <summary> + /// Gets or sets the item identifier. + /// </summary> + /// <value>The item identifier.</value> + public string ItemId { get; set; } + } +} |
