diff --git a/i18n/en/Editor.resx b/i18n/en/Editor.resx index ddf0e3d0..31354fcc 100644 --- a/i18n/en/Editor.resx +++ b/i18n/en/Editor.resx @@ -6,6 +6,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Analyse Analysis queued + Analysis queued on {0} {0}invariant Source Back diff --git a/i18n/en/Tooltips.resx b/i18n/en/Tooltips.resx index c08e14dc..b5b8d98d 100644 --- a/i18n/en/Tooltips.resx +++ b/i18n/en/Tooltips.resx @@ -119,6 +119,7 @@ Apply this sequence preset to every section · {0} Queue every ticked preset as one job; the sequence is prepared once Tick presets on the cards first + Queue every ticked preset on {0}, one job each Average bit rate; more keeps detail and gradients, files grow Video or image codec; 10-bit HEVC keeps sky gradients clean Rec.709 colour; 10-bit avoids banding in skies, HDR is not offered @@ -200,6 +201,7 @@ Working out the render; ready in a moment Show the rendered file in Explorer Choose another preset + Render on {0} with the selected preset; progress beside the title · Ctrl+R Return every control of this section to Auto · Ctrl+Z undoes Try to save now; saving is also retried automatically {0} running on {1} diff --git a/i18n/it/Editor.it.resx b/i18n/it/Editor.it.resx index 27e657ee..605ef569 100644 --- a/i18n/it/Editor.it.resx +++ b/i18n/it/Editor.it.resx @@ -6,6 +6,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Analizza Analisi in coda + Analisi in coda su {0} Sorgente Indietro Aggiungi chiave diff --git a/i18n/it/Tooltips.it.resx b/i18n/it/Tooltips.it.resx index c197722d..a5fa3c17 100644 --- a/i18n/it/Tooltips.it.resx +++ b/i18n/it/Tooltips.it.resx @@ -119,6 +119,7 @@ Applica questo preset di sequenza a tutte le sezioni · {0} Mette in coda i preset spuntati come un unico lavoro; la sequenza si prepara una volta Spunta prima i preset sulle schede + Mette in coda su {0} i preset spuntati, un lavoro per ciascuno Bit rate medio; di più conserva dettagli e sfumature, i file crescono Codec video o immagine; HEVC a 10 bit mantiene pulite le sfumature del cielo Colore Rec.709; 10 bit evitano il banding nel cielo, l’HDR non è disponibile @@ -200,6 +201,7 @@ Calcolo del render in corso; pronto tra un attimo Mostra il file del render in Esplora file Scegli un altro preset + Renderizza su {0} con il preset scelto; avanzamento accanto al titolo · Ctrl+R Riporta in Auto ogni controllo di questa sezione · Ctrl+Z annulla Prova a salvare ora; il salvataggio viene anche ritentato da solo {0} in corso su {1} diff --git a/src/Titano.App/Editor/EditorPanels.xaml b/src/Titano.App/Editor/EditorPanels.xaml index 1f0825f5..a57e65bf 100644 --- a/src/Titano.App/Editor/EditorPanels.xaml +++ b/src/Titano.App/Editor/EditorPanels.xaml @@ -294,8 +294,9 @@ ToolTip="{Binding HistoryText}" /> - diff --git a/src/Titano.App/Editor/EditorViewModel.cs b/src/Titano.App/Editor/EditorViewModel.cs index 0c2439c7..1d03d0f1 100644 --- a/src/Titano.App/Editor/EditorViewModel.cs +++ b/src/Titano.App/Editor/EditorViewModel.cs @@ -377,7 +377,7 @@ public sealed class EditorViewModel : LocalizedViewModel, IAsyncDisposable /// "Render · 4K archive". public string RenderText => Loc.L("Editor.Render", Plan?.PresetName ?? string.Empty); - public string RenderToolTip => RenderBlockedReason ?? Loc.L("Tooltips.Editor.Render"); + public string RenderToolTip => RenderBlockedReason ?? (IsRemote ? Loc.L("Tooltips.Editor.RenderServer", RemoteText ?? string.Empty) : Loc.L("Tooltips.Editor.Render")); public bool CanRender => RenderBlockedReason is null; @@ -784,7 +784,9 @@ public sealed class EditorViewModel : LocalizedViewModel, IAsyncDisposable private async Task AnalyseAsync() { await Session.SubmitAsync(Session.AnalysisRequest()); - Shell.Notify(Loc.L("Editor.Analyse.Queued"), Title, Loc.L("Shell.Nav.Jobs"), Loc.L("Tooltips.Nav.Jobs"), () => Shell.Navigate(SectionKey.Jobs)); + // The Jobs screen lists this PC's jobs; a server's analysis shows beside the title. + if (IsRemote) Shell.Notify(Loc.L("Editor.Analyse.QueuedServer", RemoteText ?? string.Empty), Title); + else Shell.Notify(Loc.L("Editor.Analyse.Queued"), Title, Loc.L("Shell.Nav.Jobs"), Loc.L("Tooltips.Nav.Jobs"), () => Shell.Navigate(SectionKey.Jobs)); } private void OnJobChanged(Job job) @@ -838,8 +840,9 @@ public sealed class EditorViewModel : LocalizedViewModel, IAsyncDisposable await Session.ReloadAsync(); } catch (Exception ex) when (ex is System.IO.IOException or System.IO.InvalidDataException or InvalidOperationException or UnauthorizedAccessException - or System.Net.Http.HttpRequestException or Protocol.Client.TitanoApiException) + or System.Net.Http.HttpRequestException or Protocol.Client.TitanoApiException or OperationCanceledException) { + // A server that does not answer in time cancels the request (OperationCanceledException). Shell.ReportError(ex); return; } diff --git a/src/Titano.App/Editor/ExportTab.cs b/src/Titano.App/Editor/ExportTab.cs index e6d3a34b..122c8a04 100644 --- a/src/Titano.App/Editor/ExportTab.cs +++ b/src/Titano.App/Editor/ExportTab.cs @@ -153,7 +153,9 @@ public sealed class ExportTab : EditorTab public string AddToQueueToolTip => Editor.RenderBlockedReason ?? Loc.L("Tooltips.Editor.Export.AddToQueue"); - public string BatchToolTip => Editor.RenderBlockedReason ?? Loc.L(Batch.Count > 0 ? "Tooltips.Editor.Export.Batch" : "Tooltips.Editor.Export.BatchEmpty"); + public string BatchToolTip => Editor.RenderBlockedReason ?? (Batch.Count == 0 ? Loc.L("Tooltips.Editor.Export.BatchEmpty") + : Editor.IsRemote ? Loc.L("Tooltips.Editor.Export.BatchServer", Editor.RemoteText ?? string.Empty) + : Loc.L("Tooltips.Editor.Export.Batch")); public bool HasHistory => Editor.Session.Content.Renders.Count > 0; diff --git a/src/Titano.App/Server/RemoteSequenceApi.cs b/src/Titano.App/Server/RemoteSequenceApi.cs index 5b4efd25..a98d7287 100644 --- a/src/Titano.App/Server/RemoteSequenceApi.cs +++ b/src/Titano.App/Server/RemoteSequenceApi.cs @@ -1,4 +1,6 @@ using Titano.App.Editor; +using Titano.Core.Model; +using Titano.Data.Jobs; using Titano.Protocol; using Titano.Protocol.Client; @@ -10,7 +12,7 @@ public delegate IRemoteSequenceApi RemoteSequenceApiFactory(Uri address, string /// over a signed-in , which it owns. public sealed class TitanoRemoteSequenceApi(TitanoClient client) : IRemoteSequenceApi { - private static readonly string[] ActiveStates = ["queued", "running", "paused"]; + private static readonly string[] ActiveStates = [JobWire.State(JobState.Queued), JobWire.State(JobState.Running), JobWire.State(JobState.Paused)]; public Task GetSequenceAsync(Guid id, CancellationToken cancellationToken) => client.GetSequenceAsync(id, cancellationToken); diff --git a/src/Titano.App/Server/SyncHost.cs b/src/Titano.App/Server/SyncHost.cs index 738e5992..f7e4fb79 100644 --- a/src/Titano.App/Server/SyncHost.cs +++ b/src/Titano.App/Server/SyncHost.cs @@ -88,6 +88,7 @@ public sealed class SyncHost(AppServices services) : ISyncConnector, IAsyncDispo if (services.Engine is not { } engine) return; Uploads.Attach(engine); if (ReferenceEquals(_renders, engine)) return; + if (_renders is not null) _renders.JobChanged -= OnJobChanged; _renders = engine; engine.JobChanged += OnJobChanged; } @@ -156,8 +157,9 @@ public sealed class SyncHost(AppServices services) : ISyncConnector, IAsyncDispo { if (await exports.SendAsync(job, Server, CanUpload) is { } send) Log.Info("sync", $"{job.TargetLabel} will be sent to the server (job {send.Id})"); } - catch (Exception ex) when (ex is Data.DatabaseException or InvalidOperationException) + catch (Exception ex) when (ex is not OutOfMemoryException) { + // Nobody awaits this: the render itself succeeded, and the send can be asked for again on the Server screen. Log.Warning("sync", $"The render {job.TargetLabel} could not be queued for the server", ex); } }