aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs28
-rw-r--r--MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs2
-rw-r--r--MediaBrowser.Model/DTO/UserDto.cs2
-rw-r--r--MediaBrowser.Model/Plugins/PluginInfo.cs2
-rw-r--r--MediaBrowser.Model/Querying/ItemQuery.cs2
-rw-r--r--MediaBrowser.Model/Querying/ItemsByNameQuery.cs3
-rw-r--r--MediaBrowser.Model/System/SystemInfo.cs2
7 files changed, 6 insertions, 35 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index eb2b4ddeb..0c18564ec 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -154,27 +154,6 @@ namespace MediaBrowser.Model.Configuration
public bool DownloadHDFanArt { get; set; }
/// <summary>
- /// Gets or sets the name of the item repository that should be used
- /// </summary>
- /// <value>The item repository.</value>
- [ProtoMember(24)]
- public string ItemRepository { get; set; }
-
- /// <summary>
- /// Gets or sets the name of the user repository that should be used
- /// </summary>
- /// <value>The user repository.</value>
- [ProtoMember(25)]
- public string UserRepository { get; set; }
-
- /// <summary>
- /// Gets or sets the name of the user data repository that should be used
- /// </summary>
- /// <value>The user data repository.</value>
- [ProtoMember(26)]
- public string UserDataRepository { get; set; }
-
- /// <summary>
/// Characters to be replaced with a ' ' in strings to create a sort name
/// </summary>
/// <value>The sort replace characters.</value>
@@ -203,13 +182,6 @@ namespace MediaBrowser.Model.Configuration
public bool ShowLogWindow { get; set; }
/// <summary>
- /// Gets or sets the name of the user data repository that should be used
- /// </summary>
- /// <value>The display preferences repository.</value>
- [ProtoMember(31)]
- public string DisplayPreferencesRepository { get; set; }
-
- /// <summary>
/// The list of types that will NOT be allowed to have internet providers run against them even if they are turned on.
/// </summary>
/// <value>The internet provider exclude types.</value>
diff --git a/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs b/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs
index 565ce6ec2..a5e44f22e 100644
--- a/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs
+++ b/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Connectivity
/// </summary>
/// <value>The user id.</value>
[ProtoMember(1)]
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
/// <summary>
/// Gets or sets the type of the client.
diff --git a/MediaBrowser.Model/DTO/UserDto.cs b/MediaBrowser.Model/DTO/UserDto.cs
index 979422dbe..b2afa90c0 100644
--- a/MediaBrowser.Model/DTO/UserDto.cs
+++ b/MediaBrowser.Model/DTO/UserDto.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Model.Dto
/// </summary>
/// <value>The id.</value>
[ProtoMember(2)]
- public Guid Id { get; set; }
+ public string Id { get; set; }
/// <summary>
/// Gets or sets the primary image tag.
diff --git a/MediaBrowser.Model/Plugins/PluginInfo.cs b/MediaBrowser.Model/Plugins/PluginInfo.cs
index 2df635db0..fd4cfa78c 100644
--- a/MediaBrowser.Model/Plugins/PluginInfo.cs
+++ b/MediaBrowser.Model/Plugins/PluginInfo.cs
@@ -57,7 +57,7 @@ namespace MediaBrowser.Model.Plugins
/// </summary>
/// <value>The unique id.</value>
[ProtoMember(9)]
- public Guid Id { get; set; }
+ public string Id { get; set; }
/// <summary>
/// Whether or not this plug-in should be automatically updated when a
diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs
index 3a1d14065..86886d751 100644
--- a/MediaBrowser.Model/Querying/ItemQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemQuery.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Querying
/// The user to localize search results for
/// </summary>
/// <value>The user id.</value>
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
/// <summary>
/// Specify this to localize the search to a specific item or folder. Omit to use the root.
diff --git a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
index 0bebb085e..eae2dc042 100644
--- a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
@@ -1,5 +1,4 @@
using MediaBrowser.Model.Entities;
-using System;
namespace MediaBrowser.Model.Querying
{
@@ -12,7 +11,7 @@ namespace MediaBrowser.Model.Querying
/// Gets or sets the user id.
/// </summary>
/// <value>The user id.</value>
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
/// <summary>
/// Gets or sets the start index.
/// </summary>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 20716ecc5..afe074088 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -71,6 +71,6 @@ namespace MediaBrowser.Model.System
/// </summary>
/// <value>The id.</value>
[ProtoMember(9)]
- public Guid Id { get; set; }
+ public string Id { get; set; }
}
}