Amatsugu/AZKi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve sync batching; added playback types

Browse Source
This commit is contained in:
Amatsugu
2026-01-28 14:19:32 -05:00
parent 7c9ea505b0
commit c3ddcf16bf
5 changed files with 91 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AZKiServer/Protos/azki.proto
View File

@@ -9,4 +9,5 @@ import "Protos/types.proto";
service AZKi{
rpc GetMediaEntriesInRange(MediaRangeRequest) returns (MediaList);
rpc GetMediaPlayback(MediaPlaybackRequest) returns (PlaybackInfo);
}

4
AZKiServer/Protos/types.proto
View File

@@ -23,6 +23,10 @@ message MediaRangeRequest{
google.protobuf.Timestamp to = 3;
}
message MediaPlaybackRequest{
google.protobuf.Timestamp date = 1;
}
message MediaEntry {
int32 version = 1;
string id = 2;

25
AZKiServer/Services/AZKiRpcService.cs
View File

@@ -18,4 +18,29 @@ public class AZKiRpcService(MediaService mediaService) : RPC.AZKi.AZKiBase
result.Entries.AddRange(items.Select(e => e.ToRpc()));
return result;
}
public override async Task<PlaybackInfo> GetMediaPlayback(MediaPlaybackRequest request, ServerCallContext context)
{
var from = request.Date.ToDateTime().Date;
var to = request.Date.ToDateTime().Date.AddDays(1);
var items = await mediaService.GetEntriesInRangeAsync(Models.MediaType.All, from, to);
var channels = items.GroupBy(i => i.CameraId).Select(c =>
{
var images = c.Where(m => m.Type == Models.MediaType.Image).Select(m => m.ToRpc());
var videos = c.Where(m => m.Type == Models.MediaType.Video).Select(m => m.ToRpc());
var result = new MediaChannel
{
CameraId = c.Key,
};
result.Images.AddRange(images);
result.Videos.AddRange(videos);
return result;
});
var playback = new PlaybackInfo
{
Date = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(from),
};
playback.Channels.AddRange(channels);
return playback;
}
}

99
AZKiServer/Services/FileScannerService.cs
View File

@@ -8,6 +8,9 @@ using MaybeError.Errors;
using SixLabors.ImageSharp;
using System.Collections.Frozen;
using System.IO;
namespace AZKiServer.Services;
public class FileScannerService(MediaService mediaService, IConfiguration config, ILogger<FileScannerService> logger) : IHostedService, IDisposable
@@ -50,49 +53,11 @@ public class FileScannerService(MediaService mediaService, IConfiguration config
{
var files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
var existingFiles = await mediaService.GetExistingFilePathsAsync(cancellationToken);
var entries = new List<MediaEntry>();
var upgradeEntries = new List<MediaEntry>();
foreach (var filePath in files)
var total = 0;
foreach (var chunk in files.Chunk(50))
{
if (cancellationToken.IsCancellationRequested)
break;
var relativePath = Path.GetRelativePath(path, filePath);
if (relativePath[0] == '.') //Ignore hidden folders
continue;
var isUpgrade = false;
if (existingFiles.TryGetValue(relativePath, out var version))
{
if(version < MediaEntry.CUR_VERSION)
continue;
isUpgrade = true;
}
var metadata = ReadMetadata(filePath);
if(metadata.HasError)
{
logger.LogError(metadata.Error.GetException(), $"Failed to get metadata for file: {filePath}");
continue;
}
var entry = MediaEntry.Parse(relativePath, metadata);
if(entry.HasError)
{
logger.LogError(entry.Error.GetException(), "Failed to parse file data");
continue;
}
if(isUpgrade)
upgradeEntries.Add(entry);
else
entries.Add(entry);
}
cancellationToken.ThrowIfCancellationRequested();
if(entries.Count > 0) {
await mediaService.AddMediaBulkAsync(entries, cancellationToken);
logger.LogInformation("Added {count} file entries", entries.Count);
}
if (upgradeEntries.Count > 0)
{
await mediaService.DeleteAllEntriesAsync(upgradeEntries.Select(e => e.Filepath), cancellationToken);
await mediaService.AddMediaBulkAsync(upgradeEntries, cancellationToken);
logger.LogInformation("Upgraded {count} file entries", entries.Count);
total += await ScanFileChunkAsync(path, chunk, existingFiles, cancellationToken);
logger.LogInformation("Added {updated} of {count}", total, existingFiles.Count);
}
}
catch (Exception ex)
@@ -101,6 +66,56 @@ public class FileScannerService(MediaService mediaService, IConfiguration config
}
}
private async Task<int> ScanFileChunkAsync(string path, IEnumerable<string> files, FrozenDictionary<string, int> existingFiles, CancellationToken cancellationToken = default)
{
var entries = new List<MediaEntry>();
var upgradeEntries = new List<MediaEntry>();
foreach (var filePath in files)
{
if (cancellationToken.IsCancellationRequested)
break;
var relativePath = Path.GetRelativePath(path, filePath);
if (relativePath[0] == '.') //Ignore hidden folders
continue;
var isUpgrade = false;
if (existingFiles.TryGetValue(relativePath, out var version))
{
if (version < MediaEntry.CUR_VERSION)
continue;
isUpgrade = true;
}
var metadata = ReadMetadata(filePath);
if (metadata.HasError)
{
logger.LogError(metadata.Error.GetException(), $"Failed to get metadata for file: {filePath}");
continue;
}
var entry = MediaEntry.Parse(relativePath, metadata);
if (entry.HasError)
{
logger.LogError(entry.Error.GetException(), "Failed to parse file data");
continue;
}
if (isUpgrade)
upgradeEntries.Add(entry);
else
entries.Add(entry);
}
cancellationToken.ThrowIfCancellationRequested();
if (entries.Count > 0)
{
await mediaService.AddMediaBulkAsync(entries, cancellationToken);
logger.LogInformation("Added {count} file entries", entries.Count);
}
if (upgradeEntries.Count > 0)
{
await mediaService.DeleteAllEntriesAsync(upgradeEntries.Select(e => e.Filepath), cancellationToken);
await mediaService.AddMediaBulkAsync(upgradeEntries, cancellationToken);
logger.LogInformation("Upgraded {count} file entries", entries.Count);
}
return entries.Count + upgradeEntries.Count;
}
private static Maybe<MediaMetadata> ReadMetadata(string filePath)
{
var ext = Path.GetExtension(filePath);