aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-29 15:59:52 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-29 15:59:52 -0400
commit1a5a75854bd3ec4cdd771c9afdaefe0acb62c03c (patch)
tree1479a46b06ca7e3a22f4c1646e6a65aa533e2f33 /MediaBrowser.Model
parentb87f759460490792b7ceaf0513ab0d87a869e73b (diff)
update translations
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs6
-rw-r--r--MediaBrowser.Model/Dlna/ConditionProcessor.cs29
-rw-r--r--MediaBrowser.Model/Dlna/EventSubscription.cs34
-rw-r--r--MediaBrowser.Model/Dlna/Filter.cs35
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs8
-rw-r--r--MediaBrowser.Model/Dto/BaseItemPerson.cs3
-rw-r--r--MediaBrowser.Model/Dto/ChapterInfoDto.cs3
-rw-r--r--MediaBrowser.Model/Dto/UserDto.cs3
-rw-r--r--MediaBrowser.Model/Dto/UserItemDataDto.cs3
-rw-r--r--MediaBrowser.Model/Entities/DisplayPreferences.cs3
-rw-r--r--MediaBrowser.Model/Entities/MediaStream.cs2
-rw-r--r--MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs8
-rw-r--r--MediaBrowser.Model/Extensions/ListHelper.cs11
-rw-r--r--MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs3
-rw-r--r--MediaBrowser.Model/LiveTv/ChannelInfoDto.cs3
-rw-r--r--MediaBrowser.Model/LiveTv/ProgramInfoDto.cs3
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingGroupDto.cs3
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingInfoDto.cs3
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj3
-rw-r--r--MediaBrowser.Model/Notifications/NotificationRequest.cs6
-rw-r--r--MediaBrowser.Model/Session/GeneralCommand.cs5
-rw-r--r--MediaBrowser.Model/Session/SessionInfoDto.cs3
-rw-r--r--MediaBrowser.Model/Themes/AppTheme.cs5
-rw-r--r--MediaBrowser.Model/Updates/CheckForUpdateResult.cs7
-rw-r--r--MediaBrowser.Model/Updates/PackageVersionInfo.cs30
25 files changed, 88 insertions, 134 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 3d5e0a9c9..542020483 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,6 +1,5 @@
using MediaBrowser.Model.Weather;
using System;
-using System.Collections.Generic;
namespace MediaBrowser.Model.Configuration
{
@@ -275,14 +274,13 @@ namespace MediaBrowser.Model.Configuration
UICulture = "en-us";
- MetadataOptions = new List<MetadataOptions>
+ MetadataOptions = new[]
{
new MetadataOptions(1, 1280) {ItemType = "Book"},
new MetadataOptions(1, 1280) {ItemType = "MusicAlbum"},
new MetadataOptions(1, 1280) {ItemType = "MusicArtist"},
new MetadataOptions(0, 1280) {ItemType = "Season"}
-
- }.ToArray();
+ };
NotificationOptions = new NotificationOptions();
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index 66c3e0b19..89b844ae5 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -175,6 +175,35 @@ namespace MediaBrowser.Model.Dlna
return false;
}
+
+ private bool IsConditionSatisfied(ProfileCondition condition, float? currentValue)
+ {
+ if (!currentValue.HasValue)
+ {
+ // If the value is unknown, it satisfies if not marked as required
+ return !condition.IsRequired;
+ }
+
+ float expected;
+ if (FloatHelper.TryParseCultureInvariant(condition.Value, out expected))
+ {
+ switch (condition.Condition)
+ {
+ case ProfileConditionType.Equals:
+ return currentValue.Value.Equals(expected);
+ case ProfileConditionType.GreaterThanEqual:
+ return currentValue.Value >= expected;
+ case ProfileConditionType.LessThanEqual:
+ return currentValue.Value <= expected;
+ case ProfileConditionType.NotEquals:
+ return !currentValue.Value.Equals(expected);
+ default:
+ throw new InvalidOperationException("Unexpected ProfileConditionType");
+ }
+ }
+
+ return false;
+ }
private bool IsConditionSatisfied(ProfileCondition condition, double? currentValue)
{
diff --git a/MediaBrowser.Model/Dlna/EventSubscription.cs b/MediaBrowser.Model/Dlna/EventSubscription.cs
deleted file mode 100644
index 863ea508a..000000000
--- a/MediaBrowser.Model/Dlna/EventSubscription.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.Dlna
-{
- public class EventSubscription
- {
- public string Id { get; set; }
- public string CallbackUrl { get; set; }
- public string NotificationType { get; set; }
-
- public DateTime SubscriptionTime { get; set; }
- public int TimeoutSeconds { get; set; }
-
- public long TriggerCount { get; set; }
-
- public void IncrementTriggerCount()
- {
- if (TriggerCount == long.MaxValue)
- {
- TriggerCount = 0;
- }
-
- TriggerCount++;
- }
-
- public bool IsExpired
- {
- get
- {
- return SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
- }
- }
- }
-}
diff --git a/MediaBrowser.Model/Dlna/Filter.cs b/MediaBrowser.Model/Dlna/Filter.cs
deleted file mode 100644
index a41997010..000000000
--- a/MediaBrowser.Model/Dlna/Filter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using MediaBrowser.Model.Extensions;
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Dlna
-{
- public class Filter
- {
- private readonly List<string> _fields;
- private readonly bool _all;
-
- public Filter()
- : this("*")
- {
-
- }
-
- public Filter(string filter)
- {
- _all = StringHelper.EqualsIgnoreCase(filter, "*");
-
- List<string> list = new List<string>();
- foreach (string s in (filter ?? string.Empty).Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries))
- list.Add(s);
- _fields = list;
- }
-
- public bool Contains(string field)
- {
- // Don't bother with this. Some clients (media monkey) use the filter and then don't display very well when very little data comes back.
- return true;
- //return _all || ListHelper.ContainsIgnoreCase(_fields, field);
- }
- }
-}
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 1d20080dd..7f7a4b8f0 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Dto
/// This holds information about a BaseItem in a format that is convenient for the client.
/// </summary>
[DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")]
- public class BaseItemDto : IHasProviderIds, INotifyPropertyChanged, IItemDto
+ public class BaseItemDto : IHasProviderIds, IHasPropertyChangedEvent, IItemDto
{
/// <summary>
/// Gets or sets the name.
@@ -844,7 +844,7 @@ namespace MediaBrowser.Model.Dto
[IgnoreDataMember]
public bool IsVideo
{
- get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Video); }
+ get { return StringHelper.EqualsIgnoreCase(MediaType, MediaBrowser.Model.Entities.MediaType.Video); }
}
/// <summary>
@@ -854,7 +854,7 @@ namespace MediaBrowser.Model.Dto
[IgnoreDataMember]
public bool IsAudio
{
- get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Audio); }
+ get { return StringHelper.EqualsIgnoreCase(MediaType, MediaBrowser.Model.Entities.MediaType.Audio); }
}
/// <summary>
@@ -864,7 +864,7 @@ namespace MediaBrowser.Model.Dto
[IgnoreDataMember]
public bool IsGame
{
- get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Game); }
+ get { return StringHelper.EqualsIgnoreCase(MediaType, MediaBrowser.Model.Entities.MediaType.Game); }
}
/// <summary>
diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs
index b8393f444..46485316e 100644
--- a/MediaBrowser.Model/Dto/BaseItemPerson.cs
+++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs
@@ -1,6 +1,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Serialization;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Dto
{
@@ -8,7 +9,7 @@ namespace MediaBrowser.Model.Dto
/// This is used by the api to get information about a Person within a BaseItem
/// </summary>
[DebuggerDisplay("Name = {Name}, Role = {Role}, Type = {Type}")]
- public class BaseItemPerson : INotifyPropertyChanged
+ public class BaseItemPerson : IHasPropertyChangedEvent
{
/// <summary>
/// Gets or sets the name.
diff --git a/MediaBrowser.Model/Dto/ChapterInfoDto.cs b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
index 1ec425169..62b1839d4 100644
--- a/MediaBrowser.Model/Dto/ChapterInfoDto.cs
+++ b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
@@ -1,6 +1,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Serialization;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Dto
{
@@ -8,7 +9,7 @@ namespace MediaBrowser.Model.Dto
/// Class ChapterInfo
/// </summary>
[DebuggerDisplay("Name = {Name}")]
- public class ChapterInfoDto : INotifyPropertyChanged
+ public class ChapterInfoDto : IHasPropertyChangedEvent
{
/// <summary>
/// Gets or sets the start position ticks.
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index c4a43c512..fec22e11c 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -3,6 +3,7 @@ using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Serialization;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Dto
{
@@ -10,7 +11,7 @@ namespace MediaBrowser.Model.Dto
/// Class UserDto
/// </summary>
[DebuggerDisplay("Name = {Name}, ID = {Id}, HasPassword = {HasPassword}")]
- public class UserDto : INotifyPropertyChanged, IItemDto
+ public class UserDto : IHasPropertyChangedEvent, IItemDto
{
/// <summary>
/// Gets or sets the name.
diff --git a/MediaBrowser.Model/Dto/UserItemDataDto.cs b/MediaBrowser.Model/Dto/UserItemDataDto.cs
index 8e8e7adbe..26b0e9d9e 100644
--- a/MediaBrowser.Model/Dto/UserItemDataDto.cs
+++ b/MediaBrowser.Model/Dto/UserItemDataDto.cs
@@ -1,12 +1,13 @@
using System;
using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Dto
{
/// <summary>
/// Class UserItemDataDto
/// </summary>
- public class UserItemDataDto : INotifyPropertyChanged
+ public class UserItemDataDto : IHasPropertyChangedEvent
{
/// <summary>
/// Gets or sets the rating.
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 56a2c6194..cac703c91 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -2,13 +2,14 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Entities
{
/// <summary>
/// Defines the display preferences for any item that supports them (usually Folders)
/// </summary>
- public class DisplayPreferences : INotifyPropertyChanged
+ public class DisplayPreferences : IHasPropertyChangedEvent
{
/// <summary>
/// Occurs when [property changed].
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 7be8a64b7..fe05483e7 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -136,7 +136,7 @@ namespace MediaBrowser.Model.Entities
{
if (Type != MediaStreamType.Subtitle) return false;
- var codec = Codec ?? string.Empty;
+ string codec = Codec ?? string.Empty;
return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 &&
StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1;
diff --git a/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs b/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs
new file mode 100644
index 000000000..c87550620
--- /dev/null
+++ b/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs
@@ -0,0 +1,8 @@
+using System.ComponentModel;
+
+namespace MediaBrowser.Model.Extensions
+{
+ public interface IHasPropertyChangedEvent : INotifyPropertyChanged
+ {
+ }
+}
diff --git a/MediaBrowser.Model/Extensions/ListHelper.cs b/MediaBrowser.Model/Extensions/ListHelper.cs
index 6c5d471c0..d929866bd 100644
--- a/MediaBrowser.Model/Extensions/ListHelper.cs
+++ b/MediaBrowser.Model/Extensions/ListHelper.cs
@@ -6,7 +6,16 @@ namespace MediaBrowser.Model.Extensions
{
public static class ListHelper
{
- public static bool ContainsIgnoreCase(IEnumerable<string> list, string value)
+ public static bool ContainsIgnoreCase(List<string> list, string value)
+ {
+ if (value == null)
+ {
+ throw new ArgumentNullException("value");
+ }
+
+ return list.Contains(value, StringComparer.OrdinalIgnoreCase);
+ }
+ public static bool ContainsIgnoreCase(string[] list, string value)
{
if (value == null)
{
diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
index 2d88215bb..27001f721 100644
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -1,9 +1,10 @@
using System;
using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.LiveTv
{
- public class BaseTimerInfoDto : INotifyPropertyChanged
+ public class BaseTimerInfoDto : IHasPropertyChangedEvent
{
/// <summary>
/// Occurs when a property value changes.
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index a48006755..351378eea 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -1,5 +1,6 @@
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Library;
using System.Collections.Generic;
using System.ComponentModel;
@@ -12,7 +13,7 @@ namespace MediaBrowser.Model.LiveTv
/// Class ChannelInfoDto
/// </summary>
[DebuggerDisplay("Name = {Name}, Number = {Number}")]
- public class ChannelInfoDto : INotifyPropertyChanged, IItemDto
+ public class ChannelInfoDto : IHasPropertyChangedEvent, IItemDto
{
/// <summary>
/// Gets or sets the name.
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 644af027d..50881f72f 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -5,12 +5,13 @@ using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
+using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Library;
namespace MediaBrowser.Model.LiveTv
{
[DebuggerDisplay("Name = {Name}, StartTime = {StartDate}, EndTime = {EndDate}")]
- public class ProgramInfoDto : INotifyPropertyChanged, IItemDto
+ public class ProgramInfoDto : IHasPropertyChangedEvent, IItemDto
{
/// <summary>
/// Id of the program.
diff --git a/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs b/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
index db96d56b4..07c5ac32f 100644
--- a/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
@@ -1,5 +1,6 @@
using System.ComponentModel;
using System.Diagnostics;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.LiveTv
{
@@ -7,7 +8,7 @@ namespace MediaBrowser.Model.LiveTv
/// Class RecordingGroupDto.
/// </summary>
[DebuggerDisplay("Name = {Name}, Count = {RecordingCount}")]
- public class RecordingGroupDto : INotifyPropertyChanged
+ public class RecordingGroupDto : IHasPropertyChangedEvent
{
/// <summary>
/// Gets or sets the name.
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 58bca06bd..43ae9681e 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,5 +1,6 @@
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Library;
using System;
using System.Collections.Generic;
@@ -10,7 +11,7 @@ using System.Runtime.Serialization;
namespace MediaBrowser.Model.LiveTv
{
[DebuggerDisplay("Name = {Name}, ChannelName = {ChannelName}")]
- public class RecordingInfoDto : INotifyPropertyChanged, IItemDto
+ public class RecordingInfoDto : IHasPropertyChangedEvent, IItemDto
{
/// <summary>
/// Id of the recording.
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 5d753f9c2..fc79b7e75 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -109,8 +109,6 @@
<Compile Include="Dlna\DlnaFlags.cs" />
<Compile Include="Dlna\DlnaMaps.cs" />
<Compile Include="Dlna\DlnaProfileType.cs" />
- <Compile Include="Dlna\EventSubscription.cs" />
- <Compile Include="Dlna\Filter.cs" />
<Compile Include="Dlna\HeaderMatchType.cs" />
<Compile Include="Dlna\HttpHeaderInfo.cs" />
<Compile Include="Dlna\MediaFormatProfile.cs" />
@@ -155,6 +153,7 @@
<Compile Include="Entities\VideoSize.cs" />
<Compile Include="Events\GenericEventArgs.cs" />
<Compile Include="Extensions\DoubleHelper.cs" />
+ <Compile Include="Extensions\IHasPropertyChangedEvent.cs" />
<Compile Include="Extensions\IntHelper.cs" />
<Compile Include="Extensions\ListHelper.cs" />
<Compile Include="Extensions\StringHelper.cs" />
diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs
index d47e9c4f2..f511d41a9 100644
--- a/MediaBrowser.Model/Notifications/NotificationRequest.cs
+++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs
@@ -1,6 +1,6 @@
-using System;
+using MediaBrowser.Model.Configuration;
+using System;
using System.Collections.Generic;
-using MediaBrowser.Model.Configuration;
namespace MediaBrowser.Model.Notifications
{
@@ -34,7 +34,7 @@ namespace MediaBrowser.Model.Notifications
UserIds = new List<string>();
Date = DateTime.UtcNow;
- Variables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+ Variables = new Dictionary<string, string>();
ExcludeUserIds = new List<string>();
}
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 7e818245d..ae9ab3adc 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace MediaBrowser.Model.Session
{
@@ -13,7 +12,7 @@ namespace MediaBrowser.Model.Session
public GeneralCommand()
{
- Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+ Arguments = new Dictionary<string, string>();
}
}
}
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 7217e28f4..40723eff8 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -3,11 +3,12 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
+using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Session
{
[DebuggerDisplay("Client = {Client}, Username = {UserName}")]
- public class SessionInfoDto : INotifyPropertyChanged
+ public class SessionInfoDto : IHasPropertyChangedEvent
{
/// <summary>
/// Gets or sets a value indicating whether this instance can seek.
diff --git a/MediaBrowser.Model/Themes/AppTheme.cs b/MediaBrowser.Model/Themes/AppTheme.cs
index 40a729963..527f1de72 100644
--- a/MediaBrowser.Model/Themes/AppTheme.cs
+++ b/MediaBrowser.Model/Themes/AppTheme.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace MediaBrowser.Model.Themes
{
@@ -15,7 +14,7 @@ namespace MediaBrowser.Model.Themes
public AppTheme()
{
- Options = new Dictionary<string, string>(StringComparer.Ordinal);
+ Options = new Dictionary<string, string>();
Images = new List<ThemeImage>();
}
diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
index c9bc2d6b9..ff0bba197 100644
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
@@ -1,5 +1,4 @@
-using System;
-
+
namespace MediaBrowser.Model.Updates
{
/// <summary>
@@ -17,9 +16,9 @@ namespace MediaBrowser.Model.Updates
/// Gets or sets the available version.
/// </summary>
/// <value>The available version.</value>
- public Version AvailableVersion
+ public string AvailableVersion
{
- get { return Package != null ? Package.version : new Version(0, 0); }
+ get { return Package != null ? Package.versionStr : "0.0.0.1"; }
set { } // need this for the serializer
}
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index b3d297e8e..de8f4e8b8 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Runtime.Serialization;
-
+
namespace MediaBrowser.Model.Updates
{
/// <summary>
@@ -27,32 +25,6 @@ namespace MediaBrowser.Model.Updates
public string versionStr { get; set; }
/// <summary>
- /// The _version
- /// </summary>
- private Version _version;
- /// <summary>
- /// Gets or sets the version.
- /// Had to make this an interpreted property since Protobuf can't handle Version
- /// </summary>
- /// <value>The version.</value>
- [IgnoreDataMember]
- public Version version
- {
- get { return _version ?? (_version = new Version(ValueOrDefault(versionStr, "0.0.0.1"))); }
- }
-
- /// <summary>
- /// Values the or default.
- /// </summary>
- /// <param name="str">The STR.</param>
- /// <param name="def">The def.</param>
- /// <returns>System.String.</returns>
- private static string ValueOrDefault(string str, string def)
- {
- return string.IsNullOrEmpty(str) ? def : str;
- }
-
- /// <summary>
/// Gets or sets the classification.
/// </summary>
/// <value>The classification.</value>