diff options
| author | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-08-01 23:15:11 -0400 |
|---|---|---|
| committer | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-08-01 23:15:11 -0400 |
| commit | 51ce69d9dbd0f2acf44100de4c021eec2d841d89 (patch) | |
| tree | b256f22f5e426874602d88739bc04daa73356202 | |
| parent | 6e8bfb6d9b34e8aad876bdb21907ca686741e7cb (diff) | |
| parent | 80fd8d015626cbb5ed9ea8678149b13a4a1272f4 (diff) | |
Merge
| -rw-r--r-- | MediaBrowser.Api/ApiService.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.ApiInteraction/BaseClient.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/ApiBaseItem.cs | 7 |
4 files changed, 51 insertions, 5 deletions
diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs index 34f7e69e7..bb2427574 100644 --- a/MediaBrowser.Api/ApiService.cs +++ b/MediaBrowser.Api/ApiService.cs @@ -31,9 +31,14 @@ namespace MediaBrowser.Api UserItemData = Kernel.Instance.GetUserItemData(userId, item.Id),
Type = item.GetType().Name,
IsFolder = (item is Folder),
- ParentId = item.Parent == null ? Guid.Empty : item.Parent.Id
+ ParentLogoItemId = GetParentLogoItemId(item)
};
+ if (item.Parent != null)
+ {
+ wrapper.ParentId = item.Parent.Id;
+ }
+
if (includeChildren)
{
var folder = item as Folder;
@@ -46,5 +51,25 @@ namespace MediaBrowser.Api return wrapper;
}
+
+ private static Guid? GetParentLogoItemId(BaseItem item)
+ {
+ if (string.IsNullOrEmpty(item.LogoImagePath))
+ {
+ var parent = item.Parent;
+
+ while (parent != null)
+ {
+ if (!string.IsNullOrEmpty(parent.LogoImagePath))
+ {
+ return parent.Id;
+ }
+
+ parent = parent.Parent;
+ }
+ }
+
+ return null;
+ }
}
}
diff --git a/MediaBrowser.ApiInteraction/BaseClient.cs b/MediaBrowser.ApiInteraction/BaseClient.cs index bd25b1653..887c1779f 100644 --- a/MediaBrowser.ApiInteraction/BaseClient.cs +++ b/MediaBrowser.ApiInteraction/BaseClient.cs @@ -8,7 +8,23 @@ namespace MediaBrowser.ApiInteraction /// </summary>
public abstract class BaseClient : IDisposable
{
- public string ApiUrl { get; set; }
+ /// <summary>
+ /// Gets or sets the server host name (myserver or 192.168.x.x)
+ /// </summary>
+ public string ServerHostName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the port number used by the API
+ /// </summary>
+ public int ApiPort { get; set; }
+
+ protected string ApiUrl
+ {
+ get
+ {
+ return string.Format("http://{0}:{1}/mediabrowser/api", ServerHostName, ApiPort);
+ }
+ }
protected HttpClient HttpClient { get; private set; }
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 514c05097..2420a5091 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -141,7 +141,7 @@ namespace MediaBrowser.Common.Kernel /// <summary>
/// Reloads application configuration from the config file
/// </summary>
- private void ReloadConfiguration()
+ protected virtual void ReloadConfiguration()
{
//Configuration information for anything other than server-specific configuration will have to come via the API... -ebr
@@ -199,7 +199,7 @@ namespace MediaBrowser.Common.Kernel /// <summary>
/// Disposes all resources currently in use.
/// </summary>
- public void Dispose()
+ public virtual void Dispose()
{
DisposeHttpServer();
DisposeLogger();
diff --git a/MediaBrowser.Model/Entities/ApiBaseItem.cs b/MediaBrowser.Model/Entities/ApiBaseItem.cs index 341b1c77f..0ec9ed7c6 100644 --- a/MediaBrowser.Model/Entities/ApiBaseItem.cs +++ b/MediaBrowser.Model/Entities/ApiBaseItem.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.Model.Entities public bool IsFolder { get; set; }
- public Guid ParentId { get; set; }
+ public Guid? ParentId { get; set; }
public string Type { get; set; }
@@ -39,5 +39,10 @@ namespace MediaBrowser.Model.Entities {
return Type.Equals(type, StringComparison.OrdinalIgnoreCase);
}
+
+ /// <summary>
+ /// If the item does not have a logo, this will hold the Id of the Parent that has one.
+ /// </summary>
+ public Guid? ParentLogoItemId { get; set; }
}
}
|