Skip to content

Commit 88882b2

Browse files
Bugfixes (#1194)
* FFMPEG support * Fix redirects. * Install ffmpeg. * Rebuild options fixed. * Update tests * Catch exception * Disable test
1 parent 21a443c commit 88882b2

File tree

43 files changed

+407
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+407
-174
lines changed

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS backend
66

7+
# FFMPEG for tests
8+
RUN apt-get update \
9+
&& apt-get install -y ffmpeg
10+
711
ARG SQUIDEX__BUILD__VERSION=7.0.0
812

913
WORKDIR /src
@@ -73,7 +77,7 @@ ARG SQUIDEX__RUNTIME__VERSION=7.0.0
7377

7478
# Curl for debugging and libc-dev for protobuf
7579
RUN apt-get update \
76-
&& apt-get install -y curl libc-dev
80+
&& apt-get install -y curl libc-dev ffmpeg
7781

7882
# Default tool directory
7983
WORKDIR /tools

backend/src/Migrations/Migrations/RebuildApps.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ public sealed class RebuildApps(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
return rebuilder.RebuildAppsAsync(rebuildOptions.BatchSize, ct);
22+
return rebuilder.RebuildAppsAsync(rebuildOptions.Value.CalculateBatchSize(), ct);
2523
}
2624
}

backend/src/Migrations/Migrations/RebuildAssetFolders.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ public sealed class RebuildAssetFolders(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
return rebuilder.RebuildAssetFoldersAsync(rebuildOptions.BatchSize, ct);
22+
return rebuilder.RebuildAssetFoldersAsync(rebuildOptions.Value.CalculateBatchSize(), ct);
2523
}
2624
}

backend/src/Migrations/Migrations/RebuildAssets.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ public sealed class RebuildAssets(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
return rebuilder.RebuildAssetsAsync(rebuildOptions.BatchSize, ct);
22+
return rebuilder.RebuildAssetsAsync(rebuildOptions.Value.CalculateBatchSize(), ct);
2523
}
2624
}

backend/src/Migrations/Migrations/RebuildContents.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ public sealed class RebuildContents(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
return rebuilder.RebuildContentAsync(rebuildOptions.BatchSize, ct);
22+
return rebuilder.RebuildContentAsync(rebuildOptions.Value.CalculateBatchSize(), ct);
2523
}
2624
}

backend/src/Migrations/Migrations/RebuildRules.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ public sealed class RebuildRules(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
return rebuilder.RebuildRulesAsync(rebuildOptions.BatchSize, ct);
22+
return rebuilder.RebuildRulesAsync(rebuildOptions.Value.CalculateBatchSize(), ct);
2523
}
2624
}

backend/src/Migrations/Migrations/RebuildSchemas.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ public sealed class RebuildSchemas(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
return rebuilder.RebuildSchemasAsync(rebuildOptions.BatchSize, ct);
22+
return rebuilder.RebuildSchemasAsync(rebuildOptions.Value.CalculateBatchSize(), ct);
2523
}
2624
}

backend/src/Migrations/Migrations/RebuildSnapshots.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ public sealed class RebuildSnapshots(
1616
IOptions<RebuildOptions> rebuildOptions)
1717
: IMigration
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public async Task UpdateAsync(
2220
CancellationToken ct)
2321
{
24-
await rebuilder.RebuildAppsAsync(rebuildOptions.BatchSize, ct);
25-
await rebuilder.RebuildSchemasAsync(rebuildOptions.BatchSize, ct);
26-
await rebuilder.RebuildRulesAsync(rebuildOptions.BatchSize, ct);
27-
await rebuilder.RebuildContentAsync(rebuildOptions.BatchSize, ct);
28-
await rebuilder.RebuildAssetsAsync(rebuildOptions.BatchSize, ct);
29-
await rebuilder.RebuildAssetFoldersAsync(rebuildOptions.BatchSize, ct);
22+
var batchSize = rebuildOptions.Value.CalculateBatchSize();
23+
24+
await rebuilder.RebuildAppsAsync(batchSize, ct);
25+
await rebuilder.RebuildSchemasAsync(batchSize, ct);
26+
await rebuilder.RebuildRulesAsync(batchSize, ct);
27+
await rebuilder.RebuildContentAsync(batchSize, ct);
28+
await rebuilder.RebuildAssetsAsync(batchSize, ct);
29+
await rebuilder.RebuildAssetFoldersAsync(batchSize, ct);
30+
await rebuilder.RebuildTeamsAsync(batchSize, ct);
3031
}
3132
}

backend/src/Migrations/RebuildOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public sealed class RebuildOptions
2323

2424
public bool Schemas { get; set; }
2525

26+
public bool Teams { get; set; }
27+
2628
public int BatchSize { get; set; } = 100;
2729

2830
public int CalculateBatchSize()

backend/src/Migrations/RebuildRunner.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,43 @@ public sealed class RebuildRunner(
1616
Rebuilder rebuilder,
1717
RebuildFiles rebuildFiles)
1818
{
19-
private readonly RebuildOptions rebuildOptions = rebuildOptions.Value;
20-
2119
public async Task RunAsync(
2220
CancellationToken ct)
2321
{
24-
var batchSize = rebuildOptions.CalculateBatchSize();
22+
var batchSize = rebuildOptions.Value.CalculateBatchSize();
2523

26-
if (rebuildOptions.Apps)
24+
if (rebuildOptions.Value.Apps)
2725
{
2826
await rebuilder.RebuildAppsAsync(batchSize, ct);
2927
}
3028

31-
if (rebuildOptions.Schemas)
29+
if (rebuildOptions.Value.Teams)
30+
{
31+
await rebuilder.RebuildTeamsAsync(batchSize, ct);
32+
}
33+
34+
if (rebuildOptions.Value.Schemas)
3235
{
3336
await rebuilder.RebuildSchemasAsync(batchSize, ct);
3437
}
3538

36-
if (rebuildOptions.Rules)
39+
if (rebuildOptions.Value.Rules)
3740
{
3841
await rebuilder.RebuildRulesAsync(batchSize, ct);
3942
}
4043

41-
if (rebuildOptions.Assets)
44+
if (rebuildOptions.Value.Assets)
4245
{
4346
await rebuilder.RebuildAssetsAsync(batchSize, ct);
4447
await rebuilder.RebuildAssetFoldersAsync(batchSize, ct);
4548
}
4649

47-
if (rebuildOptions.AssetFiles)
50+
if (rebuildOptions.Value.AssetFiles)
4851
{
4952
await rebuildFiles.RepairAsync(ct);
5053
}
5154

52-
if (rebuildOptions.Contents)
55+
if (rebuildOptions.Value.Contents)
5356
{
5457
await rebuilder.RebuildContentAsync(batchSize, ct);
5558
}

0 commit comments

Comments
 (0)