jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: saved exports view/edit/trigger

Browse Source
This commit is contained in:
Gary Sharp
2025-02-12 18:36:30 +11:00
parent 59dc0b9d5a
commit eec8ba438c
40 changed files with 3042 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Exporting/SavedExportTask.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Disco.Services.Exporting
protected override void ExecuteTask()
{
SavedExports.EvaluateSavedExports();
SavedExports.EvaluateSavedExportSchedules();
}
}
Disco.Services/Exporting/SavedExports.cs
+54 -35
View File
@@ -171,6 +171,14 @@ namespace Disco.Services.Exporting
return exports;
}
public static List<SavedExport> GetSavedExports(DiscoDataContext database)
=> database.DiscoConfiguration.SavedExports
.Where(e => e.Enabled && exportTypes.ContainsKey(e.Type))
.ToList();
public static Dictionary<string, string> GetSavedExportTypeNames()
=> exportTypes.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Name, StringComparer.Ordinal);
public static bool IsAuthorized(SavedExport savedExport, AuthorizationToken authorization)
{
if (authorization.Has(Claims.Config.ManageSavedExports))
@@ -188,7 +196,7 @@ namespace Disco.Services.Exporting
return false;
}
public static void EvaluateSavedExports()
public static void EvaluateSavedExportSchedules()
{
using (var database = new DiscoDataContext())
{
@@ -198,42 +206,53 @@ namespace Disco.Services.Exporting
foreach (var scheduledExport in scheduledExports)
{
ExportResult exportResult = null;
try
{
exportResult = EvaluateSavedExport(database, scheduledExport);
}
catch (Exception ex)
{
SystemLog.LogException($"Failed to generate saved '{scheduledExport.Name}' [{scheduledExport.Id}]", ex);
continue;
}
var filePath = scheduledExport.FilePath;
if (scheduledExport.TimestampSuffix)
{
var timestamp = DateTime.Now.ToString("yyyyMMdd-HH");
var extension = Path.GetExtension(filePath);
filePath = Path.Combine(Path.GetDirectoryName(filePath), $"{Path.GetFileNameWithoutExtension(filePath)}-{timestamp}{extension}");
}
try
{
using (var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write))
{
exportResult.Result.CopyTo(fileStream);
}
SystemLog.LogInformation($"Saved '{scheduledExport.Name}' [{scheduledExport.Name}] wrote to '{filePath}'");
}
catch (Exception ex)
{
SystemLog.LogException($"Failed to write saved '{scheduledExport.Name}' [{scheduledExport.Id}] to '{filePath}'", ex);
}
EvaluateSavedExportSchedule(database, scheduledExport);
}
}
}
public static void EvaluateSavedExportSchedule(DiscoDataContext database, SavedExport scheduledExport)
{
ExportResult exportResult = null;
try
{
exportResult = EvaluateSavedExport(database, scheduledExport);
}
catch (Exception ex)
{
SystemLog.LogException($"Failed to generate saved '{scheduledExport.Name}' [{scheduledExport.Id}]", ex);
return;
}
var filePath = scheduledExport.FilePath;
if (scheduledExport.TimestampSuffix)
{
var timestamp = DateTime.Now.ToString("yyyyMMdd-HH");
var extension = Path.GetExtension(filePath);
filePath = Path.Combine(Path.GetDirectoryName(filePath), $"{Path.GetFileNameWithoutExtension(filePath)}-{timestamp}{extension}");
}
try
{
using (var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write))
{
exportResult.Result.CopyTo(fileStream);
}
var allExports = database.DiscoConfiguration.SavedExports;
var configExport = allExports.First(e => e.Id == scheduledExport.Id);
configExport.LastRunOn = DateTime.Now;
database.DiscoConfiguration.SavedExports = allExports;
database.SaveChanges();
SystemLog.LogInformation($"Saved '{scheduledExport.Name}' [{scheduledExport.Name}] wrote to '{filePath}'");
}
catch (Exception ex)
{
SystemLog.LogException($"Failed to write saved '{scheduledExport.Name}' [{scheduledExport.Id}] to '{filePath}'", ex);
}
}
public static ExportResult EvaluateSavedExport(DiscoDataContext database, SavedExport savedExport)
{
var (exportType, _, exportDelegate) = exportTypes[savedExport.Type];
@@ -273,7 +292,7 @@ namespace Disco.Services.Exporting
var exports = database.DiscoConfiguration.SavedExports;
var now = DateTime.Now;
var hour = now.Hour;
var day = (byte)(1 << (int)now.DayOfWeek);
var day = now.DayOfWeek;
foreach (var export in exports)
{
@@ -292,7 +311,7 @@ namespace Disco.Services.Exporting
continue;
// scheduled for today?
if ((schedule.WeekDays & day) == 0)
if (!schedule.IncludesDay(day))
continue;
// always run if scheduled earlier today? (potentially missed)