Skip to content

Commit

Permalink
More adde List Tracks and PlayThis
Browse files Browse the repository at this point in the history
  • Loading branch information
MaKrotos committed Feb 1, 2024
1 parent 5af5a58 commit 6f3a38c
Show file tree
Hide file tree
Showing 18 changed files with 746 additions and 322 deletions.
19 changes: 10 additions & 9 deletions MusicX.Core/Models/Album.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,19 @@ public class Album
[JsonProperty("thumb")]
public Photo Thumb { get; set; }

public string Cover
public string? Cover
{
get
{
if (Thumb == null) return null;
if (Thumb.Photo68 != null) return Thumb.Photo68;
if (Thumb.Photo135 != null) return Thumb.Photo135;
if (Thumb.Photo270 != null) return Thumb.Photo270;
if (Thumb.Photo300 != null) return Thumb.Photo300;
if (Thumb.Photo600 != null) return Thumb.Photo600;
if (Thumb.Photo1200 != null) return Thumb.Photo1200;
return null;
return Thumb.Photo270 ??
Thumb.Photo300 ??
Thumb.Photo600 ??
Thumb.Photo1200 ??
Thumb.Photo135 ??
Thumb.Photo68 ??
null;


}
}
}
Expand Down
24 changes: 23 additions & 1 deletion MusicX.Core/Models/Audio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace MusicX.Core.Models
{
public class Audio : IEquatable<Audio>
public class Audio : VkNet.Model.Attachments.Audio
{
[JsonProperty("artist")]
public string Artist { get; set; }
Expand Down Expand Up @@ -110,6 +110,28 @@ public override bool Equals(object? obj)
return false;
return Equals((Audio)obj);
}
public static MusicX.Core.Models.Audio ConvertToMusicXAudio(VkNet.Model.Attachments.Audio vkAudio)
{
// Сериализация объекта vkAudio в JSON
string json = JsonConvert.SerializeObject(vkAudio);

// Десериализация JSON обратно в MusicX.Core.Models.Audio
var musicXAudio = JsonConvert.DeserializeObject<MusicX.Core.Models.Audio>(json);

return musicXAudio;
}

public bool Equals(VkNet.Model.Attachments.Audio? other)
{
if (ReferenceEquals(null, other))
return false;
if (ReferenceEquals(this, other))
return true;
if (other.GetType() != typeof(Audio))
return false;
return Equals((VkNet.Model.Attachments.Audio)other);
}

public override int GetHashCode()
{
return Id.GetHashCode();
Expand Down
Loading

0 comments on commit 6f3a38c

Please sign in to comment.