anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#112 removing httpclient from audioclip page

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-05-09 20:49:37 +04:30
parent 9d0622571e
commit 4dab2737f1
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
GanjooRazor/Pages/AudioClip.cshtml.cs
View File

@ -1,30 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Newtonsoft.Json;
using RMuseum.Models.Ganjoor.ViewModels;
using RMuseum.Models.GanjoorAudio.ViewModels;
using RMuseum.Services;
namespace GanjooRazor.Pages
{
public class AudioClipModel : PageModel
{
/// <summary>
/// HttpClient instance
/// </summary>
private readonly HttpClient _httpClient;
/// <summary>
/// constructor
/// </summary>
/// <param name="httpClient"></param>
public AudioClipModel(HttpClient httpClient)
private readonly IGanjoorService _ganjoorService;
private readonly IRecitationService _recitationService;
public AudioClipModel(IGanjoorService ganjoorService, IRecitationService recitationService)
{
_httpClient = httpClient;
_ganjoorService = ganjoorService;
_recitationService = recitationService;
}
/// <summary>
@ -44,15 +38,14 @@ namespace GanjooRazor.Pages
return BadRequest();
}
var response = await _httpClient.GetAsync($"{APIRoot.Url}/api/audio/published/{Request.Query["a"]}");
response.EnsureSuccessStatusCode();
var res = await _recitationService.GetPublishedRecitationById(int.Parse(Request.Query["a"]));
Recitation = JsonConvert.DeserializeObject<PublicRecitationViewModel>(await response.Content.ReadAsStringAsync());
var responsePoem = await _httpClient.GetAsync($"{APIRoot.Url}/api/ganjoor/poem/{Recitation.PoemId}?rhymes=false&recitations=false&images=false&songs=false&comments=false&navigation=false");
responsePoem.EnsureSuccessStatusCode();
Recitation = res.Result;
Poem = JsonConvert.DeserializeObject<GanjoorPoemCompleteViewModel>(await responsePoem.Content.ReadAsStringAsync());
var resPoem = await _ganjoorService.GetPoemById(Recitation.PoemId, true, false, false, false, false, false, false, false, false);
Poem = resPoem.Result;
return Page();

9
GanjooRazor/Pages/Golha.cshtml.cs
View File

@ -19,10 +19,11 @@ namespace GanjooRazor.Pages
private readonly IMusicCatalogueService _musicCatalogue;
/// <summary>
/// constructor
/// </summary>
/// <param name="httpClient"></param>
/// <summary>
/// constructor
/// </summary>
/// <param name="ganjoorService"></param>
/// <param name="musicCatalogue"></param>
public GolhaModel(
IGanjoorService ganjoorService,
IMusicCatalogueService musicCatalogue