Skip to content

Commit

Permalink
litte cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
st0o0 committed Nov 23, 2023
1 parent 2b0ab07 commit cf3d679
Show file tree
Hide file tree
Showing 126 changed files with 1,760 additions and 80 deletions.
6 changes: 5 additions & 1 deletion src/Flickr.Net.Core/Entities/Activity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@

namespace Flickr.Net.Core;

/// <summary>
/// </summary>
public record Activity : FlickrEntityBase
{
/// <summary>
/// </summary>
[JsonPropertyName("event")]
public List<Event> Events { get; set; } = new List<Event>();
public List<Event> Events { get; set; } = [];
}
8 changes: 8 additions & 0 deletions src/Flickr.Net.Core/Entities/Argument.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,23 @@

namespace Flickr.Net.Core;

/// <summary>
/// </summary>
[FlickrJsonPropertyName("error")]
public record Argument
{
/// <summary>
/// </summary>
[JsonPropertyName("name")]
public string Name { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("optional")]
public bool Optional { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("_content")]
public string Content { get; set; }
}
8 changes: 8 additions & 0 deletions src/Flickr.Net.Core/Entities/Bases/FlickrEntityBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@

namespace Flickr.Net.Core.Bases;

/// <inheritdoc/>
public abstract record FlickrEntityBase<TIdentifier> : IFlickrEntity<TIdentifier> where TIdentifier : IIdentifierType
{
/// <inheritdoc/>
[JsonPropertyGenericTypeName(0)]
public TIdentifier Id { get; set; }
}

/// <inheritdoc/>
public abstract record FlickrEntityBase : IFlickrEntity { }

/// <inheritdoc/>
public interface IFlickrEntity<T> : IFlickrEntity where T : IIdentifierType
{
/// <summary>
/// </summary>
[JsonPropertyGenericTypeName(0)]
public T Id { get; set; }
}

/// <summary>
/// </summary>
public interface IFlickrEntity
{ }
5 changes: 5 additions & 0 deletions src/Flickr.Net.Core/Entities/Bases/GroupBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@

namespace Flickr.Net.Core.Bases;

/// <inheritdoc/>
public record GroupBase : FlickrEntityBase<NsId>
{
/// <summary>
/// </summary>
[JsonPropertyName("name")]
public string Name { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("eighteenplus")]
public bool EighteenPlus { get; set; }
}
38 changes: 33 additions & 5 deletions src/Flickr.Net.Core/Entities/Bases/Id.cs
Original file line number Diff line number Diff line change
@@ -1,49 +1,77 @@
using Flickr.Net.Core.Internals.Attributes;
using Flickr.Net.Core.Internals.JsonConverters.IdentifierConverters;

namespace Flickr.Net.Core.Bases;

/// <summary>
/// </summary>
public interface IIdentifierType
{
}

/// <inheritdoc/>
public abstract record IdentifierType : IIdentifierType
{
/// <summary>
/// </summary>
protected string _id;

/// <summary>
/// </summary>
public static implicit operator string(IdentifierType value) => value._id;

/// <summary>
/// </summary>
public static implicit operator IdentifierType(string value) => new Id() { _id = value };
}

/// <inheritdoc/>
[FlickrJsonPropertyName("id")]
public record Id : IdentifierType
{
/// <summary>
/// </summary>
public static implicit operator string(Id value) => value._id;

public static implicit operator Id(string value) => new Id() { _id = value };
/// <summary>
/// </summary>
public static implicit operator Id(string value) => new() { _id = value };
}

/// <inheritdoc/>
[FlickrJsonPropertyName("nsid")]
public record NsId : IdentifierType
{
/// <summary>
/// </summary>
public static implicit operator string(NsId value) => value._id;

public static implicit operator NsId(string value) => new NsId() { _id = value };
/// <summary>
/// </summary>
public static implicit operator NsId(string value) => new() { _id = value };
}

/// <inheritdoc/>
[FlickrJsonPropertyName("photo_id")]
public record PhotoId : IdentifierType
{
/// <summary>
/// </summary>
public static implicit operator string(PhotoId value) => value._id;

public static implicit operator PhotoId(string value) => new PhotoId() { _id = value };
/// <summary>
/// </summary>
public static implicit operator PhotoId(string value) => new() { _id = value };
}

/// <inheritdoc/>
[FlickrJsonPropertyName("photoset_id")]
public record PhotosetId : IdentifierType
{
/// <summary>
/// </summary>
public static implicit operator string(PhotosetId value) => value._id;

public static implicit operator PhotosetId(string value) => new PhotosetId() { _id = value };
/// <summary>
/// </summary>
public static implicit operator PhotosetId(string value) => new() { _id = value };
}
30 changes: 30 additions & 0 deletions src/Flickr.Net.Core/Entities/Bases/Interfaces.cs
Original file line number Diff line number Diff line change
@@ -1,46 +1,76 @@
namespace Flickr.Net.Core;

/// <summary>
/// </summary>
public interface IThumbnailUrl
{ }

/// <summary>
/// </summary>
public interface ISquareUrl
{ }

/// <summary>
/// </summary>
public interface ILargeSquareUrl
{ }

/// <summary>
/// </summary>
public interface ISmallUrl
{ }

/// <summary>
/// </summary>
public interface ISmall320Url
{ }

/// <summary>
/// </summary>
public interface ISmall400Url
{ }

/// <summary>
/// </summary>
public interface IMediumUrl
{ }

/// <summary>
/// </summary>
public interface IMedium640Url
{ }

/// <summary>
/// </summary>
public interface IMedium800Url
{ }

/// <summary>
/// </summary>
public interface ILargeUrl
{ }

/// <summary>
/// </summary>
public interface ILarge1600Url
{ }

/// <summary>
/// </summary>
public interface ILarge2048Url
{ }

/// <summary>
/// </summary>
public interface IOriginalUrl
{ }

/// <summary>
/// </summary>
public interface IBuddyIcon
{ }

/// <summary>
/// </summary>
public interface IWebUrl
{ }
19 changes: 19 additions & 0 deletions src/Flickr.Net.Core/Entities/Bases/PhotoBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,54 @@

namespace Flickr.Net.Core.Bases;

/// <inheritdoc/>
public abstract record PhotoBase : FlickrEntityBase<Id>
{
/// <summary>
/// </summary>
[JsonPropertyName("secret")]
public string Secret { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("server")]
public string Server { get; set; }
}

/// <inheritdoc/>
public abstract record DeluxePhotoBase : PhotoBase
{
/// <summary>
/// </summary>
[JsonPropertyName("owner")]
public string Owner { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("farm")]
public string Farm { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("title")]
public string Title { get; set; }
}

/// <inheritdoc/>
public abstract record UltraDeluxePhotoBase : DeluxePhotoBase
{
/// <summary>
/// </summary>
[JsonPropertyName("ispublic")]
public bool IsPublic { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("isfriend")]
public bool IsFriend { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("isfamily")]
public bool IsFamily { get; set; }
}
3 changes: 3 additions & 0 deletions src/Flickr.Net.Core/Entities/Bases/TagBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

namespace Flickr.Net.Core;

/// <inheritdoc/>
public record TagBase : FlickrEntityBase
{
/// <summary>
/// </summary>
[JsonPropertyName("_content")]
public string Content { get; set; }
}
4 changes: 4 additions & 0 deletions src/Flickr.Net.Core/Entities/Brand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@

namespace Flickr.Net.Core;

/// <summary>
/// </summary>
public record Brand : FlickrEntityBase<Id>
{
/// <summary>
/// </summary>
[JsonPropertyName("_content")]
public string Content { get; set; }
}
8 changes: 8 additions & 0 deletions src/Flickr.Net.Core/Entities/CSVFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@

namespace Flickr.Net.Core;

/// <summary>
/// </summary>
[FlickrJsonPropertyName("csvfiles")]
public record CSVFile : FlickrEntityBase
{
/// <summary>
/// </summary>
[JsonPropertyName("href")]
public string Href { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("type")]
public string Type { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("date")]
public DateOnly Date { get; set; }
}
8 changes: 8 additions & 0 deletions src/Flickr.Net.Core/Entities/Camera.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,22 @@

namespace Flickr.Net.Core;

/// <summary>
/// </summary>
public record Camera : FlickrEntityBase<Id>
{
/// <summary>
/// </summary>
[JsonPropertyName("name")]
public string Name { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("details")]
public Details Details { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("images")]
public Image Image { get; set; }
}
6 changes: 6 additions & 0 deletions src/Flickr.Net.Core/Entities/Cluster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@

namespace Flickr.Net.Core;

/// <summary>
/// </summary>
[FlickrJsonPropertyName("cluster")]
public record Cluster : FlickrEntityBase
{
/// <summary>
/// </summary>
[JsonPropertyName("total")]
public int Total { get; set; }

/// <summary>
/// </summary>
[JsonPropertyName("tag")]
public List<ClusterTag> Tags { get; set; }
}
Loading

0 comments on commit cf3d679

Please sign in to comment.