Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated to SynologyDotNet.Core 0.5.0 #1

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Updated to SynologyDotNet.Core 0.5.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SynologyDotNet.AudioStation/AudioStationClient.Album.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public partial class AudioStationClient
/// <param name="artist">Filter by artist name</param>
/// <param name="queryParameters">Filter parameters</param>
/// <returns></returns>
public async Task<ApiListRessponse<AlbumList>> ListAlbumsAsync(int limit, int offset, string artist = null, params (AlbumQueryParameter, object)[] queryParameters)
public async Task<ApiListResponse<AlbumList>> ListAlbumsAsync(int limit, int offset, string artist = null, params (AlbumQueryParameter, object)[] queryParameters)
{
var args = new List<(string, object)>(queryParameters.Select(f => (f.Item1.ToString(), f.Item2)));
args.Add(GetLibraryArg());
args.Add(("additional", "avg_rating"));
if (!string.IsNullOrWhiteSpace(artist))
args.Add(("artist", artist));

return await Client.QueryListAsync<ApiListRessponse<AlbumList>>(SYNO_AudioStation_Album, "list", limit, offset, args.ToArray()).ConfigureAwait(false);
return await Client.QueryListAsync<ApiListResponse<AlbumList>>(SYNO_AudioStation_Album, "list", limit, offset, args.ToArray()).ConfigureAwait(false);
}

/// <summary>
Expand All @@ -49,9 +49,9 @@ public async Task<ByteArrayData> GetAlbumCoverAsync(string artist, string album)
/// <param name="offset">The offset.</param>
/// <param name="keyword">The keyword.</param>
/// <returns></returns>
public async Task<ApiListRessponse<AlbumList>> SearchAlbumsByNameAsync(int limit, int offset, string keyword)
public async Task<ApiListResponse<AlbumList>> SearchAlbumsByNameAsync(int limit, int offset, string keyword)
{
return await Client.QueryListAsync<ApiListRessponse<AlbumList>>(SYNO_AudioStation_Album, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<AlbumList>>(SYNO_AudioStation_Album, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"),
("keyword", keyword),
Expand Down
12 changes: 6 additions & 6 deletions SynologyDotNet.AudioStation/AudioStationClient.Artist.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public partial class AudioStationClient
/// <param name="limit">Maximum number of items to return</param>
/// <param name="offset">Start position in the list (use it for paging)</param>
/// <returns></returns>
public async Task<ApiListRessponse<ArtistList>> ListArtistsAsync(int limit, int offset)
public async Task<ApiListResponse<ArtistList>> ListArtistsAsync(int limit, int offset)
{
return await Client.QueryListAsync<ApiListRessponse<ArtistList>>(SYNO_AudioStation_Artist, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<ArtistList>>(SYNO_AudioStation_Artist, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating")).ConfigureAwait(false);
}
Expand All @@ -27,9 +27,9 @@ public async Task<ApiListRessponse<ArtistList>> ListArtistsAsync(int limit, int
/// <param name="offset">Start position in the list (use it for paging)</param>
/// <param name="genre">Filter by genre</param>
/// <returns></returns>
public async Task<ApiListRessponse<ArtistList>> SearchArtistsByGenreAsync(int limit, int offset, string genre)
public async Task<ApiListResponse<ArtistList>> SearchArtistsByGenreAsync(int limit, int offset, string genre)
{
return await Client.QueryListAsync<ApiListRessponse<ArtistList>>(SYNO_AudioStation_Artist, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<ArtistList>>(SYNO_AudioStation_Artist, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"),
("genre", genre)).ConfigureAwait(false);
Expand All @@ -42,9 +42,9 @@ public async Task<ApiListRessponse<ArtistList>> SearchArtistsByGenreAsync(int li
/// <param name="offset">Start position in the list (use it for paging)</param>
/// <param name="keyword">Filter by keyword</param>
/// <returns></returns>
public async Task<ApiListRessponse<ArtistList>> SearchArtistsByNameAsync(int limit, int offset, string keyword)
public async Task<ApiListResponse<ArtistList>> SearchArtistsByNameAsync(int limit, int offset, string keyword)
{
return await Client.QueryListAsync<ApiListRessponse<ArtistList>>(SYNO_AudioStation_Artist, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<ArtistList>>(SYNO_AudioStation_Artist, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"),
("keyword", keyword),
Expand Down
8 changes: 4 additions & 4 deletions SynologyDotNet.AudioStation/AudioStationClient.Composer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public partial class AudioStationClient
/// <param name="limit">The limit.</param>
/// <param name="offset">The offset.</param>
/// <returns></returns>
public async Task<ApiListRessponse<ComposerList>> ListComposersAsync(int limit, int offset)
public async Task<ApiListResponse<ComposerList>> ListComposersAsync(int limit, int offset)
{
return await Client.QueryListAsync<ApiListRessponse<ComposerList>>(SYNO_AudioStation_Composer, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<ComposerList>>(SYNO_AudioStation_Composer, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"))
.ConfigureAwait(false);
Expand All @@ -27,9 +27,9 @@ public async Task<ApiListRessponse<ComposerList>> ListComposersAsync(int limit,
/// <param name="offset">The offset.</param>
/// <param name="keyword">The keyword.</param>
/// <returns></returns>
public async Task<ApiListRessponse<ComposerList>> SearchComposersByNameAsync(int limit, int offset, string keyword)
public async Task<ApiListResponse<ComposerList>> SearchComposersByNameAsync(int limit, int offset, string keyword)
{
return await Client.QueryListAsync<ApiListRessponse<ComposerList>>(SYNO_AudioStation_Composer, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<ComposerList>>(SYNO_AudioStation_Composer, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"),
("keyword", keyword),
Expand Down
8 changes: 4 additions & 4 deletions SynologyDotNet.AudioStation/AudioStationClient.Genre.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public partial class AudioStationClient
/// <param name="limit">The limit.</param>
/// <param name="offset">The offset.</param>
/// <returns></returns>
public async Task<ApiListRessponse<GenreList>> ListGenresAsync(int limit, int offset)
public async Task<ApiListResponse<GenreList>> ListGenresAsync(int limit, int offset)
{
return await Client.QueryListAsync<ApiListRessponse<GenreList>>(SYNO_AudioStation_Genre, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<GenreList>>(SYNO_AudioStation_Genre, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"))
.ConfigureAwait(false);
Expand All @@ -27,9 +27,9 @@ public async Task<ApiListRessponse<GenreList>> ListGenresAsync(int limit, int of
/// <param name="offset">The offset.</param>
/// <param name="keyword">The keyword.</param>
/// <returns></returns>
public async Task<ApiListRessponse<GenreList>> SearchGenresByNameAsync(int limit, int offset, string keyword)
public async Task<ApiListResponse<GenreList>> SearchGenresByNameAsync(int limit, int offset, string keyword)
{
return await Client.QueryListAsync<ApiListRessponse<GenreList>>(SYNO_AudioStation_Genre, "list", limit, offset,
return await Client.QueryListAsync<ApiListResponse<GenreList>>(SYNO_AudioStation_Genre, "list", limit, offset,
GetLibraryArg(),
("additional", "avg_rating"),
("keyword", keyword),
Expand Down
6 changes: 3 additions & 3 deletions SynologyDotNet.AudioStation/AudioStationClient.Playlist.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public async Task<ApiResponse> DeletePlaylistAsync(string id)
/// <param name="limit">The limit.</param>
/// <param name="offset">The offset.</param>
/// <returns></returns>
public async Task<ApiListRessponse<PlaylistList>> ListPlaylistsAsync(int limit, int offset)
public async Task<ApiListResponse<PlaylistList>> ListPlaylistsAsync(int limit, int offset)
{
return await Client.QueryListAsync<ApiListRessponse<PlaylistList>>(
return await Client.QueryListAsync<ApiListResponse<PlaylistList>>(
SYNO_AudioStation_Playlist, "list", limit, offset,
GetLibraryArg()).ConfigureAwait(false);
}
Expand Down Expand Up @@ -84,7 +84,7 @@ public async Task<ApiDataResponse<Playlist>> GetPlaylistAsync(int limit, int off
var test = await Client.QueryByteArrayAsync(SYNO_AudioStation_Playlist, "getinfo", args.ToArray()).ConfigureAwait(false);
string json = Encoding.UTF8.GetString(test.Data);

var playlists = await Client.QueryListAsync<ApiListRessponse<PlaylistList>>(
var playlists = await Client.QueryListAsync<ApiListResponse<PlaylistList>>(
SYNO_AudioStation_Playlist, "getinfo", limit, offset,
args.ToArray()).ConfigureAwait(false);
return new ApiDataResponse<Playlist>(playlists, playlists.Data?.Playlists?.FirstOrDefault() ?? default);
Expand Down
12 changes: 6 additions & 6 deletions SynologyDotNet.AudioStation/AudioStationClient.Song.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public partial class AudioStationClient
/// <param name="additionalFields">Additional fields to load</param>
/// <param name="queryParameters">Filter parameters</param>
/// <returns></returns>
public async Task<ApiListRessponse<SongList>> ListSongsAsync(int limit, int offset, SongQueryAdditional additionalFields, params (SongQueryParameter, object)[] queryParameters)
public async Task<ApiListResponse<SongList>> ListSongsAsync(int limit, int offset, SongQueryAdditional additionalFields, params (SongQueryParameter, object)[] queryParameters)
{
var args = new List<(string, object)>(queryParameters.Select(f => (f.Item1.ToString(), f.Item2)));
args.Add(GetLibraryArg());
Expand All @@ -35,7 +35,7 @@ public async Task<ApiListRessponse<SongList>> ListSongsAsync(int limit, int offs
.Where(x => additionalFields.HasFlag(x))
.Select(x => x.ToString()))));
}
return await Client.QueryListAsync<ApiListRessponse<SongList>>(SYNO_AudioStation_Song, "list", limit, offset, args.ToArray()).ConfigureAwait(false);
return await Client.QueryListAsync<ApiListResponse<SongList>>(SYNO_AudioStation_Song, "list", limit, offset, args.ToArray()).ConfigureAwait(false);
}

/// <summary>
Expand All @@ -46,7 +46,7 @@ public async Task<ApiListRessponse<SongList>> ListSongsAsync(int limit, int offs
/// <param name="title">Title to search</param>
/// <param name="additionalFields">Additional fields to load</param>
/// <returns></returns>
public async Task<ApiListRessponse<SongList>> SearchSongsByTitleAsync(int limit, int offset, string title, SongQueryAdditional additionalFields)
public async Task<ApiListResponse<SongList>> SearchSongsByTitleAsync(int limit, int offset, string title, SongQueryAdditional additionalFields)
{
var args = new List<(string, object)>();
args.Add(GetLibraryArg());
Expand All @@ -62,20 +62,20 @@ public async Task<ApiListRessponse<SongList>> SearchSongsByTitleAsync(int limit,
.Where(x => additionalFields.HasFlag(x))
.Select(x => x.ToString()))));
}
return await Client.QueryListAsync<ApiListRessponse<SongList>>(SYNO_AudioStation_Song, "search", limit, offset, args.ToArray()).ConfigureAwait(false);
return await Client.QueryListAsync<ApiListResponse<SongList>>(SYNO_AudioStation_Song, "search", limit, offset, args.ToArray()).ConfigureAwait(false);
}

/// <summary>
/// Gets a song by ID
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<ApiListRessponse<SongList>> GetSongByIdAsync(string id)
public async Task<ApiListResponse<SongList>> GetSongByIdAsync(string id)
{
var args = new List<(string, object)>();
args.Add(("id", id));
args.Add(("additional", "song_tag, song_audio, song_rating")); // request detailed song info
return await Client.QueryObjectAsync<ApiListRessponse<SongList>>(SYNO_AudioStation_Song, "getinfo", args.ToArray()).ConfigureAwait(false);
return await Client.QueryObjectAsync<ApiListResponse<SongList>>(SYNO_AudioStation_Song, "getinfo", args.ToArray()).ConfigureAwait(false);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions SynologyDotNet.AudioStation/AudioStationClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ public async Task<ApiDataResponse<SearchResults>> SearchAsync(string keyword)
/// <param name="offset">Start position in the list (use it for paging)</param>
/// <param name="folderId">Root folder ID, the children directories will be listed in the response. Not recursive.</param>
/// <returns></returns>
public async Task<ApiListRessponse<FolderList>> ListFoldersAsync(int limit, int offset, string folderId = null)
public async Task<ApiListResponse<FolderList>> ListFoldersAsync(int limit, int offset, string folderId = null)
{
var args = new List<(string, object)>();
args.Add(GetLibraryArg());
if (!string.IsNullOrEmpty(folderId))
args.Add(("id", folderId));

return await Client.QueryListAsync<ApiListRessponse<FolderList>>(SYNO_AudioStation_Folder, "list", limit, offset, args.ToArray()).ConfigureAwait(false);
return await Client.QueryListAsync<ApiListResponse<FolderList>>(SYNO_AudioStation_Folder, "list", limit, offset, args.ToArray()).ConfigureAwait(false);
}

// Use tageditor instead!
Expand Down
2 changes: 1 addition & 1 deletion SynologyDotNet.AudioStation/SynologyDotNet.AudioStation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="SynologyDotNet.Core" Version="0.4.3" />
<PackageReference Include="SynologyDotNet.Core" Version="0.5.0" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down