Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit be0383b

Browse files
Merge branch 'release-1.1.0' into main
2 parents a7f0e9b + a76a6e3 commit be0383b

19 files changed

+32
-186
lines changed

Changelog.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Changelog
22
=============
33

4+
Version 1.1.1
5+
===
6+
7+
#### 1.1.1
8+
(2021-03-16)
9+
10+
Fixed:
11+
12+
- GetShowAsync returns Status null when status is 'upcoming' ([Issue 208](https://github.com/henrikfroehling/Trakt.NET/issues/208))
13+
- GetShowAsync returns Status null when status is 'planned' ([Issue 221](https://github.com/henrikfroehling/Trakt.NET/issues/221))
14+
- Calendar methods do not accept a value greater than 31 for days ([Issue 220](https://github.com/henrikfroehling/Trakt.NET/issues/220))
15+
16+
---------
17+
418
Version 1.1.0
519
===
620

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright © 2016 - 2020 Henrik Fröhling et al.
3+
Copyright © 2016 - 2021 Henrik Fröhling et al.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ _**Formerly known as [TraktApiSharp](https://github.com/henrikfroehling/TraktApi
88
**This is a .NET wrapper library for the [Trakt.tv](https://trakt.tv/) [API](http://docs.trakt.apiary.io/#).**
99

1010
[![Project Status](https://img.shields.io/badge/Project%20Status-In%20Development-green)](https://img.shields.io/badge/Project%20Status-In%20Development-green)
11-
[![NuGet Package](https://img.shields.io/badge/NuGet-v1.1.0-green.svg?style=flat)](https://www.nuget.org/packages/Trakt.NET/1.1.0)
11+
[![NuGet Package](https://img.shields.io/badge/NuGet-v1.1.1-green.svg?style=flat)](https://www.nuget.org/packages/Trakt.NET/1.1.1)
1212
[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat)](https://opensource.org/licenses/MIT)
1313
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
1414
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=henrikfroehling_Trakt.NET&metric=alert_status)](https://sonarcloud.io/dashboard?id=henrikfroehling_Trakt.NET)
@@ -51,8 +51,6 @@ _**Formerly known as [TraktApiSharp](https://github.com/henrikfroehling/TraktApi
5151
| Branch | Status | Description |
5252
|---|---|---|
5353
| [develop](https://github.com/henrikfroehling/Trakt.NET/tree/develop) | [![Build status](https://dev.azure.com/henrikfroehling/Trakt.NET/_apis/build/status/Trakt.NET-CI-Developer-Preview)](https://dev.azure.com/henrikfroehling/Trakt.NET/_build/latest?definitionId=5) | This branch tracks the current and possibly unstable development. |
54-
| [release 1.0.0](https://github.com/henrikfroehling/Trakt.NET/tree/release-1.0.0) | [![Build status](https://dev.azure.com/henrikfroehling/Trakt.NET/_apis/build/status/Trakt.NET-CI-Release-1.0.0)](https://dev.azure.com/henrikfroehling/Trakt.NET/_build/latest?definitionId=6) | This branch tracks the current development of release 1.0.0. |
55-
| [release 1.1.0](https://github.com/henrikfroehling/Trakt.NET/tree/release-1.1.0) | [![Build status](https://dev.azure.com/henrikfroehling/Trakt.NET/_apis/build/status/Trakt.NET-CI-Release-1.1.0)](https://dev.azure.com/henrikfroehling/Trakt.NET/_build/latest?definitionId=13) | This branch tracks the current development of the next upcoming release. |
5654

5755
### Getting Started
5856

@@ -201,7 +199,7 @@ if (theMartian)
201199
```text
202200
The MIT License (MIT)
203201
204-
Copyright © 2016 - 2020 Henrik Fröhling et al.
202+
Copyright © 2016 - 2021 Henrik Fröhling et al.
205203
206204
Permission is hereby granted, free of charge, to any person obtaining a copy
207205
of this software and associated documentation files (the "Software"), to deal

Source/Lib/Trakt.NET/Enums/TraktShowStatus.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ public sealed class TraktShowStatus : TraktEnumeration
1818
/// <summary>The status for a show, which has ended.</summary>
1919
public static TraktShowStatus Ended { get; } = new TraktShowStatus(8, "ended", "ended", "Ended");
2020

21+
/// <summary>The status for a show, which is upcoming.</summary>
22+
public static TraktShowStatus Upcoming { get; } = new TraktShowStatus(16, "upcoming", "upcoming", "Upcoming");
23+
24+
/// <summary>The status for a show, which is planned.</summary>
25+
public static TraktShowStatus Planned { get; } = new TraktShowStatus(32, "planned", "planned", "Planned");
26+
2127
/// <summary>
2228
/// Initializes a new instance of the <see cref="TraktShowStatus" /> class.<para />
2329
/// The initialized <see cref="TraktShowStatus" /> is invalid.

Source/Lib/Trakt.NET/Requests/Calendars/ACalendarRequest'1.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ public override IDictionary<string, object> GetUriPathParameters()
4949

5050
public override void Validate()
5151
{
52-
if (Days.HasValue && (Days.Value < 1 || Days.Value > 31))
53-
throw new ArgumentOutOfRangeException(nameof(Days), "days must have a value between 1 and 31");
5452
}
5553
}
5654
}

Source/Lib/Trakt.NET/Trakt.NET.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<RootNamespace>TraktNet</RootNamespace>
66
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
8-
<Version>1.1.0</Version>
8+
<Version>1.1.1</Version>
99
<Authors>Henrik Fröhling</Authors>
1010
<Company>Henrik Fröhling</Company>
1111
<PackageLicenseUrl>https://github.com/henrikfroehling/Trakt.NET/blob/develop/LICENSE.md</PackageLicenseUrl>
1212
<PackageProjectUrl>https://github.com/henrikfroehling/Trakt.NET</PackageProjectUrl>
13-
<Copyright>Copyright © 2016 - 2020 Henrik Fröhling et al.</Copyright>
13+
<Copyright>Copyright © 2016 - 2021 Henrik Fröhling et al.</Copyright>
1414
<Description>.NET wrapper library for the Trakt.tv API.
1515

1616
Features
@@ -22,7 +22,7 @@ Features
2222
- Language Service</Description>
2323
<RepositoryUrl>https://github.com/henrikfroehling/Trakt.NET</RepositoryUrl>
2424
<PackageTags>trakt rest api</PackageTags>
25-
<PackageReleaseNotes>https://github.com/henrikfroehling/Trakt.NET/blob/develop/Changelog.md#110</PackageReleaseNotes>
25+
<PackageReleaseNotes>https://github.com/henrikfroehling/Trakt.NET/blob/develop/Changelog.md#111</PackageReleaseNotes>
2626
</PropertyGroup>
2727

2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/Lib/Trakt.NET/Trakt.NET.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Trakt.NET</id>
5-
<version>1.1.0$versionSuffix$</version>
5+
<version>1.1.1$versionSuffix$</version>
66
<title>Trakt.NET</title>
77
<authors>Henrik Fröhling</authors>
88
<owners>henrikfroehling</owners>
@@ -20,8 +20,8 @@ Features
2020
- Language Service
2121
</description>
2222
<summary>.NET wrapper library for the Trakt.tv API.</summary>
23-
<releaseNotes>https://github.com/henrikfroehling/Trakt.NET/blob/develop/Changelog.md#110</releaseNotes>
24-
<copyright>Copyright (c) 2016 - 2020 Henrik Fröhling et al.</copyright>
23+
<releaseNotes>https://github.com/henrikfroehling/Trakt.NET/blob/develop/Changelog.md#111</releaseNotes>
24+
<copyright>Copyright (c) 2016 - 2021 Henrik Fröhling et al.</copyright>
2525
<language>en-US</language>
2626
<tags>trakt rest api</tags>
2727
<dependencies>

Source/Tests/Trakt.NET.Core.Tests/Enums/TraktShowStatus_Tests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ public void Test_TraktShowStatus_GetAll()
1414
{
1515
var allValues = TraktEnumeration.GetAll<TraktShowStatus>();
1616

17-
allValues.Should().NotBeNull().And.HaveCount(5);
17+
allValues.Should().NotBeNull().And.HaveCount(7);
1818
allValues.Should().Contain(new List<TraktShowStatus>() { TraktShowStatus.Unspecified, TraktShowStatus.ReturningSeries,
1919
TraktShowStatus.InProduction, TraktShowStatus.Canceled,
20-
TraktShowStatus.Ended });
20+
TraktShowStatus.Ended, TraktShowStatus.Upcoming,
21+
TraktShowStatus.Planned });
2122
}
2223
}
2324
}

Source/Tests/Trakt.NET.Modules.Tests/TraktCalendarModule/TraktCalendarModuleTests_GetAllDVDMovies_Tests.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,19 +352,5 @@ public async Task Test_TraktCalendarModule_GetAllDVDMovies_Throws_API_Exception(
352352
(exception.GetType() == exceptionType).Should().BeTrue();
353353
}
354354
}
355-
356-
[Fact]
357-
public void Test_TraktCalendarModule_GetAllDVDMovies_ArgumentExceptions()
358-
{
359-
TraktClient client = TestUtility.GetMockClient(GET_ALL_DVD_MOVIES_URI,
360-
CALENDAR_DVD_MOVIES_JSON,
361-
startDate: START_DATE, endDate: END_DATE);
362-
363-
Func<Task<TraktListResponse<ITraktCalendarMovie>>> act = () => client.Calendar.GetAllDVDMoviesAsync(null, 0);
364-
act.Should().Throw<ArgumentOutOfRangeException>();
365-
366-
act = () => client.Calendar.GetAllDVDMoviesAsync(null, 32);
367-
act.Should().Throw<ArgumentOutOfRangeException>();
368-
}
369355
}
370356
}

Source/Tests/Trakt.NET.Modules.Tests/TraktCalendarModule/TraktCalendarModuleTests_GetAllMovies_Tests.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,19 +352,5 @@ public async Task Test_TraktCalendarModule_GetAllMovies_Throws_API_Exception(Htt
352352
(exception.GetType() == exceptionType).Should().BeTrue();
353353
}
354354
}
355-
356-
[Fact]
357-
public void Test_TraktCalendarModule_GetAllMovies_ArgumentExceptions()
358-
{
359-
TraktClient client = TestUtility.GetMockClient(GET_ALL_MOVIES_URI,
360-
CALENDAR_ALL_MOVIES_JSON,
361-
startDate: START_DATE, endDate: END_DATE);
362-
363-
Func<Task<TraktListResponse<ITraktCalendarMovie>>> act = () => client.Calendar.GetAllMoviesAsync(null, 0);
364-
act.Should().Throw<ArgumentOutOfRangeException>();
365-
366-
act = () => client.Calendar.GetAllMoviesAsync(null, 32);
367-
act.Should().Throw<ArgumentOutOfRangeException>();
368-
}
369355
}
370356
}

0 commit comments

Comments
 (0)