RPCS3/discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2025-02-08 11:26:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

workaround segfault when running dotnet from the snap

Browse Source
This commit is contained in:
13xforever 2019-03-06 03:28:46 +05:00
parent 1919183095
commit e128633471
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CompatBot/Commands/Psn.cs
View File

@ -10,8 +10,6 @@ using DSharpPlus.CommandsNext;
using DSharpPlus.CommandsNext.Attributes;
using DSharpPlus.Entities;
using DSharpPlus.Interactivity;
using Google.Apis.Http;
using Microsoft.EntityFrameworkCore.Migrations;
using PsnClient;
using PsnClient.POCOs;
@ -22,6 +20,7 @@ namespace CompatBot.Commands
internal sealed partial class Psn: BaseCommandModuleCustom
{
private static readonly Client Client = new Client();
private static readonly DiscordColor PsnBlue = new DiscordColor(0x0071cd);
[Command("fix"), RequiresBotModRole]
[Description("Reset thumbnail cache for specified product")]
@ -78,7 +77,7 @@ namespace CompatBot.Commands
}
search = response.Message.Content;
}
var msgTask = msg.UpdateOrCreateMessageAsync(ctx.Channel, "Searching...");
var msgTask = msg.UpdateOrCreateMessageAsync(ctx.Channel, "⏳ Searching...");
var psnResponseUSTask = Client.SearchAsync("en-US", search, Config.Cts.Token);
var psnResponseEUTask = Client.SearchAsync("en-GB", search, Config.Cts.Token);
var psnResponseJPTask = Client.SearchAsync("ja-JP", search, Config.Cts.Token);
@ -87,7 +86,7 @@ namespace CompatBot.Commands
var responseEU = await psnResponseEUTask.ConfigureAwait(false);
var responseJP = await psnResponseJPTask.ConfigureAwait(false);
msg = await msgTask.ConfigureAwait(false);
msg = await msg.UpdateOrCreateMessageAsync(ctx.Channel, "Preparing results...").ConfigureAwait(false);
msg = await msg.UpdateOrCreateMessageAsync(ctx.Channel, "⌛ Preparing results...").ConfigureAwait(false);
var usGame = GetBestMatch(responseUS.Included, search);
var euGame = GetBestMatch(responseEU.Included, search);
var jpGame = GetBestMatch(responseJP.Included, search);
@ -96,9 +95,10 @@ namespace CompatBot.Commands
{
var thumb = await ThumbnailProvider.GetEmbeddableUrlAsync(ctx.Client, g.Id, g.Attributes.ThumbnailUrlBase).ConfigureAwait(false);
var score = g.Attributes.StarRating?.Score == null ? "N/A" : $"{StringUtils.GetStars(g.Attributes.StarRating?.Score)} ({g.Attributes.StarRating?.Score})";
var embedColor = ColorGetter.Analyze(thumb.image, PsnBlue);
var result = new DiscordEmbedBuilder
{
Color = ColorGetter.Analyze(thumb.image, new DiscordColor(0x0071cd)),
Color = embedColor,
Title = $"⏬ {g.Attributes.Name} [{region}] ({g.Attributes.FileSize?.Value} {g.Attributes.FileSize?.Unit})",
Url = $"https://store.playstation.com/{locale}/product/{g.Id}",
Description = $"Rating: {score}",

12
CompatBot/Utils/ColorGetter.cs
View File

@ -2,6 +2,7 @@
using System.Drawing;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using ColorThiefDotNet;
using DSharpPlus.Entities;
@ -13,18 +14,15 @@ namespace CompatBot.Utils
{
try
{
// when running dotnet from the snap, it will segfault on attempt to create a Bitmap
if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SNAP")))
return defaultColor;
var analyzer = new ColorThief();
using (var stream = new MemoryStream(jpg))
{
//var img = Bitmap.FromStream(stream, false, true);
var bmp = new Bitmap(stream, false);
var palette = analyzer.GetPalette(bmp, ignoreWhite: false);
/*
var bright = palette.FirstOrDefault(p => !p.IsDark);
if (bright != null)
return new DiscordColor(bright.Color.R, bright.Color.G, bright.Color.B);
*/
var colors = palette
.Select(p => new {c = p.Color, hsl = p.Color.ToHsl()})
.OrderBy(p => Math.Abs(0.5 - p.hsl.L))