Mirrors/roadie
2
0
Fork 0
mirror of https://github.com/sphildreth/roadie synced 2024-11-22 12:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added SignalR play activity.

Browse source
This commit is contained in:
Steven Hildreth 2018-11-16 20:44:08 -06:00
parent 30dad4ae45
commit 375295746e
7 changed files with 96 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
RoadieApi/Controllers/PlayController.cs
View file

@ -34,7 +34,8 @@ namespace Roadie.Api.Controllers
[HttpGet("track/{id}")]
public async Task<FileStreamResult> StreamTrack(Guid id)
{
var track = await this.TrackService.ById(await this.CurrentUserModel(), id, null);
var user = await this.CurrentUserModel();
var track = await this.TrackService.ById(user, id, null);
if (track == null || track.IsNotFoundResult)
{
Response.StatusCode = (int)HttpStatusCode.NotFound;
@ -61,8 +62,8 @@ namespace Roadie.Api.Controllers
Response.Headers.Add("Cache-Control", info.Data.CacheControl);
Response.Headers.Add("Expires", info.Data.Expires);
var stream = new MemoryStream(info.Data.Bytes);
await this.PlayActivityService.CreatePlayActivity(await this.CurrentUserModel(), info.Data);
this._logger.LogInformation($"StreamTrack [{ info.Data.ToString() }]");
var playListUser = await this.PlayActivityService.CreatePlayActivity(user, info.Data);
this._logger.LogInformation($"StreamTrack PlayActivity `{ playListUser }`, StreamInfo `{ info.Data.ToString() }`");
return new FileStreamResult(stream, info.Data.ContentType)
{
FileDownloadName = info.Data.FileName

17
RoadieApi/Hubs/PlayActivityHub.cs Normal file
View file

@ -0,0 +1,17 @@
using Microsoft.AspNetCore.SignalR;
using Roadie.Library.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Roadie.Api.Hubs
{
public class PlayActivityHub : Hub
{
public async Task SendActivity(PlayActivityList playActivity)
{
await Clients.All.SendAsync("PlayActivity", playActivity);
}
}
}

1
RoadieApi/Roadie.Api.csproj
View file

@ -11,6 +11,7 @@
<ItemGroup>
<PackageReference Include="Mapster" Version="3.2.0" />
<PackageReference Include="Microsoft.AspNet.SignalR" Version="2.4.0" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.6" />
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.6" />

2
RoadieApi/Services/IPlayActivityService.cs
View file

@ -10,6 +10,6 @@ namespace Roadie.Api.Services
{
Task<PagedResult<PlayActivityList>> List(PagedRequest request, User roadieUser = null);
Task<OperationResult<UserTrack>> CreatePlayActivity(User roadieUser, TrackStreamInfo streamInfo);
Task<OperationResult<PlayActivityList>> CreatePlayActivity(User roadieUser, TrackStreamInfo streamInfo);
}
}

108
RoadieApi/Services/PlayActivityService.cs
View file

@ -1,5 +1,8 @@
using Mapster;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Roadie.Api.Hubs;
using Roadie.Library;
using Roadie.Library.Caching;
using Roadie.Library.Configuration;
@ -20,14 +23,18 @@ namespace Roadie.Api.Services
{
public class PlayActivityService : ServiceBase, IPlayActivityService
{
protected IHubContext<PlayActivityHub> PlayActivityHub { get; }
public PlayActivityService(IRoadieSettings configuration,
IHttpEncoder httpEncoder,
IHttpContext httpContext,
data.IRoadieDbContext dbContext,
ICacheManager cacheManager,
ILogger<PlayActivityService> logger)
ILogger<PlayActivityService> logger,
IHubContext<PlayActivityHub> playHubContext)
: base(configuration, httpEncoder, dbContext, cacheManager, logger, httpContext)
{
this.PlayActivityHub = playHubContext;
}
public async Task<Library.Models.Pagination.PagedResult<PlayActivityList>> List(PagedRequest request, User roadieUser = null)
@ -107,23 +114,23 @@ namespace Roadie.Api.Services
return new Library.Models.Pagination.PagedResult<PlayActivityList>();
}
public async Task<OperationResult<UserTrack>> CreatePlayActivity(User roadieUser, TrackStreamInfo streamInfo)
public async Task<OperationResult<PlayActivityList>> CreatePlayActivity(User roadieUser, TrackStreamInfo streamInfo)
{
var sw = Stopwatch.StartNew();
var track = this.GetTrack(streamInfo.Track.Value);
if (track == null)
{
return new OperationResult<UserTrack>($"CreatePlayActivity: Unable To Find Track [{ streamInfo.Track.Value }]");
return new OperationResult<PlayActivityList>($"CreatePlayActivity: Unable To Find Track [{ streamInfo.Track.Value }]");
}
if (!track.IsValid)
{
return new OperationResult<UserTrack>($"CreatePlayActivity: Invalid Track. Track Id [{streamInfo.Track.Value}], FilePath [{track.FilePath}], Filename [{track.FileName}]");
return new OperationResult<PlayActivityList>($"CreatePlayActivity: Invalid Track. Track Id [{streamInfo.Track.Value}], FilePath [{track.FilePath}], Filename [{track.FileName}]");
}
var user = this.GetUser(roadieUser.UserId);
if (user == null)
{
return new OperationResult<UserTrack>($"CreatePlayActivity: Unable To Find User [{ roadieUser.UserId }]");
return new OperationResult<PlayActivityList>($"CreatePlayActivity: Unable To Find User [{ roadieUser.UserId }]");
}
var now = DateTime.UtcNow;
track.PlayedCount = (track.PlayedCount ?? 0) + 1;
@ -145,53 +152,60 @@ namespace Roadie.Api.Services
this.CacheManager.ClearRegion(track.ReleaseMedia.Release.CacheRegion);
this.CacheManager.ClearRegion(track.ReleaseMedia.Release.Artist.CacheRegion);
// TODO publish with SignalR
var pl = new PlayActivityList
{
Artist = new DataToken
{
Text = track.ReleaseMedia.Release.Artist.Name,
Value = track.ReleaseMedia.Release.Artist.RoadieId.ToString()
},
TrackArtist = track.TrackArtist == null ? null : new DataToken
{
Text = track.TrackArtist.Name,
Value = track.TrackArtist.RoadieId.ToString()
},
Release = new DataToken
{
Text = track.ReleaseMedia.Release.Title,
Value = track.ReleaseMedia.Release.RoadieId.ToString()
},
Track = new DataToken
{
Text = track.Title,
Value = track.RoadieId.ToString()
},
User = new DataToken
{
Text = roadieUser.UserName,
Value = roadieUser.UserId.ToString()
},
PlayedDateDateTime = userTrack.LastPlayed,
ReleasePlayUrl = $"{ this.HttpContext.BaseUrl }/play/release/{ track.ReleaseMedia.Release.RoadieId}",
Rating = track.Rating,
UserRating = userTrack.Rating,
TrackPlayUrl = $"{ this.HttpContext.BaseUrl }/play/track/{ track.RoadieId}",
ArtistThumbnail = this.MakeArtistThumbnailImage(track.TrackArtist != null ? track.TrackArtist.RoadieId : track.ReleaseMedia.Release.Artist.RoadieId),
ReleaseThumbnail = this.MakeReleaseThumbnailImage(track.ReleaseMedia.Release.RoadieId),
UserThumbnail = this.MakeUserThumbnailImage(roadieUser.UserId)
};
//if (!this.RoadieUser.isPrivate ?? false)
//{
// try
// {
// var hub = GlobalHost.ConnectionManager.GetHubContext<Hubs.PlayActivityHub>();
// var releaseArtist = track.releasemedia.release.artist;
// artist trackArtist = track.artistId == null ? null : context.artists.FirstOrDefault(x => x.id == track.artistId);
// hub.Clients.All.PlayActivity(new PlayActivityListModel
// {
// releaseTitle = track.releasemedia.release.title,
// playedDateDateTime = userTrack.lastPlayed,
// userId = this.RoadieUser.roadieId,
// userName = this.RoadieUser.username,
// releaseId = track.releasemedia.release.roadieId,
// trackId = track.roadieId,
// IsLocked = (track.isLocked ?? false) || (track.releasemedia.release.isLocked ?? false) || ((trackArtist ?? releaseArtist).isLocked ?? false),
// createdDateTime = track.createdDate,
// lastUpdatedDateTime = track.lastUpdated,
// releasePlayUrl = this.Request.Url.BasePath + "/play/release/" + this.Base64BearerToken + "/" + track.releasemedia.release.roadieId,
// rating = track.rating,
// userRating = userTrack.rating,
// releaseArtistId = releaseArtist.roadieId,
// releaseArtistName = releaseArtist.name,
// roadieId = track.roadieId,
// status = track.status.ToString(),
// title = track.title,
// trackArtistId = trackArtist == null ? null : trackArtist.roadieId,
// trackArtistName = trackArtist == null ? null : trackArtist.name,
// trackPlayUrl = this.Request.Url.BasePath + "/play/track/" + this.Base64BearerToken + "/" + track.roadieId,
// artistThumbnailUrl = this.Request.Url.BasePath + "/api/v1/image/artist/thumbnail/" + (trackArtist != null ? trackArtist.roadieId : releaseArtist.roadieId),
// releaseThumbnailUrl = this.Request.Url.BasePath + "/api/v1/image/release/thumbnail/" + track.releasemedia.release.roadieId,
// userThumbnailUrl = this.Request.Url.BasePath + "/api/v1/image/user/thumbnail/" + this.RoadieUser.roadieId
// });
// }
// catch (Exception ex)
// {
// this.LoggingService.Error(ex.Serialize());
// }
//}
if (!roadieUser.IsPrivate)
{
try
{
await this.PlayActivityHub.Clients.All.SendAsync(JsonConvert.SerializeObject(pl));
}
catch (Exception ex)
{
this.Logger.LogError(ex);
}
}
await this.DbContext.SaveChangesAsync();
sw.Stop();
return new OperationResult<UserTrack>
return new OperationResult<PlayActivityList>
{
Data = userTrack.Adapt<UserTrack>(),
Data = pl,
IsSuccess = userTrack != null,
OperationTime = sw.ElapsedMilliseconds
};

7
RoadieApi/Startup.cs
View file

@ -14,6 +14,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Microsoft.OData.Edm;
using Newtonsoft.Json;
using Roadie.Api.Hubs;
using Roadie.Api.Services;
using Roadie.Library.Caching;
using Roadie.Library.Configuration;
@ -72,6 +73,10 @@ namespace Roadie.Api
// c.SwaggerEndpoint("/swagger/v1/swagger.json", "MyComics API v1");
// c.RoutePrefix = string.Empty;
//});
app.UseSignalR(routes =>
{
routes.MapHub<PlayActivityHub>("playActivityHub");
});
app.UseMvc(b =>
{
b.Select().Expand().Filter().OrderBy().MaxTop(100).Count();
@ -176,6 +181,8 @@ namespace Roadie.Api
services.AddOData();
services.AddSignalR();
services.AddMvc()
.AddJsonOptions(options =>
{

5
RoadieLibrary/Models/PlayActivityList.cs
View file

@ -32,5 +32,10 @@ namespace Roadie.Library.Models
public int? UserRating { get; set; }
public Image UserThumbnail { get; set; }
public UserTrack UserTrack { get; set; }
public override string ToString()
{
return $"User [{ this.User }], Artist [{ this.Artist }], Release [{ this.Release }], Track [{ this.Track}]";
}
}
}