diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-02-05 16:14:08 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-02-05 16:14:08 -0500 |
| commit | bde06629da72a2418921b2e300fdd996f0119b5a (patch) | |
| tree | f0d7f15d0a1fcb2d0560845645eb896059354663 /MediaBrowser.Controller | |
| parent | 7d415fc2fd8c76ba25c2bdb40347d1e0d17ad99f (diff) | |
update translations
Diffstat (limited to 'MediaBrowser.Controller')
5 files changed, 42 insertions, 16 deletions
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index 318c5fff3..b5ca053ec 100644 --- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs +++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs @@ -417,7 +417,7 @@ namespace MediaBrowser.Controller.Entities ParentId = (parent == null ? null : parent.Id.ToString("N")), GroupItems = true - }).Select(i => i.Item1); + }).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null); query.SortBy = new string[] { }; diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 27beabcc1..e8223ef10 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -345,6 +345,7 @@ <Compile Include="Sync\ISyncManager.cs" /> <Compile Include="Sync\ISyncProvider.cs" /> <Compile Include="Sync\ISyncRepository.cs" /> + <Compile Include="Sync\SyncAccount.cs" /> <Compile Include="Themes\IAppThemeManager.cs" /> <Compile Include="Themes\InternalThemeImage.cs" /> <Compile Include="TV\ITVSeriesManager.cs" /> diff --git a/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs b/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs index f93360c64..dae7faef8 100644 --- a/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs +++ b/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs @@ -1,4 +1,5 @@ - +using System.Collections.Generic; + namespace MediaBrowser.Controller.Sync { public interface ICloudSyncProvider @@ -8,5 +9,11 @@ namespace MediaBrowser.Controller.Sync /// </summary> /// <value>The name.</value> string Name { get; } + + /// <summary> + /// Gets the synchronize targets. + /// </summary> + /// <returns>IEnumerable<SyncTarget>.</returns> + IEnumerable<SyncAccount> GetSyncAccounts(); } } diff --git a/MediaBrowser.Controller/Sync/IServerSyncProvider.cs b/MediaBrowser.Controller/Sync/IServerSyncProvider.cs index 175fda647..8ef54fd43 100644 --- a/MediaBrowser.Controller/Sync/IServerSyncProvider.cs +++ b/MediaBrowser.Controller/Sync/IServerSyncProvider.cs @@ -31,22 +31,12 @@ namespace MediaBrowser.Controller.Sync /// </summary> /// <param name="serverId">The server identifier.</param> /// <param name="itemId">The item identifier.</param> - /// <param name="path">The path.</param> + /// <param name="pathParts">The path parts.</param> + /// <param name="name">The name.</param> + /// <param name="fileType">Type of the file.</param> /// <param name="target">The target.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - Task TransferItemFile(string serverId, string itemId, string path, SyncTarget target, CancellationToken cancellationToken); - - /// <summary> - /// Transfers the related file. - /// </summary> - /// <param name="serverId">The server identifier.</param> - /// <param name="itemId">The item identifier.</param> - /// <param name="path">The path.</param> - /// <param name="type">The type.</param> - /// <param name="target">The target.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task.</returns> - Task TransferRelatedFile(string serverId, string itemId, string path, ItemFileType type, SyncTarget target, CancellationToken cancellationToken); + Task TransferItemFile(string serverId, string itemId, string[] pathParts, string name, ItemFileType fileType, SyncTarget target, CancellationToken cancellationToken); } } diff --git a/MediaBrowser.Controller/Sync/SyncAccount.cs b/MediaBrowser.Controller/Sync/SyncAccount.cs new file mode 100644 index 000000000..882e948d1 --- /dev/null +++ b/MediaBrowser.Controller/Sync/SyncAccount.cs @@ -0,0 +1,28 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Sync +{ + public class SyncAccount + { + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string Name { get; set; } + /// <summary> + /// Gets or sets the identifier. + /// </summary> + /// <value>The identifier.</value> + public string Id { get; set; } + /// <summary> + /// Gets or sets the user identifier. + /// </summary> + /// <value>The user identifier.</value> + public List<string> UserIds { get; set; } + + public SyncAccount() + { + UserIds = new List<string>(); + } + } +} |
