Добавлен плейлист Кинопоиска, сборка пакетов Nuget

K1llMan · Mar 8, 2022 · 84cb337 · 84cb337
1 parent 1e0a378
commit 84cb337
Show file tree

Hide file tree

Showing 33 changed files with 127 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,14 +5,9 @@
 /.vs
 /.vscode
 /docs/build
-/Yandex.Music.Api/bin
-/Yandex.Music.Api/obj
-/Yandex.Music.Api.Tests/bin
-/Yandex.Music.Api.Tests/obj
-/Yandex.Music.Client/bin
-/Yandex.Music.Client/obj
-/Yandex.Music.Client.Tests/bin
-/Yandex.Music.Client.Tests/obj
+*/bin
+*/obj
+/output
 
 /Yandex.Music.Api.sln.DotSettings.user
 /Yandex.Music.Api/Yandex.Music.Api.csproj.user

diff --git a/Configs/Common.xml b/Configs/Common.xml
@@ -0,0 +1,20 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetFrameworks>net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(SolutionDir)LICENSE" Pack="true" Visible="false" PackagePath=""/>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <Version>1.0.0</Version>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+    <Authors>K1llM@n</Authors>
+    <ProjectUrl>https://github.com/K1llMan/Yandex.Music.Api</ProjectUrl>
+    <RepositoryUrl>https://github.com/K1llMan/Yandex.Music.Api</RepositoryUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+  </PropertyGroup>
+</Project>
diff --git a/Configs/Tests.xml b/Configs/Tests.xml
@@ -0,0 +1,7 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetFrameworks>net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+  </PropertyGroup>
+</Project>
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 [![Build Status](https://travis-ci.com/K1llMan/Yandex.Music.Api.svg?branch=master)](https://travis-ci.com/K1llMan/Yandex.Music.Api)
 [![Documentation Status](https://readthedocs.org/projects/yandexmusicapicsharp/badge/?version=latest)](https://yandexmusicapicsharp.readthedocs.io/ru/latest/?badge=latest)
+[![Nuget API](https://www.nuget.org/packages/KM.Yandex.Music.Api/)](https://img.shields.io/nuget/dt/KM.Yandex.Music.Api)
+[![Nuget Client](https://www.nuget.org/packages/KM.Yandex.Music.Client/)](https://img.shields.io/nuget/dt/KM.Yandex.Music.Client)
 
 
  Yandex.Music API (Unofficial) for .Net Core

diff --git a/Utils/pack.bat b/Utils/pack.bat
@@ -0,0 +1,3 @@
+cd ..
+dotnet pack -c Release -o output
+@pause
diff --git a/Yandex.Music.Api.Tests/Tests/API/PlaylistAPITest.cs b/Yandex.Music.Api.Tests/Tests/API/PlaylistAPITest.cs
@@ -106,7 +106,7 @@ public void Podcasts_ValidData_True()
         [Order(8)]
         public void Rewind_ValidData_True()
         {
-            YResponse<YPlaylist> response = Fixture.API.Playlist.Rewind(Fixture.Storage);
+            YResponse<YPlaylist> response = Fixture.API.Playlist.Kinopoisk(Fixture.Storage);
 
             response.Should().NotBeNull();
         }

diff --git a/Yandex.Music.Api.Tests/Yandex.Music.Api.Tests.csproj b/Yandex.Music.Api.Tests/Yandex.Music.Api.Tests.csproj
@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <IsPackable>false</IsPackable>
-    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-  </PropertyGroup>
+  <Import Project="$(SolutionDir)\Configs\Tests.xml" />
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />

diff --git a/Yandex.Music.Api.sln b/Yandex.Music.Api.sln
@@ -1,15 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29911.84
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yandex.Music.Api", "Yandex.Music.Api\Yandex.Music.Api.csproj", "{1D367F66-175A-46D8-80E5-DA1272ACA1B4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yandex.Music.Api.Tests", "Yandex.Music.Api.Tests\Yandex.Music.Api.Tests.csproj", "{2508C0DA-86D2-4D61-8F15-EE69D4085682}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yandex.Music.Client", "Yandex.Music.Client\Yandex.Music.Client.csproj", "{F12919EA-CAE9-42F9-B833-7F9DF991A59A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yandex.Music.Client", "Yandex.Music.Client\Yandex.Music.Client.csproj", "{F12919EA-CAE9-42F9-B833-7F9DF991A59A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yandex.Music.Client.Tests", "Yandex.Music.Client.Tests\Yandex.Music.Client.Tests.csproj", "{ED0FC303-CFCC-424B-B62E-0DD427794AD6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yandex.Music.Client.Tests", "Yandex.Music.Client.Tests\Yandex.Music.Client.Tests.csproj", "{ED0FC303-CFCC-424B-B62E-0DD427794AD6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Yandex.Music.Api/API/YPlaylistAPI.cs b/Yandex.Music.Api/API/YPlaylistAPI.cs
@@ -245,19 +245,19 @@ public YResponse<YPlaylist> Podcasts(AuthStorage storage)
         /// </summary>
         /// <param name="storage">Хранилище</param>
         /// <returns></returns>
-        public async Task<YResponse<YPlaylist>> RewindAsync(AuthStorage storage)
+        public async Task<YResponse<YPlaylist>> KinopoiskAsync(AuthStorage storage)
         {
-            return await GetPersonalPlaylist(storage, YGeneratedPlaylistType.Rewind21);
+            return await GetPersonalPlaylist(storage, YGeneratedPlaylistType.Kinopoisk);
         }
 
         /// <summary>
         /// Большая перемотка
         /// </summary>
         /// <param name="storage">Хранилище</param>
         /// <returns></returns>
-        public YResponse<YPlaylist> Rewind(AuthStorage storage)
+        public YResponse<YPlaylist> Kinopoisk(AuthStorage storage)
         {
-            return RewindAsync(storage).GetAwaiter().GetResult();
+            return KinopoiskAsync(storage).GetAwaiter().GetResult();
         }
 
         #endregion Стандартные плейлисты

diff --git a/Yandex.Music.Api/API/YTrackAPI.cs b/Yandex.Music.Api/API/YTrackAPI.cs
@@ -23,20 +23,20 @@ public class YTrackAPI : YCommonAPI
         private string BuildLinkForDownload(YTrackDownloadInfo mainDownloadResponse,
             YStorageDownloadFile storageDownload)
         {
-            var path = storageDownload.Path;
-            var host = storageDownload.Host;
-            var ts = storageDownload.Ts;
-            var s = storageDownload.S;
-            var codec = mainDownloadResponse.Codec;
+            string path = storageDownload.Path;
+            string host = storageDownload.Host;
+            string ts = storageDownload.Ts;
+            string s = storageDownload.S;
+            string codec = mainDownloadResponse.Codec;
 
-            var secret = $"XGRlBW9FXlekgbPrRHuSiA{path.Substring(1, path.Length - 1)}{s}";
-            var md5 = MD5.Create();
-            var md5Hash = md5.ComputeHash(Encoding.UTF8.GetBytes(secret));
-            var hmacsha1 = new HMACSHA1();
-            var hmasha1Hash = hmacsha1.ComputeHash(md5Hash);
-            var sign = BitConverter.ToString(hmasha1Hash).Replace("-", "").ToLower();
+            string secret = $"XGRlBW9FXlekgbPrRHuSiA{path.Substring(1, path.Length - 1)}{s}";
+            MD5 md5 = MD5.Create();
+            byte[] md5Hash = md5.ComputeHash(Encoding.UTF8.GetBytes(secret));
+            HMACSHA1 hmacsha1 = new HMACSHA1();
+            byte[] hmasha1Hash = hmacsha1.ComputeHash(md5Hash);
+            string sign = BitConverter.ToString(hmasha1Hash).Replace("-", "").ToLower();
 
-            var link = $"https://{host}/get-{codec}/{sign}/{ts}{path}";
+            string link = $"https://{host}/get-{codec}/{sign}/{ts}{path}";
 
             return link;
         }
@@ -155,8 +155,8 @@ public YStorageDownloadFile GetDownloadFileInfo(AuthStorage storage, YTrackDownl
         /// <returns></returns>
         public string GetFileLink(AuthStorage storage, string trackKey)
         {
-            var mainDownloadResponse = GetMetadataForDownload(storage, trackKey).Result.First(m => m.Codec == "mp3");
-            var storageDownloadResponse = GetDownloadFileInfo(storage, mainDownloadResponse);
+            YTrackDownloadInfo mainDownloadResponse = GetMetadataForDownload(storage, trackKey).Result.First(m => m.Codec == "mp3");
+            YStorageDownloadFile storageDownloadResponse = GetDownloadFileInfo(storage, mainDownloadResponse);
 
             return BuildLinkForDownload(mainDownloadResponse, storageDownloadResponse);
         }
@@ -169,8 +169,8 @@ public string GetFileLink(AuthStorage storage, string trackKey)
         /// <returns></returns>
         public string GetFileLink(AuthStorage storage, YTrack track)
         {
-            var mainDownloadResponse = GetMetadataForDownload(storage, track).Result.First(m => m.Codec == "mp3");
-            var storageDownloadResponse = GetDownloadFileInfo(storage, mainDownloadResponse);
+            YTrackDownloadInfo mainDownloadResponse = GetMetadataForDownload(storage, track).Result.First(m => m.Codec == "mp3");
+            YStorageDownloadFile storageDownloadResponse = GetDownloadFileInfo(storage, mainDownloadResponse);
 
             return BuildLinkForDownload(mainDownloadResponse, storageDownloadResponse);
         }
@@ -185,10 +185,10 @@ public string GetFileLink(AuthStorage storage, YTrack track)
         /// <param name="filePath">Путь для файла</param>
         public void ExtractToFile(AuthStorage storage, string trackKey, string filePath)
         {
-            var fileLink = GetFileLink(storage, trackKey);
+            string fileLink = GetFileLink(storage, trackKey);
 
             try {
-                using (var client = new WebClient()) {
+                using (WebClient client = new WebClient()) {
                     client.DownloadFile(fileLink, filePath);
                 }
             }
@@ -205,11 +205,11 @@ public void ExtractToFile(AuthStorage storage, string trackKey, string filePath)
         /// <param name="filePath">Путь для файла</param>
         public void ExtractToFile(AuthStorage storage, YTrack track, string filePath)
         {
-            var fileLink = GetFileLink(storage, track.GetKey().ToString());
+            string fileLink = GetFileLink(storage, track.GetKey().ToString());
 
             try
             {
-                using (var client = new WebClient())
+                using (WebClient client = new WebClient())
                 {
                     client.DownloadFile(fileLink, filePath);
                 }
@@ -228,12 +228,12 @@ public void ExtractToFile(AuthStorage storage, YTrack track, string filePath)
         /// <returns></returns>
         public byte[] ExtractData(AuthStorage storage, string trackKey)
         {
-            var fileLink = GetFileLink(storage, trackKey);
+            string fileLink = GetFileLink(storage, trackKey);
 
-            var bytes = default(byte[]);
+            byte[] bytes = default(byte[]);
 
             try {
-                using (var client = new WebClient()) {
+                using (WebClient client = new WebClient()) {
                     bytes = client.DownloadData(fileLink);
                 }
             }
@@ -252,13 +252,13 @@ public byte[] ExtractData(AuthStorage storage, string trackKey)
         /// <returns></returns>
         public byte[] ExtractData(AuthStorage storage, YTrack track)
         {
-            var fileLink = GetFileLink(storage, track.GetKey().ToString());
+            string fileLink = GetFileLink(storage, track.GetKey().ToString());
 
-            var bytes = default(byte[]);
+            byte[] bytes = default(byte[]);
 
             try
             {
-                using (var client = new WebClient())
+                using (WebClient client = new WebClient())
                 {
                     bytes = client.DownloadData(fileLink);
                 }

diff --git a/Yandex.Music.Api/Common/DebugSettings.cs b/Yandex.Music.Api/Common/DebugSettings.cs
@@ -30,12 +30,12 @@ public class DebugSettings
 
         public T Deserialize<T>(string url, string json, JsonSerializerSettings settings)
         {
-            var errors = new Dictionary<string, List<string>>();
+            Dictionary<string, List<string>> errors = new Dictionary<string, List<string>>();
 
             settings.Error = (sender, args) =>  {
-                var pos = args.ErrorContext.Error.Message.IndexOf("Path");
-                var error = args.ErrorContext.Error.Message.Substring(0, pos);
-                var path = args.ErrorContext.Error.Message.Substring(pos);
+                int pos = args.ErrorContext.Error.Message.IndexOf("Path");
+                string error = args.ErrorContext.Error.Message.Substring(0, pos);
+                string path = args.ErrorContext.Error.Message.Substring(pos);
 
                 if (!errors.ContainsKey(error))
                     errors[error] = new List<string>();
@@ -46,7 +46,7 @@ public T Deserialize<T>(string url, string json, JsonSerializerSettings settings
 
             settings.MissingMemberHandling = MissingMemberHandling.Error;
 
-            var obj = JsonConvert.DeserializeObject<T>(json, settings);
+            T obj = JsonConvert.DeserializeObject<T>(json, settings);
 
             // Запись ответа от API с ошибкой
             if (errors.Count > 0) {

diff --git a/Yandex.Music.Api/Common/Encryptor.cs b/Yandex.Music.Api/Common/Encryptor.cs
@@ -5,7 +5,7 @@
 namespace Yandex.Music.Api.Common
 {
     /// <summary>
-    /// Класс для шифровки потом
+    /// Класс для шифровки
     /// </summary>
     public class Encryptor
     {
@@ -46,8 +46,8 @@ public Encryptor(string key)
 
         public byte[] Encrypt(byte[] data)
         {
-            using (var ms = new MemoryStream()) {
-                using (var csEncrypt = new CryptoStream(ms, rijAlg.CreateEncryptor(keyHash, IVHash), CryptoStreamMode.Write)) {
+            using (MemoryStream ms = new MemoryStream()) {
+                using (CryptoStream csEncrypt = new CryptoStream(ms, rijAlg.CreateEncryptor(keyHash, IVHash), CryptoStreamMode.Write)) {
                     csEncrypt.Write(data, 0, data.Length);
 
                     if (!csEncrypt.HasFlushedFinalBlock)
@@ -60,8 +60,8 @@ public byte[] Encrypt(byte[] data)
 
         public byte[] Decrypt(byte[] data)
         {
-            using (var ms = new MemoryStream()) {
-                using (var csDecrypt = new CryptoStream(ms, rijAlg.CreateDecryptor(keyHash, IVHash), CryptoStreamMode.Write)) {
+            using (MemoryStream ms = new MemoryStream()) {
+                using (CryptoStream csDecrypt = new CryptoStream(ms, rijAlg.CreateDecryptor(keyHash, IVHash), CryptoStreamMode.Write)) {
                     csDecrypt.Write(data, 0, data.Length);
 
                     if (!csDecrypt.HasFlushedFinalBlock)

diff --git a/Yandex.Music.Api/Models/Common/Cover/YCover.cs b/Yandex.Music.Api/Models/Common/Cover/YCover.cs
@@ -17,11 +17,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             if (reader.TokenType == JsonToken.Null)
                 return null;
 
-            var jObject = JObject.Load(reader);
+            JObject jObject = JObject.Load(reader);
             YCover cover;
 
             try {
-                var type = jObject["error"] != null
+                YCoverType type = jObject["error"] != null
                     ? YCoverType.Error
                     : jObject["type"].ToObject<YCoverType>();
 

diff --git a/Yandex.Music.Api/Models/Library/YLibraryArtist.cs b/Yandex.Music.Api/Models/Library/YLibraryArtist.cs
diff --git a/Yandex.Music.Api/Models/Playlist/YGeneratedPlaylistType.cs b/Yandex.Music.Api/Models/Playlist/YGeneratedPlaylistType.cs
@@ -40,8 +40,8 @@ public enum YGeneratedPlaylistType
         Podcasts,
 
         /// <summary>
-        /// Большая перемотка
+        /// Кинопоиск
         /// </summary>
-        Rewind21,
+        Kinopoisk,
     }
 }
diff --git a/Yandex.Music.Api/Models/Radio/Restriction/YRestriction.cs b/Yandex.Music.Api/Models/Radio/Restriction/YRestriction.cs
@@ -17,7 +17,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             if (reader.TokenType == JsonToken.Null)
                 return null;
 
-            var jObject = JObject.Load(reader);
+            JObject jObject = JObject.Load(reader);
             YRestriction restriction;
 
             try

diff --git a/Yandex.Music.Api/Models/Search/YSearchBest.cs b/Yandex.Music.Api/Models/Search/YSearchBest.cs
@@ -30,9 +30,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             if (reader.TokenType == JsonToken.Null)
                 return null;
 
-            var obj = JObject.Load(reader);
-            var contract = (JsonObjectContract) serializer.ContractResolver.ResolveContract(objectType);
-            var best = existingValue as YSearchBest ?? (YSearchBest) contract.DefaultCreator();
+            JObject obj = JObject.Load(reader);
+            JsonObjectContract contract = (JsonObjectContract) serializer.ContractResolver.ResolveContract(objectType);
+            YSearchBest best = existingValue as YSearchBest ?? (YSearchBest) contract.DefaultCreator();
 
             best.Type = (YSearchType) Enum.Parse(typeof(YSearchType), obj["type"].ToString(), true);
 

diff --git a/Yandex.Music.Api/Requests/Auth/YAuthorizeRequest.cs b/Yandex.Music.Api/Requests/Auth/YAuthorizeRequest.cs
@@ -16,11 +16,11 @@ internal class YAuthorizeRequest : YRequest
 
         public YRequest Create(string login, string password)
         {
-            var headers = new List<KeyValuePair<string, string>> {
+            List<KeyValuePair<string, string>> headers = new List<KeyValuePair<string, string>> {
                 YRequestHeaders.Get(YHeader.ContentType, "application/x-www-form-urlencoded")
             };
 
-            var body = new Dictionary<string, string> {
+            Dictionary<string, string> body = new Dictionary<string, string> {
                 { "grant_type", "password" },
                 { "client_id", CLIENT_ID },
                 { "client_secret", CLIENT_SECRET },

diff --git a/Yandex.Music.Api/Requests/HttpContext.cs b/Yandex.Music.Api/Requests/HttpContext.cs
@@ -16,10 +16,10 @@ public HttpContext()
 
         public long GetTimeInterval()
         {
-            var dt = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now);
-            var dt1970 = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-            var tsInterval = dt.Subtract(dt1970);
-            var iMilliseconds = Convert.ToInt64(tsInterval.TotalMilliseconds);
+            DateTime dt = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now);
+            DateTime dt1970 = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+            TimeSpan tsInterval = dt.Subtract(dt1970);
+            long iMilliseconds = Convert.ToInt64(tsInterval.TotalMilliseconds);
 
             return iMilliseconds;
         }