aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-24 14:03:55 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-24 14:03:55 -0500
commitee00f8bf726ae5498d64cff0086b9b7e638936ea (patch)
tree710a5b4b715e5fbf1574bc072c4f299e7c9826ff /MediaBrowser.Controller
parent1af651bc56025935cebe2762d6f36be41530eba1 (diff)
added HasSyncJob
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Collections/ICollectionManager.cs7
-rw-r--r--MediaBrowser.Controller/Dto/DtoOptions.cs1
-rw-r--r--MediaBrowser.Controller/Dto/IDtoService.cs11
-rw-r--r--MediaBrowser.Controller/IServerApplicationHost.cs12
-rw-r--r--MediaBrowser.Controller/Sync/ISyncManager.cs7
-rw-r--r--MediaBrowser.Controller/Sync/ISyncRepository.cs7
6 files changed, 42 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs
index 9130f68d4..89e505579 100644
--- a/MediaBrowser.Controller/Collections/ICollectionManager.cs
+++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs
@@ -60,5 +60,12 @@ namespace MediaBrowser.Controller.Collections
/// <param name="userId">The user identifier.</param>
/// <returns>Folder.</returns>
Folder GetCollectionsFolder(string userId);
+
+ /// <summary>
+ /// Gets the collections.
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>IEnumerable&lt;BoxSet&gt;.</returns>
+ IEnumerable<BoxSet> GetCollections(User user);
}
}
diff --git a/MediaBrowser.Controller/Dto/DtoOptions.cs b/MediaBrowser.Controller/Dto/DtoOptions.cs
index eeb4fc114..a8d1b1862 100644
--- a/MediaBrowser.Controller/Dto/DtoOptions.cs
+++ b/MediaBrowser.Controller/Dto/DtoOptions.cs
@@ -17,6 +17,7 @@ namespace MediaBrowser.Controller.Dto
public List<ImageType> ImageTypes { get; set; }
public int ImageTypeLimit { get; set; }
public bool EnableImages { get; set; }
+ public string DeviceId { get; set; }
public DtoOptions()
{
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index 7c7ec56d5..ea311d993 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -44,6 +44,17 @@ namespace MediaBrowser.Controller.Dto
/// <param name="owner">The owner.</param>
/// <returns>BaseItemDto.</returns>
BaseItemDto GetBaseItemDto(BaseItem item, DtoOptions options, User user = null, BaseItem owner = null);
+
+ /// <summary>
+ /// Gets the base item dtos.
+ /// </summary>
+ /// <param name="items">The items.</param>
+ /// <param name="options">The options.</param>
+ /// <param name="user">The user.</param>
+ /// <param name="owner">The owner.</param>
+ /// <returns>IEnumerable&lt;BaseItemDto&gt;.</returns>
+ IEnumerable<BaseItemDto> GetBaseItemDtos(IEnumerable<BaseItem> items, DtoOptions options, User user = null,
+ BaseItem owner = null);
/// <summary>
/// Gets the chapter information dto.
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 0b0f6d828..105e4e2f0 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -55,9 +55,15 @@ namespace MediaBrowser.Controller
string FriendlyName { get; }
/// <summary>
- /// Gets the HTTP server ip addresses.
+ /// Gets the local ip address.
/// </summary>
- /// <value>The HTTP server ip addresses.</value>
- IEnumerable<string> HttpServerIpAddresses { get; }
+ /// <value>The local ip address.</value>
+ string LocalIpAddress { get; }
+
+ /// <summary>
+ /// Gets the local API URL.
+ /// </summary>
+ /// <value>The local API URL.</value>
+ string LocalApiUrl { get; }
}
}
diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 62b6a3a37..9edc708ee 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -142,5 +142,12 @@ namespace MediaBrowser.Controller.Sync
/// <param name="id">The identifier.</param>
/// <returns>Task.</returns>
Task UnmarkJobItemForRemoval(string id);
+
+ /// <summary>
+ /// Gets the library item ids.
+ /// </summary>
+ /// <param name="query">The query.</param>
+ /// <returns>QueryResult&lt;System.String&gt;.</returns>
+ QueryResult<string> GetLibraryItemIds(SyncJobItemQuery query);
}
}
diff --git a/MediaBrowser.Controller/Sync/ISyncRepository.cs b/MediaBrowser.Controller/Sync/ISyncRepository.cs
index f1bcd7f07..315f5f541 100644
--- a/MediaBrowser.Controller/Sync/ISyncRepository.cs
+++ b/MediaBrowser.Controller/Sync/ISyncRepository.cs
@@ -68,5 +68,12 @@ namespace MediaBrowser.Controller.Sync
/// <param name="query">The query.</param>
/// <returns>IEnumerable&lt;SyncJobItem&gt;.</returns>
QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query);
+
+ /// <summary>
+ /// Gets the library item ids.
+ /// </summary>
+ /// <param name="query">The query.</param>
+ /// <returns>QueryResult&lt;System.String&gt;.</returns>
+ QueryResult<string> GetLibraryItemIds(SyncJobItemQuery query);
}
}