Compare commits
2 Commits
14a6e18966
...
v1.3.5
| Author | SHA1 | Date | |
|---|---|---|---|
| 73236e1fde | |||
| 90078a0f62 |
@@ -36,6 +36,9 @@ public class Media
|
|||||||
{ ".ico", MediaType.Image },
|
{ ".ico", MediaType.Image },
|
||||||
{ ".gif", MediaType.Image },
|
{ ".gif", MediaType.Image },
|
||||||
{ ".mp3", MediaType.Audio },
|
{ ".mp3", MediaType.Audio },
|
||||||
|
{ ".ogg", MediaType.Audio },
|
||||||
|
{ ".wav", MediaType.Audio },
|
||||||
|
{ ".aac", MediaType.Audio },
|
||||||
{ ".flac", MediaType.Audio },
|
{ ".flac", MediaType.Audio },
|
||||||
{ ".alac", MediaType.Audio },
|
{ ".alac", MediaType.Audio },
|
||||||
{ ".mp4", MediaType.Video },
|
{ ".mp4", MediaType.Video },
|
||||||
|
|||||||
@@ -87,6 +87,12 @@ public class AobaService(IMongoDatabase db)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task SetMediaTypeAsync(ObjectId mediaId, MediaType type, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
var update = Builders<Media>.Update.Set(m => m.MediaType, type);
|
||||||
|
await _media.UpdateOneAsync(m => m.MediaId == mediaId, update, null, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<Maybe<Media>> UploadFileAsync(Stream data, string filename, ObjectId owner, CancellationToken cancellationToken = default)
|
public async Task<Maybe<Media>> UploadFileAsync(Stream data, string filename, ObjectId owner, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -10,8 +10,11 @@ using MongoDB.Bson;
|
|||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using MongoDB.Driver.GridFS;
|
using MongoDB.Driver.GridFS;
|
||||||
|
|
||||||
|
using SixLabors.Fonts;
|
||||||
using SixLabors.ImageSharp;
|
using SixLabors.ImageSharp;
|
||||||
|
using SixLabors.ImageSharp.Drawing.Processing;
|
||||||
using SixLabors.ImageSharp.Formats;
|
using SixLabors.ImageSharp.Formats;
|
||||||
|
using SixLabors.ImageSharp.PixelFormats;
|
||||||
using SixLabors.ImageSharp.Processing;
|
using SixLabors.ImageSharp.Processing;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
@@ -119,7 +122,8 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
|||||||
{
|
{
|
||||||
MediaType.Image => await GenerateImageThumbnailAsync(stream, size, ext, cancellationToken),
|
MediaType.Image => await GenerateImageThumbnailAsync(stream, size, ext, cancellationToken),
|
||||||
MediaType.Video => GenerateVideoThumbnail(stream, size, cancellationToken),
|
MediaType.Video => GenerateVideoThumbnail(stream, size, cancellationToken),
|
||||||
MediaType.Text or MediaType.Code => await GenerateDocumentThumbnailAsync(stream, size, cancellationToken),
|
MediaType.Audio => GenerateAudioThumbnail(stream, size, ext, cancellationToken),
|
||||||
|
MediaType.Text or MediaType.Code => await GenerateTextThumbnailAsync(stream, size, cancellationToken),
|
||||||
_ => new Error($"No Thumbnail for {type}"),
|
_ => new Error($"No Thumbnail for {type}"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -156,6 +160,40 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Maybe<Stream> GenerateAudioThumbnail(Stream data, ThumbnailSize size, string ext, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
|
||||||
|
var w = (int)size;
|
||||||
|
var fn = ObjectId.GenerateNewId().ToString();
|
||||||
|
var filePath = $"/tmp/{fn}{ext}";
|
||||||
|
|
||||||
|
using var source = new FileStream(filePath, FileMode.CreateNew);
|
||||||
|
data.CopyTo(source);
|
||||||
|
source.Flush();
|
||||||
|
source.Dispose();
|
||||||
|
data.Dispose();
|
||||||
|
//ffmpeg -i test.wav -lavfi "showspectrumpic=s=512x512:legend=0:color=plasma:scale=log" output3.png
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var output = new MemoryStream();
|
||||||
|
FFMpegArguments.FromFileInput(filePath, false)
|
||||||
|
.OutputToPipe(new StreamPipeSink(output), opt =>
|
||||||
|
{
|
||||||
|
opt.WithCustomArgument("-lavfi \"showspectrumpic=s=512x512:legend=0:color=plasma:scale=log\"").ForceFormat("webp");
|
||||||
|
}).ProcessSynchronously();
|
||||||
|
output.Position = 0;
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return ex;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
File.Delete(filePath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
public static Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
var w = (int)size;
|
var w = (int)size;
|
||||||
@@ -231,8 +269,23 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
public async Task<Maybe<Stream>> GenerateTextThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
|
//var w = (int)size;
|
||||||
|
//using var image = new Image<Rgba32>(w, w);
|
||||||
|
//var reader = new StreamReader(data);
|
||||||
|
//var text = new char[500];
|
||||||
|
//reader.ReadBlock(text, 0, text.Length);
|
||||||
|
//image.Mutate(op =>
|
||||||
|
//{
|
||||||
|
// op.BackgroundColor(Color.Black);
|
||||||
|
// var font = new Font(), 11);
|
||||||
|
// var textOpts = new RichTextOptions(font);
|
||||||
|
// op.DrawText(, new string(text), new Brush
|
||||||
|
// {
|
||||||
|
|
||||||
|
// });
|
||||||
|
//});
|
||||||
return new NotImplementedException();
|
return new NotImplementedException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
|
|
||||||
|
using AobaCore.Models;
|
||||||
using AobaCore.Services;
|
using AobaCore.Services;
|
||||||
|
|
||||||
namespace AobaServer.Services;
|
namespace AobaServer.Services;
|
||||||
@@ -7,13 +8,5 @@ public class DebugService(AobaService aobaService, ThumbnailService thumbnailSer
|
|||||||
{
|
{
|
||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
{
|
{
|
||||||
var mediaItems = await aobaService.FindMediaWithExtAsync(".avif", stoppingToken);
|
|
||||||
foreach (var item in mediaItems)
|
|
||||||
{
|
|
||||||
foreach (var size in item.Thumbnails.Keys)
|
|
||||||
{
|
|
||||||
await thumbnailService.DeleteThumbnailAsync(item.MediaId, size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user