Prepared Encoder service

Encoder/Program.cs

@@ -1,14 +1,16 @@
-using System.Collections;
-using Microsoft.AspNetCore.Http.HttpResults;
-Queue<EncodingJob> JobQueue = new();
+using Encoder;
 
 var builder = WebApplication.CreateBuilder(args);
 
 //Settings
-string tmpFilePath = builder.Configuration.GetValue<string>("TempFilePath") ?? Path.GetTempPath();
-
+string? tmpFilePath = builder.Configuration.GetValue<string>("TempFilePath");
+string? ffmpegPath = builder.Configuration.GetValue<string>("FfmpegPath");
 //Services
 builder.Services.AddOpenApi();
+
+var encoderOptions = new EncoderServiceOptions { OutputPath = tmpFilePath };
+builder.Services.AddSingleton<IEncoderService, EncoderService>(_ => new (encoderOptions));
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment()) { app.MapOpenApi(); }
@@ -18,7 +20,7 @@ app.UseHttpsRedirection();
 // Get a video file as multipart form data and schedule it for encoding
 // Get video encoding settings from query parameters
 // Returns the ID of the job handling the encoding
-app.MapPost("encode", context =>
+app.MapPost("encode", context => 
 {
     var request = context.Request;
     if (!request.HasFormContentType) {
@@ -34,16 +36,25 @@ app.MapPost("encode", context =>
         return context.Response.WriteAsync("No video file provided.");
     }
     
-    var Job = new EncodingJob(Guid.NewGuid());
-    JobQueue.Enqueue(Job);
-    
-    return context.Response.WriteAsJsonAsync(new { JobId = Job.Id });
+    var job = new EncodingJob(Guid.NewGuid());
+    var encSrv = context.RequestServices.GetService<EncoderService>();
+    if (encSrv != null) encSrv.EnqueueJob(job);
+    else {
+        context.Response.StatusCode = 500;
+        return context.Response.WriteAsync("Encoder service not available.");
+    }
+
+    context.Response.StatusCode = 200;
+    return context.Response.WriteAsJsonAsync(new { JobId = job.Id });
 });
 
 // Check the status of an encoding job by its ID
-app.MapGet("status/{jobId:guid}", (Guid jobId) =>
+app.MapGet("status/{jobId:guid}", (HttpContext context, Guid jobId) =>
 {
-    var job = JobQueue.FirstOrDefault(j => j.Id == jobId);
+    var encSrv = context.RequestServices.GetService<EncoderService>();
+    if (encSrv == null) return Results.InternalServerError();
+    
+    var job = encSrv.GetJobStatus(jobId);
     if (job == null) {
         return Results.NotFound(new { Message = "Job not found." });
     }
@@ -51,44 +62,26 @@ app.MapGet("status/{jobId:guid}", (Guid jobId) =>
     return Results.Ok(new { 
         JobId = job.Id, 
         Status = job.Status.ToString(),
-        CreatedAt = job.CreatedAt,
-        CompletedAt = job.CompletedAt 
+        job.CreatedAt,
+        job.CompletedAt 
     });
 });
 
-app.MapGet("file/{jobId:guid}", (Guid jobId) =>
+app.MapGet("file/{jobId:guid}", (HttpContext context, Guid jobId) =>
 {
-    var job = JobQueue.FirstOrDefault(j => j.Id == jobId);
-    if (job == null) {
-        return Results.NotFound(new { Message = "Job not found." });
-    }
+    var encSrv = context.RequestServices.GetService<EncoderService>();
+    if (encSrv == null) return Results.InternalServerError();
+    
+    var job = encSrv.GetJobStatus(jobId);
+    if (job == null) return Results.NotFound(new { Message = "Job not found." });
 
-    if (job.Status != JobStatus.Completed) {
-        return Results.BadRequest(new { Message = "Job is not completed yet." });
-    }
+    if (job.Status != JobStatus.Completed) return Results.BadRequest(new { Message = "Job is not completed yet." });
 
     var filePath = job.EncodedFilePath;
-    if (!File.Exists(filePath)) {
-        return Results.NotFound(new { Message = "Encoded file not found." });
-    }
+    if (!File.Exists(filePath)) return Results.NotFound(new { Message = "Encoded file not found." });
 
     var fileBytes = File.ReadAllBytes(filePath);
     return Results.File(fileBytes, "video/mp4", Path.GetFileName(filePath), enableRangeProcessing:true);
 });
 
-app.Run();
-
-public enum JobStatus {
-    Pending,
-    InProgress,
-    Completed,
-    Failed
-}
-
-public record EncodingJob(Guid Id) {
-    public JobStatus Status { get; set; } = JobStatus.Pending;
-    public DateTime CreatedAt { get; init; } = DateTime.Now;
-    public DateTime? CompletedAt { get; set; } = null;
-    public string OrigFilePath { get; init; } = string.Empty;
-    public string EncodedFilePath { get; set; } = string.Empty;
-}
+app.Run();