sarsoo/Spotify.NET
1
0
Fork 0
mirror of https://github.com/Sarsoo/Spotify.NET.git synced 2024-12-24 23:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates Download and UploadData functions.

Browse Source
This commit is contained in:
Petr Houška 2016-08-14 03:39:35 +02:00
parent 9ccd257f43
commit 0250131345
1 changed files with 66 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
SpotifyAPI/Web/SpotifyWebAPI.cs
View File

@ -1932,11 +1932,24 @@ namespace SpotifyAPI.Web
{ {
if (!UseAuth) if (!UseAuth)
throw new InvalidOperationException("Auth is required for all Upload-Actions"); throw new InvalidOperationException("Auth is required for all Upload-Actions");
int triesLeft = RetryTimes + 1;
Error lastError = null;
Tuple<ResponseInfo, T> response = null;
do
{
WebClient.SetHeader("Authorization", TokenType + " " + AccessToken); WebClient.SetHeader("Authorization", TokenType + " " + AccessToken);
WebClient.SetHeader("Content-Type", "application/json"); WebClient.SetHeader("Content-Type", "application/json");
Tuple<ResponseInfo, T> response = WebClient.UploadJson<T>(url, uploadData, method); response = WebClient.UploadJson<T>(url, uploadData, method);
response.Item2.AddResponseInfo(response.Item1); response.Item2.AddResponseInfo(response.Item1);
lastError = response.Item2.Error;
triesLeft -= 1;
} while (UseAutoRetry && triesLeft > 0 && lastError != null);
return response.Item2; return response.Item2;
} }
@ -1944,26 +1957,67 @@ namespace SpotifyAPI.Web
{ {
if (!UseAuth) if (!UseAuth)
throw new InvalidOperationException("Auth is required for all Upload-Actions"); throw new InvalidOperationException("Auth is required for all Upload-Actions");
int triesLeft = RetryTimes + 1;
Error lastError = null;
Tuple<ResponseInfo, T> response = null;
do
{
WebClient.SetHeader("Authorization", TokenType + " " + AccessToken); WebClient.SetHeader("Authorization", TokenType + " " + AccessToken);
WebClient.SetHeader("Content-Type", "application/json"); WebClient.SetHeader("Content-Type", "application/json");
Tuple<ResponseInfo, T> response = await WebClient.UploadJsonAsync<T>(url, uploadData, method); response = await WebClient.UploadJsonAsync<T>(url, uploadData, method);
response.Item2.AddResponseInfo(response.Item1); response.Item2.AddResponseInfo(response.Item1);
lastError = response.Item2.Error;
triesLeft -= 1;
} while (UseAutoRetry && triesLeft > 0 && lastError != null);
return response.Item2; return response.Item2;
} }
public T DownloadData<T>(string url) where T : BasicModel public T DownloadData<T>(string url) where T : BasicModel
{ {
Tuple<ResponseInfo, T> response = DownloadDataAlt<T>(url); int triesLeft = RetryTimes + 1;
Error lastError = null;
Tuple<ResponseInfo, T> response = null;
do
{
response = DownloadDataAlt<T>(url);
response.Item2.AddResponseInfo(response.Item1); response.Item2.AddResponseInfo(response.Item1);
lastError = response.Item2.Error;
triesLeft -= 1;
} while (UseAutoRetry && triesLeft > 0 && lastError != null);
return response.Item2; return response.Item2;
} }
public async Task<T> DownloadDataAsync<T>(string url) where T : BasicModel public async Task<T> DownloadDataAsync<T>(string url) where T : BasicModel
{ {
Tuple<ResponseInfo, T> response = await DownloadDataAltAsync<T>(url); int triesLeft = RetryTimes + 1;
Error lastError = null;
Tuple<ResponseInfo, T> response = null;
do
{
response = await DownloadDataAltAsync<T>(url);
response.Item2.AddResponseInfo(response.Item1); response.Item2.AddResponseInfo(response.Item1);
lastError = response.Item2.Error;
triesLeft -= 1;
} while (UseAutoRetry && triesLeft > 0 && lastError != null);
return response.Item2; return response.Item2;
} }