self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

turn task type enum into string

Browse Source
This commit is contained in:
margaale 2017-02-22 13:57:14 -03:00
parent fa89d33900
commit 3501e33722
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
View File

@ -60,7 +60,7 @@ public void Setup()
Id = "id1", Id = "id1",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Waiting, Status = DownloadStationTaskStatus.Waiting,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -83,7 +83,7 @@ public void Setup()
Id = "id2", Id = "id2",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Finished, Status = DownloadStationTaskStatus.Finished,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -106,7 +106,7 @@ public void Setup()
Id = "id2", Id = "id2",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Seeding, Status = DownloadStationTaskStatus.Seeding,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -129,7 +129,7 @@ public void Setup()
Id = "id3", Id = "id3",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Downloading, Status = DownloadStationTaskStatus.Downloading,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -152,7 +152,7 @@ public void Setup()
Id = "id4", Id = "id4",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Error, Status = DownloadStationTaskStatus.Error,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -175,7 +175,7 @@ public void Setup()
Id = "id5", Id = "id5",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Seeding, Status = DownloadStationTaskStatus.Seeding,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "a.mkv", Title = "a.mkv",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -198,7 +198,7 @@ public void Setup()
Id = "id6", Id = "id6",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Seeding, Status = DownloadStationTaskStatus.Seeding,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -221,7 +221,7 @@ public void Setup()
Id = "id6", Id = "id6",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Finished, Status = DownloadStationTaskStatus.Finished,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "a.mkv", Title = "a.mkv",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -244,7 +244,7 @@ public void Setup()
Id = "id6", Id = "id6",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Finished, Status = DownloadStationTaskStatus.Finished,
Type = DownloadStationTaskType.BT, Type = DownloadStationTaskType.BT.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional

10
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs
View File

@ -58,7 +58,7 @@ public void Setup()
Id = "id1", Id = "id1",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Waiting, Status = DownloadStationTaskStatus.Waiting,
Type = DownloadStationTaskType.NZB, Type = DownloadStationTaskType.NZB.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -81,7 +81,7 @@ public void Setup()
Id = "id2", Id = "id2",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Finished, Status = DownloadStationTaskStatus.Finished,
Type = DownloadStationTaskType.NZB, Type = DownloadStationTaskType.NZB.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -104,7 +104,7 @@ public void Setup()
Id = "id2", Id = "id2",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Seeding, Status = DownloadStationTaskStatus.Seeding,
Type = DownloadStationTaskType.NZB, Type = DownloadStationTaskType.NZB.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -127,7 +127,7 @@ public void Setup()
Id = "id3", Id = "id3",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Downloading, Status = DownloadStationTaskStatus.Downloading,
Type = DownloadStationTaskType.NZB, Type = DownloadStationTaskType.NZB.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional
@ -150,7 +150,7 @@ public void Setup()
Id = "id4", Id = "id4",
Size = 1000, Size = 1000,
Status = DownloadStationTaskStatus.Error, Status = DownloadStationTaskStatus.Error,
Type = DownloadStationTaskType.NZB, Type = DownloadStationTaskType.NZB.ToString(),
Username = "admin", Username = "admin",
Title = "title", Title = "title",
Additional = new DownloadStationTaskAdditional Additional = new DownloadStationTaskAdditional

8
src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationTask.cs
View File

@ -15,8 +15,10 @@ public class DownloadStationTask
public long Size { get; set; } public long Size { get; set; }
[JsonConverter(typeof(StringEnumConverter))] /// <summary>
public DownloadStationTaskType Type { get; set; } /// /// Possible values are: BT, NZB, http, ftp, eMule and https
/// </summary>
public string Type { get; set; }
[JsonProperty(PropertyName = "status_extra")] [JsonProperty(PropertyName = "status_extra")]
public Dictionary<string, string> StatusExtra { get; set; } public Dictionary<string, string> StatusExtra { get; set; }
@ -34,7 +36,7 @@ public override string ToString()
public enum DownloadStationTaskType public enum DownloadStationTaskType
{ {
BT, NZB, http, ftp, eMule BT, NZB, http, ftp, eMule, https
} }
public enum DownloadStationTaskStatus public enum DownloadStationTaskStatus

2
src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs
View File

@ -76,7 +76,7 @@ public IEnumerable<DownloadStationTask> GetTasks(DownloadStationTaskType type, D
{ {
var response = ProcessRequest<DownloadStationTaskInfoResponse>(DiskStationApi.DownloadStationTask, arguments, settings, "get tasks"); var response = ProcessRequest<DownloadStationTaskInfoResponse>(DiskStationApi.DownloadStationTask, arguments, settings, "get tasks");
return response.Data.Tasks.Where(t => t.Type == type); return response.Data.Tasks.Where(t => t.Type == type.ToString());
} }
catch (DownloadClientException e) catch (DownloadClientException e)
{ {